summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arts/kde/kartsserver.cpp6
-rw-r--r--arts/kde/kioinputstream_impl.cpp2
-rw-r--r--arts/kde/kplayobject.cc8
-rw-r--r--arts/knotify/knotify.cpp4
-rw-r--r--dcop/client/dcopstart.cpp2
-rw-r--r--dcop/dcopclient.cpp26
-rw-r--r--interfaces/khexedit/byteseditinterface.h2
-rw-r--r--interfaces/ktexteditor/editorchooser_ui.ui2
-rw-r--r--interfaces/ktexteditor/templateinterface.cpp2
-rw-r--r--kab/kabapi.cc2
-rw-r--r--kabc/address.cpp4
-rw-r--r--kabc/addressbook.cpp2
-rw-r--r--kabc/ldapclient.cpp2
-rw-r--r--kabc/ldifconverter.cpp112
-rw-r--r--kabc/ldifconverter.h2
-rw-r--r--kabc/vcardparser/testwrite.cpp2
-rw-r--r--kate/part/kateautoindent.cpp14
-rw-r--r--kate/part/katecmds.cpp8
-rw-r--r--kate/part/katecodecompletion.cpp2
-rw-r--r--kate/part/kateconfig.cpp2
-rw-r--r--kate/part/katedocument.cpp4
-rw-r--r--kate/part/katehighlight.cpp2
-rw-r--r--kate/part/katejscript.cpp2
-rw-r--r--kate/part/kateprinter.cpp2
-rw-r--r--kate/part/katerenderer.cpp6
-rw-r--r--kate/part/kateschema.cpp10
-rw-r--r--kate/part/kateview.cpp2
-rw-r--r--kate/part/kateviewinternal.h2
-rw-r--r--kate/part/test_regression.cpp2
-rw-r--r--kcert/kcertpart.cc8
-rw-r--r--kconf_update/kconf_update.cpp2
-rw-r--r--kded/kbuildsycoca.cpp4
-rw-r--r--kdewidgets/makekdewidgets.cpp16
-rw-r--r--khtml/css/cssstyleselector.cpp8
-rw-r--r--khtml/dom/dom_doc.cpp4
-rw-r--r--khtml/ecma/kjs_debugwin.cpp6
-rw-r--r--khtml/ecma/kjs_navigator.cpp30
-rw-r--r--khtml/ecma/kjs_proxy.cpp10
-rw-r--r--khtml/ecma/kjs_window.cpp24
-rw-r--r--khtml/ecma/xmlhttprequest.cpp2
-rw-r--r--khtml/html/html_documentimpl.cpp8
-rw-r--r--khtml/html/html_formimpl.cpp12
-rw-r--r--khtml/html/htmltokenizer.cpp4
-rw-r--r--khtml/java/kjavaappletcontext.cpp16
-rw-r--r--khtml/java/kjavaappletserver.cpp20
-rw-r--r--khtml/java/kjavaappletviewer.cpp26
-rw-r--r--khtml/khtml_ext.cpp4
-rw-r--r--khtml/khtml_part.cpp130
-rw-r--r--khtml/khtml_run.cpp2
-rw-r--r--khtml/khtml_settings.cc30
-rw-r--r--khtml/khtmlview.cpp2
-rw-r--r--khtml/kmultipart/kmultipart.cpp4
-rw-r--r--khtml/misc/loader.cpp10
-rw-r--r--khtml/rendering/enumerate.cpp2
-rw-r--r--khtml/rendering/font.cpp2
-rw-r--r--khtml/rendering/render_applet.cpp14
-rw-r--r--khtml/rendering/render_form.cpp26
-rw-r--r--khtml/rendering/render_frames.cpp42
-rw-r--r--khtml/rendering/render_generated.cpp2
-rw-r--r--khtml/rendering/render_layer.cpp6
-rw-r--r--khtml/rendering/render_list.cpp12
-rw-r--r--khtml/rendering/render_object.cpp10
-rw-r--r--khtml/rendering/render_replaced.cpp4
-rw-r--r--khtml/test_regression.cpp6
-rw-r--r--khtml/test_regression_fontoverload.cpp2
-rw-r--r--khtml/testkhtml.cpp10
-rw-r--r--khtml/xml/dom2_eventsimpl.cpp6
-rw-r--r--khtml/xml/dom_docimpl.cpp2
-rw-r--r--kimgio/dds.cpp10
-rw-r--r--kimgio/eps.cpp4
-rw-r--r--kimgio/exr.cpp2
-rw-r--r--kimgio/hdr.cpp8
-rw-r--r--kimgio/ico.cpp2
-rw-r--r--kimgio/jp2.cpp4
-rw-r--r--kimgio/pcx.cpp10
-rw-r--r--kimgio/psd.cpp8
-rw-r--r--kimgio/rgb.cpp8
-rw-r--r--kimgio/tga.cpp10
-rw-r--r--kimgio/tiffr.cpp2
-rw-r--r--kimgio/xcf.cpp4
-rw-r--r--kimgio/xview.cpp4
-rw-r--r--kinit/klauncher.cpp2
-rw-r--r--kinit/tests/klaunchertest.cpp4
-rw-r--r--kio/bookmarks/kbookmark.cc2
-rw-r--r--kio/bookmarks/kbookmarkbar.cc4
-rw-r--r--kio/bookmarks/kbookmarkimporter_ns.cc2
-rw-r--r--kio/bookmarks/kbookmarkmanager.cc16
-rw-r--r--kio/httpfilter/httpfilter.cc2
-rw-r--r--kio/kfile/config-kfile.h30
-rw-r--r--kio/kfile/kacleditwidget.cpp4
-rw-r--r--kio/kfile/kcombiview.cpp2
-rw-r--r--kio/kfile/kdiroperator.cpp78
-rw-r--r--kio/kfile/kdirselectdialog.cpp4
-rw-r--r--kio/kfile/kdiskfreesp.cpp2
-rw-r--r--kio/kfile/kencodingfiledialog.cpp2
-rw-r--r--kio/kfile/kfiledetailview.h2
-rw-r--r--kio/kfile/kfiledialog.cpp24
-rw-r--r--kio/kfile/kfilefiltercombo.cpp2
-rw-r--r--kio/kfile/kfileiconview.cpp18
-rw-r--r--kio/kfile/kfiletreeview.cpp4
-rw-r--r--kio/kfile/kicondialog.cpp6
-rw-r--r--kio/kfile/knotifydialog.cpp18
-rw-r--r--kio/kfile/kopenwith.cpp36
-rw-r--r--kio/kfile/kpropertiesdialog.cpp58
-rw-r--r--kio/kfile/krecentdirs.cpp4
-rw-r--r--kio/kfile/krecentdocument.cpp30
-rw-r--r--kio/kfile/kurlbar.cpp18
-rw-r--r--kio/kfile/kurlcombobox.cpp4
-rw-r--r--kio/kfile/kurlrequester.cpp2
-rw-r--r--kio/kfile/tests/kdirselectdialogtest.cpp2
-rw-r--r--kio/kfile/tests/kfdtest.cpp2
-rw-r--r--kio/kfile/tests/kfiletreeviewtest.cpp2
-rw-r--r--kio/kfile/tests/kfstest.cpp38
-rw-r--r--kio/kfile/tests/kurlrequestertest.cpp2
-rw-r--r--kio/kio/authinfo.cpp14
-rw-r--r--kio/kio/chmodjob.cpp2
-rw-r--r--kio/kio/dataprotocol.cpp2
-rw-r--r--kio/kio/dataslave.cpp2
-rw-r--r--kio/kio/global.cpp26
-rw-r--r--kio/kio/job.cpp38
-rw-r--r--kio/kio/kacl.cpp10
-rw-r--r--kio/kio/karchive.cpp2
-rw-r--r--kio/kio/kdatatool.cpp6
-rw-r--r--kio/kio/kfileitem.cpp2
-rw-r--r--kio/kio/kfilemetainfo.cpp2
-rw-r--r--kio/kio/kfileshare.cpp4
-rw-r--r--kio/kio/kimageio.cpp20
-rw-r--r--kio/kio/kmimemagic.cpp2
-rw-r--r--kio/kio/kmimetype.cpp12
-rw-r--r--kio/kio/kmimetypechooser.cpp4
-rw-r--r--kio/kio/kprotocolmanager.cpp10
-rw-r--r--kio/kio/kremoteencoding.cpp4
-rw-r--r--kio/kio/ksambashare.cpp2
-rw-r--r--kio/kio/kurifilter.cpp12
-rw-r--r--kio/kio/netaccess.cpp4
-rw-r--r--kio/kio/passdlg.cpp2
-rw-r--r--kio/kio/previewjob.cpp6
-rw-r--r--kio/kio/sessiondata.cpp4
-rw-r--r--kio/kio/slave.cpp4
-rw-r--r--kio/kio/slavebase.h12
-rw-r--r--kio/kpasswdserver/kpasswdserver.cpp2
-rw-r--r--kio/kssl/ksslcertificate.cc4
-rw-r--r--kio/kssl/ksslinfodlg.cc8
-rw-r--r--kio/kssl/ksslpeerinfo.cc2
-rw-r--r--kio/misc/kntlm/kntlm.cpp4
-rw-r--r--kio/misc/ksendbugmail/main.cpp8
-rw-r--r--kio/misc/ksendbugmail/smtp.cpp14
-rw-r--r--kio/misc/kssld/kssld.cpp26
-rw-r--r--kio/misc/uiserver.cpp4
-rw-r--r--kio/misc/uiserver.h2
-rw-r--r--kio/tests/jobtest.cpp2
-rw-r--r--kio/tests/kacltest.cpp30
-rw-r--r--kio/tests/kdefaultprogresstest.cpp4
-rw-r--r--kio/tests/ksycocatest.cpp2
-rw-r--r--kio/tests/kurifiltertest.cpp4
-rw-r--r--kioslave/file/file.cc30
-rw-r--r--kioslave/ftp/ftp.cc6
-rw-r--r--kioslave/http/http.cc102
-rw-r--r--kioslave/http/http_cache_cleaner.cpp8
-rw-r--r--kioslave/http/kcookiejar/kcookiejar.cpp26
-rw-r--r--kioslave/http/kcookiejar/kcookiejar.h2
-rw-r--r--kioslave/http/kcookiejar/tests/kcookiejartest.cpp10
-rw-r--r--kioslave/iso/iso.cpp8
-rw-r--r--kmdi/kmdi/guiclient.cpp2
-rw-r--r--kmdi/kmdichildarea.cpp6
-rw-r--r--kmdi/kmdichildfrm.cpp36
-rw-r--r--kmdi/kmdiguiclient.cpp2
-rw-r--r--kmdi/kmdimainfrm.cpp12
-rw-r--r--kmdi/kmditaskbar.cpp4
-rw-r--r--kparts/browserextension.cpp2
-rw-r--r--kparts/browserextension.h2
-rw-r--r--kparts/browserinterface.cpp2
-rw-r--r--kparts/browserrun.cpp6
-rw-r--r--kparts/browserrun.h2
-rw-r--r--kparts/componentfactory.h6
-rw-r--r--kparts/dockmainwindow.cpp4
-rw-r--r--kparts/mainwindow.cpp4
-rw-r--r--kparts/part.cpp6
-rw-r--r--kparts/partmanager.cpp2
-rw-r--r--kparts/plugin.cpp6
-rw-r--r--kparts/statusbarextension.cpp2
-rw-r--r--krandr/libkrandr.cc6
-rw-r--r--kresources/manager.h2
-rw-r--r--kspell2/broker.cpp4
-rw-r--r--kspell2/ui/kspell2ui.ui2
-rw-r--r--kstyles/asteroid/asteroid.cpp108
-rw-r--r--kstyles/asteroid/asteroid.h12
-rw-r--r--kstyles/highcolor/highcolor.cpp80
-rw-r--r--kstyles/highcolor/highcolor.h10
-rw-r--r--kstyles/highcontrast/highcontrast.cpp56
-rw-r--r--kstyles/highcontrast/highcontrast.h10
-rw-r--r--kstyles/keramik/keramik.cpp100
-rw-r--r--kstyles/keramik/keramik.h10
-rw-r--r--kstyles/klegacy/klegacystyle.cpp8
-rw-r--r--kstyles/kthemestyle/kthemebase.cpp6
-rw-r--r--kstyles/kthemestyle/kthemebase.h26
-rw-r--r--kstyles/kthemestyle/kthemestyle.cpp166
-rw-r--r--kstyles/kthemestyle/kthemestyle.h10
-rw-r--r--kstyles/light/lightstyle-v2.cpp54
-rw-r--r--kstyles/light/lightstyle-v2.h10
-rw-r--r--kstyles/light/lightstyle-v3.cpp78
-rw-r--r--kstyles/light/lightstyle-v3.h10
-rw-r--r--kstyles/plastik/plastik.cpp64
-rw-r--r--kstyles/plastik/plastik.h12
-rw-r--r--kstyles/web/webstyle.cpp22
-rw-r--r--kunittest/module.h4
-rw-r--r--kunittest/tester.cpp2
-rw-r--r--kunittest/tester.h2
-rw-r--r--kutils/kcmoduleproxy.cpp2
-rw-r--r--kutils/kmultitabbar.cpp82
-rw-r--r--kutils/kpluginselector.cpp4
-rw-r--r--kutils/kreplace.cpp2
-rw-r--r--networkstatus/connectionmanager.cpp2
-rw-r--r--tdecore/kaboutdata.cpp6
-rw-r--r--tdecore/kaccel.cpp6
-rw-r--r--tdecore/kaccelmanager.cpp12
-rw-r--r--tdecore/kapplication.cpp28
-rw-r--r--tdecore/kcalendarsystemfactory.h2
-rw-r--r--tdecore/kcalendarsystemgregorian.cpp2
-rw-r--r--tdecore/kcalendarsystemhebrew.cpp6
-rw-r--r--tdecore/kcalendarsystemhijri.cpp2
-rw-r--r--tdecore/kcalendarsystemjalali.cpp2
-rw-r--r--tdecore/kcatalogue.cpp2
-rw-r--r--tdecore/kcharsets.cpp8
-rw-r--r--tdecore/kcmdlineargs.cpp2
-rw-r--r--tdecore/kcompletion.cpp8
-rw-r--r--tdecore/kcompletion_private.h2
-rw-r--r--tdecore/kconfig_compiler/kconfig_compiler.cpp18
-rw-r--r--tdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp6
-rw-r--r--tdecore/kconfig_compiler/tests/test1.cpp.ref48
-rw-r--r--tdecore/kconfig_compiler/tests/test1.h.ref18
-rw-r--r--tdecore/kconfig_compiler/tests/test2.cpp.ref66
-rw-r--r--tdecore/kconfig_compiler/tests/test2.h.ref22
-rw-r--r--tdecore/kconfig_compiler/tests/test3.cpp.ref22
-rw-r--r--tdecore/kconfig_compiler/tests/test3.h.ref8
-rw-r--r--tdecore/kconfig_compiler/tests/test4.cpp.ref48
-rw-r--r--tdecore/kconfig_compiler/tests/test4.h.ref8
-rw-r--r--tdecore/kconfig_compiler/tests/test5.cpp.ref48
-rw-r--r--tdecore/kconfig_compiler/tests/test5.h.ref8
-rw-r--r--tdecore/kconfig_compiler/tests/test6.cpp.ref18
-rw-r--r--tdecore/kconfig_compiler/tests/test6.h.ref6
-rw-r--r--tdecore/kconfig_compiler/tests/test7.cpp.ref18
-rw-r--r--tdecore/kconfig_compiler/tests/test7.h.ref6
-rw-r--r--tdecore/kconfig_compiler/tests/test8a.cpp.ref10
-rw-r--r--tdecore/kconfig_compiler/tests/test8a.h.ref4
-rw-r--r--tdecore/kconfig_compiler/tests/test8b.cpp.ref16
-rw-r--r--tdecore/kconfig_compiler/tests/test8b.h.ref6
-rw-r--r--tdecore/kconfig_compiler/tests/test9.cpp.ref16
-rw-r--r--tdecore/kconfig_compiler/tests/test9.h.ref6
-rw-r--r--tdecore/kconfig_compiler/tests/test9main.cpp2
-rw-r--r--tdecore/kconfig_compiler/tests/test_dpointer.cpp.ref88
-rw-r--r--tdecore/kconfigbackend.cpp8
-rw-r--r--tdecore/kconfigbase.cpp16
-rw-r--r--tdecore/kconfigbase.h8
-rw-r--r--tdecore/kconfigdialogmanager.cpp6
-rw-r--r--tdecore/kconfigskeleton.h10
-rw-r--r--tdecore/kdcoppropertyproxy.cpp6
-rw-r--r--tdecore/kde-config.cpp.in2
-rw-r--r--tdecore/kdebug.cpp4
-rw-r--r--tdecore/kdebug.h4
-rw-r--r--tdecore/kdesktopfile.cpp22
-rw-r--r--tdecore/kextsock.cpp2
-rw-r--r--tdecore/kgenericfactory.tcc8
-rw-r--r--tdecore/kglobal.cpp2
-rw-r--r--tdecore/kglobalaccel_win.cpp6
-rw-r--r--tdecore/kglobalaccel_x11.cpp6
-rw-r--r--tdecore/kiconeffect.cpp4
-rw-r--r--tdecore/kiconloader.cpp6
-rw-r--r--tdecore/kicontheme.cpp6
-rw-r--r--tdecore/kidna.cpp4
-rw-r--r--tdecore/klocale.cpp34
-rw-r--r--tdecore/knotifyclient.cpp12
-rw-r--r--tdecore/kprocess.h2
-rw-r--r--tdecore/kprotocolinfo_tdecore.cpp2
-rw-r--r--tdecore/ksavefile.cpp2
-rw-r--r--tdecore/ksavefile.h2
-rw-r--r--tdecore/ksimpleconfig.cpp2
-rw-r--r--tdecore/ksockaddr.cpp4
-rw-r--r--tdecore/kstandarddirs.cpp14
-rw-r--r--tdecore/kstartupinfo.cpp72
-rw-r--r--tdecore/ksycoca.cpp2
-rw-r--r--tdecore/ktimezones.cpp4
-rw-r--r--tdecore/kurl.cpp10
-rw-r--r--tdecore/kurl.h4
-rw-r--r--tdecore/network/kclientsocketbase.cpp2
-rw-r--r--tdecore/network/khttpproxysocketdevice.cpp2
-rw-r--r--tdecore/network/kresolver.cpp8
-rw-r--r--tdecore/network/kresolverstandardworkers.cpp16
-rw-r--r--tdecore/network/kreverseresolver.cpp4
-rw-r--r--tdecore/network/kserversocket.cpp2
-rw-r--r--tdecore/network/ksocketaddress.cpp8
-rw-r--r--tdecore/network/ksocketbase.cpp2
-rw-r--r--tdecore/network/ksrvresolverworker.cpp6
-rw-r--r--tdecore/svgicons/ksvgiconengine.cpp8
-rw-r--r--tdecore/svgicons/ksvgiconpainter.cpp70
-rw-r--r--tdecore/svgicons/ksvgiconpainter.h4
-rw-r--r--tdecore/tests/kcalendartest.cpp2
-rw-r--r--tdecore/tests/klocaletest.cpp26
-rw-r--r--tdecore/tests/kresolvertest.cpp8
-rw-r--r--tdecore/tests/ktimezonestest.cpp2
-rw-r--r--tdefx/kdrawutil.h2
-rw-r--r--tdefx/kimageeffect.cpp2
-rw-r--r--tdefx/kstyle.cpp44
-rw-r--r--tdefx/kstyle.h12
-rw-r--r--tdeprint/cups/cupsaddsmb2.cpp4
-rw-r--r--tdeprint/cups/cupsinfos.cpp4
-rw-r--r--tdeprint/cups/ippreportdlg.cpp2
-rw-r--r--tdeprint/cups/ipprequest.cpp2
-rw-r--r--tdeprint/cups/kcupsprinterimpl.cpp6
-rw-r--r--tdeprint/cups/kmcupsjobmanager.cpp6
-rw-r--r--tdeprint/cups/kmcupsmanager.cpp22
-rw-r--r--tdeprint/cups/kmpropusers.cpp2
-rw-r--r--tdeprint/cups/kmwfax.cpp4
-rw-r--r--tdeprint/cups/kmwipp.cpp2
-rw-r--r--tdeprint/cups/kmwippprinter.cpp6
-rw-r--r--tdeprint/cups/kmwippselect.cpp6
-rw-r--r--tdeprint/driver.cpp2
-rw-r--r--tdeprint/driveritem.cpp4
-rw-r--r--tdeprint/foomatic/kfoomaticprinterimpl.cpp2
-rw-r--r--tdeprint/foomatic/kmfoomaticmanager.cpp2
-rw-r--r--tdeprint/kmfactory.cpp6
-rw-r--r--tdeprint/kmjob.cpp2
-rw-r--r--tdeprint/kmmanager.cpp4
-rw-r--r--tdeprint/kmspecialmanager.cpp6
-rw-r--r--tdeprint/kpcopiespage.cpp2
-rw-r--r--tdeprint/kprintdialog.cpp4
-rw-r--r--tdeprint/kprinter.cpp4
-rw-r--r--tdeprint/kprinterimpl.cpp2
-rw-r--r--tdeprint/kprintpreview.cpp2
-rw-r--r--tdeprint/lpd/gschecker.cpp2
-rw-r--r--tdeprint/lpd/klpdprinterimpl.cpp2
-rw-r--r--tdeprint/lpd/kmlpdmanager.cpp52
-rw-r--r--tdeprint/lpd/lpdtools.cpp10
-rw-r--r--tdeprint/lpdunix/klpdunixprinterimpl.cpp4
-rw-r--r--tdeprint/lpdunix/kmlpdunixmanager.cpp4
-rw-r--r--tdeprint/lpr/apshandler.cpp8
-rw-r--r--tdeprint/lpr/klprprinterimpl.cpp4
-rw-r--r--tdeprint/lpr/kmlprmanager.cpp4
-rw-r--r--tdeprint/lpr/lprngtoolhandler.cpp6
-rw-r--r--tdeprint/lpr/matichandler.cpp8
-rw-r--r--tdeprint/management/kmdbcreator.cpp2
-rw-r--r--tdeprint/management/kmdriverdb.cpp2
-rw-r--r--tdeprint/management/kmdriverdbwidget.cpp2
-rw-r--r--tdeprint/management/kmiconview.cpp2
-rw-r--r--tdeprint/management/kminfopage.cpp2
-rw-r--r--tdeprint/management/kmpropmembers.cpp2
-rw-r--r--tdeprint/management/kmwbackend.cpp2
-rw-r--r--tdeprint/management/kmwend.cpp12
-rw-r--r--tdeprint/management/kmwfile.cpp2
-rw-r--r--tdeprint/management/kmwlpd.cpp2
-rw-r--r--tdeprint/management/kmwpassword.cpp2
-rw-r--r--tdeprint/management/kmwsocket.cpp2
-rw-r--r--tdeprint/management/kmwsocketutil.cpp2
-rw-r--r--tdeprint/management/kxmlcommanddlg.cpp4
-rw-r--r--tdeprint/management/networkscanner.cpp2
-rw-r--r--tdeprint/posterpreview.cpp4
-rw-r--r--tdeprint/rlpr/kmrlprmanager.cpp2
-rw-r--r--tdeprint/rlpr/kmwrlpr.cpp4
-rw-r--r--tdeprint/rlpr/krlprprinterimpl.cpp2
-rw-r--r--tdeprint/tdeprintcheck.cpp4
-rw-r--r--tdeprint/tests/helpwindow.cpp2
-rw-r--r--tdeprint/tests/richpage.cpp2
-rw-r--r--tdeprint/treecombobox.cpp2
-rw-r--r--tdeui/kaboutdialog.cpp4
-rw-r--r--tdeui/kaboutkde.cpp8
-rw-r--r--tdeui/kaction.cpp4
-rw-r--r--tdeui/kactionclasses.cpp4
-rw-r--r--tdeui/kactioncollection.cpp4
-rw-r--r--tdeui/kactivelabel.cpp2
-rw-r--r--tdeui/karrowbutton.cpp6
-rw-r--r--tdeui/kauthicon.cpp2
-rw-r--r--tdeui/kbugreport.cpp64
-rw-r--r--tdeui/kbuttonbox.cpp2
-rw-r--r--tdeui/kcharselect.cpp16
-rw-r--r--tdeui/kcmenumngr.cpp8
-rw-r--r--tdeui/kcolorbutton.cpp10
-rw-r--r--tdeui/kcolordialog.cpp4
-rw-r--r--tdeui/kcolordrag.cpp2
-rw-r--r--tdeui/kcursor.cpp4
-rw-r--r--tdeui/kdatepicker.cpp18
-rw-r--r--tdeui/kdatepicker.h2
-rw-r--r--tdeui/kdatetbl.cpp28
-rw-r--r--tdeui/kdialog.cpp2
-rw-r--r--tdeui/kdialogbase.cpp28
-rw-r--r--tdeui/kdockwidget.cpp30
-rw-r--r--tdeui/kdockwidget.h6
-rw-r--r--tdeui/kdockwidget_private.cpp14
-rw-r--r--tdeui/kdualcolorbutton.cpp8
-rw-r--r--tdeui/keditcl1.cpp2
-rw-r--r--tdeui/kedittoolbar.cpp16
-rw-r--r--tdeui/kfontcombo.cpp2
-rw-r--r--tdeui/kfontdialog.cpp10
-rw-r--r--tdeui/khelpmenu.cpp2
-rw-r--r--tdeui/kiconview.cpp24
-rw-r--r--tdeui/kjanuswidget.cpp20
-rw-r--r--tdeui/kjanuswidget.h2
-rw-r--r--tdeui/kkeybutton.cpp10
-rw-r--r--tdeui/klanguagebutton.cpp6
-rw-r--r--tdeui/kled.cpp6
-rw-r--r--tdeui/klistbox.cpp4
-rw-r--r--tdeui/klistview.cpp30
-rw-r--r--tdeui/klistview.h2
-rw-r--r--tdeui/klistviewsearchline.cpp22
-rw-r--r--tdeui/kmainwindow.cpp58
-rw-r--r--tdeui/kmainwindow.h14
-rw-r--r--tdeui/kmenubar.cpp26
-rw-r--r--tdeui/kmessagebox.cpp14
-rw-r--r--tdeui/knumvalidator.cpp6
-rw-r--r--tdeui/kpassdlg.cpp4
-rw-r--r--tdeui/kpopupmenu.cpp2
-rw-r--r--tdeui/kprogress.cpp6
-rw-r--r--tdeui/krootpixmap.cpp10
-rw-r--r--tdeui/kruler.cpp10
-rw-r--r--tdeui/ksconfig.cpp4
-rw-r--r--tdeui/kselect.cpp28
-rw-r--r--tdeui/kselect.h2
-rw-r--r--tdeui/kseparator.cpp2
-rw-r--r--tdeui/kshortcutdialog.cpp4
-rw-r--r--tdeui/kspell.cpp8
-rw-r--r--tdeui/kstatusbar.cpp4
-rw-r--r--tdeui/kstdaction.cpp2
-rw-r--r--tdeui/kstdguiitem.cpp56
-rw-r--r--tdeui/ksyntaxhighlighter.cpp10
-rw-r--r--tdeui/ksystemtray.cpp2
-rw-r--r--tdeui/ktabbar.cpp14
-rw-r--r--tdeui/ktabctl.cpp28
-rw-r--r--tdeui/ktabwidget.cpp4
-rw-r--r--tdeui/ktextedit.cpp2
-rw-r--r--tdeui/ktip.cpp12
-rw-r--r--tdeui/ktoolbar.cpp62
-rw-r--r--tdeui/ktoolbar.h2
-rw-r--r--tdeui/ktoolbarbutton.cpp24
-rw-r--r--tdeui/ktoolbarbutton.h2
-rw-r--r--tdeui/ktoolbarhandler.cpp2
-rw-r--r--tdeui/ktoolbarlabelaction.cpp2
-rw-r--r--tdeui/kurllabel.cpp2
-rw-r--r--tdeui/kwhatsthismanager.cpp4
-rw-r--r--tdeui/kxmlguibuilder.cpp30
-rw-r--r--tdeui/kxmlguiclient.cpp6
-rw-r--r--tdeui/kxmlguifactory.cpp8
-rw-r--r--tdeui/qxembed.cpp114
-rw-r--r--tdeui/tests/kdialogbasetest.cpp2
-rw-r--r--tdeui/tests/kdockwidgetdemo.cpp14
-rw-r--r--tdeui/tests/kdualcolortest.cpp4
-rw-r--r--tdeui/tests/keditlistboxtest.cpp12
-rw-r--r--tdeui/tests/kmessageboxtest.cpp14
-rw-r--r--tdeui/twindowlistmenu.cpp2
447 files changed, 2669 insertions, 2669 deletions
diff --git a/arts/kde/kartsserver.cpp b/arts/kde/kartsserver.cpp
index 50e8b3a2a..e030cb411 100644
--- a/arts/kde/kartsserver.cpp
+++ b/arts/kde/kartsserver.cpp
@@ -77,12 +77,12 @@ Arts::SoundServerV2 KArtsServer::server(void)
X11CommConfig.sync();
- proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("tdeinit_wrapper"))).data();
+ proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("tdeinit_wrapper"))).data();
if(rt)
- proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("artswrapper"))).data();
+ proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("artswrapper"))).data();
else
- proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("artsd"))).data();
+ proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("artsd"))).data();
proc << TQStringList::split( " ", config.readEntry( "Arguments", "-F 10 -S 4096 -s 60 -m artsmessage -l 3 -f" ) );
diff --git a/arts/kde/kioinputstream_impl.cpp b/arts/kde/kioinputstream_impl.cpp
index 15994625e..8c131bfd1 100644
--- a/arts/kde/kioinputstream_impl.cpp
+++ b/arts/kde/kioinputstream_impl.cpp
@@ -78,7 +78,7 @@ void KIOInputStream_impl::streamStart()
m_job = KIO::get(m_url, false, false);
m_job->addMetaData("accept", "audio/x-mp3, video/mpeg, application/ogg");
- m_job->addMetaData("UserAgent", TQString::tqfromLatin1("aRts/") + TQString::tqfromLatin1(ARTS_VERSION));
+ m_job->addMetaData("UserAgent", TQString::fromLatin1("aRts/") + TQString::fromLatin1(ARTS_VERSION));
TQObject::connect(m_job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
this, TQT_SLOT(slotData(KIO::Job *, const TQByteArray &)));
diff --git a/arts/kde/kplayobject.cc b/arts/kde/kplayobject.cc
index 7c71be31f..becb20a58 100644
--- a/arts/kde/kplayobject.cc
+++ b/arts/kde/kplayobject.cc
@@ -65,7 +65,7 @@ void KPlayObject::halt()
TQString KPlayObject::description()
{
- return TQString::tqfromLatin1(object().description().c_str());
+ return TQString::fromLatin1(object().description().c_str());
}
Arts::poTime KPlayObject::currentTime()
@@ -85,7 +85,7 @@ Arts::poCapabilities KPlayObject::capabilities()
TQString KPlayObject::mediaName()
{
- return TQString::tqfromLatin1(object().mediaName().c_str());
+ return TQString::fromLatin1(object().mediaName().c_str());
}
Arts::poState KPlayObject::state()
@@ -243,7 +243,7 @@ TQString KDE::PlayObject::description()
{
if ( object().isNull() )
return TQString();
- return TQString::tqfromLatin1(object().description().c_str());
+ return TQString::fromLatin1(object().description().c_str());
}
Arts::poTime KDE::PlayObject::currentTime()
@@ -271,7 +271,7 @@ TQString KDE::PlayObject::mediaName()
{
if ( object().isNull() )
return TQString();
- return TQString::tqfromLatin1(object().mediaName().c_str());
+ return TQString::fromLatin1(object().mediaName().c_str());
}
Arts::poState KDE::PlayObject::state()
diff --git a/arts/knotify/knotify.cpp b/arts/knotify/knotify.cpp
index b8d5b8d26..21cd34cf4 100644
--- a/arts/knotify/knotify.cpp
+++ b/arts/knotify/knotify.cpp
@@ -642,7 +642,7 @@ bool KNotify::notifyByLogfile(const TQString &text, const TQString &file)
// append msg
TQTextStream strm( &logFile );
- strm << "- KNotify " << TQDateTime::tqcurrentDateTime().toString() << ": ";
+ strm << "- KNotify " << TQDateTime::currentDateTime().toString() << ": ";
strm << text << endl;
// close file
@@ -660,7 +660,7 @@ bool KNotify::notifyByStderr(const TQString &text)
TQTextStream strm( stderr, IO_WriteOnly );
// output msg
- strm << "KNotify " << TQDateTime::tqcurrentDateTime().toString() << ": ";
+ strm << "KNotify " << TQDateTime::currentDateTime().toString() << ": ";
strm << text << endl;
return true;
diff --git a/dcop/client/dcopstart.cpp b/dcop/client/dcopstart.cpp
index f46531735..5741ef775 100644
--- a/dcop/client/dcopstart.cpp
+++ b/dcop/client/dcopstart.cpp
@@ -33,7 +33,7 @@ static DCOPClient* dcop = 0;
void startApp(const char *_app, int argc, const char **args)
{
const char *function = 0;
- TQString app = TQString::tqfromLatin1(_app);
+ TQString app = TQString::fromLatin1(_app);
if (app.endsWith(".desktop"))
function = "start_service_by_desktop_path(TQString,TQStringList)";
else
diff --git a/dcop/dcopclient.cpp b/dcop/dcopclient.cpp
index ae1b85f9f..24e90c75b 100644
--- a/dcop/dcopclient.cpp
+++ b/dcop/dcopclient.cpp
@@ -764,7 +764,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
DCOPAuthCount,
const_cast<char **>(DCOPAuthNames),
DCOPClientAuthProcs, 0L)) < 0) {
- emit attachFailed(TQString::tqfromLatin1( "Communications could not be established." ));
+ emit attachFailed(TQString::fromLatin1( "Communications could not be established." ));
return false;
}
@@ -779,7 +779,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
TQCString fName = dcopServerFile();
TQFile f(TQFile::decodeName(fName));
if (!f.open(IO_ReadOnly)) {
- emit attachFailed(TQString::tqfromLatin1( "Could not read network connection list.\n" )+TQFile::decodeName(fName));
+ emit attachFailed(TQString::fromLatin1( "Could not read network connection list.\n" )+TQFile::decodeName(fName));
return false;
}
int size = TQMIN( (qint64)1024, f.size() ); // protection against a huge file
@@ -819,7 +819,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
delete [] d->serverAddr;
d->serverAddr = 0;
}
- emit attachFailed(TQString::tqfromLatin1( errBuf ));
+ emit attachFailed(TQString::fromLatin1( errBuf ));
return false;
}
fcntl(socket(), F_SETFL, FD_CLOEXEC);
@@ -845,7 +845,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
delete [] d->serverAddr;
d->serverAddr = 0;
}
- emit attachFailed(TQString::tqfromLatin1( errBuf ));
+ emit attachFailed(TQString::fromLatin1( errBuf ));
return false;
} else if (setupstat == IceProtocolAlreadyActive) {
if (bClearServerAddr) {
@@ -853,7 +853,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
d->serverAddr = 0;
}
/* should not happen because 3rd arg to IceOpenConnection was 0. */
- emit attachFailed(TQString::tqfromLatin1( "internal error in IceOpenConnection" ));
+ emit attachFailed(TQString::fromLatin1( "internal error in IceOpenConnection" ));
return false;
}
@@ -863,7 +863,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
delete [] d->serverAddr;
d->serverAddr = 0;
}
- emit attachFailed(TQString::tqfromLatin1( "DCOP server did not accept the connection." ));
+ emit attachFailed(TQString::fromLatin1( "DCOP server did not accept the connection." ));
return false;
}
@@ -1470,10 +1470,10 @@ static bool receiveQtObject( const TQCString &objId, const TQCString &fun, const
l << "QCStringList properties()";
l << "bool setProperty(TQCString,TQVariant)";
l << "TQVariant property(TQCString)";
- TQStrList lst = o->tqmetaObject()->slotNames( true );
+ TQStrList lst = o->metaObject()->slotNames( true );
int i = 0;
for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) {
- if ( o->tqmetaObject()->slot( i++, true )->tqt_mo_access != TQMetaData::Public )
+ if ( o->metaObject()->slot( i++, true )->tqt_mo_access != TQMetaData::Public )
continue;
TQCString slot = it.current();
if ( slot.contains( "()" ) ) {
@@ -1487,10 +1487,10 @@ static bool receiveQtObject( const TQCString &objId, const TQCString &fun, const
replyType = "QCStringList";
TQDataStream reply( replyData, IO_WriteOnly );
QCStringList l;
- TQMetaObject *meta = o->tqmetaObject();
+ TQMetaObject *meta = o->metaObject();
while ( meta ) {
l.prepend( meta->className() );
- meta = meta->tqsuperClass();
+ meta = meta->superClass();
}
reply << l;
return true;
@@ -1498,9 +1498,9 @@ static bool receiveQtObject( const TQCString &objId, const TQCString &fun, const
replyType = "QCStringList";
TQDataStream reply( replyData, IO_WriteOnly );
QCStringList l;
- TQStrList lst = o->tqmetaObject()->propertyNames( true );
+ TQStrList lst = o->metaObject()->propertyNames( true );
for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) {
- TQMetaObject *mo = o->tqmetaObject();
+ TQMetaObject *mo = o->metaObject();
const TQMetaProperty* p = mo->property( mo->findProperty( it.current(), true ), true );
if ( !p )
continue;
@@ -1532,7 +1532,7 @@ static bool receiveQtObject( const TQCString &objId, const TQCString &fun, const
reply << (TQ_INT8) o->setProperty( name, value );
return true;
} else {
- int slot = o->tqmetaObject()->findSlot( fun, true );
+ int slot = o->metaObject()->findSlot( fun, true );
if ( slot != -1 ) {
replyType = "void";
TQUObject uo[ 1 ];
diff --git a/interfaces/khexedit/byteseditinterface.h b/interfaces/khexedit/byteseditinterface.h
index 4a78d59b8..b27a0bdb7 100644
--- a/interfaces/khexedit/byteseditinterface.h
+++ b/interfaces/khexedit/byteseditinterface.h
@@ -221,7 +221,7 @@ inline BytesEditInterface *bytesEditInterface( T *t )
inline TQWidget *createBytesEditWidget( TQWidget *Parent = 0, const char *Name = 0 )
{
return KParts::ComponentFactory::createInstanceFromQuery<TQWidget>
- ( TQString::tqfromLatin1("KHexEdit/KBytesEdit"), TQString::null, TQT_TQOBJECT(Parent), Name );
+ ( TQString::fromLatin1("KHexEdit/KBytesEdit"), TQString::null, TQT_TQOBJECT(Parent), Name );
}
}
diff --git a/interfaces/ktexteditor/editorchooser_ui.ui b/interfaces/ktexteditor/editorchooser_ui.ui
index 816a1d194..0c1eda1cb 100644
--- a/interfaces/ktexteditor/editorchooser_ui.ui
+++ b/interfaces/ktexteditor/editorchooser_ui.ui
@@ -31,7 +31,7 @@
<property name="name">
<cstring>TextLabel1</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>460</width>
<height>0</height>
diff --git a/interfaces/ktexteditor/templateinterface.cpp b/interfaces/ktexteditor/templateinterface.cpp
index c5ea93931..0cb52db75 100644
--- a/interfaces/ktexteditor/templateinterface.cpp
+++ b/interfaces/ktexteditor/templateinterface.cpp
@@ -74,7 +74,7 @@ bool TemplateInterface::expandMacros( TQMap<TQString, TQString> &map, TQWidget *
{
KABC::StdAddressBook *addrBook = 0;
KABC::Addressee userAddress;
- TQDateTime datetime = TQDateTime::tqcurrentDateTime();
+ TQDateTime datetime = TQDateTime::currentDateTime();
TQDate date = TQT_TQDATE_OBJECT(datetime.date());
TQTime time = TQT_TQTIME_OBJECT(datetime.time());
diff --git a/kab/kabapi.cc b/kab/kabapi.cc
index 6ec29028e..0cf97905c 100644
--- a/kab/kabapi.cc
+++ b/kab/kabapi.cc
@@ -74,7 +74,7 @@ int KabAPI::exec()
}
listbox->setMinimumSize(listbox->sizeHint());
adjustSize();
- resize(tqminimumSize());
+ resize(minimumSize());
return KDialogBase::exec();
} else {
kdDebug(KAB_KDEBUG_AREA) << "KabAPI::exec: error creating interface."
diff --git a/kabc/address.cpp b/kabc/address.cpp
index 714dd571e..0787bcc4e 100644
--- a/kabc/address.cpp
+++ b/kabc/address.cpp
@@ -521,7 +521,7 @@ TQString Address::countryToISO( const TQString &cname )
return it.data();
TQString mapfile = KGlobal::dirs()->findResource( "data",
- TQString::tqfromLatin1( "kabc/countrytransl.map" ) );
+ TQString::fromLatin1( "kabc/countrytransl.map" ) );
TQFile file( mapfile );
if ( file.open( IO_ReadOnly ) ) {
@@ -551,7 +551,7 @@ TQString Address::ISOtoCountry( const TQString &ISOname )
return TQString::null;
TQString mapfile = KGlobal::dirs()->findResource( "data",
- TQString::tqfromLatin1( "kabc/countrytransl.map" ) );
+ TQString::fromLatin1( "kabc/countrytransl.map" ) );
TQFile file( mapfile );
if ( file.open( IO_ReadOnly ) ) {
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index 29bbd0f1f..bf6d0d17a 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -527,7 +527,7 @@ void AddressBook::insertAddressee( const Addressee &a )
Addressee addr( a );
if ( !fAddr.isEmpty() ) {
if ( fAddr != a )
- addr.setRevision( TQDateTime::tqcurrentDateTime() );
+ addr.setRevision( TQDateTime::currentDateTime() );
else {
if ( fAddr.resource() == 0 ) {
fAddr.setResource( resource );
diff --git a/kabc/ldapclient.cpp b/kabc/ldapclient.cpp
index 6ce467a46..724f039ec 100644
--- a/kabc/ldapclient.cpp
+++ b/kabc/ldapclient.cpp
@@ -50,7 +50,7 @@ public:
TQString LdapObject::toString() const
{
- TQString result = TQString::tqfromLatin1( "\ndn: %1\n" ).arg( dn );
+ TQString result = TQString::fromLatin1( "\ndn: %1\n" ).arg( dn );
for ( LdapAttrMap::ConstIterator it = attrs.begin(); it != attrs.end(); ++it ) {
TQString attr = it.key();
for ( LdapAttrValue::ConstIterator it2 = (*it).begin(); it2 != (*it).end(); ++it2 ) {
diff --git a/kabc/ldifconverter.cpp b/kabc/ldifconverter.cpp
index d4c7b22df..4bf989395 100644
--- a/kabc/ldifconverter.cpp
+++ b/kabc/ldifconverter.cpp
@@ -183,7 +183,7 @@ bool LDIFConverter::LDIFToAddressee( const TQString &str, AddresseeList &addrLis
data.setRawData( latinstr, latinstrlen );
ldif.setLDIF( data );
if (!dt.isValid())
- dt = TQDateTime::tqcurrentDateTime();
+ dt = TQDateTime::currentDateTime();
a.setRevision(dt);
homeAddr = Address( Address::Home );
workAddr = Address( Address::Work );
@@ -235,7 +235,7 @@ bool LDIFConverter::evaluatePair( Addressee &a, Address &homeAddr,
Address &workAddr,
TQString &fieldname, TQString &value )
{
- if ( fieldname == TQString::tqfromLatin1( "dn" ) ) // ignore & return false!
+ if ( fieldname == TQString::fromLatin1( "dn" ) ) // ignore & return false!
return false;
if ( fieldname.startsWith("#") ) {
@@ -249,56 +249,56 @@ bool LDIFConverter::evaluatePair( Addressee &a, Address &homeAddr,
return true;
}
- if ( fieldname == TQString::tqfromLatin1( "givenname" ) ) {
+ if ( fieldname == TQString::fromLatin1( "givenname" ) ) {
a.setGivenName( value );
return true;
}
- if ( fieldname == TQString::tqfromLatin1( "xmozillanickname") ||
- fieldname == TQString::tqfromLatin1( "nickname") ) {
+ if ( fieldname == TQString::fromLatin1( "xmozillanickname") ||
+ fieldname == TQString::fromLatin1( "nickname") ) {
a.setNickName( value );
return true;
}
- if ( fieldname == TQString::tqfromLatin1( "sn" ) ) {
+ if ( fieldname == TQString::fromLatin1( "sn" ) ) {
a.setFamilyName( value );
return true;
}
- if ( fieldname == TQString::tqfromLatin1( "uid" ) ) {
+ if ( fieldname == TQString::fromLatin1( "uid" ) ) {
a.setUid( value );
return true;
}
- if ( fieldname == TQString::tqfromLatin1( "mail" ) ||
- fieldname == TQString::tqfromLatin1( "mozillasecondemail" ) ) { // mozilla
+ if ( fieldname == TQString::fromLatin1( "mail" ) ||
+ fieldname == TQString::fromLatin1( "mozillasecondemail" ) ) { // mozilla
if ( a.emails().findIndex( value ) == -1 )
a.insertEmail( value );
return true;
}
- if ( fieldname == TQString::tqfromLatin1( "title" ) ) {
+ if ( fieldname == TQString::fromLatin1( "title" ) ) {
a.setTitle( value );
return true;
}
- if ( fieldname == TQString::tqfromLatin1( "vocation" ) ) {
+ if ( fieldname == TQString::fromLatin1( "vocation" ) ) {
a.setPrefix( value );
return true;
}
- if ( fieldname == TQString::tqfromLatin1( "cn" ) ) {
+ if ( fieldname == TQString::fromLatin1( "cn" ) ) {
a.setFormattedName( value );
return true;
}
- if ( fieldname == TQString::tqfromLatin1( "o" ) ||
- fieldname == TQString::tqfromLatin1( "organization" ) || // Exchange
- fieldname == TQString::tqfromLatin1( "organizationname" ) ) { // Exchange
+ if ( fieldname == TQString::fromLatin1( "o" ) ||
+ fieldname == TQString::fromLatin1( "organization" ) || // Exchange
+ fieldname == TQString::fromLatin1( "organizationname" ) ) { // Exchange
a.setOrganization( value );
return true;
}
- if ( fieldname == TQString::tqfromLatin1( "description" ) ) {
+ if ( fieldname == TQString::fromLatin1( "description" ) ) {
addComment:
if ( !a.note().isEmpty() )
a.setNote( a.note() + "\n" );
@@ -306,15 +306,15 @@ addComment:
return true;
}
- if ( fieldname == TQString::tqfromLatin1( "custom1" ) ||
- fieldname == TQString::tqfromLatin1( "custom2" ) ||
- fieldname == TQString::tqfromLatin1( "custom3" ) ||
- fieldname == TQString::tqfromLatin1( "custom4" ) ) {
+ if ( fieldname == TQString::fromLatin1( "custom1" ) ||
+ fieldname == TQString::fromLatin1( "custom2" ) ||
+ fieldname == TQString::fromLatin1( "custom3" ) ||
+ fieldname == TQString::fromLatin1( "custom4" ) ) {
goto addComment;
}
- if ( fieldname == TQString::tqfromLatin1( "homeurl" ) ||
- fieldname == TQString::tqfromLatin1( "workurl" ) ) {
+ if ( fieldname == TQString::fromLatin1( "homeurl" ) ||
+ fieldname == TQString::fromLatin1( "workurl" ) ) {
if (a.url().isEmpty()) {
a.setUrl( KURL( value ) );
return true;
@@ -325,139 +325,139 @@ addComment:
// TODO: change this with KDE 4
}
- if ( fieldname == TQString::tqfromLatin1( "homephone" ) ) {
+ if ( fieldname == TQString::fromLatin1( "homephone" ) ) {
a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Home ) );
return true;
}
- if ( fieldname == TQString::tqfromLatin1( "telephonenumber" ) ) {
+ if ( fieldname == TQString::fromLatin1( "telephonenumber" ) ) {
a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Work ) );
return true;
}
- if ( fieldname == TQString::tqfromLatin1( "mobile" ) ) { // mozilla/Netscape 7
+ if ( fieldname == TQString::fromLatin1( "mobile" ) ) { // mozilla/Netscape 7
a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Cell ) );
return true;
}
- if ( fieldname == TQString::tqfromLatin1( "cellphone" ) ) {
+ if ( fieldname == TQString::fromLatin1( "cellphone" ) ) {
a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Cell ) );
return true;
}
- if ( fieldname == TQString::tqfromLatin1( "pager" ) || // mozilla
- fieldname == TQString::tqfromLatin1( "pagerphone" ) ) { // mozilla
+ if ( fieldname == TQString::fromLatin1( "pager" ) || // mozilla
+ fieldname == TQString::fromLatin1( "pagerphone" ) ) { // mozilla
a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Pager ) );
return true;
}
- if ( fieldname == TQString::tqfromLatin1( "facsimiletelephonenumber" ) ) {
+ if ( fieldname == TQString::fromLatin1( "facsimiletelephonenumber" ) ) {
a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Fax ) );
return true;
}
- if ( fieldname == TQString::tqfromLatin1( "xmozillaanyphone" ) ) { // mozilla
+ if ( fieldname == TQString::fromLatin1( "xmozillaanyphone" ) ) { // mozilla
a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Work ) );
return true;
}
- if ( fieldname == TQString::tqfromLatin1( "street" ) ||
- fieldname == TQString::tqfromLatin1( "streethomeaddress" ) ) {
+ if ( fieldname == TQString::fromLatin1( "street" ) ||
+ fieldname == TQString::fromLatin1( "streethomeaddress" ) ) {
homeAddr.setStreet( value );
return true;
}
- if ( fieldname == TQString::tqfromLatin1( "postaladdress" ) ) { // mozilla
+ if ( fieldname == TQString::fromLatin1( "postaladdress" ) ) { // mozilla
workAddr.setStreet( value );
return true;
}
- if ( fieldname == TQString::tqfromLatin1( "mozillapostaladdress2" ) ) { // mozilla
- workAddr.setStreet( workAddr.street() + TQString::tqfromLatin1( "\n" ) + value );
+ if ( fieldname == TQString::fromLatin1( "mozillapostaladdress2" ) ) { // mozilla
+ workAddr.setStreet( workAddr.street() + TQString::fromLatin1( "\n" ) + value );
return true;
}
- if ( fieldname == TQString::tqfromLatin1( "postalcode" ) ) {
+ if ( fieldname == TQString::fromLatin1( "postalcode" ) ) {
workAddr.setPostalCode( value );
return true;
}
- if ( fieldname == TQString::tqfromLatin1( "postofficebox" ) ) {
+ if ( fieldname == TQString::fromLatin1( "postofficebox" ) ) {
workAddr.setPostOfficeBox( value );
return true;
}
- if ( fieldname == TQString::tqfromLatin1( "homepostaladdress" ) ) { // Netscape 7
+ if ( fieldname == TQString::fromLatin1( "homepostaladdress" ) ) { // Netscape 7
homeAddr.setStreet( value );
return true;
}
- if ( fieldname == TQString::tqfromLatin1( "mozillahomepostaladdress2" ) ) { // mozilla
- homeAddr.setStreet( homeAddr.street() + TQString::tqfromLatin1( "\n" ) + value );
+ if ( fieldname == TQString::fromLatin1( "mozillahomepostaladdress2" ) ) { // mozilla
+ homeAddr.setStreet( homeAddr.street() + TQString::fromLatin1( "\n" ) + value );
return true;
}
- if ( fieldname == TQString::tqfromLatin1( "mozillahomelocalityname" ) ) { // mozilla
+ if ( fieldname == TQString::fromLatin1( "mozillahomelocalityname" ) ) { // mozilla
homeAddr.setLocality( value );
return true;
}
- if ( fieldname == TQString::tqfromLatin1( "mozillahomestate" ) ) { // mozilla
+ if ( fieldname == TQString::fromLatin1( "mozillahomestate" ) ) { // mozilla
homeAddr.setRegion( value );
return true;
}
- if ( fieldname == TQString::tqfromLatin1( "mozillahomepostalcode" ) ) { // mozilla
+ if ( fieldname == TQString::fromLatin1( "mozillahomepostalcode" ) ) { // mozilla
homeAddr.setPostalCode( value );
return true;
}
- if ( fieldname == TQString::tqfromLatin1( "mozillahomecountryname" ) ) { // mozilla
+ if ( fieldname == TQString::fromLatin1( "mozillahomecountryname" ) ) { // mozilla
if ( value.length() <= 2 )
value = Address::ISOtoCountry(value);
homeAddr.setCountry( value );
return true;
}
- if ( fieldname == TQString::tqfromLatin1( "locality" ) ) {
+ if ( fieldname == TQString::fromLatin1( "locality" ) ) {
workAddr.setLocality( value );
return true;
}
- if ( fieldname == TQString::tqfromLatin1( "streetaddress" ) ) { // Netscape 4.x
+ if ( fieldname == TQString::fromLatin1( "streetaddress" ) ) { // Netscape 4.x
workAddr.setStreet( value );
return true;
}
- if ( fieldname == TQString::tqfromLatin1( "countryname" ) ||
- fieldname == TQString::tqfromLatin1( "c" ) ) { // mozilla
+ if ( fieldname == TQString::fromLatin1( "countryname" ) ||
+ fieldname == TQString::fromLatin1( "c" ) ) { // mozilla
if ( value.length() <= 2 )
value = Address::ISOtoCountry(value);
workAddr.setCountry( value );
return true;
}
- if ( fieldname == TQString::tqfromLatin1( "l" ) ) { // mozilla
+ if ( fieldname == TQString::fromLatin1( "l" ) ) { // mozilla
workAddr.setLocality( value );
return true;
}
- if ( fieldname == TQString::tqfromLatin1( "st" ) ) {
+ if ( fieldname == TQString::fromLatin1( "st" ) ) {
workAddr.setRegion( value );
return true;
}
- if ( fieldname == TQString::tqfromLatin1( "ou" ) ) {
+ if ( fieldname == TQString::fromLatin1( "ou" ) ) {
a.setRole( value );
return true;
}
- if ( fieldname == TQString::tqfromLatin1( "department" ) ) {
+ if ( fieldname == TQString::fromLatin1( "department" ) ) {
a.setDepartment( value );
return true;
}
- if ( fieldname == TQString::tqfromLatin1( "member" ) ) {
+ if ( fieldname == TQString::fromLatin1( "member" ) ) {
// this is a mozilla list member (cn=xxx, mail=yyy)
TQStringList list( TQStringList::split( ',', value ) );
TQString name, email;
@@ -476,8 +476,8 @@ addComment:
return true;
}
- if ( fieldname == TQString::tqfromLatin1( "modifytimestamp" ) ) {
- if (value == TQString::tqfromLatin1("0Z")) // ignore
+ if ( fieldname == TQString::fromLatin1( "modifytimestamp" ) ) {
+ if (value == TQString::fromLatin1("0Z")) // ignore
return true;
TQDateTime dt = VCardStringToDate( value );
if ( dt.isValid() ) {
@@ -486,7 +486,7 @@ addComment:
}
}
- if ( fieldname == TQString::tqfromLatin1( "objectclass" ) ) // ignore
+ if ( fieldname == TQString::fromLatin1( "objectclass" ) ) // ignore
return true;
kdWarning() << TQString(TQString("LDIFConverter: Unknown field for '%1': '%2=%3'\n")
diff --git a/kabc/ldifconverter.h b/kabc/ldifconverter.h
index a2225ad2d..a8052a65f 100644
--- a/kabc/ldifconverter.h
+++ b/kabc/ldifconverter.h
@@ -44,7 +44,7 @@ namespace KABC {
* @param dt The date & time value of the last modification (e.g. file modification time).
* @since 3.2
*/
- KABC_EXPORT bool LDIFToAddressee( const TQString &str, AddresseeList &addrList, TQDateTime dt = TQDateTime::tqcurrentDateTime() );
+ KABC_EXPORT bool LDIFToAddressee( const TQString &str, AddresseeList &addrList, TQDateTime dt = TQDateTime::currentDateTime() );
/**
* Converts a list of addressees to a LDIF string.
diff --git a/kabc/vcardparser/testwrite.cpp b/kabc/vcardparser/testwrite.cpp
index f24f1ad25..f6e894f4b 100644
--- a/kabc/vcardparser/testwrite.cpp
+++ b/kabc/vcardparser/testwrite.cpp
@@ -60,7 +60,7 @@ int main( int argc, char **argv )
addressee.setOrganization( "KDE" );
addressee.setNote( "nerver\ntouch a running system" );
addressee.setProductId( "testId" );
- addressee.setRevision( TQDateTime::tqcurrentDateTime() );
+ addressee.setRevision( TQDateTime::currentDateTime() );
addressee.setSortString( "koenig" );
addressee.setUrl( KURL( "http://wgess16.dyndns.org") );
addressee.setSecrecy( KABC::Secrecy( KABC::Secrecy::Confidential ) );
diff --git a/kate/part/kateautoindent.cpp b/kate/part/kateautoindent.cpp
index 0aabde874..4d36f5918 100644
--- a/kate/part/kateautoindent.cpp
+++ b/kate/part/kateautoindent.cpp
@@ -748,7 +748,7 @@ void KateCSmartIndent::processChar(TQChar c)
if (c == 'n')
{
- if (firstChar != '#' || textLine->string(curCol-5, 5) != TQString::tqfromLatin1("regio"))
+ if (firstChar != '#' || textLine->string(curCol-5, 5) != TQString::fromLatin1("regio"))
return;
}
@@ -1917,8 +1917,8 @@ TQString KateCSAndSIndent::calcIndent (const KateDocCursor &begin)
// if the line starts with # (but isn't a c# region thingy), no indentation at all.
if( currLineFirst >= 0 && currLine->getChar(currLineFirst) == '#' )
{
- if( !currLine->stringAtPos( currLineFirst+1, TQString::tqfromLatin1("region") ) &&
- !currLine->stringAtPos( currLineFirst+1, TQString::tqfromLatin1("endregion") ) )
+ if( !currLine->stringAtPos( currLineFirst+1, TQString::fromLatin1("region") ) &&
+ !currLine->stringAtPos( currLineFirst+1, TQString::fromLatin1("endregion") ) )
return TQString::null;
}
@@ -1974,10 +1974,10 @@ TQString KateCSAndSIndent::calcIndent (const KateDocCursor &begin)
{
#define ARRLEN( array ) ( sizeof(array)/sizeof(array[0]) )
for( uint n = 0; n < ARRLEN(scopeKeywords); ++n )
- if( textLine->stringAtPos(pos, TQString::tqfromLatin1(scopeKeywords[n]) ) )
+ if( textLine->stringAtPos(pos, TQString::fromLatin1(scopeKeywords[n]) ) )
return calcIndentAfterKeyword( begin, cur, pos, false );
for( uint n = 0; n < ARRLEN(blockScopeKeywords); ++n )
- if( textLine->stringAtPos(pos, TQString::tqfromLatin1(blockScopeKeywords[n]) ) )
+ if( textLine->stringAtPos(pos, TQString::fromLatin1(blockScopeKeywords[n]) ) )
return calcIndentAfterKeyword( begin, cur, pos, true );
#undef ARRLEN
}
@@ -2070,7 +2070,7 @@ TQString KateCSAndSIndent::calcIndentInBrace(const KateDocCursor &indentCursor,
// beginning 'namespace'. that's 99% of usage, I'd guess.
{
if( braceFirst >= 0 && braceLine->attribute(braceFirst) == keywordAttrib &&
- braceLine->stringAtPos( braceFirst, TQString::tqfromLatin1( "namespace" ) ) )
+ braceLine->stringAtPos( braceFirst, TQString::fromLatin1( "namespace" ) ) )
return continuationIndent(indentCursor) + whitespaceToOpenBrace;
if( braceCursor.line() > 0 )
@@ -2078,7 +2078,7 @@ TQString KateCSAndSIndent::calcIndentInBrace(const KateDocCursor &indentCursor,
KateTextLine::Ptr prevLine = doc->plainKateTextLine(braceCursor.line() - 1);
int firstPrev = prevLine->firstChar();
if( firstPrev >= 0 && prevLine->attribute(firstPrev) == keywordAttrib &&
- prevLine->stringAtPos( firstPrev, TQString::tqfromLatin1( "namespace" ) ) )
+ prevLine->stringAtPos( firstPrev, TQString::fromLatin1( "namespace" ) ) )
return continuationIndent(indentCursor) + whitespaceToOpenBrace;
}
}
diff --git a/kate/part/katecmds.cpp b/kate/part/katecmds.cpp
index d4879cfda..b519994f7 100644
--- a/kate/part/katecmds.cpp
+++ b/kate/part/katecmds.cpp
@@ -408,7 +408,7 @@ int KateCommands::SedReplace::sedMagic( KateDocument *doc, int &line,
TQString rep=repOld;
// now set the backreferences in the replacement
- TQStringList backrefs=matcher.tqcapturedTexts();
+ TQStringList backrefs=matcher.capturedTexts();
int refnum=1;
TQStringList::Iterator i = backrefs.begin();
@@ -593,10 +593,10 @@ bool KateCommands::Date::exec (Kate::View *view, const TQString &cmd, TQString &
if (cmd.left(4) != "date")
return false;
- if (TQDateTime::tqcurrentDateTime().toString(cmd.mid(5, cmd.length()-5)).length() > 0)
- view->insertText(TQDateTime::tqcurrentDateTime().toString(cmd.mid(5, cmd.length()-5)));
+ if (TQDateTime::currentDateTime().toString(cmd.mid(5, cmd.length()-5)).length() > 0)
+ view->insertText(TQDateTime::currentDateTime().toString(cmd.mid(5, cmd.length()-5)));
else
- view->insertText(TQDateTime::tqcurrentDateTime().toString("yyyy-MM-dd hh:mm:ss"));
+ view->insertText(TQDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss"));
return true;
}
diff --git a/kate/part/katecodecompletion.cpp b/kate/part/katecodecompletion.cpp
index 1bff647f6..892a1d429 100644
--- a/kate/part/katecodecompletion.cpp
+++ b/kate/part/katecodecompletion.cpp
@@ -384,7 +384,7 @@ void KateCodeCompletion::showComment()
m_completionListBox->ensureCurrentVisible();
finalPoint.setY(
- m_completionListBox->viewport()->mapToGlobal(m_completionListBox->tqitemRect(
+ m_completionListBox->viewport()->mapToGlobal(m_completionListBox->itemRect(
m_completionListBox->item(m_completionListBox->currentItem())).topLeft()).y());
m_commentLabel->move(finalPoint);
diff --git a/kate/part/kateconfig.cpp b/kate/part/kateconfig.cpp
index 5bfe55fbc..9921fe605 100644
--- a/kate/part/kateconfig.cpp
+++ b/kate/part/kateconfig.cpp
@@ -422,7 +422,7 @@ TQTextCodec *KateDocumentConfig::codec ()
if (m_encodingSet || isGlobal())
{
if (m_encoding.isEmpty() && isGlobal())
- return KGlobal::charsets()->codecForName (TQString::tqfromLatin1(KGlobal::locale()->encoding()));
+ return KGlobal::charsets()->codecForName (TQString::fromLatin1(KGlobal::locale()->encoding()));
else if (m_encoding.isEmpty())
return s_global->codec ();
else
diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp
index 938758852..b2ec1b411 100644
--- a/kate/part/katedocument.cpp
+++ b/kate/part/katedocument.cpp
@@ -2316,7 +2316,7 @@ bool KateDocument::openURL( const KURL &url )
w = m_views.first();
if (w)
- m_job->setWindow (w->tqtopLevelWidget());
+ m_job->setWindow (w->topLevelWidget());
emit started( m_job );
@@ -3195,7 +3195,7 @@ void KateDocument::backspace( KateView *view, const KateTextCursor& c )
if (!textLine)
return;
- if (config()->wordWrap() && textLine->endingWith(TQString::tqfromLatin1(" ")))
+ if (config()->wordWrap() && textLine->endingWith(TQString::fromLatin1(" ")))
{
// gg: in hard wordwrap mode, backspace must also eat the trailing space
removeText (line-1, textLine->length()-1, line, 0);
diff --git a/kate/part/katehighlight.cpp b/kate/part/katehighlight.cpp
index 7f5bcc882..1b7a4d7c3 100644
--- a/kate/part/katehighlight.cpp
+++ b/kate/part/katehighlight.cpp
@@ -958,7 +958,7 @@ int KateHlRegExpr::checkHgl(const TQString& text, int offset, int /*len*/)
TQStringList *KateHlRegExpr::capturedTexts()
{
- return new TQStringList(Expr->tqcapturedTexts());
+ return new TQStringList(Expr->capturedTexts());
}
KateHlItem *KateHlRegExpr::clone(const TQStringList *args)
diff --git a/kate/part/katejscript.cpp b/kate/part/katejscript.cpp
index 615adab01..8a7731f76 100644
--- a/kate/part/katejscript.cpp
+++ b/kate/part/katejscript.cpp
@@ -1135,7 +1135,7 @@ void KateIndentJScriptManager::parseScriptHeader(const TQString &filePath,
if (currentState==NOTHING)
{
if (keyValue.exactMatch(line)) {
- TQStringList sl=keyValue.tqcapturedTexts();
+ TQStringList sl=keyValue.capturedTexts();
kdDebug(13050)<<"key:"<<sl[1]<<endl<<"value:"<<sl[2]<<endl;
kdDebug(13050)<<"key-length:"<<sl[1].length()<<endl<<"value-length:"<<sl[2].length()<<endl;
TQString key=sl[1];
diff --git a/kate/part/kateprinter.cpp b/kate/part/kateprinter.cpp
index 925c99e1a..d1c44fdca 100644
--- a/kate/part/kateprinter.cpp
+++ b/kate/part/kateprinter.cpp
@@ -184,7 +184,7 @@ bool KatePrinter::print (KateDocument *doc)
// This retrieves all tags, ued or not, but
// none of theese operations should be expensive,
// and searcing each tag in the format strings is avoided.
- TQDateTime dt = TQDateTime::tqcurrentDateTime();
+ TQDateTime dt = TQDateTime::currentDateTime();
TQMap<TQString,TQString> tags;
KUser u (KUser::UseRealUserID);
diff --git a/kate/part/katerenderer.cpp b/kate/part/katerenderer.cpp
index 143d24f6d..cbed7de67 100644
--- a/kate/part/katerenderer.cpp
+++ b/kate/part/katerenderer.cpp
@@ -537,13 +537,13 @@ void KateRenderer::paintTextLine(TQPainter& paint, const KateLineRange* range, i
if (isIMSel && !isTab)
{
// input method selection
- fillColor = m_view->tqcolorGroup().color(TQColorGroup::Foreground);
+ fillColor = m_view->colorGroup().color(TQColorGroup::Foreground);
}
else if (isIMEdit && !isTab)
{
// XIM support
// input method edit area
- const TQColorGroup& cg = m_view->tqcolorGroup();
+ const TQColorGroup& cg = m_view->colorGroup();
int h1, s1, v1, h2, s2, v2;
TQColor(cg.color( TQColorGroup::Base )).hsv( &h1, &s1, &v1 );
TQColor(cg.color( TQColorGroup::Background )).hsv( &h2, &s2, &v2 );
@@ -576,7 +576,7 @@ void KateRenderer::paintTextLine(TQPainter& paint, const KateLineRange* range, i
if (isIMSel && paintBackground && !isTab)
{
paint.save();
- paint.setPen( m_view->tqcolorGroup().color( TQColorGroup::BrightText ) );
+ paint.setPen( m_view->colorGroup().color( TQColorGroup::BrightText ) );
}
// Draw indentation markers.
diff --git a/kate/part/kateschema.cpp b/kate/part/kateschema.cpp
index 704e2776c..1a83df6d2 100644
--- a/kate/part/kateschema.cpp
+++ b/kate/part/kateschema.cpp
@@ -1088,9 +1088,9 @@ void KateStyleListView::showPopupMenu( KateStyleListItem *i, const TQPoint &glob
TQPixmap scl(16,16);
scl.fill( i->style()->selectedTextColor() );
TQPixmap bgcl(16,16);
- bgcl.fill( i->style()->itemSet(KateAttribute::BGColor) ? i->style()->bgColor() : viewport()->tqcolorGroup().base() );
+ bgcl.fill( i->style()->itemSet(KateAttribute::BGColor) ? i->style()->bgColor() : viewport()->colorGroup().base() );
TQPixmap sbgcl(16,16);
- sbgcl.fill( i->style()->itemSet(KateAttribute::SelectedBGColor) ? i->style()->selectedBGColor() : viewport()->tqcolorGroup().base() );
+ sbgcl.fill( i->style()->itemSet(KateAttribute::SelectedBGColor) ? i->style()->selectedBGColor() : viewport()->colorGroup().base() );
if ( showtitle )
m.insertTitle( i->contextName(), KateStyleListItem::ContextName );
@@ -1156,7 +1156,7 @@ void KateStyleListView::slotMousePressed(int btn, TQListViewItem* i, const TQPoi
if ( dynamic_cast<KateStyleListItem*>(i) ) {
if ( btn == Qt::LeftButton && c > 0 ) {
// map pos to item/column and call KateStyleListItem::activate(col, pos)
- ((KateStyleListItem*)i)->activate( c, viewport()->mapFromGlobal( pos ) - TQPoint( 0, tqitemRect(i).top() ) );
+ ((KateStyleListItem*)i)->activate( c, viewport()->mapFromGlobal( pos ) - TQPoint( 0, itemRect(i).top() ) );
}
}
}
@@ -1465,7 +1465,7 @@ void KateStyleListItem::paintCell( TQPainter *p, const TQColorGroup& /*cg*/, int
Q_ASSERT( lv ); //###
// use a private color group and set the text/highlighted text colors
- TQColorGroup mcg = lv->viewport()->tqcolorGroup();
+ TQColorGroup mcg = lv->viewport()->colorGroup();
if ( col ) // col 0 is drawn by the superclass method
p->fillRect( 0, 0, width, height(), TQBrush( mcg.base() ) );
@@ -1602,7 +1602,7 @@ void KateStyleListCaption::paintCell( TQPainter *p, const TQColorGroup& /*cg*/,
Q_ASSERT( lv ); //###
// use the same colorgroup as the other items in the viewport
- TQColorGroup mcg = lv->viewport()->tqcolorGroup();
+ TQColorGroup mcg = lv->viewport()->colorGroup();
TQListViewItem::paintCell( p, mcg, col, width, align );
}
diff --git a/kate/part/kateview.cpp b/kate/part/kateview.cpp
index a0310ecb5..232c51b6e 100644
--- a/kate/part/kateview.cpp
+++ b/kate/part/kateview.cpp
@@ -793,7 +793,7 @@ void KateView::contextMenuEvent( TQContextMenuEvent *ev )
if ( !m_doc || !m_doc->browserExtension() )
return;
emit m_doc->browserExtension()->popupMenu( /*this, */ev->globalPos(), m_doc->url(),
- TQString::tqfromLatin1( "text/plain" ) );
+ TQString::fromLatin1( "text/plain" ) );
ev->accept();
}
diff --git a/kate/part/kateviewinternal.h b/kate/part/kateviewinternal.h
index 0d706ffc3..4dbc08bf8 100644
--- a/kate/part/kateviewinternal.h
+++ b/kate/part/kateviewinternal.h
@@ -222,7 +222,7 @@ class KateViewInternal : public TQWidget
int scrollX;
int scrollY;
- TQt::tqCursorShape m_mouseCursor;
+ TQt::CursorShape m_mouseCursor;
KateSuperCursor cursor;
KateTextCursor displayCursor;
diff --git a/kate/part/test_regression.cpp b/kate/part/test_regression.cpp
index 6d440922e..258c5a913 100644
--- a/kate/part/test_regression.cpp
+++ b/kate/part/test_regression.cpp
@@ -935,7 +935,7 @@ void RegressionTest::doFailureReport( const TQString& test, int failures )
if ( failures & ResultFailure ) {
domDiff += "<pre>";
- FILE *pipe = popen( TQString::tqfromLatin1( "diff -u baseline/%1-result %3/%2-result" )
+ FILE *pipe = popen( TQString::fromLatin1( "diff -u baseline/%1-result %3/%2-result" )
.arg ( test, test, relOutputDir ).latin1(), "r" );
TQTextIStream *is = new TQTextIStream( pipe );
for ( int line = 0; line < 100 && !is->eof(); ++line ) {
diff --git a/kcert/kcertpart.cc b/kcert/kcertpart.cc
index d0e091041..536bc9a83 100644
--- a/kcert/kcertpart.cc
+++ b/kcert/kcertpart.cc
@@ -636,7 +636,7 @@ void KCertPart::displayCACert(KSSLCertificate *c) {
// Set the valid period
TQPalette cspl = _ca_validFrom->palette();
- if (TQDateTime::tqcurrentDateTime() < c->getQDTNotBefore()) {
+ if (TQDateTime::currentDateTime() < c->getQDTNotBefore()) {
cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
} else {
cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@@ -645,7 +645,7 @@ void KCertPart::displayCACert(KSSLCertificate *c) {
_ca_validFrom->setText(c->getNotBefore());
cspl = _ca_validUntil->palette();
- if (TQDateTime::tqcurrentDateTime() > c->getQDTNotAfter()) {
+ if (TQDateTime::currentDateTime() > c->getQDTNotAfter()) {
cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
} else {
cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@@ -677,7 +677,7 @@ void KCertPart::displayPKCS12Cert(KSSLCertificate *c) {
// Set the valid period
TQPalette cspl = _p12_validFrom->palette();
- if (TQDateTime::tqcurrentDateTime() < c->getQDTNotBefore()) {
+ if (TQDateTime::currentDateTime() < c->getQDTNotBefore()) {
cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
} else {
cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@@ -686,7 +686,7 @@ void KCertPart::displayPKCS12Cert(KSSLCertificate *c) {
_p12_validFrom->setText(c->getNotBefore());
cspl = _p12_validUntil->palette();
- if (TQDateTime::tqcurrentDateTime() > c->getQDTNotAfter()) {
+ if (TQDateTime::currentDateTime() > c->getQDTNotAfter()) {
cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
} else {
cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
diff --git a/kconf_update/kconf_update.cpp b/kconf_update/kconf_update.cpp
index 4d3846f2c..a3a165ab8 100644
--- a/kconf_update/kconf_update.cpp
+++ b/kconf_update/kconf_update.cpp
@@ -201,7 +201,7 @@ KonfUpdate::log()
}
}
- (*m_textStream) << TQDateTime::tqcurrentDateTime().toString( Qt::ISODate ) << " ";
+ (*m_textStream) << TQDateTime::currentDateTime().toString( Qt::ISODate ) << " ";
return *m_textStream;
}
diff --git a/kded/kbuildsycoca.cpp b/kded/kbuildsycoca.cpp
index da5059a92..b09f40916 100644
--- a/kded/kbuildsycoca.cpp
+++ b/kded/kbuildsycoca.cpp
@@ -160,12 +160,12 @@ void KBuildSycoca::processGnomeVfs()
if (line[0] != '\t')
{
- app = TQString::tqfromLatin1(line);
+ app = TQString::fromLatin1(line);
app.truncate(app.length()-1);
}
else if (strncmp(line+1, "mime_types=", 11) == 0)
{
- TQString mimetypes = TQString::tqfromLatin1(line+12);
+ TQString mimetypes = TQString::fromLatin1(line+12);
mimetypes.truncate(mimetypes.length()-1);
mimetypes.replace(TQRegExp("\\*"), "all");
KService *s = g_bsf->findServiceByName(app);
diff --git a/kdewidgets/makekdewidgets.cpp b/kdewidgets/makekdewidgets.cpp
index c5141d3f6..94a5bdde6 100644
--- a/kdewidgets/makekdewidgets.cpp
+++ b/kdewidgets/makekdewidgets.cpp
@@ -47,7 +47,7 @@ static const char classDef[] = "#ifndef EMBED_IMAGES\n"
" TQPixmap pix(m_widgets[key].iconSet);\n"
"#else\n"
" TQPixmap pix(locate( \"data\", \n"
- " TQString::tqfromLatin1(\"%PluginNameLower/pics/\") + m_widgets[key].iconSet));\n"
+ " TQString::fromLatin1(\"%PluginNameLower/pics/\") + m_widgets[key].iconSet));\n"
"#endif\n"
" return TQIconSet(pix);\n"
" }\n"
@@ -81,17 +81,17 @@ static const char classDef[] = "#ifndef EMBED_IMAGES\n"
"%PluginName::%PluginName()\n"
"{\n"
" WidgetInfo widget;\n";
-static const char widgetDef[] = " widget.group = TQString::tqfromLatin1(\"%Group\");\n"
+static const char widgetDef[] = " widget.group = TQString::fromLatin1(\"%Group\");\n"
"#ifdef EMBED_IMAGES\n"
" widget.iconSet = TQPixmap(%Pixmap);\n"
"#else\n"
- " widget.iconSet = TQString::tqfromLatin1(\"%IconSet\");\n"
+ " widget.iconSet = TQString::fromLatin1(\"%IconSet\");\n"
"#endif\n"
- " widget.includeFile = TQString::tqfromLatin1(\"%IncludeFile\");\n"
- " widget.toolTip = TQString::tqfromLatin1(\"%ToolTip\");\n"
- " widget.whatsThis = TQString::tqfromLatin1(\"%WhatsThis\");\n"
+ " widget.includeFile = TQString::fromLatin1(\"%IncludeFile\");\n"
+ " widget.toolTip = TQString::fromLatin1(\"%ToolTip\");\n"
+ " widget.whatsThis = TQString::fromLatin1(\"%WhatsThis\");\n"
" widget.isContainer = %IsContainer;\n"
- " m_widgets.insert(TQString::tqfromLatin1(\"%Class\"), widget);\n";
+ " m_widgets.insert(TQString::fromLatin1(\"%Class\"), widget);\n";
static const char endCtor[] = " %Init\n"
"}\n"
"%PluginName::~%PluginName()\n"
@@ -100,7 +100,7 @@ static const char endCtor[] = " %Init\n"
"}\n"
"TQWidget *%PluginName::create(const TQString &key, TQWidget *parent, const char *name)\n"
"{\n";
-static const char widgetCreate[] = " if (key == TQString::tqfromLatin1(\"%Class\"))\n"
+static const char widgetCreate[] = " if (key == TQString::fromLatin1(\"%Class\"))\n"
" return new %ImplClass%ConstructorArgs;\n";
static const char endCreate[] = " return 0;\n"
"}\n"
diff --git a/khtml/css/cssstyleselector.cpp b/khtml/css/cssstyleselector.cpp
index 32391bb7f..03fbd1c02 100644
--- a/khtml/css/cssstyleselector.cpp
+++ b/khtml/css/cssstyleselector.cpp
@@ -327,7 +327,7 @@ void CSSStyleSelector::loadDefaultStyle(const KHTMLSettings *s, DocumentImpl *do
if ( readbytes >= 0 )
file[readbytes] = '\0';
- TQString style = TQString::tqfromLatin1( file.data() );
+ TQString style = TQString::fromLatin1( file.data() );
if(s)
style += s->settingsToCSS();
DOMString str(style);
@@ -352,7 +352,7 @@ void CSSStyleSelector::loadDefaultStyle(const KHTMLSettings *s, DocumentImpl *do
if ( readbytes >= 0 )
file[readbytes] = '\0';
- TQString style = TQString::tqfromLatin1( file.data() );
+ TQString style = TQString::fromLatin1( file.data() );
DOMString str(style);
s_quirksSheet = new DOM::CSSStyleSheetImpl(doc);
@@ -1196,14 +1196,14 @@ bool CSSStyleSelector::checkSimpleSelector(DOM::CSSSelector *sel, DOM::ElementIm
//kdDebug( 6080 ) << "checking for beginswith match" << endl;
TQConstString val_str(value->tqunicode(), value->length());
TQConstString sel_str(sel->value.tqunicode(), sel->value.length());
- return val_str.string().tqstartsWith(sel_str.string(), caseSensitive);
+ return val_str.string().startsWith(sel_str.string(), caseSensitive);
}
case CSSSelector::End:
{
//kdDebug( 6080 ) << "checking for endswith match" << endl;
TQConstString val_str(value->tqunicode(), value->length());
TQConstString sel_str(sel->value.tqunicode(), sel->value.length());
- return val_str.string().tqendsWith(sel_str.string(), caseSensitive);
+ return val_str.string().endsWith(sel_str.string(), caseSensitive);
}
case CSSSelector::Hyphen:
{
diff --git a/khtml/dom/dom_doc.cpp b/khtml/dom/dom_doc.cpp
index 088a7a94a..0ff123444 100644
--- a/khtml/dom/dom_doc.cpp
+++ b/khtml/dom/dom_doc.cpp
@@ -112,8 +112,8 @@ HTMLDocument DOMImplementation::createHTMLDocument( const DOMString& title )
r->open();
- r->write(TQString::tqfromLatin1("<HTML><HEAD><TITLE>") + title.string() +
- TQString::tqfromLatin1("</TITLE></HEAD>"));
+ r->write(TQString::fromLatin1("<HTML><HEAD><TITLE>") + title.string() +
+ TQString::fromLatin1("</TITLE></HEAD>"));
return r;
}
diff --git a/khtml/ecma/kjs_debugwin.cpp b/khtml/ecma/kjs_debugwin.cpp
index b3c2a41b1..87d1b8a6c 100644
--- a/khtml/ecma/kjs_debugwin.cpp
+++ b/khtml/ecma/kjs_debugwin.cpp
@@ -690,7 +690,7 @@ bool KJSDebugWin::eventFilter(TQObject *o, TQEvent *e)
void KJSDebugWin::disableOtherWindows()
{
- TQWidgetList *widgets = TQApplication::tqallWidgets();
+ TQWidgetList *widgets = TQApplication::allWidgets();
TQWidgetListIt it(*widgets);
for (; it.current(); ++it)
it.current()->installEventFilter(this);
@@ -698,7 +698,7 @@ void KJSDebugWin::disableOtherWindows()
void KJSDebugWin::enableOtherWindows()
{
- TQWidgetList *widgets = TQApplication::tqallWidgets();
+ TQWidgetList *widgets = TQApplication::allWidgets();
TQWidgetListIt it(*widgets);
for (; it.current(); ++it)
it.current()->removeEventFilter(this);
@@ -861,7 +861,7 @@ bool KJSDebugWin::exception(ExecState *exec, const Value &value, bool inTryCatch
if (dontShowAgain) {
KConfig *config = kapp->config();
- KConfigGroupSaver saver(config,TQString::tqfromLatin1("Java/JavaScript Settings"));
+ KConfigGroupSaver saver(config,TQString::fromLatin1("Java/JavaScript Settings"));
config->writeEntry("ReportJavaScriptErrors",TQVariant(false,0));
config->sync();
TQByteArray data;
diff --git a/khtml/ecma/kjs_navigator.cpp b/khtml/ecma/kjs_navigator.cpp
index 637b6a8e1..a14877be2 100644
--- a/khtml/ecma/kjs_navigator.cpp
+++ b/khtml/ecma/kjs_navigator.cpp
@@ -188,14 +188,14 @@ Value Navigator::getValueProperty(ExecState *exec, int token) const
return String("Mozilla");
case AppName:
// If we find "Mozilla" but not "(compatible, ...)" we are a real Netscape
- if (userAgent.find(TQString::tqfromLatin1("Mozilla")) >= 0 &&
- userAgent.find(TQString::tqfromLatin1("compatible")) == -1)
+ if (userAgent.find(TQString::fromLatin1("Mozilla")) >= 0 &&
+ userAgent.find(TQString::fromLatin1("compatible")) == -1)
{
//kdDebug() << "appName -> Mozilla" << endl;
return String("Netscape");
}
- if (userAgent.find(TQString::tqfromLatin1("Microsoft")) >= 0 ||
- userAgent.find(TQString::tqfromLatin1("MSIE")) >= 0)
+ if (userAgent.find(TQString::fromLatin1("Microsoft")) >= 0 ||
+ userAgent.find(TQString::fromLatin1("MSIE")) >= 0)
{
//kdDebug() << "appName -> IE" << endl;
return String("Microsoft Internet Explorer");
@@ -207,14 +207,14 @@ Value Navigator::getValueProperty(ExecState *exec, int token) const
return String(userAgent.mid(userAgent.find('/') + 1));
case Product:
// We are pretending to be Mozilla or Safari
- if (userAgent.find(TQString::tqfromLatin1("Mozilla")) >= 0 &&
- userAgent.find(TQString::tqfromLatin1("compatible")) == -1)
+ if (userAgent.find(TQString::fromLatin1("Mozilla")) >= 0 &&
+ userAgent.find(TQString::fromLatin1("compatible")) == -1)
{
return String("Gecko");
}
// When spoofing as IE, we use Undefined().
- if (userAgent.find(TQString::tqfromLatin1("Microsoft")) >= 0 ||
- userAgent.find(TQString::tqfromLatin1("MSIE")) >= 0)
+ if (userAgent.find(TQString::fromLatin1("Microsoft")) >= 0 ||
+ userAgent.find(TQString::fromLatin1("MSIE")) >= 0)
{
return Undefined();
}
@@ -245,19 +245,19 @@ Value Navigator::getValueProperty(ExecState *exec, int token) const
return String(userAgent);
case Platform:
// yet another evil hack, but necessary to spoof some sites...
- if ( (userAgent.find(TQString::tqfromLatin1("Win"),0,false)>=0) )
- return String(TQString::tqfromLatin1("Win32"));
- else if ( (userAgent.find(TQString::tqfromLatin1("Macintosh"),0,false)>=0) ||
- (userAgent.find(TQString::tqfromLatin1("Mac_PowerPC"),0,false)>=0) )
- return String(TQString::tqfromLatin1("MacPPC"));
+ if ( (userAgent.find(TQString::fromLatin1("Win"),0,false)>=0) )
+ return String(TQString::fromLatin1("Win32"));
+ else if ( (userAgent.find(TQString::fromLatin1("Macintosh"),0,false)>=0) ||
+ (userAgent.find(TQString::fromLatin1("Mac_PowerPC"),0,false)>=0) )
+ return String(TQString::fromLatin1("MacPPC"));
else
{
struct utsname name;
int ret = uname(&name);
if ( ret >= 0 )
- return String(TQString(TQString::tqfromLatin1("%1 %1 X11").arg(name.sysname).arg(name.machine)));
+ return String(TQString(TQString::fromLatin1("%1 %1 X11").arg(name.sysname).arg(name.machine)));
else // can't happen
- return String(TQString(TQString::tqfromLatin1("Unix X11")));
+ return String(TQString(TQString::fromLatin1("Unix X11")));
}
case CpuClass:
{
diff --git a/khtml/ecma/kjs_proxy.cpp b/khtml/ecma/kjs_proxy.cpp
index 2469ac681..ca26c5a0b 100644
--- a/khtml/ecma/kjs_proxy.cpp
+++ b/khtml/ecma/kjs_proxy.cpp
@@ -343,8 +343,8 @@ void KJSProxyImpl::applyUserAgent()
assert( m_script );
TQString host = m_frame->m_part->url().isLocalFile() ? "localhost" : m_frame->m_part->url().host();
TQString userAgent = KProtocolManager::userAgentForHost(host);
- if (userAgent.find(TQString::tqfromLatin1("Microsoft")) >= 0 ||
- userAgent.find(TQString::tqfromLatin1("MSIE")) >= 0)
+ if (userAgent.find(TQString::fromLatin1("Microsoft")) >= 0 ||
+ userAgent.find(TQString::fromLatin1("MSIE")) >= 0)
{
m_script->setCompatMode(Interpreter::IECompat);
#ifdef KJS_VERBOSE
@@ -353,9 +353,9 @@ void KJSProxyImpl::applyUserAgent()
}
else
// If we find "Mozilla" but not "(compatible, ...)" we are a real Netscape
- if (userAgent.find(TQString::tqfromLatin1("Mozilla")) >= 0 &&
- userAgent.find(TQString::tqfromLatin1("compatible")) == -1 &&
- userAgent.find(TQString::tqfromLatin1("KHTML")) == -1)
+ if (userAgent.find(TQString::fromLatin1("Mozilla")) >= 0 &&
+ userAgent.find(TQString::fromLatin1("compatible")) == -1 &&
+ userAgent.find(TQString::fromLatin1("KHTML")) == -1)
{
m_script->setCompatMode(Interpreter::NetscapeCompat);
#ifdef KJS_VERBOSE
diff --git a/khtml/ecma/kjs_window.cpp b/khtml/ecma/kjs_window.cpp
index bed6b83c6..02af22f55 100644
--- a/khtml/ecma/kjs_window.cpp
+++ b/khtml/ecma/kjs_window.cpp
@@ -864,7 +864,7 @@ Value Window::get(ExecState *exec, const Identifier &p) const
#if defined Q_WS_X11 && ! defined K_WS_QTONLY
if (!part->widget())
return Number(0);
- KWin::WindowInfo inf = KWin::windowInfo(part->widget()->tqtopLevelWidget()->winId());
+ KWin::WindowInfo inf = KWin::windowInfo(part->widget()->topLevelWidget()->winId());
return Number(entry->value == OuterHeight ?
inf.geometry().height() : inf.geometry().width());
#else
@@ -1446,7 +1446,7 @@ void Window::goURL(ExecState* exec, const TQString& url, bool lockHistory)
// check if we're allowed to inject javascript
// SYNC check with khtml_part.cpp::slotRedirect!
if ( isSafeScript(exec) ||
- dstUrl.find(TQString::tqfromLatin1("javascript:"), 0, false) != 0 )
+ dstUrl.find(TQString::fromLatin1("javascript:"), 0, false) != 0 )
part->scheduleRedirection(-1,
dstUrl,
lockHistory);
@@ -1622,7 +1622,7 @@ Value Window::executeOpenWindow(ExecState *exec, const KURL& url, const TQString
if (pos >= 0) {
key = s.left(pos).stripWhiteSpace().lower();
val = s.mid(pos + 1).stripWhiteSpace().lower();
- TQRect screen = KGlobalSettings::desktopGeometry(widget->tqtopLevelWidget());
+ TQRect screen = KGlobalSettings::desktopGeometry(widget->topLevelWidget());
if (key == "left" || key == "screenx") {
winargs.x = (int)val.toFloat() + screen.x();
@@ -1633,13 +1633,13 @@ Value Window::executeOpenWindow(ExecState *exec, const KURL& url, const TQString
if (winargs.y < screen.y() || winargs.y > screen.bottom())
winargs.y = screen.y(); // only safe choice until size is determined
} else if (key == "height") {
- winargs.height = (int)val.toFloat() + 2*tqApp->tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) + 2;
+ winargs.height = (int)val.toFloat() + 2*tqApp->tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ) + 2;
if (winargs.height > screen.height()) // should actually check workspace
winargs.height = screen.height();
if (winargs.height < 100)
winargs.height = 100;
} else if (key == "width") {
- winargs.width = (int)val.toFloat() + 2*tqApp->tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) + 2;
+ winargs.width = (int)val.toFloat() + 2*tqApp->tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ) + 2;
if (winargs.width > screen.width()) // should actually check workspace
winargs.width = screen.width();
if (winargs.width < 100)
@@ -1897,8 +1897,8 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
KHTMLSettings::KJSWindowFocusPolicy policy =
part->settings()->windowFocusPolicy(part->url().host());
if(policy == KHTMLSettings::KJSWindowFocusAllow && widget) {
- widget->tqtopLevelWidget()->raise();
- KWin::deIconifyWindow( widget->tqtopLevelWidget()->winId() );
+ widget->topLevelWidget()->raise();
+ KWin::deIconifyWindow( widget->topLevelWidget()->winId() );
widget->setActiveWindow();
emit part->browserExtension()->requestFocus(part);
}
@@ -1950,7 +1950,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
{
KParts::BrowserExtension *ext = part->browserExtension();
if (ext) {
- TQWidget * tl = widget->tqtopLevelWidget();
+ TQWidget * tl = widget->topLevelWidget();
TQRect sg = KGlobalSettings::desktopGeometry(tl);
TQPoint dest = tl->pos() + TQPoint( args[0].toInt32(exec), args[1].toInt32(exec) );
@@ -1970,7 +1970,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
{
KParts::BrowserExtension *ext = part->browserExtension();
if (ext) {
- TQWidget * tl = widget->tqtopLevelWidget();
+ TQWidget * tl = widget->topLevelWidget();
TQRect sg = KGlobalSettings::desktopGeometry(tl);
TQPoint dest( args[0].toInt32(exec)+sg.x(), args[1].toInt32(exec)+sg.y() );
@@ -1989,7 +1989,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
if(policy == KHTMLSettings::KJSWindowResizeAllow
&& args.size() == 2 && widget)
{
- TQWidget * tl = widget->tqtopLevelWidget();
+ TQWidget * tl = widget->topLevelWidget();
TQRect geom = tl->frameGeometry();
window->resizeTo( tl,
geom.width() + args[0].toInt32(exec),
@@ -2003,7 +2003,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
if(policy == KHTMLSettings::KJSWindowResizeAllow
&& args.size() == 2 && widget)
{
- TQWidget * tl = widget->tqtopLevelWidget();
+ TQWidget * tl = widget->topLevelWidget();
window->resizeTo( tl, args[0].toInt32(exec), args[1].toInt32(exec) );
}
return Undefined();
@@ -2545,7 +2545,7 @@ Value Location::get(ExecState *exec, const Identifier &p) const
return String("");
return String( url.path().isEmpty() ? TQString("/") : url.path() );
case Port:
- return String( url.port() ? TQString::number((int)url.port()) : TQString::tqfromLatin1("") );
+ return String( url.port() ? TQString::number((int)url.port()) : TQString::fromLatin1("") );
case Protocol:
return String( url.protocol()+":" );
case Search:
diff --git a/khtml/ecma/xmlhttprequest.cpp b/khtml/ecma/xmlhttprequest.cpp
index 7b88477f0..08ba07519 100644
--- a/khtml/ecma/xmlhttprequest.cpp
+++ b/khtml/ecma/xmlhttprequest.cpp
@@ -487,7 +487,7 @@ void XMLHttpRequest::setRequestHeader(const TQString& _name, const TQString &val
// Reject all banned headers. See BANNED_HTTP_HEADERS above.
// kdDebug() << "Banned HTTP Headers: " << BANNED_HTTP_HEADERS << endl;
TQStringList bannedHeaders = TQStringList::split(',',
- TQString::tqfromLatin1(BANNED_HTTP_HEADERS));
+ TQString::fromLatin1(BANNED_HTTP_HEADERS));
if (bannedHeaders.contains(name))
return; // Denied
diff --git a/khtml/html/html_documentimpl.cpp b/khtml/html/html_documentimpl.cpp
index a5c78657c..bbfbc86f5 100644
--- a/khtml/html/html_documentimpl.cpp
+++ b/khtml/html/html_documentimpl.cpp
@@ -110,8 +110,8 @@ DOMString HTMLDocumentImpl::cookie() const
long windowId = 0;
KHTMLView *v = view ();
- if ( v && v->tqtopLevelWidget() )
- windowId = v->tqtopLevelWidget()->winId();
+ if ( v && v->topLevelWidget() )
+ windowId = v->topLevelWidget()->winId();
TQCString replyType;
TQByteArray params, reply;
@@ -142,8 +142,8 @@ void HTMLDocumentImpl::setCookie( const DOMString & value )
long windowId = 0;
KHTMLView *v = view ();
- if ( v && v->tqtopLevelWidget() )
- windowId = v->tqtopLevelWidget()->winId();
+ if ( v && v->topLevelWidget() )
+ windowId = v->topLevelWidget()->winId();
TQByteArray params;
TQDataStream stream(params, IO_WriteOnly);
diff --git a/khtml/html/html_formimpl.cpp b/khtml/html/html_formimpl.cpp
index 1512395e2..b77dff16c 100644
--- a/khtml/html/html_formimpl.cpp
+++ b/khtml/html/html_formimpl.cpp
@@ -1322,10 +1322,10 @@ TQString HTMLInputElementImpl::state( )
{
switch (m_type) {
case PASSWORD:
- return TQString::tqfromLatin1("."); // empty string, avoid restoring
+ return TQString::fromLatin1("."); // empty string, avoid restoring
case CHECKBOX:
case RADIO:
- return TQString::tqfromLatin1(checked() ? "on" : "off");
+ return TQString::fromLatin1(checked() ? "on" : "off");
case TEXT:
if (autoComplete() && value() != getAttribute(ATTR_VALUE) && getDocument()->view())
getDocument()->view()->addFormCompletionItem(name().string(), value().string());
@@ -1340,7 +1340,7 @@ void HTMLInputElementImpl::restoreState(const TQString &state)
switch (m_type) {
case CHECKBOX:
case RADIO:
- setChecked((state == TQString::tqfromLatin1("on")));
+ setChecked((state == TQString::fromLatin1("on")));
break;
case FILE:
m_value = DOMString(state.left(state.length()-1));
@@ -1566,12 +1566,12 @@ bool HTMLInputElementImpl::encoding(const TQTextCodec* codec, khtml::encodingLis
if(m_clicked)
{
m_clicked = false;
- TQString astr(nme.isEmpty() ? TQString::tqfromLatin1("x") : nme + ".x");
+ TQString astr(nme.isEmpty() ? TQString::fromLatin1("x") : nme + ".x");
encoding += fixUpfromUnicode(codec, astr);
astr.setNum(KMAX( clickX(), 0 ));
encoding += fixUpfromUnicode(codec, astr);
- astr = nme.isEmpty() ? TQString::tqfromLatin1("y") : nme + ".y";
+ astr = nme.isEmpty() ? TQString::fromLatin1("y") : nme + ".y";
encoding += fixUpfromUnicode(codec, astr);
astr.setNum(KMAX( clickY(), 0 ) );
encoding += fixUpfromUnicode(codec, astr);
@@ -1618,7 +1618,7 @@ bool HTMLInputElementImpl::encoding(const TQTextCodec* codec, khtml::encodingLis
KIO::UDSEntry filestat;
// can't submit file in www-url-form encoded
- TQWidget* const toplevel = static_cast<RenderSubmitButton*>(m_render)->widget()->tqtopLevelWidget();
+ TQWidget* const toplevel = static_cast<RenderSubmitButton*>(m_render)->widget()->topLevelWidget();
if (multipart) {
TQCString filearray( "" );
if ( KIO::NetAccess::stat(fileurl, filestat, toplevel)) {
diff --git a/khtml/html/htmltokenizer.cpp b/khtml/html/htmltokenizer.cpp
index 0b9b5f34d..778b9fe3a 100644
--- a/khtml/html/htmltokenizer.cpp
+++ b/khtml/html/htmltokenizer.cpp
@@ -919,7 +919,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src)
a = khtml::getAttrID(cBuffer, cBufferPos-1);
}
if (!a)
- attrName = TQString::tqfromLatin1(TQCString(cBuffer, cBufferPos+1).data());
+ attrName = TQString::fromLatin1(TQCString(cBuffer, cBufferPos+1).data());
}
dest = buffer;
@@ -941,7 +941,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src)
}
if ( cBufferPos == CBUFLEN ) {
cBuffer[cBufferPos] = '\0';
- attrName = TQString::tqfromLatin1(TQCString(cBuffer, cBufferPos+1).data());
+ attrName = TQString::fromLatin1(TQCString(cBuffer, cBufferPos+1).data());
dest = buffer;
*dest++ = 0;
tag = SearchEqual;
diff --git a/khtml/java/kjavaappletcontext.cpp b/khtml/java/kjavaappletcontext.cpp
index 776eb8a64..76914a5dc 100644
--- a/khtml/java/kjavaappletcontext.cpp
+++ b/khtml/java/kjavaappletcontext.cpp
@@ -138,7 +138,7 @@ void KJavaAppletContext::received( const TQString& cmd, const TQStringList& arg
kdDebug(6100) << "KJavaAppletContext::received, cmd = >>" << cmd << "<<" << endl;
kdDebug(6100) << "arg count = " << arg.count() << endl;
- if ( cmd == TQString::tqfromLatin1("showstatus")
+ if ( cmd == TQString::fromLatin1("showstatus")
&& !arg.empty() )
{
TQString tmp = arg.first();
@@ -146,19 +146,19 @@ void KJavaAppletContext::received( const TQString& cmd, const TQStringList& arg
kdDebug(6100) << "status message = " << tmp << endl;
emit showStatus( tmp );
}
- else if ( cmd == TQString::tqfromLatin1( "showurlinframe" )
+ else if ( cmd == TQString::fromLatin1( "showurlinframe" )
&& arg.count() > 1 )
{
kdDebug(6100) << "url = " << arg[0] << ", frame = " << arg[1] << endl;
emit showDocument( arg[0], arg[1] );
}
- else if ( cmd == TQString::tqfromLatin1( "showdocument" )
+ else if ( cmd == TQString::fromLatin1( "showdocument" )
&& !arg.empty() )
{
kdDebug(6100) << "url = " << arg.first() << endl;
emit showDocument( arg.first(), "_top" );
}
- else if ( cmd == TQString::tqfromLatin1( "resizeapplet" )
+ else if ( cmd == TQString::fromLatin1( "resizeapplet" )
&& arg.count() > 2 )
{
//arg[1] should be appletID
@@ -180,10 +180,10 @@ void KJavaAppletContext::received( const TQString& cmd, const TQStringList& arg
tmp->resizeAppletWidget( width, height );
}
}
- else if (cmd.startsWith(TQString::tqfromLatin1("audioclip_"))) {
+ else if (cmd.startsWith(TQString::fromLatin1("audioclip_"))) {
kdDebug(DEBUGAREA) << "process Audio command (not yet implemented): " << cmd << " " << arg[0] << endl;
}
- else if ( cmd == TQString::tqfromLatin1( "JS_Event" )
+ else if ( cmd == TQString::fromLatin1( "JS_Event" )
&& arg.count() > 2 )
{
bool ok;
@@ -198,7 +198,7 @@ void KJavaAppletContext::received( const TQString& cmd, const TQStringList& arg
else
kdError(DEBUGAREA) << "parse JS event " << arg[0] << " " << arg[1] << endl;
}
- else if ( cmd == TQString::tqfromLatin1( "AppletStateNotification" ) )
+ else if ( cmd == TQString::fromLatin1( "AppletStateNotification" ) )
{
bool ok;
const int appletID = arg.first().toInt(&ok);
@@ -222,7 +222,7 @@ void KJavaAppletContext::received( const TQString& cmd, const TQStringList& arg
} else
kdError(DEBUGAREA) << "AppletStateNotification: Applet ID is not numerical" << endl;
}
- else if ( cmd == TQString::tqfromLatin1( "AppletFailed" ) ) {
+ else if ( cmd == TQString::fromLatin1( "AppletFailed" ) ) {
bool ok;
const int appletID = arg.first().toInt(&ok);
if (ok)
diff --git a/khtml/java/kjavaappletserver.cpp b/khtml/java/kjavaappletserver.cpp
index 4eab56972..56e056a62 100644
--- a/khtml/java/kjavaappletserver.cpp
+++ b/khtml/java/kjavaappletserver.cpp
@@ -531,19 +531,19 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb )
switch( cmd_code )
{
case KJAS_SHOW_DOCUMENT:
- cmd = TQString::tqfromLatin1( "showdocument" );
+ cmd = TQString::fromLatin1( "showdocument" );
break;
case KJAS_SHOW_URLINFRAME:
- cmd = TQString::tqfromLatin1( "showurlinframe" );
+ cmd = TQString::fromLatin1( "showurlinframe" );
break;
case KJAS_SHOW_STATUS:
- cmd = TQString::tqfromLatin1( "showstatus" );
+ cmd = TQString::fromLatin1( "showstatus" );
break;
case KJAS_RESIZE_APPLET:
- cmd = TQString::tqfromLatin1( "resizeapplet" );
+ cmd = TQString::fromLatin1( "resizeapplet" );
break;
case KJAS_GET_URLDATA:
@@ -573,7 +573,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb )
kdError(6100) << "KIO Data command error " << ok << " args:" << args.size() << endl;
return;
case KJAS_JAVASCRIPT_EVENT:
- cmd = TQString::tqfromLatin1( "JS_Event" );
+ cmd = TQString::fromLatin1( "JS_Event" );
kdDebug(6100) << "Javascript request: "<< contextID
<< " code: " << args[0] << endl;
break;
@@ -593,24 +593,24 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb )
return;
}
case KJAS_AUDIOCLIP_PLAY:
- cmd = TQString::tqfromLatin1( "audioclip_play" );
+ cmd = TQString::fromLatin1( "audioclip_play" );
kdDebug(6100) << "Audio Play: url=" << args[0] << endl;
break;
case KJAS_AUDIOCLIP_LOOP:
- cmd = TQString::tqfromLatin1( "audioclip_loop" );
+ cmd = TQString::fromLatin1( "audioclip_loop" );
kdDebug(6100) << "Audio Loop: url=" << args[0] << endl;
break;
case KJAS_AUDIOCLIP_STOP:
- cmd = TQString::tqfromLatin1( "audioclip_stop" );
+ cmd = TQString::fromLatin1( "audioclip_stop" );
kdDebug(6100) << "Audio Stop: url=" << args[0] << endl;
break;
case KJAS_APPLET_STATE:
kdDebug(6100) << "Applet State Notification for Applet " << args[0] << ". New state=" << args[1] << endl;
- cmd = TQString::tqfromLatin1( "AppletStateNotification" );
+ cmd = TQString::fromLatin1( "AppletStateNotification" );
break;
case KJAS_APPLET_FAILED:
kdDebug(6100) << "Applet " << args[0] << " Failed: " << args[1] << endl;
- cmd = TQString::tqfromLatin1( "AppletFailed" );
+ cmd = TQString::fromLatin1( "AppletFailed" );
break;
case KJAS_SECURITY_CONFIRM: {
if (KSSL::doesSSLWork() && !d->kssl)
diff --git a/khtml/java/kjavaappletviewer.cpp b/khtml/java/kjavaappletviewer.cpp
index 9071fa5d5..e55a915f2 100644
--- a/khtml/java/kjavaappletviewer.cpp
+++ b/khtml/java/kjavaappletviewer.cpp
@@ -245,27 +245,27 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *,
baseurl = KURL (KURL (value), TQString (".")).url ();
} else if (name == "__KHTML__CODEBASE")
khtml_codebase = value;
- else if (name_lower == TQString::tqfromLatin1("codebase") ||
- name_lower == TQString::tqfromLatin1("java_codebase")) {
+ else if (name_lower == TQString::fromLatin1("codebase") ||
+ name_lower == TQString::fromLatin1("java_codebase")) {
if (!value.isEmpty ())
codebase = value;
} else if (name == "__KHTML__CLASSID")
- //else if (name.lower()==TQString::tqfromLatin1("classid"))
+ //else if (name.lower()==TQString::fromLatin1("classid"))
classid = value;
- else if (name_lower == TQString::tqfromLatin1("code") ||
- name_lower == TQString::tqfromLatin1("java_code"))
+ else if (name_lower == TQString::fromLatin1("code") ||
+ name_lower == TQString::fromLatin1("java_code"))
classname = value;
- else if (name_lower == TQString::tqfromLatin1("src"))
+ else if (name_lower == TQString::fromLatin1("src"))
src_param = value;
- else if (name_lower == TQString::tqfromLatin1("archive") ||
- name_lower == TQString::tqfromLatin1("java_archive") ||
+ else if (name_lower == TQString::fromLatin1("archive") ||
+ name_lower == TQString::fromLatin1("java_archive") ||
name_lower.startsWith ("cache_archive"))
applet->setArchives (value);
- else if (name_lower == TQString::tqfromLatin1("name"))
+ else if (name_lower == TQString::fromLatin1("name"))
applet->setAppletName (value);
- else if (name_lower == TQString::tqfromLatin1("width"))
+ else if (name_lower == TQString::fromLatin1("width"))
width = value.toInt();
- else if (name_lower == TQString::tqfromLatin1("height"))
+ else if (name_lower == TQString::fromLatin1("height"))
height = value.toInt();
if (!name.startsWith ("__KHTML__")) {
applet->setParameter (name, value);
@@ -327,7 +327,7 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *,
info.verifyPath = true;
TQDataStream stream(params, IO_WriteOnly);
- stream << info << m_view->tqtopLevelWidget()->winId();
+ stream << info << m_view->topLevelWidget()->winId();
if (!kapp->dcopClient ()->call( "kded", "kpasswdserver", "checkAuthInfo(KIO::AuthInfo, long int)", params, replyType, reply ) ) {
kdWarning() << "Can't communicate with kded_kpasswdserver!" << endl;
@@ -342,7 +342,7 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *,
/* install event filter for close events */
if (wparent)
- wparent->tqtopLevelWidget ()->installEventFilter (this);
+ wparent->topLevelWidget ()->installEventFilter (this);
setInstance (KJavaAppletViewerFactory::instance ());
KParts::Part::setWidget (m_view);
diff --git a/khtml/khtml_ext.cpp b/khtml/khtml_ext.cpp
index 5ff15fe53..6275deebb 100644
--- a/khtml/khtml_ext.cpp
+++ b/khtml/khtml_ext.cpp
@@ -315,7 +315,7 @@ void KHTMLPartBrowserExtension::callExtensionProxyMethod( const char *method )
if ( !m_extensionProxy )
return;
- int slot = m_extensionProxy->tqmetaObject()->findSlot( method );
+ int slot = m_extensionProxy->metaObject()->findSlot( method );
if ( slot == -1 )
return;
@@ -809,7 +809,7 @@ void KHTMLPopupGUIClient::saveURL( TQWidget *parent, const TQString &caption,
const TQString &filter, long cacheId,
const TQString & suggestedFilename )
{
- TQString name = TQString::tqfromLatin1( "index.html" );
+ TQString name = TQString::fromLatin1( "index.html" );
if ( !suggestedFilename.isEmpty() )
name = suggestedFilename;
else if ( !url.fileName().isEmpty() )
diff --git a/khtml/khtml_part.cpp b/khtml/khtml_part.cpp
index fefc59fa1..c41811f59 100644
--- a/khtml/khtml_part.cpp
+++ b/khtml/khtml_part.cpp
@@ -717,7 +717,7 @@ bool KHTMLPart::openURL( const KURL &url )
}
if (widget())
- d->m_job->setWindow(widget()->tqtopLevelWidget());
+ d->m_job->setWindow(widget()->topLevelWidget());
d->m_job->addMetaData(args.metaData());
connect( d->m_job, TQT_SIGNAL( result( KIO::Job* ) ),
@@ -1722,14 +1722,14 @@ void KHTMLPart::htmlError( int errorCode, const TQString& text, const KURL& reqU
d->m_bJScriptForce = false;
d->m_bJScriptOverride = true;
begin();
- TQString errText = TQString::tqfromLatin1( "<HTML dir=%1><HEAD><TITLE>" )
+ TQString errText = TQString::fromLatin1( "<HTML dir=%1><HEAD><TITLE>" )
.arg(TQApplication::reverseLayout() ? "rtl" : "ltr");
errText += i18n( "Error while loading %1" ).arg( reqUrl.htmlURL() );
- errText += TQString::tqfromLatin1( "</TITLE></HEAD><BODY><P>" );
+ errText += TQString::fromLatin1( "</TITLE></HEAD><BODY><P>" );
errText += i18n( "An error occurred while loading <B>%1</B>:" ).arg( reqUrl.htmlURL() );
- errText += TQString::tqfromLatin1( "</P>" );
+ errText += TQString::fromLatin1( "</P>" );
errText += TQStyleSheet::convertFromPlainText( KIO::buildErrorString( errorCode, text ) );
- errText += TQString::tqfromLatin1( "</BODY></HTML>" );
+ errText += TQString::fromLatin1( "</BODY></HTML>" );
write(errText);
end();
@@ -1757,56 +1757,56 @@ void KHTMLPart::htmlError( int errorCode, const TQString& text, const KURL& reqU
TQString url, protocol, datetime;
url = reqUrl.prettyURL();
protocol = reqUrl.protocol();
- datetime = KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime(),
+ datetime = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(),
false );
- TQString doc = TQString::tqfromLatin1( "<html><head><title>" );
+ TQString doc = TQString::fromLatin1( "<html><head><title>" );
doc += i18n( "Error: " );
doc += errorName;
- doc += TQString::tqfromLatin1( " - %1</title></head><body><h1>" ).arg( url );
+ doc += TQString::fromLatin1( " - %1</title></head><body><h1>" ).arg( url );
doc += i18n( "The requested operation could not be completed" );
- doc += TQString::tqfromLatin1( "</h1><h2>" );
+ doc += TQString::fromLatin1( "</h1><h2>" );
doc += errorName;
- doc += TQString::tqfromLatin1( "</h2>" );
+ doc += TQString::fromLatin1( "</h2>" );
if ( !techName.isNull() ) {
- doc += TQString::tqfromLatin1( "<h2>" );
+ doc += TQString::fromLatin1( "<h2>" );
doc += i18n( "Technical Reason: " );
doc += techName;
- doc += TQString::tqfromLatin1( "</h2>" );
+ doc += TQString::fromLatin1( "</h2>" );
}
- doc += TQString::tqfromLatin1( "<h3>" );
+ doc += TQString::fromLatin1( "<h3>" );
doc += i18n( "Details of the Request:" );
- doc += TQString::tqfromLatin1( "</h3><ul><li>" );
+ doc += TQString::fromLatin1( "</h3><ul><li>" );
doc += i18n( "URL: %1" ).arg( url );
- doc += TQString::tqfromLatin1( "</li><li>" );
+ doc += TQString::fromLatin1( "</li><li>" );
if ( !protocol.isNull() ) {
// uncomment for 3.1... i18n change
// doc += i18n( "Protocol: %1" ).arg( protocol ).arg( protocol );
- doc += TQString::tqfromLatin1( "</li><li>" );
+ doc += TQString::fromLatin1( "</li><li>" );
}
doc += i18n( "Date and Time: %1" ).arg( datetime );
- doc += TQString::tqfromLatin1( "</li><li>" );
+ doc += TQString::fromLatin1( "</li><li>" );
doc += i18n( "Additional Information: %1" ).arg( text );
- doc += TQString::tqfromLatin1( "</li></ul><h3>" );
+ doc += TQString::fromLatin1( "</li></ul><h3>" );
doc += i18n( "Description:" );
- doc += TQString::tqfromLatin1( "</h3><p>" );
+ doc += TQString::fromLatin1( "</h3><p>" );
doc += description;
- doc += TQString::tqfromLatin1( "</p>" );
+ doc += TQString::fromLatin1( "</p>" );
if ( causes.count() ) {
- doc += TQString::tqfromLatin1( "<h3>" );
+ doc += TQString::fromLatin1( "<h3>" );
doc += i18n( "Possible Causes:" );
- doc += TQString::tqfromLatin1( "</h3><ul><li>" );
+ doc += TQString::fromLatin1( "</h3><ul><li>" );
doc += causes.join( "</li><li>" );
- doc += TQString::tqfromLatin1( "</li></ul>" );
+ doc += TQString::fromLatin1( "</li></ul>" );
}
if ( solutions.count() ) {
- doc += TQString::tqfromLatin1( "<h3>" );
+ doc += TQString::fromLatin1( "<h3>" );
doc += i18n( "Possible Solutions:" );
- doc += TQString::tqfromLatin1( "</h3><ul><li>" );
+ doc += TQString::fromLatin1( "</h3><ul><li>" );
doc += solutions.join( "</li><li>" );
- doc += TQString::tqfromLatin1( "</li></ul>" );
+ doc += TQString::fromLatin1( "</li></ul>" );
}
- doc += TQString::tqfromLatin1( "</body></html>" );
+ doc += TQString::fromLatin1( "</body></html>" );
write( doc );
end();
@@ -2402,7 +2402,7 @@ void KHTMLPart::slotRedirect()
d->m_redirectURL = TQString();
// SYNC check with ecma/kjs_window.cpp::goURL !
- if ( u.find( TQString::tqfromLatin1( "javascript:" ), 0, false ) == 0 )
+ if ( u.find( TQString::fromLatin1( "javascript:" ), 0, false ) == 0 )
{
TQString script = KURL::decode_string( u.right( u.length() - 11 ) );
kdDebug( 6050 ) << "KHTMLPart::slotRedirect script=" << script << endl;
@@ -3731,7 +3731,7 @@ void KHTMLPart::overURL( const TQString &url, const TQString &target, bool /*shi
return;
}
- if (url.find( TQString::tqfromLatin1( "javascript:" ),0, false ) == 0 ) {
+ if (url.find( TQString::fromLatin1( "javascript:" ),0, false ) == 0 ) {
TQString jscode = KURL::decode_string( url.mid( url.find( "javascript:", 0, false ) ) );
jscode = KStringHandler::rsqueeze( jscode, 80 ); // truncate if too long
if (url.startsWith("javascript:window.open"))
@@ -3838,18 +3838,18 @@ void KHTMLPart::overURL( const TQString &url, const TQString &target, bool /*shi
extra = i18n(" (In other frame)");
}
- if (u.protocol() == TQString::tqfromLatin1("mailto")) {
- TQString mailtoMsg /* = TQString::tqfromLatin1("<img src=%1>").arg(locate("icon", TQString::tqfromLatin1("locolor/16x16/actions/mail_send.png")))*/;
+ if (u.protocol() == TQString::fromLatin1("mailto")) {
+ TQString mailtoMsg /* = TQString::fromLatin1("<img src=%1>").arg(locate("icon", TQString::fromLatin1("locolor/16x16/actions/mail_send.png")))*/;
mailtoMsg += i18n("Email to: ") + KURL::decode_string(u.path());
TQStringList queries = TQStringList::split('&', u.query().mid(1));
TQStringList::Iterator it = queries.begin();
const TQStringList::Iterator itEnd = queries.end();
for (; it != itEnd; ++it)
- if ((*it).startsWith(TQString::tqfromLatin1("subject=")))
+ if ((*it).startsWith(TQString::fromLatin1("subject=")))
mailtoMsg += i18n(" - Subject: ") + KURL::decode_string((*it).mid(8));
- else if ((*it).startsWith(TQString::tqfromLatin1("cc=")))
+ else if ((*it).startsWith(TQString::fromLatin1("cc=")))
mailtoMsg += i18n(" - CC: ") + KURL::decode_string((*it).mid(3));
- else if ((*it).startsWith(TQString::tqfromLatin1("bcc=")))
+ else if ((*it).startsWith(TQString::fromLatin1("bcc=")))
mailtoMsg += i18n(" - BCC: ") + KURL::decode_string((*it).mid(4));
mailtoMsg = TQStyleSheet::escape(mailtoMsg);
mailtoMsg.replace(TQRegExp("([\n\r\t]|[ ]{10})"), TQString());
@@ -3858,9 +3858,9 @@ void KHTMLPart::overURL( const TQString &url, const TQString &target, bool /*shi
}
// Is this check necessary at all? (Frerich)
#if 0
- else if (u.protocol() == TQString::tqfromLatin1("http")) {
+ else if (u.protocol() == TQString::fromLatin1("http")) {
DOM::Node hrefNode = nodeUnderMouse().parentNode();
- while (hrefNode.nodeName().string() != TQString::tqfromLatin1("A") && !hrefNode.isNull())
+ while (hrefNode.nodeName().string() != TQString::fromLatin1("A") && !hrefNode.isNull())
hrefNode = hrefNode.parentNode();
if (!hrefNode.isNull()) {
@@ -3868,12 +3868,12 @@ void KHTMLPart::overURL( const TQString &url, const TQString &target, bool /*shi
if (!hreflangNode.isNull()) {
TQString countryCode = hreflangNode.nodeValue().string().lower();
// Map the language code to an appropriate country code.
- if (countryCode == TQString::tqfromLatin1("en"))
- countryCode = TQString::tqfromLatin1("gb");
- TQString flagImg = TQString::tqfromLatin1("<img src=%1>").arg(
- locate("locale", TQString::tqfromLatin1("l10n/")
+ if (countryCode == TQString::fromLatin1("en"))
+ countryCode = TQString::fromLatin1("gb");
+ TQString flagImg = TQString::fromLatin1("<img src=%1>").arg(
+ locate("locale", TQString::fromLatin1("l10n/")
+ countryCode
- + TQString::tqfromLatin1("/flag.png")));
+ + TQString::fromLatin1("/flag.png")));
emit setStatusBarText(flagImg + u.prettyURL() + extra);
}
}
@@ -3906,7 +3906,7 @@ bool KHTMLPart::urlSelectedIntern( const TQString &url, int button, int state, c
if ( !target.isEmpty() )
hasTarget = true;
- if ( url.find( TQString::tqfromLatin1( "javascript:" ), 0, false ) == 0 )
+ if ( url.find( TQString::fromLatin1( "javascript:" ), 0, false ) == 0 )
{
crossFrameExecuteScript( target, KURL::decode_string( url.mid( 11 ) ) );
return false;
@@ -4027,7 +4027,7 @@ void KHTMLPart::slotViewDocumentSource()
}
}
- (void) KRun::runURL( url, TQString::tqfromLatin1("text/plain"), isTempFile );
+ (void) KRun::runURL( url, TQString::fromLatin1("text/plain"), isTempFile );
}
void KHTMLPart::slotViewPageInfo()
@@ -4108,7 +4108,7 @@ void KHTMLPart::slotViewFrameSource()
}
}
- (void) KRun::runURL( url, TQString::tqfromLatin1("text/plain"), isTempFile );
+ (void) KRun::runURL( url, TQString::fromLatin1("text/plain"), isTempFile );
}
KURL KHTMLPart::backgroundURL() const
@@ -4276,7 +4276,7 @@ void KHTMLPart::updateActions()
{
TQObject *ext = KParts::BrowserExtension::childObject( frame );
if ( ext )
- enablePrintFrame = ext->tqmetaObject()->slotNames().contains( "print()" );
+ enablePrintFrame = ext->metaObject()->slotNames().contains( "print()" );
}
d->m_paPrintFrame->setEnabled( enablePrintFrame );
@@ -4319,7 +4319,7 @@ bool KHTMLPart::requestFrame( khtml::RenderPart *frame, const TQString &url, con
(*it)->m_params = params;
// Support for <frame src="javascript:string">
- if ( url.find( TQString::tqfromLatin1( "javascript:" ), 0, false ) == 0 )
+ if ( url.find( TQString::fromLatin1( "javascript:" ), 0, false ) == 0 )
{
if ( processObjectRequest(*it, KURL("about:blank"), TQString("text/html") ) ) {
KHTMLPart* p = static_cast<KHTMLPart*>(static_cast<KParts::ReadOnlyPart *>((*it)->m_part));
@@ -4341,7 +4341,7 @@ bool KHTMLPart::requestFrame( khtml::RenderPart *frame, const TQString &url, con
TQString KHTMLPart::requestFrameName()
{
- return TQString::tqfromLatin1("<!--frame %1-->").arg(d->m_frameNameId++);
+ return TQString::fromLatin1("<!--frame %1-->").arg(d->m_frameNameId++);
}
bool KHTMLPart::requestObject( khtml::RenderPart *frame, const TQString &url, const TQString &serviceType,
@@ -4408,7 +4408,7 @@ bool KHTMLPart::requestObject( khtml::ChildFrame *child, const KURL &url, const
// We want a KHTMLPart if the HTML says <frame src=""> or <frame src="about:blank">
if ((url.isEmpty() || url.url() == "about:blank") && args.serviceType.isEmpty())
- args.serviceType = TQString::tqfromLatin1( "text/html" );
+ args.serviceType = TQString::fromLatin1( "text/html" );
if ( args.serviceType.isEmpty() ) {
kdDebug(6050) << "Running new KHTMLRun for " << this << " and child=" << child << endl;
@@ -4650,7 +4650,7 @@ KParts::ReadOnlyPart *KHTMLPart::createPart( TQWidget *parentWidget, const char
{
TQString constr;
if ( !serviceName.isEmpty() )
- constr.append( TQString::tqfromLatin1( "Name == '%1'" ).arg( serviceName ) );
+ constr.append( TQString::fromLatin1( "Name == '%1'" ).arg( serviceName ) );
KTrader::OfferList offers = KTrader::self()->query( mimetype, "KParts/ReadOnlyPart", constr, TQString() );
@@ -4701,7 +4701,7 @@ KParts::PartManager *KHTMLPart::partManager()
{
if ( !d->m_manager && d->m_view )
{
- d->m_manager = new KParts::PartManager( d->m_view->tqtopLevelWidget(), this, "khtml part manager" );
+ d->m_manager = new KParts::PartManager( d->m_view->topLevelWidget(), this, "khtml part manager" );
d->m_manager->setAllowNestedParts( true );
connect( d->m_manager, TQT_SIGNAL( activePartChanged( KParts::Part * ) ),
this, TQT_SLOT( slotActiveFrameChanged( KParts::Part * ) ) );
@@ -4777,7 +4777,7 @@ void KHTMLPart::submitForm( const char *action, const TQString &url, const TQByt
"WarnOnUnencryptedForm");
// Move this setting into KSSL instead
KConfig *config = kapp->config();
- TQString grpNotifMsgs = TQString::tqfromLatin1("Notification Messages");
+ TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages");
KConfigGroupSaver saver( config, grpNotifMsgs );
if (!config->readBoolEntry("WarnOnUnencryptedForm", true)) {
@@ -4811,7 +4811,7 @@ void KHTMLPart::submitForm( const char *action, const TQString &url, const TQByt
TQString urlstring = u.url();
- if ( urlstring.find( TQString::tqfromLatin1( "javascript:" ), 0, false ) == 0 ) {
+ if ( urlstring.find( TQString::fromLatin1( "javascript:" ), 0, false ) == 0 ) {
urlstring = KURL::decode_string(urlstring);
crossFrameExecuteScript( _target, urlstring.right( urlstring.length() - 11) );
return;
@@ -4873,18 +4873,18 @@ void KHTMLPart::submitForm( const char *action, const TQString &url, const TQByt
TQString bodyEnc;
if (contentType.lower() == "multipart/form-data") {
// FIXME: is this correct? I suspect not
- bodyEnc = KURL::encode_string(TQString::tqfromLatin1(formData.data(),
+ bodyEnc = KURL::encode_string(TQString::fromLatin1(formData.data(),
formData.size()));
} else if (contentType.lower() == "text/plain") {
// Convention seems to be to decode, and s/&/\n/
- TQString tmpbody = TQString::tqfromLatin1(formData.data(),
+ TQString tmpbody = TQString::fromLatin1(formData.data(),
formData.size());
tmpbody.replace(TQRegExp("[&]"), "\n");
tmpbody.replace(TQRegExp("[+]"), " ");
tmpbody = KURL::decode_string(tmpbody); // Decode the rest of it
bodyEnc = KURL::encode_string(tmpbody); // Recode for the URL
} else {
- bodyEnc = KURL::encode_string(TQString::tqfromLatin1(formData.data(),
+ bodyEnc = KURL::encode_string(TQString::fromLatin1(formData.data(),
formData.size()));
}
@@ -4895,7 +4895,7 @@ void KHTMLPart::submitForm( const char *action, const TQString &url, const TQByt
if ( strcmp( action, "get" ) == 0 ) {
if (u.protocol() != "mailto")
- u.setQuery( TQString::tqfromLatin1( formData.data(), formData.size() ) );
+ u.setQuery( TQString::fromLatin1( formData.data(), formData.size() ) );
args.setDoPost( false );
}
else {
@@ -4975,7 +4975,7 @@ void KHTMLPart::popupMenu( const TQString &linkUrl )
KHTMLPopupGUIClient* client = new KHTMLPopupGUIClient( this, d->m_popupMenuXML, linkKURL );
TQGuardedPtr<TQObject> guard( client );
- TQString mimetype = TQString::tqfromLatin1( "text/html" );
+ TQString mimetype = TQString::fromLatin1( "text/html" );
args.metaData()["referrer"] = referrer;
if (!linkUrl.isEmpty()) // over a link
@@ -5095,7 +5095,7 @@ void KHTMLPart::slotChildURLRequest( const KURL &url, const KParts::URLArgs &arg
// TODO: handle child target correctly! currently the script are always executed fur the parent
TQString urlStr = url.url();
- if ( urlStr.find( TQString::tqfromLatin1( "javascript:" ), 0, false ) == 0 ) {
+ if ( urlStr.find( TQString::fromLatin1( "javascript:" ), 0, false ) == 0 ) {
TQString script = KURL::decode_string( urlStr.right( urlStr.length() - 11 ) );
executeScript( DOM::Node(), script );
return;
@@ -5103,17 +5103,17 @@ void KHTMLPart::slotChildURLRequest( const KURL &url, const KParts::URLArgs &arg
TQString frameName = args.frameName.lower();
if ( !frameName.isEmpty() ) {
- if ( frameName == TQString::tqfromLatin1( "_top" ) )
+ if ( frameName == TQString::fromLatin1( "_top" ) )
{
emit d->m_extension->openURLRequest( url, args );
return;
}
- else if ( frameName == TQString::tqfromLatin1( "_blank" ) )
+ else if ( frameName == TQString::fromLatin1( "_blank" ) )
{
emit d->m_extension->createNewWindow( url, args );
return;
}
- else if ( frameName == TQString::tqfromLatin1( "_parent" ) )
+ else if ( frameName == TQString::fromLatin1( "_parent" ) )
{
KParts::URLArgs newArgs( args );
newArgs.frameName = TQString();
@@ -5121,7 +5121,7 @@ void KHTMLPart::slotChildURLRequest( const KURL &url, const KParts::URLArgs &arg
emit d->m_extension->openURLRequest( url, newArgs );
return;
}
- else if ( frameName != TQString::tqfromLatin1( "_self" ) )
+ else if ( frameName != TQString::fromLatin1( "_self" ) )
{
khtml::ChildFrame *_frame = recursiveFrameRequest( callingHtmlPart, url, args );
@@ -6658,7 +6658,7 @@ void KHTMLPart::slotPrintFrame()
if ( !ext )
return;
- TQMetaObject *mo = ext->tqmetaObject();
+ TQMetaObject *mo = ext->metaObject();
int idx = mo->findSlot( "print()", true );
if ( idx >= 0 ) {
@@ -7157,7 +7157,7 @@ void KHTMLPart::openWallet(DOM::HTMLFormElementImpl *form)
}
if (!d->m_wq) {
- KWallet::Wallet *wallet = KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), widget() ? widget()->tqtopLevelWidget()->winId() : 0, KWallet::Wallet::Asynchronous);
+ KWallet::Wallet *wallet = KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), widget() ? widget()->topLevelWidget()->winId() : 0, KWallet::Wallet::Asynchronous);
d->m_wq = new KHTMLWalletQueue(this);
d->m_wq->wallet = wallet;
connect(wallet, TQT_SIGNAL(walletOpened(bool)), d->m_wq, TQT_SLOT(walletOpened(bool)));
@@ -7199,7 +7199,7 @@ void KHTMLPart::saveToWallet(const TQString& key, const TQMap<TQString,TQString>
}
if (!d->m_wq) {
- KWallet::Wallet *wallet = KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), widget() ? widget()->tqtopLevelWidget()->winId() : 0, KWallet::Wallet::Asynchronous);
+ KWallet::Wallet *wallet = KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), widget() ? widget()->topLevelWidget()->winId() : 0, KWallet::Wallet::Asynchronous);
d->m_wq = new KHTMLWalletQueue(this);
d->m_wq->wallet = wallet;
connect(wallet, TQT_SIGNAL(walletOpened(bool)), d->m_wq, TQT_SLOT(walletOpened(bool)));
diff --git a/khtml/khtml_run.cpp b/khtml/khtml_run.cpp
index c07b44b79..90770d38f 100644
--- a/khtml/khtml_run.cpp
+++ b/khtml/khtml_run.cpp
@@ -30,7 +30,7 @@
KHTMLRun::KHTMLRun( KHTMLPart *part, khtml::ChildFrame *child, const KURL &url,
const KParts::URLArgs &args, bool hideErrorDialog )
- : KParts::BrowserRun( url, args, part, part->widget() ? part->widget()->tqtopLevelWidget() : 0,
+ : KParts::BrowserRun( url, args, part, part->widget() ? part->widget()->topLevelWidget() : 0,
false, false, hideErrorDialog ),
m_child( child )
{
diff --git a/khtml/khtml_settings.cc b/khtml/khtml_settings.cc
index 6b8649601..3a9a4e297 100644
--- a/khtml/khtml_settings.cc
+++ b/khtml/khtml_settings.cc
@@ -138,9 +138,9 @@ KHTMLSettings::KJavaScriptAdvice KHTMLSettings::strToAdvice(const TQString& _str
if (!_str)
ret = KJavaScriptDunno;
- if (_str.lower() == TQString::tqfromLatin1("accept"))
+ if (_str.lower() == TQString::fromLatin1("accept"))
ret = KJavaScriptAccept;
- else if (_str.lower() == TQString::tqfromLatin1("reject"))
+ else if (_str.lower() == TQString::fromLatin1("reject"))
ret = KJavaScriptReject;
return ret;
@@ -189,63 +189,63 @@ void KHTMLSettings::splitDomainAdvice(const TQString& configStr, TQString &domai
void KHTMLSettings::readDomainSettings(KConfig *config, bool reset,
bool global, KPerDomainSettings &pd_settings) {
TQString jsPrefix = global ? TQString::null
- : TQString::tqfromLatin1("javascript.");
+ : TQString::fromLatin1("javascript.");
TQString javaPrefix = global ? TQString::null
- : TQString::tqfromLatin1("java.");
+ : TQString::fromLatin1("java.");
TQString pluginsPrefix = global ? TQString::null
- : TQString::tqfromLatin1("plugins.");
+ : TQString::fromLatin1("plugins.");
// The setting for Java
- TQString key = javaPrefix + TQString::tqfromLatin1("EnableJava");
+ TQString key = javaPrefix + TQString::fromLatin1("EnableJava");
if ( (global && reset) || config->hasKey( key ) )
pd_settings.m_bEnableJava = config->readBoolEntry( key, false );
else if ( !global )
pd_settings.m_bEnableJava = d->global.m_bEnableJava;
// The setting for Plugins
- key = pluginsPrefix + TQString::tqfromLatin1("EnablePlugins");
+ key = pluginsPrefix + TQString::fromLatin1("EnablePlugins");
if ( (global && reset) || config->hasKey( key ) )
pd_settings.m_bEnablePlugins = config->readBoolEntry( key, true );
else if ( !global )
pd_settings.m_bEnablePlugins = d->global.m_bEnablePlugins;
// The setting for JavaScript
- key = jsPrefix + TQString::tqfromLatin1("EnableJavaScript");
+ key = jsPrefix + TQString::fromLatin1("EnableJavaScript");
if ( (global && reset) || config->hasKey( key ) )
pd_settings.m_bEnableJavaScript = config->readBoolEntry( key, true );
else if ( !global )
pd_settings.m_bEnableJavaScript = d->global.m_bEnableJavaScript;
// window property policies
- key = jsPrefix + TQString::tqfromLatin1("WindowOpenPolicy");
+ key = jsPrefix + TQString::fromLatin1("WindowOpenPolicy");
if ( (global && reset) || config->hasKey( key ) )
pd_settings.m_windowOpenPolicy = (KJSWindowOpenPolicy)
config->readUnsignedNumEntry( key, KJSWindowOpenSmart );
else if ( !global )
pd_settings.m_windowOpenPolicy = d->global.m_windowOpenPolicy;
- key = jsPrefix + TQString::tqfromLatin1("WindowMovePolicy");
+ key = jsPrefix + TQString::fromLatin1("WindowMovePolicy");
if ( (global && reset) || config->hasKey( key ) )
pd_settings.m_windowMovePolicy = (KJSWindowMovePolicy)
config->readUnsignedNumEntry( key, KJSWindowMoveAllow );
else if ( !global )
pd_settings.m_windowMovePolicy = d->global.m_windowMovePolicy;
- key = jsPrefix + TQString::tqfromLatin1("WindowResizePolicy");
+ key = jsPrefix + TQString::fromLatin1("WindowResizePolicy");
if ( (global && reset) || config->hasKey( key ) )
pd_settings.m_windowResizePolicy = (KJSWindowResizePolicy)
config->readUnsignedNumEntry( key, KJSWindowResizeAllow );
else if ( !global )
pd_settings.m_windowResizePolicy = d->global.m_windowResizePolicy;
- key = jsPrefix + TQString::tqfromLatin1("WindowStatusPolicy");
+ key = jsPrefix + TQString::fromLatin1("WindowStatusPolicy");
if ( (global && reset) || config->hasKey( key ) )
pd_settings.m_windowStatusPolicy = (KJSWindowStatusPolicy)
config->readUnsignedNumEntry( key, KJSWindowStatusAllow );
else if ( !global )
pd_settings.m_windowStatusPolicy = d->global.m_windowStatusPolicy;
- key = jsPrefix + TQString::tqfromLatin1("WindowFocusPolicy");
+ key = jsPrefix + TQString::fromLatin1("WindowFocusPolicy");
if ( (global && reset) || config->hasKey( key ) )
pd_settings.m_windowFocusPolicy = (KJSWindowFocusPolicy)
config->readUnsignedNumEntry( key, KJSWindowFocusAllow );
@@ -611,7 +611,7 @@ void KHTMLSettings::init( KConfig * config, bool reset )
{
TQCString javaPolicy = adviceToStr( it.data() );
TQCString javaScriptPolicy = adviceToStr( KJavaScriptDunno );
- domainConfig.append(TQString::tqfromLatin1("%1:%2:%3").arg(it.key()).arg(javaPolicy).arg(javaScriptPolicy));
+ domainConfig.append(TQString::fromLatin1("%1:%2:%3").arg(it.key()).arg(javaPolicy).arg(javaScriptPolicy));
}
config->writeEntry( "JavaDomainSettings", domainConfig );
}
@@ -624,7 +624,7 @@ void KHTMLSettings::init( KConfig * config, bool reset )
{
TQCString javaPolicy = adviceToStr( KJavaScriptDunno );
TQCString javaScriptPolicy = adviceToStr( it.data() );
- domainConfig.append(TQString::tqfromLatin1("%1:%2:%3").arg(it.key()).arg(javaPolicy).arg(javaScriptPolicy));
+ domainConfig.append(TQString::fromLatin1("%1:%2:%3").arg(it.key()).arg(javaPolicy).arg(javaScriptPolicy));
}
config->writeEntry( "ECMADomainSettings", domainConfig );
}
diff --git a/khtml/khtmlview.cpp b/khtml/khtmlview.cpp
index 80f031fe2..b59781bf0 100644
--- a/khtml/khtmlview.cpp
+++ b/khtml/khtmlview.cpp
@@ -2721,7 +2721,7 @@ TQMap< ElementImpl*, TQChar > KHTMLView::buildFallbackAccessKeys() const
TQString url = (*it).url;
it = data.remove( it );
// assign the same accesskey also to other elements pointing to the same url
- if( !url.isEmpty() && !url.tqstartsWith( "javascript:", false )) {
+ if( !url.isEmpty() && !url.startsWith( "javascript:", false )) {
for( TQValueList< AccessKeyData >::Iterator it2 = data.begin();
it2 != data.end();
) {
diff --git a/khtml/kmultipart/kmultipart.cpp b/khtml/kmultipart/kmultipart.cpp
index 5d82742d9..fe47e8616 100644
--- a/khtml/kmultipart/kmultipart.cpp
+++ b/khtml/kmultipart/kmultipart.cpp
@@ -234,7 +234,7 @@ void KMultiPart::slotData( KIO::Job *job, const TQByteArray &data )
}
else if ( !qstrnicmp( line.data(), "Content-Encoding:", 17 ) )
{
- TQString encoding = TQString::tqfromLatin1(line.data()+17).stripWhiteSpace().lower();
+ TQString encoding = TQString::fromLatin1(line.data()+17).stripWhiteSpace().lower();
if (encoding == "gzip" || encoding == "x-gzip") {
m_gzip = true;
} else {
@@ -245,7 +245,7 @@ void KMultiPart::slotData( KIO::Job *job, const TQByteArray &data )
else if ( !qstrnicmp( line.data(), "Content-Type:", 13 ) )
{
Q_ASSERT( m_nextMimeType.isNull() );
- m_nextMimeType = TQString::tqfromLatin1( line.data() + 14 ).stripWhiteSpace();
+ m_nextMimeType = TQString::fromLatin1( line.data() + 14 ).stripWhiteSpace();
int semicolon = m_nextMimeType.find( ';' );
if ( semicolon != -1 )
m_nextMimeType = m_nextMimeType.left( semicolon );
diff --git a/khtml/misc/loader.cpp b/khtml/misc/loader.cpp
index de7d5aea2..8320a51c3 100644
--- a/khtml/misc/loader.cpp
+++ b/khtml/misc/loader.cpp
@@ -213,7 +213,7 @@ CachedCSSStyleSheet::CachedCSSStyleSheet(DocLoader* dl, const DOMString &url, KI
: CachedObject(url, CSSStyleSheet, _cachePolicy, 0)
{
// Set the type we want (probably css or xml)
- TQString ah = TQString::tqfromLatin1( accept );
+ TQString ah = TQString::fromLatin1( accept );
if ( !ah.isEmpty() )
ah += ",";
ah += "*/*;q=0.1";
@@ -327,7 +327,7 @@ CachedScript::CachedScript(DocLoader* dl, const DOMString &url, KIO::CacheContro
// It's javascript we want.
// But some websites think their scripts are <some wrong mimetype here>
// and refuse to serve them if we only accept application/x-javascript.
- setAccept( TQString::tqfromLatin1("*/*") );
+ setAccept( TQString::fromLatin1("*/*") );
// load the file
Cache::loader()->load(dl, this, false);
m_loading = true;
@@ -787,7 +787,7 @@ void CachedImage::setShowAnimations( KHTMLSettings::KAnimationAdvice showAnimati
delete p;
p = new TQPixmap(m->framePixmap());
m->disconnectUpdate( this, TQT_SLOT( movieUpdated( const TQRect &) ));
- m->disconnectqStatus( this, TQT_SLOT( movieStatus( int ) ));
+ m->disconnecStatus( this, TQT_SLOT( movieStatus( int ) ));
m->disconnectResize( this, TQT_SLOT( movieResize( const TQSize& ) ) );
TQTimer::singleShot(0, this, TQT_SLOT( deleteMovie()));
imgSource = 0;
@@ -850,7 +850,7 @@ void CachedImage::data ( TQBuffer &_buffer, bool eof )
imgSource = new ImageSource( _buffer.buffer());
m = new TQMovie( imgSource, 8192 );
m->connectUpdate( this, TQT_SLOT( movieUpdated( const TQRect &) ));
- m->connectqStatus( this, TQT_SLOT( movieStatus(int)));
+ m->connecStatus( this, TQT_SLOT( movieStatus(int)));
m->connectResize( this, TQT_SLOT( movieResize( const TQSize& ) ) );
}
}
@@ -1167,7 +1167,7 @@ void Loader::servePendingRequests()
{
job->addMetaData( "cross-domain", part->toplevelURL().url() );
if (part->widget())
- job->setWindow (part->widget()->tqtopLevelWidget());
+ job->setWindow (part->widget()->topLevelWidget());
}
}
diff --git a/khtml/rendering/enumerate.cpp b/khtml/rendering/enumerate.cpp
index 57445c12b..9cfe149ad 100644
--- a/khtml/rendering/enumerate.cpp
+++ b/khtml/rendering/enumerate.cpp
@@ -138,7 +138,7 @@ TQString toHebrew( int number ) {
TQString letter;
if (number < 1) return TQString::number(number);
if (number>999) {
- letter = toHebrew(number/1000) + TQString::tqfromLatin1("'");
+ letter = toHebrew(number/1000) + TQString::fromLatin1("'");
number = number%1000;
}
diff --git a/khtml/rendering/font.cpp b/khtml/rendering/font.cpp
index 766c89840..64ede83e3 100644
--- a/khtml/rendering/font.cpp
+++ b/khtml/rendering/font.cpp
@@ -407,7 +407,7 @@ bool Font::isFontScalable(TQFontDatabase& db, const TQFont& font)
/* Cache size info */
if (!scalSizesCache)
scalSizesCache = new TQMap<ScalKey, TQValueList<int> >;
- (*scalSizesCache)[key] = db.tqsmoothSizes(font.family(), db.styleString(font));
+ (*scalSizesCache)[key] = db.smoothSizes(font.family(), db.styleString(font));
}
}
diff --git a/khtml/rendering/render_applet.cpp b/khtml/rendering/render_applet.cpp
index 3a00589e2..fce22f7c8 100644
--- a/khtml/rendering/render_applet.cpp
+++ b/khtml/rendering/render_applet.cpp
@@ -123,22 +123,22 @@ void RenderApplet::processArguments(const TQMap<TQString, TQString> &args)
KJavaApplet* applet = w ? w->applet() : 0;
if ( applet ) {
- applet->setBaseURL( args[TQString::tqfromLatin1("baseURL") ] );
- applet->setAppletClass( args[TQString::tqfromLatin1("code") ] );
+ applet->setBaseURL( args[TQString::fromLatin1("baseURL") ] );
+ applet->setAppletClass( args[TQString::fromLatin1("code") ] );
- TQString str = args[TQString::tqfromLatin1("codeBase") ];
+ TQString str = args[TQString::fromLatin1("codeBase") ];
if( !str.isEmpty() )
applet->setCodeBase( str );
- str = args[TQString::tqfromLatin1("name") ];
+ str = args[TQString::fromLatin1("name") ];
if( !str.isNull() )
applet->setAppletName( str );
else
- applet->setAppletName( args[TQString::tqfromLatin1("code") ] );
+ applet->setAppletName( args[TQString::fromLatin1("code") ] );
- str = args[TQString::tqfromLatin1("archive") ];
+ str = args[TQString::fromLatin1("archive") ];
if( !str.isEmpty() )
- applet->setArchives( args[TQString::tqfromLatin1("archive") ] );
+ applet->setArchives( args[TQString::fromLatin1("archive") ] );
}
}
diff --git a/khtml/rendering/render_form.cpp b/khtml/rendering/render_form.cpp
index 5c53f0250..d55b32fe4 100644
--- a/khtml/rendering/render_form.cpp
+++ b/khtml/rendering/render_form.cpp
@@ -155,8 +155,8 @@ void RenderCheckBox::calcMinMaxWidth()
KHTMLAssert( !minMaxKnown() );
TQCheckBox *cb = static_cast<TQCheckBox *>( m_widget );
- TQSize s( cb->tqstyle().tqpixelMetric( TQStyle::PM_IndicatorWidth ),
- cb->tqstyle().tqpixelMetric( TQStyle::PM_IndicatorHeight ) );
+ TQSize s( cb->tqstyle().pixelMetric( TQStyle::PM_IndicatorWidth ),
+ cb->tqstyle().pixelMetric( TQStyle::PM_IndicatorHeight ) );
setIntrinsicWidth( s.width() );
setIntrinsicHeight( s.height() );
@@ -207,8 +207,8 @@ void RenderRadioButton::calcMinMaxWidth()
KHTMLAssert( !minMaxKnown() );
TQRadioButton *rb = static_cast<TQRadioButton *>( m_widget );
- TQSize s( rb->tqstyle().tqpixelMetric( TQStyle::PM_ExclusiveIndicatorWidth ),
- rb->tqstyle().tqpixelMetric( TQStyle::PM_ExclusiveIndicatorHeight ) );
+ TQSize s( rb->tqstyle().pixelMetric( TQStyle::PM_ExclusiveIndicatorWidth ),
+ rb->tqstyle().pixelMetric( TQStyle::PM_ExclusiveIndicatorHeight ) );
setIntrinsicWidth( s.width() );
setIntrinsicHeight( s.height() );
@@ -260,17 +260,17 @@ void RenderSubmitButton::calcMinMaxWidth()
bool empty = raw.isEmpty();
if ( empty )
- raw = TQString::tqfromLatin1("X");
+ raw = TQString::fromLatin1("X");
TQFontMetrics fm = pb->fontMetrics();
TQSize ts = fm.size( ShowPrefix, raw);
TQSize s(pb->tqstyle().tqsizeFromContents( TQStyle::CT_PushButton, pb, ts )
.expandedTo(TQApplication::globalStrut()));
- int margin = pb->tqstyle().tqpixelMetric( TQStyle::PM_ButtonMargin, pb) +
- pb->tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, pb ) * 2;
+ int margin = pb->tqstyle().pixelMetric( TQStyle::PM_ButtonMargin, pb) +
+ pb->tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth, pb ) * 2;
int w = ts.width() + margin;
int h = s.height();
if (pb->isDefault() || pb->autoDefault()) {
- int dbw = pb->tqstyle().tqpixelMetric( TQStyle::PM_ButtonDefaultIndicator, pb ) * 2;
+ int dbw = pb->tqstyle().pixelMetric( TQStyle::PM_ButtonDefaultIndicator, pb ) * 2;
w += dbw;
}
@@ -1018,7 +1018,7 @@ void RenderSelect::updateFromElement()
DOMString label = optElem->getAttribute(ATTR_LABEL);
if (!label.isEmpty())
text = label.string();
- text = TQString::tqfromLatin1(" ")+text;
+ text = TQString::fromLatin1(" ")+text;
}
if(m_useListBox) {
@@ -1406,7 +1406,7 @@ void TextAreaWidget::slotReplaceNext()
}
if (!(m_replace->options() & KReplaceDialog::PromptOnReplace)) {
- viewport()->tqsetUpdatesEnabled(false);
+ viewport()->setUpdatesEnabled(false);
}
KFind::Result res = KFind::NoMatch;
@@ -1449,7 +1449,7 @@ void TextAreaWidget::slotReplaceNext()
}
if (!(m_replace->options() & KReplaceDialog::PromptOnReplace)) {
- viewport()->tqsetUpdatesEnabled(true);
+ viewport()->setUpdatesEnabled(true);
repaintChanged();
}
@@ -1738,13 +1738,13 @@ TQString RenderTextArea::text()
paragraphText = paragraphText.left(pl); //Snip invented space.
for (int l = 0; l < pl; ++l) {
if (lindex != w->lineOfChar(p, l)) {
- paragraphText.insert(l+ll++, TQString::tqfromLatin1("\n"));
+ paragraphText.insert(l+ll++, TQString::fromLatin1("\n"));
lindex = w->lineOfChar(p, l);
}
}
txt += paragraphText;
if (p < w->paragraphs() - 1)
- txt += TQString::tqfromLatin1("\n");
+ txt += TQString::fromLatin1("\n");
}
}
else
diff --git a/khtml/rendering/render_frames.cpp b/khtml/rendering/render_frames.cpp
index 9f58a0a4f..bc3f00be4 100644
--- a/khtml/rendering/render_frames.cpp
+++ b/khtml/rendering/render_frames.cpp
@@ -728,16 +728,16 @@ void RenderPartObject::updateWidget()
HTMLParamElementImpl *p = static_cast<HTMLParamElementImpl *>( child );
TQString aStr = p->name();
- aStr += TQString::tqfromLatin1("=\"");
+ aStr += TQString::fromLatin1("=\"");
aStr += p->value();
- aStr += TQString::tqfromLatin1("\"");
+ aStr += TQString::fromLatin1("\"");
TQString name_lower = p->name().lower();
- if (name_lower == TQString::tqfromLatin1("type") && objbase->id() != ID_APPLET) {
+ if (name_lower == TQString::fromLatin1("type") && objbase->id() != ID_APPLET) {
objbase->setServiceType(p->value());
} else if (url.isEmpty() &&
- (name_lower == TQString::tqfromLatin1("src") ||
- name_lower == TQString::tqfromLatin1("movie") ||
- name_lower == TQString::tqfromLatin1("code"))) {
+ (name_lower == TQString::fromLatin1("src") ||
+ name_lower == TQString::fromLatin1("movie") ||
+ name_lower == TQString::fromLatin1("code"))) {
url = p->value();
}
params.append(aStr);
@@ -754,8 +754,8 @@ void RenderPartObject::updateWidget()
}
}
}
- params.append( TQString::tqfromLatin1("__KHTML__PLUGINEMBED=\"YES\"") );
- params.append( TQString::tqfromLatin1("__KHTML__PLUGINBASEURL=\"%1\"").arg(element()->getDocument()->baseURL().url()));
+ params.append( TQString::fromLatin1("__KHTML__PLUGINEMBED=\"YES\"") );
+ params.append( TQString::fromLatin1("__KHTML__PLUGINBASEURL=\"%1\"").arg(element()->getDocument()->baseURL().url()));
HTMLEmbedElementImpl *embed = 0;
TQString classId;
@@ -775,18 +775,18 @@ void RenderPartObject::updateWidget()
}
classId = objbase->classId;
- params.append( TQString::tqfromLatin1("__KHTML__CLASSID=\"%1\"").arg( classId ) );
- params.append( TQString::tqfromLatin1("__KHTML__CODEBASE=\"%1\"").arg( objbase->getAttribute(ATTR_CODEBASE).string() ) );
+ params.append( TQString::fromLatin1("__KHTML__CLASSID=\"%1\"").arg( classId ) );
+ params.append( TQString::fromLatin1("__KHTML__CODEBASE=\"%1\"").arg( objbase->getAttribute(ATTR_CODEBASE).string() ) );
if (!objbase->getAttribute(ATTR_WIDTH).isEmpty())
- params.append( TQString::tqfromLatin1("WIDTH=\"%1\"").arg( objbase->getAttribute(ATTR_WIDTH).string() ) );
+ params.append( TQString::fromLatin1("WIDTH=\"%1\"").arg( objbase->getAttribute(ATTR_WIDTH).string() ) );
else if (embed && !embed->getAttribute(ATTR_WIDTH).isEmpty()) {
- params.append( TQString::tqfromLatin1("WIDTH=\"%1\"").arg( embed->getAttribute(ATTR_WIDTH).string() ) );
+ params.append( TQString::fromLatin1("WIDTH=\"%1\"").arg( embed->getAttribute(ATTR_WIDTH).string() ) );
objbase->setAttribute(ATTR_WIDTH, embed->getAttribute(ATTR_WIDTH));
}
if (!objbase->getAttribute(ATTR_HEIGHT).isEmpty())
- params.append( TQString::tqfromLatin1("HEIGHT=\"%1\"").arg( objbase->getAttribute(ATTR_HEIGHT).string() ) );
+ params.append( TQString::fromLatin1("HEIGHT=\"%1\"").arg( objbase->getAttribute(ATTR_HEIGHT).string() ) );
else if (embed && !embed->getAttribute(ATTR_HEIGHT).isEmpty()) {
- params.append( TQString::tqfromLatin1("HEIGHT=\"%1\"").arg( embed->getAttribute(ATTR_HEIGHT).string() ) );
+ params.append( TQString::fromLatin1("HEIGHT=\"%1\"").arg( embed->getAttribute(ATTR_HEIGHT).string() ) );
objbase->setAttribute(ATTR_HEIGHT, embed->getAttribute(ATTR_HEIGHT));
}
@@ -808,7 +808,7 @@ void RenderPartObject::updateWidget()
serviceType = "application/x-activex-handler";
#endif
- if(classId.find(TQString::tqfromLatin1("D27CDB6E-AE6D-11cf-96B8-444553540000")) >= 0) {
+ if(classId.find(TQString::fromLatin1("D27CDB6E-AE6D-11cf-96B8-444553540000")) >= 0) {
// It is ActiveX, but the nsplugin system handling
// should also work, that's why we don't override the
// serviceType with application/x-activex-handler
@@ -817,17 +817,17 @@ void RenderPartObject::updateWidget()
// with nspluginviewer (Niko)
serviceType = "application/x-shockwave-flash";
}
- else if(classId.find(TQString::tqfromLatin1("CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA")) >= 0)
+ else if(classId.find(TQString::fromLatin1("CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA")) >= 0)
serviceType = "audio/x-pn-realaudio-plugin";
- else if(classId.find(TQString::tqfromLatin1("8AD9C840-044E-11D1-B3E9-00805F499D93")) >= 0 ||
- objbase->classId.find(TQString::tqfromLatin1("CAFEEFAC-0014-0000-0000-ABCDEFFEDCBA")) >= 0)
+ else if(classId.find(TQString::fromLatin1("8AD9C840-044E-11D1-B3E9-00805F499D93")) >= 0 ||
+ objbase->classId.find(TQString::fromLatin1("CAFEEFAC-0014-0000-0000-ABCDEFFEDCBA")) >= 0)
serviceType = "application/x-java-applet";
// http://www.apple.com/quicktime/tools_tips/tutorials/activex.html
- else if(classId.find(TQString::tqfromLatin1("02BF25D5-8C17-4B23-BC80-D3488ABDDC6B")) >= 0)
+ else if(classId.find(TQString::fromLatin1("02BF25D5-8C17-4B23-BC80-D3488ABDDC6B")) >= 0)
serviceType = "video/quicktime";
// http://msdn.microsoft.com/library/en-us/dnwmt/html/adding_windows_media_to_web_pages__etse.asp?frame=true
- else if(objbase->classId.find(TQString::tqfromLatin1("6BF52A52-394A-11d3-B153-00C04F79FAA6")) >= 0 ||
- classId.find(TQString::tqfromLatin1("22D6f312-B0F6-11D0-94AB-0080C74C7E95")) >= 0)
+ else if(objbase->classId.find(TQString::fromLatin1("6BF52A52-394A-11d3-B153-00C04F79FAA6")) >= 0 ||
+ classId.find(TQString::fromLatin1("22D6f312-B0F6-11D0-94AB-0080C74C7E95")) >= 0)
serviceType = "video/x-msvideo";
else
diff --git a/khtml/rendering/render_generated.cpp b/khtml/rendering/render_generated.cpp
index f5fc70687..ba80a5aa1 100644
--- a/khtml/rendering/render_generated.cpp
+++ b/khtml/rendering/render_generated.cpp
@@ -379,7 +379,7 @@ void RenderGlyph::paint(PaintInfo& paintInfo, int _tx, int _ty)
diamond[2] = TQPoint(x+s, y+2*s);
diamond[3] = TQPoint(x, y+s);
p->setBrush( color );
- p->tqdrawConvexPolygon( diamond, 0, 4 );
+ p->drawConvexPolygon( diamond, 0, 4 );
return;
}
case LNONE:
diff --git a/khtml/rendering/render_layer.cpp b/khtml/rendering/render_layer.cpp
index 3427bf1dc..e82e0d831 100644
--- a/khtml/rendering/render_layer.cpp
+++ b/khtml/rendering/render_layer.cpp
@@ -637,7 +637,7 @@ int RenderLayer::verticalScrollbarWidth()
#ifdef APPLE_CHANGES
return m_vBar->width();
#else
- return m_vBar->tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent);
+ return m_vBar->tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent);
#endif
}
@@ -650,7 +650,7 @@ int RenderLayer::horizontalScrollbarHeight()
#ifdef APPLE_CHANGES
return m_hBar->height();
#else
- return m_hBar->tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent);
+ return m_hBar->tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent);
#endif
}
@@ -691,7 +691,7 @@ void RenderLayer::positionScrollbars(const TQRect& absBounds)
TQScrollBar *b = m_hBar;
if (!m_hBar)
b = m_vBar;
- int sw = b->tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent);
+ int sw = b->tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent);
if (m_vBar) {
TQRect vBarRect = TQRect(tx + w - sw + 1, ty, sw, h - (m_hBar ? sw : 0) + 1);
diff --git a/khtml/rendering/render_list.cpp b/khtml/rendering/render_list.cpp
index c88f103d3..769b79670 100644
--- a/khtml/rendering/render_list.cpp
+++ b/khtml/rendering/render_list.cpp
@@ -333,7 +333,7 @@ void RenderListMarker::paint(PaintInfo& paintInfo, int _tx, int _ty)
diamond[2] = TQPoint(x+s, y+2*s);
diamond[3] = TQPoint(x, y+s);
p->setBrush( color );
- p->tqdrawConvexPolygon( diamond, 0, 4 );
+ p->drawConvexPolygon( diamond, 0, 4 );
return;
}
case LNONE:
@@ -344,21 +344,21 @@ void RenderListMarker::paint(PaintInfo& paintInfo, int _tx, int _ty)
if( style()->direction() == LTR) {
p->drawText(_tx, _ty, 0, 0, Qt::AlignLeft|TQt::DontClip, m_item);
p->drawText(_tx + fm.width(m_item), _ty, 0, 0, Qt::AlignLeft|TQt::DontClip,
- TQString::tqfromLatin1(". "));
+ TQString::fromLatin1(". "));
}
else {
- const TQString& punct(TQString::tqfromLatin1(" ."));
+ const TQString& punct(TQString::fromLatin1(" ."));
p->drawText(_tx, _ty, 0, 0, Qt::AlignLeft|TQt::DontClip, punct);
p->drawText(_tx + fm.width(punct), _ty, 0, 0, Qt::AlignLeft|TQt::DontClip, m_item);
}
} else {
if (style()->direction() == LTR) {
- const TQString& punct(TQString::tqfromLatin1(". "));
+ const TQString& punct(TQString::fromLatin1(". "));
p->drawText(_tx-offset/2, _ty, 0, 0, Qt::AlignRight|TQt::DontClip, punct);
p->drawText(_tx-offset/2-fm.width(punct), _ty, 0, 0, Qt::AlignRight|TQt::DontClip, m_item);
}
else {
- const TQString& punct(TQString::tqfromLatin1(" ."));
+ const TQString& punct(TQString::fromLatin1(" ."));
p->drawText(_tx+offset/2, _ty, 0, 0, Qt::AlignLeft|TQt::DontClip, punct);
p->drawText(_tx+offset/2+fm.width(punct), _ty, 0, 0, Qt::AlignLeft|TQt::DontClip, m_item);
}
@@ -543,7 +543,7 @@ void RenderListMarker::calcMinMaxWidth()
default:
KHTMLAssert(false);
}
- m_markerWidth = fm.width(m_item) + fm.width(TQString::tqfromLatin1(". "));
+ m_markerWidth = fm.width(m_item) + fm.width(TQString::fromLatin1(". "));
}
end:
diff --git a/khtml/rendering/render_object.cpp b/khtml/rendering/render_object.cpp
index 1fc72c7d8..e69991930 100644
--- a/khtml/rendering/render_object.cpp
+++ b/khtml/rendering/render_object.cpp
@@ -1164,15 +1164,15 @@ TQString RenderObject::information() const
<< " mB: " << marginBottom() << " qB: " << isBottomMarginQuirk()
<< "}"
<< (isTableCell() ?
- ( TQString::tqfromLatin1(" [r=") +
+ ( TQString::fromLatin1(" [r=") +
TQString::number( static_cast<const RenderTableCell *>(this)->row() ) +
- TQString::tqfromLatin1(" c=") +
+ TQString::fromLatin1(" c=") +
TQString::number( static_cast<const RenderTableCell *>(this)->col() ) +
- TQString::tqfromLatin1(" rs=") +
+ TQString::fromLatin1(" rs=") +
TQString::number( static_cast<const RenderTableCell *>(this)->rowSpan() ) +
- TQString::tqfromLatin1(" cs=") +
+ TQString::fromLatin1(" cs=") +
TQString::number( static_cast<const RenderTableCell *>(this)->colSpan() ) +
- TQString::tqfromLatin1("]") ) : TQString::null );
+ TQString::fromLatin1("]") ) : TQString::null );
if ( layer() )
ts << " layer=" << layer();
if ( continuation() )
diff --git a/khtml/rendering/render_replaced.cpp b/khtml/rendering/render_replaced.cpp
index 01379930a..f0a6f94a9 100644
--- a/khtml/rendering/render_replaced.cpp
+++ b/khtml/rendering/render_replaced.cpp
@@ -558,7 +558,7 @@ static void copyWidget(const TQRect& r, TQPainter *p, TQWidget *widget, int tx,
if ( external ) {
// even hackier!
TQPainter pt( pm );
- const TQColor c = widget->tqcolorGroup().base();
+ const TQColor c = widget->colorGroup().base();
for (int i = 0; i < cnt; ++i)
pt.fillRect( br[i], c );
} else {
@@ -672,7 +672,7 @@ bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e)
// don't allow the widget to react to wheel event unless its
// currently focused. this avoids accidentally changing a select box
// or something while wheeling a webpage.
- if (tqApp->tqfocusWidget() != widget() &&
+ if (tqApp->focusWidget() != widget() &&
widget()->focusPolicy() <= TQ_StrongFocus) {
TQT_TQWHEELEVENT(e)->ignore();
TQApplication::sendEvent(view(), e);
diff --git a/khtml/test_regression.cpp b/khtml/test_regression.cpp
index 93c2deea5..6da8d04f0 100644
--- a/khtml/test_regression.cpp
+++ b/khtml/test_regression.cpp
@@ -943,7 +943,7 @@ TQString RegressionTest::getPartOutput( OutputType type)
getPartDOMOutput( outputStream, m_part, 0 );
}
- dump.replace( m_baseDir + "/tests", TQString::tqfromLatin1( "REGRESSION_SRCDIR" ) );
+ dump.replace( m_baseDir + "/tests", TQString::fromLatin1( "REGRESSION_SRCDIR" ) );
return dump;
}
@@ -1138,7 +1138,7 @@ void RegressionTest::doFailureReport( const TQString& test, int failures )
if ( failures & RenderFailure ) {
renderDiff += "<pre>";
- FILE *pipe = popen( TQString::tqfromLatin1( "diff -u baseline/%1-render %3/%2-render" )
+ FILE *pipe = popen( TQString::fromLatin1( "diff -u baseline/%1-render %3/%2-render" )
.arg ( test, test, relOutputDir ).latin1(), "r" );
TQTextIStream *is = new TQTextIStream( pipe );
for ( int line = 0; line < 100 && !is->eof(); ++line ) {
@@ -1154,7 +1154,7 @@ void RegressionTest::doFailureReport( const TQString& test, int failures )
if ( failures & DomFailure ) {
domDiff += "<pre>";
- FILE *pipe = popen( TQString::tqfromLatin1( "diff -u baseline/%1-dom %3/%2-dom" )
+ FILE *pipe = popen( TQString::fromLatin1( "diff -u baseline/%1-dom %3/%2-dom" )
.arg ( test, test, relOutputDir ).latin1(), "r" );
TQTextIStream *is = new TQTextIStream( pipe );
for ( int line = 0; line < 100 && !is->eof(); ++line ) {
diff --git a/khtml/test_regression_fontoverload.cpp b/khtml/test_regression_fontoverload.cpp
index 93f698ed2..2e0d86b98 100644
--- a/khtml/test_regression_fontoverload.cpp
+++ b/khtml/test_regression_fontoverload.cpp
@@ -98,7 +98,7 @@ QFakeFontEngine::QFakeFontEngine( XFontStruct *fs, const char *name, int size )
: QFontEngineXLFD( fs, name, 0)
{
pixS = size;
- ahem = TQString::tqfromLatin1(name).contains("ahem");
+ ahem = TQString::fromLatin1(name).contains("ahem");
}
QFakeFontEngine::~QFakeFontEngine()
diff --git a/khtml/testkhtml.cpp b/khtml/testkhtml.cpp
index 4a2b2daa1..7765cee8a 100644
--- a/khtml/testkhtml.cpp
+++ b/khtml/testkhtml.cpp
@@ -123,7 +123,7 @@ int main(int argc, char *argv[])
doc->setURLCursor(TQCursor(Qt::PointingHandCursor));
a.setTopWidget(doc->widget());
TQWidget::connect(doc, TQT_SIGNAL(setWindowCaption(const TQString &)),
- doc->widget()->tqtopLevelWidget(), TQT_SLOT(setCaption(const TQString &)));
+ doc->widget()->topLevelWidget(), TQT_SLOT(setCaption(const TQString &)));
doc->widget()->show();
toplevel->show();
((TQScrollView *)doc->widget())->viewport()->show();
@@ -142,7 +142,7 @@ void Dummy::doBenchmark()
results.clear();
TQString directory = KFileDialog::getExistingDirectory(settings.readPathEntry("path"), m_part->view(),
- TQString::tqfromLatin1("Please select directory with tests"));
+ TQString::fromLatin1("Please select directory with tests"));
if (!directory.isEmpty()) {
settings.writePathEntry("path", directory);
@@ -184,14 +184,14 @@ void Dummy::nextRun()
for (int pos = 0; pos < timings.size(); ++pos) {
int t = timings[pos];
if (pos < COLD_RUNS)
- m_part->write(TQString::tqfromLatin1("<td>(Cold):") + TQString::number(t) + "</td>");
+ m_part->write(TQString::fromLatin1("<td>(Cold):") + TQString::number(t) + "</td>");
else {
total += t;
- m_part->write(TQString::tqfromLatin1("<td><i>") + TQString::number(t) + "</i></td>");
+ m_part->write(TQString::fromLatin1("<td><i>") + TQString::number(t) + "</i></td>");
}
}
- m_part->write(TQString::tqfromLatin1("<td>Average:<b>") + TQString::number(double(total) / HOT_RUNS) + "</b></td>");
+ m_part->write(TQString::fromLatin1("<td>Average:<b>") + TQString::number(double(total) / HOT_RUNS) + "</b></td>");
m_part->write("</tr>");
}
diff --git a/khtml/xml/dom2_eventsimpl.cpp b/khtml/xml/dom2_eventsimpl.cpp
index c49a03e78..596edfbaa 100644
--- a/khtml/xml/dom2_eventsimpl.cpp
+++ b/khtml/xml/dom2_eventsimpl.cpp
@@ -48,7 +48,7 @@ EventImpl::EventImpl()
m_currentTarget = 0;
m_eventPhase = 0;
m_target = 0;
- m_createTime = TQDateTime::tqcurrentDateTime();
+ m_createTime = TQDateTime::currentDateTime();
m_defaultHandled = false;
}
@@ -67,7 +67,7 @@ EventImpl::EventImpl(EventId _id, bool canBubbleArg, bool cancelableArg)
m_currentTarget = 0;
m_eventPhase = 0;
m_target = 0;
- m_createTime = TQDateTime::tqcurrentDateTime();
+ m_createTime = TQDateTime::currentDateTime();
m_defaultHandled = false;
}
@@ -739,7 +739,7 @@ DOMString KeyboardEventImpl::keyIdentifier() const
{
if (unsigned special = virtKeyVal())
if (const char* id = keyIdentifiersToVirtKeys()->toLeft(special))
- return TQString::tqfromLatin1(id);
+ return TQString::fromLatin1(id);
if (unsigned tqunicode = keyVal())
return TQString(TQChar(tqunicode));
diff --git a/khtml/xml/dom_docimpl.cpp b/khtml/xml/dom_docimpl.cpp
index 0f70610ef..0b7f566de 100644
--- a/khtml/xml/dom_docimpl.cpp
+++ b/khtml/xml/dom_docimpl.cpp
@@ -1387,7 +1387,7 @@ void DocumentImpl::write( const TQString &text )
if (m_view)
m_view->part()->resetFromScript();
m_tokenizer->setAutoClose();
- write(TQString::tqfromLatin1("<html>"));
+ write(TQString::fromLatin1("<html>"));
}
m_tokenizer->write(text, false);
}
diff --git a/kimgio/dds.cpp b/kimgio/dds.cpp
index 1beb025cf..1a2edee84 100644
--- a/kimgio/dds.cpp
+++ b/kimgio/dds.cpp
@@ -964,7 +964,7 @@ KDE_EXPORT void kimgio_dds_read( TQImageIO *io )
if( fourcc != FOURCC_DDS ) {
kdDebug(399) << "This is not a DDS file." << endl;
io->setImage( TQImage() );
- io->setqStatus( -1 );
+ io->seStatus( -1 );
return;
}
@@ -976,7 +976,7 @@ KDE_EXPORT void kimgio_dds_read( TQImageIO *io )
if( s.atEnd() || !IsValid( header ) ) {
kdDebug(399) << "This DDS file is not valid." << endl;
io->setImage( TQImage() );
- io->setqStatus( -1 );
+ io->seStatus( -1 );
return;
}
@@ -984,7 +984,7 @@ KDE_EXPORT void kimgio_dds_read( TQImageIO *io )
if( !IsSupported( header ) ) {
kdDebug(399) << "This DDS file is not supported." << endl;
io->setImage( TQImage() );
- io->setqStatus( -1 );
+ io->seStatus( -1 );
return;
}
@@ -1002,12 +1002,12 @@ KDE_EXPORT void kimgio_dds_read( TQImageIO *io )
if( result == false ) {
kdDebug(399) << "Error loading DDS file." << endl;
io->setImage( TQImage() );
- io->setqStatus( -1 );
+ io->seStatus( -1 );
return;
}
io->setImage( img );
- io->setqStatus( 0 );
+ io->seStatus( 0 );
}
diff --git a/kimgio/eps.cpp b/kimgio/eps.cpp
index a2770cc75..a06d43be3 100644
--- a/kimgio/eps.cpp
+++ b/kimgio/eps.cpp
@@ -234,7 +234,7 @@ KDE_EXPORT void kimgio_eps_read (TQImageIO *image)
TQImage myimage;
if( myimage.load (tmpFile.name()) ) {
image->setImage (myimage);
- image->setqStatus (0);
+ image->seStatus (0);
kdDebug(399) << "kimgio EPS: success!" << endl;
}
else
@@ -290,5 +290,5 @@ KDE_EXPORT void kimgio_eps_write( TQImageIO *imageio )
inFile.close();
- imageio->setqStatus(0);
+ imageio->seStatus(0);
}
diff --git a/kimgio/exr.cpp b/kimgio/exr.cpp
index 2af22b345..88b3fbbbe 100644
--- a/kimgio/exr.cpp
+++ b/kimgio/exr.cpp
@@ -148,7 +148,7 @@ KDE_EXPORT void kimgio_exr_read( TQImageIO *io )
}
io->setImage( image );
- io->setqStatus( 0 );
+ io->seStatus( 0 );
}
catch (const std::exception &exc)
{
diff --git a/kimgio/hdr.cpp b/kimgio/hdr.cpp
index 82a2e111d..99bcccbbf 100644
--- a/kimgio/hdr.cpp
+++ b/kimgio/hdr.cpp
@@ -225,7 +225,7 @@ KDE_EXPORT void kimgio_hdr_read( TQImageIO * io )
{
kdDebug(399) << "Unknown HDR format." << endl;
io->setImage( TQImage() );
- io->setqStatus( -1 );
+ io->seStatus( -1 );
return;
}
@@ -238,7 +238,7 @@ KDE_EXPORT void kimgio_hdr_read( TQImageIO * io )
{
kdDebug(399) << "Invalid HDR file." << endl;
io->setImage( TQImage() );
- io->setqStatus( -1 );
+ io->seStatus( -1 );
return;
}
@@ -249,12 +249,12 @@ KDE_EXPORT void kimgio_hdr_read( TQImageIO * io )
{
kdDebug(399) << "Error loading HDR file." << endl;
io->setImage( TQImage() );
- io->setqStatus( -1 );
+ io->seStatus( -1 );
return;
}
io->setImage( img );
- io->setqStatus( 0 );
+ io->seStatus( 0 );
}
diff --git a/kimgio/ico.cpp b/kimgio/ico.cpp
index b7208e577..3188ac238 100644
--- a/kimgio/ico.cpp
+++ b/kimgio/ico.cpp
@@ -306,7 +306,7 @@ extern "C" KDE_EXPORT void kimgio_ico_read( TQImageIO* io )
icon.setText( "X-HotspotY", 0, TQString::number( selected->hotspotY ) );
}
io->setImage(icon);
- io->setqStatus(0);
+ io->seStatus(0);
}
}
diff --git a/kimgio/jp2.cpp b/kimgio/jp2.cpp
index 121e83287..4e74211e8 100644
--- a/kimgio/jp2.cpp
+++ b/kimgio/jp2.cpp
@@ -163,7 +163,7 @@ kimgio_jp2_read( TQImageIO* io )
if( gs.altimage ) jas_image_destroy( gs.altimage );
io->setImage( image );
- io->setqStatus( 0 );
+ io->seStatus( 0 );
} // kimgio_jp2_read
@@ -309,7 +309,7 @@ kimgio_jp2_write( TQImageIO* io )
// everything went fine
- io->setqStatus( IO_Ok );
+ io->seStatus( IO_Ok );
} // kimgio_jp2_write
#endif // HAVE_JASPER
diff --git a/kimgio/pcx.cpp b/kimgio/pcx.cpp
index e823ebb8d..bda7ef495 100644
--- a/kimgio/pcx.cpp
+++ b/kimgio/pcx.cpp
@@ -269,7 +269,7 @@ KDE_EXPORT void kimgio_pcx_read( TQImageIO *io )
if ( s.tqdevice()->size() < 128 )
{
- io->setqStatus( -1 );
+ io->seStatus( -1 );
return;
}
@@ -279,7 +279,7 @@ KDE_EXPORT void kimgio_pcx_read( TQImageIO *io )
if ( header.Manufacturer != 10 || s.atEnd())
{
- io->setqStatus( -1 );
+ io->seStatus( -1 );
return;
}
@@ -323,11 +323,11 @@ KDE_EXPORT void kimgio_pcx_read( TQImageIO *io )
if ( !img.isNull() )
{
io->setImage( img );
- io->setqStatus( 0 );
+ io->seStatus( 0 );
}
else
{
- io->setqStatus( -1 );
+ io->seStatus( -1 );
}
}
@@ -526,7 +526,7 @@ KDE_EXPORT void kimgio_pcx_write( TQImageIO *io )
writeImage24( img, s, header );
}
- io->setqStatus( 0 );
+ io->seStatus( 0 );
}
/* vim: et sw=2 ts=2
diff --git a/kimgio/psd.cpp b/kimgio/psd.cpp
index d400257aa..5fa0d81a1 100644
--- a/kimgio/psd.cpp
+++ b/kimgio/psd.cpp
@@ -250,7 +250,7 @@ void kimgio_psd_read( TQImageIO *io )
if( s.atEnd() || !IsValid( header ) ) {
kdDebug(399) << "This PSD file is not valid." << endl;
io->setImage( TQImage() );
- io->setqStatus( -1 );
+ io->seStatus( -1 );
return;
}
@@ -258,7 +258,7 @@ void kimgio_psd_read( TQImageIO *io )
if( !IsSupported( header ) ) {
kdDebug(399) << "This PSD file is not supported." << endl;
io->setImage( TQImage() );
- io->setqStatus( -1 );
+ io->seStatus( -1 );
return;
}
@@ -266,12 +266,12 @@ void kimgio_psd_read( TQImageIO *io )
if( !LoadPSD(s, header, img) ) {
kdDebug(399) << "Error loading PSD file." << endl;
io->setImage( TQImage() );
- io->setqStatus( -1 );
+ io->seStatus( -1 );
return;
}
io->setImage( img );
- io->setqStatus( 0 );
+ io->seStatus( 0 );
}
diff --git a/kimgio/rgb.cpp b/kimgio/rgb.cpp
index da3888c99..68da172fb 100644
--- a/kimgio/rgb.cpp
+++ b/kimgio/rgb.cpp
@@ -38,12 +38,12 @@ KDE_EXPORT void kimgio_rgb_read(TQImageIO *io)
if (!sgi.readImage(img)) {
io->setImage(TQImage());
- io->setqStatus(-1);
+ io->seStatus(-1);
return;
}
io->setImage(img);
- io->setqStatus(0);
+ io->seStatus(0);
}
@@ -53,9 +53,9 @@ KDE_EXPORT void kimgio_rgb_write(TQImageIO *io)
TQImage img = io->image();
if (!sgi.writeImage(img))
- io->setqStatus(-1);
+ io->seStatus(-1);
- io->setqStatus(0);
+ io->seStatus(0);
}
diff --git a/kimgio/tga.cpp b/kimgio/tga.cpp
index 0b7c3df1e..0a90aa514 100644
--- a/kimgio/tga.cpp
+++ b/kimgio/tga.cpp
@@ -330,7 +330,7 @@ KDE_EXPORT void kimgio_tga_read( TQImageIO *io )
if( s.atEnd() ) {
kdDebug(399) << "This TGA file is not valid." << endl;
io->setImage( TQImage() );
- io->setqStatus( -1 );
+ io->seStatus( -1 );
return;
}
@@ -338,7 +338,7 @@ KDE_EXPORT void kimgio_tga_read( TQImageIO *io )
if( !IsSupported(tga) ) {
kdDebug(399) << "This TGA file is not supported." << endl;
io->setImage( TQImage() );
- io->setqStatus( -1 );
+ io->seStatus( -1 );
return;
}
@@ -349,13 +349,13 @@ KDE_EXPORT void kimgio_tga_read( TQImageIO *io )
if( result == false ) {
kdDebug(399) << "Error loading TGA file." << endl;
io->setImage( TQImage() );
- io->setqStatus( -1 );
+ io->seStatus( -1 );
return;
}
io->setImage( img );
- io->setqStatus( 0 );
+ io->seStatus( 0 );
}
@@ -385,6 +385,6 @@ KDE_EXPORT void kimgio_tga_write( TQImageIO *io )
s << TQ_UINT8( tqAlpha( color ) );
}
- io->setqStatus( 0 );
+ io->seStatus( 0 );
}
diff --git a/kimgio/tiffr.cpp b/kimgio/tiffr.cpp
index 0d3e1d062..2dcf28b9d 100644
--- a/kimgio/tiffr.cpp
+++ b/kimgio/tiffr.cpp
@@ -140,7 +140,7 @@ KDE_EXPORT void kimgio_tiff_read( TQImageIO *io )
TIFFClose( tiff );
io->setImage( image );
- io->setqStatus ( 0 );
+ io->seStatus ( 0 );
}
KDE_EXPORT void kimgio_tiff_write( TQImageIO * )
diff --git a/kimgio/xcf.cpp b/kimgio/xcf.cpp
index ff74f1576..6a87ec237 100644
--- a/kimgio/xcf.cpp
+++ b/kimgio/xcf.cpp
@@ -42,7 +42,7 @@ KDE_EXPORT void kimgio_xcf_read(TQImageIO *io)
KDE_EXPORT void kimgio_xcf_write(TQImageIO *io)
{
kdDebug(399) << "XCF: write support not implemented" << endl;
- io->setqStatus(-1);
+ io->seStatus(-1);
}
///////////////////////////////////////////////////////////////////////////////
@@ -190,7 +190,7 @@ kdDebug() << tag << " " << xcf_image.width << " " << xcf_image.height << " " <<
}
io->setImage(xcf_image.image);
- io->setqStatus(0);
+ io->seStatus(0);
}
diff --git a/kimgio/xview.cpp b/kimgio/xview.cpp
index 3ba866c40..169ad1aa8 100644
--- a/kimgio/xview.cpp
+++ b/kimgio/xview.cpp
@@ -94,7 +94,7 @@ KDE_EXPORT void kimgio_xv_read( TQImageIO *_imageio )
}
_imageio->setImage( image );
- _imageio->setqStatus( 0 );
+ _imageio->seStatus( 0 );
free(block);
return;
@@ -164,6 +164,6 @@ KDE_EXPORT void kimgio_xv_write( TQImageIO *imageio )
}
delete[] buffer;
- imageio->setqStatus( 0 );
+ imageio->seStatus( 0 );
}
diff --git a/kinit/klauncher.cpp b/kinit/klauncher.cpp
index 47b3b5f42..69a2e10d2 100644
--- a/kinit/klauncher.cpp
+++ b/kinit/klauncher.cpp
@@ -182,7 +182,7 @@ KLauncher::KLauncher(int _tdeinitSocket, bool new_startup)
objId(), "terminateKDE()", false );
TQString prefix = locateLocal("socket", "klauncher");
- KTempFile domainname(prefix, TQString::tqfromLatin1(".slave-socket"));
+ KTempFile domainname(prefix, TQString::fromLatin1(".slave-socket"));
if (domainname.status() != 0)
{
// Sever error!
diff --git a/kinit/tests/klaunchertest.cpp b/kinit/tests/klaunchertest.cpp
index 46a4e5635..f246e7086 100644
--- a/kinit/tests/klaunchertest.cpp
+++ b/kinit/tests/klaunchertest.cpp
@@ -39,13 +39,13 @@ int main(int argc, char *argv[])
TQCString dcopService;
int pid;
int result = KApplication::startServiceByDesktopName(
- TQString::tqfromLatin1("konsole"), TQString::null, &error, &dcopService, &pid );
+ TQString::fromLatin1("konsole"), TQString::null, &error, &dcopService, &pid );
printf("Result = %d, error = \"%s\", dcopService = \"%s\", pid = %d\n",
result, error.ascii(), dcopService.data(), pid);
result = KApplication::startServiceByDesktopName(
- TQString::tqfromLatin1("konqueror"), TQString::null, &error, &dcopService, &pid );
+ TQString::fromLatin1("konqueror"), TQString::null, &error, &dcopService, &pid );
printf("Result = %d, error = \"%s\", dcopService = \"%s\", pid = %d\n",
result, error.ascii(), dcopService.data(), pid);
diff --git a/kio/bookmarks/kbookmark.cc b/kio/bookmarks/kbookmark.cc
index 9721788a2..44b8b496c 100644
--- a/kio/bookmarks/kbookmark.cc
+++ b/kio/bookmarks/kbookmark.cc
@@ -447,7 +447,7 @@ void KBookmark::updateAccessMetadata()
{
kdDebug(7043) << "KBookmark::updateAccessMetadata " << address() << " " << url().prettyURL() << endl;
- const uint timet = TQDateTime::tqcurrentDateTime().toTime_t();
+ const uint timet = TQDateTime::currentDateTime().toTime_t();
setMetaDataItem( "time_added", TQString::number( timet ), DontOverwriteMetaData );
setMetaDataItem( "time_visited", TQString::number( timet ) );
diff --git a/kio/bookmarks/kbookmarkbar.cc b/kio/bookmarks/kbookmarkbar.cc
index 158caf373..08c34061b 100644
--- a/kio/bookmarks/kbookmarkbar.cc
+++ b/kio/bookmarks/kbookmarkbar.cc
@@ -313,7 +313,7 @@ static TQString handleToolbarDragMoveEvent(
int index = 0;
KToolBarButton* b;
- b = dynamic_cast<KToolBarButton*>(tb->tqchildAt(pos));
+ b = dynamic_cast<KToolBarButton*>(tb->childAt(pos));
KAction *a = 0;
TQString address;
atFirst = false;
@@ -394,7 +394,7 @@ static KAction* handleToolbarMouseButton(TQPoint pos, TQPtrList<KAction> actions
Q_ASSERT(tb);
KToolBarButton *b;
- b = dynamic_cast<KToolBarButton*>(tb->tqchildAt(pos));
+ b = dynamic_cast<KToolBarButton*>(tb->childAt(pos));
if (!b)
return 0;
diff --git a/kio/bookmarks/kbookmarkimporter_ns.cc b/kio/bookmarks/kbookmarkimporter_ns.cc
index e4e074107..5521bee7e 100644
--- a/kio/bookmarks/kbookmarkimporter_ns.cc
+++ b/kio/bookmarks/kbookmarkimporter_ns.cc
@@ -191,7 +191,7 @@ void KNSBookmarkExporterImpl::write(KBookmarkGroup parent) {
fstream.setEncoding(m_utf8 ? TQTextStream::UnicodeUTF8 : TQTextStream::Locale);
TQString charset
- = m_utf8 ? "UTF-8" : TQString::tqfromLatin1(TQTextCodec::codecForLocale()->name()).upper();
+ = m_utf8 ? "UTF-8" : TQString::fromLatin1(TQTextCodec::codecForLocale()->name()).upper();
fstream << "<!DOCTYPE NETSCAPE-Bookmark-file-1>" << endl
<< i18n("<!-- This file was generated by Konqueror -->") << endl
diff --git a/kio/bookmarks/kbookmarkmanager.cc b/kio/bookmarks/kbookmarkmanager.cc
index 250d62a59..96ce12896 100644
--- a/kio/bookmarks/kbookmarkmanager.cc
+++ b/kio/bookmarks/kbookmarkmanager.cc
@@ -329,7 +329,7 @@ bool KBookmarkManager::saveAs( const TQString & filename, bool toolbarCache ) co
// Save the bookmark toolbar folder for quick loading
// but only when it will actually make things quicker
- const TQString cacheFilename = filename + TQString::tqfromLatin1(".tbcache");
+ const TQString cacheFilename = filename + TQString::fromLatin1(".tbcache");
if(toolbarCache && !root().isToolbarGroup())
{
KSaveFile cacheFile( cacheFilename );
@@ -388,7 +388,7 @@ KBookmarkGroup KBookmarkManager::toolbar()
if(!m_docIsLoaded)
{
kdDebug(7043) << "KBookmarkManager::toolbar trying cache" << endl;
- const TQString cacheFilename = m_bookmarksFile + TQString::tqfromLatin1(".tbcache");
+ const TQString cacheFilename = m_bookmarksFile + TQString::fromLatin1(".tbcache");
TQFileInfo bmInfo(m_bookmarksFile);
TQFileInfo cacheInfo(cacheFilename);
if (m_toolbarDoc.isNull() &&
@@ -614,11 +614,11 @@ void KBookmarkManager::setEditorOptions( const TQString& caption, bool browser )
void KBookmarkManager::slotEditBookmarks()
{
KProcess proc;
- proc << TQString::tqfromLatin1("keditbookmarks");
+ proc << TQString::fromLatin1("keditbookmarks");
if (!dptr()->m_editorCaption.isNull())
- proc << TQString::tqfromLatin1("--customcaption") << dptr()->m_editorCaption;
+ proc << TQString::fromLatin1("--customcaption") << dptr()->m_editorCaption;
if (!dptr()->m_browserEditor)
- proc << TQString::tqfromLatin1("--nobrowser");
+ proc << TQString::fromLatin1("--nobrowser");
proc << m_bookmarksFile;
proc.start(KProcess::DontCare);
}
@@ -626,8 +626,8 @@ void KBookmarkManager::slotEditBookmarks()
void KBookmarkManager::slotEditBookmarksAtAddress( const TQString& address )
{
KProcess proc;
- proc << TQString::tqfromLatin1("keditbookmarks")
- << TQString::tqfromLatin1("--address") << address
+ proc << TQString::fromLatin1("keditbookmarks")
+ << TQString::fromLatin1("--address") << address
<< m_bookmarksFile;
proc.start(KProcess::DontCare);
}
@@ -690,7 +690,7 @@ void KBookmarkManager::updateFavicon( const TQString &url, const TQString &favic
TQString KBookmarkManager::userBookmarksFile()
{
- return locateLocal("data", TQString::tqfromLatin1("konqueror/bookmarks.xml"));
+ return locateLocal("data", TQString::fromLatin1("konqueror/bookmarks.xml"));
}
KBookmarkManager* KBookmarkManager::userBookmarksManager()
diff --git a/kio/httpfilter/httpfilter.cc b/kio/httpfilter/httpfilter.cc
index a7e8c87c9..6a5a1346c 100644
--- a/kio/httpfilter/httpfilter.cc
+++ b/kio/httpfilter/httpfilter.cc
@@ -81,7 +81,7 @@ HTTPFilterMD5::HTTPFilterMD5()
TQString
HTTPFilterMD5::md5()
{
- return TQString::tqfromLatin1(context.base64Digest());
+ return TQString::fromLatin1(context.base64Digest());
}
void
diff --git a/kio/kfile/config-kfile.h b/kio/kfile/config-kfile.h
index 3c5b7c09b..8715ed273 100644
--- a/kio/kfile/config-kfile.h
+++ b/kio/kfile/config-kfile.h
@@ -3,7 +3,7 @@
const int kfile_area = 250;
-#define DefaultViewStyle TQString::tqfromLatin1("SimpleView")
+#define DefaultViewStyle TQString::fromLatin1("SimpleView")
#define DefaultPannerPosition 40
#define DefaultMixDirsAndFiles false
#define DefaultShowStatusLine false
@@ -14,19 +14,19 @@ const int kfile_area = 250;
#define DefaultRecentURLsNumber 15
#define DefaultDirectoryFollowing true
#define DefaultAutoSelectExtChecked true
-#define ConfigGroup TQString::tqfromLatin1("KFileDialog Settings")
-#define RecentURLs TQString::tqfromLatin1("Recent URLs")
-#define RecentFiles TQString::tqfromLatin1("Recent Files")
-#define RecentURLsNumber TQString::tqfromLatin1("Maximum of recent URLs")
-#define RecentFilesNumber TQString::tqfromLatin1("Maximum of recent files")
-#define DialogWidth TQString::tqfromLatin1("Width (%1)")
-#define DialogHeight TQString::tqfromLatin1("Height (%1)")
-#define ConfigShowStatusLine TQString::tqfromLatin1("ShowStatusLine")
-#define AutoDirectoryFollowing TQString::tqfromLatin1("Automatic directory following")
-#define PathComboCompletionMode TQString::tqfromLatin1("PathCombo Completionmode")
-#define LocationComboCompletionMode TQString::tqfromLatin1("LocationCombo Completionmode")
-#define ShowSpeedbar TQString::tqfromLatin1("Show Speedbar")
-#define ShowBookmarks TQString::tqfromLatin1("Show Bookmarks")
-#define AutoSelectExtChecked TQString::tqfromLatin1("Automatically select filename extension")
+#define ConfigGroup TQString::fromLatin1("KFileDialog Settings")
+#define RecentURLs TQString::fromLatin1("Recent URLs")
+#define RecentFiles TQString::fromLatin1("Recent Files")
+#define RecentURLsNumber TQString::fromLatin1("Maximum of recent URLs")
+#define RecentFilesNumber TQString::fromLatin1("Maximum of recent files")
+#define DialogWidth TQString::fromLatin1("Width (%1)")
+#define DialogHeight TQString::fromLatin1("Height (%1)")
+#define ConfigShowStatusLine TQString::fromLatin1("ShowStatusLine")
+#define AutoDirectoryFollowing TQString::fromLatin1("Automatic directory following")
+#define PathComboCompletionMode TQString::fromLatin1("PathCombo Completionmode")
+#define LocationComboCompletionMode TQString::fromLatin1("LocationCombo Completionmode")
+#define ShowSpeedbar TQString::fromLatin1("Show Speedbar")
+#define ShowBookmarks TQString::fromLatin1("Show Bookmarks")
+#define AutoSelectExtChecked TQString::fromLatin1("Automatically select filename extension")
#endif
diff --git a/kio/kfile/kacleditwidget.cpp b/kio/kfile/kacleditwidget.cpp
index 99fed814f..64cb16b4b 100644
--- a/kio/kfile/kacleditwidget.cpp
+++ b/kio/kfile/kacleditwidget.cpp
@@ -582,14 +582,14 @@ KACLListView::KACLListView( TQWidget* parent, const char* name )
struct passwd *user = 0;
setpwent();
while ( ( user = getpwent() ) != 0 ) {
- m_allUsers << TQString::tqfromLatin1( user->pw_name );
+ m_allUsers << TQString::fromLatin1( user->pw_name );
}
endpwent();
struct group *gr = 0;
setgrent();
while ( ( gr = getgrent() ) != 0 ) {
- m_allGroups << TQString::tqfromLatin1( gr->gr_name );
+ m_allGroups << TQString::fromLatin1( gr->gr_name );
}
endgrent();
m_allUsers.sort();
diff --git a/kio/kfile/kcombiview.cpp b/kio/kfile/kcombiview.cpp
index 41b4176fa..8ba9d29bb 100644
--- a/kio/kfile/kcombiview.cpp
+++ b/kio/kfile/kcombiview.cpp
@@ -300,7 +300,7 @@ void KCombiView::slotSortingChanged( TQDir::SortSpec sorting )
KFileView *KCombiView::focusView( KFileView *preferred ) const
{
- TQWidget *w = tqfocusWidget();
+ TQWidget *w = focusWidget();
KFileView *other = (right == preferred) ? left : right;
return (preferred && w == preferred->widget()) ? preferred : other;
}
diff --git a/kio/kfile/kdiroperator.cpp b/kio/kfile/kdiroperator.cpp
index 753ba1b3a..c5e339b1a 100644
--- a/kio/kfile/kdiroperator.cpp
+++ b/kio/kfile/kdiroperator.cpp
@@ -111,13 +111,13 @@ KDirOperator::KDirOperator(const KURL& _url,
TQString strPath = TQDir::currentDirPath();
strPath.append('/');
currUrl = KURL();
- currUrl.setProtocol(TQString::tqfromLatin1("file"));
+ currUrl.setProtocol(TQString::fromLatin1("file"));
currUrl.setPath(strPath);
}
else {
currUrl = _url;
if ( currUrl.protocol().isEmpty() )
- currUrl.setProtocol(TQString::tqfromLatin1("file"));
+ currUrl.setProtocol(TQString::fromLatin1("file"));
currUrl.addPath("/"); // make sure we have a trailing slash!
}
@@ -414,7 +414,7 @@ bool KDirOperator::mkdir( const TQString& directory, bool enterDirectory )
{
url.addPath( *it );
exists = KIO::NetAccess::exists( url, false, 0 );
- writeOk = !exists && KIO::NetAccess::mkdir( url, tqtopLevelWidget() );
+ writeOk = !exists && KIO::NetAccess::mkdir( url, topLevelWidget() );
}
if ( exists ) // url was already existant
@@ -484,7 +484,7 @@ KIO::DeleteJob * KDirOperator::del( const KFileItemList& items,
if ( doIt ) {
KIO::DeleteJob *job = KIO::del( urls, false, showProgress );
- job->setWindow (tqtopLevelWidget());
+ job->setWindow (topLevelWidget());
job->setAutoErrorHandlingEnabled( true, parent );
return job;
}
@@ -547,7 +547,7 @@ KIO::CopyJob * KDirOperator::trash( const KFileItemList& items,
if ( doIt ) {
KIO::CopyJob *job = KIO::trash( urls, showProgress );
- job->setWindow (tqtopLevelWidget());
+ job->setWindow (topLevelWidget());
job->setAutoErrorHandlingEnabled( true, parent );
return job;
}
@@ -651,7 +651,7 @@ void KDirOperator::setURL(const KURL& _newurl, bool clearforward)
if ( !isReadable( newurl ) ) {
// maybe newurl is a file? check its parent directory
- newurl.cd(TQString::tqfromLatin1(".."));
+ newurl.cd(TQString::fromLatin1(".."));
if ( !isReadable( newurl ) ) {
resetCursor();
KMessageBox::error(viewWidget(),
@@ -777,7 +777,7 @@ KURL KDirOperator::url() const
void KDirOperator::cdUp()
{
KURL tmp(currUrl);
- tmp.cd(TQString::tqfromLatin1(".."));
+ tmp.cd(TQString::fromLatin1(".."));
setURL(tmp, true);
}
@@ -1120,7 +1120,7 @@ void KDirOperator::setDirLister( KDirLister *lister )
dir->setAutoUpdate( true );
- TQWidget* mainWidget = tqtopLevelWidget();
+ TQWidget* mainWidget = topLevelWidget();
dir->setMainWindow (mainWidget);
kdDebug (kfile_area) << "mainWidget=" << mainWidget << endl;
@@ -1253,7 +1253,7 @@ void KDirOperator::slotCompletionMatch(const TQString& match)
void KDirOperator::setupActions()
{
- myActionCollection = new KActionCollection( tqtopLevelWidget(), TQT_TQOBJECT(this), "KDirOperator::myActionCollection" );
+ myActionCollection = new KActionCollection( topLevelWidget(), TQT_TQOBJECT(this), "KDirOperator::myActionCollection" );
actionMenu = new KActionMenu( i18n("Menu"), myActionCollection, "popupMenu" );
upAction = KStdAction::up( TQT_TQOBJECT(this), TQT_SLOT( cdUp() ), myActionCollection, "up" );
@@ -1273,7 +1273,7 @@ void KDirOperator::setupActions()
this, TQT_SLOT( trashSelected( KAction::ActivationReason, TQt::ButtonState ) ) );
new KAction( i18n( "Delete" ), "editdelete", SHIFT+Key_Delete, TQT_TQOBJECT(this),
TQT_SLOT( deleteSelected() ), myActionCollection, "delete" );
- mkdirAction->setIcon( TQString::tqfromLatin1("folder_new") );
+ mkdirAction->setIcon( TQString::fromLatin1("folder_new") );
reloadAction->setText( i18n("Reload") );
reloadAction->setShortcut( KStdAccel::shortcut( KStdAccel::Reload ));
@@ -1293,7 +1293,7 @@ void KDirOperator::setupActions()
TQT_TQOBJECT(this), TQT_SLOT( slotSortReversed() ),
myActionCollection, "reversed" );
- TQString sortGroup = TQString::tqfromLatin1("sort");
+ TQString sortGroup = TQString::fromLatin1("sort");
byNameAction->setExclusiveGroup( sortGroup );
byDateAction->setExclusiveGroup( sortGroup );
bySizeAction->setExclusiveGroup( sortGroup );
@@ -1337,7 +1337,7 @@ void KDirOperator::setupActions()
TQT_SLOT( togglePreview( bool )));
- TQString viewGroup = TQString::tqfromLatin1("view");
+ TQString viewGroup = TQString::fromLatin1("view");
shortAction->setExclusiveGroup( viewGroup );
detailedAction->setExclusiveGroup( viewGroup );
@@ -1386,7 +1386,7 @@ void KDirOperator::setupMenu(int whichActions)
if (currUrl.isLocalFile() && !(KApplication::keyboardMouseState() & TQt::ShiftButton))
actionMenu->insert( myActionCollection->action( "trash" ) );
KConfig *globalconfig = KGlobal::config();
- KConfigGroupSaver cs( globalconfig, TQString::tqfromLatin1("KDE") );
+ KConfigGroupSaver cs( globalconfig, TQString::fromLatin1("KDE") );
if (!currUrl.isLocalFile() || (KApplication::keyboardMouseState() & TQt::ShiftButton) ||
globalconfig->readBoolEntry("ShowDeleteCommand", false))
actionMenu->insert( myActionCollection->action( "delete" ) );
@@ -1450,45 +1450,45 @@ void KDirOperator::readConfig( KConfig *kc, const TQString& group )
defaultView = 0;
int sorting = 0;
- TQString viewStyle = kc->readEntry( TQString::tqfromLatin1("View Style"),
- TQString::tqfromLatin1("Simple") );
- if ( viewStyle == TQString::tqfromLatin1("Detail") )
+ TQString viewStyle = kc->readEntry( TQString::fromLatin1("View Style"),
+ TQString::fromLatin1("Simple") );
+ if ( viewStyle == TQString::fromLatin1("Detail") )
defaultView |= KFile::Detail;
else
defaultView |= KFile::Simple;
- if ( kc->readBoolEntry( TQString::tqfromLatin1("Separate Directories"),
+ if ( kc->readBoolEntry( TQString::fromLatin1("Separate Directories"),
DefaultMixDirsAndFiles ) )
defaultView |= KFile::SeparateDirs;
- if ( kc->readBoolEntry(TQString::tqfromLatin1("Show Preview"), false))
+ if ( kc->readBoolEntry(TQString::fromLatin1("Show Preview"), false))
defaultView |= KFile::PreviewContents;
- if ( kc->readBoolEntry( TQString::tqfromLatin1("Sort case insensitively"),
+ if ( kc->readBoolEntry( TQString::fromLatin1("Sort case insensitively"),
DefaultCaseInsensitive ) )
sorting |= TQDir::IgnoreCase;
- if ( kc->readBoolEntry( TQString::tqfromLatin1("Sort directories first"),
+ if ( kc->readBoolEntry( TQString::fromLatin1("Sort directories first"),
DefaultDirsFirst ) )
sorting |= TQDir::DirsFirst;
- TQString name = TQString::tqfromLatin1("Name");
- TQString sortBy = kc->readEntry( TQString::tqfromLatin1("Sort by"), name );
+ TQString name = TQString::fromLatin1("Name");
+ TQString sortBy = kc->readEntry( TQString::fromLatin1("Sort by"), name );
if ( sortBy == name )
sorting |= TQDir::Name;
- else if ( sortBy == TQString::tqfromLatin1("Size") )
+ else if ( sortBy == TQString::fromLatin1("Size") )
sorting |= TQDir::Size;
- else if ( sortBy == TQString::tqfromLatin1("Date") )
+ else if ( sortBy == TQString::fromLatin1("Date") )
sorting |= TQDir::Time;
mySorting = static_cast<TQDir::SortSpec>( sorting );
setSorting( mySorting );
- if ( kc->readBoolEntry( TQString::tqfromLatin1("Show hidden files"),
+ if ( kc->readBoolEntry( TQString::fromLatin1("Show hidden files"),
DefaultShowHidden ) ) {
showHiddenAction->setChecked( true );
dir->setShowingDotFiles( true );
}
- if ( kc->readBoolEntry( TQString::tqfromLatin1("Sort reversed"),
+ if ( kc->readBoolEntry( TQString::fromLatin1("Sort reversed"),
DefaultSortReversed ) )
reverseAction->setChecked( true );
@@ -1505,18 +1505,18 @@ void KDirOperator::writeConfig( KConfig *kc, const TQString& group )
if ( !group.isEmpty() )
kc->setGroup( group );
- TQString sortBy = TQString::tqfromLatin1("Name");
+ TQString sortBy = TQString::fromLatin1("Name");
if ( KFile::isSortBySize( mySorting ) )
- sortBy = TQString::tqfromLatin1("Size");
+ sortBy = TQString::fromLatin1("Size");
else if ( KFile::isSortByDate( mySorting ) )
- sortBy = TQString::tqfromLatin1("Date");
- kc->writeEntry( TQString::tqfromLatin1("Sort by"), sortBy );
+ sortBy = TQString::fromLatin1("Date");
+ kc->writeEntry( TQString::fromLatin1("Sort by"), sortBy );
- kc->writeEntry( TQString::tqfromLatin1("Sort reversed"),
+ kc->writeEntry( TQString::fromLatin1("Sort reversed"),
reverseAction->isChecked() );
- kc->writeEntry( TQString::tqfromLatin1("Sort case insensitively"),
+ kc->writeEntry( TQString::fromLatin1("Sort case insensitively"),
caseInsensitiveAction->isChecked() );
- kc->writeEntry( TQString::tqfromLatin1("Sort directories first"),
+ kc->writeEntry( TQString::fromLatin1("Sort directories first"),
dirsFirstAction->isChecked() );
// don't save the separate dirs or preview when an application specific
@@ -1530,26 +1530,26 @@ void KDirOperator::writeConfig( KConfig *kc, const TQString& group )
if ( !appSpecificPreview ) {
if ( separateDirsAction->isEnabled() )
- kc->writeEntry( TQString::tqfromLatin1("Separate Directories"),
+ kc->writeEntry( TQString::fromLatin1("Separate Directories"),
separateDirsAction->isChecked() );
KToggleAction *previewAction = static_cast<KToggleAction*>(myActionCollection->action("preview"));
if ( previewAction->isEnabled() ) {
bool hasPreview = previewAction->isChecked();
- kc->writeEntry( TQString::tqfromLatin1("Show Preview"), hasPreview );
+ kc->writeEntry( TQString::fromLatin1("Show Preview"), hasPreview );
}
}
- kc->writeEntry( TQString::tqfromLatin1("Show hidden files"),
+ kc->writeEntry( TQString::fromLatin1("Show hidden files"),
showHiddenAction->isChecked() );
KFile::FileView fv = static_cast<KFile::FileView>( m_viewKind );
TQString style;
if ( KFile::isDetailView( fv ) )
- style = TQString::tqfromLatin1("Detail");
+ style = TQString::fromLatin1("Detail");
else if ( KFile::isSimpleView( fv ) )
- style = TQString::tqfromLatin1("Simple");
- kc->writeEntry( TQString::tqfromLatin1("View Style"), style );
+ style = TQString::fromLatin1("Simple");
+ kc->writeEntry( TQString::fromLatin1("View Style"), style );
kc->setGroup( oldGroup );
}
diff --git a/kio/kfile/kdirselectdialog.cpp b/kio/kfile/kdirselectdialog.cpp
index 10238ad93..9a3d4fc6c 100644
--- a/kio/kfile/kdirselectdialog.cpp
+++ b/kio/kfile/kdirselectdialog.cpp
@@ -248,7 +248,7 @@ void KDirSelectDialog::slotNextDirToList( KFileTreeViewItem *item )
{
// scroll to make item the topmost item
view()->ensureItemVisible( item );
- TQRect r = view()->tqitemRect( item );
+ TQRect r = view()->itemRect( item );
if ( r.isValid() )
{
int x, y;
@@ -426,7 +426,7 @@ void KDirSelectDialog::slotMkdir()
{
folderurl.addPath( *it );
exists = KIO::NetAccess::exists( folderurl, false, 0 );
- writeOk = !exists && KIO::NetAccess::mkdir( folderurl, tqtopLevelWidget() );
+ writeOk = !exists && KIO::NetAccess::mkdir( folderurl, topLevelWidget() );
}
if ( exists ) // url was already existant
diff --git a/kio/kfile/kdiskfreesp.cpp b/kio/kfile/kdiskfreesp.cpp
index 2a2f6f0f2..179b69f72 100644
--- a/kio/kfile/kdiskfreesp.cpp
+++ b/kio/kfile/kdiskfreesp.cpp
@@ -100,7 +100,7 @@ void KDiskFreeSp::dfDone()
TQTextStream t (dfStringErrOut, IO_ReadOnly);
TQString s=t.readLine();
- if ( (s.isEmpty()) || ( s.left(10) != TQString::tqfromLatin1("Filesystem") ) )
+ if ( (s.isEmpty()) || ( s.left(10) != TQString::fromLatin1("Filesystem") ) )
kdError() << "Error running df command... got [" << s << "]" << endl;
while ( !t.eof() ) {
TQString u,v;
diff --git a/kio/kfile/kencodingfiledialog.cpp b/kio/kfile/kencodingfiledialog.cpp
index bded7fb79..07098982e 100644
--- a/kio/kfile/kencodingfiledialog.cpp
+++ b/kio/kfile/kencodingfiledialog.cpp
@@ -54,7 +54,7 @@ KEncodingFileDialog::KEncodingFileDialog(const TQString& startDir, const TQStrin
d->encoding->clear ();
TQString sEncoding = encoding;
if (sEncoding.isEmpty())
- sEncoding = TQString::tqfromLatin1(KGlobal::locale()->encoding());
+ sEncoding = TQString::fromLatin1(KGlobal::locale()->encoding());
TQStringList encodings (KGlobal::charsets()->availableEncodingNames());
int insert = 0;
diff --git a/kio/kfile/kfiledetailview.h b/kio/kfile/kfiledetailview.h
index 7e0baff83..937c8f56c 100644
--- a/kio/kfile/kfiledetailview.h
+++ b/kio/kfile/kfiledetailview.h
@@ -78,7 +78,7 @@ public:
TQRect rect() const
{
- TQRect r = listView()->tqitemRect(this);
+ TQRect r = listView()->itemRect(this);
return TQRect( listView()->viewportToContents( r.topLeft() ),
TQSize( r.width(), r.height() ) );
}
diff --git a/kio/kfile/kfiledialog.cpp b/kio/kfile/kfiledialog.cpp
index fbc6dd7ab..60f7a7c1c 100644
--- a/kio/kfile/kfiledialog.cpp
+++ b/kio/kfile/kfiledialog.cpp
@@ -258,7 +258,7 @@ void KFileDialog::setMimeFilter( const TQStringList& mimeTypes,
filterWidget->setMimeFilter( mimeTypes, defaultType );
TQStringList types = TQStringList::split(" ", filterWidget->currentFilter());
- types.append( TQString::tqfromLatin1( "inode/directory" ));
+ types.append( TQString::fromLatin1( "inode/directory" ));
ops->clearFilter();
ops->setMimeFilter( types );
d->hasDefaultFilter = !defaultType.isEmpty();
@@ -357,7 +357,7 @@ void KFileDialog::slotOk()
bool multi = (mode() & KFile::Files) != 0;
KFileItemListIterator it( *items );
- TQString endQuote = TQString::tqfromLatin1("\" ");
+ TQString endQuote = TQString::fromLatin1("\" ");
TQString name, files;
while ( it.current() ) {
name = (*it)->name();
@@ -402,7 +402,7 @@ void KFileDialog::slotOk()
}
}
- KURL url = KIO::NetAccess::mostLocalURL(d->url,tqtopLevelWidget());
+ KURL url = KIO::NetAccess::mostLocalURL(d->url,topLevelWidget());
if ( (mode() & KFile::LocalOnly) == KFile::LocalOnly &&
!url.isLocalFile() ) {
// ### after message freeze, add message for directories!
@@ -446,7 +446,7 @@ void KFileDialog::slotOk()
return;
}
- KURL url = KIO::NetAccess::mostLocalURL(selectedURL,tqtopLevelWidget());
+ KURL url = KIO::NetAccess::mostLocalURL(selectedURL,topLevelWidget());
if ( (mode() & KFile::LocalOnly) == KFile::LocalOnly &&
!url.isLocalFile() ) {
KMessageBox::sorry( d->mainWidget,
@@ -555,7 +555,7 @@ void KFileDialog::slotOk()
it != list.end(); ++it )
{
job = KIO::stat( *it, !(*it).isLocalFile() );
- job->setWindow (tqtopLevelWidget());
+ job->setWindow (topLevelWidget());
KIO::Scheduler::scheduleJob( job );
d->statJobs.append( job );
connect( job, TQT_SIGNAL( result(KIO::Job *) ),
@@ -565,7 +565,7 @@ void KFileDialog::slotOk()
}
job = KIO::stat(d->url,!d->url.isLocalFile());
- job->setWindow (tqtopLevelWidget());
+ job->setWindow (topLevelWidget());
d->statJobs.append( job );
connect(job, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(slotStatResult(KIO::Job*)));
}
@@ -1548,7 +1548,7 @@ TQString KFileDialog::selectedFile() const
{
if ( result() == TQDialog::Accepted )
{
- KURL url = KIO::NetAccess::mostLocalURL(d->url,tqtopLevelWidget());
+ KURL url = KIO::NetAccess::mostLocalURL(d->url,topLevelWidget());
if (url.isLocalFile())
return url.path();
else {
@@ -1570,7 +1570,7 @@ TQStringList KFileDialog::selectedFiles() const
KURL::List urls = parseSelectedURLs();
TQValueListConstIterator<KURL> it = urls.begin();
while ( it != urls.end() ) {
- url = KIO::NetAccess::mostLocalURL(*it,tqtopLevelWidget());
+ url = KIO::NetAccess::mostLocalURL(*it,topLevelWidget());
if ( url.isLocalFile() )
list.append( url.path() );
++it;
@@ -1737,7 +1737,7 @@ void KFileDialog::readConfig( KConfig *kc, const TQString& group )
d->autoSelectExtChecked = kc->readBoolEntry (AutoSelectExtChecked, DefaultAutoSelectExtChecked);
updateAutoSelectExtension ();
- int w1 = tqminimumSize().width();
+ int w1 = minimumSize().width();
int w2 = toolbar->sizeHint().width() + 10;
if (w1 < w2)
setMinimumWidth(w2);
@@ -2068,7 +2068,7 @@ void KFileDialog::updateLocationEditExtension (const TQString &lastExtension)
{
// exists?
KIO::UDSEntry t;
- if (KIO::NetAccess::stat (url, t, tqtopLevelWidget()))
+ if (KIO::NetAccess::stat (url, t, topLevelWidget()))
{
kdDebug (kfile_area) << "\tfile exists" << endl;
@@ -2146,7 +2146,7 @@ void KFileDialog::appendExtension (KURL &url)
// exists?
KIO::UDSEntry t;
- if (KIO::NetAccess::stat (url, t, tqtopLevelWidget()))
+ if (KIO::NetAccess::stat (url, t, topLevelWidget()))
{
kdDebug (kfile_area) << "\tfile exists - won't append extension" << endl;
return;
@@ -2265,7 +2265,7 @@ void KFileDialog::toggleBookmarks(bool show)
connect( d->bookmarkHandler, TQT_SIGNAL( openURL( const TQString& )),
TQT_SLOT( enterURL( const TQString& )));
- toolbar->insertButton(TQString::tqfromLatin1("bookmark"),
+ toolbar->insertButton(TQString::fromLatin1("bookmark"),
(int)HOTLIST_BUTTON, true,
i18n("Bookmarks"), 5);
toolbar->getButton(HOTLIST_BUTTON)->setPopup(d->bookmarkHandler->menu(),
diff --git a/kio/kfile/kfilefiltercombo.cpp b/kio/kfile/kfilefiltercombo.cpp
index 625321f1a..2849ceb0e 100644
--- a/kio/kfile/kfilefiltercombo.cpp
+++ b/kio/kfile/kfilefiltercombo.cpp
@@ -129,7 +129,7 @@ void KFileFilterCombo::setMimeFilter( const TQStringList& types,
{
clear();
filters.clear();
- TQString delim = TQString::tqfromLatin1(", ");
+ TQString delim = TQString::fromLatin1(", ");
d->hasAllSupportedFiles = false;
m_allTypes = defaultType.isEmpty() && (types.count() > 1);
diff --git a/kio/kfile/kfileiconview.cpp b/kio/kfile/kfileiconview.cpp
index 90c8e82f2..4171d88d7 100644
--- a/kio/kfile/kfileiconview.cpp
+++ b/kio/kfile/kfileiconview.cpp
@@ -70,8 +70,8 @@ public:
parent->actionCollection(),
"large rows" );
- smallColumns->setExclusiveGroup(TQString::tqfromLatin1("IconView mode"));
- largeRows->setExclusiveGroup(TQString::tqfromLatin1("IconView mode"));
+ smallColumns->setExclusiveGroup(TQString::fromLatin1("IconView mode"));
+ largeRows->setExclusiveGroup(TQString::fromLatin1("IconView mode"));
previews = new KToggleAction( i18n("Thumbnail Previews"), 0,
parent->actionCollection(),
@@ -191,7 +191,7 @@ void KFileIconView::readConfig( KConfig *kc, const TQString& group )
{
TQString gr = group.isEmpty() ? TQString("KFileIconView") : group;
KConfigGroupSaver cs( kc, gr );
- TQString small = TQString::tqfromLatin1("SmallColumns");
+ TQString small = TQString::fromLatin1("SmallColumns");
d->previewIconSize = kc->readNumEntry( "Preview Size", DEFAULT_PREVIEW_SIZE );
d->previews->setChecked( kc->readBoolEntry( "ShowPreviews", DEFAULT_SHOW_PREVIEWS ) );
@@ -214,8 +214,8 @@ void KFileIconView::writeConfig( KConfig *kc, const TQString& group )
KConfigGroupSaver cs( kc, gr );
TQString viewMode = d->smallColumns->isChecked() ?
- TQString::tqfromLatin1("SmallColumns") :
- TQString::tqfromLatin1("LargeRows");
+ TQString::fromLatin1("SmallColumns") :
+ TQString::fromLatin1("LargeRows");
if(!kc->hasDefault( "ViewMode" ) && viewMode == DEFAULT_VIEW_MODE )
kc->revertToDefault( "ViewMode" );
else
@@ -251,7 +251,7 @@ void KFileIconView::showToolTip( TQIconViewItem *item )
int w = maxItemWidth() - ( itemTextPos() == TQIconView::Bottom ? 0 :
item->pixmapRect().width() ) - 4;
if ( fontMetrics().width( item->text() ) >= w ) {
- toolTip = new TQLabel( TQString::tqfromLatin1(" %1 ").arg(item->text()), 0,
+ toolTip = new TQLabel( TQString::fromLatin1(" %1 ").arg(item->text()), 0,
"myToolTip",
(WFlags)(WStyle_StaysOnTop | WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WX11BypassWM) );
toolTip->setFrameStyle( TQFrame::Plain | TQFrame::Box );
@@ -268,7 +268,7 @@ void KFileIconView::showToolTip( TQIconViewItem *item )
toolTip->move(toolTip->x(), screen.bottom()-toolTip->y()-toolTip->height()+toolTip->y());
}
toolTip->setFont( TQToolTip::font() );
- toolTip->tqsetPalette( TQToolTip::palette(), true );
+ toolTip->setPalette( TQToolTip::palette(), true );
toolTip->show();
}
}
@@ -340,10 +340,10 @@ void KFileIconView::insertItem( KFileItem *i )
TQIconView* qview = static_cast<TQIconView*>( this );
// Since creating and initializing an item leads to a tqrepaint,
// we disable updates on the IconView for a while.
- qview->tqsetUpdatesEnabled( false );
+ qview->setUpdatesEnabled( false );
KFileIconViewItem *item = new KFileIconViewItem( qview, i );
initItem( item, i, true );
- qview->tqsetUpdatesEnabled( true );
+ qview->setUpdatesEnabled( true );
if ( !i->isMimeTypeKnown() )
m_resolver->m_lstPendingMimeIconItems.append( item );
diff --git a/kio/kfile/kfiletreeview.cpp b/kio/kfile/kfiletreeview.cpp
index 06bce2881..9efe41d46 100644
--- a/kio/kfile/kfiletreeview.cpp
+++ b/kio/kfile/kfiletreeview.cpp
@@ -522,7 +522,7 @@ void KFileTreeView::slotAnimation()
}
uint & iconNumber = it.data().iconNumber;
- TQString icon = TQString::tqfromLatin1( it.data().iconBaseName ).append( TQString::number( iconNumber ) );
+ TQString icon = TQString::fromLatin1( it.data().iconBaseName ).append( TQString::number( iconNumber ) );
// kdDebug(250) << "Loading icon " << icon << endl;
item->setPixmap( 0, DesktopIcon( icon,KIcon::SizeSmall,KIcon::ActiveState )); // KFileTreeViewFactory::instance() ) );
@@ -666,7 +666,7 @@ void KFileTreeViewToolTip::maybeTip( const TQPoint & )
if ( item ) {
TQString text = static_cast<KFileViewItem*>( item )->toolTipText();
if ( !text.isEmpty() )
- tip ( m_view->tqitemRect( item ), text );
+ tip ( m_view->itemRect( item ), text );
}
#endif
}
diff --git a/kio/kfile/kicondialog.cpp b/kio/kfile/kicondialog.cpp
index 150536a33..d5faf59b2 100644
--- a/kio/kfile/kicondialog.cpp
+++ b/kio/kfile/kicondialog.cpp
@@ -122,7 +122,7 @@ void KIconCanvas::slotLoadFiles()
TQApplication::setOverrideCursor(tqwaitCursor);
// disable updates to not trigger paint events when adding child items
- tqsetUpdatesEnabled( false );
+ setUpdatesEnabled( false );
#ifdef HAVE_LIBART
KSVGIconEngine *svgEngine = new KSVGIconEngine();
@@ -191,7 +191,7 @@ void KIconCanvas::slotLoadFiles()
#endif
// enable updates since we have to draw the whole view now
- tqsetUpdatesEnabled( true );
+ setUpdatesEnabled( true );
TQApplication::restoreOverrideCursor();
d->m_bLoading = false;
@@ -259,7 +259,7 @@ void KIconDialog::init()
mGroupOrSize = KIcon::Desktop;
mContext = KIcon::Any;
mType = 0;
- mFileList = KGlobal::dirs()->findAllResources("appicon", TQString::tqfromLatin1("*.png"));
+ mFileList = KGlobal::dirs()->findAllResources("appicon", TQString::fromLatin1("*.png"));
TQWidget *main = new TQWidget( this );
setMainWidget(main);
diff --git a/kio/kfile/knotifydialog.cpp b/kio/kfile/knotifydialog.cpp
index e9a4c2b6f..8787fa19b 100644
--- a/kio/kfile/knotifydialog.cpp
+++ b/kio/kfile/knotifydialog.cpp
@@ -181,7 +181,7 @@ KNotifyDialog::~KNotifyDialog()
void KNotifyDialog::addApplicationEvents( const char *appName )
{
addApplicationEvents( TQString::fromUtf8( appName ) +
- TQString::tqfromLatin1( "/eventsrc" ) );
+ TQString::fromLatin1( "/eventsrc" ) );
}
void KNotifyDialog::addApplicationEvents( const TQString& path )
@@ -1005,10 +1005,10 @@ Application::Application( const TQString &path )
m_events = 0L;
config = new KConfig(config_file, false, false);
kc = new KConfig(path, true, false, "data");
- kc->setGroup( TQString::tqfromLatin1("!Global!") );
- m_icon = kc->readEntry(TQString::tqfromLatin1("IconName"),
- TQString::tqfromLatin1("misc"));
- m_description = kc->readEntry( TQString::tqfromLatin1("Comment"),
+ kc->setGroup( TQString::fromLatin1("!Global!") );
+ m_icon = kc->readEntry(TQString::fromLatin1("IconName"),
+ TQString::fromLatin1("misc"));
+ m_description = kc->readEntry( TQString::fromLatin1("Comment"),
i18n("No description available") );
int index = path.find( '/' );
@@ -1070,10 +1070,10 @@ void Application::reloadEvents( bool revertToDefaults )
Event *e = 0L;
- TQString global = TQString::tqfromLatin1("!Global!");
- TQString default_group = TQString::tqfromLatin1("<default>");
- TQString name = TQString::tqfromLatin1("Name");
- TQString comment = TQString::tqfromLatin1("Comment");
+ TQString global = TQString::fromLatin1("!Global!");
+ TQString default_group = TQString::fromLatin1("<default>");
+ TQString name = TQString::fromLatin1("Name");
+ TQString comment = TQString::fromLatin1("Comment");
TQStringList conflist = kc->groupList();
TQStringList::ConstIterator it = conflist.begin();
diff --git a/kio/kfile/kopenwith.cpp b/kio/kfile/kopenwith.cpp
index 0b32bc684..30b7d161e 100644
--- a/kio/kfile/kopenwith.cpp
+++ b/kio/kfile/kopenwith.cpp
@@ -279,8 +279,8 @@ void KApplicationTree::slotSelectionChanged(TQListViewItem* i)
void KApplicationTree::resizeEvent( TQResizeEvent * e)
{
- setColumnWidth(0, width()-TQApplication::tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent)
- -2*TQApplication::tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth));
+ setColumnWidth(0, width()-TQApplication::tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent)
+ -2*TQApplication::tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth));
KListView::resizeEvent(e);
}
@@ -340,7 +340,7 @@ KOpenWithDlg::KOpenWithDlg( const KURL::List& _urls, const TQString&_text,
{
TQString caption = KStringHandler::csqueeze( _urls.first().prettyURL() );
if (_urls.count() > 1)
- caption += TQString::tqfromLatin1("...");
+ caption += TQString::fromLatin1("...");
setCaption(caption);
setServiceType( _urls );
init( _text, _value );
@@ -376,7 +376,7 @@ void KOpenWithDlg::setServiceType( const KURL::List& _urls )
if ( _urls.count() == 1 )
{
qServiceType = KMimeType::findByURL( _urls.first())->name();
- if (qServiceType == TQString::tqfromLatin1("application/octet-stream"))
+ if (qServiceType == TQString::fromLatin1("application/octet-stream"))
qServiceType = TQString::null;
}
else
@@ -413,13 +413,13 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value )
KHistoryCombo *combo = new KHistoryCombo();
combo->setDuplicatesEnabled( false );
KConfig *kc = KGlobal::config();
- KConfigGroupSaver ks( kc, TQString::tqfromLatin1("Open-with settings") );
- int max = kc->readNumEntry( TQString::tqfromLatin1("Maximum history"), 15 );
+ KConfigGroupSaver ks( kc, TQString::fromLatin1("Open-with settings") );
+ int max = kc->readNumEntry( TQString::fromLatin1("Maximum history"), 15 );
combo->setMaxCount( max );
- int mode = kc->readNumEntry(TQString::tqfromLatin1("CompletionMode"),
+ int mode = kc->readNumEntry(TQString::fromLatin1("CompletionMode"),
KGlobalSettings::completionMode());
combo->setCompletionMode((KGlobalSettings::Completion)mode);
- TQStringList list = kc->readListEntry( TQString::tqfromLatin1("History") );
+ TQStringList list = kc->readListEntry( TQString::fromLatin1("History") );
combo->setHistoryItems( list, true );
edit = new KURLRequester( combo, this );
}
@@ -483,8 +483,8 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value )
// check to see if we use konsole if not disable the nocloseonexit
// because we don't know how to do this on other terminal applications
- KConfigGroup confGroup( KGlobal::config(), TQString::tqfromLatin1("General") );
- TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::tqfromLatin1("konsole"));
+ KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") );
+ TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole"));
if (bReadOnly || preferredTerminal != "konsole")
nocloseonexit->hide();
@@ -666,13 +666,13 @@ void KOpenWithDlg::slotOK()
if (terminal->isChecked())
{
- KConfigGroup confGroup( KGlobal::config(), TQString::tqfromLatin1("General") );
- preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::tqfromLatin1("konsole"));
+ KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") );
+ preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole"));
m_command = preferredTerminal;
// only add --noclose when we are sure it is konsole we're using
if (preferredTerminal == "konsole" && nocloseonexit->isChecked())
- m_command += TQString::tqfromLatin1(" --noclose");
- m_command += TQString::tqfromLatin1(" -e ");
+ m_command += TQString::fromLatin1(" --noclose");
+ m_command += TQString::fromLatin1(" -e ");
m_command += edit->url();
kdDebug(250) << "Setting m_command to " << m_command << endl;
}
@@ -740,7 +740,7 @@ void KOpenWithDlg::slotOK()
{
desktop = new KDesktopFile(newPath);
}
- desktop->writeEntry("Type", TQString::tqfromLatin1("Application"));
+ desktop->writeEntry("Type", TQString::fromLatin1("Application"));
desktop->writeEntry("Name", initialServiceName);
desktop->writePathEntry("Exec", fullExec);
if (terminal->isChecked())
@@ -814,9 +814,9 @@ void KOpenWithDlg::accept()
combo->addToHistory( edit->url() );
KConfig *kc = KGlobal::config();
- KConfigGroupSaver ks( kc, TQString::tqfromLatin1("Open-with settings") );
- kc->writeEntry( TQString::tqfromLatin1("History"), combo->historyItems() );
- kc->writeEntry(TQString::tqfromLatin1("CompletionMode"),
+ KConfigGroupSaver ks( kc, TQString::fromLatin1("Open-with settings") );
+ kc->writeEntry( TQString::fromLatin1("History"), combo->historyItems() );
+ kc->writeEntry(TQString::fromLatin1("CompletionMode"),
combo->completionMode());
// don't store the completion-list, as it contains all of KURLCompletion's
// executables
diff --git a/kio/kfile/kpropertiesdialog.cpp b/kio/kfile/kpropertiesdialog.cpp
index 6496b2cdb..2c86f582b 100644
--- a/kio/kfile/kpropertiesdialog.cpp
+++ b/kio/kfile/kpropertiesdialog.cpp
@@ -516,7 +516,7 @@ void KPropertiesDialog::insertPages()
if ( mimetype.isEmpty() )
return;
- TQString query = TQString::tqfromLatin1(
+ TQString query = TQString::fromLatin1(
"('KPropsDlg/Plugin' in ServiceTypes) and "
"((not exist [X-KDE-Protocol]) or "
" ([X-KDE-Protocol] == '%1' ) )" ).arg(item->url().protocol());
@@ -718,7 +718,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
kdDebug() << "url=" << url << " bDesktopFile=" << bDesktopFile << " isLocal=" << isLocal << " isReallyLocal=" << isReallyLocal << endl;
mode_t mode = item->mode();
bool hasDirs = item->isDir() && !item->isLink();
- bool hasRoot = url.path() == TQString::tqfromLatin1("/");
+ bool hasRoot = url.path() == TQString::fromLatin1("/");
TQString iconStr = KMimeType::iconForURL(url, mode);
TQString directory = properties->kurl().directory();
TQString protocol = properties->kurl().protocol();
@@ -831,7 +831,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
magicMimeComment = TQString::null;
}
- if ( url.path() == TQString::tqfromLatin1("/") )
+ if ( url.path() == TQString::fromLatin1("/") )
hasRoot = true;
if ( (*it)->isDir() && !(*it)->isLink() )
{
@@ -859,7 +859,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
if ( !isDevice && !isTrash && (bDesktopFile || S_ISDIR(mode)) && !d->bMultiple /*not implemented for multiple*/ )
{
KIconButton *iconButton = new KIconButton( d->m_frame );
- int bsize = 66 + 2 * iconButton->tqstyle().tqpixelMetric(TQStyle::PM_ButtonMargin);
+ int bsize = 66 + 2 * iconButton->tqstyle().pixelMetric(TQStyle::PM_ButtonMargin);
iconButton->setFixedSize(bsize, bsize);
iconButton->setIconSize(48);
iconButton->setStrictIconSize(false);
@@ -883,7 +883,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
this, TQT_SLOT( slotIconChanged() ) );
} else {
TQLabel *iconLabel = new TQLabel( d->m_frame );
- int bsize = 66 + 2 * iconLabel->tqstyle().tqpixelMetric(TQStyle::PM_ButtonMargin);
+ int bsize = 66 + 2 * iconLabel->tqstyle().pixelMetric(TQStyle::PM_ButtonMargin);
iconLabel->setFixedSize(bsize, bsize);
iconLabel->setPixmap( KGlobal::iconLoader()->loadIcon( iconStr, KIcon::Desktop, 48) );
iconArea = iconLabel;
@@ -942,7 +942,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
//TODO: wrap for win32 or mac?
TQPushButton *button = new TQPushButton(box);
- TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1("configure"));
+ TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("configure"));
TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal );
button->setIconSet( iconSet );
button->setFixedSize( pixMap.width()+8, pixMap.height()+8 );
@@ -1136,9 +1136,9 @@ void KFilePropsPlugin::slotEditFileType()
else
mime = d->mimeType;
//TODO: wrap for win32 or mac?
- TQString keditfiletype = TQString::tqfromLatin1("keditfiletype");
+ TQString keditfiletype = TQString::fromLatin1("keditfiletype");
KRun::runCommand( keditfiletype
- + " --parent " + TQString::number( (ulong)properties->tqtopLevelWidget()->winId())
+ + " --parent " + TQString::number( (ulong)properties->topLevelWidget()->winId())
+ " " + KProcess::quote(mime),
keditfiletype, keditfiletype /*unused*/);
#endif
@@ -1234,7 +1234,7 @@ void KFilePropsPlugin::slotDirSizeFinished( KIO::Job * job )
KIO::filesize_t totalSize = static_cast<KDirSize*>(job)->totalSize();
KIO::filesize_t totalFiles = static_cast<KDirSize*>(job)->totalFiles();
KIO::filesize_t totalSubdirs = static_cast<KDirSize*>(job)->totalSubdirs();
- m_sizeLabel->setText( TQString::tqfromLatin1("%1 (%2)\n%3, %4")
+ m_sizeLabel->setText( TQString::fromLatin1("%1 (%2)\n%3, %4")
.arg(KIO::convertSize(totalSize))
.arg(KGlobal::locale()->formatNumber(totalSize, 0))
.arg(i18n("1 file","%n files",totalFiles))
@@ -1439,7 +1439,7 @@ void KFilePropsPlugin::applyIconChanges()
if (S_ISDIR(properties->item()->mode()))
{
- path = url.path(1) + TQString::tqfromLatin1(".directory");
+ path = url.path(1) + TQString::fromLatin1(".directory");
// don't call updateUrl because the other tabs (i.e. permissions)
// apply to the directory, not the .directory file.
}
@@ -1753,7 +1753,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr
kcom->setOrder(KCompletion::Sorted);
setpwent();
for (i=0; ((user = getpwent()) != 0L) && (i < maxEntries); i++)
- kcom->addItem(TQString::tqfromLatin1(user->pw_name));
+ kcom->addItem(TQString::fromLatin1(user->pw_name));
endpwent();
usrEdit->setCompletionMode((i < maxEntries) ? KGlobalSettings::CompletionAuto :
KGlobalSettings::CompletionNone);
@@ -1781,7 +1781,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr
for (i=0; ((ge = getgrent()) != 0L) && (i < maxEntries); i++)
{
if (IamRoot)
- groupList += TQString::tqfromLatin1(ge->gr_name);
+ groupList += TQString::fromLatin1(ge->gr_name);
else
{
/* pick the groups to which the user belongs */
@@ -1802,7 +1802,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr
/* add the effective Group to the list .. */
ge = getgrgid (getegid());
if (ge) {
- TQString name = TQString::tqfromLatin1(ge->gr_name);
+ TQString name = TQString::fromLatin1(ge->gr_name);
if (name.isEmpty())
name.setNum(ge->gr_gid);
if (groupList.find(name) == groupList.end())
@@ -2639,7 +2639,7 @@ void KURLPropsPlugin::applyChanges()
KSimpleConfig config( path );
config.setDesktopGroup();
- config.writeEntry( "Type", TQString::tqfromLatin1("Link"));
+ config.writeEntry( "Type", TQString::fromLatin1("Link"));
config.writePathEntry( "URL", URLEdit->url() );
// Users can't create a Link .desktop file with a Name field,
// but distributions can. Update the Name field in that case.
@@ -2796,7 +2796,7 @@ void KBindingPropsPlugin::applyChanges()
KSimpleConfig config( path );
config.setDesktopGroup();
- config.writeEntry( "Type", TQString::tqfromLatin1("MimeType") );
+ config.writeEntry( "Type", TQString::fromLatin1("MimeType") );
config.writeEntry( "Patterns", patternEdit->text() );
config.writeEntry( "Comment", commentEdit->text() );
@@ -2852,8 +2852,8 @@ KDevicePropsPlugin::KDevicePropsPlugin( KPropertiesDialog *_props ) : KPropsDlgP
if ((mountPoint != "-") && (mountPoint != "none") && !mountPoint.isEmpty()
&& device != "none")
{
- devices.append( device + TQString::tqfromLatin1(" (")
- + mountPoint + TQString::tqfromLatin1(")") );
+ devices.append( device + TQString::fromLatin1(" (")
+ + mountPoint + TQString::fromLatin1(")") );
m_devicelist.append(device);
d->mountpointlist.append(mountPoint);
}
@@ -2916,7 +2916,7 @@ KDevicePropsPlugin::KDevicePropsPlugin( KPropertiesDialog *_props ) : KPropsDlgP
layout->addMultiCellWidget(sep, 6, 6, 0, 1);
unmounted = new KIconButton( d->m_frame );
- int bsize = 66 + 2 * unmounted->tqstyle().tqpixelMetric(TQStyle::PM_ButtonMargin);
+ int bsize = 66 + 2 * unmounted->tqstyle().pixelMetric(TQStyle::PM_ButtonMargin);
unmounted->setFixedSize(bsize, bsize);
unmounted->setIconType(KIcon::Desktop, KIcon::Device);
layout->addWidget(unmounted, 7, 0);
@@ -3077,7 +3077,7 @@ void KDevicePropsPlugin::applyChanges()
KSimpleConfig config( path );
config.setDesktopGroup();
- config.writeEntry( "Type", TQString::tqfromLatin1("FSDevice") );
+ config.writeEntry( "Type", TQString::fromLatin1("FSDevice") );
config.writeEntry( "Dev", device->currentText() );
config.writeEntry( "MountPoint", mountpoint->text() );
@@ -3362,7 +3362,7 @@ void KDesktopPropsPlugin::applyChanges()
KSimpleConfig config( path );
config.setDesktopGroup();
- config.writeEntry( "Type", TQString::tqfromLatin1("Application"));
+ config.writeEntry( "Type", TQString::fromLatin1("Application"));
config.writeEntry( "Comment", w->commentEdit->text() );
config.writeEntry( "Comment", w->commentEdit->text(), true, false, true ); // for compat
config.writeEntry( "GenericName", w->genNameEdit->text() );
@@ -3446,9 +3446,9 @@ void KDesktopPropsPlugin::slotAdvanced()
// check to see if we use konsole if not do not add the nocloseonexit
// because we don't know how to do this on other terminal applications
- KConfigGroup confGroup( KGlobal::config(), TQString::tqfromLatin1("General") );
+ KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") );
TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication",
- TQString::tqfromLatin1("konsole"));
+ TQString::fromLatin1("konsole"));
bool terminalCloseBool = false;
@@ -3493,7 +3493,7 @@ void KDesktopPropsPlugin::slotAdvanced()
int i, maxEntries = 1000;
setpwent();
for (i=0; ((pw = getpwent()) != 0L) && (i < maxEntries); i++)
- kcom->addItem(TQString::tqfromLatin1(pw->pw_name));
+ kcom->addItem(TQString::fromLatin1(pw->pw_name));
endpwent();
if (i < maxEntries)
{
@@ -3672,9 +3672,9 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props )
// check to see if we use konsole if not do not add the nocloseonexit
// because we don't know how to do this on other terminal applications
- KConfigGroup confGroup( KGlobal::config(), TQString::tqfromLatin1("General") );
+ KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") );
TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication",
- TQString::tqfromLatin1("konsole"));
+ TQString::fromLatin1("konsole"));
int posOptions = 1;
d->nocloseonexitCheck = 0L;
@@ -3767,7 +3767,7 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props )
int i, maxEntries = 1000;
setpwent();
for (i=0; ((pw = getpwent()) != 0L) && (i < maxEntries); i++)
- kcom->addItem(TQString::tqfromLatin1(pw->pw_name));
+ kcom->addItem(TQString::fromLatin1(pw->pw_name));
endpwent();
if (i < maxEntries)
{
@@ -3854,7 +3854,7 @@ void KExecPropsPlugin::applyChanges()
KSimpleConfig config( path );
config.setDesktopGroup();
- config.writeEntry( "Type", TQString::tqfromLatin1("Application"));
+ config.writeEntry( "Type", TQString::fromLatin1("Application"));
config.writePathEntry( "Exec", execEdit->text() );
config.writePathEntry( "SwallowExec", swallowExecEdit->text() );
config.writeEntry( "SwallowTitle", swallowTitleEdit->text() );
@@ -3862,7 +3862,7 @@ void KExecPropsPlugin::applyChanges()
TQString temp = terminalEdit->text();
if (d->nocloseonexitCheck )
if ( d->nocloseonexitCheck->isChecked() )
- temp += TQString::tqfromLatin1("--noclose ");
+ temp += TQString::fromLatin1("--noclose ");
temp = temp.stripWhiteSpace();
config.writeEntry( "TerminalOptions", temp );
config.writeEntry( "X-KDE-SubstituteUID", suidCheck->isChecked() );
@@ -4097,7 +4097,7 @@ void KApplicationPropsPlugin::applyChanges()
KSimpleConfig config( path );
config.setDesktopGroup();
- config.writeEntry( "Type", TQString::tqfromLatin1("Application"));
+ config.writeEntry( "Type", TQString::fromLatin1("Application"));
config.writeEntry( "Comment", commentEdit->text() );
config.writeEntry( "Comment", commentEdit->text(), true, false, true ); // for compat
config.writeEntry( "GenericName", genNameEdit->text() );
diff --git a/kio/kfile/krecentdirs.cpp b/kio/kfile/krecentdirs.cpp
index 85cdebb02..22b4cd477 100644
--- a/kio/kfile/krecentdirs.cpp
+++ b/kio/kfile/krecentdirs.cpp
@@ -52,13 +52,13 @@ static KConfig *recentdirs_readList(TQString &key, TQStringList &result, bool re
if (key[1] == ':')
{
key = key.mid(2);
- config = new KSimpleConfig(TQString::tqfromLatin1("krecentdirsrc"), readOnly);
+ config = new KSimpleConfig(TQString::fromLatin1("krecentdirsrc"), readOnly);
}
else
{
key = key.mid(1);
config = KGlobal::config();
- config->setGroup(TQString::tqfromLatin1("Recent Dirs"));
+ config->setGroup(TQString::fromLatin1("Recent Dirs"));
}
result=config->readPathListEntry(key);
diff --git a/kio/kfile/krecentdocument.cpp b/kio/kfile/krecentdocument.cpp
index 7b5c6908a..d691de359 100644
--- a/kio/kfile/krecentdocument.cpp
+++ b/kio/kfile/krecentdocument.cpp
@@ -45,7 +45,7 @@
TQString KRecentDocument::recentDocumentDirectory()
{
// need to change this path, not sure where
- return locateLocal("data", TQString::tqfromLatin1("RecentDocuments/"));
+ return locateLocal("data", TQString::fromLatin1("RecentDocuments/"));
}
TQStringList KRecentDocument::recentDocuments()
@@ -88,9 +88,9 @@ void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName)
kdDebug(250) << "KRecentDocument::add for " << openStr << endl;
KConfig *config = KGlobal::config();
TQString oldGrp = config->group();
- config->setGroup(TQString::tqfromLatin1("RecentDocuments"));
- bool useRecent = config->readBoolEntry(TQString::tqfromLatin1("UseRecent"), true);
- int maxEntries = config->readNumEntry(TQString::tqfromLatin1("MaxEntries"), 10);
+ config->setGroup(TQString::fromLatin1("RecentDocuments"));
+ bool useRecent = config->readBoolEntry(TQString::fromLatin1("UseRecent"), true);
+ int maxEntries = config->readNumEntry(TQString::fromLatin1("MaxEntries"), 10);
config->setGroup(oldGrp);
if(!useRecent)
@@ -100,7 +100,7 @@ void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName)
TQString dStr = path + url.fileName();
- TQString ddesktop = dStr + TQString::tqfromLatin1(".desktop");
+ TQString ddesktop = dStr + TQString::fromLatin1(".desktop");
int i=1;
// check for duplicates
@@ -108,7 +108,7 @@ void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName)
// see if it points to the same file and application
KSimpleConfig tmp(ddesktop);
tmp.setDesktopGroup();
- if(tmp.readEntry(TQString::tqfromLatin1("X-KDE-LastOpenedWith"))
+ if(tmp.readEntry(TQString::fromLatin1("X-KDE-LastOpenedWith"))
== desktopEntryName)
{
utime(TQFile::encodeName(ddesktop), NULL);
@@ -118,7 +118,7 @@ void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName)
++i;
if ( i > maxEntries )
break;
- ddesktop = dStr + TQString::tqfromLatin1("[%1].desktop").arg(i);
+ ddesktop = dStr + TQString::fromLatin1("[%1].desktop").arg(i);
}
TQDir dir(path);
@@ -129,7 +129,7 @@ void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName)
TQStringList::Iterator it;
it = list.begin();
while(i > maxEntries-1){
- TQFile::remove(dir.absPath() + TQString::tqfromLatin1("/") + (*it));
+ TQFile::remove(dir.absPath() + TQString::fromLatin1("/") + (*it));
--i, ++it;
}
}
@@ -137,15 +137,15 @@ void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName)
// create the applnk
KSimpleConfig conf(ddesktop);
conf.setDesktopGroup();
- conf.writeEntry( TQString::tqfromLatin1("Type"), TQString::tqfromLatin1("Link") );
- conf.writePathEntry( TQString::tqfromLatin1("URL"), openStr );
+ conf.writeEntry( TQString::fromLatin1("Type"), TQString::fromLatin1("Link") );
+ conf.writePathEntry( TQString::fromLatin1("URL"), openStr );
// If you change the line below, change the test in the above loop
- conf.writeEntry( TQString::tqfromLatin1("X-KDE-LastOpenedWith"), desktopEntryName );
+ conf.writeEntry( TQString::fromLatin1("X-KDE-LastOpenedWith"), desktopEntryName );
TQString name = url.fileName();
if (name.isEmpty())
name = openStr;
- conf.writeEntry( TQString::tqfromLatin1("Name"), name );
- conf.writeEntry( TQString::tqfromLatin1("Icon"), KMimeType::iconForURL( url ) );
+ conf.writeEntry( TQString::fromLatin1("Name"), name );
+ conf.writeEntry( TQString::fromLatin1("Icon"), KMimeType::iconForURL( url ) );
}
void KRecentDocument::add(const TQString &openStr, bool isUrl)
@@ -170,8 +170,8 @@ void KRecentDocument::clear()
int KRecentDocument::maximumItems()
{
KConfig *config = KGlobal::config();
- KConfigGroupSaver sa(config, TQString::tqfromLatin1("RecentDocuments"));
- return config->readNumEntry(TQString::tqfromLatin1("MaxEntries"), 10);
+ KConfigGroupSaver sa(config, TQString::fromLatin1("RecentDocuments"));
+ return config->readNumEntry(TQString::fromLatin1("MaxEntries"), 10);
}
diff --git a/kio/kfile/kurlbar.cpp b/kio/kfile/kurlbar.cpp
index 234e8717a..15ac9f35c 100644
--- a/kio/kfile/kurlbar.cpp
+++ b/kio/kfile/kurlbar.cpp
@@ -64,7 +64,7 @@ protected:
if ( item ) {
TQString text = static_cast<KURLBarItem*>( item )->toolTip();
if ( !text.isEmpty() )
- tip( m_view->tqitemRect( item ), text );
+ tip( m_view->itemRect( item ), text );
}
}
@@ -188,11 +188,11 @@ void KURLBarItem::paint( TQPainter *p )
if ( isCurrent() || isSelected() ) {
int h = height( box );
- TQBrush brush = box->tqcolorGroup().brush( TQColorGroup::Highlight );
+ TQBrush brush = box->colorGroup().brush( TQColorGroup::Highlight );
p->fillRect( 0, 0, w, h, brush );
TQPen pen = p->pen();
TQPen oldPen = pen;
- pen.setColor( box->tqcolorGroup().mid() );
+ pen.setColor( box->colorGroup().mid() );
p->setPen( pen );
p->drawPoint( 0, 0 );
@@ -225,10 +225,10 @@ void KURLBarItem::paint( TQPainter *p )
int xPos = pm->width() + margin + 2;
if ( isCurrent() || isSelected() ) {
- p->setPen( box->tqcolorGroup().highlight().dark(115) );
+ p->setPen( box->colorGroup().highlight().dark(115) );
p->drawText( xPos + ( TQApplication::reverseLayout() ? -1 : 1),
yPos + 1, visibleText );
- p->setPen( box->tqcolorGroup().highlightedText() );
+ p->setPen( box->colorGroup().highlightedText() );
}
p->drawText( xPos, yPos, visibleText );
@@ -257,10 +257,10 @@ void KURLBarItem::paint( TQPainter *p )
x = QMAX( x, margin );
if ( isCurrent() || isSelected() ) {
- p->setPen( box->tqcolorGroup().highlight().dark(115) );
+ p->setPen( box->colorGroup().highlight().dark(115) );
p->drawText( x + ( TQApplication::reverseLayout() ? -1 : 1),
y + 1, visibleText );
- p->setPen( box->tqcolorGroup().highlightedText() );
+ p->setPen( box->colorGroup().highlightedText() );
}
p->drawText( x, y, visibleText );
@@ -844,7 +844,7 @@ KURLBarListBox::~KURLBarListBox()
void KURLBarListBox::paintEvent( TQPaintEvent* )
{
TQPainter p(this);
- p.setPen( tqcolorGroup().mid() );
+ p.setPen( colorGroup().mid() );
p.drawRect( 0, 0, width(), height() );
}
@@ -980,7 +980,7 @@ KURLBarItemDialog::KURLBarItemDialog( bool allowGlobal, const KURL& url,
if ( KGlobal::instance()->aboutData() )
appName = KGlobal::instance()->aboutData()->programName();
if ( appName.isEmpty() )
- appName = TQString::tqfromLatin1( KGlobal::instance()->instanceName() );
+ appName = TQString::fromLatin1( KGlobal::instance()->instanceName() );
m_appLocal = new TQCheckBox( i18n("&Only show when using this application (%1)").arg( appName ), box );
m_appLocal->setChecked( appLocal );
TQWhatsThis::add( m_appLocal,
diff --git a/kio/kfile/kurlcombobox.cpp b/kio/kfile/kurlcombobox.cpp
index c9db56756..98e29a90b 100644
--- a/kio/kfile/kurlcombobox.cpp
+++ b/kio/kfile/kurlcombobox.cpp
@@ -31,7 +31,7 @@ class KURLComboBox::KURLComboBoxPrivate
{
public:
KURLComboBoxPrivate() {
- dirpix = SmallIcon(TQString::tqfromLatin1("folder"));
+ dirpix = SmallIcon(TQString::fromLatin1("folder"));
}
TQPixmap dirpix;
@@ -72,7 +72,7 @@ void KURLComboBox::init( Mode mode )
setTrapReturnKey( true );
setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
- opendirPix = SmallIcon(TQString::tqfromLatin1("folder_open"));
+ opendirPix = SmallIcon(TQString::fromLatin1("folder_open"));
connect( this, TQT_SIGNAL( activated( int )), TQT_SLOT( slotActivated( int )));
}
diff --git a/kio/kfile/kurlrequester.cpp b/kio/kfile/kurlrequester.cpp
index 1a53e7660..5d1495127 100644
--- a/kio/kfile/kurlrequester.cpp
+++ b/kio/kfile/kurlrequester.cpp
@@ -206,7 +206,7 @@ void KURLRequester::init()
d->edit = new KLineEdit( this, "line edit" );
myButton = new KURLDragPushButton( this, "kfile button");
- TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1("fileopen"));
+ TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("fileopen"));
TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal );
myButton->setIconSet( iconSet );
myButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 );
diff --git a/kio/kfile/tests/kdirselectdialogtest.cpp b/kio/kfile/tests/kdirselectdialogtest.cpp
index c66ed3ff2..47fcd02ca 100644
--- a/kio/kfile/tests/kdirselectdialogtest.cpp
+++ b/kio/kfile/tests/kdirselectdialogtest.cpp
@@ -10,7 +10,7 @@ int main( int argc, char **argv )
KURL u = KDirSelectDialog::selectDirectory( (argc >= 1) ? argv[1] : TQString::null );
if ( u.isValid() )
KMessageBox::information( 0L,
- TQString::tqfromLatin1("You selected the url: %1")
+ TQString::fromLatin1("You selected the url: %1")
.arg( u.prettyURL() ), "Selected URL" );
return 0;
diff --git a/kio/kfile/tests/kfdtest.cpp b/kio/kfile/tests/kfdtest.cpp
index 43dbb4fd0..867b9b4a8 100644
--- a/kio/kfile/tests/kfdtest.cpp
+++ b/kio/kfile/tests/kfdtest.cpp
@@ -25,7 +25,7 @@ void KFDTest::doit()
if ( dlg->exec() == KDialog::Accepted )
{
- KMessageBox::information(0, TQString::tqfromLatin1("You selected the file: %1").arg( dlg->selectedURL().prettyURL() ));
+ KMessageBox::information(0, TQString::fromLatin1("You selected the file: %1").arg( dlg->selectedURL().prettyURL() ));
}
// tqApp->quit();
diff --git a/kio/kfile/tests/kfiletreeviewtest.cpp b/kio/kfile/tests/kfiletreeviewtest.cpp
index bad100809..5c520dd5d 100644
--- a/kio/kfile/tests/kfiletreeviewtest.cpp
+++ b/kio/kfile/tests/kfiletreeviewtest.cpp
@@ -148,7 +148,7 @@ int main(int argc, char **argv)
{
for( int i = 1; i < argc; i++ )
{
- argv1 = TQString::tqfromLatin1(argv[i]);
+ argv1 = TQString::fromLatin1(argv[i]);
kdDebug() << "Opening " << argv1 << endl;
if( argv1 == "-d" )
tf->setDirOnly();
diff --git a/kio/kfile/tests/kfstest.cpp b/kio/kfile/tests/kfstest.cpp
index aad57b257..aeeb5b77b 100644
--- a/kio/kfile/tests/kfstest.cpp
+++ b/kio/kfile/tests/kfstest.cpp
@@ -51,11 +51,11 @@ int main(int argc, char **argv)
TQString argv1;
TQString startDir;
if (argc > 1)
- argv1 = TQString::tqfromLatin1(argv[1]);
+ argv1 = TQString::fromLatin1(argv[1]);
if ( argc > 2 )
- startDir = TQString::tqfromLatin1( argv[2]);
+ startDir = TQString::fromLatin1( argv[2]);
- if (argv1 == TQString::tqfromLatin1("diroperator")) {
+ if (argv1 == TQString::fromLatin1("diroperator")) {
KDirOperator *op = new KDirOperator(startDir, 0, "operator");
op->setViewConfig( KGlobal::config(), "TestGroup" );
op->setView(KFile::Simple);
@@ -64,24 +64,24 @@ int main(int argc, char **argv)
a.exec();
}
- else if (argv1 == TQString::tqfromLatin1("justone")) {
+ else if (argv1 == TQString::fromLatin1("justone")) {
TQString name = KFileDialog::getOpenFileName(startDir);
qDebug("filename=%s",name.latin1());
}
- else if (argv1 == TQString::tqfromLatin1("existingURL")) {
+ else if (argv1 == TQString::fromLatin1("existingURL")) {
KURL url = KFileDialog::getExistingURL();
qDebug("URL=%s",url.url().latin1());
name1 = url.url();
}
- else if (argv1 == TQString::tqfromLatin1("preview")) {
+ else if (argv1 == TQString::fromLatin1("preview")) {
KURL u = KFileDialog::getImageOpenURL();
qDebug("filename=%s", u.url().latin1());
}
- else if (argv1 == TQString::tqfromLatin1("preselect")) {
- names = KFileDialog::getOpenFileNames(TQString::tqfromLatin1("/etc/passwd"));
+ else if (argv1 == TQString::fromLatin1("preselect")) {
+ names = KFileDialog::getOpenFileNames(TQString::fromLatin1("/etc/passwd"));
TQStringList::Iterator it = names.begin();
while ( it != names.end() ) {
qDebug("selected file: %s", (*it).latin1());
@@ -89,10 +89,10 @@ int main(int argc, char **argv)
}
}
- else if (argv1 == TQString::tqfromLatin1("dirs"))
+ else if (argv1 == TQString::fromLatin1("dirs"))
name1 = KFileDialog::getExistingDirectory();
- else if (argv1 == TQString::tqfromLatin1("heap")) {
+ else if (argv1 == TQString::fromLatin1("heap")) {
KFileDialog *dlg = new KFileDialog( startDir, TQString::null, 0L,
"file dialog", true );
dlg->setMode( KFile::File);
@@ -104,33 +104,33 @@ int main(int argc, char **argv)
if ( urlBar )
{
urlBar->insertDynamicItem( KURL("ftp://ftp.kde.org"),
- TQString::tqfromLatin1("KDE FTP Server") );
+ TQString::fromLatin1("KDE FTP Server") );
}
if ( dlg->exec() == KDialog::Accepted )
name1 = dlg->selectedURL().url();
}
- else if ( argv1 == TQString::tqfromLatin1("eventloop") )
+ else if ( argv1 == TQString::fromLatin1("eventloop") )
{
KFDTest *test = new KFDTest( startDir );
return a.exec();
}
- else if (argv1 == TQString::tqfromLatin1("save")) {
+ else if (argv1 == TQString::fromLatin1("save")) {
KURL u = KFileDialog::getSaveURL();
-// TQString(TQDir::homeDirPath() + TQString::tqfromLatin1("/testfile")),
+// TQString(TQDir::homeDirPath() + TQString::fromLatin1("/testfile")),
// TQString::null, 0L);
name1 = u.url();
}
- else if (argv1 == TQString::tqfromLatin1("icon")) {
+ else if (argv1 == TQString::fromLatin1("icon")) {
KIconDialog dlg;
TQString icon = dlg.selectIcon();
kdDebug() << icon << endl;
}
-// else if ( argv1 == TQString::tqfromLatin1("dirselect") ) {
+// else if ( argv1 == TQString::fromLatin1("dirselect") ) {
// KURL url;
// url.setPath( "/" );
// KURL selected = KDirSelectDialog::selectDirectory( url );
@@ -140,7 +140,7 @@ int main(int argc, char **argv)
else {
KFileDialog dlg(startDir,
- TQString::tqfromLatin1("*|All Files\n"
+ TQString::fromLatin1("*|All Files\n"
"*.lo *.o *.la|All libtool Files"),
0, 0, true);
// dlg.setFilter( "*.tdevelop" );
@@ -177,7 +177,7 @@ int main(int argc, char **argv)
}
if (!(name1.isNull()))
- KMessageBox::information(0, TQString::tqfromLatin1("You selected the file " ) + name1,
- TQString::tqfromLatin1("Your Choice"));
+ KMessageBox::information(0, TQString::fromLatin1("You selected the file " ) + name1,
+ TQString::fromLatin1("Your Choice"));
return 0;
}
diff --git a/kio/kfile/tests/kurlrequestertest.cpp b/kio/kfile/tests/kurlrequestertest.cpp
index 4a1d4bec0..9248eec5d 100644
--- a/kio/kfile/tests/kurlrequestertest.cpp
+++ b/kio/kfile/tests/kurlrequestertest.cpp
@@ -10,7 +10,7 @@ int main( int argc, char **argv )
qDebug( "Selected url: %s", url.url().latin1());
KURLRequester *req = new KURLRequester();
- KEditListBox *el = new KEditListBox( TQString::tqfromLatin1("Test"), req->customEditor() );
+ KEditListBox *el = new KEditListBox( TQString::fromLatin1("Test"), req->customEditor() );
el->show();
return app.exec();
}
diff --git a/kio/kio/authinfo.cpp b/kio/kio/authinfo.cpp
index b2449f79f..6f0592ac4 100644
--- a/kio/kio/authinfo.cpp
+++ b/kio/kio/authinfo.cpp
@@ -158,7 +158,7 @@ bool NetRC::lookup( const KURL& url, AutoLogin& login, bool userealnetrc,
AutoLogin &log = *it;
if ( (mode & defaultOnly) == defaultOnly &&
- log.machine == TQString::tqfromLatin1("default") &&
+ log.machine == TQString::fromLatin1("default") &&
(login.login.isEmpty() || login.login == log.login) )
{
login.type = log.type;
@@ -169,7 +169,7 @@ bool NetRC::lookup( const KURL& url, AutoLogin& login, bool userealnetrc,
}
if ( (mode & presetOnly) == presetOnly &&
- log.machine == TQString::tqfromLatin1("preset") &&
+ log.machine == TQString::fromLatin1("preset") &&
(login.login.isEmpty() || login.login == log.login) )
{
login.type = log.type;
@@ -237,7 +237,7 @@ TQString NetRC::extract( const char* buf, const char* key, int& pos )
if ( idx > start )
{
pos = idx;
- return TQString::tqfromLatin1( buf+start, idx-start);
+ return TQString::fromLatin1( buf+start, idx-start);
}
}
}
@@ -280,7 +280,7 @@ bool NetRC::parse( int fd )
while( buf[tail-1] == '\n' || buf[tail-1] =='\r' )
tail--;
- TQString mac = TQString::tqfromLatin1(buf, tail).stripWhiteSpace();
+ TQString mac = TQString::fromLatin1(buf, tail).stripWhiteSpace();
if ( !mac.isEmpty() )
loginMap[type][index].macdef[macro].append( mac );
@@ -294,12 +294,12 @@ bool NetRC::parse( int fd )
if (strncasecmp(buf+pos, "default", 7) == 0 )
{
pos += 7;
- l.machine = TQString::tqfromLatin1("default");
+ l.machine = TQString::fromLatin1("default");
}
else if (strncasecmp(buf+pos, "preset", 6) == 0 )
{
pos += 6;
- l.machine = TQString::tqfromLatin1("preset");
+ l.machine = TQString::fromLatin1("preset");
}
}
// kdDebug() << "Machine: " << l.machine << endl;
@@ -314,7 +314,7 @@ bool NetRC::parse( int fd )
type = l.type = extract( buf, "type", pos );
if ( l.type.isEmpty() && !l.machine.isEmpty() )
- type = l.type = TQString::tqfromLatin1("ftp");
+ type = l.type = TQString::fromLatin1("ftp");
// kdDebug() << "Type: " << l.type << endl;
macro = extract( buf, "macdef", pos );
diff --git a/kio/kio/chmodjob.cpp b/kio/kio/chmodjob.cpp
index 56c24b072..e1d343c10 100644
--- a/kio/kio/chmodjob.cpp
+++ b/kio/kio/chmodjob.cpp
@@ -121,7 +121,7 @@ void ChmodJob::slotEntries( KIO::Job*, const KIO::UDSEntryList & list )
break;
}
}
- if ( !isLink && relativePath != TQString::tqfromLatin1("..") )
+ if ( !isLink && relativePath != TQString::fromLatin1("..") )
{
ChmodInfo info;
info.url = m_lstItems.first()->url(); // base directory
diff --git a/kio/kio/dataprotocol.cpp b/kio/kio/dataprotocol.cpp
index 35bed5235..d3ef79ff3 100644
--- a/kio/kio/dataprotocol.cpp
+++ b/kio/kio/dataprotocol.cpp
@@ -186,7 +186,7 @@ static void parseDataHeader(const KURL &url, DataHeader &header_info) {
header_info.is_base64 = false;
// decode url and save it
- TQString &raw_url = header_info.url = TQString::tqfromLatin1("data:") + url.path();
+ TQString &raw_url = header_info.url = TQString::fromLatin1("data:") + url.path();
int raw_url_len = (int)raw_url.length();
// jump over scheme part (must be "data:", we don't even check that)
diff --git a/kio/kio/dataslave.cpp b/kio/kio/dataslave.cpp
index 8ec90b2a7..d16ecc0d4 100644
--- a/kio/kio/dataslave.cpp
+++ b/kio/kio/dataslave.cpp
@@ -137,7 +137,7 @@ void DataSlave::send(int cmd, const TQByteArray &arr) {
break;
default:
error(ERR_UNSUPPORTED_ACTION,
- unsupportedActionErrorString(TQString::tqfromLatin1("data"),cmd));
+ unsupportedActionErrorString(TQString::fromLatin1("data"),cmd));
}/*end switch*/
}
diff --git a/kio/kio/global.cpp b/kio/kio/global.cpp
index 9c0ae5e81..f99219524 100644
--- a/kio/kio/global.cpp
+++ b/kio/kio/global.cpp
@@ -97,7 +97,7 @@ KIO_EXPORT TQString KIO::number( KIO::filesize_t size )
{
char charbuf[256];
sprintf(charbuf, "%lld", size);
- return TQString::tqfromLatin1(charbuf);
+ return TQString::fromLatin1(charbuf);
}
KIO_EXPORT unsigned int KIO::calculateRemainingSeconds( KIO::filesize_t totalSize,
@@ -284,7 +284,7 @@ KIO_EXPORT TQString KIO::buildErrorString(int errorCode, const TQString &errorTe
result = i18n( "Could not create socket for accessing %1." ).arg( errorText );
break;
case KIO::ERR_COULD_NOT_CONNECT:
- result = i18n( "Could not connect to host %1." ).arg( errorText.isEmpty() ? TQString::tqfromLatin1("localhost") : errorText );
+ result = i18n( "Could not connect to host %1." ).arg( errorText.isEmpty() ? TQString::fromLatin1("localhost") : errorText );
break;
case KIO::ERR_CONNECTION_BROKEN:
result = i18n( "Connection to host %1 is broken." ).arg( errorText );
@@ -477,16 +477,16 @@ KIO_EXPORT TQStringList KIO::Job::detailedErrorStrings( const KURL *reqUrl /*= 0
url = i18n( "(unknown)" );
}
- datetime = KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime(),
+ datetime = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(),
false );
ret << errorName;
- ret << TQString::tqfromLatin1( "<qt><p><b>" ) + errorName +
- TQString::tqfromLatin1( "</b></p><p>" ) + description +
- TQString::tqfromLatin1( "</p>" );
- ret2 = TQString::tqfromLatin1( "<qt><p>" );
+ ret << TQString::fromLatin1( "<qt><p><b>" ) + errorName +
+ TQString::fromLatin1( "</b></p><p>" ) + description +
+ TQString::fromLatin1( "</p>" );
+ ret2 = TQString::fromLatin1( "<qt><p>" );
if ( !techName.isEmpty() )
- ret2 += i18n( "<b>Technical reason</b>: " ) + techName + TQString::tqfromLatin1( "</p>" );
+ ret2 += i18n( "<b>Technical reason</b>: " ) + techName + TQString::fromLatin1( "</p>" );
ret2 += i18n( "</p><p><b>Details of the request</b>:" );
ret2 += i18n( "</p><ul><li>URL: %1</li>" ).arg( url );
if ( !protocol.isEmpty() ) {
@@ -497,12 +497,12 @@ KIO_EXPORT TQStringList KIO::Job::detailedErrorStrings( const KURL *reqUrl /*= 0
if ( !causes.isEmpty() ) {
ret2 += i18n( "<p><b>Possible causes</b>:</p><ul><li>" );
ret2 += causes.join( "</li><li>" );
- ret2 += TQString::tqfromLatin1( "</li></ul>" );
+ ret2 += TQString::fromLatin1( "</li></ul>" );
}
if ( !solutions.isEmpty() ) {
ret2 += i18n( "<p><b>Possible solutions</b>:</p><ul><li>" );
ret2 += solutions.join( "</li><li>" );
- ret2 += TQString::tqfromLatin1( "</li></ul>" );
+ ret2 += TQString::fromLatin1( "</li></ul>" );
}
ret << ret2;
return ret;
@@ -559,7 +559,7 @@ KIO_EXPORT TQByteArray KIO::rawErrorDetail(int errorCode, const TQString &errorT
protocol = i18n( "(unknown)" );
}
- datetime = KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime(),
+ datetime = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(),
false );
TQString errorName, techName, description;
@@ -1738,7 +1738,7 @@ static TQString get_mount_info(const TQString& filename,
if ( is_my_mountpoint( mounted[i].f_mntonname, realname, max ) )
{
mountPoint = TQFile::decodeName(mounted[i].f_mntonname);
- fstype = TQString::tqfromLatin1(mounttype);
+ fstype = TQString::fromLatin1(mounttype);
check_mount_point( mounttype, mounted[i].f_mntfromname,
isautofs, isslow );
// keep going, looking for a potentially better one
@@ -1805,7 +1805,7 @@ static TQString get_mount_info(const TQString& filename,
if ( is_my_mountpoint( mountedto, realname, max ) )
{
mountPoint = TQFile::decodeName(mountedto);
- fstype = TQString::tqfromLatin1(ent->vfsent_name);
+ fstype = TQString::fromLatin1(ent->vfsent_name);
check_mount_point(ent->vfsent_name, device_name, isautofs, isslow);
if (ismanual == Unseen)
diff --git a/kio/kio/job.cpp b/kio/kio/job.cpp
index 411604aba..beb5287e6 100644
--- a/kio/kio/job.cpp
+++ b/kio/kio/job.cpp
@@ -792,7 +792,7 @@ SimpleJob *KIO::special(const KURL& url, const TQByteArray & data, bool showProg
SimpleJob *KIO::mount( bool ro, const char *fstype, const TQString& dev, const TQString& point, bool showProgressInfo )
{
KIO_ARGS << int(1) << TQ_INT8( ro ? 1 : 0 )
- << TQString::tqfromLatin1(fstype) << dev << point;
+ << TQString::fromLatin1(fstype) << dev << point;
SimpleJob *job = special( KURL("file:/"), packedArgs, showProgressInfo );
if ( showProgressInfo )
Observer::self()->mounting( job, dev, point );
@@ -1480,7 +1480,7 @@ void MimetypeJob::slotFinished( )
// Due to the "protocol doesn't support listing" code in KRun, we
// assumed it was a file.
kdDebug(7007) << "It is in fact a directory!" << endl;
- m_mimetype = TQString::tqfromLatin1("inode/directory");
+ m_mimetype = TQString::fromLatin1("inode/directory");
emit TransferJob::mimetype( this, m_mimetype );
m_error = 0;
}
@@ -3359,7 +3359,7 @@ void CopyJob::copyNextFile()
bool devicesOk=false;
// if the source is a devices url, handle it a littlebit special
- if ((*it).uSource.protocol()==TQString::tqfromLatin1("devices"))
+ if ((*it).uSource.protocol()==TQString::fromLatin1("devices"))
{
TQByteArray data;
TQByteArray param;
@@ -3395,20 +3395,20 @@ void CopyJob::copyNextFile()
config.setDesktopGroup();
KURL url = (*it).uSource;
url.setPass( "" );
- config.writePathEntry( TQString::tqfromLatin1("URL"), url.url() );
- config.writeEntry( TQString::tqfromLatin1("Name"), url.url() );
- config.writeEntry( TQString::tqfromLatin1("Type"), TQString::tqfromLatin1("Link") );
+ config.writePathEntry( TQString::fromLatin1("URL"), url.url() );
+ config.writeEntry( TQString::fromLatin1("Name"), url.url() );
+ config.writeEntry( TQString::fromLatin1("Type"), TQString::fromLatin1("Link") );
TQString protocol = (*it).uSource.protocol();
- if ( protocol == TQString::tqfromLatin1("ftp") )
- config.writeEntry( TQString::tqfromLatin1("Icon"), TQString::tqfromLatin1("ftp") );
- else if ( protocol == TQString::tqfromLatin1("http") )
- config.writeEntry( TQString::tqfromLatin1("Icon"), TQString::tqfromLatin1("www") );
- else if ( protocol == TQString::tqfromLatin1("info") )
- config.writeEntry( TQString::tqfromLatin1("Icon"), TQString::tqfromLatin1("info") );
- else if ( protocol == TQString::tqfromLatin1("mailto") ) // sven:
- config.writeEntry( TQString::tqfromLatin1("Icon"), TQString::tqfromLatin1("kmail") ); // added mailto: support
+ if ( protocol == TQString::fromLatin1("ftp") )
+ config.writeEntry( TQString::fromLatin1("Icon"), TQString::fromLatin1("ftp") );
+ else if ( protocol == TQString::fromLatin1("http") )
+ config.writeEntry( TQString::fromLatin1("Icon"), TQString::fromLatin1("www") );
+ else if ( protocol == TQString::fromLatin1("info") )
+ config.writeEntry( TQString::fromLatin1("Icon"), TQString::fromLatin1("info") );
+ else if ( protocol == TQString::fromLatin1("mailto") ) // sven:
+ config.writeEntry( TQString::fromLatin1("Icon"), TQString::fromLatin1("kmail") ); // added mailto: support
else
- config.writeEntry( TQString::tqfromLatin1("Icon"), TQString::tqfromLatin1("unknown") );
+ config.writeEntry( TQString::fromLatin1("Icon"), TQString::fromLatin1("unknown") );
config.sync();
files.remove( it );
m_processedFiles++;
@@ -4651,7 +4651,7 @@ TQFile *CacheInfo::cachedFile()
ok = false;
time_t date;
- time_t tqcurrentDate = time(0);
+ time_t currentDate = time(0);
// URL
if (ok && (!fgets(buffer, 400, fs)))
@@ -4673,10 +4673,10 @@ TQFile *CacheInfo::cachedFile()
if (ok)
{
date = (time_t) strtoul(buffer, 0, 10);
- if (m_maxCacheAge && (difftime(tqcurrentDate, date) > m_maxCacheAge))
+ if (m_maxCacheAge && (difftime(currentDate, date) > m_maxCacheAge))
{
m_bMustRevalidate = true;
- m_expireDate = tqcurrentDate;
+ m_expireDate = currentDate;
}
}
@@ -4690,7 +4690,7 @@ TQFile *CacheInfo::cachedFile()
{
date = (time_t) strtoul(buffer, 0, 10);
// After the expire date we need to revalidate.
- if (!date || difftime(tqcurrentDate, date) >= 0)
+ if (!date || difftime(currentDate, date) >= 0)
m_bMustRevalidate = true;
m_expireDate = date;
}
diff --git a/kio/kio/kacl.cpp b/kio/kio/kacl.cpp
index d05098102..432a50d31 100644
--- a/kio/kio/kacl.cpp
+++ b/kio/kio/kacl.cpp
@@ -623,8 +623,8 @@ TQString KACL::KACLPrivate::getUserName( uid_t uid ) const
if ( !temp ) {
struct passwd *user = getpwuid( uid );
if ( user ) {
- m_usercache.insert( uid, new TQString(TQString::tqfromLatin1(user->pw_name)) );
- return TQString::tqfromLatin1( user->pw_name );
+ m_usercache.insert( uid, new TQString(TQString::fromLatin1(user->pw_name)) );
+ return TQString::fromLatin1( user->pw_name );
}
else
return TQString::number( uid );
@@ -641,8 +641,8 @@ TQString KACL::KACLPrivate::getGroupName( gid_t gid ) const
if ( !temp ) {
struct group *grp = getgrgid( gid );
if ( grp ) {
- m_groupcache.insert( gid, new TQString(TQString::tqfromLatin1(grp->gr_name)) );
- return TQString::tqfromLatin1( grp->gr_name );
+ m_groupcache.insert( gid, new TQString(TQString::fromLatin1(grp->gr_name)) );
+ return TQString::fromLatin1( grp->gr_name );
}
else
return TQString::number( gid );
@@ -654,7 +654,7 @@ TQString KACL::KACLPrivate::getGroupName( gid_t gid ) const
static TQString aclAsString(const acl_t acl)
{
char *aclString = acl_to_text( acl, 0 );
- TQString ret = TQString::tqfromLatin1( aclString );
+ TQString ret = TQString::fromLatin1( aclString );
acl_free( (void*)aclString );
return ret;
}
diff --git a/kio/kio/karchive.cpp b/kio/kio/karchive.cpp
index c5b9cad66..732269523 100644
--- a/kio/kio/karchive.cpp
+++ b/kio/kio/karchive.cpp
@@ -375,7 +375,7 @@ KArchiveDirectory * KArchive::rootDir()
TQString username = pw ? TQFile::decodeName(pw->pw_name) : TQString::number( getuid() );
TQString groupname = grp ? TQFile::decodeName(grp->gr_name) : TQString::number( getgid() );
- d->rootDir = new KArchiveDirectory( this, TQString::tqfromLatin1("/"), (int)(0777 + S_IFDIR), 0, username, groupname, TQString::null );
+ d->rootDir = new KArchiveDirectory( this, TQString::fromLatin1("/"), (int)(0777 + S_IFDIR), 0, username, groupname, TQString::null );
}
return d->rootDir;
}
diff --git a/kio/kio/kdatatool.cpp b/kio/kio/kdatatool.cpp
index 798a37d95..c5e04537e 100644
--- a/kio/kio/kdatatool.cpp
+++ b/kio/kio/kdatatool.cpp
@@ -167,11 +167,11 @@ TQValueList<KDataToolInfo> KDataToolInfo::query( const TQString& datatype, const
if ( !datatype.isEmpty() )
{
- constr = TQString::tqfromLatin1( "DataType == '%1'" ).arg( datatype );
+ constr = TQString::fromLatin1( "DataType == '%1'" ).arg( datatype );
}
if ( !mimetype.isEmpty() )
{
- TQString tmp = TQString::tqfromLatin1( "'%1' in DataMimeTypes" ).arg( mimetype );
+ TQString tmp = TQString::fromLatin1( "'%1' in DataMimeTypes" ).arg( mimetype );
if ( constr.isEmpty() )
constr = tmp;
else
@@ -180,7 +180,7 @@ TQValueList<KDataToolInfo> KDataToolInfo::query( const TQString& datatype, const
/* Bug in KTrader ? Test with HEAD-tdelibs!
if ( instance )
{
- TQString tmp = TQString::tqfromLatin1( "not ('%1' in ExcludeFrom)" ).arg( instance->instanceName() );
+ TQString tmp = TQString::fromLatin1( "not ('%1' in ExcludeFrom)" ).arg( instance->instanceName() );
if ( constr.isEmpty() )
constr = tmp;
else
diff --git a/kio/kio/kfileitem.cpp b/kio/kio/kfileitem.cpp
index 363ab2752..010832573 100644
--- a/kio/kio/kfileitem.cpp
+++ b/kio/kio/kfileitem.cpp
@@ -1041,7 +1041,7 @@ TQString KFileItem::parsePermissions(mode_t perm) const
if (hasExtendedACL())
p[10]='+';
- return TQString::tqfromLatin1(p);
+ return TQString::fromLatin1(p);
}
// check if we need to cache this
diff --git a/kio/kio/kfilemetainfo.cpp b/kio/kio/kfilemetainfo.cpp
index 3c85363c4..dcf735619 100644
--- a/kio/kio/kfilemetainfo.cpp
+++ b/kio/kio/kfilemetainfo.cpp
@@ -937,7 +937,7 @@ KFilePlugin* KFileMetaInfoProvider::loadPlugin( const TQString& mimeType, const
query = "(not exist [X-KDE-Protocol])";
queryMimeType = mimeType;
} else {
- query = TQString::tqfromLatin1( "[X-KDE-Protocol] == '%1'" ).arg(protocol);
+ query = TQString::fromLatin1( "[X-KDE-Protocol] == '%1'" ).arg(protocol);
// querying for a protocol: we have no mimetype, so we need to use KFilePlugin as one
queryMimeType = "KFilePlugin";
// hopefully using KFilePlugin as genericMimeType too isn't a problem
diff --git a/kio/kio/kfileshare.cpp b/kio/kio/kfileshare.cpp
index 62b5e6ddb..1f6dca285 100644
--- a/kio/kio/kfileshare.cpp
+++ b/kio/kio/kfileshare.cpp
@@ -90,7 +90,7 @@ void KFileShare::readConfig() // static
{
// Create KFileSharePrivate instance
KFileSharePrivate::self();
- KSimpleConfig config(TQString::tqfromLatin1(FILESHARECONF),true);
+ KSimpleConfig config(TQString::fromLatin1(FILESHARECONF),true);
s_sharingEnabled = config.readEntry("FILESHARING", "yes") == "yes";
s_restricted = config.readEntry("RESTRICT", "yes") == "yes";
@@ -241,7 +241,7 @@ KFileShare::Authorization KFileShare::authorization()
TQString KFileShare::findExe( const char* exeName )
{
// /usr/sbin on Mandrake, $PATH allows flexibility for other distributions
- TQString path = TQString::fromLocal8Bit(getenv("PATH")) + TQString::tqfromLatin1(":/usr/sbin");
+ TQString path = TQString::fromLocal8Bit(getenv("PATH")) + TQString::fromLatin1(":/usr/sbin");
TQString exe = KStandardDirs::findExe( exeName, path );
if (exe.isEmpty())
kdError() << exeName << " not found in " << path << endl;
diff --git a/kio/kio/kimageio.cpp b/kio/kio/kimageio.cpp
index 72cc13f1f..7260f9e18 100644
--- a/kio/kio/kimageio.cpp
+++ b/kio/kio/kimageio.cpp
@@ -100,18 +100,18 @@ KImageIOFormat::callLibFunc( bool read, TQImageIO *iio)
{
if (mLib.isEmpty())
{
- iio->setqStatus(1); // Error
+ iio->seStatus(1); // Error
return;
}
TQString libpath = KLibLoader::findLibrary(mLib.ascii());
if ( libpath.isEmpty())
{
- iio->setqStatus(1); // Error
+ iio->seStatus(1); // Error
return;
}
lt_dlhandle libhandle = lt_dlopen( TQFile::encodeName(libpath) );
if (libhandle == 0) {
- iio->setqStatus(1); // error
+ iio->seStatus(1); // error
kdWarning() << "KImageIOFormat::callLibFunc: couldn't dlopen " << mLib << "(" << lt_dlerror() << ")" << endl;
return;
}
@@ -123,7 +123,7 @@ KImageIOFormat::callLibFunc( bool read, TQImageIO *iio)
lt_ptr func = lt_dlsym(libhandle, funcName.ascii());
if (func == NULL) {
- iio->setqStatus(1); // error
+ iio->seStatus(1); // error
kdWarning() << "couln't find " << funcName << " (" << lt_dlerror() << ")" << endl;
}
mReadFunc = (void (*)(TQImageIO *))func;
@@ -134,7 +134,7 @@ KImageIOFormat::callLibFunc( bool read, TQImageIO *iio)
lt_ptr func = lt_dlsym(libhandle, funcName.ascii());
if (func == NULL) {
- iio->setqStatus(1); // error
+ iio->seStatus(1); // error
kdWarning() << "couln't find " << funcName << " (" << lt_dlerror() << ")" << endl;
}
mWriteFunc = (void (*)(TQImageIO *))func;
@@ -145,12 +145,12 @@ KImageIOFormat::callLibFunc( bool read, TQImageIO *iio)
if (mReadFunc)
mReadFunc(iio);
else
- iio->setqStatus(1); // Error
+ iio->seStatus(1); // Error
else
if (mWriteFunc)
mWriteFunc(iio);
else
- iio->setqStatus(1); // Error
+ iio->seStatus(1); // Error
}
@@ -232,7 +232,7 @@ KImageIOFactory::createPattern( KImageIO::Mode _mode)
patterns.sort();
patterns.prepend(allPatterns);
- TQString pattern = patterns.join(TQString::tqfromLatin1("\n"));
+ TQString pattern = patterns.join(TQString::fromLatin1("\n"));
return pattern;
}
@@ -256,7 +256,7 @@ KImageIOFactory::readImage( TQImageIO *iio)
}
if (!format || !format->bRead)
{
- iio->setqStatus(1); // error
+ iio->seStatus(1); // error
return;
}
@@ -283,7 +283,7 @@ KImageIOFactory::writeImage( TQImageIO *iio)
}
if (!format || !format->bWrite)
{
- iio->setqStatus(1); // error
+ iio->seStatus(1); // error
return;
}
diff --git a/kio/kio/kmimemagic.cpp b/kio/kio/kmimemagic.cpp
index 09615d9a7..72b249249 100644
--- a/kio/kio/kmimemagic.cpp
+++ b/kio/kio/kmimemagic.cpp
@@ -525,7 +525,7 @@ class KMimeMagicUtimeConf
public:
KMimeMagicUtimeConf()
{
- tmpDirs << TQString::tqfromLatin1("/tmp"); // default value
+ tmpDirs << TQString::fromLatin1("/tmp"); // default value
// The trick is that we also don't want the user to override globally set
// directories. So we have to misuse KStandardDirs :}
diff --git a/kio/kio/kmimetype.cpp b/kio/kio/kmimetype.cpp
index 719107223..5d650b4b2 100644
--- a/kio/kio/kmimetype.cpp
+++ b/kio/kio/kmimetype.cpp
@@ -265,7 +265,7 @@ KMimeType::Ptr KMimeType::findByURL( const KURL& _url, mode_t _mode,
{
// Assume inode/directory, if the protocol supports listing.
if ( KProtocolInfo::supportsListing( _url ) )
- return mimeType( TQString::tqfromLatin1("inode/directory") );
+ return mimeType( TQString::fromLatin1("inode/directory") );
else
return defaultMimeTypePtr(); // == 'no idea', e.g. for "data:,foo/"
}
@@ -382,15 +382,15 @@ void KMimeType::init( KDesktopFile * config )
m_lstPatterns = config->readListEntry( "Patterns", ';' );
// Read the X-KDE-AutoEmbed setting and store it in the properties map
- TQString XKDEAutoEmbed = TQString::tqfromLatin1("X-KDE-AutoEmbed");
+ TQString XKDEAutoEmbed = TQString::fromLatin1("X-KDE-AutoEmbed");
if ( config->hasKey( XKDEAutoEmbed ) )
m_mapProps.insert( XKDEAutoEmbed, TQVariant( config->readBoolEntry( XKDEAutoEmbed ), 0 ) );
- TQString XKDEText = TQString::tqfromLatin1("X-KDE-text");
+ TQString XKDEText = TQString::fromLatin1("X-KDE-text");
if ( config->hasKey( XKDEText ) )
m_mapProps.insert( XKDEText, config->readBoolEntry( XKDEText ) );
- TQString XKDEIsAlso = TQString::tqfromLatin1("X-KDE-IsAlso");
+ TQString XKDEIsAlso = TQString::fromLatin1("X-KDE-IsAlso");
if ( config->hasKey( XKDEIsAlso ) ) {
TQString inherits = config->readEntry( XKDEIsAlso );
if ( inherits != name() )
@@ -399,7 +399,7 @@ void KMimeType::init( KDesktopFile * config )
kdWarning(7009) << "Error: " << inherits << " inherits from itself!!!!" << endl;
}
- TQString XKDEPatternsAccuracy = TQString::tqfromLatin1("X-KDE-PatternsAccuracy");
+ TQString XKDEPatternsAccuracy = TQString::fromLatin1("X-KDE-PatternsAccuracy");
if ( config->hasKey( XKDEPatternsAccuracy ) )
m_mapProps.insert( XKDEPatternsAccuracy, config->readEntry( XKDEPatternsAccuracy ) );
@@ -838,7 +838,7 @@ pid_t KDEDesktopMimeType::runFSDevice( const KURL& _url, const KSimpleConfig &cf
KURL mpURL;
mpURL.setPath( mp );
// Open a new window
- retval = KRun::runURL( mpURL, TQString::tqfromLatin1("inode/directory") );
+ retval = KRun::runURL( mpURL, TQString::fromLatin1("inode/directory") );
}
else
{
diff --git a/kio/kio/kmimetypechooser.cpp b/kio/kio/kmimetypechooser.cpp
index d4d7b620a..5548396b6 100644
--- a/kio/kio/kmimetypechooser.cpp
+++ b/kio/kio/kmimetypechooser.cpp
@@ -195,9 +195,9 @@ void KMimeTypeChooser::editMimeType()
// thanks to libkonq/konq_operations.cc
connect( KSycoca::self(), TQT_SIGNAL(databaseChanged()),
this, TQT_SLOT(slotSycocaDatabaseChanged()) );
- TQString keditfiletype = TQString::tqfromLatin1("keditfiletype");
+ TQString keditfiletype = TQString::fromLatin1("keditfiletype");
KRun::runCommand( keditfiletype
- + " --parent " + TQString::number( (ulong)tqtopLevelWidget()->winId())
+ + " --parent " + TQString::number( (ulong)topLevelWidget()->winId())
+ " " + KProcess::quote(mt),
keditfiletype, keditfiletype /*unused*/);
}
diff --git a/kio/kio/kprotocolmanager.cpp b/kio/kio/kprotocolmanager.cpp
index 9d24886da..a3d8e0302 100644
--- a/kio/kio/kprotocolmanager.cpp
+++ b/kio/kio/kprotocolmanager.cpp
@@ -277,7 +277,7 @@ TQString KProtocolManager::proxyForURL( const KURL &url )
break;
}
- return (proxy.isEmpty() ? TQString::tqfromLatin1("DIRECT") : proxy);
+ return (proxy.isEmpty() ? TQString::fromLatin1("DIRECT") : proxy);
}
void KProtocolManager::badProxy( const TQString &proxy )
@@ -462,7 +462,7 @@ TQString KProtocolManager::defaultUserAgent( const TQString &_modifiers )
if( modifiers.contains('p') )
{
// TODO: determine this value instead of hardcoding it...
- supp += TQString::tqfromLatin1("; X11");
+ supp += TQString::fromLatin1("; X11");
}
if( modifiers.contains('m') )
{
@@ -471,13 +471,13 @@ TQString KProtocolManager::defaultUserAgent( const TQString &_modifiers )
if( modifiers.contains('l') )
{
TQStringList languageList = KGlobal::locale()->languageList();
- TQStringList::Iterator it = languageList.find( TQString::tqfromLatin1("C") );
+ TQStringList::Iterator it = languageList.find( TQString::fromLatin1("C") );
if( it != languageList.end() )
{
- if( languageList.contains( TQString::tqfromLatin1("en") ) > 0 )
+ if( languageList.contains( TQString::fromLatin1("en") ) > 0 )
languageList.remove( it );
else
- (*it) = TQString::tqfromLatin1("en");
+ (*it) = TQString::fromLatin1("en");
}
if( languageList.count() )
supp += TQString("; %1").arg(languageList.join(", "));
diff --git a/kio/kio/kremoteencoding.cpp b/kio/kio/kremoteencoding.cpp
index 23fd0563d..632eeb8b2 100644
--- a/kio/kio/kremoteencoding.cpp
+++ b/kio/kio/kremoteencoding.cpp
@@ -37,13 +37,13 @@ TQString KRemoteEncoding::decode(const TQCString& name) const
{
#ifdef CHECK_UTF8
if (codec->mibEnum() == 106 && !KStringHandler::isUtf8(name))
- return TQString::tqfromLatin1(name);
+ return TQString::fromLatin1(name);
#endif
TQString result = codec->toUnicode(name);
if (codec->fromUnicode(result) != name)
// fallback in case of decoding failure
- return TQString::tqfromLatin1(name);
+ return TQString::fromLatin1(name);
return result;
}
diff --git a/kio/kio/ksambashare.cpp b/kio/kio/ksambashare.cpp
index 08da8352c..defeae4a7 100644
--- a/kio/kio/ksambashare.cpp
+++ b/kio/kio/ksambashare.cpp
@@ -62,7 +62,7 @@ bool KSambaSharePrivate::load() {
* @return wether a smb.conf was found.
**/
bool KSambaSharePrivate::findSmbConf() {
- KSimpleConfig config(TQString::tqfromLatin1(FILESHARECONF),true);
+ KSimpleConfig config(TQString::fromLatin1(FILESHARECONF),true);
smbConf = config.readEntry("SMBCONF");
if ( TQFile::exists(smbConf) )
diff --git a/kio/kio/kurifilter.cpp b/kio/kio/kurifilter.cpp
index ab65e0c66..2c4c5b12e 100644
--- a/kio/kio/kurifilter.cpp
+++ b/kio/kio/kurifilter.cpp
@@ -35,7 +35,7 @@ template class TQPtrList<KURIFilterPlugin>;
KURIFilterPlugin::KURIFilterPlugin( TQObject *parent, const char *name, double pri )
:TQObject( parent, name )
{
- m_strName = TQString::tqfromLatin1( name );
+ m_strName = TQString::fromLatin1( name );
m_dblPriority = pri;
}
@@ -173,30 +173,30 @@ TQString KURIFilterData::iconName()
TQString exeName = m_pURI.url();
exeName = exeName.mid( exeName.findRev( '/' ) + 1 ); // strip path if given
KService::Ptr service = KService::serviceByDesktopName( exeName );
- if (service && service->icon() != TQString::tqfromLatin1( "unknown" ))
+ if (service && service->icon() != TQString::fromLatin1( "unknown" ))
m_strIconName = service->icon();
// Try to find an icon with the same name as the binary (useful for non-kde apps)
else if ( !KGlobal::iconLoader()->loadIcon( exeName, KIcon::NoGroup, 16, KIcon::DefaultState, 0, true ).isNull() )
m_strIconName = exeName;
else
// not found, use default
- m_strIconName = TQString::tqfromLatin1("exec");
+ m_strIconName = TQString::fromLatin1("exec");
break;
}
case KURIFilterData::HELP:
{
- m_strIconName = TQString::tqfromLatin1("khelpcenter");
+ m_strIconName = TQString::fromLatin1("khelpcenter");
break;
}
case KURIFilterData::SHELL:
{
- m_strIconName = TQString::tqfromLatin1("konsole");
+ m_strIconName = TQString::fromLatin1("konsole");
break;
}
case KURIFilterData::ERROR:
case KURIFilterData::BLOCKED:
{
- m_strIconName = TQString::tqfromLatin1("error");
+ m_strIconName = TQString::fromLatin1("error");
break;
}
default:
diff --git a/kio/kio/netaccess.cpp b/kio/kio/netaccess.cpp
index 795f9a8b1..e6c3d655b 100644
--- a/kio/kio/netaccess.cpp
+++ b/kio/kio/netaccess.cpp
@@ -373,7 +373,7 @@ bool NetAccess::mkdirInternal( const KURL & url, int permissions,
TQString NetAccess::mimetypeInternal( const KURL & url, TQWidget* window )
{
bJobOK = true; // success unless further error occurs
- m_mimetype = TQString::tqfromLatin1("unknown");
+ m_mimetype = TQString::fromLatin1("unknown");
KIO::Job * job = KIO::mimetype( url );
job->setWindow (window);
connect( job, TQT_SIGNAL( result (KIO::Job *) ),
@@ -462,7 +462,7 @@ bool NetAccess::synchronousRunInternal( Job* job, TQWidget* window, TQByteArray*
connect( job, TQT_SIGNAL( result (KIO::Job *) ),
this, TQT_SLOT( slotResult (KIO::Job *) ) );
- TQMetaObject *meta = job->tqmetaObject();
+ TQMetaObject *meta = job->metaObject();
static const char dataSignal[] = "data(KIO::Job*,const " TQBYTEARRAY_OBJECT_NAME_STRING "&)";
if ( meta->findSignal( dataSignal ) != -1 ) {
diff --git a/kio/kio/passdlg.cpp b/kio/kio/passdlg.cpp
index a71f7881f..e18666328 100644
--- a/kio/kio/passdlg.cpp
+++ b/kio/kio/passdlg.cpp
@@ -198,7 +198,7 @@ static void calculateLabelSize(TQLabel *label)
// Calculate a proper size for the text.
{
TQSimpleRichText rt(qt_text, label->font());
- TQRect d = KGlobalSettings::desktopGeometry(label->tqtopLevelWidget());
+ TQRect d = KGlobalSettings::desktopGeometry(label->topLevelWidget());
pref_width = d.width() / 4;
rt.setWidth(pref_width-10);
diff --git a/kio/kio/previewjob.cpp b/kio/kio/previewjob.cpp
index 0fc13b4b2..3b428c847 100644
--- a/kio/kio/previewjob.cpp
+++ b/kio/kio/previewjob.cpp
@@ -96,7 +96,7 @@ struct KIO::PreviewJobPrivate
// If the file to create a thumb for was a temp file, this is its name
TQString tempName;
// Over that, it's too much
- unsigned long tqmaximumSize;
+ unsigned long maximumSize;
// the size for the icon overlay
int iconSize;
// the transparency of the blended mimetype icon
@@ -246,7 +246,7 @@ void PreviewJob::startPreview()
// Read configuration value for the maximum allowed size
KConfig * config = KGlobal::config();
KConfigGroupSaver cgs( config, "PreviewSettings" );
- d->tqmaximumSize = config->readNumEntry( "MaximumSize", 1024*1024 /* 1MB */ );
+ d->maximumSize = config->readNumEntry( "MaximumSize", 1024*1024 /* 1MB */ );
if (bNeedCache)
{
@@ -339,7 +339,7 @@ void PreviewJob::slotResult( KIO::Job *job )
}
else if ( (*it).m_uds == KIO::UDS_SIZE )
{
- if ( filesize_t((*it).m_long) > d->tqmaximumSize &&
+ if ( filesize_t((*it).m_long) > d->maximumSize &&
!d->ignoreMaximumSize &&
!d->currentItem.plugin->property("IgnoreMaximumSize").toBool() )
{
diff --git a/kio/kio/sessiondata.cpp b/kio/kio/sessiondata.cpp
index 937d6aa51..8619c2dc4 100644
--- a/kio/kio/sessiondata.cpp
+++ b/kio/kio/sessiondata.cpp
@@ -273,7 +273,7 @@ void SessionData::reset()
// Get language settings...
TQStringList languageList = KGlobal::locale()->languagesTwoAlpha();
- TQStringList::Iterator it = languageList.find( TQString::tqfromLatin1("C") );
+ TQStringList::Iterator it = languageList.find( TQString::fromLatin1("C") );
if ( it != languageList.end() )
{
if ( languageList.contains( english ) > 0 )
@@ -286,7 +286,7 @@ void SessionData::reset()
d->language = languageList.join( ", " );
- d->charsets = TQString::tqfromLatin1(TQTextCodec::codecForLocale()->mimeName()).lower();
+ d->charsets = TQString::fromLatin1(TQTextCodec::codecForLocale()->mimeName()).lower();
KProtocolManager::reparseConfiguration();
}
diff --git a/kio/kio/slave.cpp b/kio/kio/slave.cpp
index b4f288d94..4826c8da8 100644
--- a/kio/kio/slave.cpp
+++ b/kio/kio/slave.cpp
@@ -364,7 +364,7 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error
client->attach();
TQString prefix = locateLocal("socket", KGlobal::instance()->instanceName());
- KTempFile socketfile(prefix, TQString::tqfromLatin1(".slave-socket"));
+ KTempFile socketfile(prefix, TQString::fromLatin1(".slave-socket"));
if ( socketfile.status() != 0 )
{
error_text = i18n("Unable to create io-slave: %1").arg(strerror(errno));
@@ -469,7 +469,7 @@ Slave* Slave::holdSlave( const TQString &protocol, const KURL& url )
client->attach();
TQString prefix = locateLocal("socket", KGlobal::instance()->instanceName());
- KTempFile socketfile(prefix, TQString::tqfromLatin1(".slave-socket"));
+ KTempFile socketfile(prefix, TQString::fromLatin1(".slave-socket"));
if ( socketfile.status() != 0 )
return 0;
diff --git a/kio/kio/slavebase.h b/kio/kio/slavebase.h
index 48fccd74e..82370ce56 100644
--- a/kio/kio/slavebase.h
+++ b/kio/kio/slavebase.h
@@ -618,10 +618,10 @@ public:
* KIO::AuthInfo authInfo;
* if ( openPassDlg( authInfo ) )
* {
- * kdDebug() << TQString::tqfromLatin1("User: ")
+ * kdDebug() << TQString::fromLatin1("User: ")
* << authInfo.username << endl;
- * kdDebug() << TQString::tqfromLatin1("Password: ")
- * << TQString::tqfromLatin1("Not displayed here!") << endl;
+ * kdDebug() << TQString::fromLatin1("Password: ")
+ * << TQString::fromLatin1("Not displayed here!") << endl;
* }
* \endcode
*
@@ -635,10 +635,10 @@ public:
* TQString errorMsg = "You entered an incorrect password.";
* if ( openPassDlg( authInfo, errorMsg ) )
* {
- * kdDebug() << TQString::tqfromLatin1("User: ")
+ * kdDebug() << TQString::fromLatin1("User: ")
* << authInfo.username << endl;
- * kdDebug() << TQString::tqfromLatin1("Password: ")
- * << TQString::tqfromLatin1("Not displayed here!") << endl;
+ * kdDebug() << TQString::fromLatin1("Password: ")
+ * << TQString::fromLatin1("Not displayed here!") << endl;
* }
* \endcode
*
diff --git a/kio/kpasswdserver/kpasswdserver.cpp b/kio/kpasswdserver/kpasswdserver.cpp
index 06694dd72..42cbad3a4 100644
--- a/kio/kpasswdserver/kpasswdserver.cpp
+++ b/kio/kpasswdserver/kpasswdserver.cpp
@@ -94,7 +94,7 @@ static TQString makeWalletKey( const TQString& key, const TQString& realm )
// Helper for storeInWallet/readFromWallet
static TQString makeMapKey( const char* key, int entryNumber )
{
- TQString str = TQString::tqfromLatin1( key );
+ TQString str = TQString::fromLatin1( key );
if ( entryNumber > 1 )
str += "-" + TQString::number( entryNumber );
return str;
diff --git a/kio/kssl/ksslcertificate.cc b/kio/kssl/ksslcertificate.cc
index 7211e510f..7d86726c8 100644
--- a/kio/kssl/ksslcertificate.cc
+++ b/kio/kssl/ksslcertificate.cc
@@ -871,7 +871,7 @@ TQDateTime KSSLCertificate::getQDTNotBefore() const {
#ifdef KSSL_HAVE_SSL
return ASN1_UTCTIME_QDateTime(X509_get_notBefore(d->m_cert), NULL);
#else
-return TQDateTime::tqcurrentDateTime();
+return TQDateTime::currentDateTime();
#endif
}
@@ -880,7 +880,7 @@ TQDateTime KSSLCertificate::getQDTNotAfter() const {
#ifdef KSSL_HAVE_SSL
return ASN1_UTCTIME_QDateTime(X509_get_notAfter(d->m_cert), NULL);
#else
-return TQDateTime::tqcurrentDateTime();
+return TQDateTime::currentDateTime();
#endif
}
diff --git a/kio/kssl/ksslinfodlg.cc b/kio/kssl/ksslinfodlg.cc
index 32580e932..9a43942c8 100644
--- a/kio/kssl/ksslinfodlg.cc
+++ b/kio/kssl/ksslinfodlg.cc
@@ -273,14 +273,14 @@ void KSSLInfoDlg::displayCert(KSSLCertificate *x) {
d->_serialNum->setText(x->getSerialNumber());
cspl = d->_validFrom->palette();
- if (x->getQDTNotBefore() > TQDateTime::tqcurrentDateTime(Qt::UTC))
+ if (x->getQDTNotBefore() > TQDateTime::currentDateTime(Qt::UTC))
cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
else cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
d->_validFrom->setPalette(cspl);
d->_validFrom->setText(x->getNotBefore());
cspl = d->_validUntil->palette();
- if (x->getQDTNotAfter() < TQDateTime::tqcurrentDateTime(Qt::UTC))
+ if (x->getQDTNotAfter() < TQDateTime::currentDateTime(Qt::UTC))
cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
else cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
d->_validUntil->setPalette(cspl);
@@ -305,8 +305,8 @@ void KSSLInfoDlg::displayCert(KSSLCertificate *x) {
ksv = ksvl.first();
if (ksv == KSSLCertificate::SelfSigned) {
- if (x->getQDTNotAfter() > TQDateTime::tqcurrentDateTime(Qt::UTC) &&
- x->getQDTNotBefore() < TQDateTime::tqcurrentDateTime(Qt::UTC)) {
+ if (x->getQDTNotAfter() > TQDateTime::currentDateTime(Qt::UTC) &&
+ x->getQDTNotBefore() < TQDateTime::currentDateTime(Qt::UTC)) {
if (KSSLSigners().useForSSL(*x))
ksv = KSSLCertificate::Ok;
} else {
diff --git a/kio/kssl/ksslpeerinfo.cc b/kio/kssl/ksslpeerinfo.cc
index 8d960ceb7..d1c2d00fc 100644
--- a/kio/kssl/ksslpeerinfo.cc
+++ b/kio/kssl/ksslpeerinfo.cc
@@ -65,7 +65,7 @@ void KSSLPeerInfo::setPeerHost(TQString realHost) {
#ifdef Q_WS_WIN //TODO kresolver not ported
d->peerHost = d->peerHost.lower();
#else
- d->peerHost = TQString::tqfromLatin1(KNetwork::KResolver::domainToAscii(d->peerHost));
+ d->peerHost = TQString::fromLatin1(KNetwork::KResolver::domainToAscii(d->peerHost));
#endif
}
diff --git a/kio/misc/kntlm/kntlm.cpp b/kio/misc/kntlm/kntlm.cpp
index db2b45b6c..834d2e30d 100644
--- a/kio/misc/kntlm/kntlm.cpp
+++ b/kio/misc/kntlm/kntlm.cpp
@@ -48,7 +48,7 @@ TQString KNTLM::getString( const TQByteArray &buf, const SecBuf &secbuf, bool tq
if ( tqunicode ) {
str = UnicodeLE2TQString( (TQChar*) c, len >> 1 );
} else {
- str = TQString::tqfromLatin1( c, len );
+ str = TQString::fromLatin1( c, len );
}
return str;
}
@@ -299,7 +299,7 @@ TQByteArray KNTLM::createBlob( const TQByteArray &targetinfo )
Blob *bl = (Blob *) blob.data();
bl->signature = KFromToBigEndian( (TQ_UINT32) 0x01010000 );
- TQ_UINT64 now = TQDateTime::tqcurrentDateTime().toTime_t();
+ TQ_UINT64 now = TQDateTime::currentDateTime().toTime_t();
now += (TQ_UINT64)3600*(TQ_UINT64)24*(TQ_UINT64)134774;
now *= (TQ_UINT64)10000000;
bl->timestamp = KFromToLittleEndian( now );
diff --git a/kio/misc/ksendbugmail/main.cpp b/kio/misc/ksendbugmail/main.cpp
index 46475e9aa..764ed1a74 100644
--- a/kio/misc/ksendbugmail/main.cpp
+++ b/kio/misc/ksendbugmail/main.cpp
@@ -101,11 +101,11 @@ int main(int argc, char **argv) {
if (!fromaddr.isEmpty()) {
TQString name = emailConfig.getSetting(KEMailSettings::RealName);
if (!name.isEmpty())
- fromaddr = name + TQString::tqfromLatin1(" <") + fromaddr + TQString::tqfromLatin1(">");
+ fromaddr = name + TQString::fromLatin1(" <") + fromaddr + TQString::fromLatin1(">");
} else {
struct passwd *p;
p = getpwuid(getuid());
- fromaddr = TQString::tqfromLatin1(p->pw_name);
+ fromaddr = TQString::fromLatin1(p->pw_name);
fromaddr += "@";
char buffer[256];
buffer[0] = '\0';
@@ -117,7 +117,7 @@ int main(int argc, char **argv) {
TQString server = emailConfig.getSetting(KEMailSettings::OutServer);
if (server.isEmpty())
- server=TQString::tqfromLatin1("bugs.kde.org");
+ server=TQString::fromLatin1("bugs.kde.org");
SMTP *sm = new SMTP;
BugMailer bm(sm);
@@ -129,7 +129,7 @@ int main(int argc, char **argv) {
sm->setSenderAddress(fromaddr);
sm->setRecipientAddress(recipient);
sm->setMessageSubject(subject);
- sm->setMessageHeader(TQString::tqfromLatin1("From: %1\r\nTo: %2\r\n").arg(fromaddr).arg(recipient.data()));
+ sm->setMessageHeader(TQString::fromLatin1("From: %1\r\nTo: %2\r\n").arg(fromaddr).arg(recipient.data()));
sm->setMessageBody(text);
sm->sendMessage();
diff --git a/kio/misc/ksendbugmail/smtp.cpp b/kio/misc/ksendbugmail/smtp.cpp
index a9f69792d..36a417b88 100644
--- a/kio/misc/ksendbugmail/smtp.cpp
+++ b/kio/misc/ksendbugmail/smtp.cpp
@@ -134,7 +134,7 @@ void SMTP::sendMessage(void)
kdDebug() << "state was == FINISHED\n" << endl;
finished = false;
state = IN;
- writeString = TQString::tqfromLatin1("helo %1\r\n").arg(domainName);
+ writeString = TQString::fromLatin1("helo %1\r\n").arg(domainName);
write(sock->socket(), writeString.ascii(), writeString.length());
}
if(connected){
@@ -262,7 +262,7 @@ void SMTP::processLine(TQString *line)
switch(stat){
case GREET: //220
state = IN;
- writeString = TQString::tqfromLatin1("helo %1\r\n").arg(domainName);
+ writeString = TQString::fromLatin1("helo %1\r\n").arg(domainName);
kdDebug() << "out: " << writeString << endl;
write(sock->socket(), writeString.ascii(), writeString.length());
break;
@@ -273,19 +273,19 @@ void SMTP::processLine(TQString *line)
switch(state){
case IN:
state = READY;
- writeString = TQString::tqfromLatin1("mail from: %1\r\n").arg(senderAddress);
+ writeString = TQString::fromLatin1("mail from: %1\r\n").arg(senderAddress);
kdDebug() << "out: " << writeString << endl;
write(sock->socket(), writeString.ascii(), writeString.length());
break;
case READY:
state = SENTFROM;
- writeString = TQString::tqfromLatin1("rcpt to: %1\r\n").arg(recipientAddress);
+ writeString = TQString::fromLatin1("rcpt to: %1\r\n").arg(recipientAddress);
kdDebug() << "out: " << writeString << endl;
write(sock->socket(), writeString.ascii(), writeString.length());
break;
case SENTFROM:
state = SENTTO;
- writeString = TQString::tqfromLatin1("data\r\n");
+ writeString = TQString::fromLatin1("data\r\n");
kdDebug() << "out: " << writeString << endl;
write(sock->socket(), writeString.ascii(), writeString.length());
break;
@@ -305,11 +305,11 @@ void SMTP::processLine(TQString *line)
break;
case READYDATA: //354
state = DATA;
- writeString = TQString::tqfromLatin1("Subject: %1\r\n").arg(messageSubject);
+ writeString = TQString::fromLatin1("Subject: %1\r\n").arg(messageSubject);
writeString += messageHeader;
writeString += "\r\n";
writeString += messageBody;
- writeString += TQString::tqfromLatin1(".\r\n");
+ writeString += TQString::fromLatin1(".\r\n");
kdDebug() << "out: " << writeString;
write(sock->socket(), writeString.ascii(), writeString.length());
break;
diff --git a/kio/misc/kssld/kssld.cpp b/kio/misc/kssld/kssld.cpp
index 45d523d2e..b60d75226 100644
--- a/kio/misc/kssld/kssld.cpp
+++ b/kio/misc/kssld/kssld.cpp
@@ -72,7 +72,7 @@ static void updatePoliciesConfig(KConfig *cfg) {
cfg->setGroup(*i);
// remove it if it has expired
- if (!cfg->readBoolEntry("Permanent") && cfg->readDateTimeEntry("Expires") < TQDateTime::tqcurrentDateTime()) {
+ if (!cfg->readBoolEntry("Permanent") && cfg->readDateTimeEntry("Expires") < TQDateTime::currentDateTime()) {
cfg->deleteGroup(*i);
continue;
}
@@ -164,7 +164,7 @@ KSSLCNode *node;
for (node = certList.first(); node; node = certList.next()) {
if (node->permanent ||
- node->expires > TQDateTime::tqcurrentDateTime()) {
+ node->expires > TQDateTime::currentDateTime()) {
// First convert to a binary format and then write the
// kconfig entry write the (CN, policy, cert) to
// KSimpleConfig
@@ -239,7 +239,7 @@ TQStringList groups = cfg->groupList();
// remove it if it has expired
if (!cfg->readBoolEntry("Permanent") &&
cfg->readDateTimeEntry("Expires") <
- TQDateTime::tqcurrentDateTime()) {
+ TQDateTime::currentDateTime()) {
cfg->deleteGroup(*i);
continue;
}
@@ -278,7 +278,7 @@ KSSLCNode *node;
node->permanent = permanent;
if (!permanent) {
- node->expires = TQDateTime::tqcurrentDateTime();
+ node->expires = TQDateTime::currentDateTime();
// FIXME: make this configurable
node->expires = TQT_TQDATETIME_OBJECT(node->expires.addSecs(3600));
}
@@ -297,7 +297,7 @@ KSSLCNode *node;
certList.prepend(n);
if (!permanent) {
- n->expires = TQDateTime::tqcurrentDateTime();
+ n->expires = TQDateTime::currentDateTime();
n->expires = TQT_TQDATETIME_OBJECT(n->expires.addSecs(3600));
}
@@ -312,7 +312,7 @@ KSSLCNode *node;
for (node = certList.first(); node; node = certList.next()) {
if (KSSLX509Map(node->cert->getSubject()).getValue("CN") == cn) {
if (!node->permanent &&
- node->expires < TQDateTime::tqcurrentDateTime()) {
+ node->expires < TQDateTime::currentDateTime()) {
certList.remove(node);
cfg->deleteGroup(node->cert->getMD5Digest());
delete node;
@@ -338,7 +338,7 @@ KSSLCNode *node;
for (node = certList.first(); node; node = certList.next()) {
if (cert == *(node->cert)) {
if (!node->permanent &&
- node->expires < TQDateTime::tqcurrentDateTime()) {
+ node->expires < TQDateTime::currentDateTime()) {
certList.remove(node);
cfg->deleteGroup(node->cert->getMD5Digest());
delete node;
@@ -362,7 +362,7 @@ KSSLCNode *node;
for (node = certList.first(); node; node = certList.next()) {
if (KSSLX509Map(node->cert->getSubject()).getValue("CN") == cn) {
if (!node->permanent &&
- node->expires < TQDateTime::tqcurrentDateTime()) {
+ node->expires < TQDateTime::currentDateTime()) {
certList.remove(node);
cfg->deleteGroup(node->cert->getMD5Digest());
delete node;
@@ -386,7 +386,7 @@ KSSLCNode *node;
for (node = certList.first(); node; node = certList.next()) {
if (cert == *(node->cert)) {
if (!node->permanent &&
- node->expires < TQDateTime::tqcurrentDateTime()) {
+ node->expires < TQDateTime::currentDateTime()) {
certList.remove(node);
cfg->deleteGroup(node->cert->getMD5Digest());
delete node;
@@ -410,7 +410,7 @@ KSSLCNode *node;
for (node = certList.first(); node; node = certList.next()) {
if (cert == *(node->cert)) {
if (!node->permanent && node->expires <
- TQDateTime::tqcurrentDateTime()) {
+ TQDateTime::currentDateTime()) {
certList.remove(node);
cfg->deleteGroup(node->cert->getMD5Digest());
delete node;
@@ -535,7 +535,7 @@ KSSLCNode *node;
for (node = certList.first(); node; node = certList.next()) {
if (cert == *(node->cert)) {
if (!node->permanent && node->expires <
- TQDateTime::tqcurrentDateTime()) {
+ TQDateTime::currentDateTime()) {
certList.remove(node);
cfg->deleteGroup(node->cert->getMD5Digest());
searchRemoveCert(node->cert);
@@ -563,7 +563,7 @@ KSSLCNode *node;
for (node = certList.first(); node; node = certList.next()) {
if (cert == *(node->cert)) {
if (!node->permanent && node->expires <
- TQDateTime::tqcurrentDateTime()) {
+ TQDateTime::currentDateTime()) {
certList.remove(node);
cfg->deleteGroup(node->cert->getMD5Digest());
searchRemoveCert(node->cert);
@@ -593,7 +593,7 @@ KSSLCNode *node;
for (node = certList.first(); node; node = certList.next()) {
if (cert == *(node->cert)) {
if (!node->permanent && node->expires <
- TQDateTime::tqcurrentDateTime()) {
+ TQDateTime::currentDateTime()) {
certList.remove(node);
cfg->deleteGroup(node->cert->getMD5Digest());
searchRemoveCert(node->cert);
diff --git a/kio/misc/uiserver.cpp b/kio/misc/uiserver.cpp
index 87f95fb29..32130c159 100644
--- a/kio/misc/uiserver.cpp
+++ b/kio/misc/uiserver.cpp
@@ -418,7 +418,7 @@ void ProgressItem::slotToggleDefaultProgress() {
// Called when a rename or skip dialog pops up
// We want to prevent someone from killing the job in the uiserver then
-void ProgressItem::tqsetVisible( bool visible ) {
+void ProgressItem::setVisible( bool visible ) {
if ( m_visible != visible )
{
m_visible = visible;
@@ -792,7 +792,7 @@ ProgressItem* UIServer::findItem( int id )
void UIServer::setItemVisible( ProgressItem * item, bool visible )
{
- item->tqsetVisible( visible );
+ item->setVisible( visible );
// Check if we were the last one to be visible
// or the first one -> hide/show the list in that case
// (Note that the user could have hidden the listview by hand yet, no time)
diff --git a/kio/misc/uiserver.h b/kio/misc/uiserver.h
index 74c1a681e..85e255a43 100644
--- a/kio/misc/uiserver.h
+++ b/kio/misc/uiserver.h
@@ -118,7 +118,7 @@ public:
bool keepOpen() const;
void finished();
- void tqsetVisible( bool visible );
+ void setVisible( bool visible );
void setDefaultProgressVisible( bool visible );
bool isVisible() const { return m_visible; }
diff --git a/kio/tests/jobtest.cpp b/kio/tests/jobtest.cpp
index 3b7a6c6d3..c5dfba9d2 100644
--- a/kio/tests/jobtest.cpp
+++ b/kio/tests/jobtest.cpp
@@ -532,7 +532,7 @@ void JobTest::slotEntries( KIO::Job*, const KIO::UDSEntryList& lst )
void JobTest::copyFileToSystem()
{
- if ( !KProtocolInfo::isKnownProtocol( TQString::tqfromLatin1( "system" ) ) ) {
+ if ( !KProtocolInfo::isKnownProtocol( TQString::fromLatin1( "system" ) ) ) {
kdDebug() << k_funcinfo << "no kio_system, skipping test" << endl;
return;
}
diff --git a/kio/tests/kacltest.cpp b/kio/tests/kacltest.cpp
index 348d35e34..e97f7c110 100644
--- a/kio/tests/kacltest.cpp
+++ b/kio/tests/kacltest.cpp
@@ -80,22 +80,22 @@ int main(int argc, char *argv[])
}
#ifdef Q_OS_FREEBSD
-static const TQString s_group1 = TQString::tqfromLatin1("staff");
-static const TQString s_group2 = TQString::tqfromLatin1("guest");
+static const TQString s_group1 = TQString::fromLatin1("staff");
+static const TQString s_group2 = TQString::fromLatin1("guest");
#else
-static const TQString s_group1 = TQString::tqfromLatin1("audio");
-static const TQString s_group2 = TQString::tqfromLatin1("users");
+static const TQString s_group1 = TQString::fromLatin1("audio");
+static const TQString s_group2 = TQString::fromLatin1("users");
#endif
-static const TQString s_testACL = TQString::tqfromLatin1( "user::rw-\nuser:bin:rwx\ngroup::rw-\nmask::rwx\nother::r--\n" );
-static const TQString s_testACL2 = TQString::tqfromLatin1( "user::rwx\nuser:bin:rwx\ngroup::rw-\n") +
- TQString::tqfromLatin1( "group:" ) + s_group1 + TQString::tqfromLatin1( ":--x\n" ) +
- TQString::tqfromLatin1( "group:" ) + s_group2 + TQString::tqfromLatin1( ":r--\n" ) +
- TQString::tqfromLatin1( "mask::r-x\nother::r--\n" );
-static const TQString s_testACLEffective = TQString::tqfromLatin1( "user::rwx\nuser:bin:rwx #effective:r-x\ngroup::rw- #effective:r--\n" ) +
- TQString::tqfromLatin1( "group:" ) + s_group1 + TQString::tqfromLatin1( ":--x\n" ) +
- TQString::tqfromLatin1( "group:" ) + s_group2 + TQString::tqfromLatin1( ":r--\n" ) +
- TQString::tqfromLatin1( "mask::r-x\nother::r--\n" );
+static const TQString s_testACL = TQString::fromLatin1( "user::rw-\nuser:bin:rwx\ngroup::rw-\nmask::rwx\nother::r--\n" );
+static const TQString s_testACL2 = TQString::fromLatin1( "user::rwx\nuser:bin:rwx\ngroup::rw-\n") +
+ TQString::fromLatin1( "group:" ) + s_group1 + TQString::fromLatin1( ":--x\n" ) +
+ TQString::fromLatin1( "group:" ) + s_group2 + TQString::fromLatin1( ":r--\n" ) +
+ TQString::fromLatin1( "mask::r-x\nother::r--\n" );
+static const TQString s_testACLEffective = TQString::fromLatin1( "user::rwx\nuser:bin:rwx #effective:r-x\ngroup::rw- #effective:r--\n" ) +
+ TQString::fromLatin1( "group:" ) + s_group1 + TQString::fromLatin1( ":--x\n" ) +
+ TQString::fromLatin1( "group:" ) + s_group2 + TQString::fromLatin1( ":r--\n" ) +
+ TQString::fromLatin1( "mask::r-x\nother::r--\n" );
KACLTest::KACLTest()
:m_acl( s_testACL )
@@ -265,8 +265,8 @@ void KACLTest::testSettingExtended()
// groups, all and named
- const TQString expected2 = TQString::tqfromLatin1( "user::rw-\nuser:bin:rwx\ngroup::rw-\ngroup:" ) + s_group1 +
- TQString::tqfromLatin1( ":-wx\ngroup:" ) + s_group2 + TQString::tqfromLatin1(":r--\nmask::rwx\nother::r--\n" );
+ const TQString expected2 = TQString::fromLatin1( "user::rw-\nuser:bin:rwx\ngroup::rw-\ngroup:" ) + s_group1 +
+ TQString::fromLatin1( ":-wx\ngroup:" ) + s_group2 + TQString::fromLatin1(":r--\nmask::rwx\nother::r--\n" );
CharlesII.setACL( s_testACL ); // reset
ACLGroupPermissionsList groups;
ACLGroupPermissions group = qMakePair( s_group1, ( unsigned short )3 );
diff --git a/kio/tests/kdefaultprogresstest.cpp b/kio/tests/kdefaultprogresstest.cpp
index c2a642c1f..a831041e1 100644
--- a/kio/tests/kdefaultprogresstest.cpp
+++ b/kio/tests/kdefaultprogresstest.cpp
@@ -18,7 +18,7 @@ int main(int argc, char **argv)
dlg->slotTotalDirs( 0L, 1 );
dlg->slotSpeed( 0L, 55 );
- dlg->slotInfoMessage( 0L, TQString::tqfromLatin1( "Starting..." ) );
+ dlg->slotInfoMessage( 0L, TQString::fromLatin1( "Starting..." ) );
int files = 0;
for ( int size = 0 ; size < 12000 ; size += 1 )
@@ -31,7 +31,7 @@ int main(int argc, char **argv)
}
kapp->processEvents();
}
- dlg->slotInfoMessage( 0L, TQString::tqfromLatin1( "Done." ) );
+ dlg->slotInfoMessage( 0L, TQString::fromLatin1( "Done." ) );
delete dlg;
return 0;
diff --git a/kio/tests/ksycocatest.cpp b/kio/tests/ksycocatest.cpp
index ab0130860..436ae7639 100644
--- a/kio/tests/ksycocatest.cpp
+++ b/kio/tests/ksycocatest.cpp
@@ -70,7 +70,7 @@ int main(int argc, char *argv[])
KApplication k(argc,argv,"whatever",false/*noGUI*/); // KMessageBox needs KApp for makeStdCaption
TQCString instname = "kword";
- TQString desktopPath = TQString::tqfromLatin1( "Office/%1.desktop" ).arg( instname );
+ TQString desktopPath = TQString::fromLatin1( "Office/%1.desktop" ).arg( instname );
qDebug( "Looking for %s", desktopPath.latin1() );
KService::Ptr service = KService::serviceByDesktopPath( desktopPath );
if ( service )
diff --git a/kio/tests/kurifiltertest.cpp b/kio/tests/kurifiltertest.cpp
index dd4d84e7f..c448cca90 100644
--- a/kio/tests/kurifiltertest.cpp
+++ b/kio/tests/kurifiltertest.cpp
@@ -45,7 +45,7 @@ void filter( const char* u, const char * expectedResult = 0, int expectedUriType
if( abs_path )
{
- m_filterData->setAbsolutePath( TQString::tqfromLatin1( abs_path ) );
+ m_filterData->setAbsolutePath( TQString::fromLatin1( abs_path ) );
kdDebug() << "Filtering: " << a << " with abs_path=" << abs_path << endl;
}
else
@@ -98,7 +98,7 @@ void filter( const char* u, const char * expectedResult = 0, int expectedUriType
{
// Hack for other locales than english, normalize google hosts to google.com
cmd = cmd.replace( TQRegExp( "www\\.google\\.[^/]*/" ), "www.google.com/" );
- if ( cmd != TQString::tqfromLatin1( expectedResult ) )
+ if ( cmd != TQString::fromLatin1( expectedResult ) )
{
kdError() << " Got " << cmd << " expected " << expectedResult << endl;
::exit(1);
diff --git a/kioslave/file/file.cc b/kioslave/file/file.cc
index 496f761dd..2deeb3535 100644
--- a/kioslave/file/file.cc
+++ b/kioslave/file/file.cc
@@ -379,7 +379,7 @@ void FileProtocol::put( const KURL& url, int _mode, bool _overwrite, bool _resum
kdDebug(7101) << "put(): " << dest_orig << ", mode=" << _mode << endl;
TQString dest_part( dest_orig );
- dest_part += TQString::tqfromLatin1(".part");
+ dest_part += TQString::fromLatin1(".part");
TQCString _dest_part( TQFile::encodeName(dest_part));
KDE_struct_stat buff_orig;
@@ -809,7 +809,7 @@ void FileProtocol::copy( const KURL &src, const KURL &dest,
ut.modtime = buff_src.st_mtime;
if ( ::utime( _dest.data(), &ut ) != 0 )
{
- kdWarning() << TQString(TQString::tqfromLatin1("Couldn't preserve access and modification time for\n%1").arg( dest.path() )) << endl;
+ kdWarning() << TQString(TQString::fromLatin1("Couldn't preserve access and modification time for\n%1").arg( dest.path() )) << endl;
}
processedSize( buff_src.st_size );
@@ -859,7 +859,7 @@ void FileProtocol::rename( const KURL &src, const KURL &dest,
error( KIO::ERR_ACCESS_DENIED, dest.path() );
}
else if (errno == EXDEV) {
- error( KIO::ERR_UNSUPPORTED_ACTION, TQString::tqfromLatin1("rename"));
+ error( KIO::ERR_UNSUPPORTED_ACTION, TQString::fromLatin1("rename"));
}
else if (errno == EROFS) { // The file is on a read-only filesystem
error( KIO::ERR_CANNOT_DELETE, src.path() );
@@ -964,8 +964,8 @@ TQString FileProtocol::getUserName( uid_t uid )
if ( !temp ) {
struct passwd *user = getpwuid( uid );
if ( user ) {
- usercache.insert( uid, new TQString(TQString::tqfromLatin1(user->pw_name)) );
- return TQString::tqfromLatin1( user->pw_name );
+ usercache.insert( uid, new TQString(TQString::fromLatin1(user->pw_name)) );
+ return TQString::fromLatin1( user->pw_name );
}
else
return TQString::number( uid );
@@ -981,8 +981,8 @@ TQString FileProtocol::getGroupName( gid_t gid )
if ( !temp ) {
struct group *grp = getgrgid( gid );
if ( grp ) {
- groupcache.insert( gid, new TQString(TQString::tqfromLatin1(grp->gr_name)) );
- return TQString::tqfromLatin1( grp->gr_name );
+ groupcache.insert( gid, new TQString(TQString::fromLatin1(grp->gr_name)) );
+ return TQString::fromLatin1( grp->gr_name );
}
else
return TQString::number( gid );
@@ -1116,7 +1116,7 @@ void FileProtocol::stat( const KURL & url )
*/
TQCString _path( TQFile::encodeName(url.path(-1)));
- TQString sDetails = metaData(TQString::tqfromLatin1("details"));
+ TQString sDetails = metaData(TQString::fromLatin1("details"));
int details = sDetails.isEmpty() ? 2 : sDetails.toInt();
kdDebug(7101) << "FileProtocol::stat details=" << details << endl;
@@ -1419,10 +1419,10 @@ void FileProtocol::mount( bool _ro, const char *_fstype, const TQString& _dev, c
bool fstype_empty = !_fstype || !*_fstype;
TQCString fstype = KProcess::quote(_fstype).latin1(); // good guess
TQCString readonly = _ro ? "-r" : "";
- TQString epath = TQString::tqfromLatin1(getenv("PATH"));
- TQString path = TQString::tqfromLatin1("/sbin:/bin");
+ TQString epath = TQString::fromLatin1(getenv("PATH"));
+ TQString path = TQString::fromLatin1("/sbin:/bin");
if(!epath.isEmpty())
- path += TQString::tqfromLatin1(":") + epath;
+ path += TQString::fromLatin1(":") + epath;
TQString mountProg = KGlobal::dirs()->findExe("mount", path);
if (mountProg.isEmpty()){
error( KIO::ERR_COULD_NOT_MOUNT, i18n("Could not find program \"mount\""));
@@ -1604,7 +1604,7 @@ void FileProtocol::unmount( const TQString& _point )
}
#else
TQString epath = getenv("PATH");
- TQString path = TQString::tqfromLatin1("/sbin:/bin");
+ TQString path = TQString::fromLatin1("/sbin:/bin");
if (!epath.isEmpty())
path += ":" + epath;
TQString umountProg = KGlobal::dirs()->findExe("umount", path);
@@ -1658,7 +1658,7 @@ void FileProtocol::unmount( const TQString& _point )
bool FileProtocol::pmount(const TQString &dev)
{
TQString epath = getenv("PATH");
- TQString path = TQString::tqfromLatin1("/sbin:/bin");
+ TQString path = TQString::fromLatin1("/sbin:/bin");
if (!epath.isEmpty())
path += ":" + epath;
TQString pmountProg = KGlobal::dirs()->findExe("pmount", path);
@@ -1700,7 +1700,7 @@ bool FileProtocol::pumount(const TQString &point)
if (dev.endsWith("/")) dev.truncate(dev.length()-1);
TQString epath = getenv("PATH");
- TQString path = TQString::tqfromLatin1("/sbin:/bin");
+ TQString path = TQString::fromLatin1("/sbin:/bin");
if (!epath.isEmpty())
path += ":" + epath;
TQString pumountProg = KGlobal::dirs()->findExe("pumount", path);
@@ -1774,7 +1774,7 @@ static bool isExtendedACL( acl_t acl )
static TQString aclAsString( acl_t acl )
{
char *aclString = acl_to_text( acl, 0 );
- TQString ret = TQString::tqfromLatin1( aclString );
+ TQString ret = TQString::fromLatin1( aclString );
acl_free( (void*)aclString );
return ret;
}
diff --git a/kioslave/ftp/ftp.cc b/kioslave/ftp/ftp.cc
index a30710743..07208fe77 100644
--- a/kioslave/ftp/ftp.cc
+++ b/kioslave/ftp/ftp.cc
@@ -71,9 +71,9 @@
#endif
// JPF: a remark on coding style (2004-03-06):
-// Some calls to TQString::tqfromLatin1() were removed from the code. In most places
+// Some calls to TQString::fromLatin1() were removed from the code. In most places
// the KDE code relies on implicit creation of QStrings. Also Qt has a lot of
-// const char* overloads, so that using TQString::tqfromLatin1() can be ineffectient!
+// const char* overloads, so that using TQString::fromLatin1() can be ineffectient!
#define FTP_LOGIN "anonymous"
#define FTP_PASSWD "anonymous@"
@@ -968,7 +968,7 @@ int Ftp::ftpOpenEPRTDataConnection()
if (sin == NULL)
return ERR_INTERNAL;
- // TQString command = TQString::tqfromLatin1("eprt |%1|%2|%3|").arg(sin->ianaFamily())
+ // TQString command = TQString::fromLatin1("eprt |%1|%2|%3|").arg(sin->ianaFamily())
// .arg(sin->nodeName())
// .arg(sin->port());
TQCString command;
diff --git a/kioslave/http/http.cc b/kioslave/http/http.cc
index f772950bb..d509a3eb3 100644
--- a/kioslave/http/http.cc
+++ b/kioslave/http/http.cc
@@ -607,7 +607,7 @@ void HTTPProtocol::stat(const KURL& url)
if ( m_protocol != "webdav" && m_protocol != "webdavs" )
{
- TQString statSide = metaData(TQString::tqfromLatin1("statSide"));
+ TQString statSide = metaData(TQString::fromLatin1("statSide"));
if ( statSide != "source" )
{
// When uploading we assume the file doesn't exit
@@ -1805,7 +1805,7 @@ bool HTTPProtocol::isOffline(const KURL &url)
TQDataStream stream(params, IO_WriteOnly);
- if ( url.host() == TQString::tqfromLatin1("localhost") || url.host() == TQString::tqfromLatin1("127.0.0.1") || url.host() == TQString::tqfromLatin1("::") ) {
+ if ( url.host() == TQString::fromLatin1("localhost") || url.host() == TQString::fromLatin1("127.0.0.1") || url.host() == TQString::fromLatin1("::") ) {
return false;
}
if ( dcopClient()->call( "kded", "networkstatus", "status()",
@@ -2786,7 +2786,7 @@ try_again:
// by assuming that they will be sending html.
kdDebug(7113) << "(" << m_pid << ") HTTPPreadHeader: HEAD -> returned "
<< "mimetype: " << DEFAULT_MIME_TYPE << endl;
- mimeType(TQString::tqfromLatin1(DEFAULT_MIME_TYPE));
+ mimeType(TQString::fromLatin1(DEFAULT_MIME_TYPE));
return true;
}
@@ -2847,7 +2847,7 @@ try_again:
// Store the the headers so they can be passed to the
// calling application later
- m_responseHeader << TQString::tqfromLatin1(buf);
+ m_responseHeader << TQString::fromLatin1(buf);
if ((strncasecmp(buf, "HTTP/", 5) == 0) ||
(strncasecmp(buf, "ICY ", 4) == 0)) // Shoutcast support
@@ -3030,7 +3030,7 @@ try_again:
// Keep Alive
else if (strncasecmp(buf, "Keep-Alive:", 11) == 0) {
TQStringList options = TQStringList::split(',',
- TQString::tqfromLatin1(trimLead(buf+11)));
+ TQString::fromLatin1(trimLead(buf+11)));
for(TQStringList::ConstIterator it = options.begin();
it != options.end();
it++)
@@ -3046,7 +3046,7 @@ try_again:
// Cache control
else if (strncasecmp(buf, "Cache-Control:", 14) == 0) {
TQStringList cacheControls = TQStringList::split(',',
- TQString::tqfromLatin1(trimLead(buf+14)));
+ TQString::fromLatin1(trimLead(buf+14)));
for(TQStringList::ConstIterator it = cacheControls.begin();
it != cacheControls.end();
it++)
@@ -3081,7 +3081,7 @@ try_again:
else if (strncasecmp(buf, "Content-location:", 17) == 0) {
setMetaData ("content-location",
- TQString::tqfromLatin1(trimLead(buf+17)).stripWhiteSpace());
+ TQString::fromLatin1(trimLead(buf+17)).stripWhiteSpace());
}
// what type of data do we have?
@@ -3093,7 +3093,7 @@ try_again:
while ( *pos && *pos != ';' ) pos++;
// Assign the mime-type.
- m_strMimeType = TQString::tqfromLatin1(start, pos-start).stripWhiteSpace().lower();
+ m_strMimeType = TQString::fromLatin1(start, pos-start).stripWhiteSpace().lower();
kdDebug(7113) << "(" << m_pid << ") Content-type: " << m_strMimeType << endl;
// If we still have text, then it means we have a mime-type with a
@@ -3108,8 +3108,8 @@ try_again:
if (*pos)
{
- mediaAttribute = TQString::tqfromLatin1(start, pos-start).stripWhiteSpace().lower();
- mediaValue = TQString::tqfromLatin1(pos+1, end-pos-1).stripWhiteSpace();
+ mediaAttribute = TQString::fromLatin1(start, pos-start).stripWhiteSpace().lower();
+ mediaValue = TQString::fromLatin1(pos+1, end-pos-1).stripWhiteSpace();
pos = end;
if (mediaValue.length() &&
(mediaValue[0] == '"') &&
@@ -3153,7 +3153,7 @@ try_again:
// Cache management
else if (strncasecmp(buf, "Last-Modified:", 14) == 0) {
- m_request.lastModified = (TQString::tqfromLatin1(trimLead(buf+14))).stripWhiteSpace();
+ m_request.lastModified = (TQString::fromLatin1(trimLead(buf+14))).stripWhiteSpace();
}
// whoops.. we received a warning
@@ -3177,7 +3177,7 @@ try_again:
// The deprecated Refresh Response
else if (strncasecmp(buf,"Refresh:", 8) == 0) {
mayCache = false; // Do not cache page as it defeats purpose of Refresh tag!
- setMetaData( "http-refresh", TQString::tqfromLatin1(trimLead(buf+8)).stripWhiteSpace() );
+ setMetaData( "http-refresh", TQString::fromLatin1(trimLead(buf+8)).stripWhiteSpace() );
}
// In fact we should do redirection only if we got redirection code
@@ -3254,7 +3254,7 @@ try_again:
dispositionBuf--;
if ( dispositionBuf > bufStart )
- dispositionFilename = TQString::tqfromLatin1( bufStart, dispositionBuf-bufStart );
+ dispositionFilename = TQString::fromLatin1( bufStart, dispositionBuf-bufStart );
break;
}
@@ -3267,7 +3267,7 @@ try_again:
dispositionBuf++;
if ( dispositionBuf > bufStart )
- dispositionType = TQString::tqfromLatin1( bufStart, dispositionBuf-bufStart ).stripWhiteSpace();
+ dispositionType = TQString::fromLatin1( bufStart, dispositionBuf-bufStart ).stripWhiteSpace();
while ( *dispositionBuf == ';' || *dispositionBuf == ' ' )
dispositionBuf++;
@@ -3288,7 +3288,7 @@ try_again:
}
}
else if(strncasecmp(buf, "Content-Language:", 17) == 0) {
- TQString language = TQString::tqfromLatin1(trimLead(buf+17)).stripWhiteSpace();
+ TQString language = TQString::fromLatin1(trimLead(buf+17)).stripWhiteSpace();
if (!language.isEmpty())
setMetaData("content-language", language);
}
@@ -3381,17 +3381,17 @@ try_again:
// md5 signature
else if (strncasecmp(buf, "Content-MD5:", 12) == 0) {
- m_sContentMD5 = TQString::tqfromLatin1(trimLead(buf + 12));
+ m_sContentMD5 = TQString::fromLatin1(trimLead(buf + 12));
}
// *** Responses to the HTTP OPTIONS method follow
// WebDAV capabilities
else if (strncasecmp(buf, "DAV:", 4) == 0) {
if (m_davCapabilities.isEmpty()) {
- m_davCapabilities << TQString::tqfromLatin1(trimLead(buf + 4));
+ m_davCapabilities << TQString::fromLatin1(trimLead(buf + 4));
}
else {
- m_davCapabilities << TQString::tqfromLatin1(trimLead(buf + 4));
+ m_davCapabilities << TQString::fromLatin1(trimLead(buf + 4));
}
}
// *** Responses to the HTTP OPTIONS method finished
@@ -3667,14 +3667,14 @@ try_again:
if (m_strMimeType == "application/x-tar")
{
m_qContentEncodings.remove(m_qContentEncodings.fromLast());
- m_strMimeType = TQString::tqfromLatin1("application/x-tgz");
+ m_strMimeType = TQString::fromLatin1("application/x-tgz");
}
else if (m_strMimeType == "application/postscript")
{
// LEONB: Adding another exception for psgz files.
// Could we use the mimelnk files instead of hardcoding all this?
m_qContentEncodings.remove(m_qContentEncodings.fromLast());
- m_strMimeType = TQString::tqfromLatin1("application/x-gzpostscript");
+ m_strMimeType = TQString::fromLatin1("application/x-gzpostscript");
}
else if ( m_request.allowCompressedPage &&
m_strMimeType != "application/x-tgz" &&
@@ -3683,7 +3683,7 @@ try_again:
m_request.url.path().right(6) == ".ps.gz" )
{
m_qContentEncodings.remove(m_qContentEncodings.fromLast());
- m_strMimeType = TQString::tqfromLatin1("application/x-gzpostscript");
+ m_strMimeType = TQString::fromLatin1("application/x-gzpostscript");
}
else if ( (m_request.allowCompressedPage &&
m_strMimeType == "text/html")
@@ -3700,7 +3700,7 @@ try_again:
else
{
m_qContentEncodings.remove(m_qContentEncodings.fromLast());
- m_strMimeType = TQString::tqfromLatin1("application/x-gzip");
+ m_strMimeType = TQString::fromLatin1("application/x-gzip");
}
}
@@ -3713,34 +3713,34 @@ try_again:
if (m_qContentEncodings.last() == "bzip2")
{
m_qContentEncodings.remove(m_qContentEncodings.fromLast());
- m_strMimeType = TQString::tqfromLatin1("application/x-bzip2");
+ m_strMimeType = TQString::fromLatin1("application/x-bzip2");
}
// Convert some common mimetypes to standard KDE mimetypes
if (m_strMimeType == "application/x-targz")
- m_strMimeType = TQString::tqfromLatin1("application/x-tgz");
+ m_strMimeType = TQString::fromLatin1("application/x-tgz");
else if (m_strMimeType == "application/zip")
- m_strMimeType = TQString::tqfromLatin1("application/x-zip");
+ m_strMimeType = TQString::fromLatin1("application/x-zip");
else if (m_strMimeType == "image/x-png")
- m_strMimeType = TQString::tqfromLatin1("image/png");
+ m_strMimeType = TQString::fromLatin1("image/png");
else if (m_strMimeType == "image/bmp")
- m_strMimeType = TQString::tqfromLatin1("image/x-bmp");
+ m_strMimeType = TQString::fromLatin1("image/x-bmp");
else if (m_strMimeType == "audio/mpeg" || m_strMimeType == "audio/x-mpeg" || m_strMimeType == "audio/mp3")
- m_strMimeType = TQString::tqfromLatin1("audio/x-mp3");
+ m_strMimeType = TQString::fromLatin1("audio/x-mp3");
else if (m_strMimeType == "audio/microsoft-wave")
- m_strMimeType = TQString::tqfromLatin1("audio/x-wav");
+ m_strMimeType = TQString::fromLatin1("audio/x-wav");
else if (m_strMimeType == "audio/midi")
- m_strMimeType = TQString::tqfromLatin1("audio/x-midi");
+ m_strMimeType = TQString::fromLatin1("audio/x-midi");
else if (m_strMimeType == "image/x-xpixmap")
- m_strMimeType = TQString::tqfromLatin1("image/x-xpm");
+ m_strMimeType = TQString::fromLatin1("image/x-xpm");
else if (m_strMimeType == "application/rtf")
- m_strMimeType = TQString::tqfromLatin1("text/rtf");
+ m_strMimeType = TQString::fromLatin1("text/rtf");
// Crypto ones....
else if (m_strMimeType == "application/pkix-cert" ||
m_strMimeType == "application/binary-certificate")
{
- m_strMimeType = TQString::tqfromLatin1("application/x-x509-ca-cert");
+ m_strMimeType = TQString::fromLatin1("application/x-x509-ca-cert");
}
// Prefer application/x-tgz or x-gzpostscript over application/x-gzip.
@@ -3748,9 +3748,9 @@ try_again:
{
if ((m_request.url.path().right(7) == ".tar.gz") ||
(m_request.url.path().right(4) == ".tar"))
- m_strMimeType = TQString::tqfromLatin1("application/x-tgz");
+ m_strMimeType = TQString::fromLatin1("application/x-tgz");
if ((m_request.url.path().right(6) == ".ps.gz"))
- m_strMimeType = TQString::tqfromLatin1("application/x-gzpostscript");
+ m_strMimeType = TQString::fromLatin1("application/x-gzpostscript");
}
// Some webservers say "text/plain" when they mean "application/x-bzip2"
@@ -3758,15 +3758,15 @@ try_again:
{
TQString ext = m_request.url.path().right(4).upper();
if (ext == ".BZ2")
- m_strMimeType = TQString::tqfromLatin1("application/x-bzip2");
+ m_strMimeType = TQString::fromLatin1("application/x-bzip2");
else if (ext == ".PEM")
- m_strMimeType = TQString::tqfromLatin1("application/x-x509-ca-cert");
+ m_strMimeType = TQString::fromLatin1("application/x-x509-ca-cert");
else if (ext == ".SWF")
- m_strMimeType = TQString::tqfromLatin1("application/x-shockwave-flash");
+ m_strMimeType = TQString::fromLatin1("application/x-shockwave-flash");
else if (ext == ".PLS")
- m_strMimeType = TQString::tqfromLatin1("audio/x-scpls");
+ m_strMimeType = TQString::fromLatin1("audio/x-scpls");
else if (ext == ".WMV")
- m_strMimeType = TQString::tqfromLatin1("video/x-ms-wmv");
+ m_strMimeType = TQString::fromLatin1("video/x-ms-wmv");
}
#if 0
@@ -3871,11 +3871,11 @@ void HTTPProtocol::addEncoding(TQString encoding, TQStringList &encs)
//if ( m_cmd != CMD_COPY )
m_iSize = NO_SIZE;
} else if ((encoding == "x-gzip") || (encoding == "gzip")) {
- encs.append(TQString::tqfromLatin1("gzip"));
+ encs.append(TQString::fromLatin1("gzip"));
} else if ((encoding == "x-bzip2") || (encoding == "bzip2")) {
- encs.append(TQString::tqfromLatin1("bzip2")); // Not yet supported!
+ encs.append(TQString::fromLatin1("bzip2")); // Not yet supported!
} else if ((encoding == "x-deflate") || (encoding == "deflate")) {
- encs.append(TQString::tqfromLatin1("deflate"));
+ encs.append(TQString::fromLatin1("deflate"));
} else {
kdDebug(7113) << "(" << m_pid << ") Unknown encoding encountered. "
<< "Please write code. Encoding = \"" << encoding
@@ -4270,7 +4270,7 @@ void HTTPProtocol::slotData(const TQByteArray &_d)
if ( m_strMimeType.isEmpty() )
{
- m_strMimeType = TQString::tqfromLatin1( DEFAULT_MIME_TYPE );
+ m_strMimeType = TQString::fromLatin1( DEFAULT_MIME_TYPE );
kdDebug(7113) << "(" << m_pid << ") Using default mimetype: "
<< m_strMimeType << endl;
}
@@ -4739,7 +4739,7 @@ FILE* HTTPProtocol::checkCacheEntry( bool readWrite)
ok = false;
time_t date;
- time_t tqcurrentDate = time(0);
+ time_t currentDate = time(0);
// URL
if (ok && (!fgets(buffer, 400, fs)))
@@ -4762,10 +4762,10 @@ FILE* HTTPProtocol::checkCacheEntry( bool readWrite)
{
date = (time_t) strtoul(buffer, 0, 10);
m_request.creationDate = date;
- if (m_maxCacheAge && (difftime(tqcurrentDate, date) > m_maxCacheAge))
+ if (m_maxCacheAge && (difftime(currentDate, date) > m_maxCacheAge))
{
m_request.bMustRevalidate = true;
- m_request.expireDate = tqcurrentDate;
+ m_request.expireDate = currentDate;
}
}
@@ -4779,14 +4779,14 @@ FILE* HTTPProtocol::checkCacheEntry( bool readWrite)
{
date = (time_t) strtoul(buffer, 0, 10);
// After the expire date we need to revalidate.
- if (!date || difftime(tqcurrentDate, date) >= 0)
+ if (!date || difftime(currentDate, date) >= 0)
m_request.bMustRevalidate = true;
m_request.expireDate = date;
}
else if (m_request.cache == CC_Refresh)
{
m_request.bMustRevalidate = true;
- m_request.expireDate = tqcurrentDate;
+ m_request.expireDate = currentDate;
}
}
@@ -5135,12 +5135,12 @@ void HTTPProtocol::configAuth( char *p, bool isForProxy )
if( isForProxy )
{
ProxyAuthentication = f;
- m_strProxyAuthorization = TQString::tqfromLatin1( strAuth );
+ m_strProxyAuthorization = TQString::fromLatin1( strAuth );
}
else
{
Authentication = f;
- m_strAuthorization = TQString::tqfromLatin1( strAuth );
+ m_strAuthorization = TQString::fromLatin1( strAuth );
}
}
diff --git a/kioslave/http/http_cache_cleaner.cpp b/kioslave/http/http_cache_cleaner.cpp
index cc17d9729..02a07c712 100644
--- a/kioslave/http/http_cache_cleaner.cpp
+++ b/kioslave/http/http_cache_cleaner.cpp
@@ -44,7 +44,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kdebug.h>
-time_t tqcurrentDate;
+time_t currentDate;
int m_maxCacheAge;
int m_maxCacheSize;
@@ -109,7 +109,7 @@ FileInfo *readEntry( const TQString &filename)
if (ok)
{
creationDate = (time_t) strtoul(buffer, 0, 10);
- age = (int) difftime(tqcurrentDate, creationDate);
+ age = (int) difftime(currentDate, creationDate);
if ( m_maxCacheAge && ( age > m_maxCacheAge))
{
ok = false; // Expired
@@ -125,7 +125,7 @@ FileInfo *readEntry( const TQString &filename)
#if 0
time_t expireDate;
expireDate = (time_t) strtoul(buffer, 0, 10);
- if (expireDate && (expireDate < tqcurrentDate))
+ if (expireDate && (expireDate < currentDate))
ok = false; // Expired
#endif
}
@@ -213,7 +213,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
}
}
- tqcurrentDate = time(0);
+ currentDate = time(0);
m_maxCacheAge = KProtocolManager::maxCacheAge();
m_maxCacheSize = KProtocolManager::maxCacheSize();
diff --git a/kioslave/http/kcookiejar/kcookiejar.cpp b/kioslave/http/kcookiejar/kcookiejar.cpp
index 136fba0b1..c9c379c58 100644
--- a/kioslave/http/kcookiejar/kcookiejar.cpp
+++ b/kioslave/http/kcookiejar/kcookiejar.cpp
@@ -84,12 +84,12 @@
#define READ_BUFFER_SIZE 8192
#define IP_ADDRESS_EXPRESSION "(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)"
-// Note with respect to TQString::tqfromLatin1( )
+// Note with respect to TQString::fromLatin1( )
// Cookies are stored as 8 bit data and passed to kio_http as
// latin1 regardless of their actual encoding.
// L1 is used to indicate latin1 constants
-#define L1(x) TQString::tqfromLatin1(x)
+#define L1(x) TQString::fromLatin1(x)
template class TQPtrList<KHttpCookie>;
template class TQPtrDict<KHttpCookieList>;
@@ -154,9 +154,9 @@ KHttpCookie::KHttpCookie(const TQString &_host,
//
// Checks if a cookie has been expired
//
-bool KHttpCookie::isExpired(time_t tqcurrentDate)
+bool KHttpCookie::isExpired(time_t currentDate)
{
- return (mExpireDate != 0) && (mExpireDate < tqcurrentDate);
+ return (mExpireDate != 0) && (mExpireDate < currentDate);
}
//
@@ -479,7 +479,7 @@ static const char * parseNameValue(const char *header,
// No '=' sign -> use string as the value, name is empty
// (behavior found in Mozilla and IE)
Name = "";
- Value = TQString::tqfromLatin1(header);
+ Value = TQString::fromLatin1(header);
Value.truncate( s - header );
Value = Value.stripWhiteSpace();
return (s);
@@ -516,12 +516,12 @@ static const char * parseNameValue(const char *header,
if ((*s=='\0') || (*s=='\n'))
{
// End of Name
- Value = TQString::tqfromLatin1(header);
+ Value = TQString::fromLatin1(header);
Value.truncate(s - header);
return (s);
}
}
- Value = TQString::tqfromLatin1(header);
+ Value = TQString::fromLatin1(header);
// *s == '\"';
if (keepQuotes)
Value.truncate( ++s - header );
@@ -542,7 +542,7 @@ static const char * parseNameValue(const char *header,
while ((*s != '\0') && (*s != ';') && (*s != '\n'))
s++;
// End of Name
- Value = TQString::tqfromLatin1(header);
+ Value = TQString::fromLatin1(header);
Value.truncate( s - header );
Value = Value.stripWhiteSpace();
}
@@ -1457,11 +1457,11 @@ bool KCookieJar::loadCookies(const TQString &_filename)
if ((expDate == 0) || (expDate < curTime))
continue;
- KHttpCookie *cookie = new KHttpCookie(TQString::tqfromLatin1(host),
- TQString::tqfromLatin1(domain),
- TQString::tqfromLatin1(path),
- TQString::tqfromLatin1(name),
- TQString::tqfromLatin1(value),
+ KHttpCookie *cookie = new KHttpCookie(TQString::fromLatin1(host),
+ TQString::fromLatin1(domain),
+ TQString::fromLatin1(path),
+ TQString::fromLatin1(name),
+ TQString::fromLatin1(value),
expDate, protVer,
secure, httpOnly, explicitPath);
addCookie(cookie);
diff --git a/kioslave/http/kcookiejar/kcookiejar.h b/kioslave/http/kcookiejar/kcookiejar.h
index 6d5d9f2e5..eb64485ea 100644
--- a/kioslave/http/kcookiejar/kcookiejar.h
+++ b/kioslave/http/kcookiejar/kcookiejar.h
@@ -89,7 +89,7 @@ public:
time_t expireDate(void) { return mExpireDate; }
int protocolVersion(void) { return mProtocolVersion; }
bool isSecure(void) { return mSecure; }
- bool isExpired(time_t tqcurrentDate);
+ bool isExpired(time_t currentDate);
bool isCrossDomain(void) { return mCrossDomain; }
bool isHttpOnly(void) { return mHttpOnly; }
bool hasExplicitPath(void) { return mExplicitPath; }
diff --git a/kioslave/http/kcookiejar/tests/kcookiejartest.cpp b/kioslave/http/kcookiejar/tests/kcookiejartest.cpp
index 1ce1c4d8f..0ad238ab7 100644
--- a/kioslave/http/kcookiejar/tests/kcookiejartest.cpp
+++ b/kioslave/http/kcookiejar/tests/kcookiejartest.cpp
@@ -72,12 +72,12 @@ static void popArg(TQString &command, TQCString & line)
int i = line.find(' ');
if (i != -1)
{
- command = TQString::tqfromLatin1(line.left(i));
+ command = TQString::fromLatin1(line.left(i));
line = line.mid(i+1);
}
else
{
- command = TQString::tqfromLatin1(line);
+ command = TQString::fromLatin1(line);
line = 0;
}
}
@@ -158,7 +158,7 @@ static void processCheck(TQCString &line)
if (url.isEmpty())
FAIL(TQString("Missing URL"));
- TQString expectedCookies = TQString::tqfromLatin1(line);
+ TQString expectedCookies = TQString::fromLatin1(line);
TQString cookies = jar->findCookies(urlStr, false, 0, 0).stripWhiteSpace();
if (cookies != expectedCookies)
@@ -246,8 +246,8 @@ int main(int argc, char *argv[])
TQCString arg2;
TQString result;
- lastYear = new TQCString(TQString("Fri, 04-May-%1 01:00:00 GMT").arg(TQDate::tqcurrentDate().year()-1).utf8());
- nextYear = new TQCString(TQString(" expires=Fri, 04-May-%1 01:00:00 GMT").arg(TQDate::tqcurrentDate().year()+1).utf8());
+ lastYear = new TQCString(TQString("Fri, 04-May-%1 01:00:00 GMT").arg(TQDate::currentDate().year()-1).utf8());
+ nextYear = new TQCString(TQString(" expires=Fri, 04-May-%1 01:00:00 GMT").arg(TQDate::currentDate().year()+1).utf8());
KAboutData about("kcookietest", "kcookietest", "1.0", description, KAboutData::License_GPL, "(C) 2004 Waldo Bastian");
KCmdLineArgs::init( argc, argv, &about);
diff --git a/kioslave/iso/iso.cpp b/kioslave/iso/iso.cpp
index 9e5691654..cde39702f 100644
--- a/kioslave/iso/iso.cpp
+++ b/kioslave/iso/iso.cpp
@@ -150,7 +150,7 @@ bool kio_isoProtocol::checkNewFile( TQString fullPath, TQString & path, int star
path.truncate( len - 1 );
}
else
- path = TQString::tqfromLatin1("/");
+ path = TQString::fromLatin1("/");
kdDebug() << "Found. isoFile=" << isoFile << " path=" << path << endl;
break;
}
@@ -259,10 +259,10 @@ void kio_isoProtocol::listDir( const KURL & url )
if ( path.isEmpty() )
{
- KURL redir( TQString::tqfromLatin1( "iso:/") );
+ KURL redir( TQString::fromLatin1( "iso:/") );
kdDebug() << "url.path()==" << url.path() << endl;
if (url.hasRef()) redir.setRef(url.htmlRef());
- redir.setPath( url.path() + TQString::tqfromLatin1("/") );
+ redir.setPath( url.path() + TQString::fromLatin1("/") );
kdDebug() << "kio_isoProtocol::listDir: redirection " << redir.url() << endl;
redirection( redir );
finished();
@@ -356,7 +356,7 @@ void kio_isoProtocol::stat( const KURL & url )
const KArchiveEntry* isoEntry;
if ( path.isEmpty() )
{
- path = TQString::tqfromLatin1( "/" );
+ path = TQString::fromLatin1( "/" );
isoEntry = root;
} else {
isoEntry = root->entry( path );
diff --git a/kmdi/kmdi/guiclient.cpp b/kmdi/kmdi/guiclient.cpp
index b58b538c7..c12debcf2 100644
--- a/kmdi/kmdi/guiclient.cpp
+++ b/kmdi/kmdi/guiclient.cpp
@@ -68,7 +68,7 @@ GUIClient::GUIClient (KMDI::MainWindow* mdiMainFrm,const char* name)
if ( domDocument().documentElement().isNull() )
{
- TQString completeDescription = TQString::tqfromLatin1( guiDescription ).arg( actionListName );
+ TQString completeDescription = TQString::fromLatin1( guiDescription ).arg( actionListName );
setXML( completeDescription, false /*merge*/ );
}
diff --git a/kmdi/kmdichildarea.cpp b/kmdi/kmdichildarea.cpp
index 684c799df..fe28fdff9 100644
--- a/kmdi/kmdichildarea.cpp
+++ b/kmdi/kmdichildarea.cpp
@@ -424,10 +424,10 @@ void KMdiChildArea::cascadeMaximized()
childFrm->move( pnt );
TQSize curSize( width() - pnt.x(), height() - pnt.y() );
- if ( ( childFrm->tqminimumSize().width() > curSize.width() ) ||
- ( childFrm->tqminimumSize().height() > curSize.height() ) )
+ if ( ( childFrm->minimumSize().width() > curSize.width() ) ||
+ ( childFrm->minimumSize().height() > curSize.height() ) )
{
- childFrm->resize( childFrm->tqminimumSize() );
+ childFrm->resize( childFrm->minimumSize() );
}
else
childFrm->resize( curSize );
diff --git a/kmdi/kmdichildfrm.cpp b/kmdi/kmdichildfrm.cpp
index c3e4fb9a1..f0605632c 100644
--- a/kmdi/kmdichildfrm.cpp
+++ b/kmdi/kmdichildfrm.cpp
@@ -278,7 +278,7 @@ void KMdiChildFrm::mouseMoveEvent( TQMouseEvent *e )
if ( !m_pClient )
return;
- if ( m_pClient->tqminimumSize() == m_pClient->tqmaximumSize() )
+ if ( m_pClient->minimumSize() == m_pClient->maximumSize() )
return;
if ( m_bResizing )
@@ -329,11 +329,11 @@ void KMdiChildFrm::resizeWindow( int resizeCorner, int xPos, int yPos )
// it could be the client forces the childframe to enlarge its minimum size
if ( m_pClient )
{
- minWidth = m_pClient->tqminimumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER;
- minHeight = m_pClient->tqminimumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER +
+ minWidth = m_pClient->minimumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER;
+ minHeight = m_pClient->minimumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER +
m_pCaption->heightHint() + KMDI_CHILDFRM_SEPARATOR;
- maxWidth = m_pClient->tqmaximumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER;
- maxHeight = m_pClient->tqmaximumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER +
+ maxWidth = m_pClient->maximumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER;
+ maxHeight = m_pClient->maximumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER +
m_pCaption->heightHint() + KMDI_CHILDFRM_SEPARATOR;
}
@@ -524,7 +524,7 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ )
// client min / max size / layout behavior don't change
// set frame max size indirectly by setting the clients max size to
// it's current value (calls setMaxSize() of frame)
- m_pClient->setMaximumSize( m_pClient->tqmaximumSize().width(), m_pClient->tqmaximumSize().height() );
+ m_pClient->setMaximumSize( m_pClient->maximumSize().width(), m_pClient->maximumSize().height() );
m_pMaximize->setPixmap( *m_pMaxButtonPixmap );
setGeometry( m_restoredRect );
break;
@@ -608,11 +608,11 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ )
m_pClient->m_stateChanged = true;
m_state = state;
// save client min / max size / layout behavior
- m_oldClientMinSize = m_pClient->tqminimumSize();
- m_oldClientMaxSize = m_pClient->tqmaximumSize();
+ m_oldClientMinSize = m_pClient->minimumSize();
+ m_oldClientMaxSize = m_pClient->maximumSize();
if ( m_pClient->tqlayout() != 0L )
{
- m_oldLayoutResizeMode = m_pClient->tqlayout() ->tqresizeMode();
+ m_oldLayoutResizeMode = m_pClient->tqlayout() ->resizeMode();
}
m_pClient->setMinimumSize( 0, 0 );
m_pClient->setMaximumSize( 0, 0 );
@@ -627,11 +627,11 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ )
m_pClient->m_stateChanged = true;
m_state = state;
// save client min / max size / layout behavior
- m_oldClientMinSize = m_pClient->tqminimumSize();
- m_oldClientMaxSize = m_pClient->tqmaximumSize();
+ m_oldClientMinSize = m_pClient->minimumSize();
+ m_oldClientMaxSize = m_pClient->maximumSize();
if ( m_pClient->tqlayout() != 0L )
{
- m_oldLayoutResizeMode = m_pClient->tqlayout() ->tqresizeMode();
+ m_oldLayoutResizeMode = m_pClient->tqlayout() ->resizeMode();
}
m_restoredRect = geometry();
m_pClient->setMinimumSize( 0, 0 );
@@ -779,8 +779,8 @@ void KMdiChildFrm::setClient( KMdiChildView *w, bool bAutomaticResize )
{
//reparent to this widget , no flags , point , show it
TQPoint pnt2( KMDI_CHILDFRM_BORDER, clientYPos );
- TQSize mincs = w->tqminimumSize();
- TQSize maxcs = w->tqmaximumSize();
+ TQSize mincs = w->minimumSize();
+ TQSize maxcs = w->maximumSize();
w->setMinimumSize( 0, 0 );
w->setMaximumSize( TQWIDGETSIZE_MAX, TQWIDGETSIZE_MAX );
@@ -798,11 +798,11 @@ void KMdiChildFrm::setClient( KMdiChildView *w, bool bAutomaticResize )
TQObject::connect( m_pClient, TQT_SIGNAL( mdiParentNowMaximized( bool ) ), m_pManager, TQT_SIGNAL( nowMaximized( bool ) ) );
if ( m_pClient->minimumWidth() > m_pManager->m_defaultChildFrmSize.width() )
- setMinimumWidth( m_pClient->tqminimumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER );
+ setMinimumWidth( m_pClient->minimumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER );
if ( m_pClient->minimumHeight() > m_pManager->m_defaultChildFrmSize.height() )
{
- setMinimumHeight( m_pClient->tqminimumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER +
+ setMinimumHeight( m_pClient->minimumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER +
m_pCaption->heightHint() + KMDI_CHILDFRM_SEPARATOR );
}
}
@@ -826,8 +826,8 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset )
if ( focusedChildWidget != 0 )
nameOfFocusedWidget = focusedChildWidget->name();
- TQSize mins = m_pClient->tqminimumSize();
- TQSize maxs = m_pClient->tqmaximumSize();
+ TQSize mins = m_pClient->minimumSize();
+ TQSize maxs = m_pClient->maximumSize();
m_pClient->reparent( 0, 0, mapToGlobal( pos() ) - pos() + positionOffset, isVisible() );
m_pClient->setMinimumSize( mins.width(), mins.height() );
m_pClient->setMaximumSize( maxs.width(), maxs.height() );
diff --git a/kmdi/kmdiguiclient.cpp b/kmdi/kmdiguiclient.cpp
index 4ac95c4fe..b2d95e169 100644
--- a/kmdi/kmdiguiclient.cpp
+++ b/kmdi/kmdiguiclient.cpp
@@ -128,7 +128,7 @@ KMDIGUIClient::KMDIGUIClient( KMdiMainFrm* mdiMainFrm, bool showMDIModeAction, c
if ( domDocument().documentElement().isNull() )
{
- TQString completeDescription = TQString::tqfromLatin1( guiDescription )
+ TQString completeDescription = TQString::fromLatin1( guiDescription )
.arg( actionListName );
setXML( completeDescription, false /*merge*/ );
diff --git a/kmdi/kmdimainfrm.cpp b/kmdi/kmdimainfrm.cpp
index 4ac49df4e..09bd89eb7 100644
--- a/kmdi/kmdimainfrm.cpp
+++ b/kmdi/kmdimainfrm.cpp
@@ -701,7 +701,7 @@ void KMdiMainFrm::detachWindow( KMdiChildView *pWnd, bool bShow )
#ifdef Q_WS_X11
if ( mdiMode() == KMdi::ToplevelMode )
{
- XSetTransientForHint( qt_xdisplay(), pWnd->winId(), tqtopLevelWidget() ->winId() );
+ XSetTransientForHint( qt_xdisplay(), pWnd->winId(), topLevelWidget() ->winId() );
}
#endif
@@ -711,7 +711,7 @@ void KMdiMainFrm::detachWindow( KMdiChildView *pWnd, bool bShow )
#ifdef Q_WS_X11
if ( mdiMode() == KMdi::ToplevelMode )
{
- XSetTransientForHint( qt_xdisplay(), pWnd->winId(), tqtopLevelWidget() ->winId() );
+ XSetTransientForHint( qt_xdisplay(), pWnd->winId(), topLevelWidget() ->winId() );
}
#endif
@@ -1659,8 +1659,8 @@ void KMdiMainFrm::finishTabPageMode()
if ( pView->isToolView() )
continue;
kdDebug(760) << "KMdiMainFrm::finishTabPageMode: in loop" << endl;
- TQSize mins = pView->tqminimumSize();
- TQSize maxs = pView->tqmaximumSize();
+ TQSize mins = pView->minimumSize();
+ TQSize maxs = pView->maximumSize();
TQSize sz = pView->size();
TQWidget* pParent = pView->parentWidget();
TQPoint p( pParent->mapToGlobal( pParent->pos() ) - pParent->pos() + m_undockPositioningOffset );
@@ -2075,8 +2075,8 @@ void KMdiMainFrm::finishIDEAlMode( bool full )
KMdiChildView* pView = it.current();
if ( pView->isToolView() )
continue;
- TQSize mins = pView->tqminimumSize();
- TQSize maxs = pView->tqmaximumSize();
+ TQSize mins = pView->minimumSize();
+ TQSize maxs = pView->maximumSize();
TQSize sz = pView->size();
TQWidget* pParent = pView->parentWidget();
TQPoint p( pParent->mapToGlobal( pParent->pos() ) - pParent->pos() + m_undockPositioningOffset );
diff --git a/kmdi/kmditaskbar.cpp b/kmdi/kmditaskbar.cpp
index 70141a110..09b212734 100644
--- a/kmdi/kmditaskbar.cpp
+++ b/kmdi/kmditaskbar.cpp
@@ -341,8 +341,8 @@ void KMdiTaskBar::layoutTaskBar( int taskBarWidth )
// if there's enough space, use actual width
int buttonCount = m_pButtonList->count();
int tbHandlePixel;
- tbHandlePixel = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent, this );
- int buttonAreaWidth = taskBarWidth - tbHandlePixel - tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, this ) - 5;
+ tbHandlePixel = tqstyle().pixelMetric( TQStyle::PM_DockWindowHandleExtent, this );
+ int buttonAreaWidth = taskBarWidth - tbHandlePixel - tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth, this ) - 5;
if ( ( ( allButtonsWidthHint ) <= buttonAreaWidth ) || ( width() < parentWidget() ->width() ) )
{
for ( b = m_pButtonList->first();b;b = m_pButtonList->next() )
diff --git a/kparts/browserextension.cpp b/kparts/browserextension.cpp
index e3ae1a516..55594af39 100644
--- a/kparts/browserextension.cpp
+++ b/kparts/browserextension.cpp
@@ -370,7 +370,7 @@ BrowserExtension::BrowserExtension( KParts::ReadOnlyPart *parent,
// they're supported or not
ActionSlotMap::ConstIterator it = s_actionSlotMap->begin();
ActionSlotMap::ConstIterator itEnd = s_actionSlotMap->end();
- TQStrList slotNames = tqmetaObject()->slotNames();
+ TQStrList slotNames = metaObject()->slotNames();
for ( int i=0 ; it != itEnd ; ++it, ++i )
{
// Does the extension have a slot with the name of this action ?
diff --git a/kparts/browserextension.h b/kparts/browserextension.h
index 364e300c4..17bf9d65e 100644
--- a/kparts/browserextension.h
+++ b/kparts/browserextension.h
@@ -446,7 +446,7 @@ public:
* Checking if the extension implements a certain slot can be done like this:
*
* \code
- * extension->tqmetaObject()->slotNames().contains( actionName + "()" )
+ * extension->metaObject()->slotNames().contains( actionName + "()" )
* \endcode
*
* (note that @p actionName is the iterator's key value if already
diff --git a/kparts/browserinterface.cpp b/kparts/browserinterface.cpp
index 6882132fe..ae66dd6c0 100644
--- a/kparts/browserinterface.cpp
+++ b/kparts/browserinterface.cpp
@@ -19,7 +19,7 @@ BrowserInterface::~BrowserInterface()
void BrowserInterface::callMethod( const char *name, const TQVariant &argument )
{
- int slot = tqmetaObject()->findSlot( name );
+ int slot = metaObject()->findSlot( name );
if ( slot == -1 )
return;
diff --git a/kparts/browserrun.cpp b/kparts/browserrun.cpp
index c617a5f99..0500e0631 100644
--- a/kparts/browserrun.cpp
+++ b/kparts/browserrun.cpp
@@ -209,7 +209,7 @@ BrowserRun::NonEmbeddableResult BrowserRun::handleNonEmbeddable( const TQString&
!m_strURL.isLocalFile() )
{
if ( isTextExecutable(mimeType) )
- mimeType = TQString::tqfromLatin1("text/plain"); // view, don't execute
+ mimeType = TQString::fromLatin1("text/plain"); // view, don't execute
kdDebug(1000) << "BrowserRun: ask for saving" << endl;
KService::Ptr offer = KServiceTypeProfile::preferredService(mimeType, "Application");
// ... -> ask whether to save
@@ -313,7 +313,7 @@ BrowserRun::AskSaveResult BrowserRun::askSave( const KURL & url, KService::Ptr o
int choice = KMessageBox::questionYesNoCancel(
0L, question, url.host(),
KStdGuiItem::saveAs(), openText,
- TQString::tqfromLatin1("askSave")+ mimeType ); // dontAskAgainName, KEEP IN SYNC!!!
+ TQString::fromLatin1("askSave")+ mimeType ); // dontAskAgainName, KEEP IN SYNC!!!
return choice == KMessageBox::Yes ? Save : ( choice == KMessageBox::No ? Open : Cancel );
// SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC
@@ -351,7 +351,7 @@ BrowserRun::AskSaveResult BrowserRun::askEmbedOrSave( const KURL & url, const TQ
int choice = KMessageBox::questionYesNoCancel(
0L, question, url.host(),
KStdGuiItem::saveAs(), KGuiItem( i18n( "&Open" ), "fileopen"),
- TQString::tqfromLatin1("askEmbedOrSave")+ mimeType ); // dontAskAgainName, KEEP IN SYNC!!!
+ TQString::fromLatin1("askEmbedOrSave")+ mimeType ); // dontAskAgainName, KEEP IN SYNC!!!
return choice == KMessageBox::Yes ? Save : ( choice == KMessageBox::No ? Open : Cancel );
// SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC
}
diff --git a/kparts/browserrun.h b/kparts/browserrun.h
index 0a0ec1be4..79a7386c6 100644
--- a/kparts/browserrun.h
+++ b/kparts/browserrun.h
@@ -98,7 +98,7 @@ namespace KParts {
*/
TQString contentDisposition() const;
- bool serverSuggestsSave() const { return contentDisposition() == TQString::tqfromLatin1("attachment"); }
+ bool serverSuggestsSave() const { return contentDisposition() == TQString::fromLatin1("attachment"); }
enum AskSaveResult { Save, Open, Cancel };
/**
diff --git a/kparts/componentfactory.h b/kparts/componentfactory.h
index ac37cabfe..67f98a90f 100644
--- a/kparts/componentfactory.h
+++ b/kparts/componentfactory.h
@@ -63,7 +63,7 @@ namespace KParts
const TQStringList &args = TQStringList() )
{
TQObject *object = factory->create( parent, name,
- T::tqstaticMetaObject()->className(),
+ T::staticMetaObject()->className(),
args );
T *result = tqt_dynamic_cast<T *>( object );
@@ -101,7 +101,7 @@ namespace KParts
{
KParts::Part *object = factory->createPart( parentWidget, widgetName,
parent, name,
- T::tqstaticMetaObject()->className(),
+ T::staticMetaObject()->className(),
args );
T *result = tqt_dynamic_cast<T *>( object );
@@ -376,7 +376,7 @@ namespace KParts
const TQStringList &args = TQStringList(),
int *error = 0 )
{
- KTrader::OfferList offers = KTrader::self()->query( serviceType, TQString::tqfromLatin1("KParts/ReadOnlyPart"), constraint, TQString::null );
+ KTrader::OfferList offers = KTrader::self()->query( serviceType, TQString::fromLatin1("KParts/ReadOnlyPart"), constraint, TQString::null );
if ( offers.isEmpty() )
{
if ( error )
diff --git a/kparts/dockmainwindow.cpp b/kparts/dockmainwindow.cpp
index 461bc0ec3..9f7703ab6 100644
--- a/kparts/dockmainwindow.cpp
+++ b/kparts/dockmainwindow.cpp
@@ -76,7 +76,7 @@ void DockMainWindow::createGUI( Part * part )
KXMLGUIFactory *factory = guiFactory();
- tqsetUpdatesEnabled( false );
+ setUpdatesEnabled( false );
TQPtrList<Plugin> plugins;
@@ -117,7 +117,7 @@ void DockMainWindow::createGUI( Part * part )
}
- tqsetUpdatesEnabled( true );
+ setUpdatesEnabled( true );
d->m_activePart = part;
}
diff --git a/kparts/mainwindow.cpp b/kparts/mainwindow.cpp
index facc5a0ec..c0c4cd086 100644
--- a/kparts/mainwindow.cpp
+++ b/kparts/mainwindow.cpp
@@ -93,7 +93,7 @@ void MainWindow::createGUI( Part * part )
assert( factory );
- tqsetUpdatesEnabled( false );
+ setUpdatesEnabled( false );
TQPtrList<Plugin> plugins;
@@ -137,7 +137,7 @@ void MainWindow::createGUI( Part * part )
applyMainWindowSettings( KGlobal::config(), autoSaveGroup() );
}
- tqsetUpdatesEnabled( true );
+ setUpdatesEnabled( true );
d->m_activePart = part;
}
diff --git a/kparts/part.cpp b/kparts/part.cpp
index aacdf4c74..61e9ac42a 100644
--- a/kparts/part.cpp
+++ b/kparts/part.cpp
@@ -114,7 +114,7 @@ void PartBase::setInstance( KInstance *inst, bool bLoadPlugins )
// install 'instancename'data resource type
KGlobal::dirs()->addResourceType( inst->instanceName() + "data",
KStandardDirs::kde_default( "data" )
- + TQString::tqfromLatin1( inst->instanceName() ) + '/' );
+ + TQString::fromLatin1( inst->instanceName() ) + '/' );
if ( bLoadPlugins )
loadPlugins( m_obj, this, instance() );
}
@@ -365,7 +365,7 @@ bool ReadOnlyPart::openURL( const KURL &url )
KURL destURL;
destURL.setPath( m_file );
d->m_job = KIO::file_copy( m_url, destURL, 0600, true, false, d->m_showProgressInfo );
- d->m_job->setWindow( widget() ? widget()->tqtopLevelWidget() : 0 );
+ d->m_job->setWindow( widget() ? widget()->topLevelWidget() : 0 );
emit started( d->m_job );
connect( d->m_job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotJobFinished ( KIO::Job * ) ) );
return true;
@@ -638,7 +638,7 @@ bool ReadWritePart::saveToURL()
return false;
}
d->m_uploadJob = KIO::file_move( uploadUrl, m_url, -1, true /*overwrite*/ );
- d->m_uploadJob->setWindow( widget() ? widget()->tqtopLevelWidget() : 0 );
+ d->m_uploadJob->setWindow( widget() ? widget()->topLevelWidget() : 0 );
connect( d->m_uploadJob, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotUploadFinished (KIO::Job *) ) );
return true;
}
diff --git a/kparts/partmanager.cpp b/kparts/partmanager.cpp
index ca8a3a76d..97a8b9961 100644
--- a/kparts/partmanager.cpp
+++ b/kparts/partmanager.cpp
@@ -206,7 +206,7 @@ bool PartManager::eventFilter( TQObject *obj, TQEvent *ev )
{
TQPoint pos;
- if ( !d->m_managedTopLevelWidgets.containsRef( w->tqtopLevelWidget() ) )
+ if ( !d->m_managedTopLevelWidgets.containsRef( w->topLevelWidget() ) )
return false;
if ( d->m_bIgnoreScrollBars && w->inherits( TQSCROLLBAR_OBJECT_NAME_STRING ) )
diff --git a/kparts/plugin.cpp b/kparts/plugin.cpp
index a42839c23..c9b0d2e36 100644
--- a/kparts/plugin.cpp
+++ b/kparts/plugin.cpp
@@ -68,7 +68,7 @@ TQString Plugin::xmlFile() const
if ( !d->m_parentInstance || ( path.length() > 0 && path[ 0 ] == '/' ) )
return path;
- TQString absPath = locate( "data", TQString::tqfromLatin1( d->m_parentInstance->instanceName() ) + '/' + path );
+ TQString absPath = locate( "data", TQString::fromLatin1( d->m_parentInstance->instanceName() ) + '/' + path );
assert( !absPath.isEmpty() );
return absPath;
}
@@ -80,7 +80,7 @@ TQString Plugin::localXMLFile() const
if ( !d->m_parentInstance || ( path.length() > 0 && path[ 0 ] == '/' ) )
return path;
- TQString absPath = locateLocal( "data", TQString::tqfromLatin1( d->m_parentInstance->instanceName() ) + '/' + path );
+ TQString absPath = locateLocal( "data", TQString::fromLatin1( d->m_parentInstance->instanceName() ) + '/' + path );
assert( !absPath.isEmpty() );
return absPath;
}
@@ -104,7 +104,7 @@ TQValueList<Plugin::PluginInfo> Plugin::pluginInfos( const KInstance * instance
for (; pIt != pEnd; ++pIt )
{
TQFileInfo fInfo( *pIt );
- if ( fInfo.extension() == TQString::tqfromLatin1( "desktop" ) )
+ if ( fInfo.extension() == TQString::fromLatin1( "desktop" ) )
continue;
TQMap<TQString,TQStringList>::Iterator mapIt = sortedPlugins.find( fInfo.fileName() );
diff --git a/kparts/statusbarextension.cpp b/kparts/statusbarextension.cpp
index 3e64bcece..a90a50689 100644
--- a/kparts/statusbarextension.cpp
+++ b/kparts/statusbarextension.cpp
@@ -135,7 +135,7 @@ KStatusBar * StatusBarExtension::statusBar() const
{
if ( !m_statusBar ) {
TQWidget* w = static_cast<KParts::ReadOnlyPart*>(parent())->widget();
- KMainWindow* mw = tqt_dynamic_cast<KMainWindow *>( w->tqtopLevelWidget() );
+ KMainWindow* mw = tqt_dynamic_cast<KMainWindow *>( w->topLevelWidget() );
if ( mw )
m_statusBar = mw->statusBar();
}
diff --git a/krandr/libkrandr.cc b/krandr/libkrandr.cc
index 86f8e6bd0..2920c70cd 100644
--- a/krandr/libkrandr.cc
+++ b/krandr/libkrandr.cc
@@ -82,7 +82,7 @@ TQString KRandrSimpleAPI::getIccFileName(TQString profileName, TQString screenNa
TQString retval;
if (profileName != NULL) {
- t_config = new KSimpleConfig( TQString::tqfromLatin1( "kiccconfigrc" ));
+ t_config = new KSimpleConfig( TQString::fromLatin1( "kiccconfigrc" ));
}
else {
t_systemconfig = new KSimpleConfig( kde_confdir + TQString("/kicc/kiccconfigrc") );
@@ -268,7 +268,7 @@ TQString KRandrSimpleAPI::applyIccConfiguration(TQString profileName, TQString k
int screenNumber = 0;
TQString errorstr = "";
- t_config = new KSimpleConfig( TQString::tqfromLatin1( "kiccconfigrc" ));
+ t_config = new KSimpleConfig( TQString::fromLatin1( "kiccconfigrc" ));
// Find all screens
if (isValid() == true) {
@@ -372,7 +372,7 @@ TQString KRandrSimpleAPI::getCurrentProfile () {
TQString profileName;
KSimpleConfig *t_config;
- t_config = new KSimpleConfig( TQString::tqfromLatin1( "kiccconfigrc" ));
+ t_config = new KSimpleConfig( TQString::fromLatin1( "kiccconfigrc" ));
profileName = t_config->readEntry("CurrentProfile");
delete t_config;
return profileName;
diff --git a/kresources/manager.h b/kresources/manager.h
index c11ecaab5..ab1562716 100644
--- a/kresources/manager.h
+++ b/kresources/manager.h
@@ -335,7 +335,7 @@ class Manager : private ManagerNotifier
++it ) {
TQString desc = mFactory->typeName( *it );
if ( !mFactory->typeDescription( *it ).isEmpty() )
- desc += TQString::tqfromLatin1(" (") + mFactory->typeDescription( *it ) + TQString::tqfromLatin1(")");
+ desc += TQString::fromLatin1(" (") + mFactory->typeDescription( *it ) + TQString::fromLatin1(")");
typeDescs.append( desc );
}
diff --git a/kspell2/broker.cpp b/kspell2/broker.cpp
index 0149dace1..7f572bb01 100644
--- a/kspell2/broker.cpp
+++ b/kspell2/broker.cpp
@@ -189,8 +189,8 @@ void Broker::loadPlugin( const TQString& pluginId )
kdDebug()<<"Loading plugin " << pluginId << endl;
Client *client = KParts::ComponentFactory::createInstanceFromQuery<Client>(
- TQString::tqfromLatin1( "KSpell/Client" ),
- TQString::tqfromLatin1( "[X-KDE-PluginInfo-Name]=='%1'" ).arg( pluginId ),
+ TQString::fromLatin1( "KSpell/Client" ),
+ TQString::fromLatin1( "[X-KDE-PluginInfo-Name]=='%1'" ).arg( pluginId ),
this, 0, TQStringList(), &error );
if ( client )
diff --git a/kspell2/ui/kspell2ui.ui b/kspell2/ui/kspell2ui.ui
index c196c3807..0bca38515 100644
--- a/kspell2/ui/kspell2ui.ui
+++ b/kspell2/ui/kspell2ui.ui
@@ -20,7 +20,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>430</width>
<height>300</height>
diff --git a/kstyles/asteroid/asteroid.cpp b/kstyles/asteroid/asteroid.cpp
index 59b37df83..8908d71fe 100644
--- a/kstyles/asteroid/asteroid.cpp
+++ b/kstyles/asteroid/asteroid.cpp
@@ -152,7 +152,7 @@ AsteroidStyle::polish( TQApplication* app)
TQPalette wp = TQApplication::tqpalette();
wp.setColor(TQColorGroup::Dark, TQColor(128, 128, 128));
wp.setColor(TQColorGroup::Mid, wp.active().color(TQColorGroup::Button).dark(150)); // Which GUI element(s) does this correspond to?
- TQApplication::tqsetPalette( wp, TRUE );
+ TQApplication::setPalette( wp, TRUE );
}
/*! \reimp
@@ -289,7 +289,7 @@ void AsteroidStyle::drawKStylePrimitive(KStylePrimitive ksp,
}
}
-int AsteroidStyle::tqstyleHint( TQ_StyleHint stylehint,
+int AsteroidStyle::styleHint( TQ_StyleHint stylehint,
const TQWidget *widget,
const TQStyleOption &option,
TQStyleHintReturn* returnData ) const
@@ -309,7 +309,7 @@ int AsteroidStyle::tqstyleHint( TQ_StyleHint stylehint,
return 1;
default:
- return KStyle::tqstyleHint(stylehint, widget, option, returnData);
+ return KStyle::styleHint(stylehint, widget, option, returnData);
}
}
@@ -613,13 +613,13 @@ void AsteroidStyle::tqdrawPrimitive(TQ_PrimitiveElement pe,
p->drawPolygon(TQPointArray(24, outside));
}
p->setPen(cg.mid());
- p->tqdrawPolyline(TQPointArray(24, outside), 0, 12);
+ p->drawPolyline(TQPointArray(24, outside), 0, 12);
p->setPen(cg.light());
- p->tqdrawPolyline(TQPointArray(24, outside), 12, 12);
+ p->drawPolyline(TQPointArray(24, outside), 12, 12);
p->setPen(cg.dark());
- p->tqdrawPolyline(TQPointArray(20, inside), 0, 10);
+ p->drawPolyline(TQPointArray(20, inside), 0, 10);
p->setPen(cg.background());
- p->tqdrawPolyline(TQPointArray(20, inside), 10, 10);
+ p->drawPolyline(TQPointArray(20, inside), 10, 10);
break;
}
@@ -907,8 +907,8 @@ void AsteroidStyle::tqdrawPrimitive(TQ_PrimitiveElement pe,
}
if (sf & Style_Down) {
- p->translate(tqpixelMetric(PM_ButtonShiftHorizontal),
- tqpixelMetric(PM_ButtonShiftVertical));
+ p->translate(pixelMetric(PM_ButtonShiftHorizontal),
+ pixelMetric(PM_ButtonShiftVertical));
}
a.translate((x + w/2), (y + (h-1)/2));
@@ -916,8 +916,8 @@ void AsteroidStyle::tqdrawPrimitive(TQ_PrimitiveElement pe,
p->drawPoint(a[6]);
if (sf & Style_Down) {
- p->translate(-tqpixelMetric(PM_ButtonShiftHorizontal),
- -tqpixelMetric(PM_ButtonShiftVertical));
+ p->translate(-pixelMetric(PM_ButtonShiftHorizontal),
+ -pixelMetric(PM_ButtonShiftVertical));
}
break;
@@ -929,7 +929,7 @@ void AsteroidStyle::tqdrawPrimitive(TQ_PrimitiveElement pe,
}
}
-void AsteroidStyle::tqdrawControl(TQ_ControlElement ce,
+void AsteroidStyle::drawControl(TQ_ControlElement ce,
TQPainter *p,
const TQWidget *w,
const TQRect &r,
@@ -1016,7 +1016,7 @@ void AsteroidStyle::tqdrawControl(TQ_ControlElement ce,
p->drawLine( x2, r2.top() + 2, x2, r2.bottom() -
(selected ? (lastTab ? 0:1) :2));
} else if ( tb->tqshape() == TQTabBar::RoundedBelow ) {
- bool rightAligned = tqstyleHint( SH_TabBar_Alignment, tb ) == TQt::AlignRight;
+ bool rightAligned = styleHint( SH_TabBar_Alignment, tb ) == TQt::AlignRight;
bool firstTab = tb->indexOf( t->identifier() ) == 0;
if ( selected ) {
p->fillRect( TQRect( r2.left()+1, r2.top(), r2.width()-3, 1),
@@ -1060,7 +1060,7 @@ void AsteroidStyle::tqdrawControl(TQ_ControlElement ce,
p->drawLine( r2.left(), r2.top() + (selected ? 0 : 2),
r2.left(), r2.bottom() - 2 );
} else {
- TQCommonStyle::tqdrawControl(ce, p, w, r, cg, sf, o);
+ TQCommonStyle::drawControl(ce, p, w, r, cg, sf, o);
}
break;
}
@@ -1074,15 +1074,15 @@ void AsteroidStyle::tqdrawControl(TQ_ControlElement ce,
TQTab * t = o.tab();
const bool enabled = sf & Style_Enabled;
- bool etchtext = tqstyleHint( SH_EtchDisabledText );
+ bool etchtext = styleHint( SH_EtchDisabledText );
TQRect tr = r;
if ( t->identifier() == tb->currentTab() )
tr.setBottom( tr.bottom() -
- tqpixelMetric( TQStyle::PM_DefaultFrameWidth, tb ) );
+ pixelMetric( TQStyle::PM_DefaultFrameWidth, tb ) );
int tqalignment = TQt::AlignCenter | TQt::ShowPrefix;
- if (!tqstyleHint(SH_UnderlineAccelerator, w, TQStyleOption::Default, 0))
+ if (!styleHint(SH_UnderlineAccelerator, w, TQStyleOption::Default, 0))
tqalignment |= TQt::NoAccel;
tr.setWidth(tr.width()+4); // Compensate for text appearing too far to the left
// TQRect tr_offset = TQRect(tr.x()+ETCH_X_OFFSET, tr.y()+ETCH_Y_OFFSET, tr.width(), tr.height());
@@ -1126,10 +1126,10 @@ void AsteroidStyle::tqdrawControl(TQ_ControlElement ce,
const TQCheckBox *checkbox = (const TQCheckBox *) w;
const bool enabled = sf & Style_Enabled;
- bool etchtext = tqstyleHint( SH_EtchDisabledText );
+ bool etchtext = styleHint( SH_EtchDisabledText );
int tqalignment = TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft;
- if (!tqstyleHint(SH_UnderlineAccelerator, w, TQStyleOption::Default, 0))
+ if (!styleHint(SH_UnderlineAccelerator, w, TQStyleOption::Default, 0))
tqalignment |= TQt::NoAccel;
//TQRect r_offset = TQRect(r.x()+ETCH_X_OFFSET, r.y()+ETCH_Y_OFFSET, r.width(), r.height());
@@ -1162,7 +1162,7 @@ void AsteroidStyle::tqdrawControl(TQ_ControlElement ce,
}
if (sf & Style_HasFocus) {
- TQRect fr = tqvisualRect(subRect(SR_CheckBoxFocusRect, w), w);
+ TQRect fr = visualRect(subRect(SR_CheckBoxFocusRect, w), w);
tqdrawPrimitive(TQStyle::PE_FocusRect, p, fr, cg, sf);
}
#endif
@@ -1175,10 +1175,10 @@ void AsteroidStyle::tqdrawControl(TQ_ControlElement ce,
const TQRadioButton *radiobutton = (const TQRadioButton *) w;
const bool enabled = sf & Style_Enabled;
- bool etchtext = tqstyleHint( SH_EtchDisabledText );
+ bool etchtext = styleHint( SH_EtchDisabledText );
int tqalignment = TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft;
- if (!tqstyleHint(SH_UnderlineAccelerator, w, TQStyleOption::Default, 0))
+ if (!styleHint(SH_UnderlineAccelerator, w, TQStyleOption::Default, 0))
tqalignment |= TQt::NoAccel;
// TQRect r_offset = TQRect(r.x()+ETCH_X_OFFSET, r.y()+ETCH_Y_OFFSET, r.width(), r.height());
@@ -1209,7 +1209,7 @@ void AsteroidStyle::tqdrawControl(TQ_ControlElement ce,
drawItem(p, r, tqalignment | TQt::AlignVCenter | TQt::ShowPrefix, cg, enabled, radiobutton->pixmap(), radiobutton->text());
if (sf & Style_HasFocus) {
- TQRect fr = tqvisualRect(subRect(SR_RadioButtonFocusRect, w), w);
+ TQRect fr = visualRect(subRect(SR_RadioButtonFocusRect, w), w);
tqdrawPrimitive(TQStyle::PE_FocusRect, p, fr, cg, sf);
}
#endif
@@ -1343,7 +1343,7 @@ void AsteroidStyle::tqdrawControl(TQ_ControlElement ce,
bool focused = sf & Style_HasFocus;
bool down = sf & Style_Down;
bool enabled = sf & Style_Enabled;
- bool etchtext = tqstyleHint( SH_EtchDisabledText );
+ bool etchtext = styleHint( SH_EtchDisabledText );
const int text_flags = AlignVCenter | AlignHCenter | ShowPrefix | DontClip | SingleLine;
if (active && focused) {
@@ -1390,13 +1390,13 @@ void AsteroidStyle::tqdrawControl(TQ_ControlElement ce,
case CE_PushButtonLabel: {
const TQPushButton *pb = dynamic_cast<const TQPushButton *>(w);
const bool enabled = sf & Style_Enabled;
- bool etchtext = tqstyleHint( SH_EtchDisabledText );
+ bool etchtext = styleHint( SH_EtchDisabledText );
const int text_flags = AlignVCenter | AlignHCenter | ShowPrefix | DontClip | SingleLine;
int dx = 0;
if (sf & Style_Down) {
- p->translate(tqpixelMetric(PM_ButtonShiftHorizontal),
- tqpixelMetric(PM_ButtonShiftVertical));
+ p->translate(pixelMetric(PM_ButtonShiftHorizontal),
+ pixelMetric(PM_ButtonShiftVertical));
}
if (pb->iconSet() && !pb->iconSet()->isNull()) {
@@ -1458,7 +1458,7 @@ void AsteroidStyle::tqdrawControl(TQ_ControlElement ce,
const TQHeader *hw = dynamic_cast<const TQHeader *>(w);
int hs = o.headerSection();
const bool enabled = sf & Style_Enabled;
- bool etchtext = tqstyleHint( SH_EtchDisabledText );
+ bool etchtext = styleHint( SH_EtchDisabledText );
const int text_flags = AlignVCenter | ShowPrefix | DontClip | SingleLine;
TQIconSet *is = hw->iconSet(hs);
@@ -1513,7 +1513,7 @@ void AsteroidStyle::tqdrawControl(TQ_ControlElement ce,
bool disabled = !mi->isEnabled();
bool checkable = pum->isCheckable();
bool enabled = mi->isEnabled();
- bool etchtext = tqstyleHint( SH_EtchDisabledText );
+ bool etchtext = styleHint( SH_EtchDisabledText );
int xpos = x;
int xm = itemFrame + checkcol + itemHMargin;
@@ -1553,7 +1553,7 @@ void AsteroidStyle::tqdrawControl(TQ_ControlElement ce,
pmr.moveCenter(cr.center());
if (backwards)
- pmr = tqvisualRect(pmr, r);
+ pmr = visualRect(pmr, r);
p->setPen(cg.highlightedText());
p->drawPixmap(pmr.topLeft(), pixmap);
@@ -1572,7 +1572,7 @@ void AsteroidStyle::tqdrawControl(TQ_ControlElement ce,
TQRect rr = TQRect(xp, y, checkcol, sh);
if (backwards) {
- rr = tqvisualRect(rr, r);
+ rr = visualRect(rr, r);
}
tqdrawPrimitive(PE_CheckMark, p, rr, cg, cflags);
@@ -1624,8 +1624,8 @@ void AsteroidStyle::tqdrawControl(TQ_ControlElement ce,
TQRect rr = TQRect(xp, y+m, tab, sh-(2*m));
TQRect rr_offset = TQRect(xp+ETCH_X_OFFSET, y+m+ETCH_Y_OFFSET, tab, sh-(2*m));
if (backwards) {
- rr = tqvisualRect(rr, r);
- rr_offset = tqvisualRect(rr_offset, r);
+ rr = visualRect(rr, r);
+ rr_offset = visualRect(rr_offset, r);
}
if POPUPMENUITEM_TEXT_ETCH_CONDITIONS {
@@ -1642,8 +1642,8 @@ void AsteroidStyle::tqdrawControl(TQ_ControlElement ce,
TQRect rr = TQRect(xpos, y+m, sw-xm-tab+1, sh-(2*m));
TQRect rr_offset = TQRect(xpos+ETCH_X_OFFSET, y+m+ETCH_Y_OFFSET, sw-xm-tab+1, sh-(2*m));
if (backwards) {
- rr = tqvisualRect(rr, r);
- rr_offset = tqvisualRect(rr_offset, r);
+ rr = visualRect(rr, r);
+ rr_offset = visualRect(rr_offset, r);
text_flags |= AlignRight;
}
@@ -1668,7 +1668,7 @@ void AsteroidStyle::tqdrawControl(TQ_ControlElement ce,
}
if (mi->popup()) {
- int dim = tqpixelMetric(PM_MenuButtonIndicator);
+ int dim = pixelMetric(PM_MenuButtonIndicator);
xpos = x + sw - arrowHMargin - 2 * itemFrame - dim;
@@ -1680,7 +1680,7 @@ void AsteroidStyle::tqdrawControl(TQ_ControlElement ce,
TQRect rr = TQRect(xpos, y + sh/2 - dim/2, dim, dim);
if (backwards)
- rr = tqvisualRect(rr, r);
+ rr = visualRect(rr, r);
tqdrawPrimitive((backwards ? PE_ArrowLeft : PE_ArrowRight), p, rr, cg, Style_Enabled);
}
@@ -1688,12 +1688,12 @@ void AsteroidStyle::tqdrawControl(TQ_ControlElement ce,
}
default: {
- KStyle::tqdrawControl(ce, p, w, r, cg, sf, o);
+ KStyle::drawControl(ce, p, w, r, cg, sf, o);
}
}
}
-void AsteroidStyle::tqdrawControlMask(TQ_ControlElement ce,
+void AsteroidStyle::drawControlMask(TQ_ControlElement ce,
TQPainter *p,
const TQWidget *w,
const TQRect &r,
@@ -1733,12 +1733,12 @@ void AsteroidStyle::tqdrawControlMask(TQ_ControlElement ce,
CE_HeaderLabel
*/
default: {
- KStyle::tqdrawControlMask(ce, p, w, r, o);
+ KStyle::drawControlMask(ce, p, w, r, o);
}
}
}
-void AsteroidStyle::tqdrawComplexControl(TQ_ComplexControl cc,
+void AsteroidStyle::drawComplexControl(TQ_ComplexControl cc,
TQPainter *p,
const TQWidget *w,
const TQRect &r,
@@ -1762,7 +1762,7 @@ void AsteroidStyle::tqdrawComplexControl(TQ_ComplexControl cc,
case CC_ListView:
{
if ( sc & SC_ListView ) {
- TQCommonStyle::tqdrawComplexControl( cc, p, w, r, cg, sf, sc, sa, o );
+ TQCommonStyle::drawComplexControl( cc, p, w, r, cg, sf, sc, sa, o );
}
if ( sc & ( SC_ListViewBranch | SC_ListViewExpand ) ) {
if (o.isDefault())
@@ -1960,7 +1960,7 @@ void AsteroidStyle::tqdrawComplexControl(TQ_ComplexControl cc,
TQRect hr(sw - handle_offset-1, y+2, handle_width, sh-4);
int hrx, hry, hrx2, hry2;
hr.coords(&hrx, &hry, &hrx2, &hry2);
- if (backwards) { hr = tqvisualRect(hr, r); }
+ if (backwards) { hr = visualRect(hr, r); }
p->drawRect(hr);
@@ -1991,7 +1991,7 @@ void AsteroidStyle::tqdrawComplexControl(TQ_ComplexControl cc,
pmr.moveBy(1, 1);
}
- if (backwards) { pmr = tqvisualRect(pmr, r); }
+ if (backwards) { pmr = visualRect(pmr, r); }
p->setPen(cg.foreground());
p->drawPixmap(pmr.topLeft(), downArrow);
@@ -2008,8 +2008,8 @@ void AsteroidStyle::tqdrawComplexControl(TQ_ComplexControl cc,
if ( toolbutton->backgroundMode() != TQt::PaletteButton )
c.setBrush( TQColorGroup::Button, toolbutton->paletteBackgroundColor() );
TQRect button, menuarea;
- button = tqvisualRect( querySubControlMetrics(cc, w, SC_ToolButton, o), w );
- menuarea = tqvisualRect( querySubControlMetrics(cc, w, SC_ToolButtonMenu, o), w );
+ button = visualRect( querySubControlMetrics(cc, w, SC_ToolButton, o), w );
+ menuarea = visualRect( querySubControlMetrics(cc, w, SC_ToolButtonMenu, o), w );
SFlags bflags = sf;
SFlags mflags = sf;
@@ -2077,7 +2077,7 @@ void AsteroidStyle::tqdrawComplexControl(TQ_ComplexControl cc,
/* Turn these off for now */
// Draw the tickmarks
/*if (controls & SC_SliderTickmarks)
- TQCommonStyle::tqdrawComplexControl(control, &p2,
+ TQCommonStyle::drawComplexControl(control, &p2,
r, cg, flags, SC_SliderTickmarks, sa, o);*/
// Draw the slider handle
@@ -2126,12 +2126,12 @@ void AsteroidStyle::tqdrawComplexControl(TQ_ComplexControl cc,
default: {
- KStyle::tqdrawComplexControl(cc, p, w, r, cg, sf, sc, sa, o);
+ KStyle::drawComplexControl(cc, p, w, r, cg, sf, sc, sa, o);
}
}
}
-void AsteroidStyle::tqdrawComplexControlMask(TQ_ComplexControl cc,
+void AsteroidStyle::drawComplexControlMask(TQ_ComplexControl cc,
TQPainter *p,
const TQWidget *w,
const TQRect &r,
@@ -2149,12 +2149,12 @@ void AsteroidStyle::tqdrawComplexControlMask(TQ_ComplexControl cc,
CC_ListView
*/
default: {
- KStyle::tqdrawComplexControlMask(cc, p, w, r, o);
+ KStyle::drawComplexControlMask(cc, p, w, r, o);
}
}
}
-int AsteroidStyle::tqpixelMetric(PixelMetric pm, const TQWidget *w) const
+int AsteroidStyle::pixelMetric(PixelMetric pm, const TQWidget *w) const
{
switch (pm) {
/* PixelMetrics available are:
@@ -2248,7 +2248,7 @@ int AsteroidStyle::tqpixelMetric(PixelMetric pm, const TQWidget *w) const
if (w && w->inherits(TQPOPUPMENU_OBJECT_NAME_STRING)) {
return 3;
} else {
- return KStyle::tqpixelMetric(pm, w);
+ return KStyle::pixelMetric(pm, w);
}
}
@@ -2274,7 +2274,7 @@ int AsteroidStyle::tqpixelMetric(PixelMetric pm, const TQWidget *w) const
return TQMAX( 4, TQApplication::globalStrut().width() );
default: {
- return KStyle::tqpixelMetric(pm, w);
+ return KStyle::pixelMetric(pm, w);
}
}
}
@@ -2454,7 +2454,7 @@ TQSize AsteroidStyle::tqsizeFromContents(ContentsType ct,
}
case CT_ComboBox: {
- int padding = (tqpixelMetric(PM_DefaultFrameWidth, w) * 2) + 1;
+ int padding = (pixelMetric(PM_DefaultFrameWidth, w) * 2) + 1;
return TQSize(s.width() + 21, s.height() + padding);
}
diff --git a/kstyles/asteroid/asteroid.h b/kstyles/asteroid/asteroid.h
index e8516c6e1..7b513896b 100644
--- a/kstyles/asteroid/asteroid.h
+++ b/kstyles/asteroid/asteroid.h
@@ -42,7 +42,7 @@ public:
SFlags = Style_Default,
const TQStyleOption & = TQStyleOption::Default) const;
- int tqstyleHint(TQ_StyleHint, const TQWidget * = 0,
+ int styleHint(TQ_StyleHint, const TQWidget * = 0,
const TQStyleOption & = TQStyleOption::Default,
TQStyleHintReturn * = 0 ) const;
@@ -53,7 +53,7 @@ public:
SFlags = Style_Default,
const TQStyleOption & = TQStyleOption::Default) const;
- void tqdrawControl(TQ_ControlElement,
+ void drawControl(TQ_ControlElement,
TQPainter *,
const TQWidget *,
const TQRect &,
@@ -61,13 +61,13 @@ public:
SFlags = Style_Default,
const TQStyleOption & = TQStyleOption::Default) const;
- void tqdrawControlMask(TQ_ControlElement,
+ void drawControlMask(TQ_ControlElement,
TQPainter *,
const TQWidget *,
const TQRect &,
const TQStyleOption &) const;
- void tqdrawComplexControl(TQ_ComplexControl,
+ void drawComplexControl(TQ_ComplexControl,
TQPainter *,
const TQWidget *,
const TQRect &,
@@ -77,13 +77,13 @@ public:
SCFlags active = SC_None,
const TQStyleOption & = TQStyleOption::Default) const;
- void tqdrawComplexControlMask(TQ_ComplexControl,
+ void drawComplexControlMask(TQ_ComplexControl,
TQPainter *,
const TQWidget *,
const TQRect &r,
const TQStyleOption & = TQStyleOption::Default) const;
- int tqpixelMetric(PixelMetric, const TQWidget * = 0) const;
+ int pixelMetric(PixelMetric, const TQWidget * = 0) const;
int kPixelMetric( KStylePixelMetric kpm, const TQWidget* /* widget */) const;
diff --git a/kstyles/highcolor/highcolor.cpp b/kstyles/highcolor/highcolor.cpp
index 318b0f207..a1eb876fc 100644
--- a/kstyles/highcolor/highcolor.cpp
+++ b/kstyles/highcolor/highcolor.cpp
@@ -764,7 +764,7 @@ void HighColorStyle::tqdrawPrimitive( TQ_PrimitiveElement pe,
case PE_WindowFrame:
case PE_PanelLineEdit: {
bool sunken = flags & Style_Sunken;
- int lw = opt.isDefault() ? tqpixelMetric(PM_DefaultFrameWidth)
+ int lw = opt.isDefault() ? pixelMetric(PM_DefaultFrameWidth)
: opt.lineWidth();
if (lw == 2)
{
@@ -799,7 +799,7 @@ void HighColorStyle::tqdrawPrimitive( TQ_PrimitiveElement pe,
case PE_PanelDockWindow: { // Toolbar
int x2 = r.x()+r.width()-1;
int y2 = r.y()+r.height()-1;
- int lw = opt.isDefault() ? tqpixelMetric(PM_DefaultFrameWidth)
+ int lw = opt.isDefault() ? pixelMetric(PM_DefaultFrameWidth)
: opt.lineWidth();
if (lw)
@@ -893,8 +893,8 @@ void HighColorStyle::tqdrawPrimitive( TQ_PrimitiveElement pe,
p->save();
if ( flags & Style_Down )
- p->translate( tqpixelMetric( PM_ButtonShiftHorizontal ),
- tqpixelMetric( PM_ButtonShiftVertical ) );
+ p->translate( pixelMetric( PM_ButtonShiftHorizontal ),
+ pixelMetric( PM_ButtonShiftVertical ) );
if ( flags & Style_Enabled ) {
a.translate( r.x() + r.width() / 2, r.y() + r.height() / 2 );
@@ -1096,7 +1096,7 @@ void HighColorStyle::drawKStylePrimitive( KStylePrimitive kpe,
}
-void HighColorStyle::tqdrawControl( TQ_ControlElement element,
+void HighColorStyle::drawControl( TQ_ControlElement element,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -1119,7 +1119,7 @@ void HighColorStyle::tqdrawControl( TQ_ControlElement element,
if ( btnDefault || button->autoDefault() ) {
// Compensate for default indicator
- static int di = tqpixelMetric( PM_ButtonDefaultIndicator );
+ static int di = pixelMetric( PM_ButtonDefaultIndicator );
br.addCoords( di, di, -di, -di );
}
@@ -1145,14 +1145,14 @@ void HighColorStyle::tqdrawControl( TQ_ControlElement element,
// Shift button contents if pushed.
if ( active ) {
- x += tqpixelMetric(PM_ButtonShiftHorizontal, widget);
- y += tqpixelMetric(PM_ButtonShiftVertical, widget);
+ x += pixelMetric(PM_ButtonShiftHorizontal, widget);
+ y += pixelMetric(PM_ButtonShiftVertical, widget);
flags |= Style_Sunken;
}
// Does the button have a popup menu?
if ( button->isMenuButton() ) {
- int dx = tqpixelMetric( PM_MenuButtonIndicator, widget );
+ int dx = pixelMetric( PM_MenuButtonIndicator, widget );
tqdrawPrimitive( PE_ArrowDown, p, TQRect(x + w - dx - 2, y + 2, dx, h - 4),
cg, flags, opt );
w -= dx;
@@ -1193,25 +1193,25 @@ void HighColorStyle::tqdrawControl( TQ_ControlElement element,
if (button->isEnabled()) // Don't draw double-shadow when disabled
for(i=0; i<2; i++)
drawItem( p, TQRect(x+i+1, y+1, w, h), AlignCenter | ShowPrefix,
- button->tqcolorGroup(), button->isEnabled(), NULL,
+ button->colorGroup(), button->isEnabled(), NULL,
button->text(), -1,
- active ? &button->tqcolorGroup().dark() : &button->tqcolorGroup().mid() );
+ active ? &button->colorGroup().dark() : &button->colorGroup().mid() );
// Normal Text
for(i=0; i<2; i++)
drawItem( p, TQRect(x+i, y, w, h), AlignCenter | ShowPrefix,
- button->tqcolorGroup(), button->isEnabled(), i == 0 ? button->pixmap() : NULL,
+ button->colorGroup(), button->isEnabled(), i == 0 ? button->pixmap() : NULL,
button->text(), -1,
- active ? &button->tqcolorGroup().light() : &button->tqcolorGroup().buttonText() );
+ active ? &button->colorGroup().light() : &button->colorGroup().buttonText() );
} else
- drawItem( p, TQRect(x, y, w, h), AlignCenter | ShowPrefix, button->tqcolorGroup(),
+ drawItem( p, TQRect(x, y, w, h), AlignCenter | ShowPrefix, button->colorGroup(),
button->isEnabled(), button->pixmap(), button->text(), -1,
- active ? &button->tqcolorGroup().light() : &button->tqcolorGroup().buttonText() );
+ active ? &button->colorGroup().light() : &button->colorGroup().buttonText() );
// Draw a focus rect if the button has focus
if ( flags & Style_HasFocus )
tqdrawPrimitive( PE_FocusRect, p,
- TQStyle::tqvisualRect(subRect(SR_PushButtonFocusRect, widget), widget),
+ TQStyle::visualRect(subRect(SR_PushButtonFocusRect, widget), widget),
cg, flags );
break;
}
@@ -1297,7 +1297,7 @@ void HighColorStyle::tqdrawControl( TQ_ControlElement element,
bool enabled = mi->isEnabled();
bool checkable = popupmenu->isCheckable();
bool active = flags & Style_Active;
- bool etchtext = tqstyleHint( SH_EtchDisabledText );
+ bool etchtext = styleHint( SH_EtchDisabledText );
bool reverse = TQApplication::reverseLayout();
int x, y, w, h;
r.rect( &x, &y, &w, &h );
@@ -1328,7 +1328,7 @@ void HighColorStyle::tqdrawControl( TQ_ControlElement element,
// Do we have an icon?
if ( mi->iconSet() ) {
TQIconSet::Mode mode;
- TQRect cr = tqvisualRect( TQRect(x, y, checkcol, h), r );
+ TQRect cr = visualRect( TQRect(x, y, checkcol, h), r );
// Select the correct icon from the iconset
if ( active )
@@ -1463,8 +1463,8 @@ void HighColorStyle::tqdrawControl( TQ_ControlElement element,
// Does the menu item have a submenu?
if ( mi->popup() ) {
TQ_PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight;
- int dim = tqpixelMetric(PM_MenuButtonIndicator);
- TQRect vr = tqvisualRect( TQRect( x + w - arrowHMargin - 2*itemFrame - dim,
+ int dim = pixelMetric(PM_MenuButtonIndicator);
+ TQRect vr = visualRect( TQRect( x + w - arrowHMargin - 2*itemFrame - dim,
y + h / 2 - dim / 2, dim, dim), r );
// Draw an arrow at the far end of the menu item
@@ -1484,12 +1484,12 @@ void HighColorStyle::tqdrawControl( TQ_ControlElement element,
}
default:
- KStyle::tqdrawControl(element, p, widget, r, cg, flags, opt);
+ KStyle::drawControl(element, p, widget, r, cg, flags, opt);
}
}
-void HighColorStyle::tqdrawControlMask( TQ_ControlElement element,
+void HighColorStyle::drawControlMask( TQ_ControlElement element,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -1510,12 +1510,12 @@ void HighColorStyle::tqdrawControlMask( TQ_ControlElement element,
}
default:
- KStyle::tqdrawControlMask(element, p, widget, r, opt);
+ KStyle::drawControlMask(element, p, widget, r, opt);
}
}
-void HighColorStyle::tqdrawComplexControl( TQ_ComplexControl control,
+void HighColorStyle::drawComplexControl( TQ_ComplexControl control,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -1566,7 +1566,7 @@ void HighColorStyle::tqdrawComplexControl( TQ_ComplexControl control,
p->drawLine(x+1, y+2, x+1, y2-2);
// Get the button bounding box
- TQRect ar = TQStyle::tqvisualRect(
+ TQRect ar = TQStyle::visualRect(
querySubControlMetrics(CC_ComboBox, widget, SC_ComboBoxArrow),
widget );
@@ -1585,7 +1585,7 @@ void HighColorStyle::tqdrawComplexControl( TQ_ComplexControl control,
if ( controls & SC_ComboBoxEditField )
{
const TQComboBox * cb = (const TQComboBox *) widget;
- TQRect re = TQStyle::tqvisualRect(
+ TQRect re = TQStyle::visualRect(
querySubControlMetrics( CC_ComboBox, widget,
SC_ComboBoxEditField), widget );
@@ -1609,7 +1609,7 @@ void HighColorStyle::tqdrawComplexControl( TQ_ComplexControl control,
p->fillRect( re.x(), re.y(), re.width(), re.height(),
cg.brush( TQColorGroup::Highlight ) );
- TQRect re = TQStyle::tqvisualRect(
+ TQRect re = TQStyle::visualRect(
subRect(SR_ComboBoxFocusRect, cb), widget);
tqdrawPrimitive( PE_FocusRect, p, re, cg,
@@ -1697,14 +1697,14 @@ void HighColorStyle::tqdrawComplexControl( TQ_ComplexControl control,
default:
- KStyle::tqdrawComplexControl(control, p, widget,
+ KStyle::drawComplexControl(control, p, widget,
r, cg, flags, controls, active, opt);
break;
}
}
-void HighColorStyle::tqdrawComplexControlMask( TQ_ComplexControl control,
+void HighColorStyle::drawComplexControlMask( TQ_ComplexControl control,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -1726,7 +1726,7 @@ void HighColorStyle::tqdrawComplexControlMask( TQ_ComplexControl control,
}
default:
- KStyle::tqdrawComplexControlMask(control, p, widget, r, opt);
+ KStyle::drawComplexControlMask(control, p, widget, r, opt);
}
}
@@ -1769,11 +1769,11 @@ TQRect HighColorStyle::subRect(SubRect r, const TQWidget *widget) const
int dbw1 = 0, dbw2 = 0;
if (button->isDefault() || button->autoDefault()) {
- dbw1 = tqpixelMetric(PM_ButtonDefaultIndicator, widget);
+ dbw1 = pixelMetric(PM_ButtonDefaultIndicator, widget);
dbw2 = dbw1 * 2;
}
- int dfw1 = tqpixelMetric(PM_DefaultFrameWidth, widget) * 2,
+ int dfw1 = pixelMetric(PM_DefaultFrameWidth, widget) * 2,
dfw2 = dfw1 * 2;
return TQRect(wrect.x() + dfw1 + dbw1 + 1,
@@ -1785,7 +1785,7 @@ TQRect HighColorStyle::subRect(SubRect r, const TQWidget *widget) const
}
-int HighColorStyle::tqpixelMetric(PixelMetric m, const TQWidget *widget) const
+int HighColorStyle::pixelMetric(PixelMetric m, const TQWidget *widget) const
{
switch(m)
{
@@ -1818,7 +1818,7 @@ int HighColorStyle::tqpixelMetric(PixelMetric m, const TQWidget *widget) const
}
default:
- return KStyle::tqpixelMetric(m, widget);
+ return KStyle::pixelMetric(m, widget);
}
}
@@ -1836,8 +1836,8 @@ TQSize HighColorStyle::tqsizeFromContents( ContentsType contents,
const TQPushButton* button = (const TQPushButton*) widget;
int w = contentSize.width();
int h = contentSize.height();
- int bm = tqpixelMetric( PM_ButtonMargin, widget );
- int fw = tqpixelMetric( PM_DefaultFrameWidth, widget ) * 2;
+ int bm = pixelMetric( PM_ButtonMargin, widget );
+ int fw = pixelMetric( PM_DefaultFrameWidth, widget ) * 2;
w += bm + fw + 6; // ### Add 6 to make way for bold font.
h += bm + fw;
@@ -1849,7 +1849,7 @@ TQSize HighColorStyle::tqsizeFromContents( ContentsType contents,
if ( type != HighColor ) {
// Compensate for default indicator
- int di = tqpixelMetric( PM_ButtonDefaultIndicator );
+ int di = pixelMetric( PM_ButtonDefaultIndicator );
w += di * 2;
h += di * 2;
}
@@ -1992,7 +1992,7 @@ bool HighColorStyle::eventFilter( TQObject *object, TQEvent *event )
if (tb) horiz_grad = tb->orientation() == Qt::Vertical;
TQPainter p( widget );
- renderGradient(&p, r, parent->tqcolorGroup().button(), horiz_grad,
+ renderGradient(&p, r, parent->colorGroup().button(), horiz_grad,
x_offset, y_offset, pr.width(), pr.height());
return false; // Now draw the contents
@@ -2006,11 +2006,11 @@ bool HighColorStyle::eventFilter( TQObject *object, TQEvent *event )
TQWidget *widget = TQT_TQWIDGET(object);
TQRect wr = widget->rect(), tr = toolbar->rect();
TQPainter p( widget );
- renderGradient(&p, wr, toolbar->tqcolorGroup().button(),
+ renderGradient(&p, wr, toolbar->colorGroup().button(),
toolbar->orientation() == Qt::Vertical,
wr.x(), wr.y(), tr.width() - 2, tr.height() - 2);
- p.setPen( toolbar->tqcolorGroup().dark() );
+ p.setPen( toolbar->colorGroup().dark() );
if ( toolbar->orientation() == Qt::Horizontal )
p.drawLine( wr.width()-1, 0, wr.width()-1, wr.height()-1 );
else
diff --git a/kstyles/highcolor/highcolor.h b/kstyles/highcolor/highcolor.h
index 14f9056e5..ff0fce2d7 100644
--- a/kstyles/highcolor/highcolor.h
+++ b/kstyles/highcolor/highcolor.h
@@ -86,7 +86,7 @@ class HighColorStyle : public KStyle
SFlags flags = Style_Default,
const TQStyleOption& = TQStyleOption::Default ) const;
- void tqdrawControl( TQ_ControlElement element,
+ void drawControl( TQ_ControlElement element,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -94,13 +94,13 @@ class HighColorStyle : public KStyle
SFlags flags = Style_Default,
const TQStyleOption& = TQStyleOption::Default ) const;
- void tqdrawControlMask( TQ_ControlElement element,
+ void drawControlMask( TQ_ControlElement element,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
const TQStyleOption& = TQStyleOption::Default ) const;
- void tqdrawComplexControl( TQ_ComplexControl control,
+ void drawComplexControl( TQ_ComplexControl control,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -110,7 +110,7 @@ class HighColorStyle : public KStyle
SCFlags active = SC_None,
const TQStyleOption& = TQStyleOption::Default ) const;
- void tqdrawComplexControlMask( TQ_ComplexControl control,
+ void drawComplexControlMask( TQ_ComplexControl control,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -126,7 +126,7 @@ class HighColorStyle : public KStyle
int len = -1,
const TQColor *penColor = 0 ) const;
- int tqpixelMetric( PixelMetric m,
+ int pixelMetric( PixelMetric m,
const TQWidget *widget = 0 ) const;
TQSize tqsizeFromContents( ContentsType contents,
diff --git a/kstyles/highcontrast/highcontrast.cpp b/kstyles/highcontrast/highcontrast.cpp
index 732a566c6..984465a4e 100644
--- a/kstyles/highcontrast/highcontrast.cpp
+++ b/kstyles/highcontrast/highcontrast.cpp
@@ -706,13 +706,13 @@ void HighContrastStyle::drawKStylePrimitive (KStylePrimitive kpe,
}
case KPE_ListViewExpander: {
- // TODO There is no tqpixelMetric associated with the
+ // TODO There is no pixelMetric associated with the
// ListViewExpander in KStyle.
// To have a properly large expander, the CC_ListView case of
- // tqdrawComplexControl should be handled.
+ // drawComplexControl should be handled.
// Probably it would be better to add a KPM_ListViewExpander metric
// to the KStyle KStylePixelMetric enum, and have the KStyle
- // tqdrawComplexControl handle it.
+ // drawComplexControl handle it.
TQ_PrimitiveElement direction;
if (flags & Style_On) { // Collapsed = On
direction = PE_ArrowRight;
@@ -733,7 +733,7 @@ void HighContrastStyle::drawKStylePrimitive (KStylePrimitive kpe,
}
-void HighContrastStyle::tqdrawControl (TQ_ControlElement element,
+void HighContrastStyle::drawControl (TQ_ControlElement element,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -793,7 +793,7 @@ void HighContrastStyle::tqdrawControl (TQ_ControlElement element,
if (( btnDefault || button->autoDefault() ) && (button->isEnabled())) {
// Compensate for default indicator
- static int di = tqpixelMetric( PM_ButtonDefaultIndicator );
+ static int di = pixelMetric( PM_ButtonDefaultIndicator );
addOffset (&br, di);
}
@@ -864,7 +864,7 @@ void HighContrastStyle::tqdrawControl (TQ_ControlElement element,
// Does the button have a popup menu?
if (popup) {
- int dx = tqpixelMetric (PM_MenuButtonIndicator, widget);
+ int dx = pixelMetric (PM_MenuButtonIndicator, widget);
drawArrow (p, TQRect(x + w - dx - 2, y + 2, dx, h - 4), PE_ArrowDown);
w -= dx;
}
@@ -1013,7 +1013,7 @@ void HighContrastStyle::tqdrawControl (TQ_ControlElement element,
// Do we have an icon?
if ( mi->iconSet() && !mi->iconSet()->isNull() ) {
TQIconSet::Mode mode;
- TQRect cr = tqvisualRect( TQRect(x, y, checkcol, h), r );
+ TQRect cr = visualRect( TQRect(x, y, checkcol, h), r );
// Select the correct icon from the iconset
if (!(flags & Style_Enabled))
@@ -1122,8 +1122,8 @@ void HighContrastStyle::tqdrawControl (TQ_ControlElement element,
// Does the menu item have a submenu?
if ( mi->popup() ) {
TQ_PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight;
- int dim = tqpixelMetric(PM_MenuButtonIndicator);
- TQRect vr = tqvisualRect( TQRect( x + w - arrowHMargin - 2*itemFrame - dim,
+ int dim = pixelMetric(PM_MenuButtonIndicator);
+ TQRect vr = visualRect( TQRect( x + w - arrowHMargin - 2*itemFrame - dim,
y + h / 2 - dim / 2, dim, dim), r );
// Draw an arrow at the far end of the menu item
@@ -1133,11 +1133,11 @@ void HighContrastStyle::tqdrawControl (TQ_ControlElement element,
}
default:
- KStyle::tqdrawControl(element, p, widget, r, cg, flags, opt);
+ KStyle::drawControl(element, p, widget, r, cg, flags, opt);
}
}
-void HighContrastStyle::tqdrawControlMask (TQ_ControlElement element,
+void HighContrastStyle::drawControlMask (TQ_ControlElement element,
TQPainter *p,
const TQWidget *w,
const TQRect &r,
@@ -1161,7 +1161,7 @@ void HighContrastStyle::tqdrawControlMask (TQ_ControlElement element,
}
default: {
- KStyle::tqdrawControlMask (element, p, w, r, opt);
+ KStyle::drawControlMask (element, p, w, r, opt);
}
}
}
@@ -1180,7 +1180,7 @@ static TQListViewItem* nextVisibleSibling(TQListViewItem* item)
return sibling;
}
-void HighContrastStyle::tqdrawComplexControl (TQ_ComplexControl control,
+void HighContrastStyle::drawComplexControl (TQ_ComplexControl control,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -1201,7 +1201,7 @@ void HighContrastStyle::tqdrawComplexControl (TQ_ComplexControl control,
setColorsText (p, cg, flags);
drawRoundRect (p, r);
- TQRect r2 = TQStyle::tqvisualRect (querySubControlMetrics (CC_ComboBox, widget, SC_ComboBoxArrow), widget);
+ TQRect r2 = TQStyle::visualRect (querySubControlMetrics (CC_ComboBox, widget, SC_ComboBoxArrow), widget);
if (flags & Style_HasFocus) {
TQRect r3 (r);
if (r2.left() > 0)
@@ -1236,12 +1236,12 @@ void HighContrastStyle::tqdrawComplexControl (TQ_ComplexControl control,
setColorsButton (p, cg, flags);
// Draw arrows if required
if (controls & SC_SpinWidgetDown) {
- TQRect r2 = TQStyle::tqvisualRect (querySubControlMetrics ((TQ_ComplexControl)CC_SpinWidget, widget, SC_SpinWidgetDown), widget);
+ TQRect r2 = TQStyle::visualRect (querySubControlMetrics ((TQ_ComplexControl)CC_SpinWidget, widget, SC_SpinWidgetDown), widget);
drawRoundRect (p, r2);
drawArrow (p, r2, PE_SpinWidgetDown, 2*basicLineWidth);
}
if (controls & SC_SpinWidgetUp) {
- TQRect r2 = TQStyle::tqvisualRect (querySubControlMetrics ((TQ_ComplexControl)CC_SpinWidget, widget, SC_SpinWidgetUp), widget);
+ TQRect r2 = TQStyle::visualRect (querySubControlMetrics ((TQ_ComplexControl)CC_SpinWidget, widget, SC_SpinWidgetUp), widget);
drawRoundRect (p, r2);
drawArrow (p, r2, PE_SpinWidgetUp, 2*basicLineWidth);
}
@@ -1316,7 +1316,7 @@ void HighContrastStyle::tqdrawComplexControl (TQ_ComplexControl control,
// Paint the icon and text.
if ( controls & SC_ListView )
- TQCommonStyle::tqdrawComplexControl( control, p, widget, r, cg, flags, controls, active, opt );
+ TQCommonStyle::drawComplexControl( control, p, widget, r, cg, flags, controls, active, opt );
// If we're have a branch or are expanded...
if ( controls & (SC_ListViewBranch | SC_ListViewExpand) )
@@ -1462,13 +1462,13 @@ void HighContrastStyle::tqdrawComplexControl (TQ_ComplexControl control,
}
default:
- KStyle::tqdrawComplexControl(control, p, widget,
+ KStyle::drawComplexControl(control, p, widget,
r, cg, flags, controls, active, opt);
break;
}
}
-void HighContrastStyle::tqdrawComplexControlMask(TQ_ComplexControl c,
+void HighContrastStyle::drawComplexControlMask(TQ_ComplexControl c,
TQPainter *p,
const TQWidget *w,
const TQRect &r,
@@ -1482,7 +1482,7 @@ void HighContrastStyle::tqdrawComplexControlMask(TQ_ComplexControl c,
break;
}
default: {
- KStyle::tqdrawComplexControlMask (c, p, w, r, o);
+ KStyle::drawComplexControlMask (c, p, w, r, o);
}
}
}
@@ -1519,7 +1519,7 @@ TQRect HighContrastStyle::querySubControlMetrics( TQ_ComplexControl control,
switch (control)
{
case CC_ComboBox : {
- int arrow = tqpixelMetric (PM_ScrollBarExtent, widget);
+ int arrow = pixelMetric (PM_ScrollBarExtent, widget);
switch (subcontrol)
{
case SC_ComboBoxFrame:
@@ -1535,7 +1535,7 @@ TQRect HighContrastStyle::querySubControlMetrics( TQ_ComplexControl control,
break;
}
case CC_SpinWidget : {
- int arrow = tqpixelMetric (PM_ScrollBarExtent, 0);
+ int arrow = pixelMetric (PM_ScrollBarExtent, 0);
switch (subcontrol)
{
case SC_SpinWidgetFrame:
@@ -1563,7 +1563,7 @@ TQRect HighContrastStyle::querySubControlMetrics( TQ_ComplexControl control,
}
-int HighContrastStyle::tqpixelMetric(PixelMetric m, const TQWidget *widget) const
+int HighContrastStyle::pixelMetric(PixelMetric m, const TQWidget *widget) const
{
//### TODO: Use the tab metrics changes from Ker.
switch(m)
@@ -1647,7 +1647,7 @@ int HighContrastStyle::tqpixelMetric(PixelMetric m, const TQWidget *widget) cons
}
default:
- return KStyle::tqpixelMetric(m, widget);
+ return KStyle::pixelMetric(m, widget);
}
}
@@ -1676,8 +1676,8 @@ TQSize HighContrastStyle::tqsizeFromContents( ContentsType contents,
const TQPushButton* button = (const TQPushButton*) widget;
int w = contentSize.width();
int h = contentSize.height();
- int bm = tqpixelMetric( PM_ButtonMargin, widget );
- int fw = tqpixelMetric( PM_DefaultFrameWidth, widget ) * 2;
+ int bm = pixelMetric( PM_ButtonMargin, widget );
+ int fw = pixelMetric( PM_DefaultFrameWidth, widget ) * 2;
w += bm + fw + 6; // ### Add 6 to make way for bold font.
h += bm + fw;
@@ -1688,7 +1688,7 @@ TQSize HighContrastStyle::tqsizeFromContents( ContentsType contents,
w = 80;
// Compensate for default indicator
- int di = tqpixelMetric( PM_ButtonDefaultIndicator );
+ int di = pixelMetric( PM_ButtonDefaultIndicator );
w += di * 2;
h += di * 2;
}
@@ -1713,7 +1713,7 @@ TQSize HighContrastStyle::tqsizeFromContents( ContentsType contents,
case CT_ComboBox: {
const TQComboBox *cb = static_cast< const TQComboBox* > (widget);
int borderSize = (cb->editable() ? 4 : 2) * basicLineWidth;
- int arrowSize = tqpixelMetric (PM_ScrollBarExtent, cb);
+ int arrowSize = pixelMetric (PM_ScrollBarExtent, cb);
return TQSize(borderSize + basicLineWidth + arrowSize, borderSize) + contentSize;
}
diff --git a/kstyles/highcontrast/highcontrast.h b/kstyles/highcontrast/highcontrast.h
index 8967a0d4d..48a7c6e92 100644
--- a/kstyles/highcontrast/highcontrast.h
+++ b/kstyles/highcontrast/highcontrast.h
@@ -74,7 +74,7 @@ class HighContrastStyle : public KStyle
SFlags flags = Style_Default,
const TQStyleOption& = TQStyleOption::Default ) const;
- void tqdrawControl( TQ_ControlElement element,
+ void drawControl( TQ_ControlElement element,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -82,13 +82,13 @@ class HighContrastStyle : public KStyle
SFlags flags = Style_Default,
const TQStyleOption& = TQStyleOption::Default ) const;
- void tqdrawControlMask( TQ_ControlElement element,
+ void drawControlMask( TQ_ControlElement element,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
const TQStyleOption& = TQStyleOption::Default ) const;
- void tqdrawComplexControl( TQ_ComplexControl control,
+ void drawComplexControl( TQ_ComplexControl control,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -98,7 +98,7 @@ class HighContrastStyle : public KStyle
SCFlags active = SC_None,
const TQStyleOption& = TQStyleOption::Default ) const;
- void tqdrawComplexControlMask( TQ_ComplexControl control,
+ void drawComplexControlMask( TQ_ComplexControl control,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -120,7 +120,7 @@ class HighContrastStyle : public KStyle
int len = -1,
const TQColor *penColor = 0 ) const;
- int tqpixelMetric( PixelMetric m,
+ int pixelMetric( PixelMetric m,
const TQWidget *widget = 0 ) const;
int kPixelMetric( KStylePixelMetric m,
diff --git a/kstyles/keramik/keramik.cpp b/kstyles/keramik/keramik.cpp
index 2ca9ed360..4efa09787 100644
--- a/kstyles/keramik/keramik.cpp
+++ b/kstyles/keramik/keramik.cpp
@@ -147,8 +147,8 @@ namespace
p->save();
/*if ( down )
- p->translate( tqpixelMetric( PM_ButtonShiftHorizontal ),
- tqpixelMetric( PM_ButtonShiftVertical ) );
+ p->translate( pixelMetric( PM_ButtonShiftHorizontal ),
+ pixelMetric( PM_ButtonShiftVertical ) );
*/
if ( enabled ) {
@@ -520,14 +520,14 @@ static void renderToolbarWidgetBackground(TQPainter* painter, const TQWidget* wi
if (painter)
{
Keramik::GradientPainter::renderGradient( painter, widget->rect(),
- widget->tqcolorGroup().button(), horiz_grad, false,
+ widget->colorGroup().button(), horiz_grad, false,
x_offset, y_offset, toolWidth, toolHeight);
}
else
{
TQPainter p( widget );
Keramik::GradientPainter::renderGradient( &p, widget->rect(),
- widget->tqcolorGroup().button(), horiz_grad, false,
+ widget->colorGroup().button(), horiz_grad, false,
x_offset, y_offset, toolWidth, toolHeight);
}
}
@@ -946,7 +946,7 @@ void KeramikStyle::tqdrawPrimitive( TQ_PrimitiveElement pe,
//p->setPen( cg.shadow() );
//p->drawRect( r.x()+1, r.y()+1, r.width()-2, r.height()-2);
- //p->fillRect( tqvisualRect( TQRect( x + 1, y + 1, 23, h - 2 ), r ), cg.background().dark( 105 ) );
+ //p->fillRect( visualRect( TQRect( x + 1, y + 1, 23, h - 2 ), r ), cg.background().dark( 105 ) );
//break;
// GENERAL PANELS
@@ -978,7 +978,7 @@ void KeramikStyle::tqdrawPrimitive( TQ_PrimitiveElement pe,
case PE_WindowFrame:
{
bool sunken = flags & Style_Sunken;
- int lw = opt.isDefault() ? tqpixelMetric(PM_DefaultFrameWidth)
+ int lw = opt.isDefault() ? pixelMetric(PM_DefaultFrameWidth)
: opt.lineWidth();
if (lw == 2)
{
@@ -1016,7 +1016,7 @@ void KeramikStyle::tqdrawPrimitive( TQ_PrimitiveElement pe,
int x2 = r.x()+r.width()-1;
int y2 = r.y()+r.height()-1;
- int lw = opt.isDefault() ? tqpixelMetric(PM_DefaultFrameWidth)
+ int lw = opt.isDefault() ? pixelMetric(PM_DefaultFrameWidth)
: opt.lineWidth();
if (lw)
{
@@ -1036,7 +1036,7 @@ void KeramikStyle::tqdrawPrimitive( TQ_PrimitiveElement pe,
int y = r.y();
int x2 = r.x() + r.width() - 1;
int y2 = r.y() + r.height() - 1;
- int lw = opt.isDefault() ? tqpixelMetric(PM_DefaultFrameWidth)
+ int lw = opt.isDefault() ? pixelMetric(PM_DefaultFrameWidth)
: opt.lineWidth();
if (lw)
@@ -1142,8 +1142,8 @@ void KeramikStyle::tqdrawPrimitive( TQ_PrimitiveElement pe,
p->save();
if ( flags & Style_Down )
- p->translate( tqpixelMetric( PM_ButtonShiftHorizontal ),
- tqpixelMetric( PM_ButtonShiftVertical ) );
+ p->translate( pixelMetric( PM_ButtonShiftHorizontal ),
+ pixelMetric( PM_ButtonShiftVertical ) );
if ( flags & Style_Enabled )
{
@@ -1325,7 +1325,7 @@ bool KeramikStyle::isFormWidget(const TQWidget* widget) const
return true;
}
-void KeramikStyle::tqdrawControl( TQ_ControlElement element,
+void KeramikStyle::drawControl( TQ_ControlElement element,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -1383,15 +1383,15 @@ void KeramikStyle::tqdrawControl( TQ_ControlElement element,
// Shift button contents if pushed.
if ( active )
{
- x += tqpixelMetric(PM_ButtonShiftHorizontal, widget);
- y += tqpixelMetric(PM_ButtonShiftVertical, widget);
+ x += pixelMetric(PM_ButtonShiftHorizontal, widget);
+ y += pixelMetric(PM_ButtonShiftVertical, widget);
flags |= Style_Sunken;
}
// Does the button have a popup menu?
if ( button->isMenuButton() )
{
- int dx = tqpixelMetric( PM_MenuButtonIndicator, widget );
+ int dx = pixelMetric( PM_MenuButtonIndicator, widget );
if ( button->iconSet() && !button->iconSet()->isNull() &&
(dx + button->iconSet()->pixmap (TQIconSet::Small, TQIconSet::Normal, TQIconSet::Off ).width()) >= w )
{
@@ -1399,7 +1399,7 @@ void KeramikStyle::tqdrawControl( TQ_ControlElement element,
}
else
{
- tqdrawPrimitive( PE_ArrowDown, p, tqvisualRect( TQRect(x + w - dx - 8, y + 2, dx, h - 4), r ),
+ tqdrawPrimitive( PE_ArrowDown, p, visualRect( TQRect(x + w - dx - 8, y + 2, dx, h - 4), r ),
cg, flags, opt );
w -= dx;
}
@@ -1448,18 +1448,18 @@ void KeramikStyle::tqdrawControl( TQ_ControlElement element,
}
if (cornArrow) //Draw over the icon
- tqdrawPrimitive( PE_ArrowDown, p, tqvisualRect( TQRect(x + w - 6, x + h - 6, 7, 7), r ),
+ tqdrawPrimitive( PE_ArrowDown, p, visualRect( TQRect(x + w - 6, x + h - 6, 7, 7), r ),
cg, flags, opt );
}
// Make the label indicate if the button is a default button or not
- drawItem( p, TQRect(x, y, w, h), AlignCenter | ShowPrefix, button->tqcolorGroup(),
+ drawItem( p, TQRect(x, y, w, h), AlignCenter | ShowPrefix, button->colorGroup(),
button->isEnabled(), button->pixmap(), button->text(), -1,
- &button->tqcolorGroup().buttonText() );
+ &button->colorGroup().buttonText() );
if ( flags & Style_HasFocus )
tqdrawPrimitive( PE_FocusRect, p,
- tqvisualRect( subRect( SR_PushButtonFocusRect, widget ), widget ),
+ visualRect( subRect( SR_PushButtonFocusRect, widget ), widget ),
cg, flags );
break;
}
@@ -1488,7 +1488,7 @@ void KeramikStyle::tqdrawControl( TQ_ControlElement element,
// nr.setWidth(r.width()-2); //Account for shadow
}
- KStyle::tqdrawControl(element, p, widget, nr, cg, flags, opt);
+ KStyle::drawControl(element, p, widget, nr, cg, flags, opt);
break;
}
@@ -1553,7 +1553,7 @@ void KeramikStyle::tqdrawControl( TQ_ControlElement element,
tb->orientation() == Qt::Horizontal);
}
else
- KStyle::tqdrawControl( (TQ_ControlElement)CE_DockWindowEmptyArea, p,
+ KStyle::drawControl( (TQ_ControlElement)CE_DockWindowEmptyArea, p,
widget, r, cg, flags, opt );
break;
}
@@ -1609,7 +1609,7 @@ void KeramikStyle::tqdrawControl( TQ_ControlElement element,
bool enabled = mi->isEnabled();
bool checkable = popupmenu->isCheckable();
bool active = flags & Style_Active;
- bool etchtext = tqstyleHint( SH_EtchDisabledText );
+ bool etchtext = styleHint( SH_EtchDisabledText );
bool reverse = TQApplication::reverseLayout();
if ( checkable )
checkcol = QMAX( checkcol, 20 );
@@ -1643,7 +1643,7 @@ void KeramikStyle::tqdrawControl( TQ_ControlElement element,
break;
}
- TQRect cr = tqvisualRect( TQRect( x + 2, y + 2, checkcol - 1, h - 4 ), r );
+ TQRect cr = visualRect( TQRect( x + 2, y + 2, checkcol - 1, h - 4 ), r );
// Do we have an icon?
if ( mi->iconSet() )
{
@@ -1789,8 +1789,8 @@ void KeramikStyle::tqdrawControl( TQ_ControlElement element,
// Does the menu item have a submenu?
if ( mi->popup() ) {
TQ_PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight;
- int dim = tqpixelMetric(PM_MenuButtonIndicator) - itemFrame;
- TQRect vr = tqvisualRect( TQRect( x + w - arrowHMargin - itemFrame - dim,
+ int dim = pixelMetric(PM_MenuButtonIndicator) - itemFrame;
+ TQRect vr = visualRect( TQRect( x + w - arrowHMargin - itemFrame - dim,
y + h / 2 - dim / 2, dim, dim), r );
// Draw an arrow at the far end of the menu item
@@ -1916,11 +1916,11 @@ void KeramikStyle::tqdrawControl( TQ_ControlElement element,
default:
- KStyle::tqdrawControl(element, p, widget, r, cg, flags, opt);
+ KStyle::drawControl(element, p, widget, r, cg, flags, opt);
}
}
-void KeramikStyle::tqdrawControlMask( TQ_ControlElement element,
+void KeramikStyle::drawControlMask( TQ_ControlElement element,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -1928,7 +1928,7 @@ void KeramikStyle::tqdrawControlMask( TQ_ControlElement element,
{
p->fillRect(r, color1);
maskMode = true;
- tqdrawControl( element, p, widget, r, TQApplication::tqpalette().active(), TQStyle::Style_Default, opt);
+ drawControl( element, p, widget, r, TQApplication::tqpalette().active(), TQStyle::Style_Default, opt);
maskMode = false;
}
@@ -1944,7 +1944,7 @@ bool KeramikStyle::isSizeConstrainedCombo(const TQComboBox* combo) const
return false;
}
-void KeramikStyle::tqdrawComplexControl( TQ_ComplexControl control,
+void KeramikStyle::drawComplexControl( TQ_ComplexControl control,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -2035,11 +2035,11 @@ void KeramikStyle::tqdrawComplexControl( TQ_ComplexControl control,
if (!compact)
{
ar.setWidth(ar.width()-13);
- TQRect rr = tqvisualRect( TQRect( ar.x(), ar.y() + 4,
+ TQRect rr = visualRect( TQRect( ar.x(), ar.y() + 4,
loader.size(keramik_ripple ).width(), ar.height() - 8 ),
widget );
- ar = tqvisualRect( TQRect( ar.x() + loader.size( keramik_ripple ).width() + 4, ar.y(),
+ ar = visualRect( TQRect( ar.x() + loader.size( keramik_ripple ).width() + 4, ar.y(),
11, ar.height() ),
widget );
@@ -2056,7 +2056,7 @@ void KeramikStyle::tqdrawComplexControl( TQ_ComplexControl control,
else //Size-constrained combo -- loose the ripple.
{
ar.setWidth(ar.width() - 7);
- ar = tqvisualRect( TQRect( ar.x(), ar.y(), 11, ar.height() ), widget);
+ ar = visualRect( TQRect( ar.x(), ar.y(), 11, ar.height() ), widget);
TQPointArray a;
a.setPoints(TQCOORDARRLEN(keramik_combo_arrow), keramik_combo_arrow);
@@ -2071,7 +2071,7 @@ void KeramikStyle::tqdrawComplexControl( TQ_ComplexControl control,
{
if ( cb->editable() )
{
- TQRect er = tqvisualRect( querySubControlMetrics( CC_ComboBox, widget, SC_ComboBoxEditField ), widget );
+ TQRect er = visualRect( querySubControlMetrics( CC_ComboBox, widget, SC_ComboBoxEditField ), widget );
er.addCoords( -2, -2, 2, 2 );
p2->fillRect( er, cg.base() );
tqdrawPrimitive( PE_PanelLineEdit, p2, er, cg );
@@ -2080,7 +2080,7 @@ void KeramikStyle::tqdrawComplexControl( TQ_ComplexControl control,
}
else if ( cb->hasFocus() )
{
- TQRect re = TQStyle::tqvisualRect(subRect(SR_ComboBoxFocusRect, cb), widget);
+ TQRect re = TQStyle::visualRect(subRect(SR_ComboBoxFocusRect, cb), widget);
if ( compact )
re.addCoords( 3, 3, 0, -3 );
p2->fillRect( re, cg.brush( TQColorGroup::Highlight ) );
@@ -2115,7 +2115,7 @@ void KeramikStyle::tqdrawComplexControl( TQ_ComplexControl control,
case CC_SpinWidget:
{
const TQSpinWidget* sw = static_cast< const TQSpinWidget* >( widget );
- TQRect br = tqvisualRect( querySubControlMetrics( (TQ_ComplexControl)CC_SpinWidget, widget, SC_SpinWidgetButtonField ), widget );
+ TQRect br = visualRect( querySubControlMetrics( (TQ_ComplexControl)CC_SpinWidget, widget, SC_SpinWidgetButtonField ), widget );
if ( controls & SC_SpinWidgetButtonField )
{
Keramik::SpinBoxPainter().draw( p, br, cg.button(), cg.background(), !sw->isEnabled() );
@@ -2139,7 +2139,7 @@ void KeramikStyle::tqdrawComplexControl( TQ_ComplexControl control,
const TQScrollBar* sb = static_cast< const TQScrollBar* >( widget );
if (highlightScrollBar && sb->parentWidget()) //Don't do the check if not highlighting anyway
{
- if (sb->parentWidget()->tqcolorGroup().button() != sb->tqcolorGroup().button())
+ if (sb->parentWidget()->colorGroup().button() != sb->colorGroup().button())
customScrollMode = true;
}
bool horizontal = sb->orientation() == Qt::Horizontal;
@@ -2313,14 +2313,14 @@ void KeramikStyle::tqdrawComplexControl( TQ_ComplexControl control,
case CC_TitleBar:
titleBarMode = Regular; //Handle buttons on titlebar different from toolbuttons
default:
- KStyle::tqdrawComplexControl( control, p, widget,
+ KStyle::drawComplexControl( control, p, widget,
r, cg, flags, controls, active, opt );
titleBarMode = None;
}
}
-void KeramikStyle::tqdrawComplexControlMask( TQ_ComplexControl control,
+void KeramikStyle::drawComplexControlMask( TQ_ComplexControl control,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -2329,7 +2329,7 @@ void KeramikStyle::tqdrawComplexControlMask( TQ_ComplexControl control,
if (control == CC_ComboBox)
{
maskMode = true;
- tqdrawComplexControl(CC_ComboBox, p, widget, r,
+ drawComplexControl(CC_ComboBox, p, widget, r,
TQApplication::tqpalette().active(), Style_Default,
SC_ComboBoxFrame,SC_None, opt);
maskMode = false;
@@ -2340,7 +2340,7 @@ void KeramikStyle::tqdrawComplexControlMask( TQ_ComplexControl control,
}
-int KeramikStyle::tqpixelMetric(PixelMetric m, const TQWidget *widget) const
+int KeramikStyle::pixelMetric(PixelMetric m, const TQWidget *widget) const
{
switch(m)
{
@@ -2410,7 +2410,7 @@ int KeramikStyle::tqpixelMetric(PixelMetric m, const TQWidget *widget) const
return titleBarH;
default:
- return KStyle::tqpixelMetric(m, widget);
+ return KStyle::pixelMetric(m, widget);
}
}
@@ -2428,8 +2428,8 @@ TQSize KeramikStyle::tqsizeFromContents( ContentsType contents,
{
const TQPushButton* btn = static_cast< const TQPushButton* >( widget );
- int w = contentSize.width() + 2 * tqpixelMetric( PM_ButtonMargin, widget );
- int h = contentSize.height() + 2 * tqpixelMetric( PM_ButtonMargin, widget );
+ int w = contentSize.width() + 2 * pixelMetric( PM_ButtonMargin, widget );
+ int h = contentSize.height() + 2 * pixelMetric( PM_ButtonMargin, widget );
if ( btn->text().isEmpty() && contentSize.width() < 32 ) return TQSize( w, h );
@@ -2623,7 +2623,7 @@ TQRect KeramikStyle::querySubControlMetrics( TQ_ComplexControl control,
{
int range = sb->maxValue() - sb->minValue();
sliderlen = ( sb->pageStep() * maxlen ) / ( range + sb->pageStep() );
- slidermin = tqpixelMetric( PM_ScrollBarSliderMin, sb );
+ slidermin = pixelMetric( PM_ScrollBarSliderMin, sb );
if ( sliderlen < slidermin ) sliderlen = slidermin;
if ( sliderlen > maxlen ) sliderlen = maxlen;
}
@@ -2666,9 +2666,9 @@ TQRect KeramikStyle::querySubControlMetrics( TQ_ComplexControl control,
bool horizontal = sl->orientation() == Qt::Horizontal;
TQSlider::TickSetting ticks = sl->tickmarks();
int pos = sl->sliderStart();
- int size = tqpixelMetric( PM_SliderControlThickness, widget );
- int handleSize = tqpixelMetric( PM_SliderThickness, widget );
- int len = tqpixelMetric( PM_SliderLength, widget );
+ int size = pixelMetric( PM_SliderControlThickness, widget );
+ int handleSize = pixelMetric( PM_SliderThickness, widget );
+ int len = pixelMetric( PM_SliderLength, widget );
//Shrink the metrics if the widget is too small
//to fit our normal values for them.
@@ -2901,20 +2901,20 @@ bool KeramikStyle::eventFilter( TQObject* object, TQEvent* event )
if ( toolbar->orientation() == Qt::Horizontal )
{
- Keramik::GradientPainter::renderGradient( &p, wr, widget->tqcolorGroup().button(),
+ Keramik::GradientPainter::renderGradient( &p, wr, widget->colorGroup().button(),
true /*horizontal*/, false /*not a menu*/,
0, widget->y(), wr.width(), tr.height());
}
else
{
- Keramik::GradientPainter::renderGradient( &p, wr, widget->tqcolorGroup().button(),
+ Keramik::GradientPainter::renderGradient( &p, wr, widget->colorGroup().button(),
false /*vertical*/, false /*not a menu*/,
widget->x(), 0, tr.width(), wr.height());
}
//Draw terminator line, too
- p.setPen( toolbar->tqcolorGroup().mid() );
+ p.setPen( toolbar->colorGroup().mid() );
if ( toolbar->orientation() == Qt::Horizontal )
p.drawLine( wr.width()-1, 0, wr.width()-1, wr.height()-1 );
else
diff --git a/kstyles/keramik/keramik.h b/kstyles/keramik/keramik.h
index b0f021aee..e177d56f8 100644
--- a/kstyles/keramik/keramik.h
+++ b/kstyles/keramik/keramik.h
@@ -70,7 +70,7 @@ public:
SFlags flags = Style_Default,
const TQStyleOption& = TQStyleOption::Default ) const;
- void tqdrawControl( TQ_ControlElement element,
+ void drawControl( TQ_ControlElement element,
TQPainter* p,
const TQWidget* widget,
const TQRect& r,
@@ -78,13 +78,13 @@ public:
SFlags flags = Style_Default,
const TQStyleOption& opt = TQStyleOption::Default ) const;
- void tqdrawControlMask( TQ_ControlElement element,
+ void drawControlMask( TQ_ControlElement element,
TQPainter* p,
const TQWidget* widget,
const TQRect& r,
const TQStyleOption& opt = TQStyleOption::Default ) const;
- void tqdrawComplexControl( TQ_ComplexControl control,
+ void drawComplexControl( TQ_ComplexControl control,
TQPainter* p,
const TQWidget* widget,
const TQRect& r,
@@ -94,13 +94,13 @@ public:
SCFlags active = SC_None,
const TQStyleOption& = TQStyleOption::Default ) const;
- void tqdrawComplexControlMask( TQ_ComplexControl control,
+ void drawComplexControlMask( TQ_ComplexControl control,
TQPainter* p,
const TQWidget* widget,
const TQRect& r,
const TQStyleOption& = TQStyleOption::Default ) const;
- int tqpixelMetric( PixelMetric m, const TQWidget* widget = 0 ) const;
+ int pixelMetric( PixelMetric m, const TQWidget* widget = 0 ) const;
TQSize tqsizeFromContents( ContentsType contents,
const TQWidget* widget,
diff --git a/kstyles/klegacy/klegacystyle.cpp b/kstyles/klegacy/klegacystyle.cpp
index cb3ddf1fa..ae9ff1614 100644
--- a/kstyles/klegacy/klegacystyle.cpp
+++ b/kstyles/klegacy/klegacystyle.cpp
@@ -1975,7 +1975,7 @@ void KLegacyStyle::polish(TQWidget *widget) {
}
GtkObject *gobj = gobj = priv->gtkDict.find(((metaobject) ? metaobject :
- widget->tqmetaObject()));
+ widget->metaObject()));
if (gobj) {
if (gobj->font() && (*gobj->font() != TQApplication::font()))
@@ -2181,7 +2181,7 @@ void KLegacyStyle::drawPushButton(TQPushButton *btn, TQPainter *p) {
key.cachekey = 0;
key.data.function = KLegacy::Box;
- TQColorGroup g = btn->tqcolorGroup();
+ TQColorGroup g = btn->colorGroup();
TQBrush fill = g.brush(TQColorGroup::Button);
int x1, y1, x2, y2;
btn->rect().coords(&x1, &y1, &x2, &y2);
@@ -2741,7 +2741,7 @@ void KLegacyStyle::drawScrollBarControls(TQPainter *p, const TQScrollBar *scroll
(active & SubLine), x, y,
buttonDim,
buttonDim,
- scrollbar->tqcolorGroup(), true);
+ scrollbar->colorGroup(), true);
if (scrollbar->orientation() == Vertical)
y = scrollbar->height() - buttonDim - defaultFrameWidth();
@@ -2753,7 +2753,7 @@ void KLegacyStyle::drawScrollBarControls(TQPainter *p, const TQScrollBar *scroll
(active & AddLine), x, y,
buttonDim,
buttonDim,
- scrollbar->tqcolorGroup(), true);
+ scrollbar->colorGroup(), true);
}
p->drawPixmap(0, 0, buf);
}
diff --git a/kstyles/kthemestyle/kthemebase.cpp b/kstyles/kthemestyle/kthemebase.cpp
index 772dd41bc..f6da05a41 100644
--- a/kstyles/kthemestyle/kthemebase.cpp
+++ b/kstyles/kthemestyle/kthemebase.cpp
@@ -1413,7 +1413,7 @@ void KThemeBase::readResourceGroup( int i, TQString *pixnames, TQString *brdname
// Blend intensity
tmpStr = prop[ "Blend" ];
if ( tmpStr.isEmpty() )
- tmpStr = TQString::tqfromLatin1( "0.0" );
+ tmpStr = TQString::fromLatin1( "0.0" );
blends[ i ] = tmpStr.toFloat();
// Bevel contrast
@@ -1609,7 +1609,7 @@ TQPalette KThemeBase::overridePalette( const TQPalette& pal )
{
if ( isColor( Background ) )
{
- background = tqcolorGroup( pal.active(), Background )
+ background = colorGroup( pal.active(), Background )
->background();
}
if ( isPixmap( Background ) )
@@ -1622,7 +1622,7 @@ TQPalette KThemeBase::overridePalette( const TQPalette& pal )
background.dark( lowlightVal ), background.dark( 120 ),
baseText, buttonText /*CHECKME: BrightText*/, base, background );
- buttonText = tqcolorGroup( pre, PushButton ) ->foreground();
+ buttonText = colorGroup( pre, PushButton ) ->foreground();
}
TQColor disfg = foreground;
diff --git a/kstyles/kthemestyle/kthemebase.h b/kstyles/kthemestyle/kthemebase.h
index 96faf57d5..d07752844 100644
--- a/kstyles/kthemestyle/kthemebase.h
+++ b/kstyles/kthemestyle/kthemebase.h
@@ -300,12 +300,12 @@ public:
* If a color group is set in the theme configuration
* that is used, otherwise defaultColor is returned.
*
- * @param defaultGroup The tqcolorGroup to set if one is available.
+ * @param defaultGroup The colorGroup to set if one is available.
*
* @param widget The widget whose color group to retrieve.
*
*/
- const TQColorGroup* tqcolorGroup( const TQColorGroup &defaultGroup,
+ const TQColorGroup* colorGroup( const TQColorGroup &defaultGroup,
WidgetType widget ) const;
TQBrush pixmapBrush( const TQColorGroup &group, TQColorGroup::ColorRole role,
@@ -508,9 +508,9 @@ protected:
/**
These are included for fuuture extension purposes..
*/
- virtual int tqpixelMetric ( PixelMetric metric, const TQWidget * widget = 0 ) const
+ virtual int pixelMetric ( PixelMetric metric, const TQWidget * widget = 0 ) const
{
- return KStyle::tqpixelMetric( metric, widget );
+ return KStyle::pixelMetric( metric, widget );
}
virtual void drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQRect & r, const TQColorGroup & cg,
@@ -522,7 +522,7 @@ protected:
}
- virtual void tqdrawControl( TQ_ControlElement element,
+ virtual void drawControl( TQ_ControlElement element,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -530,21 +530,21 @@ protected:
SFlags how = Style_Default,
const TQStyleOption& opt = TQStyleOption::Default ) const
{
- KStyle::tqdrawControl( element, p, widget,
+ KStyle::drawControl( element, p, widget,
r, cg, how, opt );
}
- virtual void tqdrawControlMask( TQ_ControlElement element,
+ virtual void drawControlMask( TQ_ControlElement element,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
const TQStyleOption& opt = TQStyleOption::Default ) const
{
- KStyle::tqdrawControlMask( element, p, widget, r, opt );
+ KStyle::drawControlMask( element, p, widget, r, opt );
}
- virtual void tqdrawComplexControl( TQ_ComplexControl control,
+ virtual void drawComplexControl( TQ_ComplexControl control,
TQPainter *p,
const TQWidget* widget,
const TQRect &r,
@@ -554,7 +554,7 @@ protected:
SCFlags active = SC_None,
const TQStyleOption& opt = TQStyleOption::Default ) const
{
- KStyle::tqdrawComplexControl( control, p, widget, r, cg, flags, controls, active, opt );
+ KStyle::drawComplexControl( control, p, widget, r, cg, flags, controls, active, opt );
}
@@ -572,12 +572,12 @@ protected:
}
- virtual int tqstyleHint( StyleHint sh,
+ virtual int styleHint( StyleHint sh,
const TQWidget *widget = 0,
const TQStyleOption& opt = TQStyleOption::Default,
TQStyleHintReturn* returnData = 0 ) const
{
- return KStyle::tqstyleHint( sh,
+ return KStyle::styleHint( sh,
widget,
opt,
returnData );
@@ -731,7 +731,7 @@ inline TQBrush KThemeBase::pixmapBrush( const TQColorGroup &group,
return ( group.color( role ) );
}
-inline const TQColorGroup* KThemeBase::tqcolorGroup( const TQColorGroup &defaultGroup,
+inline const TQColorGroup* KThemeBase::colorGroup( const TQColorGroup &defaultGroup,
WidgetType widget ) const
{
return ( ( colors[ widget ] ) ? colors[ widget ] : &defaultGroup );
diff --git a/kstyles/kthemestyle/kthemestyle.cpp b/kstyles/kthemestyle/kthemestyle.cpp
index b9f2b4ba1..d34d6cd18 100644
--- a/kstyles/kthemestyle/kthemestyle.cpp
+++ b/kstyles/kthemestyle/kthemestyle.cpp
@@ -186,8 +186,8 @@ void kDrawWindowsArrow ( TQPainter *p, const TQStyle* style, TQStyle::PrimitiveE
p->save();
if ( down )
{
- p->translate( style->tqpixelMetric( TQStyle::PM_ButtonShiftHorizontal ),
- style->tqpixelMetric( TQStyle::PM_ButtonShiftVertical ) );
+ p->translate( style->pixelMetric( TQStyle::PM_ButtonShiftHorizontal ),
+ style->pixelMetric( TQStyle::PM_ButtonShiftVertical ) );
}
if ( enabled )
@@ -226,8 +226,8 @@ TQSize KThemeStyle::tqsizeFromContents( ContentsType contents,
const TQPushButton * button = ( const TQPushButton* ) widget;
int w = contentSize.width();
int h = contentSize.height();
- int bm = tqpixelMetric( PM_ButtonMargin, widget );
- int fw = tqpixelMetric( PM_DefaultFrameWidth, widget ) * 2;
+ int bm = pixelMetric( PM_ButtonMargin, widget );
+ int fw = pixelMetric( PM_DefaultFrameWidth, widget ) * 2;
w += bm + fw + 6; // ### Add 6 to make way for bold font.
h += bm + fw;
@@ -320,8 +320,8 @@ TQRect KThemeStyle::subRect(SubRect sr, const TQWidget* widget) const
{
TQRect bounding = cb->rect();
- int cw = tqpixelMetric(PM_IndicatorWidth, widget);
- int ch = tqpixelMetric(PM_IndicatorHeight, widget);
+ int cw = pixelMetric(PM_IndicatorWidth, widget);
+ int ch = pixelMetric(PM_IndicatorHeight, widget);
TQRect checkbox(bounding.x() + 2, bounding.y() + 2 + (bounding.height() - ch)/2, cw - 4, ch - 4);
@@ -331,7 +331,7 @@ TQRect KThemeStyle::subRect(SubRect sr, const TQWidget* widget) const
return KStyle::subRect(sr, widget);
}
-int KThemeStyle::tqpixelMetric ( PixelMetric metric, const TQWidget * widget ) const
+int KThemeStyle::pixelMetric ( PixelMetric metric, const TQWidget * widget ) const
{
switch ( metric )
{
@@ -361,26 +361,26 @@ int KThemeStyle::tqpixelMetric ( PixelMetric metric, const TQWidget * widget ) c
if ( isPixmap( ExIndicatorOn ) )
return ( uncached( ExIndicatorOn ) ->size().width() );
else
- return KThemeBase::tqpixelMetric ( metric, widget );
+ return KThemeBase::pixelMetric ( metric, widget );
case PM_ExclusiveIndicatorHeight:
if ( isPixmap( ExIndicatorOn ) )
return ( uncached( ExIndicatorOn ) ->size().height() );
else
- return KThemeBase::tqpixelMetric ( metric, widget );
+ return KThemeBase::pixelMetric ( metric, widget );
case PM_IndicatorWidth:
if ( isPixmap( IndicatorOn ) )
return ( uncached( IndicatorOn ) ->size().width() );
else
- return KThemeBase::tqpixelMetric ( metric, widget );
+ return KThemeBase::pixelMetric ( metric, widget );
case PM_IndicatorHeight:
if ( isPixmap( IndicatorOn ) )
return ( uncached( IndicatorOn ) ->size().height() );
else
- return KThemeBase::tqpixelMetric ( metric, widget );
+ return KThemeBase::pixelMetric ( metric, widget );
case PM_SliderLength:
return ( sliderButtonLength() );
@@ -389,7 +389,7 @@ int KThemeStyle::tqpixelMetric ( PixelMetric metric, const TQWidget * widget ) c
return ( splitWidth() );
default:
- return KThemeBase::tqpixelMetric ( metric, widget );
+ return KThemeBase::pixelMetric ( metric, widget );
}
}
@@ -458,7 +458,7 @@ void KThemeStyle::paletteChanged()
void KThemeStyle::unPolish( TQApplication *app )
{
- app->tqsetPalette( oldPalette, true );
+ app->setPalette( oldPalette, true );
}
bool KThemeStyle::eventFilter( TQObject* object, TQEvent* event )
@@ -470,7 +470,7 @@ bool KThemeStyle::eventFilter( TQObject* object, TQEvent* event )
{
TQWidget *w = TQT_TQWIDGET(object);
TQPoint pos(0, 0);
- pos = w->mapTo(w->tqtopLevelWidget(), pos);
+ pos = w->mapTo(w->topLevelWidget(), pos);
TQPixmap pix(uncached( Background )->size());
TQPainter p;
p.begin(&pix);
@@ -559,12 +559,12 @@ void KThemeStyle::polish( TQWidget *w )
TQPalette newPal( w->palette() );
if ( isColor( MenuItem ) )
{
- newPal.setActive( *tqcolorGroup( newPal.active(), MenuItem ) );
- newPal.setDisabled( *tqcolorGroup( newPal.active(), MenuItem ) );
+ newPal.setActive( *colorGroup( newPal.active(), MenuItem ) );
+ newPal.setDisabled( *colorGroup( newPal.active(), MenuItem ) );
}
if ( isColor( MenuItemDown ) )
{
- newPal.setActive( *tqcolorGroup( newPal.active(), MenuItemDown ) );
+ newPal.setActive( *colorGroup( newPal.active(), MenuItemDown ) );
}
w->setPalette( newPal );
}
@@ -578,11 +578,11 @@ void KThemeStyle::polish( TQWidget *w )
TQPalette newPal( w->palette() );
if ( isColor( IndicatorOff ) )
{
- newPal.setActive( *tqcolorGroup( newPal.active(), IndicatorOff ) );
- newPal.setDisabled( *tqcolorGroup( newPal.active(), IndicatorOff ) );
+ newPal.setActive( *colorGroup( newPal.active(), IndicatorOff ) );
+ newPal.setDisabled( *colorGroup( newPal.active(), IndicatorOff ) );
}
if ( isColor( IndicatorOn ) )
- newPal.setActive( *tqcolorGroup( newPal.active(), IndicatorOn ) );
+ newPal.setActive( *colorGroup( newPal.active(), IndicatorOn ) );
w->setPalette( newPal );
}
}
@@ -593,12 +593,12 @@ void KThemeStyle::polish( TQWidget *w )
TQPalette newPal( w->palette() );
if ( isColor( ExIndicatorOff ) )
{
- newPal.setActive( *tqcolorGroup( newPal.active(), ExIndicatorOff ) );
- newPal.setDisabled( *tqcolorGroup( newPal.active(),
+ newPal.setActive( *colorGroup( newPal.active(), ExIndicatorOff ) );
+ newPal.setDisabled( *colorGroup( newPal.active(),
ExIndicatorOff ) );
}
if ( isColor( ExIndicatorOn ) )
- newPal.setActive( *tqcolorGroup( newPal.active(), ExIndicatorOn ) );
+ newPal.setActive( *colorGroup( newPal.active(), ExIndicatorOn ) );
w->setPalette( newPal );
}
}
@@ -757,7 +757,7 @@ void KThemeStyle::drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQRe
return ;
}
- const TQColorGroup *cg = tqcolorGroup( g, widget );
+ const TQColorGroup *cg = colorGroup( g, widget );
// Standard arrow types
if ( arrowType() == MotifArrow )
{
@@ -791,8 +791,8 @@ void KThemeStyle::drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQRe
p->save();
if ( flags & Style_Down )
- p->translate( tqpixelMetric( PM_ButtonShiftHorizontal ),
- tqpixelMetric( PM_ButtonShiftVertical ) );
+ p->translate( pixelMetric( PM_ButtonShiftHorizontal ),
+ pixelMetric( PM_ButtonShiftVertical ) );
if ( flags & Style_Enabled )
{
@@ -847,7 +847,7 @@ void KThemeStyle::drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQRe
case PE_ButtonBevel:
{
WidgetType type = ( sunken || on || down ) ? BevelDown : Bevel;
- drawBaseButton( p, x, y, w, h, *tqcolorGroup( g, type ), ( sunken || on || down ), false, type );
+ drawBaseButton( p, x, y, w, h, *colorGroup( g, type ), ( sunken || on || down ), false, type );
handled = true;
break;
}
@@ -860,7 +860,7 @@ void KThemeStyle::drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQRe
}
case PE_PanelDockWindow:
{
- drawBaseButton( p, x, y, w, h, *tqcolorGroup( g, ToolBar ), false, false,
+ drawBaseButton( p, x, y, w, h, *colorGroup( g, ToolBar ), false, false,
ToolBar );
handled = true;
break;
@@ -939,7 +939,7 @@ void KThemeStyle::drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQRe
}
case PE_Splitter:
{
- drawBaseButton( p, x, y, w, h, *tqcolorGroup( g, Splitter ), false, false,
+ drawBaseButton( p, x, y, w, h, *colorGroup( g, Splitter ), false, false,
Splitter );
handled = true;
break;
@@ -978,10 +978,10 @@ void KThemeStyle::drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQRe
if ( !isPixmap( widget ) )
{
- p->fillRect( r, tqcolorGroup( g, widget ) ->brush( TQColorGroup::Background ) );
+ p->fillRect( r, colorGroup( g, widget ) ->brush( TQColorGroup::Background ) );
// Do the borders and frame
drawShade( p, r.x(), r.y(), r.width(),
- r.height(), *tqcolorGroup( g, widget ), true, false,
+ r.height(), *colorGroup( g, widget ), true, false,
highlightWidth( widget ), borderWidth( widget ), shade() );
}
else
@@ -992,7 +992,7 @@ void KThemeStyle::drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQRe
*scalePixmap( r.width(), r.height(),
widget ) );
drawShade( p, r.x(), r.y(), r.width(),
- r.height(), *tqcolorGroup( g, widget ), true, false,
+ r.height(), *colorGroup( g, widget ), true, false,
highlightWidth( widget ), borderWidth( widget ), shade() );
}
@@ -1003,12 +1003,12 @@ void KThemeStyle::drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQRe
{
bool horizontal = ( flags & Style_Horizontal );
drawBaseButton( p, r.x(), r.y(), r.width(), r.height(),
- *tqcolorGroup( g, down ? ScrollButtonDown : ScrollButton ),
+ *colorGroup( g, down ? ScrollButtonDown : ScrollButton ),
down, false, down ? ScrollButtonDown : ScrollButton );
tqdrawPrimitive( ( horizontal ) ? PE_ArrowRight : PE_ArrowDown, p ,
TQRect( r.x() + 3, r.y() + 3, r.width() - 6, r.height() - 6 ),
- *tqcolorGroup( g, down ? ScrollButtonDown : ScrollButton ),
+ *colorGroup( g, down ? ScrollButtonDown : ScrollButton ),
flags );
handled = true;
@@ -1018,12 +1018,12 @@ void KThemeStyle::drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQRe
{
bool horizontal = ( flags & Style_Horizontal );
drawBaseButton( p, r.x(), r.y(), r.width(), r.height(),
- *tqcolorGroup( g, down ? ScrollButtonDown : ScrollButton ),
+ *colorGroup( g, down ? ScrollButtonDown : ScrollButton ),
down, false, down ? ScrollButtonDown : ScrollButton );
tqdrawPrimitive( ( horizontal ) ? PE_ArrowLeft : PE_ArrowUp, p ,
TQRect( r.x() + 3, r.y() + 3, r.width() - 6, r.height() - 6 ),
- *tqcolorGroup( g, down ? ScrollButtonDown : ScrollButton ),
+ *colorGroup( g, down ? ScrollButtonDown : ScrollButton ),
flags );
handled = true;
break;
@@ -1039,7 +1039,7 @@ void KThemeStyle::drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQRe
active ? HScrollBarSliderDown : HScrollBarSlider :
active ? VScrollBarSliderDown : VScrollBarSlider;
drawBaseButton( p, r.x()+offsetH, r.y()+offsetV, r.width()-2*offsetH,
- r.height()-2*offsetV, *tqcolorGroup( g, widget ), active, false,
+ r.height()-2*offsetV, *colorGroup( g, widget ), active, false,
widget );
int spaceW = horizontal ? r.width() - decoWidth( widget ) - 4 :
@@ -1087,7 +1087,7 @@ TQPixmap* KThemeStyle::makeMenuBarCache(int w, int h) const
return menuCache;
}
- const TQColorGroup *g = tqcolorGroup( TQApplication::tqpalette().active(), MenuBar);
+ const TQColorGroup *g = colorGroup( TQApplication::tqpalette().active(), MenuBar);
menuCache = new TQPixmap ( w, h );
TQPainter p(menuCache);
@@ -1097,7 +1097,7 @@ TQPixmap* KThemeStyle::makeMenuBarCache(int w, int h) const
}
-void KThemeStyle::tqdrawControl( ControlElement element,
+void KThemeStyle::drawControl( ControlElement element,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -1116,9 +1116,9 @@ void KThemeStyle::tqdrawControl( ControlElement element,
{
const TQPushButton * btn = ( const TQPushButton* ) widget;
bool sunken = btn->isOn() || btn->isDown();
- int diw = tqpixelMetric( PM_ButtonDefaultIndicator, btn );
+ int diw = pixelMetric( PM_ButtonDefaultIndicator, btn );
drawBaseButton( p, diw, diw, w - 2 * diw, h - 2 * diw,
- *tqcolorGroup( btn->tqcolorGroup(), sunken ? PushButtonDown :
+ *colorGroup( btn->colorGroup(), sunken ? PushButtonDown :
PushButton ), sunken, roundButton(),
sunken ? PushButtonDown : PushButton );
// TODO if diw, draw fancy default button indicator
@@ -1135,15 +1135,15 @@ void KThemeStyle::tqdrawControl( ControlElement element,
// Shift button contents if pushed.
if ( active )
{
- x += tqpixelMetric( PM_ButtonShiftHorizontal, widget );
- y += tqpixelMetric( PM_ButtonShiftVertical, widget );
+ x += pixelMetric( PM_ButtonShiftHorizontal, widget );
+ y += pixelMetric( PM_ButtonShiftVertical, widget );
how |= Style_Sunken;
}
// Does the button have a popup menu?
if ( button->isMenuButton() )
{
- int dx = tqpixelMetric( PM_MenuButtonIndicator, widget );
+ int dx = pixelMetric( PM_MenuButtonIndicator, widget );
tqdrawPrimitive( PE_ArrowDown, p, TQRect( x + w - dx - 2, y + 2, dx, h - 4 ),
cg, how, opt );
w -= dx;
@@ -1185,42 +1185,42 @@ void KThemeStyle::tqdrawControl( ControlElement element,
// Text shadow
for ( i = 0; i < 2; i++ )
drawItem( p, TQRect( x + i + 1, y + 1, w, h ), AlignCenter | ShowPrefix,
- button->tqcolorGroup(), button->isEnabled(), NULL,
+ button->colorGroup(), button->isEnabled(), NULL,
button->text(), -1,
- active ? &button->tqcolorGroup().dark() : &button->tqcolorGroup().mid() );
+ active ? &button->colorGroup().dark() : &button->colorGroup().mid() );
// Normal Text
for ( i = 0; i < 2; i++ )
drawItem( p, TQRect( x + i, y, w, h ), AlignCenter | ShowPrefix,
- button->tqcolorGroup(), true, i == 0 ? button->pixmap() : NULL,
+ button->colorGroup(), true, i == 0 ? button->pixmap() : NULL,
button->text(), -1,
- active ? &button->tqcolorGroup().light() : &button->tqcolorGroup().buttonText() );
+ active ? &button->colorGroup().light() : &button->colorGroup().buttonText() );
}
else
{
if ( button->isEnabled() )
{
- drawItem( p, TQRect( x, y, w, h ), AlignCenter | ShowPrefix, button->tqcolorGroup(),
+ drawItem( p, TQRect( x, y, w, h ), AlignCenter | ShowPrefix, button->colorGroup(),
true, button->pixmap(), button->text(), -1,
- active ? &button->tqcolorGroup().light() : &button->tqcolorGroup().buttonText() );
+ active ? &button->colorGroup().light() : &button->colorGroup().buttonText() );
}
else
{
//TODO: Handle reversed
- drawItem( p, TQRect( x + 1, y + 1, w, h ), AlignCenter | ShowPrefix, button->tqcolorGroup(),
+ drawItem( p, TQRect( x + 1, y + 1, w, h ), AlignCenter | ShowPrefix, button->colorGroup(),
true, button->pixmap(), button->text(), -1,
- &button->tqcolorGroup().light() );
+ &button->colorGroup().light() );
- drawItem( p, TQRect( x, y, w, h ), AlignCenter | ShowPrefix, button->tqcolorGroup(),
+ drawItem( p, TQRect( x, y, w, h ), AlignCenter | ShowPrefix, button->colorGroup(),
true, button->pixmap(), button->text(), -1,
- &button->tqcolorGroup().buttonText() );
+ &button->colorGroup().buttonText() );
}
}
// Draw a focus rect if the button has focus
if ( how & Style_HasFocus )
tqdrawPrimitive( PE_FocusRect, p,
- TQStyle::tqvisualRect( subRect( SR_PushButtonFocusRect, widget ), widget ),
+ TQStyle::visualRect( subRect( SR_PushButtonFocusRect, widget ), widget ),
cg, how );
handled = true;
break;
@@ -1242,7 +1242,7 @@ void KThemeStyle::tqdrawControl( ControlElement element,
TQTabBar::Shape tbs = tb->tqshape();
bool selected = how & Style_Selected;
WidgetType widget = selected ? ActiveTab : InactiveTab;
- const TQColorGroup *cg = tqcolorGroup( tb->tqcolorGroup(), widget );
+ const TQColorGroup *cg = colorGroup( tb->colorGroup(), widget );
int i;
int x2 = x + w - 1, y2 = y + h - 1;
int bWidth = borderWidth( widget );
@@ -1398,7 +1398,7 @@ void KThemeStyle::tqdrawControl( ControlElement element,
TQRect pr = mb->rect();
bool active = how & Style_Active;
//bool focused = how & Style_HasFocus;
- const TQColorGroup *g = tqcolorGroup( cg, active ? MenuBarItem : MenuBar );
+ const TQColorGroup *g = colorGroup( cg, active ? MenuBarItem : MenuBar );
TQColor btext = g->buttonText();
TQPixmap* cache = makeMenuBarCache(pr.width(), pr.height());
@@ -1440,10 +1440,10 @@ void KThemeStyle::tqdrawControl( ControlElement element,
bool enabled = (mi? mi->isEnabled():true);
bool checkable = popupmenu->isCheckable();
bool active = how & Style_Active;
- bool etchtext = tqstyleHint( SH_EtchDisabledText, 0 );
+ bool etchtext = styleHint( SH_EtchDisabledText, 0 );
bool reverse = TQApplication::reverseLayout();
- const TQColorGroup& cg_ours = *tqcolorGroup( cg, active ? MenuItemDown : MenuItem );
+ const TQColorGroup& cg_ours = *colorGroup( cg, active ? MenuItemDown : MenuItem );
//TQColor btext = cg_ours.buttonText();
@@ -1465,7 +1465,7 @@ void KThemeStyle::tqdrawControl( ControlElement element,
drawBaseButton( p, x, y, w, h, cg_ours, true, false, MenuItemDown );
else
{
- drawShade( p, x, y, w, h, *tqcolorGroup( cg_ours, MenuItem ), false, false,
+ drawShade( p, x, y, w, h, *colorGroup( cg_ours, MenuItem ), false, false,
highlightWidth( MenuItem ), borderWidth( MenuItem ),
shade() );
int dw = decoWidth( MenuItem );
@@ -1475,7 +1475,7 @@ void KThemeStyle::tqdrawControl( ControlElement element,
x + dw, y + dw, w - dw * 2, h - dw * 2,
cg_ours.brush( TQColorGroup::Background ) );
//cg.brush( TQColorGroup::Background ));
- //tqcolorGroup( cg_ours, MenuItem ) ->brush( TQColorGroup::Background ) );
+ //colorGroup( cg_ours, MenuItem ) ->brush( TQColorGroup::Background ) );
}
else
{
@@ -1493,7 +1493,7 @@ void KThemeStyle::tqdrawControl( ControlElement element,
if ( mi->iconSet() )
{
TQIconSet::Mode mode;
- TQRect cr = tqvisualRect( TQRect( x, y, checkcol, h ), r );
+ TQRect cr = visualRect( TQRect( x, y, checkcol, h ), r );
// Select the correct icon from the iconset
if ( active )
@@ -1504,7 +1504,7 @@ void KThemeStyle::tqdrawControl( ControlElement element,
// Do we have an icon and are checked at the same time?
// Then draw a "pressed" background behind the icon
if ( checkable && mi->isChecked() ) //!active && -- ??
- drawBaseButton( p, cr.x(), cr.y(), cr.width(), cr.height(), *tqcolorGroup( cg_ours, BevelDown ), true, false, BevelDown );
+ drawBaseButton( p, cr.x(), cr.y(), cr.width(), cr.height(), *colorGroup( cg_ours, BevelDown ), true, false, BevelDown );
// Draw the icon
TQPixmap pixmap = mi->iconSet() ->pixmap( TQIconSet::Small, mode );
@@ -1644,7 +1644,7 @@ void KThemeStyle::tqdrawControl( ControlElement element,
{
PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight;
int dim = 10 - itemFrame; //We're not very useful to inherit off, so just hardcode..
- TQRect vr = tqvisualRect( TQRect( x + w - arrowHMargin - itemFrame - dim,
+ TQRect vr = visualRect( TQRect( x + w - arrowHMargin - itemFrame - dim,
y + h / 2 - dim / 2, dim, dim ), r );
// Draw an arrow at the far end of the menu item
@@ -1668,7 +1668,7 @@ void KThemeStyle::tqdrawControl( ControlElement element,
case CE_ProgressBarGroove:
{
TQBrush bg;
- const TQColorGroup * cg2 = tqcolorGroup( cg, ProgressBg );
+ const TQColorGroup * cg2 = colorGroup( cg, ProgressBg );
qDrawWinPanel( p, r, *cg2, true );
bg.setColor( cg2->color( TQColorGroup::Background ) );
if ( isPixmap( ProgressBg ) )
@@ -1715,13 +1715,13 @@ void KThemeStyle::tqdrawControl( ControlElement element,
}
if ( !reverse )
- drawBaseButton( p, x + pstep, y, width, h, *tqcolorGroup( cg, ProgressBar ), false, false, ProgressBar );
+ drawBaseButton( p, x + pstep, y, width, h, *colorGroup( cg, ProgressBar ), false, false, ProgressBar );
else
{
//TODO:Optimize
TQPixmap buf( width, h );
TQPainter p2( &buf );
- drawBaseButton( &p2, 0, 0, width, h, *tqcolorGroup( cg, ProgressBar ), false, false, ProgressBar );
+ drawBaseButton( &p2, 0, 0, width, h, *colorGroup( cg, ProgressBar ), false, false, ProgressBar );
p2.end();
TQPixmap mirroredPix = TQPixmap( TQImage(buf.convertToImage()).mirror( true, false ) );
bitBlt( p->device(), x + w - width - pstep, y, &mirroredPix );
@@ -1736,12 +1736,12 @@ void KThemeStyle::tqdrawControl( ControlElement element,
};
if ( !handled )
- KThemeBase::tqdrawControl( element,
+ KThemeBase::drawControl( element,
p, widget, r, cg, how, opt );
}
-void KThemeStyle::tqdrawControlMask( ControlElement element,
+void KThemeStyle::drawControlMask( ControlElement element,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -1765,7 +1765,7 @@ void KThemeStyle::tqdrawControlMask( ControlElement element,
};
if ( !handled )
- KThemeBase::tqdrawControlMask( element,
+ KThemeBase::drawControlMask( element,
p, widget, r, opt );
}
@@ -1792,12 +1792,12 @@ void KThemeStyle::drawKStylePrimitive( KStylePrimitive kpe,
bool horizontal = slider->orientation() == Qt::Horizontal;
if ( horizontal )
{
- drawBaseButton( p, x, y, w, h, *tqcolorGroup( cg, SliderGroove ), true,
+ drawBaseButton( p, x, y, w, h, *colorGroup( cg, SliderGroove ), true,
false, SliderGroove );
}
else
{
- drawBaseButton( p, x, y, w, h, *tqcolorGroup( cg, RotSliderGroove ), true,
+ drawBaseButton( p, x, y, w, h, *colorGroup( cg, RotSliderGroove ), true,
false, RotSliderGroove );
}
}
@@ -1926,10 +1926,10 @@ void KThemeStyle::drawKStylePrimitive( KStylePrimitive kpe,
case KPE_GeneralHandle:
{
if ( w > h )
- drawBaseButton( p, x, y, w, h, *tqcolorGroup( cg, HBarHandle ), false, false,
+ drawBaseButton( p, x, y, w, h, *colorGroup( cg, HBarHandle ), false, false,
HBarHandle );
else
- drawBaseButton( p, x, y, w, h, *tqcolorGroup( cg, VBarHandle ), false, false,
+ drawBaseButton( p, x, y, w, h, *colorGroup( cg, VBarHandle ), false, false,
VBarHandle );
handled = true;
@@ -1951,7 +1951,7 @@ void KThemeStyle::drawKStylePrimitive( KStylePrimitive kpe,
-void KThemeStyle::tqdrawComplexControl ( TQ_ComplexControl control, TQPainter * p, const TQWidget * widget,
+void KThemeStyle::drawComplexControl ( TQ_ComplexControl control, TQPainter * p, const TQWidget * widget,
const TQRect & r, const TQColorGroup & g, SFlags how ,
SCFlags controls, SCFlags active,
const TQStyleOption & opt ) const
@@ -1978,7 +1978,7 @@ void KThemeStyle::tqdrawComplexControl ( TQ_ComplexControl control, TQPainter *
{
WidgetType widget = ( down || on ) ? ToolButtonDown : ToolButton;
- drawBaseButton( p, button.x(), button.y(), button.width(), button.height(), *tqcolorGroup( g, widget ), down || on, false,
+ drawBaseButton( p, button.x(), button.y(), button.width(), button.height(), *colorGroup( g, widget ), down || on, false,
widget );
// int m = decoWidth( widget );
@@ -2014,7 +2014,7 @@ void KThemeStyle::tqdrawComplexControl ( TQ_ComplexControl control, TQPainter *
bool sunken = ( active == SC_ComboBoxArrow );
//No frame, edit box and button for now?
WidgetType widget = sunken ? ComboBoxDown : ComboBox;
- drawBaseButton( p, x, y, w, h, *tqcolorGroup( g, widget ), sunken,
+ drawBaseButton( p, x, y, w, h, *colorGroup( g, widget ), sunken,
roundComboBox(), widget );
controls ^= SC_ComboBoxFrame;
@@ -2023,7 +2023,7 @@ void KThemeStyle::tqdrawComplexControl ( TQ_ComplexControl control, TQPainter *
if ( controls & SC_ComboBoxArrow )
{
bool sunken = ( active == SC_ComboBoxArrow );
- TQRect ar = TQStyle::tqvisualRect(
+ TQRect ar = TQStyle::visualRect(
querySubControlMetrics( CC_ComboBox, widget, SC_ComboBoxArrow ),
widget );
ar.rect( &x, &y, &w, &h );
@@ -2042,8 +2042,8 @@ void KThemeStyle::tqdrawComplexControl ( TQ_ComplexControl control, TQPainter *
else
{
- mtfstyle->tqdrawPrimitive( PE_ArrowDown, p, TQRect( x, y, w, h ), *tqcolorGroup( g, widget ), sunken ? ( how | Style_Sunken ) : how, opt );
- qDrawShadeRect( p, x, y, w, h, *tqcolorGroup( g, widget ) ); //w-14, y+7+(h-15), 10, 3,
+ mtfstyle->tqdrawPrimitive( PE_ArrowDown, p, TQRect( x, y, w, h ), *colorGroup( g, widget ), sunken ? ( how | Style_Sunken ) : how, opt );
+ qDrawShadeRect( p, x, y, w, h, *colorGroup( g, widget ) ); //w-14, y+7+(h-15), 10, 3,
}
controls ^= SC_ComboBoxArrow;
}
@@ -2116,7 +2116,7 @@ void KThemeStyle::tqdrawComplexControl ( TQ_ComplexControl control, TQPainter *
if ( !handled )
{
- KThemeBase::tqdrawComplexControl ( control, p, widget,
+ KThemeBase::drawComplexControl ( control, p, widget,
r, g, how ,
controls, active,
opt );
@@ -2185,7 +2185,7 @@ void KThemeStyle::drawBaseMask( TQPainter *p, int x, int y, int w, int h,
p->fillRect( x, y, w, h, fillBrush );
}
-int KThemeStyle::tqstyleHint( StyleHint sh, const TQWidget *w, const TQStyleOption &opt, TQStyleHintReturn *shr ) const
+int KThemeStyle::styleHint( StyleHint sh, const TQWidget *w, const TQStyleOption &opt, TQStyleHintReturn *shr ) const
{
switch ( sh )
{
@@ -2207,7 +2207,7 @@ int KThemeStyle::tqstyleHint( StyleHint sh, const TQWidget *w, const TQStyleOpti
return NoBackground;
default:
- return KThemeBase::tqstyleHint( sh, w, opt, shr );
+ return KThemeBase::styleHint( sh, w, opt, shr );
};
}
diff --git a/kstyles/kthemestyle/kthemestyle.h b/kstyles/kthemestyle/kthemestyle.h
index 4fbde91b1..0b7a220f1 100644
--- a/kstyles/kthemestyle/kthemestyle.h
+++ b/kstyles/kthemestyle/kthemestyle.h
@@ -79,13 +79,13 @@ public:
KThemeStyle( const TQString& configDir, const TQString &configFile = TQString::null );
~KThemeStyle();
- virtual int tqpixelMetric ( PixelMetric metric, const TQWidget * widget = 0 ) const;
+ virtual int pixelMetric ( PixelMetric metric, const TQWidget * widget = 0 ) const;
virtual void drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQRect & r, const TQColorGroup & cg,
SFlags flags = Style_Default,
const TQStyleOption& = TQStyleOption::Default ) const;
- virtual void tqdrawControl( ControlElement element,
+ virtual void drawControl( ControlElement element,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -93,14 +93,14 @@ public:
SFlags how = Style_Default,
const TQStyleOption& = TQStyleOption::Default ) const;
- virtual void tqdrawControlMask( ControlElement element,
+ virtual void drawControlMask( ControlElement element,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
const TQStyleOption& = TQStyleOption::Default ) const;
- virtual void tqdrawComplexControl( TQ_ComplexControl control,
+ virtual void drawComplexControl( TQ_ComplexControl control,
TQPainter *p,
const TQWidget* widget,
const TQRect &r,
@@ -119,7 +119,7 @@ public:
const TQStyleOption& = TQStyleOption::Default ) const;
- virtual int tqstyleHint( StyleHint sh,
+ virtual int styleHint( StyleHint sh,
const TQWidget *widget = 0,
const TQStyleOption& = TQStyleOption::Default,
TQStyleHintReturn* returnData = 0 ) const;
diff --git a/kstyles/light/lightstyle-v2.cpp b/kstyles/light/lightstyle-v2.cpp
index bb9373bed..3601fbb68 100644
--- a/kstyles/light/lightstyle-v2.cpp
+++ b/kstyles/light/lightstyle-v2.cpp
@@ -406,7 +406,7 @@ void LightStyleV2::tqdrawPrimitive( TQ_PrimitiveElement pe,
case PE_WindowFrame:
{
int lw = data.isDefault() ?
- tqpixelMetric(PM_DefaultFrameWidth) : data.lineWidth();
+ pixelMetric(PM_DefaultFrameWidth) : data.lineWidth();
if ( ! ( flags & Style_Sunken ) )
flags |= Style_Raised;
@@ -420,7 +420,7 @@ void LightStyleV2::tqdrawPrimitive( TQ_PrimitiveElement pe,
case PE_PanelDockWindow:
{
int lw = data.isDefault() ?
- tqpixelMetric(PM_DockWindowFrameWidth) : data.lineWidth();
+ pixelMetric(PM_DockWindowFrameWidth) : data.lineWidth();
if (lw == 2)
drawLightBevel(p, r, cg, flags | Style_Raised,
@@ -433,7 +433,7 @@ void LightStyleV2::tqdrawPrimitive( TQ_PrimitiveElement pe,
case PE_PanelMenuBar:
{
int lw = data.isDefault() ?
- tqpixelMetric(PM_MenuBarFrameWidth) : data.lineWidth();
+ pixelMetric(PM_MenuBarFrameWidth) : data.lineWidth();
if (lw == 2)
drawLightBevel(p, r, cg, flags, &cg.tqbrush(TQColorGroup::Button));
@@ -616,7 +616,7 @@ void LightStyleV2::tqdrawPrimitive( TQ_PrimitiveElement pe,
}
}
-void LightStyleV2::tqdrawControl( TQ_ControlElement control,
+void LightStyleV2::drawControl( TQ_ControlElement control,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -826,10 +826,10 @@ void LightStyleV2::tqdrawControl( TQ_ControlElement control,
bool reverse = TQApplication::reverseLayout();
if ( reverse ) {
- cr = tqvisualRect( cr, r );
- sr = tqvisualRect( sr, r );
- tr = tqvisualRect( tr, r );
- ir = tqvisualRect( ir, r );
+ cr = visualRect( cr, r );
+ sr = visualRect( sr, r );
+ tr = visualRect( tr, r );
+ ir = visualRect( ir, r );
}
if (mi->isChecked() &&
@@ -969,12 +969,12 @@ void LightStyleV2::tqdrawControl( TQ_ControlElement control,
break;
default:
- TQCommonStyle::tqdrawControl(control, p, widget, r, cg, flags, data);
+ TQCommonStyle::drawControl(control, p, widget, r, cg, flags, data);
break;
}
}
-void LightStyleV2::tqdrawControlMask( TQ_ControlElement control,
+void LightStyleV2::drawControlMask( TQ_ControlElement control,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -986,7 +986,7 @@ void LightStyleV2::tqdrawControlMask( TQ_ControlElement control,
break;
default:
- TQCommonStyle::tqdrawControlMask(control, p, widget, r, data);
+ TQCommonStyle::drawControlMask(control, p, widget, r, data);
break;
}
}
@@ -1001,7 +1001,7 @@ TQRect LightStyleV2::subRect(SubRect subrect, const TQWidget *widget) const
const TQPushButton *button = (const TQPushButton *) widget;
int dbw1 = 0, dbw2 = 0;
if (button->isDefault() || button->autoDefault()) {
- dbw1 = tqpixelMetric(PM_ButtonDefaultIndicator, widget);
+ dbw1 = pixelMetric(PM_ButtonDefaultIndicator, widget);
dbw2 = dbw1 * 2;
}
@@ -1019,7 +1019,7 @@ TQRect LightStyleV2::subRect(SubRect subrect, const TQWidget *widget) const
return rect;
}
-void LightStyleV2::tqdrawComplexControl( TQ_ComplexControl control,
+void LightStyleV2::drawComplexControl( TQ_ComplexControl control,
TQPainter* p,
const TQWidget* widget,
const TQRect& r,
@@ -1035,15 +1035,15 @@ void LightStyleV2::tqdrawComplexControl( TQ_ComplexControl control,
const TQComboBox *combobox = (const TQComboBox *) widget;
TQRect frame, arrow, field;
frame =
- TQStyle::tqvisualRect(querySubControlMetrics(CC_ComboBox, widget,
+ TQStyle::visualRect(querySubControlMetrics(CC_ComboBox, widget,
SC_ComboBoxFrame, data),
widget);
arrow =
- TQStyle::tqvisualRect(querySubControlMetrics(CC_ComboBox, widget,
+ TQStyle::visualRect(querySubControlMetrics(CC_ComboBox, widget,
SC_ComboBoxArrow, data),
widget);
field =
- TQStyle::tqvisualRect(querySubControlMetrics(CC_ComboBox, widget,
+ TQStyle::visualRect(querySubControlMetrics(CC_ComboBox, widget,
SC_ComboBoxEditField, data),
widget);
@@ -1071,7 +1071,7 @@ void LightStyleV2::tqdrawComplexControl( TQ_ComplexControl control,
if (! combobox->editable()) {
p->fillRect( field, cg.tqbrush( TQColorGroup::Highlight ) );
TQRect fr =
- TQStyle::tqvisualRect( subRect( SR_ComboBoxFocusRect, widget ),
+ TQStyle::visualRect( subRect( SR_ComboBoxFocusRect, widget ),
widget );
tqdrawPrimitive( PE_FocusRect, p, fr, cg,
flags | Style_FocusAtBorder,
@@ -1285,19 +1285,19 @@ void LightStyleV2::tqdrawComplexControl( TQ_ComplexControl control,
}
if (controls & SC_SliderTickmarks)
- TQCommonStyle::tqdrawComplexControl(control, p, widget, r, cg, flags,
+ TQCommonStyle::drawComplexControl(control, p, widget, r, cg, flags,
SC_SliderTickmarks, active, data );
break;
}
case CC_ListView:
// use the base style for CC_ListView
- singleton->basestyle->tqdrawComplexControl(control, p, widget, r, cg, flags,
+ singleton->basestyle->drawComplexControl(control, p, widget, r, cg, flags,
controls, active, data);
break;
default:
- TQCommonStyle::tqdrawComplexControl(control, p, widget, r, cg, flags,
+ TQCommonStyle::drawComplexControl(control, p, widget, r, cg, flags,
controls, active, data);
break;
}
@@ -1315,7 +1315,7 @@ TQRect LightStyleV2::querySubControlMetrics( TQ_ComplexControl control,
{
const TQScrollBar *scrollbar = (const TQScrollBar *) widget;
int sliderstart = scrollbar->sliderStart();
- int sbextent = tqpixelMetric(PM_ScrollBarExtent, widget);
+ int sbextent = pixelMetric(PM_ScrollBarExtent, widget);
int maxlen = ((scrollbar->orientation() == Qt::Horizontal) ?
scrollbar->width() : scrollbar->height()) - (sbextent * 3);
int sliderlen;
@@ -1326,7 +1326,7 @@ TQRect LightStyleV2::querySubControlMetrics( TQ_ComplexControl control,
sliderlen = (scrollbar->pageStep() * maxlen) /
(range + scrollbar->pageStep());
- int slidermin = tqpixelMetric( PM_ScrollBarSliderMin, widget );
+ int slidermin = pixelMetric( PM_ScrollBarSliderMin, widget );
if ( sliderlen < slidermin || range > INT_MAX / 2 )
sliderlen = slidermin;
if ( sliderlen > maxlen )
@@ -1413,7 +1413,7 @@ TQStyle::SubControl LightStyleV2::querySubControl( TQ_ComplexControl control,
return ret;
}
-int LightStyleV2::tqpixelMetric( PixelMetric metric,
+int LightStyleV2::pixelMetric( PixelMetric metric,
const TQWidget *widget ) const
{
int ret;
@@ -1468,7 +1468,7 @@ int LightStyleV2::tqpixelMetric( PixelMetric metric,
case PM_SliderLength:
case PM_SliderControlThickness:
- ret = singleton->basestyle->tqpixelMetric( metric, widget );
+ ret = singleton->basestyle->pixelMetric( metric, widget );
break;
case PM_MaximumDragDistance:
@@ -1476,7 +1476,7 @@ int LightStyleV2::tqpixelMetric( PixelMetric metric,
break;
default:
- ret = TQCommonStyle::tqpixelMetric(metric, widget);
+ ret = TQCommonStyle::pixelMetric(metric, widget);
break;
}
@@ -1590,7 +1590,7 @@ TQSize LightStyleV2::tqsizeFromContents( ContentsType contents,
return ret;
}
-int LightStyleV2::tqstyleHint( TQ_StyleHint stylehint,
+int LightStyleV2::styleHint( TQ_StyleHint stylehint,
const TQWidget *widget,
const TQStyleOption &option,
TQStyleHintReturn* returnData ) const
@@ -1615,7 +1615,7 @@ int LightStyleV2::tqstyleHint( TQ_StyleHint stylehint,
break;
default:
- ret = TQCommonStyle::tqstyleHint(stylehint, widget, option, returnData);
+ ret = TQCommonStyle::styleHint(stylehint, widget, option, returnData);
break;
}
diff --git a/kstyles/light/lightstyle-v2.h b/kstyles/light/lightstyle-v2.h
index 9b54e5427..c4be4c0f3 100644
--- a/kstyles/light/lightstyle-v2.h
+++ b/kstyles/light/lightstyle-v2.h
@@ -48,15 +48,15 @@ public:
SFlags = Style_Default,
const TQStyleOption & = TQStyleOption::Default ) const;
- void tqdrawControl(TQ_ControlElement, TQPainter *, const TQWidget *, const TQRect &,
+ void drawControl(TQ_ControlElement, TQPainter *, const TQWidget *, const TQRect &,
const TQColorGroup &, SFlags = Style_Default,
const TQStyleOption & = TQStyleOption::Default ) const;
- void tqdrawControlMask(TQ_ControlElement, TQPainter *, const TQWidget *, const TQRect &,
+ void drawControlMask(TQ_ControlElement, TQPainter *, const TQWidget *, const TQRect &,
const TQStyleOption & = TQStyleOption::Default) const;
TQRect subRect(SubRect, const TQWidget *) const;
- void tqdrawComplexControl(TQ_ComplexControl, TQPainter *, const TQWidget *, const TQRect &,
+ void drawComplexControl(TQ_ComplexControl, TQPainter *, const TQWidget *, const TQRect &,
const TQColorGroup &, SFlags = Style_Default,
SCFlags = SC_All, SCFlags = SC_None,
const TQStyleOption & = TQStyleOption::Default ) const;
@@ -67,12 +67,12 @@ public:
SubControl querySubControl(TQ_ComplexControl, const TQWidget *, const TQPoint &,
const TQStyleOption &data = TQStyleOption::Default ) const;
- int tqpixelMetric(PixelMetric, const TQWidget * = 0 ) const;
+ int pixelMetric(PixelMetric, const TQWidget * = 0 ) const;
TQSize tqsizeFromContents(ContentsType, const TQWidget *, const TQSize &,
const TQStyleOption & = TQStyleOption::Default ) const;
- int tqstyleHint(TQ_StyleHint, const TQWidget * = 0,
+ int styleHint(TQ_StyleHint, const TQWidget * = 0,
const TQStyleOption & = TQStyleOption::Default,
TQStyleHintReturn * = 0 ) const;
diff --git a/kstyles/light/lightstyle-v3.cpp b/kstyles/light/lightstyle-v3.cpp
index 1493322fa..7b5a8135e 100644
--- a/kstyles/light/lightstyle-v3.cpp
+++ b/kstyles/light/lightstyle-v3.cpp
@@ -278,7 +278,7 @@ void LightStyleV3::tqdrawPrimitive( TQ_PrimitiveElement pe,
br.addCoords( 1, 1, -1, -1 );
}
drawLightBevel( p, br, cg, flags,
- tqpixelMetric( PM_DefaultFrameWidth ) + ( etch ? 1 : 0 ),
+ pixelMetric( PM_DefaultFrameWidth ) + ( etch ? 1 : 0 ),
etch, true, fill );
break;
}
@@ -294,7 +294,7 @@ void LightStyleV3::tqdrawPrimitive( TQ_PrimitiveElement pe,
fill = &cg.tqbrush(TQColorGroup::Button);
} else
fill = &cg.tqbrush(TQColorGroup::Background);
- drawLightBevel( p, r, cg, flags, tqpixelMetric( PM_DefaultFrameWidth ),
+ drawLightBevel( p, r, cg, flags, pixelMetric( PM_DefaultFrameWidth ),
false, true, fill );
break;
@@ -532,7 +532,7 @@ void LightStyleV3::tqdrawPrimitive( TQ_PrimitiveElement pe,
case PE_PanelPopup:
drawLightBevel( p, r, cg, flags,
- ( data.isDefault() ? tqpixelMetric(PM_DefaultFrameWidth) :
+ ( data.isDefault() ? pixelMetric(PM_DefaultFrameWidth) :
data.lineWidth() ), false, true );
break;
@@ -545,7 +545,7 @@ void LightStyleV3::tqdrawPrimitive( TQ_PrimitiveElement pe,
int cover = 0;
int reallw = ( data.isDefault() ?
- tqpixelMetric( PM_DefaultFrameWidth ) : data.lineWidth() );
+ pixelMetric( PM_DefaultFrameWidth ) : data.lineWidth() );
cover = reallw - 1;
if ( ! ( flags & Style_Sunken ) )
@@ -573,14 +573,14 @@ void LightStyleV3::tqdrawPrimitive( TQ_PrimitiveElement pe,
case PE_PanelDockWindow:
drawLightBevel( p, r, cg, flags, ( data.isDefault() ?
- tqpixelMetric(PM_DefaultFrameWidth) :
+ pixelMetric(PM_DefaultFrameWidth) :
data.lineWidth() ), false, false,
&cg.tqbrush( TQColorGroup::Button ) );
break;
case PE_PanelMenuBar:
drawLightBevel( p, r, cg, flags, ( data.isDefault() ?
- tqpixelMetric(PM_MenuBarFrameWidth) :
+ pixelMetric(PM_MenuBarFrameWidth) :
data.lineWidth() ), false, false,
&cg.tqbrush( TQColorGroup::Button ) );
break;
@@ -804,7 +804,7 @@ void LightStyleV3::tqdrawPrimitive( TQ_PrimitiveElement pe,
}
}
-void LightStyleV3::tqdrawControl( TQ_ControlElement control,
+void LightStyleV3::drawControl( TQ_ControlElement control,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -893,7 +893,7 @@ void LightStyleV3::tqdrawControl( TQ_ControlElement control,
p->fillRect( br, cg.background() );
} else
- TQCommonStyle::tqdrawControl( control, p, widget, r, cg, flags, data );
+ TQCommonStyle::drawControl( control, p, widget, r, cg, flags, data );
break;
}
@@ -946,10 +946,10 @@ void LightStyleV3::tqdrawControl( TQ_ControlElement control,
bool reverse = TQApplication::reverseLayout();
if ( reverse ) {
- cr = tqvisualRect( cr, r );
- sr = tqvisualRect( sr, r );
- tr = tqvisualRect( tr, r );
- ir = tqvisualRect( ir, r );
+ cr = visualRect( cr, r );
+ sr = visualRect( sr, r );
+ tr = visualRect( tr, r );
+ ir = visualRect( ir, r );
}
if (mi->isChecked() &&
@@ -1079,17 +1079,17 @@ void LightStyleV3::tqdrawControl( TQ_ControlElement control,
}
case CE_ProgressBarGroove:
- drawLightBevel( p, r, cg, Style_Sunken, tqpixelMetric( PM_DefaultFrameWidth ),
+ drawLightBevel( p, r, cg, Style_Sunken, pixelMetric( PM_DefaultFrameWidth ),
true, true, &cg.tqbrush( TQColorGroup::Background ) );
break;
default:
- TQCommonStyle::tqdrawControl(control, p, widget, r, cg, flags, data);
+ TQCommonStyle::drawControl(control, p, widget, r, cg, flags, data);
break;
}
}
-void LightStyleV3::tqdrawControlMask( TQ_ControlElement control,
+void LightStyleV3::drawControlMask( TQ_ControlElement control,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -1101,7 +1101,7 @@ void LightStyleV3::tqdrawControlMask( TQ_ControlElement control,
break;
default:
- TQCommonStyle::tqdrawControlMask(control, p, widget, r, data);
+ TQCommonStyle::drawControlMask(control, p, widget, r, data);
break;
}
}
@@ -1114,7 +1114,7 @@ TQRect LightStyleV3::subRect(SubRect subrect, const TQWidget *widget) const
case SR_PushButtonFocusRect:
{
rect = TQCommonStyle::subRect( SR_PushButtonContents, widget );
- int bm = tqpixelMetric( PM_ButtonMargin, widget ), hbm = bm / 2;
+ int bm = pixelMetric( PM_ButtonMargin, widget ), hbm = bm / 2;
rect.addCoords( hbm, hbm, -hbm, -hbm );
break;
}
@@ -1151,7 +1151,7 @@ TQRect LightStyleV3::subRect(SubRect subrect, const TQWidget *widget) const
return rect;
}
-void LightStyleV3::tqdrawComplexControl( TQ_ComplexControl control,
+void LightStyleV3::drawComplexControl( TQ_ComplexControl control,
TQPainter* p,
const TQWidget* widget,
const TQRect& r,
@@ -1167,15 +1167,15 @@ void LightStyleV3::tqdrawComplexControl( TQ_ComplexControl control,
const TQComboBox *combobox = (const TQComboBox *) widget;
TQRect frame, arrow, field;
frame =
- TQStyle::tqvisualRect(querySubControlMetrics(CC_ComboBox, widget,
+ TQStyle::visualRect(querySubControlMetrics(CC_ComboBox, widget,
SC_ComboBoxFrame, data),
widget);
arrow =
- TQStyle::tqvisualRect(querySubControlMetrics(CC_ComboBox, widget,
+ TQStyle::visualRect(querySubControlMetrics(CC_ComboBox, widget,
SC_ComboBoxArrow, data),
widget);
field =
- TQStyle::tqvisualRect(querySubControlMetrics(CC_ComboBox, widget,
+ TQStyle::visualRect(querySubControlMetrics(CC_ComboBox, widget,
SC_ComboBoxEditField, data),
widget);
@@ -1194,7 +1194,7 @@ void LightStyleV3::tqdrawComplexControl( TQ_ComplexControl control,
if (flags & Style_HasFocus) {
if (! combobox->editable()) {
TQRect fr =
- TQStyle::tqvisualRect( subRect( SR_ComboBoxFocusRect, widget ),
+ TQStyle::visualRect( subRect( SR_ComboBoxFocusRect, widget ),
widget );
p->fillRect( fr, cg.tqbrush( TQColorGroup::Highlight ) );
tqdrawPrimitive( PE_FocusRect, p, fr, cg,
@@ -1409,19 +1409,19 @@ void LightStyleV3::tqdrawComplexControl( TQ_ComplexControl control,
}
if (controls & SC_SliderTickmarks)
- TQCommonStyle::tqdrawComplexControl(control, p, widget, r, cg, flags,
+ TQCommonStyle::drawComplexControl(control, p, widget, r, cg, flags,
SC_SliderTickmarks, active, data );
break;
}
case CC_ListView:
// use the base style for CC_ListView
- basestyle->tqdrawComplexControl(control, p, widget, r, cg, flags,
+ basestyle->drawComplexControl(control, p, widget, r, cg, flags,
controls, active, data);
break;
default:
- TQCommonStyle::tqdrawComplexControl(control, p, widget, r, cg, flags,
+ TQCommonStyle::drawComplexControl(control, p, widget, r, cg, flags,
controls, active, data);
break;
}
@@ -1437,8 +1437,8 @@ TQRect LightStyleV3::querySubControlMetrics( TQ_ComplexControl control,
switch (control) {
case CC_ComboBox:
{
- int fw = tqpixelMetric( PM_DefaultFrameWidth, widget );
- int sb = tqpixelMetric( PM_ScrollBarExtent ); // width of the arrow
+ int fw = pixelMetric( PM_DefaultFrameWidth, widget );
+ int sb = pixelMetric( PM_ScrollBarExtent ); // width of the arrow
switch ( sc ) {
case SC_ComboBoxFrame:
@@ -1463,7 +1463,7 @@ TQRect LightStyleV3::querySubControlMetrics( TQ_ComplexControl control,
{
const TQScrollBar *scrollbar = (const TQScrollBar *) widget;
int sliderstart = scrollbar->sliderStart();
- int sbextent = tqpixelMetric(PM_ScrollBarExtent, widget);
+ int sbextent = pixelMetric(PM_ScrollBarExtent, widget);
int maxlen = ((scrollbar->orientation() == Qt::Horizontal) ?
scrollbar->width() : scrollbar->height()) - (sbextent * 3);
int sliderlen;
@@ -1474,7 +1474,7 @@ TQRect LightStyleV3::querySubControlMetrics( TQ_ComplexControl control,
sliderlen = (scrollbar->pageStep() * maxlen) /
(range + scrollbar->pageStep());
- int slidermin = tqpixelMetric( PM_ScrollBarSliderMin, widget );
+ int slidermin = pixelMetric( PM_ScrollBarSliderMin, widget );
if ( sliderlen < slidermin || range > INT_MAX / 2 )
sliderlen = slidermin;
if ( sliderlen > maxlen )
@@ -1538,8 +1538,8 @@ TQRect LightStyleV3::querySubControlMetrics( TQ_ComplexControl control,
case CC_Slider:
{
const TQSlider *slider = (const TQSlider *) widget;
- int tickOffset = tqpixelMetric( PM_SliderTickmarkOffset, widget );
- int thickness = tqpixelMetric( PM_SliderControlThickness, widget );
+ int tickOffset = pixelMetric( PM_SliderTickmarkOffset, widget );
+ int thickness = pixelMetric( PM_SliderControlThickness, widget );
switch ( sc ) {
case SC_SliderGroove:
@@ -1552,7 +1552,7 @@ TQRect LightStyleV3::querySubControlMetrics( TQ_ComplexControl control,
case SC_SliderHandle:
{
int pos = slider->sliderStart();
- int len = tqpixelMetric( PM_SliderLength, widget );
+ int len = pixelMetric( PM_SliderLength, widget );
if ( slider->orientation() == Qt::Horizontal )
ret.setRect( pos + 2, tickOffset + 2, len - 4, thickness - 4 );
@@ -1594,7 +1594,7 @@ TQStyle::SubControl LightStyleV3::querySubControl( TQ_ComplexControl control,
return ret;
}
-int LightStyleV3::tqpixelMetric( PixelMetric metric,
+int LightStyleV3::pixelMetric( PixelMetric metric,
const TQWidget *widget ) const
{
int ret;
@@ -1691,7 +1691,7 @@ int LightStyleV3::tqpixelMetric( PixelMetric metric,
break;
default:
- ret = TQCommonStyle::tqpixelMetric(metric, widget);
+ ret = TQCommonStyle::pixelMetric(metric, widget);
break;
}
@@ -1708,8 +1708,8 @@ TQSize LightStyleV3::tqsizeFromContents( ContentsType contents,
switch (contents) {
case CT_ComboBox:
{
- int fw = tqpixelMetric( PM_DefaultFrameWidth, widget ) * 2;
- int sb = tqpixelMetric( PM_ScrollBarExtent ); // width of the arrow
+ int fw = pixelMetric( PM_DefaultFrameWidth, widget ) * 2;
+ int sb = pixelMetric( PM_ScrollBarExtent ); // width of the arrow
int w = contentsSize.width();
int h = contentsSize.height();
@@ -1729,7 +1729,7 @@ TQSize LightStyleV3::tqsizeFromContents( ContentsType contents,
const TQPushButton *button = (const TQPushButton *) widget;
ret = TQCommonStyle::tqsizeFromContents( contents, widget, contentsSize, data );
int w = ret.width(), h = ret.height();
- int dbi = tqpixelMetric( PM_ButtonDefaultIndicator, widget ) * 2;
+ int dbi = pixelMetric( PM_ButtonDefaultIndicator, widget ) * 2;
int mw = 80 - dbi, mh = 25 - dbi;
// only expand the button if we are displaying text...
@@ -1818,7 +1818,7 @@ TQSize LightStyleV3::tqsizeFromContents( ContentsType contents,
return ret;
}
-int LightStyleV3::tqstyleHint( TQ_StyleHint stylehint,
+int LightStyleV3::styleHint( TQ_StyleHint stylehint,
const TQWidget *widget,
const TQStyleOption &option,
TQStyleHintReturn* returnData ) const
@@ -1847,7 +1847,7 @@ int LightStyleV3::tqstyleHint( TQ_StyleHint stylehint,
break;
default:
- ret = TQCommonStyle::tqstyleHint(stylehint, widget, option, returnData);
+ ret = TQCommonStyle::styleHint(stylehint, widget, option, returnData);
break;
}
diff --git a/kstyles/light/lightstyle-v3.h b/kstyles/light/lightstyle-v3.h
index a76279bfa..a07bf6e53 100644
--- a/kstyles/light/lightstyle-v3.h
+++ b/kstyles/light/lightstyle-v3.h
@@ -52,15 +52,15 @@ public:
SFlags = Style_Default,
const TQStyleOption & = TQStyleOption::Default ) const;
- void tqdrawControl(TQ_ControlElement, TQPainter *, const TQWidget *, const TQRect &,
+ void drawControl(TQ_ControlElement, TQPainter *, const TQWidget *, const TQRect &,
const TQColorGroup &, SFlags = Style_Default,
const TQStyleOption & = TQStyleOption::Default ) const;
- void tqdrawControlMask(TQ_ControlElement, TQPainter *, const TQWidget *, const TQRect &,
+ void drawControlMask(TQ_ControlElement, TQPainter *, const TQWidget *, const TQRect &,
const TQStyleOption & = TQStyleOption::Default) const;
TQRect subRect(SubRect, const TQWidget *) const;
- void tqdrawComplexControl(TQ_ComplexControl, TQPainter *, const TQWidget *, const TQRect &,
+ void drawComplexControl(TQ_ComplexControl, TQPainter *, const TQWidget *, const TQRect &,
const TQColorGroup &, SFlags = Style_Default,
SCFlags = SC_All, SCFlags = SC_None,
const TQStyleOption & = TQStyleOption::Default ) const;
@@ -71,12 +71,12 @@ public:
SubControl querySubControl(TQ_ComplexControl, const TQWidget *, const TQPoint &,
const TQStyleOption &data = TQStyleOption::Default ) const;
- int tqpixelMetric(PixelMetric, const TQWidget * = 0 ) const;
+ int pixelMetric(PixelMetric, const TQWidget * = 0 ) const;
TQSize tqsizeFromContents(ContentsType, const TQWidget *, const TQSize &,
const TQStyleOption & = TQStyleOption::Default ) const;
- int tqstyleHint(TQ_StyleHint, const TQWidget * = 0,
+ int styleHint(TQ_StyleHint, const TQWidget * = 0,
const TQStyleOption & = TQStyleOption::Default,
TQStyleHintReturn * = 0 ) const;
diff --git a/kstyles/plastik/plastik.cpp b/kstyles/plastik/plastik.cpp
index d935a0ee5..c41400390 100644
--- a/kstyles/plastik/plastik.cpp
+++ b/kstyles/plastik/plastik.cpp
@@ -893,13 +893,13 @@ void PlastikStyle::renderPanel(TQPainter *p,
p->setPen(g.background().dark());
p->drawConvexPolygon(TQPointArray(4, corners));
p->setPen(g.background().light());
- p->tqdrawPolyline(TQPointArray(4, corners), 0, 3);
+ p->drawPolyline(TQPointArray(4, corners), 0, 3);
} else {
const TQCOORD corners[] = { x, y2, x, y, x2, y, x2, y2 };
p->setPen(g.background().dark());
p->drawPolygon(TQPointArray(4, corners));
p->setPen(g.background().light());
- p->tqdrawPolyline(TQPointArray(4, corners), 0, 3);
+ p->drawPolyline(TQPointArray(4, corners), 0, 3);
}
} else {
renderContour(p, r, g.background(), getColor(g, PanelContour) );
@@ -2095,11 +2095,11 @@ void PlastikStyle::tqdrawPrimitive(TQ_PrimitiveElement pe,
}
}
- const TQWMatrix oldMatrix( p->tqworldMatrix() );
+ const TQWMatrix oldMatrix( p->worldMatrix() );
if (flags & Style_Down) {
- p->translate(tqpixelMetric(PM_ButtonShiftHorizontal),
- tqpixelMetric(PM_ButtonShiftVertical));
+ p->translate(pixelMetric(PM_ButtonShiftHorizontal),
+ pixelMetric(PM_ButtonShiftVertical));
}
a.translate((r.x()+r.width()/2), (r.y()+r.height()/2));
@@ -2139,7 +2139,7 @@ void PlastikStyle::tqdrawPrimitive(TQ_PrimitiveElement pe,
}
-void PlastikStyle::tqdrawControl(TQ_ControlElement element,
+void PlastikStyle::drawControl(TQ_ControlElement element,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -2337,7 +2337,7 @@ void PlastikStyle::tqdrawControl(TQ_ControlElement element,
renderTab(p, r, cg, mouseOver, selected, true, pos, false, cornerWidget);
break;
default:
- KStyle::tqdrawControl(element, p, widget, r, cg, flags, opt);
+ KStyle::drawControl(element, p, widget, r, cg, flags, opt);
}
break;
@@ -2380,15 +2380,15 @@ void PlastikStyle::tqdrawControl(TQ_ControlElement element,
// Shift button contents if pushed.
if ( active )
{
- x += tqpixelMetric(PM_ButtonShiftHorizontal, widget);
- y += tqpixelMetric(PM_ButtonShiftVertical, widget);
+ x += pixelMetric(PM_ButtonShiftHorizontal, widget);
+ y += pixelMetric(PM_ButtonShiftVertical, widget);
flags |= Style_Sunken;
}
// Does the button have a popup menu?
if ( button->isMenuButton() )
{
- int dx = tqpixelMetric( PM_MenuButtonIndicator, widget );
+ int dx = pixelMetric( PM_MenuButtonIndicator, widget );
if ( button->iconSet() && !button->iconSet()->isNull() &&
(dx + button->iconSet()->pixmap (TQIconSet::Small, TQIconSet::Normal, TQIconSet::Off ).width()) >= w )
{
@@ -2397,7 +2397,7 @@ void PlastikStyle::tqdrawControl(TQ_ControlElement element,
else
{
p->setPen(cg.buttonText());
- tqdrawPrimitive( PE_ArrowDown, p, tqvisualRect( TQRect(x + w - dx - 8, y + 2, dx, h - 4), r ),
+ tqdrawPrimitive( PE_ArrowDown, p, visualRect( TQRect(x + w - dx - 8, y + 2, dx, h - 4), r ),
cg, flags, opt );
w -= dx;
}
@@ -2423,7 +2423,7 @@ void PlastikStyle::tqdrawControl(TQ_ControlElement element,
p->drawPixmap( x + 4, y + h / 2 - pixmap.height() / 2, pixmap );
if (cornArrow) //Draw over the icon
- tqdrawPrimitive( PE_ArrowDown, p, tqvisualRect( TQRect(x + w - 6, x + h - 6, 7, 7), r ),
+ tqdrawPrimitive( PE_ArrowDown, p, visualRect( TQRect(x + w - 6, x + h - 6, 7, 7), r ),
cg, flags, opt );
@@ -2433,14 +2433,14 @@ void PlastikStyle::tqdrawControl(TQ_ControlElement element,
}
// Make the label indicate if the button is a default button or not
- drawItem( p, TQRect(x, y, w, h), AlignCenter|ShowPrefix, button->tqcolorGroup(),
+ drawItem( p, TQRect(x, y, w, h), AlignCenter|ShowPrefix, button->colorGroup(),
button->isEnabled(), button->pixmap(), button->text(), -1,
- &button->tqcolorGroup().buttonText() );
+ &button->colorGroup().buttonText() );
if ( flags & Style_HasFocus )
tqdrawPrimitive( PE_FocusRect, p,
- tqvisualRect( subRect( SR_PushButtonFocusRect, widget ), widget ),
+ visualRect( subRect( SR_PushButtonFocusRect, widget ), widget ),
cg, flags );
break;
}
@@ -2490,7 +2490,7 @@ void PlastikStyle::tqdrawControl(TQ_ControlElement element,
bool enabled = mi->isEnabled();
bool checkable = popupmenu->isCheckable();
bool active = flags & Style_Active;
- bool etchtext = tqstyleHint( SH_EtchDisabledText );
+ bool etchtext = styleHint( SH_EtchDisabledText );
bool reverse = TQApplication::reverseLayout();
if ( checkable )
checkcol = QMAX( checkcol, 20 );
@@ -2525,7 +2525,7 @@ void PlastikStyle::tqdrawControl(TQ_ControlElement element,
break;
}
- TQRect cr = tqvisualRect( TQRect( r.x() + 2, r.y() + 2, checkcol - 1, r.height() - 4 ), r );
+ TQRect cr = visualRect( TQRect( r.x() + 2, r.y() + 2, checkcol - 1, r.height() - 4 ), r );
// Do we have an icon?
if ( mi->iconSet() )
{
@@ -2669,8 +2669,8 @@ void PlastikStyle::tqdrawControl(TQ_ControlElement element,
// Does the menu item have a submenu?
if ( mi->popup() ) {
TQ_PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight;
- int dim = tqpixelMetric(PM_MenuButtonIndicator) - 1;
- TQRect vr = tqvisualRect( TQRect( r.x() + r.width() - 5 - 1 - dim,
+ int dim = pixelMetric(PM_MenuButtonIndicator) - 1;
+ TQRect vr = visualRect( TQRect( r.x() + r.width() - 5 - 1 - dim,
r.y() + r.height() / 2 - dim / 2, dim, dim), r );
// Draw an arrow at the far end of the menu item
@@ -2706,11 +2706,11 @@ void PlastikStyle::tqdrawControl(TQ_ControlElement element,
break;
default:
- KStyle::tqdrawControl(element, p, widget, r, cg, flags, opt);
+ KStyle::drawControl(element, p, widget, r, cg, flags, opt);
}
}
-void PlastikStyle::tqdrawControlMask(TQ_ControlElement element,
+void PlastikStyle::drawControlMask(TQ_ControlElement element,
TQPainter *p,
const TQWidget *w,
const TQRect &r,
@@ -2725,12 +2725,12 @@ void PlastikStyle::tqdrawControlMask(TQ_ControlElement element,
}
default: {
- KStyle::tqdrawControlMask (element, p, w, r, opt);
+ KStyle::drawControlMask (element, p, w, r, opt);
}
}
}
-void PlastikStyle::tqdrawComplexControlMask(TQ_ComplexControl c,
+void PlastikStyle::drawComplexControlMask(TQ_ComplexControl c,
TQPainter *p,
const TQWidget *w,
const TQRect &r,
@@ -2746,12 +2746,12 @@ void PlastikStyle::tqdrawComplexControlMask(TQ_ComplexControl c,
break;
}
default: {
- KStyle::tqdrawComplexControlMask (c, p, w, r, o);
+ KStyle::drawComplexControlMask (c, p, w, r, o);
}
}
}
-void PlastikStyle::tqdrawComplexControl(TQ_ComplexControl control,
+void PlastikStyle::drawComplexControl(TQ_ComplexControl control,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -3141,7 +3141,7 @@ void PlastikStyle::tqdrawComplexControl(TQ_ComplexControl control,
}
default:
- KStyle::tqdrawComplexControl(control, p, widget,
+ KStyle::drawComplexControl(control, p, widget,
r, cg, flags, controls,
active, opt);
break;
@@ -3246,7 +3246,7 @@ TQRect PlastikStyle::querySubControlMetrics(TQ_ComplexControl control,
}
}
-int PlastikStyle::tqpixelMetric(PixelMetric m, const TQWidget *widget) const
+int PlastikStyle::pixelMetric(PixelMetric m, const TQWidget *widget) const
{
switch(m) {
// TABS
@@ -3343,7 +3343,7 @@ int PlastikStyle::tqpixelMetric(PixelMetric m, const TQWidget *widget) const
}
default:
- return KStyle::tqpixelMetric(m, widget);
+ return KStyle::pixelMetric(m, widget);
}
}
@@ -3412,8 +3412,8 @@ TQSize PlastikStyle::tqsizeFromContents(ContentsType t,
{
const TQPushButton* btn = static_cast<const TQPushButton*>(widget);
- int w = s.width() + 2 * tqpixelMetric(PM_ButtonMargin, widget);
- int h = s.height() + 2 * tqpixelMetric(PM_ButtonMargin, widget);
+ int w = s.width() + 2 * pixelMetric(PM_ButtonMargin, widget);
+ int h = s.height() + 2 * pixelMetric(PM_ButtonMargin, widget);
if ( btn->text().isEmpty() && s.width() < 32 ) return TQSize(w, h);
return TQSize( w+25, h+5 );
@@ -3434,7 +3434,7 @@ TQSize PlastikStyle::tqsizeFromContents(ContentsType t,
return KStyle::tqsizeFromContents (t, widget, s, opt);
}
-int PlastikStyle::tqstyleHint( TQ_StyleHint stylehint,
+int PlastikStyle::styleHint( TQ_StyleHint stylehint,
const TQWidget *widget,
const TQStyleOption &option,
TQStyleHintReturn* returnData ) const
@@ -3444,7 +3444,7 @@ int PlastikStyle::tqstyleHint( TQ_StyleHint stylehint,
return 96; // Motif-like delay...
default:
- return KStyle::tqstyleHint(stylehint, widget, option, returnData);
+ return KStyle::styleHint(stylehint, widget, option, returnData);
}
}
diff --git a/kstyles/plastik/plastik.h b/kstyles/plastik/plastik.h
index 6fa325db9..fbac34232 100644
--- a/kstyles/plastik/plastik.h
+++ b/kstyles/plastik/plastik.h
@@ -81,7 +81,7 @@ public:
SFlags flags = Style_Default,
const TQStyleOption &opt = TQStyleOption::Default ) const;
- void tqdrawControl(TQ_ControlElement element,
+ void drawControl(TQ_ControlElement element,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -89,9 +89,9 @@ public:
SFlags flags = Style_Default,
const TQStyleOption& = TQStyleOption::Default ) const;
- void tqdrawControlMask( TQ_ControlElement, TQPainter *, const TQWidget *, const TQRect &, const TQStyleOption &) const;
+ void drawControlMask( TQ_ControlElement, TQPainter *, const TQWidget *, const TQRect &, const TQStyleOption &) const;
- void tqdrawComplexControl(TQ_ComplexControl control,
+ void drawComplexControl(TQ_ComplexControl control,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -101,7 +101,7 @@ public:
SCFlags active = SC_None,
const TQStyleOption& = TQStyleOption::Default ) const;
- int tqpixelMetric(PixelMetric m,
+ int pixelMetric(PixelMetric m,
const TQWidget *widget = 0 ) const;
TQRect subRect(SubRect r,
@@ -112,7 +112,7 @@ public:
SubControl subcontrol,
const TQStyleOption &opt = TQStyleOption::Default ) const;
- void tqdrawComplexControlMask(TQStyle::TQ_ComplexControl c,
+ void drawComplexControlMask(TQStyle::TQ_ComplexControl c,
TQPainter *p,
const TQWidget *w,
const TQRect &r,
@@ -123,7 +123,7 @@ public:
const TQSize &s,
const TQStyleOption &o) const;
- int tqstyleHint(TQ_StyleHint, const TQWidget * = 0,
+ int styleHint(TQ_StyleHint, const TQWidget * = 0,
const TQStyleOption & = TQStyleOption::Default,
TQStyleHintReturn * = 0 ) const;
diff --git a/kstyles/web/webstyle.cpp b/kstyles/web/webstyle.cpp
index f1416526e..b9eff2f7b 100644
--- a/kstyles/web/webstyle.cpp
+++ b/kstyles/web/webstyle.cpp
@@ -92,7 +92,7 @@ scrollBarControlsMetrics
int extent = horizontal ? sb->height() : sb->width();
- TQColorGroup g = sb->tqcolorGroup();
+ TQColorGroup g = sb->colorGroup();
if (sliderStart > sliderMax)
sliderStart = sliderMax;
@@ -371,14 +371,14 @@ WebStyle::drawPushButton(TQPushButton * b, TQPainter * p)
bool sunken(b->isDown() || b->isOn());
bool hl(_highlightedButton == b);
- TQColor bg(b->tqcolorGroup().button());
+ TQColor bg(b->colorGroup().button());
p->save();
- p->fillRect(b->rect(), b->tqcolorGroup().brush(TQColorGroup::Background));
+ p->fillRect(b->rect(), b->colorGroup().brush(TQColorGroup::Background));
if (b->isDefault())
{
- TQColor c(hl ? b->tqcolorGroup().highlight() : b->tqcolorGroup().mid());
+ TQColor c(hl ? b->colorGroup().highlight() : b->colorGroup().mid());
p->setPen(contrastingForeground(c, bg));
@@ -391,26 +391,26 @@ WebStyle::drawPushButton(TQPushButton * b, TQPainter * p)
4,
b->width() - 8,
b->height() - 8,
- b->tqcolorGroup().brush(TQColorGroup::Button)
+ b->colorGroup().brush(TQColorGroup::Button)
);
if (b->isEnabled())
{
if (sunken)
{
- p->setPen(contrastingForeground(b->tqcolorGroup().light(), bg));
+ p->setPen(contrastingForeground(b->colorGroup().light(), bg));
}
else
{
if (hl)
- p->setPen(contrastingForeground(b->tqcolorGroup().highlight(), bg));
+ p->setPen(contrastingForeground(b->colorGroup().highlight(), bg));
else
- p->setPen(contrastingForeground(b->tqcolorGroup().mid(), bg));
+ p->setPen(contrastingForeground(b->colorGroup().mid(), bg));
}
}
else
{
- p->setPen(b->tqcolorGroup().button());
+ p->setPen(b->colorGroup().button());
}
drawFunkyRect(p, 3, 3, b->width() - 6, b->height() - 6, true);
@@ -459,7 +459,7 @@ WebStyle::drawScrollBarControls
rSlider
);
- TQColorGroup g(sb->tqcolorGroup());
+ TQColorGroup g(sb->colorGroup());
if (controls & AddLine && rAdd.isValid())
{
@@ -1450,7 +1450,7 @@ WebStyle::drawTab
{
TQRect r(tab->rect());
- TQColorGroup g(tabBar->tqcolorGroup());
+ TQColorGroup g(tabBar->colorGroup());
p->save();
diff --git a/kunittest/module.h b/kunittest/module.h
index 4213ddcf0..7f4b24789 100644
--- a/kunittest/module.h
+++ b/kunittest/module.h
@@ -48,7 +48,7 @@ namespace KUnitTest
* @code KUNITTEST_MODULE(kunittest_samplemodule,"TestSuite") @endcode
*/
#define KUNITTEST_MODULE(library,suite) \
- static const TQString s_kunittest_suite = TQString::tqfromLatin1(suite); \
+ static const TQString s_kunittest_suite = TQString::fromLatin1(suite); \
class library##Module : public TQObject \
{ \
public: \
@@ -93,7 +93,7 @@ namespace KUnitTest
tester##ModuleAutoregister() \
{ \
KUnitTest::Tester *test = new tester(); \
- TQString name = s_kunittest_suite + TQString::tqfromLatin1("::") + TQString::fromLocal8Bit(#tester); \
+ TQString name = s_kunittest_suite + TQString::fromLatin1("::") + TQString::fromLocal8Bit(#tester); \
test->setName(name.local8Bit()); \
kunittest_registerModuleTester(name.local8Bit(), test ); \
} \
diff --git a/kunittest/tester.cpp b/kunittest/tester.cpp
index 55f9d541d..11a24e653 100644
--- a/kunittest/tester.cpp
+++ b/kunittest/tester.cpp
@@ -48,7 +48,7 @@ namespace KUnitTest
void SlotTester::allTests()
{
- TQStrList allSlots = tqmetaObject()->slotNames();
+ TQStrList allSlots = metaObject()->slotNames();
if ( allSlots.contains("setUp()") > 0 ) invokeMember("setUp()");
diff --git a/kunittest/tester.h b/kunittest/tester.h
index 278f0d18d..061f319b3 100644
--- a/kunittest/tester.h
+++ b/kunittest/tester.h
@@ -359,7 +359,7 @@ using namespace std;
*
* @code SKIP("Test skipped because of lack of foo support."); @endcode
*/
-#define SKIP( x ) skip( __FILE__, __LINE__, TQString::tqfromLatin1(#x))
+#define SKIP( x ) skip( __FILE__, __LINE__, TQString::fromLatin1(#x))
/*!
* A macro testing that @p expression throws an exception that is catched
diff --git a/kutils/kcmoduleproxy.cpp b/kutils/kcmoduleproxy.cpp
index b9f297d6e..ac51acb40 100644
--- a/kutils/kcmoduleproxy.cpp
+++ b/kutils/kcmoduleproxy.cpp
@@ -311,7 +311,7 @@ void KCModuleProxy::runAsRoot()
TQPalette pal( red );
pal.setColor( TQColorGroup::Background,
- tqcolorGroup().background() );
+ colorGroup().background() );
d->embedFrame->setPalette( pal );
d->embedFrame->setLineWidth( 2 );
d->embedFrame->setMidLineWidth( 2 );
diff --git a/kutils/kmultitabbar.cpp b/kutils/kmultitabbar.cpp
index 9c47e87e8..ffd237846 100644
--- a/kutils/kmultitabbar.cpp
+++ b/kutils/kmultitabbar.cpp
@@ -120,9 +120,9 @@ void KMultiTabBarInternal::drawContents ( TQPainter * paint, int clipx, int clip
if (m_position==KMultiTabBar::Right)
{
- paint->setPen(tqcolorGroup().shadow());
+ paint->setPen(colorGroup().shadow());
paint->drawLine(0,0,0,viewport()->height());
- paint->setPen(tqcolorGroup().background().dark(120));
+ paint->setPen(colorGroup().background().dark(120));
paint->drawLine(1,0,1,viewport()->height());
@@ -130,28 +130,28 @@ void KMultiTabBarInternal::drawContents ( TQPainter * paint, int clipx, int clip
else
if (m_position==KMultiTabBar::Left)
{
- paint->setPen(tqcolorGroup().light());
+ paint->setPen(colorGroup().light());
paint->drawLine(23,0,23,viewport()->height());
paint->drawLine(22,0,22,viewport()->height());
- paint->setPen(tqcolorGroup().shadow());
+ paint->setPen(colorGroup().shadow());
paint->drawLine(0,0,0,viewport()->height());
}
else
if (m_position==KMultiTabBar::Bottom)
{
- paint->setPen(tqcolorGroup().shadow());
+ paint->setPen(colorGroup().shadow());
paint->drawLine(0,0,viewport()->width(),0);
- paint->setPen(tqcolorGroup().background().dark(120));
+ paint->setPen(colorGroup().background().dark(120));
paint->drawLine(0,1,viewport()->width(),1);
}
else
{
- paint->setPen(tqcolorGroup().light());
+ paint->setPen(colorGroup().light());
paint->drawLine(0,23,viewport()->width(),23);
paint->drawLine(0,22,viewport()->width(),22);
-/* paint->setPen(tqcolorGroup().shadow());
+/* paint->setPen(colorGroup().shadow());
paint->drawLine(0,0,0,viewport()->height());*/
}
@@ -472,7 +472,7 @@ TQSize KMultiTabBarButton::sizeHint() const
}
#endif
if ( isMenuButton() )
- w += tqstyle().tqpixelMetric(TQStyle::PM_MenuButtonIndicator, this);
+ w += tqstyle().pixelMetric(TQStyle::PM_MenuButtonIndicator, this);
if ( pixmap() ) {
TQPixmap *pm = (TQPixmap *)pixmap();
@@ -482,7 +482,7 @@ TQSize KMultiTabBarButton::sizeHint() const
TQString s( text() );
bool empty = s.isEmpty();
if ( empty )
- s = TQString::tqfromLatin1("XXXX");
+ s = TQString::fromLatin1("XXXX");
TQFontMetrics fm = fontMetrics();
TQSize sz = fm.size( ShowPrefix, s );
if(!empty || !w)
@@ -650,8 +650,8 @@ void KMultiTabBarTab::drawButtonStyled(TQPainter *paint) {
if (isOn()) st|=TQStyle::Style_On;
- tqstyle().tqdrawControl(TQStyle::CE_PushButton,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), tqcolorGroup(),st);
- tqstyle().tqdrawControl(TQStyle::CE_PushButtonLabel,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), tqcolorGroup(),st);
+ tqstyle().drawControl(TQStyle::CE_PushButton,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st);
+ tqstyle().drawControl(TQStyle::CE_PushButtonLabel,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st);
switch (m_position) {
case KMultiTabBar::Left:
@@ -667,8 +667,8 @@ void KMultiTabBarTab::drawButtonStyled(TQPainter *paint) {
paint->drawPixmap(0,0,pixmap);
break;
}
-// tqstyle().tqdrawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()),
-// tqcolorGroup(),TQStyle::Style_Enabled);
+// tqstyle().drawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()),
+// colorGroup(),TQStyle::Style_Enabled);
}
@@ -678,58 +678,58 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
TQPixmap pixmap;
if ( iconSet())
pixmap = iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal );
- paint->fillRect(0, 0, 24, 24, tqcolorGroup().background());
+ paint->fillRect(0, 0, 24, 24, colorGroup().background());
if (!isOn())
{
if (m_position==KMultiTabBar::Right)
{
- paint->fillRect(0,0,21,21,TQBrush(tqcolorGroup().background()));
+ paint->fillRect(0,0,21,21,TQBrush(colorGroup().background()));
- paint->setPen(tqcolorGroup().background().dark(150));
+ paint->setPen(colorGroup().background().dark(150));
paint->drawLine(0,22,23,22);
paint->drawPixmap(12-pixmap.width()/2,12-pixmap.height()/2,pixmap);
- paint->setPen(tqcolorGroup().shadow());
+ paint->setPen(colorGroup().shadow());
paint->drawLine(0,0,0,23);
- paint->setPen(tqcolorGroup().background().dark(120));
+ paint->setPen(colorGroup().background().dark(120));
paint->drawLine(1,0,1,23);
}
else
if ((m_position==KMultiTabBar::Bottom) || (m_position==KMultiTabBar::Top))
{
- paint->fillRect(0,1,23,22,TQBrush(tqcolorGroup().background()));
+ paint->fillRect(0,1,23,22,TQBrush(colorGroup().background()));
paint->drawPixmap(12-pixmap.width()/2,12-pixmap.height()/2,pixmap);
- paint->setPen(tqcolorGroup().background().dark(120));
+ paint->setPen(colorGroup().background().dark(120));
paint->drawLine(23,0,23,23);
- paint->setPen(tqcolorGroup().light());
+ paint->setPen(colorGroup().light());
paint->drawLine(0,22,23,22);
paint->drawLine(0,23,23,23);
- paint->setPen(tqcolorGroup().shadow());
+ paint->setPen(colorGroup().shadow());
paint->drawLine(0,0,23,0);
- paint->setPen(tqcolorGroup().background().dark(120));
+ paint->setPen(colorGroup().background().dark(120));
paint->drawLine(0,1,23,1);
}
else
{
- paint->setPen(tqcolorGroup().background().dark(120));
+ paint->setPen(colorGroup().background().dark(120));
paint->drawLine(0,23,23,23);
- paint->fillRect(0,0,23,21,TQBrush(tqcolorGroup().background()));
+ paint->fillRect(0,0,23,21,TQBrush(colorGroup().background()));
paint->drawPixmap(12-pixmap.width()/2,12-pixmap.height()/2,pixmap);
- paint->setPen(tqcolorGroup().light());
+ paint->setPen(colorGroup().light());
paint->drawLine(23,0,23,23);
paint->drawLine(22,0,22,23);
- paint->setPen(tqcolorGroup().shadow());
+ paint->setPen(colorGroup().shadow());
paint->drawLine(0,0,0,23);
}
@@ -740,12 +740,12 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
{
if (m_position==KMultiTabBar::Right)
{
- paint->setPen(tqcolorGroup().shadow());
+ paint->setPen(colorGroup().shadow());
paint->drawLine(0,height()-1,23,height()-1);
paint->drawLine(0,height()-2,23,height()-2);
paint->drawLine(23,0,23,height()-1);
paint->drawLine(22,0,22,height()-1);
- paint->fillRect(0,0,21,height()-3,TQBrush(tqcolorGroup().light()));
+ paint->fillRect(0,0,21,height()-3,TQBrush(colorGroup().light()));
paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap);
if (m_showActiveTabText)
@@ -755,9 +755,9 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
TQPixmap tpixmap(height()-25-3, width()-2);
TQPainter painter(&tpixmap);
- painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(tqcolorGroup().light()));
+ painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(colorGroup().light()));
- painter.setPen(tqcolorGroup().text());
+ painter.setPen(colorGroup().text());
painter.drawText(0,+width()/2+TQFontMetrics(TQFont()).height()/2,m_text);
paint->rotate(90);
@@ -769,25 +769,25 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
else
if (m_position==KMultiTabBar::Top)
{
- paint->fillRect(0,0,width()-1,23,TQBrush(tqcolorGroup().light()));
+ paint->fillRect(0,0,width()-1,23,TQBrush(colorGroup().light()));
paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap);
if (m_showActiveTabText)
{
- paint->setPen(tqcolorGroup().text());
+ paint->setPen(colorGroup().text());
paint->drawText(25,height()/2+TQFontMetrics(TQFont()).height()/2,m_text);
}
}
else
if (m_position==KMultiTabBar::Bottom)
{
- paint->setPen(tqcolorGroup().shadow());
+ paint->setPen(colorGroup().shadow());
paint->drawLine(0,23,width()-1,23);
paint->drawLine(0,22,width()-1,22);
- paint->fillRect(0,0,width()-1,21,TQBrush(tqcolorGroup().light()));
+ paint->fillRect(0,0,width()-1,21,TQBrush(colorGroup().light()));
paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap);
if (m_showActiveTabText)
{
- paint->setPen(tqcolorGroup().text());
+ paint->setPen(colorGroup().text());
paint->drawText(25,height()/2+TQFontMetrics(TQFont()).height()/2,m_text);
}
@@ -796,10 +796,10 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
{
- paint->setPen(tqcolorGroup().shadow());
+ paint->setPen(colorGroup().shadow());
paint->drawLine(0,height()-1,23,height()-1);
paint->drawLine(0,height()-2,23,height()-2);
- paint->fillRect(0,0,23,height()-3,TQBrush(tqcolorGroup().light()));
+ paint->fillRect(0,0,23,height()-3,TQBrush(colorGroup().light()));
paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap);
if (m_showActiveTabText)
{
@@ -809,9 +809,9 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
TQPixmap tpixmap(height()-25-3, width()-2);
TQPainter painter(&tpixmap);
- painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(tqcolorGroup().light()));
+ painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(colorGroup().light()));
- painter.setPen(tqcolorGroup().text());
+ painter.setPen(colorGroup().text());
painter.drawText(tpixmap.width()-TQFontMetrics(TQFont()).width(m_text),+width()/2+TQFontMetrics(TQFont()).height()/2,m_text);
paint->rotate(-90);
diff --git a/kutils/kpluginselector.cpp b/kutils/kpluginselector.cpp
index 585a02b6f..99b88efd9 100644
--- a/kutils/kpluginselector.cpp
+++ b/kutils/kpluginselector.cpp
@@ -115,8 +115,8 @@ void KPluginListViewToolTip::maybeTip( const TQPoint &pos )
"<tr><td><b>License:</b></td><td>%4</td></tr></table></qt>" ).arg( item->pluginInfo()->comment(),
item->pluginInfo()->author(), item->pluginInfo()->version(), item->pluginInfo()->license() );
- //kdDebug( 702 ) << k_funcinfo << "Adding tooltip: tqitemRect: " << tqitemRect << ", tooltip: " << toolTip << endl;
- tip( m_listView->tqitemRect( item ), toolTip );
+ //kdDebug( 702 ) << k_funcinfo << "Adding tooltip: itemRect: " << itemRect << ", tooltip: " << toolTip << endl;
+ tip( m_listView->itemRect( item ), toolTip );
}
struct KPluginSelectionWidget::KPluginSelectionWidgetPrivate
diff --git a/kutils/kreplace.cpp b/kutils/kreplace.cpp
index 204384ae3..f825e93cc 100644
--- a/kutils/kreplace.cpp
+++ b/kutils/kreplace.cpp
@@ -50,7 +50,7 @@ KReplaceNextDialog::KReplaceNextDialog(TQWidget *parent) :
{
m_mainLabel = new TQLabel( this );
setMainWidget( m_mainLabel );
- resize(tqminimumSize());
+ resize(minimumSize());
}
void KReplaceNextDialog::setLabel( const TQString& pattern, const TQString& replacement )
diff --git a/networkstatus/connectionmanager.cpp b/networkstatus/connectionmanager.cpp
index 7b95e8101..29174e773 100644
--- a/networkstatus/connectionmanager.cpp
+++ b/networkstatus/connectionmanager.cpp
@@ -150,7 +150,7 @@ bool ConnectionManager::askToConnect( TQWidget * mainWidget )
i18n("This application is currently in offline mode. Do you want to connect in order to carry out this operation?"),
i18n("Leave Offline Mode?"),
i18n("Connect"), i18n("Do Not Connect"),
- TQString::tqfromLatin1("OfflineModeAlwaysGoOnline") ) == KMessageBox::Yes );
+ TQString::fromLatin1("OfflineModeAlwaysGoOnline") ) == KMessageBox::Yes );
}
#include "connectionmanager.moc"
diff --git a/tdecore/kaboutdata.cpp b/tdecore/kaboutdata.cpp
index e6aa1a68a..3aa9aa062 100644
--- a/tdecore/kaboutdata.cpp
+++ b/tdecore/kaboutdata.cpp
@@ -296,7 +296,7 @@ KAboutData::setProgramLogo(const TQImage& image)
TQString
KAboutData::version() const
{
- return TQString::tqfromLatin1(mVersion);
+ return TQString::fromLatin1(mVersion);
}
TQString
@@ -311,13 +311,13 @@ KAboutData::shortDescription() const
TQString
KAboutData::homepage() const
{
- return TQString::tqfromLatin1(mHomepageAddress);
+ return TQString::fromLatin1(mHomepageAddress);
}
TQString
KAboutData::bugAddress() const
{
- return TQString::tqfromLatin1(mBugEmailAddress);
+ return TQString::fromLatin1(mBugEmailAddress);
}
const TQValueList<KAboutPerson>
diff --git a/tdecore/kaccel.cpp b/tdecore/kaccel.cpp
index 1abc8d381..660cc4c29 100644
--- a/tdecore/kaccel.cpp
+++ b/tdecore/kaccel.cpp
@@ -120,10 +120,10 @@ bool qt_try_modal( TQWidget *, XEvent * );
bool KAccelEventHandler::x11Event( XEvent* pEvent )
{
- if( TQWidget::keyboardGrabber() || !kapp->tqfocusWidget() )
+ if( TQWidget::keyboardGrabber() || !kapp->focusWidget() )
return false;
- if ( !qt_try_modal(kapp->tqfocusWidget(), pEvent) )
+ if ( !qt_try_modal(kapp->focusWidget(), pEvent) )
return false;
if( pEvent->type == XKeyPress ) {
@@ -144,7 +144,7 @@ bool KAccelEventHandler::x11Event( XEvent* pEvent )
ke.ignore();
g_bAccelActivated = false;
- kapp->sendEvent( kapp->tqfocusWidget(), &ke );
+ kapp->sendEvent( kapp->focusWidget(), &ke );
// If the Override event was accepted from a non-KAccel widget,
// then kill the next AccelOverride in KApplication::notify.
diff --git a/tdecore/kaccelmanager.cpp b/tdecore/kaccelmanager.cpp
index 6e8f08e0a..d9f0b5cda 100644
--- a/tdecore/kaccelmanager.cpp
+++ b/tdecore/kaccelmanager.cpp
@@ -240,12 +240,12 @@ void KAcceleratorManagerPrivate::calculateAccelerators(Item *item, TQString &use
if ( dynamic_cast<TQLabel*>( it->m_widget ) && it->m_widget->inherits("KURLLabel") )
continue;
- int tprop = it->m_widget->tqmetaObject()->findProperty("text", true);
+ int tprop = it->m_widget->metaObject()->findProperty("text", true);
if (tprop != -1) {
if (checkChange(contents[cnt]))
it->m_widget->setProperty("text", contents[cnt].accelerated());
} else {
- tprop = it->m_widget->tqmetaObject()->findProperty("title", true);
+ tprop = it->m_widget->metaObject()->findProperty("title", true);
if (tprop != -1 && checkChange(contents[cnt]))
it->m_widget->setProperty("title", contents[cnt].accelerated());
}
@@ -341,9 +341,9 @@ void KAcceleratorManagerPrivate::manageWidget(TQWidget *w, Item *item)
{
TQString content;
TQVariant variant;
- int tprop = w->tqmetaObject()->findProperty("text", true);
+ int tprop = w->metaObject()->findProperty("text", true);
if (tprop != -1) {
- const TQMetaProperty* p = w->tqmetaObject()->property( tprop, true );
+ const TQMetaProperty* p = w->metaObject()->property( tprop, true );
if ( p && p->isValid() )
w->qt_property( tprop, 1, &variant );
else
@@ -351,9 +351,9 @@ void KAcceleratorManagerPrivate::manageWidget(TQWidget *w, Item *item)
}
if (tprop == -1) {
- tprop = w->tqmetaObject()->findProperty("title", true);
+ tprop = w->metaObject()->findProperty("title", true);
if (tprop != -1) {
- const TQMetaProperty* p = w->tqmetaObject()->property( tprop, true );
+ const TQMetaProperty* p = w->metaObject()->property( tprop, true );
if ( p && p->isValid() )
w->qt_property( tprop, 1, &variant );
}
diff --git a/tdecore/kapplication.cpp b/tdecore/kapplication.cpp
index 878b6e12f..6e5ae5d40 100644
--- a/tdecore/kapplication.cpp
+++ b/tdecore/kapplication.cpp
@@ -1012,7 +1012,7 @@ void KApplication::init(bool GUIenabled)
// install appdata resource type
KGlobal::dirs()->addResourceType("appdata", KStandardDirs::kde_default("data")
- + TQString::tqfromLatin1(name()) + '/');
+ + TQString::fromLatin1(name()) + '/');
pSessionConfig = 0L;
bSessionManagement = true;
@@ -1291,7 +1291,7 @@ void KApplication::commitData( TQSessionManager& sm )
if ( sm.allowsInteraction() ) {
TQWidgetList done;
- TQWidgetList *list = TQApplication::tqtopLevelWidgets();
+ TQWidgetList *list = TQApplication::topLevelWidgets();
bool canceled = false;
TQWidget* w = list->first();
while ( !canceled && w ) {
@@ -1302,7 +1302,7 @@ void KApplication::commitData( TQSessionManager& sm )
if ( !canceled )
done.append( w );
delete list; // one never knows...
- list = TQApplication::tqtopLevelWidgets();
+ list = TQApplication::topLevelWidgets();
w = list->first();
} else {
w = list->next();
@@ -1449,9 +1449,9 @@ void KApplication::startKdeinit()
return; // whoever held the lock has already started dcopserver
}
// Try to launch tdeinit.
- TQString srv = KStandardDirs::findExe(TQString::tqfromLatin1("tdeinit"));
+ TQString srv = KStandardDirs::findExe(TQString::fromLatin1("tdeinit"));
if (srv.isEmpty())
- srv = KStandardDirs::findExe(TQString::tqfromLatin1("tdeinit"), KGlobal::dirs()->kfsstnd_defaultbindir());
+ srv = KStandardDirs::findExe(TQString::fromLatin1("tdeinit"), KGlobal::dirs()->kfsstnd_defaultbindir());
if (srv.isEmpty())
return;
if (kapp && (Tty != kapp->type()))
@@ -2208,11 +2208,11 @@ void KApplication::updateRemoteUserTimestamp( const TQCString& dcopId, unsigned
void KApplication::invokeEditSlot( const char *slot )
{
- TQObject *object = TQT_TQOBJECT(tqfocusWidget());
+ TQObject *object = TQT_TQOBJECT(focusWidget());
if( !object )
return;
- TQMetaObject *meta = object->tqmetaObject();
+ TQMetaObject *meta = object->metaObject();
int idx = meta->findSlot( slot + 1, true );
if( idx < 0 )
@@ -2430,7 +2430,7 @@ void KApplication::kdisplaySetPalette()
return;
}
#endif
- TQApplication::tqsetPalette( createApplicationPalette(), true);
+ TQApplication::setPalette( createApplicationPalette(), true);
emit kdisplayPaletteChanged();
emit appearanceChanged();
}
@@ -2438,10 +2438,10 @@ void KApplication::kdisplaySetPalette()
void KApplication::kdisplaySetFont()
{
- TQApplication::tqsetFont(KGlobalSettings::generalFont(), true);
- TQApplication::tqsetFont(KGlobalSettings::menuFont(), true, TQMENUBAR_OBJECT_NAME_STRING);
- TQApplication::tqsetFont(KGlobalSettings::menuFont(), true, TQPOPUPMENU_OBJECT_NAME_STRING);
- TQApplication::tqsetFont(KGlobalSettings::menuFont(), true, "KPopupTitle");
+ TQApplication::setFont(KGlobalSettings::generalFont(), true);
+ TQApplication::setFont(KGlobalSettings::menuFont(), true, TQMENUBAR_OBJECT_NAME_STRING);
+ TQApplication::setFont(KGlobalSettings::menuFont(), true, TQPOPUPMENU_OBJECT_NAME_STRING);
+ TQApplication::setFont(KGlobalSettings::menuFont(), true, "KPopupTitle");
// "patch" standard TQStyleSheet to follow our fonts
TQStyleSheet* sheet = TQStyleSheet::defaultSheet();
@@ -2777,10 +2777,10 @@ void KApplication::invokeMailer(const TQString &_to, const TQString &_cc, const
TQString command = config.readPathEntry("EmailClient");
TQString to, cc, bcc;
- if (command.isEmpty() || command == TQString::tqfromLatin1("kmail")
+ if (command.isEmpty() || command == TQString::fromLatin1("kmail")
|| command.endsWith("/kmail"))
{
- command = TQString::tqfromLatin1("kmail --composer -s %s -c %c -b %b --body %B --attach %A -- %t");
+ command = TQString::fromLatin1("kmail --composer -s %s -c %c -b %b --body %B --attach %A -- %t");
if ( !_to.isEmpty() )
{
// put the whole address lists into RFC2047 encoded blobs; technically
diff --git a/tdecore/kcalendarsystemfactory.h b/tdecore/kcalendarsystemfactory.h
index 75b5782e4..6ebba1573 100644
--- a/tdecore/kcalendarsystemfactory.h
+++ b/tdecore/kcalendarsystemfactory.h
@@ -49,7 +49,7 @@ public:
* 0 is specified.
* @return a KCalendarSystem object
*/
- static KCalendarSystem *create (const TQString & calType = TQString::tqfromLatin1("gregorian"),
+ static KCalendarSystem *create (const TQString & calType = TQString::fromLatin1("gregorian"),
const KLocale * locale = 0);
/**
diff --git a/tdecore/kcalendarsystemgregorian.cpp b/tdecore/kcalendarsystemgregorian.cpp
index 19f9b3dc8..38ee1014a 100644
--- a/tdecore/kcalendarsystemgregorian.cpp
+++ b/tdecore/kcalendarsystemgregorian.cpp
@@ -295,7 +295,7 @@ int KCalendarSystemGregorian::weekDayOfPray() const
TQString KCalendarSystemGregorian::calendarName() const
{
- return TQString::tqfromLatin1("gregorian");
+ return TQString::fromLatin1("gregorian");
}
bool KCalendarSystemGregorian::isLunar() const
diff --git a/tdecore/kcalendarsystemhebrew.cpp b/tdecore/kcalendarsystemhebrew.cpp
index 710e027d1..9c04942a5 100644
--- a/tdecore/kcalendarsystemhebrew.cpp
+++ b/tdecore/kcalendarsystemhebrew.cpp
@@ -614,7 +614,7 @@ TQDate KCalendarSystemHebrew::addYears( const TQDate & date, int nyears ) const
// Ok
TQString KCalendarSystemHebrew::calendarName() const
{
- return TQString::tqfromLatin1("hebrew");
+ return TQString::fromLatin1("hebrew");
}
// Ok
@@ -640,7 +640,7 @@ TQString KCalendarSystemHebrew::dayString(const TQDate & pDate, bool bShort) con
TQString sResult;
// Only use hebrew numbers if the hebrew setting is selected
- if (locale()->language() == TQString::tqfromLatin1("he"))
+ if (locale()->language() == TQString::fromLatin1("he"))
sResult = num2heb(day(pDate), false);
else
sResult = KCalendarSystem::dayString(pDate, bShort);
@@ -653,7 +653,7 @@ TQString KCalendarSystemHebrew::yearString(const TQDate & pDate, bool bShort) co
TQString sResult;
// Only use hebrew numbers if the hebrew setting is selected
- if (locale()->language() == TQString::tqfromLatin1("he"))
+ if (locale()->language() == TQString::fromLatin1("he"))
sResult = num2heb(year(pDate), !bShort);
else
sResult = KCalendarSystem::yearString(pDate, bShort);
diff --git a/tdecore/kcalendarsystemhijri.cpp b/tdecore/kcalendarsystemhijri.cpp
index 90faec48e..a6487060e 100644
--- a/tdecore/kcalendarsystemhijri.cpp
+++ b/tdecore/kcalendarsystemhijri.cpp
@@ -577,7 +577,7 @@ TQDate KCalendarSystemHijri::addYears( const TQDate & date, int nyears ) const
TQString KCalendarSystemHijri::calendarName() const
{
- return TQString::tqfromLatin1("hijri");
+ return TQString::fromLatin1("hijri");
}
bool KCalendarSystemHijri::isLunar() const
diff --git a/tdecore/kcalendarsystemjalali.cpp b/tdecore/kcalendarsystemjalali.cpp
index 6197ca75f..29798a1dd 100644
--- a/tdecore/kcalendarsystemjalali.cpp
+++ b/tdecore/kcalendarsystemjalali.cpp
@@ -541,7 +541,7 @@ int KCalendarSystemJalali::weekDayOfPray() const
}
TQString KCalendarSystemJalali::calendarName() const
{
- return TQString::tqfromLatin1("jalali");
+ return TQString::fromLatin1("jalali");
}
bool KCalendarSystemJalali::isLunar() const
diff --git a/tdecore/kcatalogue.cpp b/tdecore/kcatalogue.cpp
index df07fef44..24d0193b2 100644
--- a/tdecore/kcatalogue.cpp
+++ b/tdecore/kcatalogue.cpp
@@ -62,7 +62,7 @@ KCatalogue::KCatalogue(const TQString & name, const TQString & language )
// has to be set after we have the first catalog objects.
d->pluralType = -1;
- TQString path = TQString::tqfromLatin1("%1/LC_MESSAGES/%2.mo")
+ TQString path = TQString::fromLatin1("%1/LC_MESSAGES/%2.mo")
.arg( d->language )
.arg( d->name );
diff --git a/tdecore/kcharsets.cpp b/tdecore/kcharsets.cpp
index b78345276..491eeb64c 100644
--- a/tdecore/kcharsets.cpp
+++ b/tdecore/kcharsets.cpp
@@ -477,7 +477,7 @@ TQStringList KCharsets::availableEncodingNames()
TQStringList available;
for ( const char* const* pos = charsets_for_encoding; *pos; ++pos ) {
//kdDebug(0) << *charsets << " available" << endl;
- available.append( TQString::tqfromLatin1( *pos ));
+ available.append( TQString::fromLatin1( *pos ));
}
return available;
}
@@ -511,7 +511,7 @@ TQStringList KCharsets::descriptiveEncodingNames()
// As we are sorting, we can directly read the array language_for_encoding
TQStringList encodings;
for ( const LanguageForEncoding* pos = language_for_encoding; pos->index; ++pos ) {
- const TQString name = TQString::tqfromLatin1( pos->index );
+ const TQString name = TQString::fromLatin1( pos->index );
const TQString description = i18n( language_names[ pos->data ] );
encodings.append( i18n("Descriptive Encoding Name", "%1 ( %2 )"). arg ( description ). arg( name ) );
}
@@ -573,7 +573,7 @@ TQTextCodec *KCharsets::codecForName(const TQString &n, bool &ok) const
TQString dir;
{
KConfigGroupSaver cfgsav( KGlobal::config(), "i18n" );
- dir = KGlobal::config()->readPathEntry("i18ndir", TQString::tqfromLatin1("/usr/share/i18n/charmaps"));
+ dir = KGlobal::config()->readPathEntry("i18ndir", TQString::fromLatin1("/usr/share/i18n/charmaps"));
}
// these are codecs not included in Qt. They can be build up if the corresponding charmap
@@ -584,7 +584,7 @@ TQTextCodec *KCharsets::codecForName(const TQString &n, bool &ok) const
cname = name;
cname = cname.upper();
- const TQString basicName = TQString::tqfromLatin1(cname);
+ const TQString basicName = TQString::fromLatin1(cname);
kdDebug() << k_funcinfo << endl << " Trying to find " << cname << " in " << dir << endl;
TQString charMapFileName;
diff --git a/tdecore/kcmdlineargs.cpp b/tdecore/kcmdlineargs.cpp
index 3c76feca1..a3a941494 100644
--- a/tdecore/kcmdlineargs.cpp
+++ b/tdecore/kcmdlineargs.cpp
@@ -858,7 +858,7 @@ KCmdLineArgs::usage(const char *id)
bool hasOptions = false;
TQString optionsHeader;
if (args->name)
- optionsHeader = optionHeaderString.arg(i18n("%1 options").arg(TQString::tqfromLatin1(args->name)));
+ optionsHeader = optionHeaderString.arg(i18n("%1 options").arg(TQString::fromLatin1(args->name)));
else
optionsHeader = i18n("\nOptions:\n");
diff --git a/tdecore/kcompletion.cpp b/tdecore/kcompletion.cpp
index 813b56027..784ad017b 100644
--- a/tdecore/kcompletion.cpp
+++ b/tdecore/kcompletion.cpp
@@ -463,7 +463,7 @@ TQString KCompletion::findCompletion( const TQString& string )
uint weight = temp_node->weight();
const KCompTreeNode* hit = temp_node;
for( int i = 1; i < count; i++ ) {
- temp_node = node->tqchildAt(i);
+ temp_node = node->childAt(i);
if( temp_node->weight() > weight ) {
hit = temp_node;
weight = hit->weight();
@@ -628,19 +628,19 @@ void KCompletion::doBeep( BeepMode mode ) const
switch ( mode ) {
case Rotation:
- event = TQString::tqfromLatin1("Textcompletion: rotation");
+ event = TQString::fromLatin1("Textcompletion: rotation");
text = i18n("You reached the end of the list\nof matching items.\n");
break;
case PartialMatch:
if ( myCompletionMode == KGlobalSettings::CompletionShell ||
myCompletionMode == KGlobalSettings::CompletionMan ) {
- event = TQString::tqfromLatin1("Textcompletion: partial match");
+ event = TQString::fromLatin1("Textcompletion: partial match");
text = i18n("The completion is ambiguous, more than one\nmatch is available.\n");
}
break;
case NoMatch:
if ( myCompletionMode == KGlobalSettings::CompletionShell ) {
- event = TQString::tqfromLatin1("Textcompletion: no match");
+ event = TQString::fromLatin1("Textcompletion: no match");
text = i18n("There is no matching item available.\n");
}
break;
diff --git a/tdecore/kcompletion_private.h b/tdecore/kcompletion_private.h
index fcfea7243..bd199bdfd 100644
--- a/tdecore/kcompletion_private.h
+++ b/tdecore/kcompletion_private.h
@@ -118,7 +118,7 @@ public:
inline const KCompTreeChildren * children() const {
return &myChildren;
}
- inline const KCompTreeNode * tqchildAt(int index) const {
+ inline const KCompTreeNode * childAt(int index) const {
return myChildren.tqat(index);
}
inline const KCompTreeNode * firstChild() const {
diff --git a/tdecore/kconfig_compiler/kconfig_compiler.cpp b/tdecore/kconfig_compiler/kconfig_compiler.cpp
index 10c91834c..b75d7e05d 100644
--- a/tdecore/kconfig_compiler/kconfig_compiler.cpp
+++ b/tdecore/kconfig_compiler/kconfig_compiler.cpp
@@ -265,7 +265,7 @@ static TQString literalString( const TQString &s )
if (s[i].tqunicode() > 127) isAscii = false;
if (isAscii)
- return "TQString::tqfromLatin1( " + quoteString(s) + " )";
+ return "TQString::fromLatin1( " + quoteString(s) + " )";
else
return "TQString::fromUtf8( " + quoteString(s) + " )";
}
@@ -805,9 +805,9 @@ TQString paramString(const TQString &group, const TQValueList<Param> &parameters
}
}
if (arguments.isEmpty())
- return "TQString::tqfromLatin1( \""+group+"\" )";
+ return "TQString::fromLatin1( \""+group+"\" )";
- return "TQString::tqfromLatin1( \""+paramString+"\" )"+arguments;
+ return "TQString::fromLatin1( \""+paramString+"\" )"+arguments;
}
/* int i is the value of the parameter */
@@ -883,12 +883,12 @@ TQString memberMutatorBody( CfgEntry *e )
out << "}" << endl << endl;
}
- out << "if (!" << This << "isImmutable( TQString::tqfromLatin1( \"";
+ out << "if (!" << This << "isImmutable( TQString::fromLatin1( \"";
if (!e->param().isEmpty())
{
out << e->paramName().replace("$("+e->param()+")", "%1") << "\" ).arg( ";
if ( e->paramType() == "Enum" ) {
- out << "TQString::tqfromLatin1( ";
+ out << "TQString::fromLatin1( ";
if (globalEnums)
out << enumName(e->param()) << "ToString[i]";
@@ -1518,7 +1518,7 @@ int main( int argc, char **argv )
cpp << " )" << endl;
cpp << " : " << inherits << "(";
- if ( !cfgFileName.isEmpty() ) cpp << " TQString::tqfromLatin1( \"" << cfgFileName << "\" ";
+ if ( !cfgFileName.isEmpty() ) cpp << " TQString::fromLatin1( \"" << cfgFileName << "\" ";
if ( cfgFileNameArg ) cpp << " config ";
if ( !cfgFileName.isEmpty() ) cpp << ") ";
cpp << ")" << endl;
@@ -1560,7 +1560,7 @@ int main( int argc, char **argv )
for( it = choices.begin(); it != choices.end(); ++it ) {
cpp << " {" << endl;
cpp << " KConfigSkeleton::ItemEnum::Choice choice;" << endl;
- cpp << " choice.name = TQString::tqfromLatin1( \"" << (*it).name << "\" );" << endl;
+ cpp << " choice.name = TQString::fromLatin1( \"" << (*it).name << "\" );" << endl;
if ( setUserTexts ) {
if ( !(*it).label.isEmpty() )
cpp << " choice.label = i18n(" << quoteString((*it).label) << ");" << endl;
@@ -1592,7 +1592,7 @@ int main( int argc, char **argv )
cpp << " addItem( " << itemPath(e);
TQString quotedName = e->name();
addQuotes( quotedName );
- if ( quotedName != key ) cpp << ", TQString::tqfromLatin1( \"" << e->name() << "\" )";
+ if ( quotedName != key ) cpp << ", TQString::fromLatin1( \"" << e->name() << "\" )";
cpp << " );" << endl;
}
else
@@ -1621,7 +1621,7 @@ int main( int argc, char **argv )
// param name. The check for isImmutable in the set* functions doesn't have the param
// name available, just the corresponding enum value (int), so we need to store the
// param names in a separate static list!.
- cpp << " addItem( " << itemVarStr << ", TQString::tqfromLatin1( \"";
+ cpp << " addItem( " << itemVarStr << ", TQString::fromLatin1( \"";
if ( e->paramType()=="Enum" )
cpp << e->paramName().replace( "$("+e->param()+")", "%1").arg(e->paramValues()[i] );
else
diff --git a/tdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp b/tdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp
index 3dd197b34..2f8e7eee3 100644
--- a/tdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp
+++ b/tdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp
@@ -61,7 +61,7 @@ void KConfigCompiler_Test::testExpectedOutput()
// Known to pass test cases
while (testCases[ i ])
{
- performCompare(TQString::tqfromLatin1(testCases[ i ]));
+ performCompare(TQString::fromLatin1(testCases[ i ]));
++i;
}
@@ -69,7 +69,7 @@ void KConfigCompiler_Test::testExpectedOutput()
i= 0;
while (willFailCases[ i ])
{
- performCompare(TQString::tqfromLatin1(willFailCases[ i ]), true);
+ performCompare(TQString::fromLatin1(willFailCases[ i ]), true);
++i;
}
}
@@ -77,7 +77,7 @@ void KConfigCompiler_Test::testExpectedOutput()
void KConfigCompiler_Test::performCompare(const TQString &fileName, bool fail)
{
TQFile file(fileName);
- TQFile fileRef(TQString::tqfromLatin1(SRCDIR) + TQString::tqfromLatin1("/") + fileName + TQString::tqfromLatin1(".ref"));
+ TQFile fileRef(TQString::fromLatin1(SRCDIR) + TQString::fromLatin1("/") + fileName + TQString::fromLatin1(".ref"));
if ( file.open(IO_ReadOnly) && fileRef.open(IO_ReadOnly) )
{
diff --git a/tdecore/kconfig_compiler/tests/test1.cpp.ref b/tdecore/kconfig_compiler/tests/test1.cpp.ref
index f8c4c1189..b3050921e 100644
--- a/tdecore/kconfig_compiler/tests/test1.cpp.ref
+++ b/tdecore/kconfig_compiler/tests/test1.cpp.ref
@@ -4,66 +4,66 @@
#include "test1.h"
Test1::Test1( const TQString & transport, const TQString & folder )
- : KConfigSkeleton( TQString::tqfromLatin1( "examplerc" ) )
+ : KConfigSkeleton( TQString::fromLatin1( "examplerc" ) )
, mParamtransport(transport)
, mParamfolder(folder)
{
- setCurrentGroup( TQString::tqfromLatin1( "General-%1" ).arg( mParamfolder ) );
+ setCurrentGroup( TQString::fromLatin1( "General-%1" ).arg( mParamfolder ) );
KConfigSkeleton::ItemBool *itemOneOption;
- itemOneOption = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "OneOption" ), mOneOption, true );
- addItem( itemOneOption, TQString::tqfromLatin1( "OneOption" ) );
+ itemOneOption = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "OneOption" ), mOneOption, true );
+ addItem( itemOneOption, TQString::fromLatin1( "OneOption" ) );
KConfigSkeleton::ItemInt *itemAnotherOption;
- itemAnotherOption = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Another Option" ), mAnotherOption, 5 );
- addItem( itemAnotherOption, TQString::tqfromLatin1( "AnotherOption" ) );
+ itemAnotherOption = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Another Option" ), mAnotherOption, 5 );
+ addItem( itemAnotherOption, TQString::fromLatin1( "AnotherOption" ) );
TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesListOption;
{
KConfigSkeleton::ItemEnum::Choice choice;
- choice.name = TQString::tqfromLatin1( "One" );
+ choice.name = TQString::fromLatin1( "One" );
valuesListOption.append( choice );
}
{
KConfigSkeleton::ItemEnum::Choice choice;
- choice.name = TQString::tqfromLatin1( "Two" );
+ choice.name = TQString::fromLatin1( "Two" );
valuesListOption.append( choice );
}
{
KConfigSkeleton::ItemEnum::Choice choice;
- choice.name = TQString::tqfromLatin1( "Three" );
+ choice.name = TQString::fromLatin1( "Three" );
valuesListOption.append( choice );
}
KConfigSkeleton::ItemEnum *itemListOption;
- itemListOption = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "ListOption" ), mListOption, valuesListOption, EnumListOption::One );
- addItem( itemListOption, TQString::tqfromLatin1( "ListOption" ) );
+ itemListOption = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "ListOption" ), mListOption, valuesListOption, EnumListOption::One );
+ addItem( itemListOption, TQString::fromLatin1( "ListOption" ) );
- setCurrentGroup( TQString::tqfromLatin1( "MyOptions" ) );
+ setCurrentGroup( TQString::fromLatin1( "MyOptions" ) );
KConfigSkeleton::ItemString *itemMyString;
- itemMyString = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "MyString" ), mMyString, TQString::tqfromLatin1( "Default String" ) );
- addItem( itemMyString, TQString::tqfromLatin1( "MyString" ) );
+ itemMyString = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "MyString" ), mMyString, TQString::fromLatin1( "Default String" ) );
+ addItem( itemMyString, TQString::fromLatin1( "MyString" ) );
KConfigSkeleton::ItemPath *itemMyPath;
- itemMyPath = new KConfigSkeleton::ItemPath( currentGroup(), TQString::tqfromLatin1( "MyPath" ), mMyPath, TQDir::homeDirPath()+TQString::tqfromLatin1(".hidden_file") );
- addItem( itemMyPath, TQString::tqfromLatin1( "MyPath" ) );
+ itemMyPath = new KConfigSkeleton::ItemPath( currentGroup(), TQString::fromLatin1( "MyPath" ), mMyPath, TQDir::homeDirPath()+TQString::fromLatin1(".hidden_file") );
+ addItem( itemMyPath, TQString::fromLatin1( "MyPath" ) );
KConfigSkeleton::ItemInt *itemAnotherOption2;
- itemAnotherOption2 = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Another Option" ), mAnotherOption2, 10 );
- addItem( itemAnotherOption2, TQString::tqfromLatin1( "AnotherOption2" ) );
+ itemAnotherOption2 = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Another Option" ), mAnotherOption2, 10 );
+ addItem( itemAnotherOption2, TQString::fromLatin1( "AnotherOption2" ) );
TQStringList defaultMyStringList;
defaultMyStringList.append( TQString::fromUtf8( "up" ) );
defaultMyStringList.append( TQString::fromUtf8( "down" ) );
KConfigSkeleton::ItemStringList *itemMyStringList;
- itemMyStringList = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::tqfromLatin1( "MyStringList" ), mMyStringList, defaultMyStringList );
- addItem( itemMyStringList, TQString::tqfromLatin1( "MyStringList" ) );
+ itemMyStringList = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "MyStringList" ), mMyStringList, defaultMyStringList );
+ addItem( itemMyStringList, TQString::fromLatin1( "MyStringList" ) );
TQStringList defaultMyStringListHidden;
defaultMyStringListHidden.append( TQString::fromUtf8( "up" ) );
defaultMyStringListHidden.append( TQString::fromUtf8( "down" ) );
KConfigSkeleton::ItemStringList *itemMyStringListHidden;
- itemMyStringListHidden = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::tqfromLatin1( "MyStringListHidden" ), mMyStringListHidden, defaultMyStringListHidden );
- addItem( itemMyStringListHidden, TQString::tqfromLatin1( "MyStringListHidden" ) );
+ itemMyStringListHidden = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "MyStringListHidden" ), mMyStringListHidden, defaultMyStringListHidden );
+ addItem( itemMyStringListHidden, TQString::fromLatin1( "MyStringListHidden" ) );
KConfigSkeleton::ItemInt *itemMyNumber;
- itemMyNumber = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "List-%1-%2" ).arg( mParamtransport ).arg( mParamfolder ), mMyNumber, 1 );
- addItem( itemMyNumber, TQString::tqfromLatin1( "MyNumber" ) );
+ itemMyNumber = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "List-%1-%2" ).arg( mParamtransport ).arg( mParamfolder ), mMyNumber, 1 );
+ addItem( itemMyNumber, TQString::fromLatin1( "MyNumber" ) );
}
Test1::~Test1()
diff --git a/tdecore/kconfig_compiler/tests/test1.h.ref b/tdecore/kconfig_compiler/tests/test1.h.ref
index b5a66b5cd..cc2d99c69 100644
--- a/tdecore/kconfig_compiler/tests/test1.h.ref
+++ b/tdecore/kconfig_compiler/tests/test1.h.ref
@@ -24,7 +24,7 @@ class Test1 : public KConfigSkeleton
*/
void setOneOption( bool v )
{
- if (!isImmutable( TQString::tqfromLatin1( "OneOption" ) ))
+ if (!isImmutable( TQString::fromLatin1( "OneOption" ) ))
mOneOption = v;
}
@@ -41,7 +41,7 @@ class Test1 : public KConfigSkeleton
*/
void setAnotherOption( int v )
{
- if (!isImmutable( TQString::tqfromLatin1( "AnotherOption" ) ))
+ if (!isImmutable( TQString::fromLatin1( "AnotherOption" ) ))
mAnotherOption = v;
}
@@ -58,7 +58,7 @@ class Test1 : public KConfigSkeleton
*/
void setListOption( int v )
{
- if (!isImmutable( TQString::tqfromLatin1( "ListOption" ) ))
+ if (!isImmutable( TQString::fromLatin1( "ListOption" ) ))
mListOption = v;
}
@@ -75,7 +75,7 @@ class Test1 : public KConfigSkeleton
*/
void setMyString( const TQString & v )
{
- if (!isImmutable( TQString::tqfromLatin1( "MyString" ) ))
+ if (!isImmutable( TQString::fromLatin1( "MyString" ) ))
mMyString = v;
}
@@ -92,7 +92,7 @@ class Test1 : public KConfigSkeleton
*/
void setMyPath( const TQString & v )
{
- if (!isImmutable( TQString::tqfromLatin1( "MyPath" ) ))
+ if (!isImmutable( TQString::fromLatin1( "MyPath" ) ))
mMyPath = v;
}
@@ -109,7 +109,7 @@ class Test1 : public KConfigSkeleton
*/
void setAnotherOption2( int v )
{
- if (!isImmutable( TQString::tqfromLatin1( "AnotherOption2" ) ))
+ if (!isImmutable( TQString::fromLatin1( "AnotherOption2" ) ))
mAnotherOption2 = v;
}
@@ -126,7 +126,7 @@ class Test1 : public KConfigSkeleton
*/
void setMyStringList( const TQStringList & v )
{
- if (!isImmutable( TQString::tqfromLatin1( "MyStringList" ) ))
+ if (!isImmutable( TQString::fromLatin1( "MyStringList" ) ))
mMyStringList = v;
}
@@ -143,7 +143,7 @@ class Test1 : public KConfigSkeleton
*/
void setMyStringListHidden( const TQStringList & v )
{
- if (!isImmutable( TQString::tqfromLatin1( "MyStringListHidden" ) ))
+ if (!isImmutable( TQString::fromLatin1( "MyStringListHidden" ) ))
mMyStringListHidden = v;
}
@@ -160,7 +160,7 @@ class Test1 : public KConfigSkeleton
*/
void setMyNumber( int v )
{
- if (!isImmutable( TQString::tqfromLatin1( "MyNumber" ) ))
+ if (!isImmutable( TQString::fromLatin1( "MyNumber" ) ))
mMyNumber = v;
}
diff --git a/tdecore/kconfig_compiler/tests/test2.cpp.ref b/tdecore/kconfig_compiler/tests/test2.cpp.ref
index af8db588d..2d56f7545 100644
--- a/tdecore/kconfig_compiler/tests/test2.cpp.ref
+++ b/tdecore/kconfig_compiler/tests/test2.cpp.ref
@@ -6,90 +6,90 @@
#include <klocale.h>
Test2::Test2( )
- : MyPrefs( TQString::tqfromLatin1( "korganizerrc" ) )
+ : MyPrefs( TQString::fromLatin1( "korganizerrc" ) )
{
- setCurrentGroup( TQString::tqfromLatin1( "General" ) );
+ setCurrentGroup( TQString::fromLatin1( "General" ) );
- mAutoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "Auto Save" ), mAutoSave, false );
+ mAutoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Auto Save" ), mAutoSave, false );
mAutoSaveItem->setLabel( i18n("Enable automatic saving of calendar") );
mAutoSaveItem->setWhatsThis( i18n("WhatsThis text for AutoSave option") );
- addItem( mAutoSaveItem, TQString::tqfromLatin1( "AutoSave" ) );
- mAutoSaveIntervalItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Auto Save Interval" ), mAutoSaveInterval, 10 );
+ addItem( mAutoSaveItem, TQString::fromLatin1( "AutoSave" ) );
+ mAutoSaveIntervalItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Auto Save Interval" ), mAutoSaveInterval, 10 );
mAutoSaveIntervalItem->setLabel( i18n("Auto Save Interval") );
- addItem( mAutoSaveIntervalItem, TQString::tqfromLatin1( "AutoSaveInterval" ) );
- mConfirmItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "Confirm Deletes" ), mConfirm, true );
+ addItem( mAutoSaveIntervalItem, TQString::fromLatin1( "AutoSaveInterval" ) );
+ mConfirmItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Confirm Deletes" ), mConfirm, true );
mConfirmItem->setLabel( i18n("Confirm deletes") );
- addItem( mConfirmItem, TQString::tqfromLatin1( "Confirm" ) );
- mArchiveFileItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "Archive File" ), mArchiveFile );
+ addItem( mConfirmItem, TQString::fromLatin1( "Confirm" ) );
+ mArchiveFileItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Archive File" ), mArchiveFile );
mArchiveFileItem->setLabel( i18n("Archive File") );
- addItem( mArchiveFileItem, TQString::tqfromLatin1( "ArchiveFile" ) );
+ addItem( mArchiveFileItem, TQString::fromLatin1( "ArchiveFile" ) );
TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesDestination;
{
KConfigSkeleton::ItemEnum::Choice choice;
- choice.name = TQString::tqfromLatin1( "standardDestination" );
+ choice.name = TQString::fromLatin1( "standardDestination" );
valuesDestination.append( choice );
}
{
KConfigSkeleton::ItemEnum::Choice choice;
- choice.name = TQString::tqfromLatin1( "askDestination" );
+ choice.name = TQString::fromLatin1( "askDestination" );
valuesDestination.append( choice );
}
{
KConfigSkeleton::ItemEnum::Choice choice;
- choice.name = TQString::tqfromLatin1( "argl1" );
+ choice.name = TQString::fromLatin1( "argl1" );
choice.label = i18n("Argl1 Label");
valuesDestination.append( choice );
}
{
KConfigSkeleton::ItemEnum::Choice choice;
- choice.name = TQString::tqfromLatin1( "argl2" );
+ choice.name = TQString::fromLatin1( "argl2" );
choice.whatsThis = i18n("Argl2 Whatsthis");
valuesDestination.append( choice );
}
{
KConfigSkeleton::ItemEnum::Choice choice;
- choice.name = TQString::tqfromLatin1( "argl3" );
+ choice.name = TQString::fromLatin1( "argl3" );
choice.label = i18n("Argl3 Label");
choice.whatsThis = i18n("Argl3 Whatsthis");
valuesDestination.append( choice );
}
- mDestinationItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "Destination" ), mDestination, valuesDestination, standardDestination );
+ mDestinationItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "Destination" ), mDestination, valuesDestination, standardDestination );
mDestinationItem->setLabel( i18n("New Events/Todos Should") );
- addItem( mDestinationItem, TQString::tqfromLatin1( "Destination" ) );
+ addItem( mDestinationItem, TQString::fromLatin1( "Destination" ) );
- setCurrentGroup( TQString::tqfromLatin1( "Views" ) );
+ setCurrentGroup( TQString::fromLatin1( "Views" ) );
- mHourSizeItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Hour Size" ), mHourSize, 10 );
+ mHourSizeItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Hour Size" ), mHourSize, 10 );
mHourSizeItem->setLabel( i18n("Hour Size") );
- addItem( mHourSizeItem, TQString::tqfromLatin1( "HourSize" ) );
- mSelectionStartsEditorItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "SelectionStartsEditor" ), mSelectionStartsEditor, false );
+ addItem( mHourSizeItem, TQString::fromLatin1( "HourSize" ) );
+ mSelectionStartsEditorItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "SelectionStartsEditor" ), mSelectionStartsEditor, false );
mSelectionStartsEditorItem->setLabel( i18n("Time range selection in agenda view starts event editor") );
- addItem( mSelectionStartsEditorItem, TQString::tqfromLatin1( "SelectionStartsEditor" ) );
+ addItem( mSelectionStartsEditorItem, TQString::fromLatin1( "SelectionStartsEditor" ) );
- setCurrentGroup( TQString::tqfromLatin1( "KOrganizer Plugins" ) );
+ setCurrentGroup( TQString::fromLatin1( "KOrganizer Plugins" ) );
TQStringList defaultSelectedPlugins;
defaultSelectedPlugins.append( TQString::fromUtf8( "holidays" ) );
defaultSelectedPlugins.append( TQString::fromUtf8( "webexport" ) );
- mSelectedPluginsItem = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::tqfromLatin1( "SelectedPlugins" ), mSelectedPlugins, defaultSelectedPlugins );
+ mSelectedPluginsItem = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "SelectedPlugins" ), mSelectedPlugins, defaultSelectedPlugins );
mSelectedPluginsItem->setLabel( i18n("SelectedPlugins") );
- addItem( mSelectedPluginsItem, TQString::tqfromLatin1( "SelectedPlugins" ) );
+ addItem( mSelectedPluginsItem, TQString::fromLatin1( "SelectedPlugins" ) );
- setCurrentGroup( TQString::tqfromLatin1( "Colors" ) );
+ setCurrentGroup( TQString::fromLatin1( "Colors" ) );
- mHighlightColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "Highlight Color" ), mHighlightColor, TQColor( 100, 100, 255 ) );
+ mHighlightColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Highlight Color" ), mHighlightColor, TQColor( 100, 100, 255 ) );
mHighlightColorItem->setLabel( i18n("Highlight color") );
- addItem( mHighlightColorItem, TQString::tqfromLatin1( "HighlightColor" ) );
- mAgendaBgColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "Agenda Background Color" ), mAgendaBgColor, TQColor( 255, 255, 255 ) );
+ addItem( mHighlightColorItem, TQString::fromLatin1( "HighlightColor" ) );
+ mAgendaBgColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Agenda Background Color" ), mAgendaBgColor, TQColor( 255, 255, 255 ) );
mAgendaBgColorItem->setLabel( i18n("Agenda view background color") );
- addItem( mAgendaBgColorItem, TQString::tqfromLatin1( "AgendaBgColor" ) );
+ addItem( mAgendaBgColorItem, TQString::fromLatin1( "AgendaBgColor" ) );
- setCurrentGroup( TQString::tqfromLatin1( "Fonts" ) );
+ setCurrentGroup( TQString::fromLatin1( "Fonts" ) );
- mTimeBarFontItem = new KConfigSkeleton::ItemFont( currentGroup(), TQString::tqfromLatin1( "TimeBar Font" ), mTimeBarFont );
+ mTimeBarFontItem = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "TimeBar Font" ), mTimeBarFont );
mTimeBarFontItem->setLabel( i18n("Time bar") );
- addItem( mTimeBarFontItem, TQString::tqfromLatin1( "TimeBarFont" ) );
+ addItem( mTimeBarFontItem, TQString::fromLatin1( "TimeBarFont" ) );
}
Test2::~Test2()
diff --git a/tdecore/kconfig_compiler/tests/test2.h.ref b/tdecore/kconfig_compiler/tests/test2.h.ref
index 075f48bde..6c0a74d66 100644
--- a/tdecore/kconfig_compiler/tests/test2.h.ref
+++ b/tdecore/kconfig_compiler/tests/test2.h.ref
@@ -21,7 +21,7 @@ class Test2 : public MyPrefs
*/
void setAutoSave( bool v )
{
- if (!isImmutable( TQString::tqfromLatin1( "AutoSave" ) ))
+ if (!isImmutable( TQString::fromLatin1( "AutoSave" ) ))
mAutoSave = v;
}
@@ -46,7 +46,7 @@ class Test2 : public MyPrefs
*/
void setAutoSaveInterval( int v )
{
- if (!isImmutable( TQString::tqfromLatin1( "AutoSaveInterval" ) ))
+ if (!isImmutable( TQString::fromLatin1( "AutoSaveInterval" ) ))
mAutoSaveInterval = v;
}
@@ -71,7 +71,7 @@ class Test2 : public MyPrefs
*/
void setConfirm( bool v )
{
- if (!isImmutable( TQString::tqfromLatin1( "Confirm" ) ))
+ if (!isImmutable( TQString::fromLatin1( "Confirm" ) ))
mConfirm = v;
}
@@ -96,7 +96,7 @@ class Test2 : public MyPrefs
*/
void setArchiveFile( const TQString & v )
{
- if (!isImmutable( TQString::tqfromLatin1( "ArchiveFile" ) ))
+ if (!isImmutable( TQString::fromLatin1( "ArchiveFile" ) ))
mArchiveFile = v;
}
@@ -121,7 +121,7 @@ class Test2 : public MyPrefs
*/
void setDestination( int v )
{
- if (!isImmutable( TQString::tqfromLatin1( "Destination" ) ))
+ if (!isImmutable( TQString::fromLatin1( "Destination" ) ))
mDestination = v;
}
@@ -146,7 +146,7 @@ class Test2 : public MyPrefs
*/
void setHourSize( int v )
{
- if (!isImmutable( TQString::tqfromLatin1( "HourSize" ) ))
+ if (!isImmutable( TQString::fromLatin1( "HourSize" ) ))
mHourSize = v;
}
@@ -171,7 +171,7 @@ class Test2 : public MyPrefs
*/
void setSelectionStartsEditor( bool v )
{
- if (!isImmutable( TQString::tqfromLatin1( "SelectionStartsEditor" ) ))
+ if (!isImmutable( TQString::fromLatin1( "SelectionStartsEditor" ) ))
mSelectionStartsEditor = v;
}
@@ -196,7 +196,7 @@ class Test2 : public MyPrefs
*/
void setSelectedPlugins( const TQStringList & v )
{
- if (!isImmutable( TQString::tqfromLatin1( "SelectedPlugins" ) ))
+ if (!isImmutable( TQString::fromLatin1( "SelectedPlugins" ) ))
mSelectedPlugins = v;
}
@@ -221,7 +221,7 @@ class Test2 : public MyPrefs
*/
void setHighlightColor( const TQColor & v )
{
- if (!isImmutable( TQString::tqfromLatin1( "HighlightColor" ) ))
+ if (!isImmutable( TQString::fromLatin1( "HighlightColor" ) ))
mHighlightColor = v;
}
@@ -246,7 +246,7 @@ class Test2 : public MyPrefs
*/
void setAgendaBgColor( const TQColor & v )
{
- if (!isImmutable( TQString::tqfromLatin1( "AgendaBgColor" ) ))
+ if (!isImmutable( TQString::fromLatin1( "AgendaBgColor" ) ))
mAgendaBgColor = v;
}
@@ -271,7 +271,7 @@ class Test2 : public MyPrefs
*/
void setTimeBarFont( const TQFont & v )
{
- if (!isImmutable( TQString::tqfromLatin1( "TimeBarFont" ) ))
+ if (!isImmutable( TQString::fromLatin1( "TimeBarFont" ) ))
mTimeBarFont = v;
}
diff --git a/tdecore/kconfig_compiler/tests/test3.cpp.ref b/tdecore/kconfig_compiler/tests/test3.cpp.ref
index a47fd5213..11fe6b38f 100644
--- a/tdecore/kconfig_compiler/tests/test3.cpp.ref
+++ b/tdecore/kconfig_compiler/tests/test3.cpp.ref
@@ -6,21 +6,21 @@
using namespace TestNameSpace;
Test3::Test3( )
- : KConfigSkeleton( TQString::tqfromLatin1( "test3rc" ) )
+ : KConfigSkeleton( TQString::fromLatin1( "test3rc" ) )
{
- setCurrentGroup( TQString::tqfromLatin1( "General" ) );
+ setCurrentGroup( TQString::fromLatin1( "General" ) );
- mAutoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "Auto Save" ), mAutoSave, false );
- addItem( mAutoSaveItem, TQString::tqfromLatin1( "AutoSave" ) );
+ mAutoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Auto Save" ), mAutoSave, false );
+ addItem( mAutoSaveItem, TQString::fromLatin1( "AutoSave" ) );
- setCurrentGroup( TQString::tqfromLatin1( "Blah" ) );
+ setCurrentGroup( TQString::fromLatin1( "Blah" ) );
- mBlubbItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Blubb" ), mBlubb, 10 );
- addItem( mBlubbItem, TQString::tqfromLatin1( "Blubb" ) );
- mBlahBlahItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "BlahBlah" ), mBlahBlah, TQString::tqfromLatin1( "a string" ) );
- addItem( mBlahBlahItem, TQString::tqfromLatin1( "BlahBlah" ) );
- mMyPasswordItem = new KConfigSkeleton::ItemPassword( currentGroup(), TQString::tqfromLatin1( "MyPassword" ), mMyPassword );
- addItem( mMyPasswordItem, TQString::tqfromLatin1( "MyPassword" ) );
+ mBlubbItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Blubb" ), mBlubb, 10 );
+ addItem( mBlubbItem, TQString::fromLatin1( "Blubb" ) );
+ mBlahBlahItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "BlahBlah" ), mBlahBlah, TQString::fromLatin1( "a string" ) );
+ addItem( mBlahBlahItem, TQString::fromLatin1( "BlahBlah" ) );
+ mMyPasswordItem = new KConfigSkeleton::ItemPassword( currentGroup(), TQString::fromLatin1( "MyPassword" ), mMyPassword );
+ addItem( mMyPasswordItem, TQString::fromLatin1( "MyPassword" ) );
}
Test3::~Test3()
diff --git a/tdecore/kconfig_compiler/tests/test3.h.ref b/tdecore/kconfig_compiler/tests/test3.h.ref
index 8e86d36b0..75b1b0929 100644
--- a/tdecore/kconfig_compiler/tests/test3.h.ref
+++ b/tdecore/kconfig_compiler/tests/test3.h.ref
@@ -20,7 +20,7 @@ class Test3 : public KConfigSkeleton
*/
void setAutoSave( bool v )
{
- if (!isImmutable( TQString::tqfromLatin1( "AutoSave" ) ))
+ if (!isImmutable( TQString::fromLatin1( "AutoSave" ) ))
mAutoSave = v;
}
@@ -45,7 +45,7 @@ class Test3 : public KConfigSkeleton
*/
void setBlubb( int v )
{
- if (!isImmutable( TQString::tqfromLatin1( "Blubb" ) ))
+ if (!isImmutable( TQString::fromLatin1( "Blubb" ) ))
mBlubb = v;
}
@@ -70,7 +70,7 @@ class Test3 : public KConfigSkeleton
*/
void setBlahBlah( const TQString & v )
{
- if (!isImmutable( TQString::tqfromLatin1( "BlahBlah" ) ))
+ if (!isImmutable( TQString::fromLatin1( "BlahBlah" ) ))
mBlahBlah = v;
}
@@ -95,7 +95,7 @@ class Test3 : public KConfigSkeleton
*/
void setMyPassword( const TQString & v )
{
- if (!isImmutable( TQString::tqfromLatin1( "MyPassword" ) ))
+ if (!isImmutable( TQString::fromLatin1( "MyPassword" ) ))
mMyPassword = v;
}
diff --git a/tdecore/kconfig_compiler/tests/test4.cpp.ref b/tdecore/kconfig_compiler/tests/test4.cpp.ref
index 0eee21488..6918a8c8a 100644
--- a/tdecore/kconfig_compiler/tests/test4.cpp.ref
+++ b/tdecore/kconfig_compiler/tests/test4.cpp.ref
@@ -21,57 +21,57 @@ Test4 *Test4::self()
const char* const Test4::EnumButton::enumToString[] = { "right", "mid", "left" };
Test4::Test4( )
- : KConfigSkeleton( TQString::tqfromLatin1( "test4rc" ) )
+ : KConfigSkeleton( TQString::fromLatin1( "test4rc" ) )
{
mSelf = this;
- setCurrentGroup( TQString::tqfromLatin1( "Foo" ) );
+ setCurrentGroup( TQString::fromLatin1( "Foo" ) );
TQColor defaultColor[4] = { Qt::red, Qt::blue, Qt::green, Qt::black };
KConfigSkeleton::ItemColor *itemColor[4];
- itemColor[0] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "color #0" ), mColor[0], defaultColor[0] );
- addItem( itemColor[0], TQString::tqfromLatin1( "Color0" ) );
- itemColor[1] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "color #1" ), mColor[1], defaultColor[1] );
- addItem( itemColor[1], TQString::tqfromLatin1( "Color1" ) );
- itemColor[2] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "color #2" ), mColor[2], defaultColor[2] );
- addItem( itemColor[2], TQString::tqfromLatin1( "Color2" ) );
- itemColor[3] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "color #3" ), mColor[3], defaultColor[3] );
- addItem( itemColor[3], TQString::tqfromLatin1( "Color3" ) );
+ itemColor[0] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #0" ), mColor[0], defaultColor[0] );
+ addItem( itemColor[0], TQString::fromLatin1( "Color0" ) );
+ itemColor[1] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #1" ), mColor[1], defaultColor[1] );
+ addItem( itemColor[1], TQString::fromLatin1( "Color1" ) );
+ itemColor[2] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #2" ), mColor[2], defaultColor[2] );
+ addItem( itemColor[2], TQString::fromLatin1( "Color2" ) );
+ itemColor[3] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #3" ), mColor[3], defaultColor[3] );
+ addItem( itemColor[3], TQString::fromLatin1( "Color3" ) );
TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesMouseAction;
{
KConfigSkeleton::ItemEnum::Choice choice;
- choice.name = TQString::tqfromLatin1( "Encrypt" );
+ choice.name = TQString::fromLatin1( "Encrypt" );
valuesMouseAction.append( choice );
}
{
KConfigSkeleton::ItemEnum::Choice choice;
- choice.name = TQString::tqfromLatin1( "Decrypt" );
+ choice.name = TQString::fromLatin1( "Decrypt" );
valuesMouseAction.append( choice );
}
{
KConfigSkeleton::ItemEnum::Choice choice;
- choice.name = TQString::tqfromLatin1( "CrashNBurn" );
+ choice.name = TQString::fromLatin1( "CrashNBurn" );
valuesMouseAction.append( choice );
}
{
KConfigSkeleton::ItemEnum::Choice choice;
- choice.name = TQString::tqfromLatin1( "PumpNDump" );
+ choice.name = TQString::fromLatin1( "PumpNDump" );
valuesMouseAction.append( choice );
}
KConfigSkeleton::ItemEnum *itemMouseAction[3];
- itemMouseAction[0] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "right_mouse_action" ), mMouseAction[0], valuesMouseAction, EnumMouseAction::Decrypt );
- addItem( itemMouseAction[0], TQString::tqfromLatin1( "MouseActionright" ) );
- itemMouseAction[1] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "mid_mouse_action" ), mMouseAction[1], valuesMouseAction, EnumMouseAction::Encrypt );
- addItem( itemMouseAction[1], TQString::tqfromLatin1( "MouseActionmid" ) );
- itemMouseAction[2] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "left_mouse_action" ), mMouseAction[2], valuesMouseAction, EnumMouseAction::PumpNDump );
- addItem( itemMouseAction[2], TQString::tqfromLatin1( "MouseActionleft" ) );
+ itemMouseAction[0] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "right_mouse_action" ), mMouseAction[0], valuesMouseAction, EnumMouseAction::Decrypt );
+ addItem( itemMouseAction[0], TQString::fromLatin1( "MouseActionright" ) );
+ itemMouseAction[1] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "mid_mouse_action" ), mMouseAction[1], valuesMouseAction, EnumMouseAction::Encrypt );
+ addItem( itemMouseAction[1], TQString::fromLatin1( "MouseActionmid" ) );
+ itemMouseAction[2] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "left_mouse_action" ), mMouseAction[2], valuesMouseAction, EnumMouseAction::PumpNDump );
+ addItem( itemMouseAction[2], TQString::fromLatin1( "MouseActionleft" ) );
KConfigSkeleton::ItemString *itemFooBar;
- itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "foo bar" ), mFooBar );
- addItem( itemFooBar, TQString::tqfromLatin1( "FooBar" ) );
+ itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar );
+ addItem( itemFooBar, TQString::fromLatin1( "FooBar" ) );
KConfigSkeleton::ItemInt *itemAge;
- itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Age" ), mAge, 35 );
+ itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 );
itemAge->setMinValue(8);
itemAge->setMaxValue(88);
- addItem( itemAge, TQString::tqfromLatin1( "Age" ) );
+ addItem( itemAge, TQString::fromLatin1( "Age" ) );
}
Test4::~Test4()
diff --git a/tdecore/kconfig_compiler/tests/test4.h.ref b/tdecore/kconfig_compiler/tests/test4.h.ref
index dc8691b1f..d11dd3aee 100644
--- a/tdecore/kconfig_compiler/tests/test4.h.ref
+++ b/tdecore/kconfig_compiler/tests/test4.h.ref
@@ -30,7 +30,7 @@ class Test4 : public KConfigSkeleton
static
void setColor( int i, const TQColor & v )
{
- if (!self()->isImmutable( TQString::tqfromLatin1( "Color%1" ).arg( i ) ))
+ if (!self()->isImmutable( TQString::fromLatin1( "Color%1" ).arg( i ) ))
self()->mColor[i] = v;
}
@@ -49,7 +49,7 @@ class Test4 : public KConfigSkeleton
static
void setMouseAction( int i, int v )
{
- if (!self()->isImmutable( TQString::tqfromLatin1( "MouseAction%1" ).arg( TQString::tqfromLatin1( EnumButton::enumToString[i] ) ) ))
+ if (!self()->isImmutable( TQString::fromLatin1( "MouseAction%1" ).arg( TQString::fromLatin1( EnumButton::enumToString[i] ) ) ))
self()->mMouseAction[i] = v;
}
@@ -68,7 +68,7 @@ class Test4 : public KConfigSkeleton
static
void setFooBar( const TQString & v )
{
- if (!self()->isImmutable( TQString::tqfromLatin1( "FooBar" ) ))
+ if (!self()->isImmutable( TQString::fromLatin1( "FooBar" ) ))
self()->mFooBar = v;
}
@@ -99,7 +99,7 @@ class Test4 : public KConfigSkeleton
v = 88;
}
- if (!self()->isImmutable( TQString::tqfromLatin1( "Age" ) ))
+ if (!self()->isImmutable( TQString::fromLatin1( "Age" ) ))
self()->mAge = v;
}
diff --git a/tdecore/kconfig_compiler/tests/test5.cpp.ref b/tdecore/kconfig_compiler/tests/test5.cpp.ref
index 0fc90b387..8373eb3f6 100644
--- a/tdecore/kconfig_compiler/tests/test5.cpp.ref
+++ b/tdecore/kconfig_compiler/tests/test5.cpp.ref
@@ -21,57 +21,57 @@ Test5 *Test5::self()
const char* const Test5::EnumButtonToString[] = { "right", "mid", "left" };
Test5::Test5( )
- : KConfigSkeleton( TQString::tqfromLatin1( "test4rc" ) )
+ : KConfigSkeleton( TQString::fromLatin1( "test4rc" ) )
{
mSelf = this;
- setCurrentGroup( TQString::tqfromLatin1( "Foo" ) );
+ setCurrentGroup( TQString::fromLatin1( "Foo" ) );
TQColor defaultColor[4] = { Qt::red, Qt::blue, Qt::green, Qt::black };
KConfigSkeleton::ItemColor *itemColor[4];
- itemColor[0] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "color #0" ), mColor[0], defaultColor[0] );
- addItem( itemColor[0], TQString::tqfromLatin1( "Color0" ) );
- itemColor[1] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "color #1" ), mColor[1], defaultColor[1] );
- addItem( itemColor[1], TQString::tqfromLatin1( "Color1" ) );
- itemColor[2] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "color #2" ), mColor[2], defaultColor[2] );
- addItem( itemColor[2], TQString::tqfromLatin1( "Color2" ) );
- itemColor[3] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "color #3" ), mColor[3], defaultColor[3] );
- addItem( itemColor[3], TQString::tqfromLatin1( "Color3" ) );
+ itemColor[0] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #0" ), mColor[0], defaultColor[0] );
+ addItem( itemColor[0], TQString::fromLatin1( "Color0" ) );
+ itemColor[1] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #1" ), mColor[1], defaultColor[1] );
+ addItem( itemColor[1], TQString::fromLatin1( "Color1" ) );
+ itemColor[2] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #2" ), mColor[2], defaultColor[2] );
+ addItem( itemColor[2], TQString::fromLatin1( "Color2" ) );
+ itemColor[3] = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #3" ), mColor[3], defaultColor[3] );
+ addItem( itemColor[3], TQString::fromLatin1( "Color3" ) );
TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesMouseAction;
{
KConfigSkeleton::ItemEnum::Choice choice;
- choice.name = TQString::tqfromLatin1( "Encrypt" );
+ choice.name = TQString::fromLatin1( "Encrypt" );
valuesMouseAction.append( choice );
}
{
KConfigSkeleton::ItemEnum::Choice choice;
- choice.name = TQString::tqfromLatin1( "Decrypt" );
+ choice.name = TQString::fromLatin1( "Decrypt" );
valuesMouseAction.append( choice );
}
{
KConfigSkeleton::ItemEnum::Choice choice;
- choice.name = TQString::tqfromLatin1( "CrashNBurn" );
+ choice.name = TQString::fromLatin1( "CrashNBurn" );
valuesMouseAction.append( choice );
}
{
KConfigSkeleton::ItemEnum::Choice choice;
- choice.name = TQString::tqfromLatin1( "PumpNDump" );
+ choice.name = TQString::fromLatin1( "PumpNDump" );
valuesMouseAction.append( choice );
}
KConfigSkeleton::ItemEnum *itemMouseAction[3];
- itemMouseAction[0] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "right_mouse_action" ), mMouseAction[0], valuesMouseAction, Decrypt );
- addItem( itemMouseAction[0], TQString::tqfromLatin1( "MouseActionright" ) );
- itemMouseAction[1] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "mid_mouse_action" ), mMouseAction[1], valuesMouseAction, Encrypt );
- addItem( itemMouseAction[1], TQString::tqfromLatin1( "MouseActionmid" ) );
- itemMouseAction[2] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "left_mouse_action" ), mMouseAction[2], valuesMouseAction, PumpNDump );
- addItem( itemMouseAction[2], TQString::tqfromLatin1( "MouseActionleft" ) );
+ itemMouseAction[0] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "right_mouse_action" ), mMouseAction[0], valuesMouseAction, Decrypt );
+ addItem( itemMouseAction[0], TQString::fromLatin1( "MouseActionright" ) );
+ itemMouseAction[1] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "mid_mouse_action" ), mMouseAction[1], valuesMouseAction, Encrypt );
+ addItem( itemMouseAction[1], TQString::fromLatin1( "MouseActionmid" ) );
+ itemMouseAction[2] = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "left_mouse_action" ), mMouseAction[2], valuesMouseAction, PumpNDump );
+ addItem( itemMouseAction[2], TQString::fromLatin1( "MouseActionleft" ) );
KConfigSkeleton::ItemString *itemFooBar;
- itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "foo bar" ), mFooBar );
- addItem( itemFooBar, TQString::tqfromLatin1( "FooBar" ) );
+ itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar );
+ addItem( itemFooBar, TQString::fromLatin1( "FooBar" ) );
KConfigSkeleton::ItemInt *itemAge;
- itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Age" ), mAge, 35 );
+ itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 );
itemAge->setMinValue(8);
itemAge->setMaxValue(88);
- addItem( itemAge, TQString::tqfromLatin1( "Age" ) );
+ addItem( itemAge, TQString::fromLatin1( "Age" ) );
}
Test5::~Test5()
diff --git a/tdecore/kconfig_compiler/tests/test5.h.ref b/tdecore/kconfig_compiler/tests/test5.h.ref
index 9fadbd0ec..efb9b448a 100644
--- a/tdecore/kconfig_compiler/tests/test5.h.ref
+++ b/tdecore/kconfig_compiler/tests/test5.h.ref
@@ -22,7 +22,7 @@ class Test5 : public KConfigSkeleton
static
void setColor( int i, const TQColor & v )
{
- if (!self()->isImmutable( TQString::tqfromLatin1( "Color%1" ).arg( i ) ))
+ if (!self()->isImmutable( TQString::fromLatin1( "Color%1" ).arg( i ) ))
self()->mColor[i] = v;
}
@@ -41,7 +41,7 @@ class Test5 : public KConfigSkeleton
static
void setMouseAction( int i, int v )
{
- if (!self()->isImmutable( TQString::tqfromLatin1( "MouseAction%1" ).arg( TQString::tqfromLatin1( EnumButtonToString[i] ) ) ))
+ if (!self()->isImmutable( TQString::fromLatin1( "MouseAction%1" ).arg( TQString::fromLatin1( EnumButtonToString[i] ) ) ))
self()->mMouseAction[i] = v;
}
@@ -60,7 +60,7 @@ class Test5 : public KConfigSkeleton
static
void setFooBar( const TQString & v )
{
- if (!self()->isImmutable( TQString::tqfromLatin1( "FooBar" ) ))
+ if (!self()->isImmutable( TQString::fromLatin1( "FooBar" ) ))
self()->mFooBar = v;
}
@@ -91,7 +91,7 @@ class Test5 : public KConfigSkeleton
v = 88;
}
- if (!self()->isImmutable( TQString::tqfromLatin1( "Age" ) ))
+ if (!self()->isImmutable( TQString::fromLatin1( "Age" ) ))
self()->mAge = v;
}
diff --git a/tdecore/kconfig_compiler/tests/test6.cpp.ref b/tdecore/kconfig_compiler/tests/test6.cpp.ref
index 2b8a71d50..51b96d4c4 100644
--- a/tdecore/kconfig_compiler/tests/test6.cpp.ref
+++ b/tdecore/kconfig_compiler/tests/test6.cpp.ref
@@ -4,25 +4,25 @@
#include "test6.h"
Test6::Test6( const TQString & Number )
- : KConfigSkeleton( TQString::tqfromLatin1( "test4rc" ) )
+ : KConfigSkeleton( TQString::fromLatin1( "test4rc" ) )
, mParamNumber(Number)
{
- setCurrentGroup( TQString::tqfromLatin1( "Foo" ) );
+ setCurrentGroup( TQString::fromLatin1( "Foo" ) );
KConfigSkeleton::ItemColor *itemColor;
- itemColor = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "color #%1" ).arg( mParamNumber ), mColor, TQColor( "red" ) );
- addItem( itemColor, TQString::tqfromLatin1( "Color" ) );
+ itemColor = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #%1" ).arg( mParamNumber ), mColor, TQColor( "red" ) );
+ addItem( itemColor, TQString::fromLatin1( "Color" ) );
- setCurrentGroup( TQString::tqfromLatin1( "Bar%1" ).arg( mParamNumber ) );
+ setCurrentGroup( TQString::fromLatin1( "Bar%1" ).arg( mParamNumber ) );
KConfigSkeleton::ItemString *itemFooBar;
- itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "foo bar" ), mFooBar );
- addItem( itemFooBar, TQString::tqfromLatin1( "FooBar" ) );
+ itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar );
+ addItem( itemFooBar, TQString::fromLatin1( "FooBar" ) );
KConfigSkeleton::ItemInt *itemAge;
- itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Age" ), mAge, 35 );
+ itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 );
itemAge->setMinValue(8);
itemAge->setMaxValue(88);
- addItem( itemAge, TQString::tqfromLatin1( "Age" ) );
+ addItem( itemAge, TQString::fromLatin1( "Age" ) );
}
Test6::~Test6()
diff --git a/tdecore/kconfig_compiler/tests/test6.h.ref b/tdecore/kconfig_compiler/tests/test6.h.ref
index 18615da38..6743d6064 100644
--- a/tdecore/kconfig_compiler/tests/test6.h.ref
+++ b/tdecore/kconfig_compiler/tests/test6.h.ref
@@ -18,7 +18,7 @@ class Test6 : public KConfigSkeleton
*/
void setColor( const TQColor & v )
{
- if (!isImmutable( TQString::tqfromLatin1( "Color" ) ))
+ if (!isImmutable( TQString::fromLatin1( "Color" ) ))
mColor = v;
}
@@ -35,7 +35,7 @@ class Test6 : public KConfigSkeleton
*/
void setFooBar( const TQString & v )
{
- if (!isImmutable( TQString::tqfromLatin1( "FooBar" ) ))
+ if (!isImmutable( TQString::fromLatin1( "FooBar" ) ))
mFooBar = v;
}
@@ -64,7 +64,7 @@ class Test6 : public KConfigSkeleton
v = 88;
}
- if (!isImmutable( TQString::tqfromLatin1( "Age" ) ))
+ if (!isImmutable( TQString::fromLatin1( "Age" ) ))
mAge = v;
}
diff --git a/tdecore/kconfig_compiler/tests/test7.cpp.ref b/tdecore/kconfig_compiler/tests/test7.cpp.ref
index dab0ae27d..91a22e036 100644
--- a/tdecore/kconfig_compiler/tests/test7.cpp.ref
+++ b/tdecore/kconfig_compiler/tests/test7.cpp.ref
@@ -4,25 +4,25 @@
#include "test7.h"
Test7::Test7( int Number )
- : KConfigSkeleton( TQString::tqfromLatin1( "test7rc" ) )
+ : KConfigSkeleton( TQString::fromLatin1( "test7rc" ) )
, mParamNumber(Number)
{
- setCurrentGroup( TQString::tqfromLatin1( "Foo" ) );
+ setCurrentGroup( TQString::fromLatin1( "Foo" ) );
KConfigSkeleton::ItemColor *itemColor;
- itemColor = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "color #%1" ).arg( mParamNumber ), mColor, TQColor( "red" ) );
- addItem( itemColor, TQString::tqfromLatin1( "Color" ) );
+ itemColor = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "color #%1" ).arg( mParamNumber ), mColor, TQColor( "red" ) );
+ addItem( itemColor, TQString::fromLatin1( "Color" ) );
- setCurrentGroup( TQString::tqfromLatin1( "Bar%1" ).arg( mParamNumber ) );
+ setCurrentGroup( TQString::fromLatin1( "Bar%1" ).arg( mParamNumber ) );
KConfigSkeleton::ItemString *itemFooBar;
- itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "foo bar" ), mFooBar );
- addItem( itemFooBar, TQString::tqfromLatin1( "FooBar" ) );
+ itemFooBar = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "foo bar" ), mFooBar );
+ addItem( itemFooBar, TQString::fromLatin1( "FooBar" ) );
KConfigSkeleton::ItemInt *itemAge;
- itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Age" ), mAge, 35 );
+ itemAge = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Age" ), mAge, 35 );
itemAge->setMinValue(8);
itemAge->setMaxValue(88);
- addItem( itemAge, TQString::tqfromLatin1( "Age" ) );
+ addItem( itemAge, TQString::fromLatin1( "Age" ) );
}
Test7::~Test7()
diff --git a/tdecore/kconfig_compiler/tests/test7.h.ref b/tdecore/kconfig_compiler/tests/test7.h.ref
index f67bc30cb..8f8808da1 100644
--- a/tdecore/kconfig_compiler/tests/test7.h.ref
+++ b/tdecore/kconfig_compiler/tests/test7.h.ref
@@ -18,7 +18,7 @@ class Test7 : public KConfigSkeleton
*/
void setColor( const TQColor & v )
{
- if (!isImmutable( TQString::tqfromLatin1( "Color" ) ))
+ if (!isImmutable( TQString::fromLatin1( "Color" ) ))
mColor = v;
}
@@ -35,7 +35,7 @@ class Test7 : public KConfigSkeleton
*/
void setFooBar( const TQString & v )
{
- if (!isImmutable( TQString::tqfromLatin1( "FooBar" ) ))
+ if (!isImmutable( TQString::fromLatin1( "FooBar" ) ))
mFooBar = v;
}
@@ -64,7 +64,7 @@ class Test7 : public KConfigSkeleton
v = 88;
}
- if (!isImmutable( TQString::tqfromLatin1( "Age" ) ))
+ if (!isImmutable( TQString::fromLatin1( "Age" ) ))
mAge = v;
}
diff --git a/tdecore/kconfig_compiler/tests/test8a.cpp.ref b/tdecore/kconfig_compiler/tests/test8a.cpp.ref
index 8d8925c57..f89b7c133 100644
--- a/tdecore/kconfig_compiler/tests/test8a.cpp.ref
+++ b/tdecore/kconfig_compiler/tests/test8a.cpp.ref
@@ -6,14 +6,14 @@
Test8a::Test8a( KSharedConfig::Ptr config )
: KConfigSkeleton( config )
{
- setCurrentGroup( TQString::tqfromLatin1( "Group" ) );
+ setCurrentGroup( TQString::fromLatin1( "Group" ) );
KConfigSkeleton::ItemFont *itemFont;
- itemFont = new KConfigSkeleton::ItemFont( currentGroup(), TQString::tqfromLatin1( "Font" ), mFont, KGlobalSettings::generalFont() );
- addItem( itemFont, TQString::tqfromLatin1( "Font" ) );
+ itemFont = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "Font" ), mFont, KGlobalSettings::generalFont() );
+ addItem( itemFont, TQString::fromLatin1( "Font" ) );
KConfigSkeleton::ItemFont *itemTitleFont;
- itemTitleFont = new KConfigSkeleton::ItemFont( currentGroup(), TQString::tqfromLatin1( "TitleFont" ), mTitleFont, KGlobalSettings::windowTitleFont() );
- addItem( itemTitleFont, TQString::tqfromLatin1( "TitleFont" ) );
+ itemTitleFont = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "TitleFont" ), mTitleFont, KGlobalSettings::windowTitleFont() );
+ addItem( itemTitleFont, TQString::fromLatin1( "TitleFont" ) );
}
Test8a::~Test8a()
diff --git a/tdecore/kconfig_compiler/tests/test8a.h.ref b/tdecore/kconfig_compiler/tests/test8a.h.ref
index a1ac4de64..2e947c437 100644
--- a/tdecore/kconfig_compiler/tests/test8a.h.ref
+++ b/tdecore/kconfig_compiler/tests/test8a.h.ref
@@ -19,7 +19,7 @@ class Test8a : public KConfigSkeleton
*/
void setFont( const TQFont & v )
{
- if (!isImmutable( TQString::tqfromLatin1( "Font" ) ))
+ if (!isImmutable( TQString::fromLatin1( "Font" ) ))
mFont = v;
}
@@ -36,7 +36,7 @@ class Test8a : public KConfigSkeleton
*/
void setTitleFont( const TQFont & v )
{
- if (!isImmutable( TQString::tqfromLatin1( "TitleFont" ) ))
+ if (!isImmutable( TQString::fromLatin1( "TitleFont" ) ))
mTitleFont = v;
}
diff --git a/tdecore/kconfig_compiler/tests/test8b.cpp.ref b/tdecore/kconfig_compiler/tests/test8b.cpp.ref
index 566902399..e29e3c4e7 100644
--- a/tdecore/kconfig_compiler/tests/test8b.cpp.ref
+++ b/tdecore/kconfig_compiler/tests/test8b.cpp.ref
@@ -22,20 +22,20 @@ Test8b::Test8b( )
: Test8a()
{
mSelf = this;
- setCurrentGroup( TQString::tqfromLatin1( "Group8b1" ) );
+ setCurrentGroup( TQString::fromLatin1( "Group8b1" ) );
KConfigSkeleton::ItemUInt *itemSomething;
- itemSomething = new KConfigSkeleton::ItemUInt( currentGroup(), TQString::tqfromLatin1( "Something" ), mSomething, 60 );
- addItem( itemSomething, TQString::tqfromLatin1( "Something" ) );
+ itemSomething = new KConfigSkeleton::ItemUInt( currentGroup(), TQString::fromLatin1( "Something" ), mSomething, 60 );
+ addItem( itemSomething, TQString::fromLatin1( "Something" ) );
- setCurrentGroup( TQString::tqfromLatin1( "Group8b2" ) );
+ setCurrentGroup( TQString::fromLatin1( "Group8b2" ) );
KConfigSkeleton::ItemBool *itemFooBoo;
- itemFooBoo = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "FooBoo" ), mFooBoo, false );
- addItem( itemFooBoo, TQString::tqfromLatin1( "FooBoo" ) );
+ itemFooBoo = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "FooBoo" ), mFooBoo, false );
+ addItem( itemFooBoo, TQString::fromLatin1( "FooBoo" ) );
KConfigSkeleton::ItemUInt *itemPort;
- itemPort = new KConfigSkeleton::ItemUInt( currentGroup(), TQString::tqfromLatin1( "Port" ), mPort, 1000 );
- addItem( itemPort, TQString::tqfromLatin1( "Port" ) );
+ itemPort = new KConfigSkeleton::ItemUInt( currentGroup(), TQString::fromLatin1( "Port" ), mPort, 1000 );
+ addItem( itemPort, TQString::fromLatin1( "Port" ) );
}
Test8b::~Test8b()
diff --git a/tdecore/kconfig_compiler/tests/test8b.h.ref b/tdecore/kconfig_compiler/tests/test8b.h.ref
index dfc9089e3..4ca0d5c7f 100644
--- a/tdecore/kconfig_compiler/tests/test8b.h.ref
+++ b/tdecore/kconfig_compiler/tests/test8b.h.ref
@@ -21,7 +21,7 @@ class Test8b : public Test8a
static
void setSomething( uint v )
{
- if (!self()->isImmutable( TQString::tqfromLatin1( "Something" ) ))
+ if (!self()->isImmutable( TQString::fromLatin1( "Something" ) ))
self()->mSomething = v;
}
@@ -40,7 +40,7 @@ class Test8b : public Test8a
static
void setFooBoo( bool v )
{
- if (!self()->isImmutable( TQString::tqfromLatin1( "FooBoo" ) ))
+ if (!self()->isImmutable( TQString::fromLatin1( "FooBoo" ) ))
self()->mFooBoo = v;
}
@@ -59,7 +59,7 @@ class Test8b : public Test8a
static
void setPort( uint v )
{
- if (!self()->isImmutable( TQString::tqfromLatin1( "Port" ) ))
+ if (!self()->isImmutable( TQString::fromLatin1( "Port" ) ))
self()->mPort = v;
}
diff --git a/tdecore/kconfig_compiler/tests/test9.cpp.ref b/tdecore/kconfig_compiler/tests/test9.cpp.ref
index 606f21ed1..c5d57e4d1 100644
--- a/tdecore/kconfig_compiler/tests/test9.cpp.ref
+++ b/tdecore/kconfig_compiler/tests/test9.cpp.ref
@@ -4,29 +4,29 @@
#include "test9.h"
Test9::Test9( const TQString & transport, const TQString & folder )
- : KConfigSkeleton( TQString::tqfromLatin1( "examplerc" ) )
+ : KConfigSkeleton( TQString::fromLatin1( "examplerc" ) )
, mParamtransport(transport)
, mParamfolder(folder)
{
- setCurrentGroup( TQString::tqfromLatin1( "MyOptionsXX" ) );
+ setCurrentGroup( TQString::fromLatin1( "MyOptionsXX" ) );
TQStringList defaultMyStringList;
defaultMyStringList.append( TQString::fromUtf8( "up" ) );
defaultMyStringList.append( TQString::fromUtf8( "down" ) );
KConfigSkeleton::ItemStringList *itemMyStringList;
- itemMyStringList = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::tqfromLatin1( "MyStringList" ), mMyStringList, defaultMyStringList );
- addItem( itemMyStringList, TQString::tqfromLatin1( "MyStringList" ) );
+ itemMyStringList = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "MyStringList" ), mMyStringList, defaultMyStringList );
+ addItem( itemMyStringList, TQString::fromLatin1( "MyStringList" ) );
TQStringList defaultMyPathList;
defaultMyPathList.append( TQString::fromUtf8( "/home" ) );
defaultMyPathList.append( TQString::fromUtf8( "~" ) );
KConfigSkeleton::ItemPathList *itemMyPathList;
- itemMyPathList = new KConfigSkeleton::ItemPathList( currentGroup(), TQString::tqfromLatin1( "MyPathList" ), mMyPathList, defaultMyPathList );
- addItem( itemMyPathList, TQString::tqfromLatin1( "MyPathList" ) );
+ itemMyPathList = new KConfigSkeleton::ItemPathList( currentGroup(), TQString::fromLatin1( "MyPathList" ), mMyPathList, defaultMyPathList );
+ addItem( itemMyPathList, TQString::fromLatin1( "MyPathList" ) );
KConfigSkeleton::ItemPathList *itemMyPathsList2;
- itemMyPathsList2 = new KConfigSkeleton::ItemPathList( currentGroup(), TQString::tqfromLatin1( "MyPathsList2" ), mMyPathsList2, TQStringList(TQString::tqfromLatin1("/usr/bin")) += TQDir::homeDirPath() );
- addItem( itemMyPathsList2, TQString::tqfromLatin1( "MyPathsList2" ) );
+ itemMyPathsList2 = new KConfigSkeleton::ItemPathList( currentGroup(), TQString::fromLatin1( "MyPathsList2" ), mMyPathsList2, TQStringList(TQString::fromLatin1("/usr/bin")) += TQDir::homeDirPath() );
+ addItem( itemMyPathsList2, TQString::fromLatin1( "MyPathsList2" ) );
}
Test9::~Test9()
diff --git a/tdecore/kconfig_compiler/tests/test9.h.ref b/tdecore/kconfig_compiler/tests/test9.h.ref
index 0476c8a19..66a629b48 100644
--- a/tdecore/kconfig_compiler/tests/test9.h.ref
+++ b/tdecore/kconfig_compiler/tests/test9.h.ref
@@ -19,7 +19,7 @@ class Test9 : public KConfigSkeleton
*/
void setMyStringList( const TQStringList & v )
{
- if (!isImmutable( TQString::tqfromLatin1( "MyStringList" ) ))
+ if (!isImmutable( TQString::fromLatin1( "MyStringList" ) ))
mMyStringList = v;
}
@@ -36,7 +36,7 @@ class Test9 : public KConfigSkeleton
*/
void setMyPathList( const TQStringList & v )
{
- if (!isImmutable( TQString::tqfromLatin1( "MyPathList" ) ))
+ if (!isImmutable( TQString::fromLatin1( "MyPathList" ) ))
mMyPathList = v;
}
@@ -53,7 +53,7 @@ class Test9 : public KConfigSkeleton
*/
void setMyPathsList2( const TQStringList & v )
{
- if (!isImmutable( TQString::tqfromLatin1( "MyPathsList2" ) ))
+ if (!isImmutable( TQString::fromLatin1( "MyPathsList2" ) ))
mMyPathsList2 = v;
}
diff --git a/tdecore/kconfig_compiler/tests/test9main.cpp b/tdecore/kconfig_compiler/tests/test9main.cpp
index 796ec0001..12e16e0d4 100644
--- a/tdecore/kconfig_compiler/tests/test9main.cpp
+++ b/tdecore/kconfig_compiler/tests/test9main.cpp
@@ -32,7 +32,7 @@ int main( int, char*[] )
kdWarning() << myPathsList2 << endl;
// add another path
- TQStringList newlist = TQDir::homeDirPath() + TQString::tqfromLatin1("/.kde");
+ TQStringList newlist = TQDir::homeDirPath() + TQString::fromLatin1("/.kde");
myPathsList2 = myPathsList2 + newlist;
kdWarning() << myPathsList2 << endl;
diff --git a/tdecore/kconfig_compiler/tests/test_dpointer.cpp.ref b/tdecore/kconfig_compiler/tests/test_dpointer.cpp.ref
index 00e933564..7b5f55f03 100644
--- a/tdecore/kconfig_compiler/tests/test_dpointer.cpp.ref
+++ b/tdecore/kconfig_compiler/tests/test_dpointer.cpp.ref
@@ -60,97 +60,97 @@ TestDPointer *TestDPointer::self()
}
TestDPointer::TestDPointer( )
- : KConfigSkeleton( TQString::tqfromLatin1( "korganizerrc" ) )
+ : KConfigSkeleton( TQString::fromLatin1( "korganizerrc" ) )
{
d = new TestDPointerPrivate;
mSelf = this;
- setCurrentGroup( TQString::tqfromLatin1( "General" ) );
+ setCurrentGroup( TQString::fromLatin1( "General" ) );
- d->autoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "Auto Save" ), d->autoSave, false );
+ d->autoSaveItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Auto Save" ), d->autoSave, false );
d->autoSaveItem->setLabel( i18n("Enable automatic saving of calendar") );
d->autoSaveItem->setWhatsThis( i18n("WhatsThis text for AutoSave option") );
- addItem( d->autoSaveItem, TQString::tqfromLatin1( "AutoSave" ) );
- d->autoSaveIntervalItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Auto Save Interval" ), d->autoSaveInterval, 10 );
+ addItem( d->autoSaveItem, TQString::fromLatin1( "AutoSave" ) );
+ d->autoSaveIntervalItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Auto Save Interval" ), d->autoSaveInterval, 10 );
d->autoSaveIntervalItem->setLabel( i18n("Auto Save Interval") );
- addItem( d->autoSaveIntervalItem, TQString::tqfromLatin1( "AutoSaveInterval" ) );
- d->confirmItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "Confirm Deletes" ), d->confirm, true );
+ addItem( d->autoSaveIntervalItem, TQString::fromLatin1( "AutoSaveInterval" ) );
+ d->confirmItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "Confirm Deletes" ), d->confirm, true );
d->confirmItem->setLabel( i18n("Confirm deletes") );
- addItem( d->confirmItem, TQString::tqfromLatin1( "Confirm" ) );
- d->archiveFileItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::tqfromLatin1( "Archive File" ), d->archiveFile );
+ addItem( d->confirmItem, TQString::fromLatin1( "Confirm" ) );
+ d->archiveFileItem = new KConfigSkeleton::ItemString( currentGroup(), TQString::fromLatin1( "Archive File" ), d->archiveFile );
d->archiveFileItem->setLabel( i18n("Archive File") );
- addItem( d->archiveFileItem, TQString::tqfromLatin1( "ArchiveFile" ) );
+ addItem( d->archiveFileItem, TQString::fromLatin1( "ArchiveFile" ) );
TQValueList<KConfigSkeleton::ItemEnum::Choice> valuesDestination;
{
KConfigSkeleton::ItemEnum::Choice choice;
- choice.name = TQString::tqfromLatin1( "standardDestination" );
+ choice.name = TQString::fromLatin1( "standardDestination" );
valuesDestination.append( choice );
}
{
KConfigSkeleton::ItemEnum::Choice choice;
- choice.name = TQString::tqfromLatin1( "askDestination" );
+ choice.name = TQString::fromLatin1( "askDestination" );
valuesDestination.append( choice );
}
{
KConfigSkeleton::ItemEnum::Choice choice;
- choice.name = TQString::tqfromLatin1( "argl1" );
+ choice.name = TQString::fromLatin1( "argl1" );
choice.label = i18n("Argl1 Label");
valuesDestination.append( choice );
}
{
KConfigSkeleton::ItemEnum::Choice choice;
- choice.name = TQString::tqfromLatin1( "argl2" );
+ choice.name = TQString::fromLatin1( "argl2" );
choice.whatsThis = i18n("Argl2 Whatsthis");
valuesDestination.append( choice );
}
{
KConfigSkeleton::ItemEnum::Choice choice;
- choice.name = TQString::tqfromLatin1( "argl3" );
+ choice.name = TQString::fromLatin1( "argl3" );
choice.label = i18n("Argl3 Label");
choice.whatsThis = i18n("Argl3 Whatsthis");
valuesDestination.append( choice );
}
- d->destinationItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::tqfromLatin1( "Destination" ), d->destination, valuesDestination, EnumDestination::standardDestination );
+ d->destinationItem = new KConfigSkeleton::ItemEnum( currentGroup(), TQString::fromLatin1( "Destination" ), d->destination, valuesDestination, EnumDestination::standardDestination );
d->destinationItem->setLabel( i18n("New Events/Todos Should") );
- addItem( d->destinationItem, TQString::tqfromLatin1( "Destination" ) );
+ addItem( d->destinationItem, TQString::fromLatin1( "Destination" ) );
- setCurrentGroup( TQString::tqfromLatin1( "Views" ) );
+ setCurrentGroup( TQString::fromLatin1( "Views" ) );
- d->hourSizeItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::tqfromLatin1( "Hour Size" ), d->hourSize, 10 );
+ d->hourSizeItem = new KConfigSkeleton::ItemInt( currentGroup(), TQString::fromLatin1( "Hour Size" ), d->hourSize, 10 );
d->hourSizeItem->setLabel( i18n("Hour Size") );
- addItem( d->hourSizeItem, TQString::tqfromLatin1( "HourSize" ) );
- d->selectionStartsEditorItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::tqfromLatin1( "SelectionStartsEditor" ), d->selectionStartsEditor, false );
+ addItem( d->hourSizeItem, TQString::fromLatin1( "HourSize" ) );
+ d->selectionStartsEditorItem = new KConfigSkeleton::ItemBool( currentGroup(), TQString::fromLatin1( "SelectionStartsEditor" ), d->selectionStartsEditor, false );
d->selectionStartsEditorItem->setLabel( i18n("Time range selection in agenda view starts event editor") );
- addItem( d->selectionStartsEditorItem, TQString::tqfromLatin1( "SelectionStartsEditor" ) );
+ addItem( d->selectionStartsEditorItem, TQString::fromLatin1( "SelectionStartsEditor" ) );
- setCurrentGroup( TQString::tqfromLatin1( "KOrganizer Plugins" ) );
+ setCurrentGroup( TQString::fromLatin1( "KOrganizer Plugins" ) );
TQStringList defaultSelectedPlugins;
defaultSelectedPlugins.append( TQString::fromUtf8( "holidays" ) );
defaultSelectedPlugins.append( TQString::fromUtf8( "webexport" ) );
- d->selectedPluginsItem = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::tqfromLatin1( "SelectedPlugins" ), d->selectedPlugins, defaultSelectedPlugins );
+ d->selectedPluginsItem = new KConfigSkeleton::ItemStringList( currentGroup(), TQString::fromLatin1( "SelectedPlugins" ), d->selectedPlugins, defaultSelectedPlugins );
d->selectedPluginsItem->setLabel( i18n("SelectedPlugins") );
- addItem( d->selectedPluginsItem, TQString::tqfromLatin1( "SelectedPlugins" ) );
+ addItem( d->selectedPluginsItem, TQString::fromLatin1( "SelectedPlugins" ) );
- setCurrentGroup( TQString::tqfromLatin1( "Colors" ) );
+ setCurrentGroup( TQString::fromLatin1( "Colors" ) );
- d->highlightColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "Highlight Color" ), d->highlightColor, TQColor( 100, 100, 255 ) );
+ d->highlightColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Highlight Color" ), d->highlightColor, TQColor( 100, 100, 255 ) );
d->highlightColorItem->setLabel( i18n("Highlight color") );
- addItem( d->highlightColorItem, TQString::tqfromLatin1( "HighlightColor" ) );
- d->agendaBgColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::tqfromLatin1( "Agenda Background Color" ), d->agendaBgColor, TQColor( 255, 255, 255 ) );
+ addItem( d->highlightColorItem, TQString::fromLatin1( "HighlightColor" ) );
+ d->agendaBgColorItem = new KConfigSkeleton::ItemColor( currentGroup(), TQString::fromLatin1( "Agenda Background Color" ), d->agendaBgColor, TQColor( 255, 255, 255 ) );
d->agendaBgColorItem->setLabel( i18n("Agenda view background color") );
- addItem( d->agendaBgColorItem, TQString::tqfromLatin1( "AgendaBgColor" ) );
+ addItem( d->agendaBgColorItem, TQString::fromLatin1( "AgendaBgColor" ) );
- setCurrentGroup( TQString::tqfromLatin1( "Fonts" ) );
+ setCurrentGroup( TQString::fromLatin1( "Fonts" ) );
- d->timeBarFontItem = new KConfigSkeleton::ItemFont( currentGroup(), TQString::tqfromLatin1( "TimeBar Font" ), d->timeBarFont );
+ d->timeBarFontItem = new KConfigSkeleton::ItemFont( currentGroup(), TQString::fromLatin1( "TimeBar Font" ), d->timeBarFont );
d->timeBarFontItem->setLabel( i18n("Time bar") );
- addItem( d->timeBarFontItem, TQString::tqfromLatin1( "TimeBarFont" ) );
+ addItem( d->timeBarFontItem, TQString::fromLatin1( "TimeBarFont" ) );
}
void TestDPointer::setAutoSave( bool v )
{
- if (!self()->isImmutable( TQString::tqfromLatin1( "AutoSave" ) ))
+ if (!self()->isImmutable( TQString::fromLatin1( "AutoSave" ) ))
self()->d->autoSave = v;
}
@@ -167,7 +167,7 @@ KConfigSkeleton::ItemBool *TestDPointer::autoSaveItem()
void TestDPointer::setAutoSaveInterval( int v )
{
- if (!self()->isImmutable( TQString::tqfromLatin1( "AutoSaveInterval" ) ))
+ if (!self()->isImmutable( TQString::fromLatin1( "AutoSaveInterval" ) ))
self()->d->autoSaveInterval = v;
}
@@ -184,7 +184,7 @@ KConfigSkeleton::ItemInt *TestDPointer::autoSaveIntervalItem()
void TestDPointer::setConfirm( bool v )
{
- if (!self()->isImmutable( TQString::tqfromLatin1( "Confirm" ) ))
+ if (!self()->isImmutable( TQString::fromLatin1( "Confirm" ) ))
self()->d->confirm = v;
}
@@ -201,7 +201,7 @@ KConfigSkeleton::ItemBool *TestDPointer::confirmItem()
void TestDPointer::setArchiveFile( const TQString & v )
{
- if (!self()->isImmutable( TQString::tqfromLatin1( "ArchiveFile" ) ))
+ if (!self()->isImmutable( TQString::fromLatin1( "ArchiveFile" ) ))
self()->d->archiveFile = v;
}
@@ -218,7 +218,7 @@ KConfigSkeleton::ItemString *TestDPointer::archiveFileItem()
void TestDPointer::setDestination( int v )
{
- if (!self()->isImmutable( TQString::tqfromLatin1( "Destination" ) ))
+ if (!self()->isImmutable( TQString::fromLatin1( "Destination" ) ))
self()->d->destination = v;
}
@@ -235,7 +235,7 @@ KConfigSkeleton::ItemEnum *TestDPointer::destinationItem()
void TestDPointer::setHourSize( int v )
{
- if (!self()->isImmutable( TQString::tqfromLatin1( "HourSize" ) ))
+ if (!self()->isImmutable( TQString::fromLatin1( "HourSize" ) ))
self()->d->hourSize = v;
}
@@ -252,7 +252,7 @@ KConfigSkeleton::ItemInt *TestDPointer::hourSizeItem()
void TestDPointer::setSelectionStartsEditor( bool v )
{
- if (!self()->isImmutable( TQString::tqfromLatin1( "SelectionStartsEditor" ) ))
+ if (!self()->isImmutable( TQString::fromLatin1( "SelectionStartsEditor" ) ))
self()->d->selectionStartsEditor = v;
}
@@ -269,7 +269,7 @@ KConfigSkeleton::ItemBool *TestDPointer::selectionStartsEditorItem()
void TestDPointer::setSelectedPlugins( const TQStringList & v )
{
- if (!self()->isImmutable( TQString::tqfromLatin1( "SelectedPlugins" ) ))
+ if (!self()->isImmutable( TQString::fromLatin1( "SelectedPlugins" ) ))
self()->d->selectedPlugins = v;
}
@@ -286,7 +286,7 @@ KConfigSkeleton::ItemStringList *TestDPointer::selectedPluginsItem()
void TestDPointer::setHighlightColor( const TQColor & v )
{
- if (!self()->isImmutable( TQString::tqfromLatin1( "HighlightColor" ) ))
+ if (!self()->isImmutable( TQString::fromLatin1( "HighlightColor" ) ))
self()->d->highlightColor = v;
}
@@ -303,7 +303,7 @@ KConfigSkeleton::ItemColor *TestDPointer::highlightColorItem()
void TestDPointer::setAgendaBgColor( const TQColor & v )
{
- if (!self()->isImmutable( TQString::tqfromLatin1( "AgendaBgColor" ) ))
+ if (!self()->isImmutable( TQString::fromLatin1( "AgendaBgColor" ) ))
self()->d->agendaBgColor = v;
}
@@ -320,7 +320,7 @@ KConfigSkeleton::ItemColor *TestDPointer::agendaBgColorItem()
void TestDPointer::setTimeBarFont( const TQFont & v )
{
- if (!self()->isImmutable( TQString::tqfromLatin1( "TimeBarFont" ) ))
+ if (!self()->isImmutable( TQString::fromLatin1( "TimeBarFont" ) ))
self()->d->timeBarFont = v;
}
diff --git a/tdecore/kconfigbackend.cpp b/tdecore/kconfigbackend.cpp
index 633458d41..85e44ebaa 100644
--- a/tdecore/kconfigbackend.cpp
+++ b/tdecore/kconfigbackend.cpp
@@ -256,7 +256,7 @@ void KConfigBackEnd::changeFileName(const TQString &_fileName,
if (useKDEGlobals)
mGlobalFileName = KGlobal::dirs()->saveLocation("config") +
- TQString::tqfromLatin1("kdeglobals");
+ TQString::fromLatin1("kdeglobals");
else
mGlobalFileName = TQString::null;
@@ -347,19 +347,19 @@ bool KConfigINIBackEnd::parseConfigFiles()
// Parse the general config files
if (useKDEGlobals) {
TQStringList kdercs = KGlobal::dirs()->
- findAllResources("config", TQString::tqfromLatin1("kdeglobals"));
+ findAllResources("config", TQString::fromLatin1("kdeglobals"));
#ifdef Q_WS_WIN
TQString etc_kderc = TQFile::decodeName( TQCString(getenv("WINDIR")) + "\\kderc" );
#else
- TQString etc_kderc = TQString::tqfromLatin1("/etc/kderc");
+ TQString etc_kderc = TQString::fromLatin1("/etc/kderc");
#endif
if (checkAccess(etc_kderc, R_OK))
kdercs += etc_kderc;
kdercs += KGlobal::dirs()->
- findAllResources("config", TQString::tqfromLatin1("system.kdeglobals"));
+ findAllResources("config", TQString::fromLatin1("system.kdeglobals"));
TQStringList::ConstIterator it;
diff --git a/tdecore/kconfigbase.cpp b/tdecore/kconfigbase.cpp
index 20d3f023c..0b3e05b35 100644
--- a/tdecore/kconfigbase.cpp
+++ b/tdecore/kconfigbase.cpp
@@ -1025,7 +1025,7 @@ TQDateTime KConfigBase::readDateTimeEntry( const TQString& pKey,
return readDateTimeEntry(pKey.utf8().data(), pDefault);
}
-// ### tqcurrentDateTime() as fallback ? (Harri)
+// ### currentDateTime() as fallback ? (Harri)
TQDateTime KConfigBase::readDateTimeEntry( const char *pKey,
const TQDateTime* pDefault ) const
{
@@ -1034,7 +1034,7 @@ TQDateTime KConfigBase::readDateTimeEntry( const char *pKey,
if( pDefault )
return *pDefault;
else
- return TQDateTime::tqcurrentDateTime();
+ return TQDateTime::currentDateTime();
}
TQStrList list;
@@ -1048,7 +1048,7 @@ TQDateTime KConfigBase::readDateTimeEntry( const char *pKey,
return TQDateTime( date, time );
}
- return TQDateTime::tqcurrentDateTime();
+ return TQDateTime::currentDateTime();
}
void KConfigBase::writeEntry( const TQString& pKey, const TQString& value,
@@ -1121,7 +1121,7 @@ static bool cleanHomeDirPath( TQString &path, const TQString &homeDir )
unsigned int len = homeDir.length();
// replace by "$HOME" if possible
if (len && (path.length() == len || path[len] == '/')) {
- path.replace(0, len, TQString::tqfromLatin1("$HOME"));
+ path.replace(0, len, TQString::fromLatin1("$HOME"));
return true;
} else
return false;
@@ -1135,7 +1135,7 @@ static TQString translatePath( TQString path )
// only "our" $HOME should be interpreted
path.replace('$', "$$");
- bool startsWithFile = path.tqstartsWith("file:", false);
+ bool startsWithFile = path.startsWith("file:", false);
// return original path, if it refers to another type of URL (e.g. http:/), or
// if the path is already relative to another directory
@@ -1189,7 +1189,7 @@ void KConfigBase::writePathEntry ( const char *pKey, const TQStringList &list,
{
if( list.isEmpty() )
{
- writeEntry( pKey, TQString::tqfromLatin1(""), bPersistent );
+ writeEntry( pKey, TQString::fromLatin1(""), bPersistent );
return;
}
TQStringList new_list;
@@ -1402,7 +1402,7 @@ void KConfigBase::writeEntry ( const char *pKey, const TQStrList &list,
{
if( list.isEmpty() )
{
- writeEntry( pKey, TQString::tqfromLatin1(""), bPersistent );
+ writeEntry( pKey, TQString::fromLatin1(""), bPersistent );
return;
}
TQString str_list;
@@ -1449,7 +1449,7 @@ void KConfigBase::writeEntry ( const char *pKey, const TQStringList &list,
{
if( list.isEmpty() )
{
- writeEntry( pKey, TQString::tqfromLatin1(""), bPersistent );
+ writeEntry( pKey, TQString::fromLatin1(""), bPersistent );
return;
}
TQString str_list;
diff --git a/tdecore/kconfigbase.h b/tdecore/kconfigbase.h
index 01c758da5..2f41195aa 100644
--- a/tdecore/kconfigbase.h
+++ b/tdecore/kconfigbase.h
@@ -693,7 +693,7 @@ public:
* and interpret it as a date and time.
*
* @param pKey The key to search for.
- * @param pDefault A default value ( tqcurrentDateTime() by default)
+ * @param pDefault A default value ( currentDateTime() by default)
* returned if the key was not found or if the read value cannot be
* interpreted.
* @return The value for this key.
@@ -707,7 +707,7 @@ public:
* and interpret it as a date and time.
*
* @param pKey The key to search for.
- * @param pDefault A default value ( tqcurrentDateTime() by default)
+ * @param pDefault A default value ( currentDateTime() by default)
* returned if the key was not found or if the read value cannot be
* interpreted.
* @return The value for this key.
@@ -979,7 +979,7 @@ public:
void writeEntry( const TQString& pKey, const char *pValue,
bool bPersistent = true, bool bGlobal = false,
bool bNLS = false )
- { writeEntry(pKey, TQString::tqfromLatin1(pValue), bPersistent, bGlobal, bNLS); }
+ { writeEntry(pKey, TQString::fromLatin1(pValue), bPersistent, bGlobal, bNLS); }
/**
* Write a (key/value) pair.
*
@@ -1000,7 +1000,7 @@ public:
void writeEntry( const char *pKey, const char *pValue,
bool bPersistent = true, bool bGlobal = false,
bool bNLS = false )
- { writeEntry(pKey, TQString::tqfromLatin1(pValue), bPersistent, bGlobal, bNLS); }
+ { writeEntry(pKey, TQString::fromLatin1(pValue), bPersistent, bGlobal, bNLS); }
/**
* Write a (key/value) pair.
diff --git a/tdecore/kconfigdialogmanager.cpp b/tdecore/kconfigdialogmanager.cpp
index adebca525..82567ca0b 100644
--- a/tdecore/kconfigdialogmanager.cpp
+++ b/tdecore/kconfigdialogmanager.cpp
@@ -131,13 +131,13 @@ void KConfigDialogManager::setupWidget(TQWidget *widget, KConfigSkeletonItem *it
TQVariant minValue = item->minValue();
if (minValue.isValid())
{
- if (widget->tqmetaObject()->findProperty("minValue", true) != -1)
+ if (widget->metaObject()->findProperty("minValue", true) != -1)
widget->setProperty("minValue", minValue);
}
TQVariant maxValue = item->maxValue();
if (maxValue.isValid())
{
- if (widget->tqmetaObject()->findProperty("maxValue", true) != -1)
+ if (widget->metaObject()->findProperty("maxValue", true) != -1)
widget->setProperty("maxValue", maxValue);
}
if (TQWhatsThis::textFor( widget ).isEmpty())
@@ -189,7 +189,7 @@ bool KConfigDialogManager::parseChildren(const TQWidget *widget, bool trackChang
// it again using the super class name. This fixes a problem with using QtRuby/Korundum
// widgets with KConfigXT where 'Qt::Widget' wasn't being seen a the real deal, even
// though it was a 'QWidget'.
- changedIt = changedMap.find(childWidget->tqmetaObject()->tqsuperClassName());
+ changedIt = changedMap.find(childWidget->metaObject()->superClassName());
}
if (changedIt == changedMap.end())
diff --git a/tdecore/kconfigskeleton.h b/tdecore/kconfigskeleton.h
index a43327da1..dde0779cf 100644
--- a/tdecore/kconfigskeleton.h
+++ b/tdecore/kconfigskeleton.h
@@ -376,7 +376,7 @@ public:
ItemString(const TQString & group, const TQString & key,
TQString & reference,
- const TQString & defaultValue = TQString::tqfromLatin1(""), // NOT TQString::null !!
+ const TQString & defaultValue = TQString::fromLatin1(""), // NOT TQString::null !!
Type type = Normal);
void writeConfig(KConfig * config);
@@ -396,7 +396,7 @@ public:
public:
ItemPassword(const TQString & group, const TQString & key,
TQString & reference,
- const TQString & defaultValue = TQString::tqfromLatin1("")); // NOT TQString::null !!
+ const TQString & defaultValue = TQString::fromLatin1("")); // NOT TQString::null !!
};
/**
@@ -859,7 +859,7 @@ public:
* @return The created item
*/
ItemString *addItemString(const TQString & name, TQString & reference,
- const TQString & defaultValue = TQString::tqfromLatin1(""), // NOT TQString::null !!
+ const TQString & defaultValue = TQString::fromLatin1(""), // NOT TQString::null !!
const TQString & key = TQString::null);
/**
@@ -876,7 +876,7 @@ public:
* @return The created item
*/
ItemPassword *addItemPassword(const TQString & name, TQString & reference,
- const TQString & defaultValue = TQString::tqfromLatin1(""),
+ const TQString & defaultValue = TQString::fromLatin1(""),
const TQString & key = TQString::null);
/**
@@ -893,7 +893,7 @@ public:
* @return The created item
*/
ItemPath *addItemPath(const TQString & name, TQString & reference,
- const TQString & defaultValue = TQString::tqfromLatin1(""),
+ const TQString & defaultValue = TQString::fromLatin1(""),
const TQString & key = TQString::null);
/**
diff --git a/tdecore/kdcoppropertyproxy.cpp b/tdecore/kdcoppropertyproxy.cpp
index 3742c509c..24bf6768b 100644
--- a/tdecore/kdcoppropertyproxy.cpp
+++ b/tdecore/kdcoppropertyproxy.cpp
@@ -94,7 +94,7 @@ TQValueList<TQCString> KDCOPPropertyProxy::functions( TQObject *object )
res << "bool setProperty(TQCString name,TQVariant property)";
res << "TQValueList<TQCString> propertyNames(bool super)";
- TQMetaObject *metaObj = object->tqmetaObject();
+ TQMetaObject *metaObj = object->metaObject();
TQStrList properties = metaObj->propertyNames( true );
TQStrListIterator it( properties );
for (; it.current(); ++it )
@@ -157,7 +157,7 @@ bool KDCOPPropertyProxy::processPropertyRequest( const TQCString &fun, const TQB
stream >> b;
TQValueList<TQCString> res;
- TQStrList props = object->tqmetaObject()->propertyNames( static_cast<bool>( b ) );
+ TQStrList props = object->metaObject()->propertyNames( static_cast<bool>( b ) );
TQStrListIterator it( props );
for (; it.current(); ++it )
res.append( it.current() );
@@ -328,7 +328,7 @@ bool KDCOPPropertyProxy::decodePropertyRequestInternal( const TQCString &fun, TQ
else
propName.truncate( propName.length() - 2 );
- if ( !object->tqmetaObject()->propertyNames( true ).contains( propName ) )
+ if ( !object->metaObject()->propertyNames( true ).contains( propName ) )
return false;
return true;
diff --git a/tdecore/kde-config.cpp.in b/tdecore/kde-config.cpp.in
index 4accfbc85..0fdf56e3d 100644
--- a/tdecore/kde-config.cpp.in
+++ b/tdecore/kde-config.cpp.in
@@ -32,7 +32,7 @@ bool _expandvars = false;
TQString expandvars(const char *_input)
{
- TQString result = TQString::tqfromLatin1(_input);
+ TQString result = TQString::fromLatin1(_input);
if (!_expandvars)
return result;
diff --git a/tdecore/kdebug.cpp b/tdecore/kdebug.cpp
index ed1a3d60d..2914881db 100644
--- a/tdecore/kdebug.cpp
+++ b/tdecore/kdebug.cpp
@@ -567,8 +567,8 @@ TQString kdBacktrace(int levels)
for (int i = 0; i < n; ++i)
s += TQString::number(i) +
- TQString::tqfromLatin1(": ") +
- TQString::tqfromLatin1(strings[i]) + TQString::tqfromLatin1("\n");
+ TQString::fromLatin1(": ") +
+ TQString::fromLatin1(strings[i]) + TQString::fromLatin1("\n");
s += "]\n";
if (strings)
free (strings);
diff --git a/tdecore/kdebug.h b/tdecore/kdebug.h
index fc9bb1294..a65667d1b 100644
--- a/tdecore/kdebug.h
+++ b/tdecore/kdebug.h
@@ -85,7 +85,7 @@ class TDECORE_EXPORT kdbgstream {
kdbgstream(unsigned int _area, unsigned int _level, bool _print = true) :
area(_area), level(_level), print(_print) { }
kdbgstream(const char * initialString, unsigned int _area, unsigned int _level, bool _print = true) :
- output(TQString::tqfromLatin1(initialString)), area(_area), level(_level), print(_print) { }
+ output(TQString::fromLatin1(initialString)), area(_area), level(_level), print(_print) { }
/// Copy constructor
kdbgstream(kdbgstream &str);
kdbgstream(const kdbgstream &str) :
@@ -98,7 +98,7 @@ class TDECORE_EXPORT kdbgstream {
*/
kdbgstream &operator<<(bool i) {
if (!print) return *this;
- output += TQString::tqfromLatin1(i ? "true" : "false");
+ output += TQString::fromLatin1(i ? "true" : "false");
return *this;
}
/**
diff --git a/tdecore/kdesktopfile.cpp b/tdecore/kdesktopfile.cpp
index 431a65578..ac7fd250c 100644
--- a/tdecore/kdesktopfile.cpp
+++ b/tdecore/kdesktopfile.cpp
@@ -42,7 +42,7 @@
KDesktopFile::KDesktopFile(const TQString &fileName, bool bReadOnly,
const char * resType)
- : KConfig(TQString::tqfromLatin1(""), bReadOnly, false)
+ : KConfig(TQString::fromLatin1(""), bReadOnly, false)
{
// KConfigBackEnd will try to locate the filename that is provided
// based on the resource type specified, _only_ if the filename
@@ -114,9 +114,9 @@ bool KDesktopFile::isDesktopFile(const TQString& path)
{
int len = path.length();
- if(len > 8 && path.right(8) == TQString::tqfromLatin1(".desktop"))
+ if(len > 8 && path.right(8) == TQString::fromLatin1(".desktop"))
return true;
- else if(len > 7 && path.right(7) == TQString::tqfromLatin1(".kdelnk"))
+ else if(len > 7 && path.right(7) == TQString::fromLatin1(".kdelnk"))
return true;
else
return false;
@@ -156,7 +156,7 @@ TQString KDesktopFile::translatedEntry(const char* key) const
TQString value = readEntryUntranslated(key);
TQString fName = fileName();
fName = fName.mid(fName.findRev('/')+1);
- TQString po_lookup_key = TQString::tqfromLatin1(key) + "(" + fName + "): " + value;
+ TQString po_lookup_key = TQString::fromLatin1(key) + "(" + fName + "): " + value;
TQString po_value = KGlobal::locale()->translate(po_lookup_key.utf8().data());
if (po_value == po_lookup_key)
@@ -241,33 +241,33 @@ TQStringList KDesktopFile::readActions() const
void KDesktopFile::setActionGroup(const TQString &group)
{
- setGroup(TQString::tqfromLatin1("Desktop Action ") + group);
+ setGroup(TQString::fromLatin1("Desktop Action ") + group);
}
bool KDesktopFile::hasActionGroup(const TQString &group) const
{
- return hasGroup(TQString::tqfromLatin1("Desktop Action ") + group);
+ return hasGroup(TQString::fromLatin1("Desktop Action ") + group);
}
bool KDesktopFile::hasLinkType() const
{
- return readEntry("Type") == TQString::tqfromLatin1("Link");
+ return readEntry("Type") == TQString::fromLatin1("Link");
}
bool KDesktopFile::hasApplicationType() const
{
- return readEntry("Type") == TQString::tqfromLatin1("Application");
+ return readEntry("Type") == TQString::fromLatin1("Application");
}
bool KDesktopFile::hasMimeTypeType() const
{
- return readEntry("Type") == TQString::tqfromLatin1("MimeType");
+ return readEntry("Type") == TQString::fromLatin1("MimeType");
}
bool KDesktopFile::hasDeviceType() const
{
- return readEntry("Type") == TQString::tqfromLatin1("FSDev") ||
- readEntry("Type") == TQString::tqfromLatin1("FSDevice");
+ return readEntry("Type") == TQString::fromLatin1("FSDev") ||
+ readEntry("Type") == TQString::fromLatin1("FSDevice");
}
bool KDesktopFile::tryExec() const
diff --git a/tdecore/kextsock.cpp b/tdecore/kextsock.cpp
index 5aad239bd..fcda490b8 100644
--- a/tdecore/kextsock.cpp
+++ b/tdecore/kextsock.cpp
@@ -248,7 +248,7 @@ void KExtendedSocket::setSocketStatus(int newstatus)
void KExtendedSocket::setError(int errorcode, int syserror)
{
- setqStatus(errorcode);
+ seStatus(errorcode);
d->syserror = syserror;
}
diff --git a/tdecore/kgenericfactory.tcc b/tdecore/kgenericfactory.tcc
index c3afb1b5a..330af8aa2 100644
--- a/tdecore/kgenericfactory.tcc
+++ b/tdecore/kgenericfactory.tcc
@@ -125,13 +125,13 @@ namespace KDEPrivate
TQObject *parent, const char *name,
const char *className, const TQStringList &args )
{
- TQMetaObject *tqmetaObject = Product::tqstaticMetaObject();
- while ( tqmetaObject )
+ TQMetaObject *metaObject = Product::staticMetaObject();
+ while ( metaObject )
{
- if ( !qstrcmp( className, tqmetaObject->className() ) )
+ if ( !qstrcmp( className, metaObject->className() ) )
return create( parentWidget, widgetName,
parent, name, args, Type2Type<BaseType>() );
- tqmetaObject = tqmetaObject->tqsuperClass();
+ metaObject = metaObject->superClass();
}
return 0;
}
diff --git a/tdecore/kglobal.cpp b/tdecore/kglobal.cpp
index d64974be4..b886d8d7f 100644
--- a/tdecore/kglobal.cpp
+++ b/tdecore/kglobal.cpp
@@ -127,7 +127,7 @@ void KGlobal::setActiveInstance(KInstance *i)
const TQString &
KGlobal::staticQString(const char *str)
{
- return staticQString(TQString::tqfromLatin1(str));
+ return staticQString(TQString::fromLatin1(str));
}
class KStringDict : public TQDict<TQString>
diff --git a/tdecore/kglobalaccel_win.cpp b/tdecore/kglobalaccel_win.cpp
index 674f09671..8b0c81f1a 100644
--- a/tdecore/kglobalaccel_win.cpp
+++ b/tdecore/kglobalaccel_win.cpp
@@ -311,14 +311,14 @@ void KGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence& s
if( rexPassIndex.search( pAction->methodSlotPtr() ) >= 0 && rexIndex.search( pAction->name() ) >= 0 ) {
int n = rexIndex.cap(1).toInt();
kdDebug(125) << "Calling " << pAction->methodSlotPtr() << " int = " << n << endl;
- int slot_id = pAction->objSlotPtr()->tqmetaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true );
+ int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true );
if( slot_id >= 0 ) {
QUObject o[2];
static_QUType_int.set(o+1,n);
const_cast< TQObject* >( pAction->objSlotPtr())->qt_invoke( slot_id, o );
}
} else if( rexPassInfo.search( pAction->methodSlotPtr() ) ) {
- int slot_id = pAction->objSlotPtr()->tqmetaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true );
+ int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true );
if( slot_id >= 0 ) {
QUObject o[4];
static_QUType_QString.set(o+1,pAction->name());
@@ -327,7 +327,7 @@ void KGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence& s
const_cast< TQObject* >( pAction->objSlotPtr())->qt_invoke( slot_id, o );
}
} else {
- int slot_id = pAction->objSlotPtr()->tqmetaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true );
+ int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true );
if( slot_id >= 0 )
const_cast< TQObject* >( pAction->objSlotPtr())->qt_invoke( slot_id, 0 );
}
diff --git a/tdecore/kglobalaccel_x11.cpp b/tdecore/kglobalaccel_x11.cpp
index c2f7a3829..ae1360391 100644
--- a/tdecore/kglobalaccel_x11.cpp
+++ b/tdecore/kglobalaccel_x11.cpp
@@ -407,14 +407,14 @@ void KGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence& s
if( rexPassIndex.search( pAction->methodSlotPtr() ) >= 0 && rexIndex.search( pAction->name() ) >= 0 ) {
int n = rexIndex.cap(1).toInt();
kdDebug(125) << "Calling " << pAction->methodSlotPtr() << " int = " << n << endl;
- int slot_id = pAction->objSlotPtr()->tqmetaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true );
+ int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true );
if( slot_id >= 0 ) {
TQUObject o[2];
static_TQUType_int.set(o+1,n);
const_cast< TQObject* >( pAction->objSlotPtr())->qt_invoke( slot_id, o );
}
} else if( rexPassInfo.search( pAction->methodSlotPtr() ) ) {
- int slot_id = pAction->objSlotPtr()->tqmetaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true );
+ int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true );
if( slot_id >= 0 ) {
TQUObject o[4];
static_TQUType_TQString.set(o+1,pAction->name());
@@ -423,7 +423,7 @@ void KGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence& s
const_cast< TQObject* >( pAction->objSlotPtr())->qt_invoke( slot_id, o );
}
} else {
- int slot_id = pAction->objSlotPtr()->tqmetaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true );
+ int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true );
if( slot_id >= 0 )
const_cast< TQObject* >( pAction->objSlotPtr())->qt_invoke( slot_id, 0 );
}
diff --git a/tdecore/kiconeffect.cpp b/tdecore/kiconeffect.cpp
index 9c76c7e4d..d866fa0d2 100644
--- a/tdecore/kiconeffect.cpp
+++ b/tdecore/kiconeffect.cpp
@@ -153,8 +153,8 @@ TQString KIconEffect::fingerprint(int group, int state) const
cached += ':';
cached += tmp.setNum(mValue[group][state]);
cached += ':';
- cached += mTrans[group][state] ? TQString::tqfromLatin1("trans")
- : TQString::tqfromLatin1("notrans");
+ cached += mTrans[group][state] ? TQString::fromLatin1("trans")
+ : TQString::fromLatin1("notrans");
if (mEffect[group][state] == Colorize || mEffect[group][state] == ToMonochrome)
{
cached += ':';
diff --git a/tdecore/kiconloader.cpp b/tdecore/kiconloader.cpp
index 317a56add..3c5cf7135 100644
--- a/tdecore/kiconloader.cpp
+++ b/tdecore/kiconloader.cpp
@@ -223,7 +223,7 @@ void KIconLoader::init( const TQString& _appname, KStandardDirs *_dirs )
{
if (groups[i] == 0L)
break;
- config->setGroup(TQString::tqfromLatin1(groups[i]) + "Icons");
+ config->setGroup(TQString::fromLatin1(groups[i]) + "Icons");
d->mpGroups[i].size = config->readNumEntry("Size", 0);
d->mpGroups[i].dblPixels = config->readBoolEntry("DoublePixels", false);
if (TQPixmap::defaultDepth()>8)
@@ -686,9 +686,9 @@ TQPixmap KIconLoader::loadIcon(const TQString& _name, KIcon::Group group, int si
{
key += d->mpEffect.fingerprint(group, state);
if (d->mpGroups[group].dblPixels)
- key += TQString::tqfromLatin1(":dblsize");
+ key += TQString::fromLatin1(":dblsize");
} else
- key += TQString::tqfromLatin1("noeffect");
+ key += TQString::fromLatin1("noeffect");
key += '_';
key += overlayStr;
diff --git a/tdecore/kicontheme.cpp b/tdecore/kicontheme.cpp
index 0f7d3b605..d30e254d0 100644
--- a/tdecore/kicontheme.cpp
+++ b/tdecore/kicontheme.cpp
@@ -451,13 +451,13 @@ TQString KIconTheme::current()
KConfig *config = KGlobal::config();
KConfigGroupSaver saver(config, "Icons");
*_theme = config->readEntry("Theme",defaultThemeName());
- if ( *_theme == TQString::tqfromLatin1("hicolor") ) *_theme = defaultThemeName();
+ if ( *_theme == TQString::fromLatin1("hicolor") ) *_theme = defaultThemeName();
/* if (_theme->isEmpty())
{
if (TQPixmap::defaultDepth() > 8)
*_theme = defaultThemeName();
else
- *_theme = TQString::tqfromLatin1("locolor");
+ *_theme = TQString::fromLatin1("locolor");
}*/
return *_theme;
}
@@ -511,7 +511,7 @@ void KIconTheme::reconfigure()
// static
TQString KIconTheme::defaultThemeName()
{
- return TQString::tqfromLatin1("crystalsvg");
+ return TQString::fromLatin1("crystalsvg");
}
/*** KIconThemeDir ***/
diff --git a/tdecore/kidna.cpp b/tdecore/kidna.cpp
index 1ce2c1348..ca41fecdf 100644
--- a/tdecore/kidna.cpp
+++ b/tdecore/kidna.cpp
@@ -43,12 +43,12 @@ TQString KIDNA::toAscii(const TQString &idna)
{
if (idna.length() && (idna[0] == (QChar)'.'))
{
- TQString host = TQString::tqfromLatin1(toAsciiCString(idna.mid(1)));
+ TQString host = TQString::fromLatin1(toAsciiCString(idna.mid(1)));
if (host.isEmpty())
return TQString::null; // Error
return idna[0] + host;
}
- return TQString::tqfromLatin1(toAsciiCString(idna));
+ return TQString::fromLatin1(toAsciiCString(idna));
}
TQString KIDNA::toUnicode(const TQString &idna)
diff --git a/tdecore/klocale.cpp b/tdecore/klocale.cpp
index 114746d0f..d47de5a03 100644
--- a/tdecore/klocale.cpp
+++ b/tdecore/klocale.cpp
@@ -123,7 +123,7 @@ void KLocale::initMainCatalogues(const TQString & catalog)
// don't use main catalogue if we're looking up .desktop translations
if (mainCatalogue.contains("desktop") == 0 || mainCatalogue.contains("kdesktop") == 1) {
if (maincatalogue) {
- mainCatalogue = TQString::tqfromLatin1(maincatalogue);
+ mainCatalogue = TQString::fromLatin1(maincatalogue);
}
}
@@ -312,13 +312,13 @@ void KLocale::initFormat()
KConfigGroupSaver saver(config, "Locale");
KSimpleConfig entry(locate("locale",
- TQString::tqfromLatin1("l10n/%1/entry.desktop")
+ TQString::fromLatin1("l10n/%1/entry.desktop")
.arg(m_country)), true);
entry.setGroup("KCM Locale");
// Numeric
#define readConfigEntry(key, default, save) \
- save = entry.readEntry(key, TQString::tqfromLatin1(default)); \
+ save = entry.readEntry(key, TQString::fromLatin1(default)); \
save = config->readEntry(key, save);
#define readConfigNumEntry(key, default, save, type) \
@@ -331,7 +331,7 @@ void KLocale::initFormat()
readConfigEntry("DecimalSymbol", ".", m_decimalSymbol);
readConfigEntry("ThousandsSeparator", ",", m_thousandsSeparator);
- m_thousandsSeparator.replace( TQString::tqfromLatin1("$0"), TQString() );
+ m_thousandsSeparator.replace( TQString::fromLatin1("$0"), TQString() );
//kdDebug(173) << "m_thousandsSeparator=" << m_thousandsSeparator << endl;
readConfigEntry("PositiveSign", "", m_positiveSign);
@@ -342,7 +342,7 @@ void KLocale::initFormat()
readConfigEntry("MonetaryDecimalSymbol", ".", m_monetaryDecimalSymbol);
readConfigEntry("MonetaryThousandsSeparator", ",",
m_monetaryThousandsSeparator);
- m_monetaryThousandsSeparator.replace(TQString::tqfromLatin1("$0"), TQString());
+ m_monetaryThousandsSeparator.replace(TQString::fromLatin1("$0"), TQString());
readConfigNumEntry("FracDigits", 2, m_fracDigits, int);
readConfigBoolEntry("PositivePrefixCurrencySymbol", true,
@@ -372,7 +372,7 @@ void KLocale::initFormat()
//Grammatical
//Precedence here is l10n / i18n / config file
KSimpleConfig language(locate("locale",
- TQString::tqfromLatin1("%1/entry.desktop")
+ TQString::fromLatin1("%1/entry.desktop")
.arg(m_language)), true);
language.setGroup("KCM Locale");
#define read3ConfigBoolEntry(key, default, save) \
@@ -404,7 +404,7 @@ bool KLocale::setCountry(const TQString & country)
TQString KLocale::catalogueFileName(const TQString & language,
const KCatalogue & catalog)
{
- TQString path = TQString::tqfromLatin1("%1/LC_MESSAGES/%2.mo")
+ TQString path = TQString::fromLatin1("%1/LC_MESSAGES/%2.mo")
.arg( language )
.arg( catalog.name() );
@@ -497,7 +497,7 @@ bool KLocale::isApplicationTranslatedInto( const TQString & language)
TQString appName = d->appName;
if (maincatalogue) {
- appName = TQString::tqfromLatin1(maincatalogue);
+ appName = TQString::fromLatin1(maincatalogue);
}
// sorry, catalogueFileName requires catalog object,k which we do not have here
// path finding was supposed to be moved completely to KCatalogue. The interface cannot
@@ -505,7 +505,7 @@ bool KLocale::isApplicationTranslatedInto( const TQString & language)
// duplicated code for file path evaluation. Cleanup will follow later. We could have e.g.
// a static method in KCataloge that can translate between these file names.
// a stat
- TQString sFileName = TQString::tqfromLatin1("%1/LC_MESSAGES/%2.mo")
+ TQString sFileName = TQString::fromLatin1("%1/LC_MESSAGES/%2.mo")
.arg( language )
.arg( appName );
// kdDebug() << "isApplicationTranslatedInto: filename " << sFileName << endl;
@@ -1948,8 +1948,8 @@ TQString KLocale::formatTime(const TQTime &pTime, bool includeSecs, bool isDurat
bool KLocale::use12Clock() const
{
- if ((timeFormat().contains(TQString::tqfromLatin1("%I")) > 0) ||
- (timeFormat().contains(TQString::tqfromLatin1("%l")) > 0))
+ if ((timeFormat().contains(TQString::fromLatin1("%I")) > 0) ||
+ (timeFormat().contains(TQString::fromLatin1("%l")) > 0))
return true;
else
return false;
@@ -1957,7 +1957,7 @@ bool KLocale::use12Clock() const
TQString KLocale::languages() const
{
- return d->languageList.join( TQString::tqfromLatin1(":") );
+ return d->languageList.join( TQString::fromLatin1(":") );
}
TQStringList KLocale::languageList() const
@@ -2008,7 +2008,7 @@ void KLocale::initInstance()
KInstance *app = KGlobal::instance();
if (app) {
- KGlobal::_locale = new KLocale(TQString::tqfromLatin1(app->instanceName()));
+ KGlobal::_locale = new KLocale(TQString::fromLatin1(app->instanceName()));
// only do this for the global instance
TQTextCodec::setCodecForLocale(KGlobal::_locale->codecForEncoding());
@@ -2265,12 +2265,12 @@ void KLocale::setMeasureSystem(MeasureSystem value)
TQString KLocale::defaultLanguage()
{
- return TQString::tqfromLatin1("en_US");
+ return TQString::fromLatin1("en_US");
}
TQString KLocale::defaultCountry()
{
- return TQString::tqfromLatin1("C");
+ return TQString::fromLatin1("C");
}
const char * KLocale::encoding() const
@@ -2325,7 +2325,7 @@ TQStringList KLocale::languagesTwoAlpha() const
TQStringList result;
- KConfig config(TQString::tqfromLatin1("language.codes"), true, false);
+ KConfig config(TQString::fromLatin1("language.codes"), true, false);
config.setGroup("TwoLetterCodes");
for ( TQStringList::ConstIterator it = origList.begin();
@@ -2466,7 +2466,7 @@ KLocale & KLocale::operator=(const KLocale & rhs)
}
bool KLocale::setCharset(const TQString & ) { return true; }
-TQString KLocale::charset() const { return TQString::tqfromLatin1("UTF-8"); }
+TQString KLocale::charset() const { return TQString::fromLatin1("UTF-8"); }
// KDE4: remove
#if 0
diff --git a/tdecore/knotifyclient.cpp b/tdecore/knotifyclient.cpp
index c219cef28..e07522fca 100644
--- a/tdecore/knotifyclient.cpp
+++ b/tdecore/knotifyclient.cpp
@@ -86,7 +86,7 @@ static int sendNotifyEvent(const TQString &message, const TQString &text,
// knotify daemon needs toplevel window
TQWidget* widget = TQT_TQWIDGET(TQWidget::find( (WId)winId ));
if( widget )
- winId = (int)widget->tqtopLevelWidget()->winId();
+ winId = (int)widget->topLevelWidget()->winId();
TQByteArray data;
TQDataStream ds(data, IO_WriteOnly);
@@ -126,20 +126,20 @@ int KNotifyClient::event( int winId, StandardEvent type, const TQString& text )
TQString message;
switch ( type ) {
case cannotOpenFile:
- message = TQString::tqfromLatin1("cannotopenfile");
+ message = TQString::fromLatin1("cannotopenfile");
break;
case warning:
- message = TQString::tqfromLatin1("warning");
+ message = TQString::fromLatin1("warning");
break;
case fatalError:
- message = TQString::tqfromLatin1("fatalerror");
+ message = TQString::fromLatin1("fatalerror");
break;
case catastrophe:
- message = TQString::tqfromLatin1("catastrophe");
+ message = TQString::fromLatin1("catastrophe");
break;
case notification: // fall through
default:
- message = TQString::tqfromLatin1("notification");
+ message = TQString::fromLatin1("notification");
break;
}
diff --git a/tdecore/kprocess.h b/tdecore/kprocess.h
index 65496bf10..7e9941717 100644
--- a/tdecore/kprocess.h
+++ b/tdecore/kprocess.h
@@ -606,7 +606,7 @@ signals:
* data structures before returning from the slot.
* Example:
* \code
- * TQString myBuf = TQString::tqfromLatin1(buffer, buflen);
+ * TQString myBuf = TQString::fromLatin1(buffer, buflen);
* \endcode
**/
void receivedStdout(KProcess *proc, char *buffer, int buflen);
diff --git a/tdecore/kprotocolinfo_tdecore.cpp b/tdecore/kprotocolinfo_tdecore.cpp
index 93692c735..943ad1b9a 100644
--- a/tdecore/kprotocolinfo_tdecore.cpp
+++ b/tdecore/kprotocolinfo_tdecore.cpp
@@ -392,7 +392,7 @@ TQString KProtocolInfo::icon( const TQString& _protocol )
{
KProtocolInfo::Ptr prot = KProtocolInfoFactory::self()->findProtocol(_protocol);
if ( !prot )
- return TQString::tqfromLatin1("unknown");
+ return TQString::fromLatin1("unknown");
return prot->m_icon;
}
diff --git a/tdecore/ksavefile.cpp b/tdecore/ksavefile.cpp
index 72625a9ca..cddf44bc5 100644
--- a/tdecore/ksavefile.cpp
+++ b/tdecore/ksavefile.cpp
@@ -55,7 +55,7 @@ KSaveFile::KSaveFile(const TQString &filename, int mode)
return;
}
- if (mTempFile.create(real_filename, TQString::tqfromLatin1(".new"), mode))
+ if (mTempFile.create(real_filename, TQString::fromLatin1(".new"), mode))
{
mFileName = real_filename; // Set filename upon success
diff --git a/tdecore/ksavefile.h b/tdecore/ksavefile.h
index 7cf4bc7e9..e035115a9 100644
--- a/tdecore/ksavefile.h
+++ b/tdecore/ksavefile.h
@@ -140,7 +140,7 @@ public:
*/
static bool backupFile( const TQString& filename,
const TQString& backupDir = TQString::null,
- const TQString& backupExtension = TQString::tqfromLatin1( "~" ) );
+ const TQString& backupExtension = TQString::fromLatin1( "~" ) );
private:
TQString mFileName;
diff --git a/tdecore/ksimpleconfig.cpp b/tdecore/ksimpleconfig.cpp
index 15597826d..6b4e13a14 100644
--- a/tdecore/ksimpleconfig.cpp
+++ b/tdecore/ksimpleconfig.cpp
@@ -38,7 +38,7 @@
#include "ksimpleconfig.h"
KSimpleConfig::KSimpleConfig(const TQString &fileName, bool bReadOnly)
- : KConfig(TQString::tqfromLatin1(""), bReadOnly, false)
+ : KConfig(TQString::fromLatin1(""), bReadOnly, false)
{
// the difference between KConfig and KSimpleConfig is just that
// for KSimpleConfig an absolute filename is guaranteed
diff --git a/tdecore/ksockaddr.cpp b/tdecore/ksockaddr.cpp
index 6ce802716..899f32dba 100644
--- a/tdecore/ksockaddr.cpp
+++ b/tdecore/ksockaddr.cpp
@@ -587,7 +587,7 @@ TQString KInetSocketAddress::nodeName() const
return i18n("<empty>");
}
- return TQString::tqfromLatin1(buf); // FIXME! What's the encoding?
+ return TQString::fromLatin1(buf); // FIXME! What's the encoding?
}
TQString KInetSocketAddress::serviceName() const
@@ -717,7 +717,7 @@ TQString KInetSocketAddress::addrToString(int family, const void* addr)
{
char buf[INET6_ADDRSTRLEN+1];
- return TQString::tqfromLatin1(inet_ntop(family, addr, buf, INET6_ADDRSTRLEN));
+ return TQString::fromLatin1(inet_ntop(family, addr, buf, INET6_ADDRSTRLEN));
}
bool KInetSocketAddress::stringToAddr(int family, const char *text, void *dest)
diff --git a/tdecore/kstandarddirs.cpp b/tdecore/kstandarddirs.cpp
index 038b5ce06..f9aaae586 100644
--- a/tdecore/kstandarddirs.cpp
+++ b/tdecore/kstandarddirs.cpp
@@ -159,7 +159,7 @@ TQStringList KStandardDirs::allTypes() const
{
TQStringList list;
for (int i = 0; types[i] != 0; ++i)
- list.append(TQString::tqfromLatin1(types[i]));
+ list.append(TQString::fromLatin1(types[i]));
return list;
}
@@ -762,9 +762,9 @@ void KStandardDirs::createSpecialResource(const char *type)
#else //UNIX
if (relink)
{
- TQString srv = findExe(TQString::tqfromLatin1("lnusertemp"), kfsstnd_defaultbindir());
+ TQString srv = findExe(TQString::fromLatin1("lnusertemp"), kfsstnd_defaultbindir());
if (srv.isEmpty())
- srv = findExe(TQString::tqfromLatin1("lnusertemp"));
+ srv = findExe(TQString::fromLatin1("lnusertemp"));
if (!srv.isEmpty())
{
system(TQFile::encodeName(srv)+" "+type);
@@ -1272,11 +1272,11 @@ TQString KStandardDirs::kfsstnd_defaultbindir()
if (!s->defaultbindir.isEmpty())
return s->defaultbindir;
#ifdef Q_WS_WIN
- s->defaultbindir = kfsstnd_defaultprefix() + TQString::tqfromLatin1("/bin");
+ s->defaultbindir = kfsstnd_defaultprefix() + TQString::fromLatin1("/bin");
#else //UNIX
s->defaultbindir = __KDE_BINDIR;
if (s->defaultbindir.isEmpty())
- s->defaultbindir = kfsstnd_defaultprefix() + TQString::tqfromLatin1("/bin");
+ s->defaultbindir = kfsstnd_defaultprefix() + TQString::fromLatin1("/bin");
#endif
if (s->defaultbindir.isEmpty())
kdWarning() << "KStandardDirs::kfsstnd_defaultbindir(): default binary KDE dir not found!" << endl;
@@ -1543,7 +1543,7 @@ bool KStandardDirs::addCustomized(KConfig *config)
addedCustoms = true;
// reading the prefixes in
- TQString group = TQString::tqfromLatin1("Directories");
+ TQString group = TQString::fromLatin1("Directories");
config->setGroup(group);
TQString kioskAdmin = config->readEntry("kioskAdmin");
@@ -1623,7 +1623,7 @@ bool KStandardDirs::addCustomized(KConfig *config)
if (profiles.isEmpty())
break;
profile = profiles.back();
- group = TQString::tqfromLatin1("Directories-%1").arg(profile);
+ group = TQString::fromLatin1("Directories-%1").arg(profile);
profiles.pop_back();
priority = true;
}
diff --git a/tdecore/kstartupinfo.cpp b/tdecore/kstartupinfo.cpp
index 00a9f5b81..f201b70c0 100644
--- a/tdecore/kstartupinfo.cpp
+++ b/tdecore/kstartupinfo.cpp
@@ -381,7 +381,7 @@ bool KStartupInfo::sendStartup( const KStartupInfoId& id_P, const KStartupInfoDa
if( id_P.none())
return false;
KXMessages msgs;
- TQString msg = TQString::tqfromLatin1( "new: %1 %2" )
+ TQString msg = TQString::fromLatin1( "new: %1 %2" )
.arg( id_P.to_text()).arg( data_P.to_text());
msg = check_required_startup_fields( msg, data_P, qt_xscreen());
kdDebug( 172 ) << "sending " << msg << endl;
@@ -394,7 +394,7 @@ bool KStartupInfo::sendStartupX( Display* disp_P, const KStartupInfoId& id_P,
{
if( id_P.none())
return false;
- TQString msg = TQString::tqfromLatin1( "new: %1 %2" )
+ TQString msg = TQString::fromLatin1( "new: %1 %2" )
.arg( id_P.to_text()).arg( data_P.to_text());
msg = check_required_startup_fields( msg, data_P, DefaultScreen( disp_P ));
#ifdef KSTARTUPINFO_ALL_DEBUG
@@ -425,7 +425,7 @@ bool KStartupInfo::sendChange( const KStartupInfoId& id_P, const KStartupInfoDat
if( id_P.none())
return false;
KXMessages msgs;
- TQString msg = TQString::tqfromLatin1( "change: %1 %2" )
+ TQString msg = TQString::fromLatin1( "change: %1 %2" )
.arg( id_P.to_text()).arg( data_P.to_text());
kdDebug( 172 ) << "sending " << msg << endl;
msgs.broadcastMessage( NET_STARTUP_MSG, msg, -1, false );
@@ -437,7 +437,7 @@ bool KStartupInfo::sendChangeX( Display* disp_P, const KStartupInfoId& id_P,
{
if( id_P.none())
return false;
- TQString msg = TQString::tqfromLatin1( "change: %1 %2" )
+ TQString msg = TQString::fromLatin1( "change: %1 %2" )
.arg( id_P.to_text()).arg( data_P.to_text());
#ifdef KSTARTUPINFO_ALL_DEBUG
kdDebug( 172 ) << "sending " << msg << endl;
@@ -450,7 +450,7 @@ bool KStartupInfo::sendFinish( const KStartupInfoId& id_P )
if( id_P.none())
return false;
KXMessages msgs;
- TQString msg = TQString::tqfromLatin1( "remove: %1" ).arg( id_P.to_text());
+ TQString msg = TQString::fromLatin1( "remove: %1" ).arg( id_P.to_text());
kdDebug( 172 ) << "sending " << msg << endl;
msgs.broadcastMessage( NET_STARTUP_MSG, msg, -1, false );
return true;
@@ -460,7 +460,7 @@ bool KStartupInfo::sendFinishX( Display* disp_P, const KStartupInfoId& id_P )
{
if( id_P.none())
return false;
- TQString msg = TQString::tqfromLatin1( "remove: %1" ).arg( id_P.to_text());
+ TQString msg = TQString::fromLatin1( "remove: %1" ).arg( id_P.to_text());
#ifdef KSTARTUPINFO_ALL_DEBUG
kdDebug( 172 ) << "sending " << msg << endl;
#endif
@@ -472,7 +472,7 @@ bool KStartupInfo::sendFinish( const KStartupInfoId& id_P, const KStartupInfoDat
// if( id_P.none()) // id may be none, the pids and hostname matter then
// return false;
KXMessages msgs;
- TQString msg = TQString::tqfromLatin1( "remove: %1 %2" )
+ TQString msg = TQString::fromLatin1( "remove: %1 %2" )
.arg( id_P.to_text()).arg( data_P.to_text());
kdDebug( 172 ) << "sending " << msg << endl;
msgs.broadcastMessage( NET_STARTUP_MSG, msg, -1, false );
@@ -484,7 +484,7 @@ bool KStartupInfo::sendFinishX( Display* disp_P, const KStartupInfoId& id_P,
{
// if( id_P.none()) // id may be none, the pids and hostname matter then
// return false;
- TQString msg = TQString::tqfromLatin1( "remove: %1 %2" )
+ TQString msg = TQString::fromLatin1( "remove: %1 %2" )
.arg( id_P.to_text()).arg( data_P.to_text());
#ifdef KSTARTUPINFO_ALL_DEBUG
kdDebug( 172 ) << "sending " << msg << endl;
@@ -955,14 +955,14 @@ const TQCString& KStartupInfoId::id() const
TQString KStartupInfoId::to_text() const
{
- return TQString::tqfromLatin1( " ID=\"%1\" " ).arg( escape_str( id()));
+ return TQString::fromLatin1( " ID=\"%1\" " ).arg( escape_str( id()));
}
KStartupInfoId::KStartupInfoId( const TQString& txt_P )
{
d = new KStartupInfoIdPrivate;
TQStringList items = get_fields( txt_P );
- const TQString id_str = TQString::tqfromLatin1( "ID=" );
+ const TQString id_str = TQString::fromLatin1( "ID=" );
for( TQStringList::Iterator it = items.begin();
it != items.end();
++it )
@@ -1124,34 +1124,34 @@ TQString KStartupInfoData::to_text() const
{
TQString ret = "";
if( !d->bin.isEmpty())
- ret += TQString::tqfromLatin1( " BIN=\"%1\"" ).arg( escape_str( d->bin ));
+ ret += TQString::fromLatin1( " BIN=\"%1\"" ).arg( escape_str( d->bin ));
if( !d->name.isEmpty())
- ret += TQString::tqfromLatin1( " NAME=\"%1\"" ).arg( escape_str( d->name ));
+ ret += TQString::fromLatin1( " NAME=\"%1\"" ).arg( escape_str( d->name ));
if( !d->description.isEmpty())
- ret += TQString::tqfromLatin1( " DESCRIPTION=\"%1\"" ).arg( escape_str( d->description ));
+ ret += TQString::fromLatin1( " DESCRIPTION=\"%1\"" ).arg( escape_str( d->description ));
if( !d->icon.isEmpty())
- ret += TQString::tqfromLatin1( " ICON=%1" ).arg( d->icon );
+ ret += TQString::fromLatin1( " ICON=%1" ).arg( d->icon );
if( d->desktop != 0 )
- ret += TQString::tqfromLatin1( " DESKTOP=%1" )
+ ret += TQString::fromLatin1( " DESKTOP=%1" )
.arg( d->desktop == NET::OnAllDesktops ? NET::OnAllDesktops : d->desktop - 1 ); // spec counts from 0
if( !d->wmclass.isEmpty())
- ret += TQString::tqfromLatin1( " WMCLASS=\"%1\"" ).arg( QString(d->wmclass) );
+ ret += TQString::fromLatin1( " WMCLASS=\"%1\"" ).arg( QString(d->wmclass) );
if( !d->hostname.isEmpty())
- ret += TQString::tqfromLatin1( " HOSTNAME=%1" ).arg( QString(d->hostname) );
+ ret += TQString::fromLatin1( " HOSTNAME=%1" ).arg( QString(d->hostname) );
for( TQValueList< pid_t >::ConstIterator it = d->pids.begin();
it != d->pids.end();
++it )
- ret += TQString::tqfromLatin1( " PID=%1" ).arg( *it );
+ ret += TQString::fromLatin1( " PID=%1" ).arg( *it );
if( d->silent != Unknown )
- ret += TQString::tqfromLatin1( " SILENT=%1" ).arg( d->silent == Yes ? 1 : 0 );
+ ret += TQString::fromLatin1( " SILENT=%1" ).arg( d->silent == Yes ? 1 : 0 );
if( d->timestamp != -1U )
- ret += TQString::tqfromLatin1( " TIMESTAMP=%1" ).arg( d->timestamp );
+ ret += TQString::fromLatin1( " TIMESTAMP=%1" ).arg( d->timestamp );
if( d->screen != -1 )
- ret += TQString::tqfromLatin1( " SCREEN=%1" ).arg( d->screen );
+ ret += TQString::fromLatin1( " SCREEN=%1" ).arg( d->screen );
if( d->xinerama != -1 )
- ret += TQString::tqfromLatin1( " XINERAMA=%1" ).arg( d->xinerama );
+ ret += TQString::fromLatin1( " XINERAMA=%1" ).arg( d->xinerama );
if( d->launched_by != 0 )
- ret += TQString::tqfromLatin1( " LAUNCHED_BY=%1" ).arg( d->launched_by );
+ ret += TQString::fromLatin1( " LAUNCHED_BY=%1" ).arg( d->launched_by );
return ret;
}
@@ -1159,19 +1159,19 @@ KStartupInfoData::KStartupInfoData( const TQString& txt_P )
{
d = new KStartupInfoDataPrivate;
TQStringList items = get_fields( txt_P );
- const TQString bin_str = TQString::tqfromLatin1( "BIN=" );
- const TQString name_str = TQString::tqfromLatin1( "NAME=" );
- const TQString description_str = TQString::tqfromLatin1( "DESCRIPTION=" );
- const TQString icon_str = TQString::tqfromLatin1( "ICON=" );
- const TQString desktop_str = TQString::tqfromLatin1( "DESKTOP=" );
- const TQString wmclass_str = TQString::tqfromLatin1( "WMCLASS=" );
- const TQString hostname_str = TQString::tqfromLatin1( "HOSTNAME=" ); // SELI nonstd
- const TQString pid_str = TQString::tqfromLatin1( "PID=" ); // SELI nonstd
- const TQString silent_str = TQString::tqfromLatin1( "SILENT=" );
- const TQString timestamp_str = TQString::tqfromLatin1( "TIMESTAMP=" );
- const TQString screen_str = TQString::tqfromLatin1( "SCREEN=" );
- const TQString xinerama_str = TQString::tqfromLatin1( "XINERAMA=" );
- const TQString launched_by_str = TQString::tqfromLatin1( "LAUNCHED_BY=" );
+ const TQString bin_str = TQString::fromLatin1( "BIN=" );
+ const TQString name_str = TQString::fromLatin1( "NAME=" );
+ const TQString description_str = TQString::fromLatin1( "DESCRIPTION=" );
+ const TQString icon_str = TQString::fromLatin1( "ICON=" );
+ const TQString desktop_str = TQString::fromLatin1( "DESKTOP=" );
+ const TQString wmclass_str = TQString::fromLatin1( "WMCLASS=" );
+ const TQString hostname_str = TQString::fromLatin1( "HOSTNAME=" ); // SELI nonstd
+ const TQString pid_str = TQString::fromLatin1( "PID=" ); // SELI nonstd
+ const TQString silent_str = TQString::fromLatin1( "SILENT=" );
+ const TQString timestamp_str = TQString::fromLatin1( "TIMESTAMP=" );
+ const TQString screen_str = TQString::fromLatin1( "SCREEN=" );
+ const TQString xinerama_str = TQString::fromLatin1( "XINERAMA=" );
+ const TQString launched_by_str = TQString::fromLatin1( "LAUNCHED_BY=" );
for( TQStringList::Iterator it = items.begin();
it != items.end();
++it )
diff --git a/tdecore/ksycoca.cpp b/tdecore/ksycoca.cpp
index 3a655d617..f95062fa0 100644
--- a/tdecore/ksycoca.cpp
+++ b/tdecore/ksycoca.cpp
@@ -178,7 +178,7 @@ bool KSycoca::openDatabase( bool openDummyIfNotFound )
// We open a dummy database instead.
//kdDebug(7011) << "No database, opening a dummy one." << endl;
TQBuffer *buffer = new TQBuffer();
- buffer->tqsetBufferFromCopy(TQByteArray());
+ buffer->setBuffer(TQByteArray());
buffer->open(IO_ReadWrite);
m_str = new TQDataStream( buffer);
(*m_str) << (TQ_INT32) KSYCOCA_VERSION;
diff --git a/tdecore/ktimezones.cpp b/tdecore/ktimezones.cpp
index dbd589d85..77a0cca0f 100644
--- a/tdecore/ktimezones.cpp
+++ b/tdecore/ktimezones.cpp
@@ -285,12 +285,12 @@ int KTimezone::offset(Qt::TimeSpec basisSpec) const
char *originalZone = ::getenv("TZ");
// Get the time in the current timezone.
- TQDateTime basisTime = TQDateTime::tqcurrentDateTime(basisSpec);
+ TQDateTime basisTime = TQDateTime::currentDateTime(basisSpec);
// Set the timezone and find out what time it is there compared to the basis.
::setenv("TZ", m_name.utf8(), 1);
tzset();
- TQDateTime remoteTime = TQDateTime::tqcurrentDateTime(Qt::LocalTime);
+ TQDateTime remoteTime = TQDateTime::currentDateTime(Qt::LocalTime);
int offset = remoteTime.secsTo(basisTime);
// Now restore things
diff --git a/tdecore/kurl.cpp b/tdecore/kurl.cpp
index f6c3fd19b..e8b2e2dd8 100644
--- a/tdecore/kurl.cpp
+++ b/tdecore/kurl.cpp
@@ -471,13 +471,13 @@ KURL::KURL( const TQString &url, int encoding_hint )
KURL::KURL( const char * url, int encoding_hint )
{
reset();
- parse( TQString::tqfromLatin1(url), encoding_hint );
+ parse( TQString::fromLatin1(url), encoding_hint );
}
KURL::KURL( const TQCString& url, int encoding_hint )
{
reset();
- parse( TQString::tqfromLatin1(url), encoding_hint );
+ parse( TQString::fromLatin1(url), encoding_hint );
}
KURL::KURL( const KURL& _u )
@@ -1040,7 +1040,7 @@ KURL& KURL::operator=( const TQString& _url )
KURL& KURL::operator=( const char * _url )
{
reset();
- parse( TQString::tqfromLatin1(_url) );
+ parse( TQString::fromLatin1(_url) );
return *this;
}
@@ -2150,7 +2150,7 @@ TQMap< TQString, TQString > KURL::queryItems( int options, int encoding_hint ) c
name = name.lower();
TQString value = (*it).mid( equal_pos + 1 );
if ( value.isEmpty() )
- result.insert( name, TQString::tqfromLatin1("") );
+ result.insert( name, TQString::fromLatin1("") );
else {
// ### why is decoding name not necessary?
value.replace( '+', ' ' ); // + in queries means space
@@ -2191,7 +2191,7 @@ TQString KURL::queryItem( const TQString& _item, int encoding_hint ) const
return decode_string( str, encoding_hint );
}
else // empty value
- return TQString::tqfromLatin1("");
+ return TQString::fromLatin1("");
}
}
diff --git a/tdecore/kurl.h b/tdecore/kurl.h
index 9cfac2885..6ed5dc652 100644
--- a/tdecore/kurl.h
+++ b/tdecore/kurl.h
@@ -281,7 +281,7 @@ public:
* See TQTextCodec::mibEnum()
*
* @see fromPathOrURL()
- * @see TQString::tqfromLatin1()
+ * @see TQString::fromLatin1()
*/
KURL( const char * url, int encoding_hint = 0 );
/**
@@ -307,7 +307,7 @@ public:
* See TQTextCodec::mibEnum()
*
* @see fromPathOrURL()
- * @see TQString::tqfromLatin1()
+ * @see TQString::fromLatin1()
*/
KURL( const TQCString& url, int encoding_hint = 0 );
diff --git a/tdecore/network/kclientsocketbase.cpp b/tdecore/network/kclientsocketbase.cpp
index 9785ce36c..f8f993a08 100644
--- a/tdecore/network/kclientsocketbase.cpp
+++ b/tdecore/network/kclientsocketbase.cpp
@@ -148,7 +148,7 @@ bool KClientSocketBase::lookup()
{
if (d->localResolver.serviceName().isNull() &&
!d->localResolver.nodeName().isNull())
- d->localResolver.setServiceName(TQString::tqfromLatin1(""));
+ d->localResolver.setServiceName(TQString::fromLatin1(""));
// don't restart the lookups if they had succeeded and
// the input values weren't changed
diff --git a/tdecore/network/khttpproxysocketdevice.cpp b/tdecore/network/khttpproxysocketdevice.cpp
index 648f4e571..f61559bfb 100644
--- a/tdecore/network/khttpproxysocketdevice.cpp
+++ b/tdecore/network/khttpproxysocketdevice.cpp
@@ -153,7 +153,7 @@ bool KHttpProxySocketDevice::connect(const TQString& node, const TQString& servi
setState(0); // unset open flag
// prepare the request
- TQString request = TQString::tqfromLatin1("CONNECT %1:%2 HTTP/1.1\r\n"
+ TQString request = TQString::fromLatin1("CONNECT %1:%2 HTTP/1.1\r\n"
"Cache-Control: no-cache\r\n"
"Host: \r\n"
"\r\n");
diff --git a/tdecore/network/kresolver.cpp b/tdecore/network/kresolver.cpp
index 93c029b8e..1a2b062c4 100644
--- a/tdecore/network/kresolver.cpp
+++ b/tdecore/network/kresolver.cpp
@@ -915,7 +915,7 @@ TQString KResolver::localHostName()
}
if (name.isEmpty())
- return TQString::tqfromLatin1("localhost");
+ return TQString::fromLatin1("localhost");
if (name.find('.') == -1)
{
@@ -924,7 +924,7 @@ TQString KResolver::localHostName()
KResolverResults results = resolve(name, "0", CanonName);
if (results.isEmpty())
// cannot find a valid hostname!
- return TQString::tqfromLatin1("localhost");
+ return TQString::fromLatin1("localhost");
else
return results.first().canonicalName();
}
@@ -943,7 +943,7 @@ static TQStringList *KResolver_initIdnDomains()
const char *kde_use_idn = getenv("KDE_USE_IDN");
if (!kde_use_idn)
kde_use_idn = "ac:at:br:cat:ch:cl:cn:de:dk:fi:gr:hu:info:io:is:jp:kr:li:lt:museum:org:no:se:sh:th:tm:tw:vn";
- return new TQStringList(TQStringList::split(':', TQString::tqfromLatin1(kde_use_idn).lower()));
+ return new TQStringList(TQStringList::split(':', TQString::fromLatin1(kde_use_idn).lower()));
}
// implement the ToAscii function, as described by IDN documents
@@ -987,7 +987,7 @@ TQCString KResolver::domainToAscii(const TQString& tqunicodeDomain)
TQString KResolver::domainToUnicode(const TQCString& asciiDomain)
{
- return domainToUnicode(TQString::tqfromLatin1(asciiDomain));
+ return domainToUnicode(TQString::fromLatin1(asciiDomain));
}
// implement the ToUnicode function, as described by IDN documents
diff --git a/tdecore/network/kresolverstandardworkers.cpp b/tdecore/network/kresolverstandardworkers.cpp
index 6236cc15d..a6f4e4ec0 100644
--- a/tdecore/network/kresolverstandardworkers.cpp
+++ b/tdecore/network/kresolverstandardworkers.cpp
@@ -140,7 +140,7 @@ bool KBlacklistWorker::isBlacklisted(const TQString& host)
return false;
// KDE4: QLatin1String
- TQString ascii = TQString::tqfromLatin1(KResolver::domainToAscii(host));
+ TQString ascii = TQString::fromLatin1(KResolver::domainToAscii(host));
TQMutexLocker locker(&blacklistMutex);
@@ -251,7 +251,7 @@ namespace
// check blacklist
if (m_af != AF_INET &&
- KBlacklistWorker::isBlacklisted(TQString::tqfromLatin1(m_hostname)))
+ KBlacklistWorker::isBlacklisted(TQString::fromLatin1(m_hostname)))
break;
# ifdef USE_GETHOSTBYNAME2_R
@@ -358,7 +358,7 @@ namespace
if (socktype == 0)
socktype = SOCK_STREAM; // default
- TQString canon = KResolver::domainToUnicode(TQString::tqfromLatin1(he->h_name));
+ TQString canon = KResolver::domainToUnicode(TQString::fromLatin1(he->h_name));
KInetSocketAddress sa;
sa.setPort(m_port);
if (he->h_addrtype != AF_INET)
@@ -404,7 +404,7 @@ namespace
{
// check blacklist
if ((m_af != AF_INET && m_af != AF_UNSPEC) &&
- KBlacklistWorker::isBlacklisted(TQString::tqfromLatin1(m_node)))
+ KBlacklistWorker::isBlacklisted(TQString::fromLatin1(m_node)))
{
results.setError(KResolver::NoName);
finished();
@@ -550,8 +550,8 @@ bool KStandardWorker::sanityCheck()
if (node.find('%') != -1)
node.truncate(node.find('%'));
- if (node.isEmpty() || node == TQString::tqfromLatin1("*") ||
- node == TQString::tqfromLatin1("localhost"))
+ if (node.isEmpty() || node == TQString::fromLatin1("*") ||
+ node == TQString::fromLatin1("localhost"))
m_encodedName.truncate(0);
else
{
@@ -616,7 +616,7 @@ bool KStandardWorker::resolveService()
// service name does not contain a port number
// must be a name
- if (serviceName().isEmpty() || serviceName().compare(TQString::tqfromLatin1("*")) == 0)
+ if (serviceName().isEmpty() || serviceName().compare(TQString::fromLatin1("*")) == 0)
port = 0;
else
{
@@ -712,7 +712,7 @@ bool KStandardWorker::resolveNumerically()
// now try to resolve the hostname numerically
KInetSocketAddress sa;
setError(KResolver::NoError);
- sa.setHost(KIpAddress(TQString::tqfromLatin1(m_encodedName)));
+ sa.setHost(KIpAddress(TQString::fromLatin1(m_encodedName)));
// if it failed, the length was reset to 0
bool ok = sa.length() != 0;
diff --git a/tdecore/network/kreverseresolver.cpp b/tdecore/network/kreverseresolver.cpp
index 00ef7f81d..5c602458c 100644
--- a/tdecore/network/kreverseresolver.cpp
+++ b/tdecore/network/kreverseresolver.cpp
@@ -238,8 +238,8 @@ bool ReverseThread::run()
if (err == 0)
{
- node = KResolver::domainToUnicode(TQString::tqfromLatin1(h));
- service = TQString::tqfromLatin1(s);
+ node = KResolver::domainToUnicode(TQString::fromLatin1(h));
+ service = TQString::fromLatin1(s);
success = true;
}
else
diff --git a/tdecore/network/kserversocket.cpp b/tdecore/network/kserversocket.cpp
index bd63d6306..49facb12c 100644
--- a/tdecore/network/kserversocket.cpp
+++ b/tdecore/network/kserversocket.cpp
@@ -155,7 +155,7 @@ bool KServerSocket::lookup()
// make sure we have at least one parameter for lookup
if (d->resolver.serviceName().isNull() &&
!d->resolver.nodeName().isNull())
- d->resolver.setServiceName(TQString::tqfromLatin1(""));
+ d->resolver.setServiceName(TQString::fromLatin1(""));
// don't restart the lookups if they had succeeded and
// the input values weren't changed
diff --git a/tdecore/network/ksocketaddress.cpp b/tdecore/network/ksocketaddress.cpp
index feaabfab5..dccac12bd 100644
--- a/tdecore/network/ksocketaddress.cpp
+++ b/tdecore/network/ksocketaddress.cpp
@@ -165,7 +165,7 @@ bool KIpAddress::setAddress(const TQString& address)
bool KIpAddress::setAddress(const char* address)
{
- return setAddress(TQString::tqfromLatin1(address));
+ return setAddress(TQString::fromLatin1(address));
}
// set from binary data
@@ -194,13 +194,13 @@ TQString KIpAddress::toString() const
{
case 4:
inet_ntop(AF_INET, m_data, buf, sizeof(buf) - 1);
- return TQString::tqfromLatin1(buf);
+ return TQString::fromLatin1(buf);
case 6:
#ifdef AF_INET6
inet_ntop(AF_INET6, m_data, buf, sizeof(buf) - 1);
#endif
- return TQString::tqfromLatin1(buf);
+ return TQString::fromLatin1(buf);
}
return TQString::null;
@@ -619,7 +619,7 @@ TQString KSocketAddress::toString() const
fmt = "[%1]:%2";
#endif
else if (d->addr.generic->sa_family == AF_UNIX)
- return TQString::tqfromLatin1("unix:%1").arg(serviceName());
+ return TQString::fromLatin1("unix:%1").arg(serviceName());
else
return i18n("1: the unknown socket address family number",
"Unknown family %1").arg(d->addr.generic->sa_family);
diff --git a/tdecore/network/ksocketbase.cpp b/tdecore/network/ksocketbase.cpp
index f5410f3e8..8449dbdc8 100644
--- a/tdecore/network/ksocketbase.cpp
+++ b/tdecore/network/ksocketbase.cpp
@@ -309,7 +309,7 @@ int KActiveSocketBase::putch(int ch)
void KActiveSocketBase::setError(int status, SocketError error)
{
KSocketBase::setError(error);
- setqStatus(status);
+ seStatus(status);
}
void KActiveSocketBase::resetError()
diff --git a/tdecore/network/ksrvresolverworker.cpp b/tdecore/network/ksrvresolverworker.cpp
index 2ec5bb4bf..31eaa1f1e 100644
--- a/tdecore/network/ksrvresolverworker.cpp
+++ b/tdecore/network/ksrvresolverworker.cpp
@@ -54,8 +54,8 @@ bool KSrvResolverWorker::preprocess()
if (node.find('%') != -1)
node.truncate(node.find('%'));
- if (node.isEmpty() || node == TQString::tqfromLatin1("*") ||
- node == TQString::tqfromLatin1("localhost"))
+ if (node.isEmpty() || node == TQString::fromLatin1("*") ||
+ node == TQString::fromLatin1("localhost"))
return false; // empty == localhost
encodedName = KResolver::domainToAscii(node);
@@ -225,7 +225,7 @@ bool KSrvResolverWorker::postprocess()
void KSrvResolverWorker::customEvent(TQCustomEvent*)
{
- dns = new TQDns(TQString::tqfromLatin1(encodedName), TQDns::Srv);
+ dns = new TQDns(TQString::fromLatin1(encodedName), TQDns::Srv);
TQObject::connect(dns, TQT_SIGNAL(resultsReady()), this, TQT_SLOT(dnsResultsReady()));
}
diff --git a/tdecore/svgicons/ksvgiconengine.cpp b/tdecore/svgicons/ksvgiconengine.cpp
index 85830126b..d035972ef 100644
--- a/tdecore/svgicons/ksvgiconengine.cpp
+++ b/tdecore/svgicons/ksvgiconengine.cpp
@@ -201,7 +201,7 @@ public:
// Combine new and old matrix
TQWMatrix matrix = m_engine->painter()->parseTransform(transform);
- TQWMatrix *current = m_engine->painter()->tqworldMatrix();
+ TQWMatrix *current = m_engine->painter()->worldMatrix();
#ifdef USE_QT4
printf("[FIXME] *current = matrix * *current locks up under Qt4; bypassing for now\n\r");
#else // USE_QT4
@@ -628,7 +628,7 @@ bool KSVGIconEngine::load(int width, int height, const TQString &path)
d->width = w;
d->height = h;
- d->painter->tqworldMatrix()->scale(vratiow, vratioh);
+ d->painter->worldMatrix()->scale(vratiow, vratioh);
}
else
{
@@ -637,10 +637,10 @@ bool KSVGIconEngine::load(int width, int height, const TQString &path)
double ratiow = width / d->width;
double ratioh = height / d->height;
- d->painter->tqworldMatrix()->scale(ratiow, ratioh);
+ d->painter->worldMatrix()->scale(ratiow, ratioh);
}
- TQWMatrix initialMatrix = *d->painter->tqworldMatrix();
+ TQWMatrix initialMatrix = *d->painter->worldMatrix();
d->helper->m_initialMatrix = initialMatrix;
// Apply transform
diff --git a/tdecore/svgicons/ksvgiconpainter.cpp b/tdecore/svgicons/ksvgiconpainter.cpp
index 6c4c52c6a..dbd867f13 100644
--- a/tdecore/svgicons/ksvgiconpainter.cpp
+++ b/tdecore/svgicons/ksvgiconpainter.cpp
@@ -65,7 +65,7 @@ public:
m_useFillGradient = false;
m_useStrokeGradient = false;
- m_tqworldMatrix = new TQWMatrix();
+ m_worldMatrix = new TQWMatrix();
// Create new image with alpha support
m_image = new TQImage(width, height, 32);
@@ -102,7 +102,7 @@ public:
art_free(m_buffer);
delete m_image;
- delete m_tqworldMatrix;
+ delete m_worldMatrix;
for(TQMap<TQString, ArtGradientLinear *>::Iterator it = m_linearGradientMap.begin(); it != m_linearGradientMap.end(); ++it)
{
@@ -233,12 +233,12 @@ public:
void drawBPath(ArtBpath *bpath)
{
double affine[6];
- affine[0] = m_tqworldMatrix->m11();
- affine[1] = m_tqworldMatrix->m12();
- affine[2] = m_tqworldMatrix->m21();
- affine[3] = m_tqworldMatrix->m22();
- affine[4] = m_tqworldMatrix->dx();
- affine[5] = m_tqworldMatrix->dy();
+ affine[0] = m_worldMatrix->m11();
+ affine[1] = m_worldMatrix->m12();
+ affine[2] = m_worldMatrix->m21();
+ affine[3] = m_worldMatrix->m22();
+ affine[4] = m_worldMatrix->dx();
+ affine[5] = m_worldMatrix->dy();
ArtBpath *temp = art_bpath_affine_transform(bpath, affine);
ArtVpath *vec = art_bez_path_to_vec(temp, 0.25);
@@ -249,12 +249,12 @@ public:
void drawVPath(ArtVpath *vec)
{
double affine[6];
- affine[0] = m_tqworldMatrix->m11();
- affine[1] = m_tqworldMatrix->m12();
- affine[2] = m_tqworldMatrix->m21();
- affine[3] = m_tqworldMatrix->m22();
- affine[4] = m_tqworldMatrix->dx();
- affine[5] = m_tqworldMatrix->dy();
+ affine[0] = m_worldMatrix->m11();
+ affine[1] = m_worldMatrix->m12();
+ affine[2] = m_worldMatrix->m21();
+ affine[3] = m_worldMatrix->m22();
+ affine[4] = m_worldMatrix->dx();
+ affine[5] = m_worldMatrix->dy();
ArtVpath *temp = art_vpath_affine_transform(vec, affine);
art_free(vec);
@@ -461,10 +461,10 @@ public:
m.map(x1, y1, &x1, &y1);
m.map(x2, y2, &x2, &y2);
- double x1n = x1 * m_tqworldMatrix->m11() + y1 * m_tqworldMatrix->m21() + m_tqworldMatrix->dx();
- double y1n = x1 * m_tqworldMatrix->m12() + y1 * m_tqworldMatrix->m22() + m_tqworldMatrix->dy();
- double x2n = x2 * m_tqworldMatrix->m11() + y2 * m_tqworldMatrix->m21() + m_tqworldMatrix->dx();
- double y2n = x2 * m_tqworldMatrix->m12() + y2 * m_tqworldMatrix->m22() + m_tqworldMatrix->dy();
+ double x1n = x1 * m_worldMatrix->m11() + y1 * m_worldMatrix->m21() + m_worldMatrix->dx();
+ double y1n = x1 * m_worldMatrix->m12() + y1 * m_worldMatrix->m22() + m_worldMatrix->dy();
+ double x2n = x2 * m_worldMatrix->m11() + y2 * m_worldMatrix->m21() + m_worldMatrix->dx();
+ double y2n = x2 * m_worldMatrix->m12() + y2 * m_worldMatrix->m22() + m_worldMatrix->dy();
double dx = x2n - x1n;
double dy = y2n - y1n;
@@ -515,12 +515,12 @@ public:
else
fy = cy;
- radial->affine[0] = m_tqworldMatrix->m11();
- radial->affine[1] = m_tqworldMatrix->m12();
- radial->affine[2] = m_tqworldMatrix->m21();
- radial->affine[3] = m_tqworldMatrix->m22();
- radial->affine[4] = m_tqworldMatrix->dx();
- radial->affine[5] = m_tqworldMatrix->dy();
+ radial->affine[0] = m_worldMatrix->m11();
+ radial->affine[1] = m_worldMatrix->m12();
+ radial->affine[2] = m_worldMatrix->m21();
+ radial->affine[3] = m_worldMatrix->m22();
+ radial->affine[4] = m_worldMatrix->dx();
+ radial->affine[5] = m_worldMatrix->dy();
radial->fx = (fx - cx) / r;
radial->fy = (fy - cy) / r;
@@ -1123,7 +1123,7 @@ private:
ArtSVP *m_clipSVP;
TQImage *m_image;
- TQWMatrix *m_tqworldMatrix;
+ TQWMatrix *m_worldMatrix;
TQString m_fillRule;
TQString m_joinStyle;
@@ -1211,17 +1211,17 @@ TQImage *KSVGIconPainter::image()
return new TQImage(*d->helper->m_image);
}
-TQWMatrix *KSVGIconPainter::tqworldMatrix()
+TQWMatrix *KSVGIconPainter::worldMatrix()
{
- return d->helper->m_tqworldMatrix;
+ return d->helper->m_worldMatrix;
}
void KSVGIconPainter::setWorldMatrix(TQWMatrix *matrix)
{
- if(d->helper->m_tqworldMatrix)
- delete d->helper->m_tqworldMatrix;
+ if(d->helper->m_worldMatrix)
+ delete d->helper->m_worldMatrix;
- d->helper->m_tqworldMatrix = matrix;
+ d->helper->m_worldMatrix = matrix;
}
void KSVGIconPainter::setStrokeWidth(double width)
@@ -2310,12 +2310,12 @@ void KSVGIconPainter::drawImage(double x, double y, TQImage &image)
image = image.convertDepth(32);
double affine[6];
- affine[0] = d->helper->m_tqworldMatrix->m11();
- affine[1] = d->helper->m_tqworldMatrix->m12();
- affine[2] = d->helper->m_tqworldMatrix->m21();
- affine[3] = d->helper->m_tqworldMatrix->m22();
+ affine[0] = d->helper->m_worldMatrix->m11();
+ affine[1] = d->helper->m_worldMatrix->m12();
+ affine[2] = d->helper->m_worldMatrix->m21();
+ affine[3] = d->helper->m_worldMatrix->m22();
// use the world matrix to convert the coordinates
- d->helper->m_tqworldMatrix->map(x, y, &affine[4], &affine[5]);
+ d->helper->m_worldMatrix->map(x, y, &affine[4], &affine[5]);
d->helper->art_rgba_rgba_affine(d->helper->m_buffer, 0, 0, d->helper->m_width, d->helper->m_height,
d->helper->m_rowstride, image.bits(), image.width(), image.height(),
diff --git a/tdecore/svgicons/ksvgiconpainter.h b/tdecore/svgicons/ksvgiconpainter.h
index b80eccea8..de5644187 100644
--- a/tdecore/svgicons/ksvgiconpainter.h
+++ b/tdecore/svgicons/ksvgiconpainter.h
@@ -41,7 +41,7 @@ public:
TQImage *image();
- TQWMatrix *tqworldMatrix();
+ TQWMatrix *worldMatrix();
void finish();
@@ -61,7 +61,7 @@ public:
void setStrokeDashOffset(const TQString &dashOffset);
void setStrokeDashArray(const TQString &dashes);
- void setWorldMatrix(TQWMatrix *tqworldMatrix);
+ void setWorldMatrix(TQWMatrix *worldMatrix);
void setClippingRect(int x, int y, int w, int h);
void drawRectangle(double x, double y, double w, double h, double rx, double ry);
diff --git a/tdecore/tests/kcalendartest.cpp b/tdecore/tests/kcalendartest.cpp
index 8b6e8eea4..51a40b892 100644
--- a/tdecore/tests/kcalendartest.cpp
+++ b/tdecore/tests/kcalendartest.cpp
@@ -67,7 +67,7 @@ int main(int argc, char **argv) {
option = args->getOption("date");
date = KGlobal::locale()->readDate(option);
} else
- date = TQDate::tqcurrentDate();
+ date = TQDate::currentDate();
args->clear(); // Free up some memory.
diff --git a/tdecore/tests/klocaletest.cpp b/tdecore/tests/klocaletest.cpp
index 29f6cd3e3..7323df34c 100644
--- a/tdecore/tests/klocaletest.cpp
+++ b/tdecore/tests/klocaletest.cpp
@@ -77,19 +77,19 @@ void Test::createFields()
string+="Used language: ";
string+=KGlobal::locale()->language()+"\n";
string+="Locale encoding: ";
- string+=TQString::tqfromLatin1(KGlobal::locale()->encoding())+"\n";
+ string+=TQString::fromLatin1(KGlobal::locale()->encoding())+"\n";
string+="Localized date and time: ";
- string+=KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime());
+ string+=KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime());
string+="\nLocalized monetary numbers: ";
string+=KGlobal::locale()->formatMoney(1234567.89) + " / \n" +KGlobal::locale()->formatMoney(-1234567.89);
// This will not work
// but you can copy other *.mo file
string+="\nSome localized strings:\n";
- string+=TQString::tqfromLatin1("Yes = ")+i18n("Yes")+"\n";
- string+=TQString::tqfromLatin1("No = ")+i18n("No")+"\n";
- string+=TQString::tqfromLatin1("Help = ")+i18n("Help")+"\n";
- string+=TQString::tqfromLatin1("Cancel = ")+i18n("Cancel")+"\n";
+ string+=TQString::fromLatin1("Yes = ")+i18n("Yes")+"\n";
+ string+=TQString::fromLatin1("No = ")+i18n("No")+"\n";
+ string+=TQString::fromLatin1("Help = ")+i18n("Help")+"\n";
+ string+=TQString::fromLatin1("Cancel = ")+i18n("Cancel")+"\n";
label=new TQLabel(string,this,"Label");
label->setGeometry(10,10,400,400);
@@ -102,9 +102,9 @@ int main( int argc, char ** argv )
KLocale::setMainCatalogue("tdelibs");
KApplication a( argc, argv, "klocaletest" );
- KGlobal::locale()->setLanguage(TQString::tqfromLatin1("en_US"));
- KGlobal::locale()->setCountry(TQString::tqfromLatin1("C"));
- KGlobal::locale()->setThousandsSeparator(TQString::tqfromLatin1(","));
+ KGlobal::locale()->setLanguage(TQString::fromLatin1("en_US"));
+ KGlobal::locale()->setCountry(TQString::fromLatin1("C"));
+ KGlobal::locale()->setThousandsSeparator(TQString::fromLatin1(","));
TQString formatted;
formatted = KGlobal::locale()->formatNumber( 70 ); check("formatNumber(70)",formatted,"70.00");
@@ -152,8 +152,8 @@ int main( int argc, char ** argv )
TQDate date;
date.setYMD( 2002, 5, 3 );
checkDate("readDate( 3, 5, 2002 )",date,KGlobal::locale()->readDate( KGlobal::locale()->formatDate( date ) ) );
- date = TQDate::tqcurrentDate();
- checkDate("readDate( TQDate::tqcurrentDate() )",date,KGlobal::locale()->readDate( KGlobal::locale()->formatDate( date ) ) );
+ date = TQDate::currentDate();
+ checkDate("readDate( TQDate::currentDate() )",date,KGlobal::locale()->readDate( KGlobal::locale()->formatDate( date ) ) );
TQTime time;
time = KGlobal::locale()->readTime( "11:22:33", &ok );
@@ -181,11 +181,11 @@ int main( int argc, char ** argv )
check("formatTime(\"0:22\", as duration)", timeStr, "00:22" );
kdDebug() << "setLanguage C\n";
- KGlobal::locale()->setLanguage(TQString::tqfromLatin1("C"));
+ KGlobal::locale()->setLanguage(TQString::fromLatin1("C"));
kdDebug() << "C: " << i18n("yes") << " " << i18n(TQACCEL_OBJECT_NAME_STRING, "Space") << endl;
kdDebug() << "setLanguage de\n";
- KGlobal::locale()->setLanguage(TQString::tqfromLatin1("de"));
+ KGlobal::locale()->setLanguage(TQString::fromLatin1("de"));
kdDebug() << "de: " << i18n("yes") << " " << i18n(TQACCEL_OBJECT_NAME_STRING, "Space") << endl;
diff --git a/tdecore/tests/kresolvertest.cpp b/tdecore/tests/kresolvertest.cpp
index 1b2f5148d..f1d3c11f9 100644
--- a/tdecore/tests/kresolvertest.cpp
+++ b/tdecore/tests/kresolvertest.cpp
@@ -75,8 +75,8 @@ public:
bool tryLookup(const char* node, const char *serv)
{
int error;
- TQString _node = TQString::tqfromLatin1(node);
- TQString _serv = TQString::tqfromLatin1(serv);
+ TQString _node = TQString::fromLatin1(node);
+ TQString _serv = TQString::fromLatin1(serv);
printf("\tTrying to lookup %s|%s... ", node, serv);
TQPtrList<KAddressInfo> list = KExtendedSocket::lookup(_node, _serv, 0, &error);
@@ -138,8 +138,8 @@ bool try_pton()
bool tryLookup6(const char *node, const char *serv)
{
int error;
- TQString _node = TQString::tqfromLatin1(node);
- TQString _serv = TQString::tqfromLatin1(serv);
+ TQString _node = TQString::fromLatin1(node);
+ TQString _serv = TQString::fromLatin1(serv);
printf("\tTrying to lookup IPv6 of %s|%s... ", node, serv);
TQPtrList<KAddressInfo> list = KExtendedSocket::lookup(_node, _serv, KExtendedSocket::ipv6Socket, &error);
diff --git a/tdecore/tests/ktimezonestest.cpp b/tdecore/tests/ktimezonestest.cpp
index 69ea7c8a1..650cc0512 100644
--- a/tdecore/tests/ktimezonestest.cpp
+++ b/tdecore/tests/ktimezonestest.cpp
@@ -17,7 +17,7 @@ int main(int argc, char *argv[])
// Find the current offset of the UTC timezone.
timezone = timezones.zone("UTC");
- printf( "UTC timezone offset should be 0: %d\n", timezone->offset(TQDateTime::tqcurrentDateTime()) );
+ printf( "UTC timezone offset should be 0: %d\n", timezone->offset(TQDateTime::currentDateTime()) );
// Find some offsets for Europe/London.
char *london = "Europe/London";
diff --git a/tdefx/kdrawutil.h b/tdefx/kdrawutil.h
index 44041968c..a229625a4 100644
--- a/tdefx/kdrawutil.h
+++ b/tdefx/kdrawutil.h
@@ -125,7 +125,7 @@ TDEFX_EXPORT void kRoundMaskRegion(TQRegion &r, int x, int y, int w, int h);
* @c \#include @c <kdrawutil.h>
*
* Paints the pixels covered by a round button of the given size with
- * Qt::color1. This function is useful in TQStyle::tqdrawControlMask().
+ * Qt::color1. This function is useful in TQStyle::drawControlMask().
*
* @param p The painter to use for drawing the button.
* @param x The X coordinate of the button.
diff --git a/tdefx/kimageeffect.cpp b/tdefx/kimageeffect.cpp
index 3f6aa5ccb..32b450f2e 100644
--- a/tdefx/kimageeffect.cpp
+++ b/tdefx/kimageeffect.cpp
@@ -3697,7 +3697,7 @@ TQImage KImageEffect::charcoal(TQImage &src, double radius, double sigma)
TQImage img(edge(src, radius));
img = blur(img, radius, sigma);
normalize(img);
- img.tqinvertPixels(false);
+ img.invertPixels(false);
KImageEffect::toGray(img);
return(img);
}
diff --git a/tdefx/kstyle.cpp b/tdefx/kstyle.cpp
index 85503632b..60fdb4571 100644
--- a/tdefx/kstyle.cpp
+++ b/tdefx/kstyle.cpp
@@ -123,8 +123,8 @@ namespace
static bool useDropShadow(TQWidget* w)
{
- return w && w->tqmetaObject() &&
- w->tqmetaObject()->findProperty("KStyleMenuDropShadow") != -1;
+ return w && w->metaObject() &&
+ w->metaObject()->findProperty("KStyleMenuDropShadow") != -1;
}
}
@@ -554,7 +554,7 @@ int KStyle::kPixelMetric( KStylePixelMetric kpm, const TQWidget* /* widget */) c
// // What should "widget" be in actuality? How should I get it? From where?
// // Almost certainly it should not be null!
// TQWidget *widget = 0;
-// tqdrawControl(pe, p, widget, r, cg, flags, opt);
+// drawControl(pe, p, widget, r, cg, flags, opt);
//}
// #endif // USE_QT4
@@ -654,7 +654,7 @@ void KStyle::tqdrawPrimitive( TQ_PrimitiveElement pe,
-void KStyle::tqdrawControl( TQ_ControlElement element,
+void KStyle::drawControl( TQ_ControlElement element,
TQPainter* p,
const TQWidget* widget,
const TQRect &r,
@@ -952,7 +952,7 @@ void KStyle::tqdrawControl( TQ_ControlElement element,
}
default:
- TQCommonStyle::tqdrawControl(element, p, widget, r, cg, flags, opt);
+ TQCommonStyle::drawControl(element, p, widget, r, cg, flags, opt);
}
}
@@ -979,7 +979,7 @@ TQRect KStyle::subRect(SubRect r, const TQWidget* widget) const
}
-int KStyle::tqpixelMetric(PixelMetric m, const TQWidget* widget) const
+int KStyle::pixelMetric(PixelMetric m, const TQWidget* widget) const
{
switch(m)
{
@@ -1000,7 +1000,7 @@ int KStyle::tqpixelMetric(PixelMetric m, const TQWidget* widget) const
&& widget->inherits(TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING) )
return widget->fontMetrics().lineSpacing();
else
- return TQCommonStyle::tqpixelMetric(m, widget);
+ return TQCommonStyle::pixelMetric(m, widget);
}
// TABS
@@ -1084,10 +1084,10 @@ int KStyle::tqpixelMetric(PixelMetric m, const TQWidget* widget) const
return 0;
case PM_PopupMenuScrollerHeight:
- return tqpixelMetric( PM_ScrollBarExtent, 0);
+ return pixelMetric( PM_ScrollBarExtent, 0);
default:
- return TQCommonStyle::tqpixelMetric( m, widget );
+ return TQCommonStyle::pixelMetric( m, widget );
}
}
@@ -1104,7 +1104,7 @@ static TQListViewItem* nextVisibleSibling(TQListViewItem* item)
return sibling;
}
-void KStyle::tqdrawComplexControl( TQ_ComplexControl control,
+void KStyle::drawComplexControl( TQ_ComplexControl control,
TQPainter* p,
const TQWidget* widget,
const TQRect &r,
@@ -1227,7 +1227,7 @@ void KStyle::tqdrawComplexControl( TQ_ComplexControl control,
// Draw the tickmarks
if (controls & SC_SliderTickmarks)
- TQCommonStyle::tqdrawComplexControl(control, &p2, widget,
+ TQCommonStyle::drawComplexControl(control, &p2, widget,
r, cg, flags, SC_SliderTickmarks, active, opt);
// Draw the slider handle
@@ -1253,7 +1253,7 @@ void KStyle::tqdrawComplexControl( TQ_ComplexControl control,
// Paint the icon and text.
if ( controls & SC_ListView )
- TQCommonStyle::tqdrawComplexControl( control, p, widget, r, cg, flags, controls, active, opt );
+ TQCommonStyle::drawComplexControl( control, p, widget, r, cg, flags, controls, active, opt );
// If we're have a branch or are expanded...
if ( controls & (SC_ListViewBranch | SC_ListViewExpand) )
@@ -1393,7 +1393,7 @@ void KStyle::tqdrawComplexControl( TQ_ComplexControl control,
}
default:
- TQCommonStyle::tqdrawComplexControl( control, p, widget, r, cg,
+ TQCommonStyle::drawComplexControl( control, p, widget, r, cg,
flags, controls, active, opt );
break;
}
@@ -1432,7 +1432,7 @@ TQRect KStyle::querySubControlMetrics( TQ_ComplexControl control,
const TQScrollBar *sb = (const TQScrollBar*)widget;
bool horizontal = sb->orientation() == Qt::Horizontal;
int sliderstart = sb->sliderStart();
- int sbextent = tqpixelMetric(PM_ScrollBarExtent, widget);
+ int sbextent = pixelMetric(PM_ScrollBarExtent, widget);
int maxlen = (horizontal ? sb->width() : sb->height())
- (sbextent * (threeButtonScrollBar ? 3 : 2));
int sliderlen;
@@ -1443,7 +1443,7 @@ TQRect KStyle::querySubControlMetrics( TQ_ComplexControl control,
uint range = sb->maxValue() - sb->minValue();
sliderlen = (sb->pageStep() * maxlen) / (range + sb->pageStep());
- int slidermin = tqpixelMetric( PM_ScrollBarSliderMin, widget );
+ int slidermin = pixelMetric( PM_ScrollBarSliderMin, widget );
if ( sliderlen < slidermin || range > INT_MAX / 2 )
sliderlen = slidermin;
if ( sliderlen > maxlen )
@@ -1833,7 +1833,7 @@ TQPixmap KStyle::stylePixmap( StylePixmap stylepixmap,
}
-int KStyle::tqstyleHint( TQ_StyleHint sh, const TQWidget* w,
+int KStyle::styleHint( TQ_StyleHint sh, const TQWidget* w,
const TQStyleOption &opt, TQStyleHintReturn* shr) const
{
switch (sh)
@@ -1848,7 +1848,7 @@ int KStyle::tqstyleHint( TQ_StyleHint sh, const TQWidget* w,
return d->menuAltKeyNavigation ? 1 : 0;
case SH_PopupMenu_SubMenuPopupDelay:
- if ( tqstyleHint( SH_PopupMenu_SloppySubMenus, w ) )
+ if ( styleHint( SH_PopupMenu_SloppySubMenus, w ) )
return QMIN( 100, d->popupMenuDelay );
else
return d->popupMenuDelay;
@@ -1884,7 +1884,7 @@ int KStyle::tqstyleHint( TQ_StyleHint sh, const TQWidget* w,
}
default:
- return TQCommonStyle::tqstyleHint(sh, w, opt, shr);
+ return TQCommonStyle::styleHint(sh, w, opt, shr);
}
}
@@ -2222,12 +2222,12 @@ bool TransparencyHandler::eventFilter( TQObject* object, TQEvent* event )
case XRender:
#endif
case SoftwareBlend:
- blendToPixmap(p->tqcolorGroup(), p);
+ blendToPixmap(p->colorGroup(), p);
break;
case SoftwareTint:
default:
- blendToColor(p->tqcolorGroup().button());
+ blendToColor(p->colorGroup().button());
};
p->setErasePixmap(pix);
@@ -2315,10 +2315,10 @@ void TransparencyHandler::XRenderBlendToPixmap(const TQWidget* p)
// Allow styles to define the blend pixmap - allows for some interesting effects.
if (::tqqt_cast<TQPopupMenu*>(p))
- kstyle->renderMenuBlendPixmap( renderPix, p->tqcolorGroup(),
+ kstyle->renderMenuBlendPixmap( renderPix, p->colorGroup(),
::tqqt_cast<TQPopupMenu*>(p) );
else
- renderPix.fill(p->tqcolorGroup().button()); // Just tint as the default behavior
+ renderPix.fill(p->colorGroup().button()); // Just tint as the default behavior
Display* dpy = qt_xdisplay();
Pixmap alphaPixmap;
diff --git a/tdefx/kstyle.h b/tdefx/kstyle.h
index da71d83b7..ed641d5c6 100644
--- a/tdefx/kstyle.h
+++ b/tdefx/kstyle.h
@@ -172,7 +172,7 @@ class TDEFX_EXPORT KStyle: public TQCommonStyle
* This virtual function defines the pixmap used to blend between the popup
* menu and the background to create different menu transparency effects.
* For example, you can fill the pixmap "pix" with a gradient based on the
- * popup's tqcolorGroup, a texture, or some other fancy painting routine.
+ * popup's colorGroup, a texture, or some other fancy painting routine.
* KStyle will then internally blend this pixmap with a snapshot of the
* background behind the popupMenu to create the illusion of transparency.
*
@@ -244,7 +244,7 @@ class TDEFX_EXPORT KStyle: public TQCommonStyle
*
* @see KStyle::KStylePrimitive
* @see TQStyle::tqdrawPrimitive
- * @see TQStyle::tqdrawComplexControl
+ * @see TQStyle::drawComplexControl
*/
virtual void drawKStylePrimitive( KStylePrimitive kpe,
TQPainter* p,
@@ -293,7 +293,7 @@ class TDEFX_EXPORT KStyle: public TQCommonStyle
// #endif // USE_QT4
- void tqdrawControl( TQ_ControlElement element,
+ void drawControl( TQ_ControlElement element,
TQPainter* p,
const TQWidget* widget,
const TQRect &r,
@@ -301,7 +301,7 @@ class TDEFX_EXPORT KStyle: public TQCommonStyle
SFlags flags = Style_Default,
const TQStyleOption& = TQStyleOption::SO_Default ) const;
- void tqdrawComplexControl( TQ_ComplexControl control,
+ void drawComplexControl( TQ_ComplexControl control,
TQPainter *p,
const TQWidget* widget,
const TQRect &r,
@@ -321,7 +321,7 @@ class TDEFX_EXPORT KStyle: public TQCommonStyle
SubControl sc,
const TQStyleOption& = TQStyleOption::SO_Default ) const;
- int tqpixelMetric( PixelMetric m,
+ int pixelMetric( PixelMetric m,
const TQWidget* widget = 0 ) const;
TQRect subRect( SubRect r,
@@ -331,7 +331,7 @@ class TDEFX_EXPORT KStyle: public TQCommonStyle
const TQWidget* widget = 0,
const TQStyleOption& = TQStyleOption::SO_Default ) const;
- int tqstyleHint( TQ_StyleHint sh,
+ int styleHint( TQ_StyleHint sh,
const TQWidget* w = 0,
const TQStyleOption &opt = TQStyleOption::SO_Default,
TQStyleHintReturn* shr = 0 ) const;
diff --git a/tdeprint/cups/cupsaddsmb2.cpp b/tdeprint/cups/cupsaddsmb2.cpp
index ca40a10a7..f0cb1c359 100644
--- a/tdeprint/cups/cupsaddsmb2.cpp
+++ b/tdeprint/cups/cupsaddsmb2.cpp
@@ -156,7 +156,7 @@ void CupsAddSmb::slotReceived(KProcess*, char *buf, int buflen)
while (1)
{
// read a line
- line = TQString::tqfromLatin1("");
+ line = TQString::fromLatin1("");
partial = true;
while (index < buflen)
{
@@ -433,7 +433,7 @@ bool CupsAddSmb::doExport()
m_actions << "quit";
m_proc.clearArguments();
- m_proc << "smbclient" << TQString::tqfromLatin1("//")+m_servered->text()+"/print$";
+ m_proc << "smbclient" << TQString::fromLatin1("//")+m_servered->text()+"/print$";
return startProcess();
}
diff --git a/tdeprint/cups/cupsinfos.cpp b/tdeprint/cups/cupsinfos.cpp
index 1fae8e0db..2f7031503 100644
--- a/tdeprint/cups/cupsinfos.cpp
+++ b/tdeprint/cups/cupsinfos.cpp
@@ -119,9 +119,9 @@ void CupsInfos::load()
{
KConfig *conf_ = KMFactory::self()->printConfig();
conf_->setGroup("CUPS");
- host_ = conf_->readEntry("Host",TQString::tqfromLatin1(cupsServer()));
+ host_ = conf_->readEntry("Host",TQString::fromLatin1(cupsServer()));
port_ = conf_->readNumEntry("Port",ippPort());
- login_ = conf_->readEntry("Login",TQString::tqfromLatin1(cupsUser()));
+ login_ = conf_->readEntry("Login",TQString::fromLatin1(cupsUser()));
savepwd_ = conf_->readBoolEntry( "SavePassword", false );
if ( savepwd_ )
{
diff --git a/tdeprint/cups/ippreportdlg.cpp b/tdeprint/cups/ippreportdlg.cpp
index 5fa54e11e..1e07789ac 100644
--- a/tdeprint/cups/ippreportdlg.cpp
+++ b/tdeprint/cups/ippreportdlg.cpp
@@ -59,7 +59,7 @@ void IppReportDlg::slotUser1()
int hh = rich.height(), page(1);
while (1)
{
- rich.draw(&painter, margin, margin, r, tqcolorGroup());
+ rich.draw(&painter, margin, margin, r, colorGroup());
TQString s = caption() + ": " + TQString::number(page);
TQRect br = painter.fontMetrics().boundingRect(s);
painter.drawText(r.right()-br.width()-5, r.top()-br.height()-4, br.width()+5, br.height()+4, Qt::AlignRight|Qt::AlignTop, s);
diff --git a/tdeprint/cups/ipprequest.cpp b/tdeprint/cups/ipprequest.cpp
index 16cbe3308..c7472a9ae 100644
--- a/tdeprint/cups/ipprequest.cpp
+++ b/tdeprint/cups/ipprequest.cpp
@@ -66,7 +66,7 @@ void dumpRequest(ipp_t *req, bool answer = false, const TQString& s = TQString::
ipp_attribute_t *attr = req->attrs;
while (attr)
{
- TQString s = TQString::tqfromLatin1("%1 (0x%2) = ").arg(attr->name).arg(attr->value_tag, 0, 16);
+ TQString s = TQString::fromLatin1("%1 (0x%2) = ").arg(attr->name).arg(attr->value_tag, 0, 16);
for (int i=0;i<attr->num_values;i++)
{
switch (attr->value_tag)
diff --git a/tdeprint/cups/kcupsprinterimpl.cpp b/tdeprint/cups/kcupsprinterimpl.cpp
index e016e9954..5c2de105b 100644
--- a/tdeprint/cups/kcupsprinterimpl.cpp
+++ b/tdeprint/cups/kcupsprinterimpl.cpp
@@ -67,8 +67,8 @@ bool KCupsPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer)
// check printer object
if (!printer) return false;
- TQString hoststr = TQString::tqfromLatin1("%1:%2").arg(CupsInfos::self()->host()).arg(CupsInfos::self()->port());
- cmd = TQString::tqfromLatin1("cupsdoprint -P %1 -J %3 -H %2").arg(quote(printer->printerName())).arg(quote(hoststr)).arg(quote(printer->docName()));
+ TQString hoststr = TQString::fromLatin1("%1:%2").arg(CupsInfos::self()->host()).arg(CupsInfos::self()->port());
+ cmd = TQString::fromLatin1("cupsdoprint -P %1 -J %3 -H %2").arg(quote(printer->printerName())).arg(quote(hoststr)).arg(quote(printer->docName()));
if (!CupsInfos::self()->login().isEmpty())
{
TQString userstr(CupsInfos::self()->login());
@@ -127,7 +127,7 @@ void KCupsPrinterImpl::broadcastOption(const TQString& key, const TQString& valu
KPrinterImpl::broadcastOption("orientation-requested",(value == "Landscape" ? "4" : "3"));
else if (key == "kde-pagesize")
{
- TQString pagename = TQString::tqfromLatin1(pageSizeToPageName((KPrinter::PageSize)value.toInt()));
+ TQString pagename = TQString::fromLatin1(pageSizeToPageName((KPrinter::PageSize)value.toInt()));
KPrinterImpl::broadcastOption("PageSize",pagename);
// simple hack for classes
KPrinterImpl::broadcastOption("media",pagename);
diff --git a/tdeprint/cups/kmcupsjobmanager.cpp b/tdeprint/cups/kmcupsjobmanager.cpp
index 58de0818a..be088d360 100644
--- a/tdeprint/cups/kmcupsjobmanager.cpp
+++ b/tdeprint/cups/kmcupsjobmanager.cpp
@@ -93,7 +93,7 @@ bool KMCupsJobManager::sendCommandSystemJob(const TQPtrList<KMJob>& jobs, int ac
if (argstr.isEmpty()) return false;
req.setOperation(CUPS_MOVE_JOB);
uri =
- TQString::tqfromLatin1("ipp://%1/printers/%2").arg(CupsInfos::self()->hostaddr(),
+ TQString::fromLatin1("ipp://%1/printers/%2").arg(CupsInfos::self()->hostaddr(),
argstr);
req.addURI(IPP_TAG_OPERATION, "job-printer-uri", uri);
break;
@@ -150,7 +150,7 @@ bool KMCupsJobManager::listJobs(const TQString& prname, KMJobManager::JobType ty
// other attributes
req.addKeyword(IPP_TAG_OPERATION, "requested-attributes", keys);
if (type == KMJobManager::CompletedJobs)
- req.addKeyword(IPP_TAG_OPERATION,"which-jobs",TQString::tqfromLatin1("completed"));
+ req.addKeyword(IPP_TAG_OPERATION,"which-jobs",TQString::fromLatin1("completed"));
if (limit > 0)
req.addInteger(IPP_TAG_OPERATION,"limit",limit);
@@ -218,7 +218,7 @@ void KMCupsJobManager::parseListAnswer(IppRequest& req, KMPrinter *pr)
}
else if (name == "job-priority")
{
- job->setAttribute(0, TQString::tqfromLatin1("%1").arg(attr->values[0].integer, 3));
+ job->setAttribute(0, TQString::fromLatin1("%1").arg(attr->values[0].integer, 3));
}
else if (name == "job-billing")
{
diff --git a/tdeprint/cups/kmcupsmanager.cpp b/tdeprint/cups/kmcupsmanager.cpp
index 8db6bdc6d..635cfd5e8 100644
--- a/tdeprint/cups/kmcupsmanager.cpp
+++ b/tdeprint/cups/kmcupsmanager.cpp
@@ -95,7 +95,7 @@ KMCupsManager::~KMCupsManager()
TQString KMCupsManager::driverDbCreationProgram()
{
- return TQString::tqfromLatin1("/opt/trinity/bin/make_driver_db_cups");
+ return TQString::fromLatin1("/opt/trinity/bin/make_driver_db_cups");
}
TQString KMCupsManager::driverDirectory()
@@ -173,7 +173,7 @@ bool KMCupsManager::createPrinter(KMPrinter *p)
else if (!p->option("requesting-user-name-allowed").isEmpty())
req.addName(IPP_TAG_PRINTER,"requesting-user-name-allowed",TQStringList::split(",",p->option("requesting-user-name-allowed"),false));
else
- req.addName(IPP_TAG_PRINTER,"requesting-user-name-allowed",TQString::tqfromLatin1("all"));
+ req.addName(IPP_TAG_PRINTER,"requesting-user-name-allowed",TQString::fromLatin1("all"));
}
req.addText(IPP_TAG_PRINTER,"printer-info",p->description());
req.addText(IPP_TAG_PRINTER,"printer-location",p->location());
@@ -287,8 +287,8 @@ bool KMCupsManager::completePrinterShort(KMPrinter *p)
delete kes;
m_hostSuccess = false;
} else {
- TQDateTime tm = TQDateTime::tqcurrentDateTime().addSecs(2);
- while (!m_lookupDone && (TQDateTime::tqcurrentDateTime() < tm))
+ TQDateTime tm = TQDateTime::currentDateTime().addSecs(2);
+ while (!m_lookupDone && (TQDateTime::currentDateTime() < tm))
tqApp->processEvents();
kes->cancelAsyncConnect();
@@ -358,8 +358,8 @@ bool KMCupsManager::completePrinterShort(KMPrinter *p)
// banners
req.name("job-sheets-default",values);
while (values.count() < 2) values.append("none");
- p->setOption("kde-banners",values.join(TQString::tqfromLatin1(",")));
- if (req.name("job-sheets-supported",values)) p->setOption("kde-banners-supported",values.join(TQString::tqfromLatin1(",")));
+ p->setOption("kde-banners",values.join(TQString::fromLatin1(",")));
+ if (req.name("job-sheets-supported",values)) p->setOption("kde-banners-supported",values.join(TQString::fromLatin1(",")));
// quotas
int ival;
@@ -405,7 +405,7 @@ bool KMCupsManager::testPrinter(KMPrinter *p)
req.addURI(IPP_TAG_OPERATION,"printer-uri",uri);
req.addMime(IPP_TAG_OPERATION,"document-format","application/postscript");
if (!CupsInfos::self()->login().isEmpty()) req.addName(IPP_TAG_OPERATION,"requesting-user-name",CupsInfos::self()->login());
- req.addName(IPP_TAG_OPERATION,"job-name",TQString::tqfromLatin1("KDE Print Test"));
+ req.addName(IPP_TAG_OPERATION,"job-name",TQString::fromLatin1("KDE Print Test"));
if (req.doFileRequest("/printers/",testpage))
return true;
reportIppError(&req);
@@ -453,7 +453,7 @@ void KMCupsManager::loadServerPrinters()
// load default
req.init();
req.setOperation(CUPS_GET_DEFAULT);
- req.addKeyword(IPP_TAG_OPERATION,"requested-attributes",TQString::tqfromLatin1("printer-name"));
+ req.addKeyword(IPP_TAG_OPERATION,"requested-attributes",TQString::fromLatin1("printer-name"));
if (req.doRequest("/printers/"))
{
TQString s = TQString::null;
@@ -576,7 +576,7 @@ DrMain* KMCupsManager::loadMaticDriver(const TQString& drname)
{
TQStringList comps = TQStringList::split('/', drname, false);
TQString tmpFile = locateLocal("tmp", "foomatic_" + kapp->randomString(8));
- TQString PATH = getenv("PATH") + TQString::tqfromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin");
+ TQString PATH = getenv("PATH") + TQString::fromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin");
TQString exe = KStandardDirs::findExe("foomatic-datafile", PATH);
if (exe.isEmpty())
{
@@ -691,7 +691,7 @@ void KMCupsManager::saveDriverFile(DrMain *driver, const TQString& filename)
keyword = line.mid(8,p-8);
DrBase *bopt = 0;
if ( keyword == "PageRegion" || keyword == "ImageableArea" || keyword == "PaperDimension" )
- bopt = driver->findOption( TQString::tqfromLatin1( "PageSize" ) );
+ bopt = driver->findOption( TQString::fromLatin1( "PageSize" ) );
else
bopt = driver->findOption( keyword );
if (bopt)
@@ -938,7 +938,7 @@ void KMCupsManager::slotConnectionSuccess()
IppRequest req;
req.setOperation( CUPS_GET_PRINTERS );
- req.addKeyword( IPP_TAG_OPERATION, "requested-attributes", TQString::tqfromLatin1( "printer-name" ) );
+ req.addKeyword( IPP_TAG_OPERATION, "requested-attributes", TQString::fromLatin1( "printer-name" ) );
if ( req.doRequest( "/printers/" ) )
setUpdatePossible( true );
else
diff --git a/tdeprint/cups/kmpropusers.cpp b/tdeprint/cups/kmpropusers.cpp
index 65a9e4dbd..0f67205b0 100644
--- a/tdeprint/cups/kmpropusers.cpp
+++ b/tdeprint/cups/kmpropusers.cpp
@@ -29,7 +29,7 @@ KMPropUsers::KMPropUsers(TQWidget *parent, const char *name)
: KMPropWidget(parent,name)
{
m_text = new TQTextView(this);
- m_text->setPaper(tqcolorGroup().background());
+ m_text->setPaper(colorGroup().background());
m_text->setFrameStyle(TQFrame::NoFrame);
TQVBoxLayout *l0 = new TQVBoxLayout(this, 10, 0);
diff --git a/tdeprint/cups/kmwfax.cpp b/tdeprint/cups/kmwfax.cpp
index 352081f6c..a9a120b6c 100644
--- a/tdeprint/cups/kmwfax.cpp
+++ b/tdeprint/cups/kmwfax.cpp
@@ -48,7 +48,7 @@ KMWFax::KMWFax(TQWidget *parent, const char *name)
// initialize
IppRequest req;
req.setOperation(CUPS_GET_DEVICES);
- TQString uri = TQString::tqfromLatin1("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr());
+ TQString uri = TQString::fromLatin1("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr());
req.addURI(IPP_TAG_OPERATION,"printer-uri",uri);
if (req.doRequest("/"))
{
@@ -57,7 +57,7 @@ KMWFax::KMWFax(TQWidget *parent, const char *name)
{
if (attr->name && strcmp(attr->name,"device-uri") == 0 && strncmp(attr->values[0].string.text,"fax",3) == 0)
{
- m_list->insertItem(SmallIcon("blockdevice"),TQString::tqfromLatin1(attr->values[0].string.text));
+ m_list->insertItem(SmallIcon("blockdevice"),TQString::fromLatin1(attr->values[0].string.text));
}
attr = attr->next;
}
diff --git a/tdeprint/cups/kmwipp.cpp b/tdeprint/cups/kmwipp.cpp
index 119da629a..cb9dedd6c 100644
--- a/tdeprint/cups/kmwipp.cpp
+++ b/tdeprint/cups/kmwipp.cpp
@@ -41,7 +41,7 @@ KMWIpp::KMWIpp(TQWidget *parent, const char *name)
"before continuing.</p>"));
setLabel(0,i18n("Host:"));
setLabel(1,i18n("Port:"));
- setText( 1, TQString::tqfromLatin1( "631" ) );
+ setText( 1, TQString::fromLatin1( "631" ) );
}
bool KMWIpp::isValid(TQString& msg)
diff --git a/tdeprint/cups/kmwippprinter.cpp b/tdeprint/cups/kmwippprinter.cpp
index 0a0c7b672..044f9cb6d 100644
--- a/tdeprint/cups/kmwippprinter.cpp
+++ b/tdeprint/cups/kmwippprinter.cpp
@@ -59,7 +59,7 @@ KMWIppPrinter::KMWIppPrinter(TQWidget *parent, const char *name)
l1->setBuddy(m_uri);
m_info = new TQTextView(this);
- m_info->setPaper(tqcolorGroup().background());
+ m_info->setPaper(colorGroup().background());
m_info->setMinimumHeight(100);
m_info->setText(i18n("<p>Either enter the printer URI directly, or use the network scanning facility.</p>"));
m_ippreport = new KPushButton(KGuiItem(i18n("&IPP Report"), "tdeprint_report"), this);
@@ -157,7 +157,7 @@ void KMWIppPrinter::slotPrinterSelected(TQListViewItem *item)
req.setOperation(IPP_GET_PRINTER_ATTRIBUTES);
req.setHost(item->text(1));
req.setPort(item->text(2).toInt());
- uri = TQString::tqfromLatin1("ipp://%1:%2/ipp").arg(item->text(1)).arg(item->text(2));
+ uri = TQString::fromLatin1("ipp://%1:%2/ipp").arg(item->text(1)).arg(item->text(2));
req.addURI(IPP_TAG_OPERATION,"printer-uri",uri);
keys.append("printer-name");
keys.append("printer-state");
@@ -176,7 +176,7 @@ void KMWIppPrinter::slotPrinterSelected(TQListViewItem *item)
if (req.uri("printer-uri-supported",value))
{
if (value[0] == '/')
- value.prepend(TQString::tqfromLatin1("ipp://%1:%2").arg(item->text(1)).arg(item->text(2)));
+ value.prepend(TQString::fromLatin1("ipp://%1:%2").arg(item->text(1)).arg(item->text(2)));
m_uri->setText(value);
}
if (req.text("printer-make-and-model",value) && !value.isEmpty()) txt.append(i18n("<b>Model</b>: %1<br>").arg(value));
diff --git a/tdeprint/cups/kmwippselect.cpp b/tdeprint/cups/kmwippselect.cpp
index 5c9cad356..b5e6c0405 100644
--- a/tdeprint/cups/kmwippselect.cpp
+++ b/tdeprint/cups/kmwippselect.cpp
@@ -75,16 +75,16 @@ void KMWIppSelect::initPrinter(KMPrinter *p)
IppRequest req;
TQString uri;
req.setOperation(CUPS_GET_PRINTERS);
- uri = TQString::tqfromLatin1("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr());
+ uri = TQString::fromLatin1("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr());
req.addURI(IPP_TAG_OPERATION,"printer-uri",uri);
- req.addKeyword(IPP_TAG_OPERATION,"requested-attributes",TQString::tqfromLatin1("printer-name"));
+ req.addKeyword(IPP_TAG_OPERATION,"requested-attributes",TQString::fromLatin1("printer-name"));
if (req.doRequest("/printers/"))
{
ipp_attribute_t *attr = req.first();
while (attr)
{
if (attr->name && strcmp(attr->name,"printer-name") == 0)
- m_list->insertItem(SmallIcon("tdeprint_printer"),TQString::tqfromLatin1(attr->values[0].string.text));
+ m_list->insertItem(SmallIcon("tdeprint_printer"),TQString::fromLatin1(attr->values[0].string.text));
attr = attr->next;
}
m_list->sort();
diff --git a/tdeprint/driver.cpp b/tdeprint/driver.cpp
index 072f125c6..3bcc50066 100644
--- a/tdeprint/driver.cpp
+++ b/tdeprint/driver.cpp
@@ -334,7 +334,7 @@ void DrGroup::flattenGroup(TQMap<TQString, DrBase*>& optmap, int& index)
optmap[oit.current()->name()] = oit.current();
if (name().isEmpty())
- optmap[TQString::tqfromLatin1("group%1").arg(index++)] = this;
+ optmap[TQString::fromLatin1("group%1").arg(index++)] = this;
else
optmap[name()] = this;
diff --git a/tdeprint/driveritem.cpp b/tdeprint/driveritem.cpp
index b6531fef2..500443581 100644
--- a/tdeprint/driveritem.cpp
+++ b/tdeprint/driveritem.cpp
@@ -46,7 +46,7 @@ void DriverItem::updateText()
{
QString s(m_item->get("text"));
if (m_item->isOption())
- s.append(TQString::tqfromLatin1(": <%1>").arg(m_item->prettyText()));
+ s.append(TQString::fromLatin1(": <%1>").arg(m_item->prettyText()));
if (m_item->type() == DrBase::List)
{
// remove all children: something has changed (otherwise this
@@ -107,7 +107,7 @@ void DriverItem::paintCell(TQPainter *p, const TQColorGroup& cg, int, int width,
p->drawText(w,0,w1,height(),Qt::AlignLeft|Qt::AlignVCenter,s);
w += w1;
p->setPen(cg.text());
- s = TQString::tqfromLatin1(">");
+ s = TQString::fromLatin1(">");
w1 = p->fontMetrics().width(s);
p->drawText(w,0,w1,height(),Qt::AlignLeft|Qt::AlignVCenter,s);
}
diff --git a/tdeprint/foomatic/kfoomaticprinterimpl.cpp b/tdeprint/foomatic/kfoomaticprinterimpl.cpp
index d47a5e134..b628ac6d9 100644
--- a/tdeprint/foomatic/kfoomaticprinterimpl.cpp
+++ b/tdeprint/foomatic/kfoomaticprinterimpl.cpp
@@ -44,7 +44,7 @@ bool KFoomaticPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer)
QString exe = executable();
if (!exe.isEmpty())
{
- cmd = exe + TQString::tqfromLatin1(" -P %1 -# %2").arg(quote(printer->printerName())).arg(printer->numCopies());
+ cmd = exe + TQString::fromLatin1(" -P %1 -# %2").arg(quote(printer->printerName())).arg(printer->numCopies());
return true;
}
else
diff --git a/tdeprint/foomatic/kmfoomaticmanager.cpp b/tdeprint/foomatic/kmfoomaticmanager.cpp
index 53049852b..6a4de31eb 100644
--- a/tdeprint/foomatic/kmfoomaticmanager.cpp
+++ b/tdeprint/foomatic/kmfoomaticmanager.cpp
@@ -136,7 +136,7 @@ DrMain* KMFoomaticManager::createDriverFromXML(TQDomElement *elem)
{
driver->set("manufacturer", pelem.namedItem("make").toElement().text());
driver->set("model", pelem.namedItem("model").toElement().text());
- QString s = TQString::tqfromLatin1("%1 %2 (%3)").arg(driver->get("manufacturer")).arg(driver->get("model")).arg(delem.namedItem("name").toElement().text());
+ QString s = TQString::fromLatin1("%1 %2 (%3)").arg(driver->get("manufacturer")).arg(driver->get("model")).arg(delem.namedItem("name").toElement().text());
driver->set("description", s);
driver->set("text", s);
diff --git a/tdeprint/kmfactory.cpp b/tdeprint/kmfactory.cpp
index 3206d3cee..b79c76240 100644
--- a/tdeprint/kmfactory.cpp
+++ b/tdeprint/kmfactory.cpp
@@ -213,7 +213,7 @@ void KMFactory::loadFactory(const TQString& syst)
if (sys.isEmpty())
// load default configured print plugin
sys = printSystem();
- TQString libname = TQString::tqfromLatin1("tdeprint_%1").arg(sys);
+ TQString libname = TQString::fromLatin1("tdeprint_%1").arg(sys);
m_factory = KLibLoader::self()->factory(TQFile::encodeName(libname));
if (!m_factory)
{
@@ -311,7 +311,7 @@ KMFactory::PluginInfo KMFactory::pluginInfo(const TQString& name)
{
TQString path(name);
if (path[0] != '/')
- path = locate("data", TQString::tqfromLatin1("tdeprint/plugins/%1.print").arg(name));
+ path = locate("data", TQString::fromLatin1("tdeprint/plugins/%1.print").arg(name));
KSimpleConfig conf(path);
PluginInfo info;
@@ -363,7 +363,7 @@ TQString KMFactory::autoDetect()
currentPrecedence = plugins[i].detectPrecedence;
}
}
- return (pluginIndex == -1 ? TQString::tqfromLatin1("lpdunix") : plugins[pluginIndex].name);
+ return (pluginIndex == -1 ? TQString::fromLatin1("lpdunix") : plugins[pluginIndex].name);
}
void KMFactory::slot_pluginChanged(pid_t pid)
diff --git a/tdeprint/kmjob.cpp b/tdeprint/kmjob.cpp
index ce7e95993..7ff1efb95 100644
--- a/tdeprint/kmjob.cpp
+++ b/tdeprint/kmjob.cpp
@@ -75,7 +75,7 @@ TQString KMJob::pixmap()
{
// special case
if (m_type == KMJob::Threaded)
- return TQString::tqfromLatin1("exec");
+ return TQString::fromLatin1("exec");
// normal case
QString str("tdeprint_job");
diff --git a/tdeprint/kmmanager.cpp b/tdeprint/kmmanager.cpp
index 01ca0dc77..e995f86af 100644
--- a/tdeprint/kmmanager.cpp
+++ b/tdeprint/kmmanager.cpp
@@ -268,7 +268,7 @@ TQPtrList<KMPrinter>* KMManager::printerList(bool reload)
// - use the PRINTER variable
if (!softDefault())
{
- KMPrinter *defprinter = findPrinter(TQString::tqfromLatin1(getenv("PRINTER")));
+ KMPrinter *defprinter = findPrinter(TQString::fromLatin1(getenv("PRINTER")));
if (defprinter)
setSoftDefault(defprinter);
}
@@ -475,7 +475,7 @@ TQStringList KMManager::detectLocalPrinters()
{
TQStringList list;
for (int i=0; i<3; i++)
- list << TQString() << TQString::tqfromLatin1("parallel:/dev/lp%1").arg(i) << i18n("Parallel Port #%1").arg(i+1) << TQString();
+ list << TQString() << TQString::fromLatin1("parallel:/dev/lp%1").arg(i) << i18n("Parallel Port #%1").arg(i+1) << TQString();
return list;
}
diff --git a/tdeprint/kmspecialmanager.cpp b/tdeprint/kmspecialmanager.cpp
index 6dc967757..d26515a16 100644
--- a/tdeprint/kmspecialmanager.cpp
+++ b/tdeprint/kmspecialmanager.cpp
@@ -66,7 +66,7 @@ bool KMSpecialManager::savePrinters()
conf.setGroup("General");
int n = conf.readNumEntry("Number",0);
for (int i=0;i<n;i++)
- conf.deleteGroup(TQString::tqfromLatin1("Printer %1").arg(i),true);
+ conf.deleteGroup(TQString::fromLatin1("Printer %1").arg(i),true);
// then add printers
n = 0;
@@ -74,7 +74,7 @@ bool KMSpecialManager::savePrinters()
for (;it.current();++it)
{
if (!it.current()->isSpecial() || it.current()->isVirtual()) continue;
- conf.setGroup(TQString::tqfromLatin1("Printer %1").arg(n));
+ conf.setGroup(TQString::fromLatin1("Printer %1").arg(n));
conf.writeEntry("Name",it.current()->name());
conf.writeEntry("Description",it.current()->description());
conf.writeEntry("Comment",it.current()->location());
@@ -139,7 +139,7 @@ bool KMSpecialManager::loadDesktopFile(const TQString& filename)
int n = conf.readNumEntry("Number",0);
for (int i=0;i<n;i++)
{
- QString grpname = TQString::tqfromLatin1("Printer %1").arg(i);
+ QString grpname = TQString::fromLatin1("Printer %1").arg(i);
if (!conf.hasGroup(grpname)) continue;
conf.setGroup(grpname);
KMPrinter *printer = new KMPrinter;
diff --git a/tdeprint/kpcopiespage.cpp b/tdeprint/kpcopiespage.cpp
index c8757e174..b27e09758 100644
--- a/tdeprint/kpcopiespage.cpp
+++ b/tdeprint/kpcopiespage.cpp
@@ -336,7 +336,7 @@ void KPCopiesPage::getOptions(TQMap<TQString,TQString>& options, bool incldef)
options["kde-collate"] = (m_collate->isChecked() ? "Collate" : "Uncollate");
// ranges
options["kde-current"] = (m_current->isChecked() ? "1" : "0");
- options["kde-range"] = (m_range->isChecked() ? m_rangeedit->text() : (incldef ? TQString::tqfromLatin1("1-") : TQString::tqfromLatin1("")));
+ options["kde-range"] = (m_range->isChecked() ? m_rangeedit->text() : (incldef ? TQString::fromLatin1("1-") : TQString::fromLatin1("")));
// page set
options["kde-pageset"] = TQString::number(m_pageset->currentItem());
}
diff --git a/tdeprint/kprintdialog.cpp b/tdeprint/kprintdialog.cpp
index 092884bde..358ee70cd 100644
--- a/tdeprint/kprintdialog.cpp
+++ b/tdeprint/kprintdialog.cpp
@@ -568,7 +568,7 @@ void KPrintDialog::initialize(KPrinter *printer)
if (!sep && it.current()->isSpecial())
{
sep = true;
- d->m_printers->insertItem(TQPixmap(), TQString::tqfromLatin1("--------"));
+ d->m_printers->insertItem(TQPixmap(), TQString::fromLatin1("--------"));
}
d->m_printers->insertItem(SmallIcon(it.current()->pixmap(),0,(it.current()->isValid() ? (int)KIcon::DefaultState : (int)KIcon::LockOverlay)),it.current()->name(),false/*sep*/);
if (it.current()->isSoftDefault())
@@ -863,7 +863,7 @@ void KPrintDialog::expandDialog(bool on)
if (on)
{
- sz.setHeight(sz.height()+d->m_dummy->tqminimumSize().height()+d->m_plugin->tqminimumSize().height()+2*layout()->spacing());
+ sz.setHeight(sz.height()+d->m_dummy->minimumSize().height()+d->m_plugin->minimumSize().height()+2*layout()->spacing());
if (isVisible() || !d->m_dummy->isVisible() || !d->m_plugin->isVisible())
{
d->m_dummy->show();
diff --git a/tdeprint/kprinter.cpp b/tdeprint/kprinter.cpp
index 67d276990..86ef04f66 100644
--- a/tdeprint/kprinter.cpp
+++ b/tdeprint/kprinter.cpp
@@ -846,7 +846,7 @@ int KPrinter::toPage() const
{ return (option("kde-topage").isEmpty() ? 0 : option("kde-topage").toInt()); }
void KPrinter::setFromTo(int m, int M)
-{ setOption("kde-frompage",TQString::number(m)); setOption("kde-topage",TQString::number(M)); setOption("kde-range",(m>0 && M>0 ? TQString("%1-%2").arg(m).arg(M) : TQString::tqfromLatin1(""))); }
+{ setOption("kde-frompage",TQString::number(m)); setOption("kde-topage",TQString::number(M)); setOption("kde-range",(m>0 && M>0 ? TQString("%1-%2").arg(m).arg(M) : TQString::fromLatin1(""))); }
// if no page size defined, use the localized one
KPrinter::PageSize KPrinter::pageSize() const
@@ -889,7 +889,7 @@ void KPrinter::setPrintProgram(const TQString& prg)
}
TQString KPrinter::printerSelectionOption() const
-{ return TQString::tqfromLatin1(""); }
+{ return TQString::fromLatin1(""); }
void KPrinter::setPrinterSelectionOption(const TQString&)
{}
diff --git a/tdeprint/kprinterimpl.cpp b/tdeprint/kprinterimpl.cpp
index 166ae7207..5b35f6eff 100644
--- a/tdeprint/kprinterimpl.cpp
+++ b/tdeprint/kprinterimpl.cpp
@@ -508,7 +508,7 @@ int KPrinterImpl::autoConvertFiles(KPrinter *printer, TQStringList& files, bool
TQString::null,
i18n("Convert"),
i18n("Keep"),
- TQString::tqfromLatin1("tdeprintAutoConvert"))) == KMessageBox::Yes)
+ TQString::fromLatin1("tdeprintAutoConvert"))) == KMessageBox::Yes)
{
// find the filter chain
TQStringList flist = KXmlCommandManager::self()->autoConvert(mime, primaryMimeType);
diff --git a/tdeprint/kprintpreview.cpp b/tdeprint/kprintpreview.cpp
index 235472d1f..d6c80cd86 100644
--- a/tdeprint/kprintpreview.cpp
+++ b/tdeprint/kprintpreview.cpp
@@ -111,7 +111,7 @@ static KLibFactory* componentFactory()
factory = KLibLoader::self()->factory("libkghostviewpart");
if( factory )
return factory;
- KTrader::OfferList offers = KTrader::self()->query(TQString::tqfromLatin1("application/postscript"), TQString::tqfromLatin1("KParts/ReadOnlyPart"), TQString::null, TQString::null);
+ KTrader::OfferList offers = KTrader::self()->query(TQString::fromLatin1("application/postscript"), TQString::fromLatin1("KParts/ReadOnlyPart"), TQString::null, TQString::null);
for (KTrader::OfferList::ConstIterator it = offers.begin(); it != offers.end(); ++it)
{
KService::Ptr service = *it;
diff --git a/tdeprint/lpd/gschecker.cpp b/tdeprint/lpd/gschecker.cpp
index 9fe6e290b..99044918b 100644
--- a/tdeprint/lpd/gschecker.cpp
+++ b/tdeprint/lpd/gschecker.cpp
@@ -53,7 +53,7 @@ void GsChecker::loadDriverList()
else
buffer.append(line).append(" ");
}
- else if (line.startsWith(TQString::tqfromLatin1("Available devices:")))
+ else if (line.startsWith(TQString::fromLatin1("Available devices:")))
ok = true;
}
m_driverlist = TQStringList::split(' ',buffer,false);
diff --git a/tdeprint/lpd/klpdprinterimpl.cpp b/tdeprint/lpd/klpdprinterimpl.cpp
index 59f04e74c..2704cc46a 100644
--- a/tdeprint/lpd/klpdprinterimpl.cpp
+++ b/tdeprint/lpd/klpdprinterimpl.cpp
@@ -46,6 +46,6 @@ bool KLpdPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer)
printer->setErrorMessage(i18n("The <b>%1</b> executable could not be found in your path. Check your installation.").arg("lpr"));
return false;
}
- cmd = TQString::tqfromLatin1("%1 -P %2 '-#%3'").arg(exestr).arg(quote(printer->printerName())).arg(printer->numCopies());
+ cmd = TQString::fromLatin1("%1 -P %2 '-#%3'").arg(exestr).arg(quote(printer->printerName())).arg(printer->numCopies());
return true;
}
diff --git a/tdeprint/lpd/kmlpdmanager.cpp b/tdeprint/lpd/kmlpdmanager.cpp
index a5612ad58..fcc6fdac8 100644
--- a/tdeprint/lpd/kmlpdmanager.cpp
+++ b/tdeprint/lpd/kmlpdmanager.cpp
@@ -65,12 +65,12 @@ KMLpdManager::~KMLpdManager()
TQString KMLpdManager::driverDbCreationProgram()
{
- return TQString::tqfromLatin1("make_driver_db_lpd");
+ return TQString::fromLatin1("make_driver_db_lpd");
}
TQString KMLpdManager::driverDirectory()
{
- return TQString::tqfromLatin1("/usr/lib/rhs/rhs-printfilters");
+ return TQString::fromLatin1("/usr/lib/rhs/rhs-printfilters");
}
bool KMLpdManager::completePrinter(KMPrinter *printer)
@@ -91,11 +91,11 @@ bool KMLpdManager::completePrinterShort(KMPrinter *printer)
KURL url;
if (!entry->arg("rm").isEmpty())
{
- url = TQString::tqfromLatin1("lpd://%1/%2").arg(entry->arg("rm")).arg(entry->arg("rp"));
+ url = TQString::fromLatin1("lpd://%1/%2").arg(entry->arg("rm")).arg(entry->arg("rp"));
printer->setDescription(i18n("Remote LPD queue %1@%2").arg(entry->arg("rp")).arg(entry->arg("rm")));
}
else if (!lp.isEmpty() && lp != "/dev/null")
- url = TQString::tqfromLatin1("parallel:%1").arg(lp);
+ url = TQString::fromLatin1("parallel:%1").arg(lp);
else if (TQFile::exists(entry->arg("sd")+"/.config"))
{
TQMap<TQString,TQString> map = loadPrinttoolCfgFile(entry->arg("sd")+"/.config");
@@ -103,17 +103,17 @@ bool KMLpdManager::completePrinterShort(KMPrinter *printer)
{
QStringList l = TQStringList::split('\\',map["share"],false);
if (map["workgroup"].isEmpty())
- url = TQString::tqfromLatin1("smb://%1/%2").arg(l[0]).arg(l[1]);
+ url = TQString::fromLatin1("smb://%1/%2").arg(l[0]).arg(l[1]);
else
- url = TQString::tqfromLatin1("smb://%1/%2/%3").arg(map["workgroup"]).arg(l[0]).arg(l[1]);
+ url = TQString::fromLatin1("smb://%1/%2/%3").arg(map["workgroup"]).arg(l[0]).arg(l[1]);
url.setUser(map["user"]);
url.setPass(map["password"]);
}
else if (type == "DIRECT")
- url = TQString::tqfromLatin1("socket://%1:%2").arg(map["printer_ip"]).arg(map["port"]);
+ url = TQString::fromLatin1("socket://%1:%2").arg(map["printer_ip"]).arg(map["port"]);
else if (type == "NCP")
{
- url = TQString::tqfromLatin1("ncp://%1/%2").arg(map["server"]).arg(map["queue"]);
+ url = TQString::fromLatin1("ncp://%1/%2").arg(map["server"]).arg(map["queue"]);
url.setUser(map["user"]);
url.setPass(map["password"]);
}
@@ -146,9 +146,9 @@ bool KMLpdManager::createPrinter(KMPrinter *printer)
{
// remote lpd queue
ent->m_args["rm"] = printer->device().host();
- ent->m_args["rp"] = printer->device().path().replace("/",TQString::tqfromLatin1(""));
+ ent->m_args["rp"] = printer->device().path().replace("/",TQString::fromLatin1(""));
ent->m_args["lpd_bounce"] = "true";
- ent->m_comment = TQString::tqfromLatin1("##PRINTTOOL3## REMOTE");
+ ent->m_comment = TQString::fromLatin1("##PRINTTOOL3## REMOTE");
}
ent->m_args["mx"] = (printer->option("mx").isEmpty() ? "#0" : printer->option("mx"));
ent->m_args["sh"] = TQString::null;
@@ -259,7 +259,7 @@ bool KMLpdManager::disablePrinter(KMPrinter *printer)
void KMLpdManager::listPrinters()
{
m_entries.clear();
- loadPrintcapFile(TQString::tqfromLatin1("%1/etc/printcap").arg(lpdprefix));
+ loadPrintcapFile(TQString::fromLatin1("%1/etc/printcap").arg(lpdprefix));
TQDictIterator<PrintcapEntry> it(m_entries);
for (;it.current();++it)
@@ -312,7 +312,7 @@ void KMLpdManager::checkStatus()
bool KMLpdManager::writePrinters()
{
- if (!writePrintcapFile(TQString::tqfromLatin1("%1/etc/printcap").arg(lpdprefix)))
+ if (!writePrintcapFile(TQString::fromLatin1("%1/etc/printcap").arg(lpdprefix)))
{
setErrorMsg(i18n("Unable to write printcap file."));
return false;
@@ -489,7 +489,7 @@ bool KMLpdManager::savePrinttoolCfgFile(const TQString& templatefile, const TQSt
{
// defines input and output file
QString fname = TQFileInfo(templatefile).fileName();
- fname.replace(TQRegExp("\\.in$"),TQString::tqfromLatin1(""));
+ fname.replace(TQRegExp("\\.in$"),TQString::fromLatin1(""));
QFile fin(templatefile);
QFile fout(dirname + "/" + fname);
if (fin.exists() && fin.open(IO_ReadOnly) && fout.open(IO_WriteOnly))
@@ -508,7 +508,7 @@ bool KMLpdManager::savePrinttoolCfgFile(const TQString& templatefile, const TQSt
if (line.startsWith("export "))
{
tout << "export ";
- line.replace(0,7,TQString::tqfromLatin1(""));
+ line.replace(0,7,TQString::fromLatin1(""));
}
if ((p=line.find('=')) != -1)
{
@@ -543,8 +543,8 @@ bool KMLpdManager::savePrinterDriver(KMPrinter *printer, DrMain *driver)
return false;
QString resol(options["RESOLUTION"]), color(options["COLOR"]);
// update entry comment to make printtool happy and save printcap file
- ent->m_comment = TQString::tqfromLatin1("##PRINTTOOL3## %1 %2 %3 %4 {} {%5} %6 {}").arg(options["PRINTER_TYPE"]).arg(options["GSDEVICE"]).arg((resol.isEmpty() ? TQString::tqfromLatin1("NAxNA") : resol)).arg(options["PAPERSIZE"]).arg(driver->name()).arg((color.isEmpty() ? TQString::tqfromLatin1("Default") : color.right(color.length()-15)));
- ent->m_args["if"] = spooldir+TQString::tqfromLatin1("/filter");
+ ent->m_comment = TQString::fromLatin1("##PRINTTOOL3## %1 %2 %3 %4 {} {%5} %6 {}").arg(options["PRINTER_TYPE"]).arg(options["GSDEVICE"]).arg((resol.isEmpty() ? TQString::fromLatin1("NAxNA") : resol)).arg(options["PAPERSIZE"]).arg(driver->name()).arg((color.isEmpty() ? TQString::fromLatin1("Default") : color.right(color.length()-15)));
+ ent->m_args["if"] = spooldir+TQString::fromLatin1("/filter");
if (!writePrinters())
return false;
// write various driver files using templates
@@ -566,11 +566,11 @@ bool KMLpdManager::createPrinttoolEntry(KMPrinter *printer, PrintcapEntry *entry
{
KURL dev(printer->device());
QString prot = dev.protocol(), sd(entry->arg("sd"));
- entry->m_comment = TQString::tqfromLatin1("##PRINTTOOL3## %1").arg(ptPrinterType(printer));
+ entry->m_comment = TQString::fromLatin1("##PRINTTOOL3## %1").arg(ptPrinterType(printer));
if (prot == "smb" || prot == "ncp" || prot == "socket")
{
- entry->m_args["af"] = sd+TQString::tqfromLatin1("/acct");
- QFile f(sd+TQString::tqfromLatin1("/.config"));
+ entry->m_args["af"] = sd+TQString::fromLatin1("/acct");
+ QFile f(sd+TQString::fromLatin1("/.config"));
if (f.open(IO_WriteOnly))
{
QTextStream t(&f);
@@ -578,7 +578,7 @@ bool KMLpdManager::createPrinttoolEntry(KMPrinter *printer, PrintcapEntry *entry
{
t << "printer_ip=" << dev.host() << endl;
t << "port=" << dev.port() << endl;
- entry->m_args["if"] = driverDirectory()+TQString::tqfromLatin1("/directprint");
+ entry->m_args["if"] = driverDirectory()+TQString::fromLatin1("/directprint");
}
else if (prot == "smb")
{
@@ -594,20 +594,20 @@ bool KMLpdManager::createPrinttoolEntry(KMPrinter *printer, PrintcapEntry *entry
t << "hostip=" << endl;
t << "user='" << dev.user() << '\'' << endl;
t << "password='" << dev.pass() << '\'' << endl;
- t << "workgroup='" << (l.count() == 2 ? dev.host() : TQString::tqfromLatin1("")) << '\'' << endl;
- entry->m_args["if"] = driverDirectory()+TQString::tqfromLatin1("/smbprint");
+ t << "workgroup='" << (l.count() == 2 ? dev.host() : TQString::fromLatin1("")) << '\'' << endl;
+ entry->m_args["if"] = driverDirectory()+TQString::fromLatin1("/smbprint");
}
else if (prot == "ncp")
{
t << "server=" << dev.host() << endl;
- t << "queue=" << dev.path().replace("/",TQString::tqfromLatin1("")) << endl;
+ t << "queue=" << dev.path().replace("/",TQString::fromLatin1("")) << endl;
t << "user=" << dev.user() << endl;
t << "password=" << dev.pass() << endl;
- entry->m_args["if"] = driverDirectory()+TQString::tqfromLatin1("/ncpprint");
+ entry->m_args["if"] = driverDirectory()+TQString::fromLatin1("/ncpprint");
}
}
else return false;
- entry->m_args["lp"] = TQString::tqfromLatin1("/dev/null");
+ entry->m_args["lp"] = TQString::fromLatin1("/dev/null");
}
else if (prot != "lpd")
entry->m_args["lp"] = dev.path();
@@ -618,7 +618,7 @@ bool KMLpdManager::createSpooldir(PrintcapEntry *entry)
{
// first check if it has a "sd" defined
if (entry->arg("sd").isEmpty())
- entry->m_args["sd"] = TQString::tqfromLatin1("/var/spool/lpd/")+entry->m_name;
+ entry->m_args["sd"] = TQString::fromLatin1("/var/spool/lpd/")+entry->m_name;
QString sd = entry->arg("sd");
if (!KStandardDirs::exists(sd))
{
diff --git a/tdeprint/lpd/lpdtools.cpp b/tdeprint/lpd/lpdtools.cpp
index 610e8ead5..5131b33f3 100644
--- a/tdeprint/lpd/lpdtools.cpp
+++ b/tdeprint/lpd/lpdtools.cpp
@@ -257,11 +257,11 @@ DrMain* PrinttoolEntry::createDriver()
for (int i=0;it.current();++it,i++)
{
ch = new DrBase;
- ch->setName(TQString::tqfromLatin1("%1x%2").arg(it.current()->xdpi).arg(it.current()->ydpi));
+ ch->setName(TQString::fromLatin1("%1x%2").arg(it.current()->xdpi).arg(it.current()->ydpi));
if (it.current()->comment.isEmpty())
- ch->set("text",TQString::tqfromLatin1("%1x%2 DPI").arg(it.current()->xdpi).arg(it.current()->ydpi));
+ ch->set("text",TQString::fromLatin1("%1x%2 DPI").arg(it.current()->xdpi).arg(it.current()->ydpi));
else
- ch->set("text",TQString::tqfromLatin1("%2x%3 DPI (%1)").arg(it.current()->comment).arg(it.current()->xdpi).arg(it.current()->ydpi));
+ ch->set("text",TQString::fromLatin1("%2x%3 DPI (%1)").arg(it.current()->comment).arg(it.current()->xdpi).arg(it.current()->ydpi));
lopt->addChoice(ch);
}
QString defval = lopt->choices()->first()->name();
@@ -281,13 +281,13 @@ DrMain* PrinttoolEntry::createDriver()
{
ch = new DrBase;
if (m_gsdriver != "uniprint")
- ch->setName(TQString::tqfromLatin1("-dBitsPerPixel=%1").arg(it.current()->bpp));
+ ch->setName(TQString::fromLatin1("-dBitsPerPixel=%1").arg(it.current()->bpp));
else
ch->setName(it.current()->bpp);
if (it.current()->comment.isEmpty())
ch->set("text",it.current()->bpp);
else
- ch->set("text",TQString::tqfromLatin1("%1 - %2").arg(it.current()->bpp).arg(it.current()->comment));
+ ch->set("text",TQString::fromLatin1("%1 - %2").arg(it.current()->bpp).arg(it.current()->comment));
lopt->addChoice(ch);
}
QString defval = lopt->choices()->first()->name();
diff --git a/tdeprint/lpdunix/klpdunixprinterimpl.cpp b/tdeprint/lpdunix/klpdunixprinterimpl.cpp
index 9ba97efae..e8ee34fd5 100644
--- a/tdeprint/lpdunix/klpdunixprinterimpl.cpp
+++ b/tdeprint/lpdunix/klpdunixprinterimpl.cpp
@@ -36,12 +36,12 @@ KLpdUnixPrinterImpl::~KLpdUnixPrinterImpl()
void KLpdUnixPrinterImpl::initLpPrint(TQString& cmd, KPrinter *printer)
{
- cmd += TQString::tqfromLatin1(" -d %1 -n%2").arg(quote(printer->printerName())).arg(printer->numCopies());
+ cmd += TQString::fromLatin1(" -d %1 -n%2").arg(quote(printer->printerName())).arg(printer->numCopies());
}
void KLpdUnixPrinterImpl::initLprPrint(TQString& cmd, KPrinter *printer)
{
- cmd += TQString::tqfromLatin1(" -P %1 '-#%2'").arg(quote(printer->printerName())).arg(printer->numCopies());
+ cmd += TQString::fromLatin1(" -P %1 '-#%2'").arg(quote(printer->printerName())).arg(printer->numCopies());
}
// look for executable, starting with "lpr"
diff --git a/tdeprint/lpdunix/kmlpdunixmanager.cpp b/tdeprint/lpdunix/kmlpdunixmanager.cpp
index afcd83b2a..577575e7f 100644
--- a/tdeprint/lpdunix/kmlpdunixmanager.cpp
+++ b/tdeprint/lpdunix/kmlpdunixmanager.cpp
@@ -168,7 +168,7 @@ TQString getPrintcapFileName()
if (pcentry[0] == '|')
{ // printcap through pipe
printcap = locateLocal("tmp","printcap");
- TQString cmd = TQString::tqfromLatin1("echo \"all\" | %1 > %2").arg(pcentry.mid(1)).arg(printcap);
+ TQString cmd = TQString::fromLatin1("echo \"all\" | %1 > %2").arg(pcentry.mid(1)).arg(printcap);
kdDebug() << "printcap obtained through pipe" << endl << "executing: " << cmd << endl;
::system(cmd.local8Bit());
}
@@ -234,7 +234,7 @@ TQString getEtcPrintersConfName()
{
// standard file not found, try NIS
printersconf = locateLocal("tmp","printers.conf");
- TQString cmd = TQString::tqfromLatin1("ypcat printers.conf.byname > %1").arg(printersconf);
+ TQString cmd = TQString::fromLatin1("ypcat printers.conf.byname > %1").arg(printersconf);
kdDebug() << "printers.conf obtained from NIS server: " << cmd << endl;
::system(TQFile::encodeName(cmd));
}
diff --git a/tdeprint/lpr/apshandler.cpp b/tdeprint/lpr/apshandler.cpp
index d4107d7c7..1c395e67c 100644
--- a/tdeprint/lpr/apshandler.cpp
+++ b/tdeprint/lpr/apshandler.cpp
@@ -50,8 +50,8 @@ bool ApsHandler::validate(PrintcapEntry *entry)
KMPrinter* ApsHandler::createPrinter(PrintcapEntry *entry)
{
- entry->comment = TQString::tqfromLatin1("# APS%1_BEGIN:printer%2").arg(m_counter).arg(m_counter);
- entry->postcomment = TQString::tqfromLatin1("# APS%1_END - don't delete this").arg(m_counter);
+ entry->comment = TQString::fromLatin1("# APS%1_BEGIN:printer%2").arg(m_counter).arg(m_counter);
+ entry->postcomment = TQString::fromLatin1("# APS%1_END - don't delete this").arg(m_counter);
m_counter++;
return LprHandler::createPrinter(entry);
}
@@ -309,8 +309,8 @@ PrintcapEntry* ApsHandler::createEntry(KMPrinter *prt)
entry->addField("af", Field::String, sd + "/acct");
entry->addField("lf", Field::String, sd + "/log");
entry->addField("if", Field::String, sysconfDir() + "/basedir/bin/apsfilter");
- entry->comment = TQString::tqfromLatin1("# APS%1_BEGIN:printer%2").arg(m_counter).arg(m_counter);
- entry->postcomment = TQString::tqfromLatin1("# APS%1_END").arg(m_counter);
+ entry->comment = TQString::fromLatin1("# APS%1_BEGIN:printer%2").arg(m_counter).arg(m_counter);
+ entry->postcomment = TQString::fromLatin1("# APS%1_END").arg(m_counter);
m_counter++;
return entry;
}
diff --git a/tdeprint/lpr/klprprinterimpl.cpp b/tdeprint/lpr/klprprinterimpl.cpp
index 70356f23c..92928a0cc 100644
--- a/tdeprint/lpr/klprprinterimpl.cpp
+++ b/tdeprint/lpr/klprprinterimpl.cpp
@@ -41,7 +41,7 @@ bool KLprPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer)
if (!printer || m_exepath.isEmpty())
return false;
- cmd = TQString::tqfromLatin1("%1 -P %1 '-#%1'").arg(m_exepath).arg(quote(printer->printerName())).arg( printer->numCopies() );
+ cmd = TQString::fromLatin1("%1 -P %1 '-#%1'").arg(m_exepath).arg(quote(printer->printerName())).arg( printer->numCopies() );
QString opts = static_cast<KMLprManager*>(KMManager::self())->printOptions(printer);
if (!opts.isEmpty())
cmd += (" " + opts);
@@ -53,7 +53,7 @@ void KLprPrinterImpl::broadcastOption(const TQString& key, const TQString& value
KPrinterImpl::broadcastOption(key,value);
if (key == "kde-pagesize")
{
- QString pagename = TQString::tqfromLatin1(pageSizeToPageName((KPrinter::PageSize)value.toInt()));
+ QString pagename = TQString::fromLatin1(pageSizeToPageName((KPrinter::PageSize)value.toInt()));
KPrinterImpl::broadcastOption("PageSize",pagename);
}
}
diff --git a/tdeprint/lpr/kmlprmanager.cpp b/tdeprint/lpr/kmlprmanager.cpp
index cf4dbbb94..54f987c58 100644
--- a/tdeprint/lpr/kmlprmanager.cpp
+++ b/tdeprint/lpr/kmlprmanager.cpp
@@ -231,7 +231,7 @@ DrMain* KMLprManager::loadPrinterDriver(KMPrinter *prt, bool config)
DrMain* KMLprManager::loadFileDriver(const TQString& filename)
{
int p = filename.find('/');
- TQString handler_str = (p != -1 ? filename.left(p) : TQString::tqfromLatin1("default"));
+ TQString handler_str = (p != -1 ? filename.left(p) : TQString::fromLatin1("default"));
LprHandler *handler = m_handlers.find(handler_str);
if (handler)
{
@@ -422,7 +422,7 @@ bool KMLprManager::removePrinter(KMPrinter *prt)
TQString KMLprManager::driverDbCreationProgram()
{
- return TQString::tqfromLatin1("make_driver_db_lpr");
+ return TQString::fromLatin1("make_driver_db_lpr");
}
TQString KMLprManager::driverDirectory()
diff --git a/tdeprint/lpr/lprngtoolhandler.cpp b/tdeprint/lpr/lprngtoolhandler.cpp
index 1d76cf2f5..d3e283123 100644
--- a/tdeprint/lpr/lprngtoolhandler.cpp
+++ b/tdeprint/lpr/lprngtoolhandler.cpp
@@ -308,7 +308,7 @@ PrintcapEntry* LPRngToolHandler::createEntry(KMPrinter *prt)
TQString work, server, printer, user, passwd;
if ( splitSmbURI( prt->device(), work, server, printer, user, passwd ) )
{
- entry->addField("xfer_options", Field::String, TQString::tqfromLatin1("authfile=\"auth\" crlf=\"0\" hostip=\"\" host=\"%1\" printer=\"%2\" remote_mode=\"SMB\" share=\"//%3/%4\" workgroup=\"%5\"").arg(server).arg(printer).arg(server).arg(printer).arg(work));
+ entry->addField("xfer_options", Field::String, TQString::fromLatin1("authfile=\"auth\" crlf=\"0\" hostip=\"\" host=\"%1\" printer=\"%2\" remote_mode=\"SMB\" share=\"//%3/%4\" workgroup=\"%5\"").arg(server).arg(printer).arg(server).arg(printer).arg(work));
TQFile authfile(LprSettings::self()->baseSpoolDir() + "/" + prt->printerName() + "/auth");
if (authfile.open(IO_WriteOnly))
{
@@ -331,8 +331,8 @@ PrintcapEntry* LPRngToolHandler::createEntry(KMPrinter *prt)
DrMain *driver = prt->driver();
comment.append("filtertype=IFHP ifhp_options=status@,sync@,pagecount@,waitend@ printerdb_entry=");
comment.append(driver->get("driverID"));
- entry->addField("ifhp", Field::String, TQString::tqfromLatin1("model=%1,status@,sync@,pagecount@,waitend@").arg(driver->get("driverID")));
- entry->addField("lprngtooloptions", Field::String, TQString::tqfromLatin1("FILTERTYPE=\"IFHP\" IFHP_OPTIONS=\"status@,sync@,pagecount@,waitend@\" PRINTERDB_ENTRY=\"%1\"").arg(driver->get("driverID")));
+ entry->addField("ifhp", Field::String, TQString::fromLatin1("model=%1,status@,sync@,pagecount@,waitend@").arg(driver->get("driverID")));
+ entry->addField("lprngtooloptions", Field::String, TQString::fromLatin1("FILTERTYPE=\"IFHP\" IFHP_OPTIONS=\"status@,sync@,pagecount@,waitend@\" PRINTERDB_ENTRY=\"%1\"").arg(driver->get("driverID")));
TQMap<TQString,TQString> opts;
TQString optstr;
driver->getOptions(opts, false);
diff --git a/tdeprint/lpr/matichandler.cpp b/tdeprint/lpr/matichandler.cpp
index ef2f1584b..49c33822d 100644
--- a/tdeprint/lpr/matichandler.cpp
+++ b/tdeprint/lpr/matichandler.cpp
@@ -104,7 +104,7 @@ bool MaticHandler::completePrinter(KMPrinter *prt, PrintcapEntry *entry, bool sh
KURL url ( parsePostpipe(postpipe) );
if (!url.isEmpty())
{
- TQString ds = TQString::tqfromLatin1("%1 (%2)").arg(prt->location()).arg(url.protocol());
+ TQString ds = TQString::fromLatin1("%1 (%2)").arg(prt->location()).arg(url.protocol());
prt->setDevice(url.url());
prt->setLocation(ds);
}
@@ -115,7 +115,7 @@ bool MaticHandler::completePrinter(KMPrinter *prt, PrintcapEntry *entry, bool sh
{
prt->setManufacturer(m["make"].toString());
prt->setModel(m["model"].toString());
- prt->setDriverInfo(TQString::tqfromLatin1("%1 %2 (%3)").arg(prt->manufacturer()).arg(prt->model()).arg(m["driver"].toString()));
+ prt->setDriverInfo(TQString::fromLatin1("%1 %2 (%3)").arg(prt->manufacturer()).arg(prt->model()).arg(m["driver"].toString()));
}
}
}
@@ -247,7 +247,7 @@ DrMain* MaticHandler::loadDbDriver(const TQString& path)
}
TQString tmpFile = locateLocal("tmp", "foomatic_" + kapp->randomString(8));
- TQString PATH = getenv("PATH") + TQString::tqfromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin");
+ TQString PATH = getenv("PATH") + TQString::fromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin");
TQString exe = KStandardDirs::findExe("foomatic-datafile", PATH);
if (exe.isEmpty())
{
@@ -351,7 +351,7 @@ bool MaticHandler::savePpdFile(DrMain *driver, const TQString& filename)
if (mdriver.isEmpty() || mprinter.isEmpty())
return true;
- TQString PATH = getenv("PATH") + TQString::tqfromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin");
+ TQString PATH = getenv("PATH") + TQString::fromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin");
TQString exe = KStandardDirs::findExe("foomatic-datafile", PATH);
if (exe.isEmpty())
{
diff --git a/tdeprint/management/kmdbcreator.cpp b/tdeprint/management/kmdbcreator.cpp
index 1a89d0a8e..3fab5929e 100644
--- a/tdeprint/management/kmdbcreator.cpp
+++ b/tdeprint/management/kmdbcreator.cpp
@@ -109,7 +109,7 @@ bool KMDBCreator::createDriverDB(const TQString& dirname, const TQString& filena
{
if (!m_dlg)
{
- m_dlg = new TQProgressDialog(parent->tqtopLevelWidget(),"progress-dialog",true);
+ m_dlg = new TQProgressDialog(parent->topLevelWidget(),"progress-dialog",true);
m_dlg->setLabelText(i18n("Please wait while KDE rebuilds a driver database."));
m_dlg->setCaption(i18n("Driver Database"));
connect(m_dlg,TQT_SIGNAL(canceled()),TQT_SLOT(slotCancelled()));
diff --git a/tdeprint/management/kmdriverdb.cpp b/tdeprint/management/kmdriverdb.cpp
index 6fbab45ec..67bd25966 100644
--- a/tdeprint/management/kmdriverdb.cpp
+++ b/tdeprint/management/kmdriverdb.cpp
@@ -60,7 +60,7 @@ KMDriverDB::~KMDriverDB()
TQString KMDriverDB::dbFile()
{
// this calls insure missing directories creation
- TQString filename = locateLocal("data",TQString::tqfromLatin1("tdeprint/printerdb_%1.txt").arg(KMFactory::self()->printSystem()));
+ TQString filename = locateLocal("data",TQString::fromLatin1("tdeprint/printerdb_%1.txt").arg(KMFactory::self()->printSystem()));
return filename;
}
diff --git a/tdeprint/management/kmdriverdbwidget.cpp b/tdeprint/management/kmdriverdbwidget.cpp
index e9c490206..579cae5df 100644
--- a/tdeprint/management/kmdriverdbwidget.cpp
+++ b/tdeprint/management/kmdriverdbwidget.cpp
@@ -105,7 +105,7 @@ void KMDriverDbWidget::setDriver(const TQString& manu, const TQString& model)
// try by stripping the manufacturer name from
// the beginning of the model string. This is
// often the case with PPD files
- item = m_model->findItem(model_.replace(0,manu.length()+1,TQString::tqfromLatin1("")));
+ item = m_model->findItem(model_.replace(0,manu.length()+1,TQString::fromLatin1("")));
if (item)
m_model->setCurrentItem(item);
}
diff --git a/tdeprint/management/kmiconview.cpp b/tdeprint/management/kmiconview.cpp
index 905f4d248..a11458730 100644
--- a/tdeprint/management/kmiconview.cpp
+++ b/tdeprint/management/kmiconview.cpp
@@ -99,7 +99,7 @@ void KMIconViewItem::updatePrinter(KMPrinter *p, int mode)
setText(TQString::null);
setText(p->name());
}
- setKey(TQString::tqfromLatin1("%1_%2").arg((p->isSpecial() ? "special" : (p->isClass(false) ? "class" : "printer"))).arg(p->name()));
+ setKey(TQString::fromLatin1("%1_%2").arg((p->isSpecial() ? "special" : (p->isClass(false) ? "class" : "printer"))).arg(p->name()));
m_isclass = p->isClass(false);
}
if (mode != m_mode || ((oldstate&0x4) != (m_state&0x4)) || (p && p->pixmap() != m_pixmap))
diff --git a/tdeprint/management/kminfopage.cpp b/tdeprint/management/kminfopage.cpp
index 2c3e7a2fa..9987ccb4c 100644
--- a/tdeprint/management/kminfopage.cpp
+++ b/tdeprint/management/kminfopage.cpp
@@ -107,7 +107,7 @@ void KMInfoPage::setPrinter(KMPrinter *p)
}
else
{
- m_title->setText(TQString::tqfromLatin1("<b>%1</b>").arg(p->name()));
+ m_title->setText(TQString::fromLatin1("<b>%1</b>").arg(p->name()));
m_titlepixmap->setPixmap(SmallIcon(p->pixmap()));
if (p->isImplicit()) m_type->setText(i18n("Implicit class"));
else if (p->isClass(false))
diff --git a/tdeprint/management/kmpropmembers.cpp b/tdeprint/management/kmpropmembers.cpp
index 4efbcf547..26671eed8 100644
--- a/tdeprint/management/kmpropmembers.cpp
+++ b/tdeprint/management/kmpropmembers.cpp
@@ -29,7 +29,7 @@ KMPropMembers::KMPropMembers(TQWidget *parent, const char *name)
: KMPropWidget(parent,name)
{
m_members = new TQTextView(this);
- m_members->setPaper(tqcolorGroup().background());
+ m_members->setPaper(colorGroup().background());
m_members->setFrameStyle(TQFrame::NoFrame);
TQVBoxLayout *main_ = new TQVBoxLayout(this, 10, 0);
diff --git a/tdeprint/management/kmwbackend.cpp b/tdeprint/management/kmwbackend.cpp
index e39b52f8d..cd98a8b07 100644
--- a/tdeprint/management/kmwbackend.cpp
+++ b/tdeprint/management/kmwbackend.cpp
@@ -102,7 +102,7 @@ void KMWBackend::updatePrinter(KMPrinter *p)
else p->setType(KMPrinter::Printer);
p->setOption("kde-backend",TQString::number(ID));
TQString s = m_buttons->selected()->text();
- s.replace(TQRegExp("&(?=\\w)"), TQString::tqfromLatin1(""));
+ s.replace(TQRegExp("&(?=\\w)"), TQString::fromLatin1(""));
p->setOption("kde-backend-description",s);
setNextPage((m_map.contains(ID) ? m_map[ID] : KMWizard::Error));
}
diff --git a/tdeprint/management/kmwend.cpp b/tdeprint/management/kmwend.cpp
index 54294fb13..2881b4ea0 100644
--- a/tdeprint/management/kmwend.cpp
+++ b/tdeprint/management/kmwend.cpp
@@ -42,11 +42,11 @@ KMWEnd::KMWEnd(TQWidget *parent, const char *name)
void KMWEnd::initPrinter(KMPrinter *p)
{
TQString txt;
- TQString s(TQString::tqfromLatin1("<li><u>%1</u>: %2</li>"));
+ TQString s(TQString::fromLatin1("<li><u>%1</u>: %2</li>"));
int ID = p->option("kde-backend").toInt();
// general information
- txt.append(TQString::tqfromLatin1("<b>%1</b><ul type=circle>").arg(i18n("General")));
+ txt.append(TQString::fromLatin1("<b>%1</b><ul type=circle>").arg(i18n("General")));
txt.append(s.arg(i18n("Type")).arg(p->option("kde-backend-description")));
txt.append(s.arg(i18n("Name")).arg(p->name()));
txt.append(s.arg(i18n("Location")).arg(p->location()));
@@ -56,9 +56,9 @@ void KMWEnd::initPrinter(KMPrinter *p)
if (ID == KMWizard::Class)
{
// class members
- txt.append(TQString::tqfromLatin1("<b>%1</b><ul type=circle>").arg(i18n("Members")));
+ txt.append(TQString::fromLatin1("<b>%1</b><ul type=circle>").arg(i18n("Members")));
TQStringList m(p->members());
- TQString s1(TQString::tqfromLatin1("<li>%1</li>"));
+ TQString s1(TQString::fromLatin1("<li>%1</li>"));
for (TQStringList::ConstIterator it=m.begin(); it!=m.end(); ++it)
txt.append(s1.arg(*it));
txt.append("</ul><br>");
@@ -66,7 +66,7 @@ void KMWEnd::initPrinter(KMPrinter *p)
else
{
// backend information
- txt.append(TQString::tqfromLatin1("<b>%1</b><ul type=circle>").arg(i18n("Backend")));
+ txt.append(TQString::fromLatin1("<b>%1</b><ul type=circle>").arg(i18n("Backend")));
KURL url ( p->device() );
switch (ID)
{
@@ -101,7 +101,7 @@ void KMWEnd::initPrinter(KMPrinter *p)
if (p->option("kde-driver") == "raw" || p->driver())
{
// driver information
- txt.append(TQString::tqfromLatin1("<b>%1</b><ul type=circle>").arg(i18n("Driver")));
+ txt.append(TQString::fromLatin1("<b>%1</b><ul type=circle>").arg(i18n("Driver")));
if (p->option("kde-driver") == "raw")
txt.append(s.arg(i18n("Type")).arg(i18n("Raw printer")));
else
diff --git a/tdeprint/management/kmwfile.cpp b/tdeprint/management/kmwfile.cpp
index 32da27c03..1fbaf45ff 100644
--- a/tdeprint/management/kmwfile.cpp
+++ b/tdeprint/management/kmwfile.cpp
@@ -72,6 +72,6 @@ bool KMWFile::isValid(TQString& msg)
void KMWFile::updatePrinter(KMPrinter *p)
{
- TQString dev = TQString::tqfromLatin1("file:%1").arg(m_url->url());
+ TQString dev = TQString::fromLatin1("file:%1").arg(m_url->url());
p->setDevice(dev);
}
diff --git a/tdeprint/management/kmwlpd.cpp b/tdeprint/management/kmwlpd.cpp
index cce4c7b5a..352a075c5 100644
--- a/tdeprint/management/kmwlpd.cpp
+++ b/tdeprint/management/kmwlpd.cpp
@@ -66,7 +66,7 @@ bool KMWLpd::isValid(TQString& msg)
void KMWLpd::updatePrinter(KMPrinter *p)
{
- QString dev = TQString::tqfromLatin1("lpd://%1/%2").arg(text(0)).arg(text(1));
+ QString dev = TQString::fromLatin1("lpd://%1/%2").arg(text(0)).arg(text(1));
p->setDevice(dev);
}
diff --git a/tdeprint/management/kmwpassword.cpp b/tdeprint/management/kmwpassword.cpp
index 40dc105d5..8490a179c 100644
--- a/tdeprint/management/kmwpassword.cpp
+++ b/tdeprint/management/kmwpassword.cpp
@@ -121,7 +121,7 @@ void KMWPassword::updatePrinter(KMPrinter *p)
p->setOption( "kde-password", TQString::null );
break;
case 1:
- p->setOption( "kde-login", TQString::tqfromLatin1( "guest" ) );
+ p->setOption( "kde-login", TQString::fromLatin1( "guest" ) );
p->setOption( "kde-password", TQString::null );
break;
case 2:
diff --git a/tdeprint/management/kmwsocket.cpp b/tdeprint/management/kmwsocket.cpp
index 98aad76a5..ca5defde4 100644
--- a/tdeprint/management/kmwsocket.cpp
+++ b/tdeprint/management/kmwsocket.cpp
@@ -88,7 +88,7 @@ KMWSocket::~KMWSocket()
void KMWSocket::updatePrinter(KMPrinter *p)
{
- TQString dev = TQString::tqfromLatin1("socket://%1:%2").arg(m_printer->text()).arg(m_port->text());
+ TQString dev = TQString::fromLatin1("socket://%1:%2").arg(m_printer->text()).arg(m_port->text());
p->setDevice(dev);
}
diff --git a/tdeprint/management/kmwsocketutil.cpp b/tdeprint/management/kmwsocketutil.cpp
index 7b77d1d82..e667d1fa1 100644
--- a/tdeprint/management/kmwsocketutil.cpp
+++ b/tdeprint/management/kmwsocketutil.cpp
@@ -53,7 +53,7 @@ SocketConfig::SocketConfig(KMWSocketUtil *util, TQWidget *parent, const char *na
TQLabel *portlabel = new TQLabel(i18n("&Port:"),dummy);
TQLabel *toutlabel = new TQLabel(i18n("&Timeout (ms):"),dummy);
TQLineEdit *mm = new TQLineEdit(dummy);
- mm->setText(TQString::tqfromLatin1(".[0-255]"));
+ mm->setText(TQString::fromLatin1(".[0-255]"));
mm->setReadOnly(true);
mm->setFixedWidth(fontMetrics().width(mm->text())+10);
diff --git a/tdeprint/management/kxmlcommanddlg.cpp b/tdeprint/management/kxmlcommanddlg.cpp
index 3b42b71d7..1bed82e8a 100644
--- a/tdeprint/management/kxmlcommanddlg.cpp
+++ b/tdeprint/management/kxmlcommanddlg.cpp
@@ -52,8 +52,8 @@
TQString generateId(const TQMap<TQString, DrBase*>& map)
{
int index(-1);
- while (map.contains(TQString::tqfromLatin1("item%1").arg(++index))) ;
- return TQString::tqfromLatin1("item%1").arg(index);
+ while (map.contains(TQString::fromLatin1("item%1").arg(++index))) ;
+ return TQString::fromLatin1("item%1").arg(index);
}
TQListViewItem* findPrev(TQListViewItem *item)
diff --git a/tdeprint/management/networkscanner.cpp b/tdeprint/management/networkscanner.cpp
index a5ca72071..a49a77877 100644
--- a/tdeprint/management/networkscanner.cpp
+++ b/tdeprint/management/networkscanner.cpp
@@ -339,7 +339,7 @@ NetworkScannerConfig::NetworkScannerConfig(NetworkScanner *scanner, const char *
TQLabel *portlabel = new TQLabel(i18n("&Port:"),dummy);
TQLabel *toutlabel = new TQLabel(i18n("&Timeout (ms):"),dummy);
TQLineEdit *mm = new TQLineEdit(dummy);
- mm->setText(TQString::tqfromLatin1(".[0-255]"));
+ mm->setText(TQString::fromLatin1(".[0-255]"));
mm->setReadOnly(true);
mm->setFixedWidth(fontMetrics().width(mm->text())+10);
diff --git a/tdeprint/posterpreview.cpp b/tdeprint/posterpreview.cpp
index 7e8542c22..241c53dbf 100644
--- a/tdeprint/posterpreview.cpp
+++ b/tdeprint/posterpreview.cpp
@@ -106,7 +106,7 @@ void PosterPreview::drawContents( TQPainter *painter )
TQPixmap pix( width(), height() );
TQPainter *p = new TQPainter( &pix );
- p->fillRect( 0, 0, width(), height(), tqcolorGroup().background() );
+ p->fillRect( 0, 0, width(), height(), colorGroup().background() );
if ( isEnabled() )
{
@@ -120,7 +120,7 @@ void PosterPreview::drawContents( TQPainter *painter )
int x = ( width()-richtext.widthUsed() )/2, y = ( height()-richtext.height() )/2;
x = QMAX( x, 0 );
y = QMAX( y, 0 );
- richtext.draw( p, x, y, TQRect( x, y, richtext.widthUsed(), richtext.height() ), tqcolorGroup() );
+ richtext.draw( p, x, y, TQRect( x, y, richtext.widthUsed(), richtext.height() ), colorGroup() );
m_boundingrect = TQRect();
}
else
diff --git a/tdeprint/rlpr/kmrlprmanager.cpp b/tdeprint/rlpr/kmrlprmanager.cpp
index 64f6acde1..804241e36 100644
--- a/tdeprint/rlpr/kmrlprmanager.cpp
+++ b/tdeprint/rlpr/kmrlprmanager.cpp
@@ -116,7 +116,7 @@ void KMRlprManager::loadPrintersConf(const TQString& filename)
if (w.count() > 4) printer->setLocation(w[4]);
}
printer->setState(KMPrinter::Idle);
- printer->setDevice(TQString::tqfromLatin1("lpd://%1/%2").arg(w[1]).arg(w[2]));
+ printer->setDevice(TQString::fromLatin1("lpd://%1/%2").arg(w[1]).arg(w[2]));
addPrinter(printer);
}
diff --git a/tdeprint/rlpr/kmwrlpr.cpp b/tdeprint/rlpr/kmwrlpr.cpp
index 70defc27b..15ad88ec2 100644
--- a/tdeprint/rlpr/kmwrlpr.cpp
+++ b/tdeprint/rlpr/kmwrlpr.cpp
@@ -53,7 +53,7 @@ KMWRlpr::KMWRlpr(TQWidget *parent, const char *name)
m_view = new KListView(this);
m_view->setFrameStyle(TQFrame::WinPanel|TQFrame::Sunken);
m_view->setLineWidth(1);
- m_view->addColumn(TQString::tqfromLatin1(""));
+ m_view->addColumn(TQString::fromLatin1(""));
m_view->header()->hide();
m_view->setRootIsDecorated(true);
m_view->setSorting(0);
@@ -109,7 +109,7 @@ void KMWRlpr::initPrinter(KMPrinter *p)
void KMWRlpr::updatePrinter(KMPrinter *p)
{
- TQString uri = TQString::tqfromLatin1("lpd://%1/%2").arg(m_host->text()).arg(m_queue->text());
+ TQString uri = TQString::fromLatin1("lpd://%1/%2").arg(m_host->text()).arg(m_queue->text());
p->setDevice(uri);
p->setOption("host",m_host->text());
p->setOption("queue",m_queue->text());
diff --git a/tdeprint/rlpr/krlprprinterimpl.cpp b/tdeprint/rlpr/krlprprinterimpl.cpp
index a6b0e5986..2833c9598 100644
--- a/tdeprint/rlpr/krlprprinterimpl.cpp
+++ b/tdeprint/rlpr/krlprprinterimpl.cpp
@@ -54,7 +54,7 @@ bool KRlprPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer)
return false;
}
- cmd = TQString::tqfromLatin1("%1 -H %2 -P %3 -\\#%4").arg(exestr).arg(quote(host)).arg(quote(queue)).arg(printer->numCopies());
+ cmd = TQString::fromLatin1("%1 -H %2 -P %3 -\\#%4").arg(exestr).arg(quote(host)).arg(quote(queue)).arg(printer->numCopies());
// proxy settings
KConfig *conf = KMFactory::self()->printConfig();
diff --git a/tdeprint/tdeprintcheck.cpp b/tdeprint/tdeprintcheck.cpp
index 1ace082a4..1b5cc691a 100644
--- a/tdeprint/tdeprintcheck.cpp
+++ b/tdeprint/tdeprintcheck.cpp
@@ -101,8 +101,8 @@ bool KdeprintChecker::checkConfig(const KURL& url)
const char* const *p = config_stddirs;
while (*p)
{
- // kdDebug( 500 ) << "checkConfig() with " << TQString::tqfromLatin1( *p ) + f << endl;
- if ( TQFile::exists( TQString::tqfromLatin1( *p ) + f ) )
+ // kdDebug( 500 ) << "checkConfig() with " << TQString::fromLatin1( *p ) + f << endl;
+ if ( TQFile::exists( TQString::fromLatin1( *p ) + f ) )
{
state = true;
break;
diff --git a/tdeprint/tests/helpwindow.cpp b/tdeprint/tests/helpwindow.cpp
index bee755d20..9f92734f4 100644
--- a/tdeprint/tests/helpwindow.cpp
+++ b/tdeprint/tests/helpwindow.cpp
@@ -278,7 +278,7 @@ void HelpWindow::print()
TQRect view( body );
int page = 1;
do {
- richText.draw( &p, body.left(), body.top(), view, tqcolorGroup() );
+ richText.draw( &p, body.left(), body.top(), view, colorGroup() );
view.moveBy( 0, body.height() );
p.translate( 0 , -body.height() );
p.setFont( font );
diff --git a/tdeprint/tests/richpage.cpp b/tdeprint/tests/richpage.cpp
index 30da712de..f12040b71 100644
--- a/tdeprint/tests/richpage.cpp
+++ b/tdeprint/tests/richpage.cpp
@@ -23,7 +23,7 @@ RichPage::RichPage(TQWidget *parent, const char *name)
QFontDatabase db;
QStringList fonts = db.families();
fontname_->insertStringList(fonts);
- fontname_->setCurrentItem(fonts.findIndex(TQString::tqfromLatin1("times")));
+ fontname_->setCurrentItem(fonts.findIndex(TQString::fromLatin1("times")));
if (fontname_->currentItem() < 0) fontname_->setCurrentItem(0);
QLabel *l1 = new TQLabel("Margin:",this);
diff --git a/tdeprint/treecombobox.cpp b/tdeprint/treecombobox.cpp
index 45213f41c..a27b68289 100644
--- a/tdeprint/treecombobox.cpp
+++ b/tdeprint/treecombobox.cpp
@@ -102,7 +102,7 @@ void TreeListBoxItem::paint(TQPainter *p)
if (m_depth > 0)
{
TQPen oldPen = p->pen();
- p->setPen(listBox()->tqcolorGroup().mid());
+ p->setPen(listBox()->colorGroup().mid());
TreeListBoxItem *item = this;
int s = xo-stepSize()/2;
diff --git a/tdeui/kaboutdialog.cpp b/tdeui/kaboutdialog.cpp
index e59d808c9..c7aaca01a 100644
--- a/tdeui/kaboutdialog.cpp
+++ b/tdeui/kaboutdialog.cpp
@@ -429,7 +429,7 @@ void KAboutContainerBase::show( void )
TQSize KAboutContainerBase::sizeHint( void ) const
{
- return tqminimumSize().expandedTo( TQSize( TQWidget::sizeHint().width(), 0 ) );
+ return minimumSize().expandedTo( TQSize( TQWidget::sizeHint().width(), 0 ) );
}
void KAboutContainerBase::fontChange( const TQFont &/*oldFont*/ )
@@ -828,7 +828,7 @@ TQSize KAboutContainer::sizeHint( void ) const
++numChild;
TQWidget* const w= TQT_TQWIDGET(o);
- TQSize s = w->tqminimumSize();
+ TQSize s = w->minimumSize();
if( s.isEmpty() )
{
s = w->minimumSizeHint();
diff --git a/tdeui/kaboutkde.cpp b/tdeui/kaboutkde.cpp
index 7ac9b7193..1973c316b 100644
--- a/tdeui/kaboutkde.cpp
+++ b/tdeui/kaboutkde.cpp
@@ -27,7 +27,7 @@
KAboutKDE::KAboutKDE( TQWidget *parent, const char *name, bool modal )
- :KAboutDialog( KAboutDialog::AbtKDEStandard, TQString::tqfromLatin1("TDE"),
+ :KAboutDialog( KAboutDialog::AbtKDEStandard, TQString::fromLatin1("TDE"),
KDialogBase::Help|KDialogBase::Close, KDialogBase::Close,
parent, name, modal )
{
@@ -75,13 +75,13 @@ KAboutKDE::KAboutKDE( TQWidget *parent, const char *name, bool modal )
"donation, using one of the ways described at "
"<a href=\"http://www.trinitydesktop.org/donate.php\">http://www.trinitydesktop.org/donate.php</a>."
"<br><br>Thank you very much in advance for your support!");
- setHelp( TQString::tqfromLatin1("khelpcenter/main.html"), TQString::null );
+ setHelp( TQString::fromLatin1("khelpcenter/main.html"), TQString::null );
setTitle(i18n("Trinity Desktop Environment. Release %1").
- arg(TQString::tqfromLatin1(TDE_VERSION_STRING)) );
+ arg(TQString::fromLatin1(TDE_VERSION_STRING)) );
addTextPage( i18n("About Trinity","&About"), text1, true );
addTextPage( i18n("&Report Bugs or Wishes"), text2, true );
addTextPage( i18n("&Join the Trinity Team"), text3, true );
addTextPage( i18n("&Support Trinity"), text4, true );
- setImage( locate( "data", TQString::tqfromLatin1("tdeui/pics/aboutkde.png")) );
+ setImage( locate( "data", TQString::fromLatin1("tdeui/pics/aboutkde.png")) );
setImageBackgroundColor( white );
}
diff --git a/tdeui/kaction.cpp b/tdeui/kaction.cpp
index 6a0ad7812..270c00ec4 100644
--- a/tdeui/kaction.cpp
+++ b/tdeui/kaction.cpp
@@ -810,7 +810,7 @@ void KAction::unplugAccel()
void KAction::plugMainWindowAccel( TQWidget *w )
{
- // Note: tqtopLevelWidget() stops too early, we can't use it.
+ // Note: topLevelWidget() stops too early, we can't use it.
TQWidget * tl = w;
TQWidget * n;
while ( !tl->isDialog() && ( n = tl->parentWidget() ) ) // lookup parent and store
@@ -1039,7 +1039,7 @@ TQString KAction::whatsThisWithIcon() const
{
TQString text = whatsThis();
if (!d->iconName().isEmpty())
- return TQString::tqfromLatin1("<img source=\"small|%1\"> %2").arg(d->iconName() ).arg(text);
+ return TQString::fromLatin1("<img source=\"small|%1\"> %2").arg(d->iconName() ).arg(text);
return text;
}
diff --git a/tdeui/kactionclasses.cpp b/tdeui/kactionclasses.cpp
index f9acb0ea9..8c3453fb3 100644
--- a/tdeui/kactionclasses.cpp
+++ b/tdeui/kactionclasses.cpp
@@ -1626,7 +1626,7 @@ void KFontSizeAction::init()
setEditable( true );
TQFontDatabase fontDB;
- TQValueList<int> sizes = fontDB.tqstandardSizes();
+ TQValueList<int> sizes = fontDB.standardSizes();
TQStringList lst;
for ( TQValueList<int>::Iterator it = sizes.begin(); it != sizes.end(); ++it )
lst.append( TQString::number( *it ) );
@@ -2021,7 +2021,7 @@ int KToggleToolBarAction::plug( TQWidget* w, int index )
return -1;
if ( !m_toolBar ) {
- // Note: tqtopLevelWidget() stops too early, we can't use it.
+ // Note: topLevelWidget() stops too early, we can't use it.
TQWidget * tl = w;
TQWidget * n;
while ( !tl->isDialog() && ( n = tl->parentWidget() ) ) // lookup parent and store
diff --git a/tdeui/kactioncollection.cpp b/tdeui/kactioncollection.cpp
index 69a87eaee..23cc55917 100644
--- a/tdeui/kactioncollection.cpp
+++ b/tdeui/kactioncollection.cpp
@@ -713,8 +713,8 @@ bool KActionShortcutList::save() const
if( m_actions.xmlFile().isEmpty() )
return writeSettings();
- TQString attrShortcut = TQString::tqfromLatin1("shortcut");
- TQString attrAccel = TQString::tqfromLatin1("accel"); // Depricated attribute
+ TQString attrShortcut = TQString::fromLatin1("shortcut");
+ TQString attrAccel = TQString::fromLatin1("accel"); // Depricated attribute
// Read XML file
TQString sXml( KXMLGUIFactory::readConfigFile( xmlFile, false, instance() ) );
diff --git a/tdeui/kactivelabel.cpp b/tdeui/kactivelabel.cpp
index f0398c1b7..72e72b677 100644
--- a/tdeui/kactivelabel.cpp
+++ b/tdeui/kactivelabel.cpp
@@ -113,7 +113,7 @@ void KActiveLabel::keyPressEvent( TQKeyEvent *e )
TQSize KActiveLabel::minimumSizeHint() const
{
- TQSize ms = tqminimumSize();
+ TQSize ms = minimumSize();
if ((ms.width() > 0) && (ms.height() > 0))
return ms;
diff --git a/tdeui/karrowbutton.cpp b/tdeui/karrowbutton.cpp
index 4d166b7b3..d691b6cfa 100644
--- a/tdeui/karrowbutton.cpp
+++ b/tdeui/karrowbutton.cpp
@@ -62,9 +62,9 @@ void KArrowButton::drawButton(TQPainter *p)
const unsigned int arrowSize = 8;
const unsigned int margin = 2;
- p->fillRect( rect(), tqcolorGroup().brush( TQColorGroup::Background ) );
+ p->fillRect( rect(), colorGroup().brush( TQColorGroup::Background ) );
tqstyle().tqdrawPrimitive( TQStyle::PE_Panel, p, TQRect( 0, 0, width(), height() ),
- tqcolorGroup(),
+ colorGroup(),
isDown() ? TQStyle::Style_Sunken : TQStyle::Style_Default,
TQStyleOption( 2, 0 ) );
@@ -104,7 +104,7 @@ void KArrowButton::drawButton(TQPainter *p)
if ( isDown() )
flags |= TQStyle::Style_Down;
tqstyle().tqdrawPrimitive( e, p, TQRect( TQPoint( x, y ), TQSize( arrowSize, arrowSize ) ),
- tqcolorGroup(), flags );
+ colorGroup(), flags );
}
void KArrowButton::virtual_hook( int, void* )
diff --git a/tdeui/kauthicon.cpp b/tdeui/kauthicon.cpp
index 647009f25..d4c18a114 100644
--- a/tdeui/kauthicon.cpp
+++ b/tdeui/kauthicon.cpp
@@ -134,7 +134,7 @@ KAuthIcon::~KAuthIcon()
TQSize KAuthIcon::sizeHint() const
{
- return layout->tqminimumSize();
+ return layout->minimumSize();
}
diff --git a/tdeui/kbugreport.cpp b/tdeui/kbugreport.cpp
index d122d2e02..a1dceb94d 100644
--- a/tdeui/kbugreport.cpp
+++ b/tdeui/kbugreport.cpp
@@ -88,7 +88,7 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const KAboutData *aboutD
TQWidget * parent = plainPage();
d->submitBugButton = 0;
- //if ( m_aboutData->bugAddress() == TQString::tqfromLatin1("submit@bugs.pearsoncomputing.net") )
+ //if ( m_aboutData->bugAddress() == TQString::fromLatin1("submit@bugs.pearsoncomputing.net") )
//{
// // This is a core KDE application -> redirect to the web form
// Always redirect to the Web form for Trinity
@@ -153,7 +153,7 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const KAboutData *aboutD
TQWhatsThis::add( d->appcombo, qwtstr );
d->appcombo->insertStrList((const char**)packages);
connect(d->appcombo, TQT_SIGNAL(activated(int)), TQT_SLOT(appChanged(int)));
- d->appname = TQString::tqfromLatin1( m_aboutData
+ d->appname = TQString::fromLatin1( m_aboutData
? m_aboutData->productName()
: tqApp->name() );
glay->addWidget( d->appcombo, row, 1 );
@@ -179,8 +179,8 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const KAboutData *aboutD
m_strVersion = m_aboutData->version();
else
m_strVersion = i18n("no version set (programmer error!)");
- d->kde_version = TQString::tqfromLatin1( TDE_VERSION_STRING );
- d->kde_version += ", " + TQString::tqfromLatin1( KDE_DISTRIBUTION_TEXT );
+ d->kde_version = TQString::fromLatin1( TDE_VERSION_STRING );
+ d->kde_version += ", " + TQString::fromLatin1( KDE_DISTRIBUTION_TEXT );
if ( !d->submitBugButton )
m_strVersion += " " + d->kde_version;
m_version = new TQLabel( m_strVersion, parent );
@@ -193,16 +193,16 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const KAboutData *aboutD
struct utsname unameBuf;
uname( &unameBuf );
- d->os = TQString::tqfromLatin1( unameBuf.sysname ) +
- " (" + TQString::tqfromLatin1( unameBuf.machine ) + ") "
- "release " + TQString::tqfromLatin1( unameBuf.release );
+ d->os = TQString::fromLatin1( unameBuf.sysname ) +
+ " (" + TQString::fromLatin1( unameBuf.machine ) + ") "
+ "release " + TQString::fromLatin1( unameBuf.release );
tmpLabel = new TQLabel(d->os, parent);
glay->addMultiCellWidget( tmpLabel, row, row, 1, 2 );
tmpLabel = new TQLabel(i18n("Compiler:"), parent);
glay->addWidget( tmpLabel, ++row, 0 );
- tmpLabel = new TQLabel(TQString::tqfromLatin1(KDE_COMPILER_VERSION), parent);
+ tmpLabel = new TQLabel(TQString::fromLatin1(KDE_COMPILER_VERSION), parent);
glay->addMultiCellWidget( tmpLabel, row, row, 1, 2 );
if ( !d->submitBugButton )
@@ -311,7 +311,7 @@ void KBugReport::slotConfigureEmail()
{
if (m_process) return;
m_process = new KProcess;
- *m_process << TQString::tqfromLatin1("kcmshell") << TQString::tqfromLatin1("kcm_useraccount");
+ *m_process << TQString::fromLatin1("kcmshell") << TQString::fromLatin1("kcm_useraccount");
connect(m_process, TQT_SIGNAL(processExited(KProcess *)), TQT_SLOT(slotSetFrom()));
if (!m_process->start())
{
@@ -330,24 +330,24 @@ void KBugReport::slotSetFrom()
m_configureEmail->setEnabled(true);
// ### KDE4: why oh why is KEmailSettings in kio?
- KConfig emailConf( TQString::tqfromLatin1("emaildefaults") );
+ KConfig emailConf( TQString::fromLatin1("emaildefaults") );
// find out the default profile
- emailConf.setGroup( TQString::tqfromLatin1("Defaults") );
- TQString profile = TQString::tqfromLatin1("PROFILE_");
- profile += emailConf.readEntry( TQString::tqfromLatin1("Profile"),
- TQString::tqfromLatin1("Default") );
+ emailConf.setGroup( TQString::fromLatin1("Defaults") );
+ TQString profile = TQString::fromLatin1("PROFILE_");
+ profile += emailConf.readEntry( TQString::fromLatin1("Profile"),
+ TQString::fromLatin1("Default") );
emailConf.setGroup( profile );
- TQString fromaddr = emailConf.readEntry( TQString::tqfromLatin1("EmailAddress") );
+ TQString fromaddr = emailConf.readEntry( TQString::fromLatin1("EmailAddress") );
if (fromaddr.isEmpty()) {
struct passwd *p;
p = getpwuid(getuid());
- fromaddr = TQString::tqfromLatin1(p->pw_name);
+ fromaddr = TQString::fromLatin1(p->pw_name);
} else {
- TQString name = emailConf.readEntry( TQString::tqfromLatin1("FullName"));
+ TQString name = emailConf.readEntry( TQString::fromLatin1("FullName"));
if (!name.isEmpty())
- fromaddr = name + TQString::tqfromLatin1(" <") + fromaddr + TQString::tqfromLatin1(">");
+ fromaddr = name + TQString::fromLatin1(" <") + fromaddr + TQString::fromLatin1(">");
}
m_from->setText( fromaddr );
}
@@ -438,9 +438,9 @@ TQString KBugReport::text() const
{
kdDebug() << m_bgSeverity->selected()->name() << endl;
// Prepend the pseudo-headers to the contents of the mail
- TQString severity = TQString::tqfromLatin1(m_bgSeverity->selected()->name());
+ TQString severity = TQString::fromLatin1(m_bgSeverity->selected()->name());
TQString appname = d->appcombo->currentText();
- TQString os = TQString::tqfromLatin1("OS: %1 (%2)\n").
+ TQString os = TQString::fromLatin1("OS: %1 (%2)\n").
arg(KDE_COMPILING_OS).
arg(KDE_DISTRIBUTION_TEXT);
TQString bodyText;
@@ -452,25 +452,25 @@ TQString KBugReport::text() const
bodyText += line;
}
- if (severity == TQString::tqfromLatin1("i18n") && KGlobal::locale()->language() != KLocale::defaultLanguage()) {
+ if (severity == TQString::fromLatin1("i18n") && KGlobal::locale()->language() != KLocale::defaultLanguage()) {
// Case 1 : i18n bug
- TQString package = TQString::tqfromLatin1("i18n_%1").arg(KGlobal::locale()->language());
- package = package.replace(TQString::tqfromLatin1("_"), TQString::tqfromLatin1("-"));
- return TQString::tqfromLatin1("Package: %1").arg(package) +
- TQString::tqfromLatin1("\n"
+ TQString package = TQString::fromLatin1("i18n_%1").arg(KGlobal::locale()->language());
+ package = package.replace(TQString::fromLatin1("_"), TQString::fromLatin1("-"));
+ return TQString::fromLatin1("Package: %1").arg(package) +
+ TQString::fromLatin1("\n"
"Application: %1\n"
// not really i18n's version, so better here IMHO
"Version: %2\n").arg(appname).arg(m_strVersion)+
- os+TQString::tqfromLatin1("\n")+bodyText;
+ os+TQString::fromLatin1("\n")+bodyText;
} else {
- appname = appname.replace(TQString::tqfromLatin1("_"), TQString::tqfromLatin1("-"));
+ appname = appname.replace(TQString::fromLatin1("_"), TQString::fromLatin1("-"));
// Case 2 : normal bug
- return TQString::tqfromLatin1("Package: %1\n"
+ return TQString::fromLatin1("Package: %1\n"
"Version: %2\n"
"Severity: %3\n")
.arg(appname).arg(m_strVersion).arg(severity)+
- TQString::tqfromLatin1("Compiler: %1\n").arg(KDE_COMPILER_VERSION)+
- os+TQString::tqfromLatin1("\n")+bodyText;
+ TQString::fromLatin1("Compiler: %1\n").arg(KDE_COMPILER_VERSION)+
+ os+TQString::fromLatin1("\n")+bodyText;
}
}
@@ -478,12 +478,12 @@ bool KBugReport::sendBugReport()
{
TQString recipient ( m_aboutData ?
m_aboutData->bugAddress() :
- TQString::tqfromLatin1("submit@bugs.pearsoncomputing.net") );
+ TQString::fromLatin1("submit@bugs.pearsoncomputing.net") );
TQString command;
command = locate("exe", "ksendbugmail");
if (command.isEmpty())
- command = KStandardDirs::findExe( TQString::tqfromLatin1("ksendbugmail") );
+ command = KStandardDirs::findExe( TQString::fromLatin1("ksendbugmail") );
KTempFile outputfile;
outputfile.close();
diff --git a/tdeui/kbuttonbox.cpp b/tdeui/kbuttonbox.cpp
index 11a8e2818..6351c512d 100644
--- a/tdeui/kbuttonbox.cpp
+++ b/tdeui/kbuttonbox.cpp
@@ -356,7 +356,7 @@ TQSizePolicy KButtonBox::sizePolicy() const
*/
TQSize KButtonBox::buttonSizeHint(TQPushButton *b) const {
TQSize s = b->sizeHint();
- const TQSize ms = b->tqminimumSize();
+ const TQSize ms = b->minimumSize();
if(s.width() < minButtonWidth)
s.setWidth(minButtonWidth);
diff --git a/tdeui/kcharselect.cpp b/tdeui/kcharselect.cpp
index 3a5ababce..f20fdc004 100644
--- a/tdeui/kcharselect.cpp
+++ b/tdeui/kcharselect.cpp
@@ -66,7 +66,7 @@ KCharSelectTable::KCharSelectTable( TQWidget *parent, const char *name, const TQ
: TQGridView( parent, name ), vFont( _font ), vChr( _chr ),
vTableNum( _tableNum ), vPos( 0, 0 ), focusItem( _chr ), focusPos( 0, 0 ), d(0)
{
- setBackgroundColor( tqcolorGroup().base() );
+ setBackgroundColor( colorGroup().base() );
setCellWidth( 20 );
setCellHeight( 25 );
@@ -156,25 +156,25 @@ void KCharSelectTable::paintCell( class TQPainter* p, int row, int col )
c += col;
if ( c == vChr.tqunicode() ) {
- p->setBrush( TQBrush( tqcolorGroup().highlight() ) );
+ p->setBrush( TQBrush( colorGroup().highlight() ) );
p->setPen( NoPen );
p->drawRect( 0, 0, w, h );
- p->setPen( tqcolorGroup().highlightedText() );
+ p->setPen( colorGroup().highlightedText() );
vPos = TQPoint( col, row );
} else {
TQFontMetrics fm = TQFontMetrics( font );
if( fm.inFont( c ) )
- p->setBrush( TQBrush( tqcolorGroup().base() ) );
+ p->setBrush( TQBrush( colorGroup().base() ) );
else
- p->setBrush( TQBrush( tqcolorGroup().button() ) );
+ p->setBrush( TQBrush( colorGroup().button() ) );
p->setPen( NoPen );
p->drawRect( 0, 0, w, h );
- p->setPen( tqcolorGroup().text() );
+ p->setPen( colorGroup().text() );
}
if ( c == focusItem.tqunicode() && hasFocus() ) {
tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, p, TQRect( 2, 2, w - 4, h - 4 ),
- tqcolorGroup() );
+ colorGroup() );
focusPos = TQPoint( col, row );
}
@@ -182,7 +182,7 @@ void KCharSelectTable::paintCell( class TQPainter* p, int row, int col )
p->drawText( 0, 0, x2, y2, AlignHCenter | AlignVCenter, TQString( TQChar( c ) ) );
- p->setPen( tqcolorGroup().text() );
+ p->setPen( colorGroup().text() );
p->drawLine( x2, 0, x2, y2 );
p->drawLine( 0, y2, x2, y2 );
diff --git a/tdeui/kcmenumngr.cpp b/tdeui/kcmenumngr.cpp
index d985c8e91..640b9c7ac 100644
--- a/tdeui/kcmenumngr.cpp
+++ b/tdeui/kcmenumngr.cpp
@@ -35,10 +35,10 @@ KContextMenuManager* KContextMenuManager::manager = 0;
KContextMenuManager::KContextMenuManager( TQObject* parent, const char* name )
: TQObject( parent, name)
{
- KConfigGroupSaver saver ( KGlobal::config(), TQString::tqfromLatin1("Shortcuts") ) ;
- menuKey = KShortcut( saver.config()->readEntry(TQString::tqfromLatin1("PopupContextMenu"), TQString::tqfromLatin1("Menu") ) ).keyCodeQt();
- saver.config()->setGroup( TQString::tqfromLatin1("ContextMenus") ) ;
- showOnPress = saver.config()->readBoolEntry(TQString::tqfromLatin1("ShowOnPress"), true );
+ KConfigGroupSaver saver ( KGlobal::config(), TQString::fromLatin1("Shortcuts") ) ;
+ menuKey = KShortcut( saver.config()->readEntry(TQString::fromLatin1("PopupContextMenu"), TQString::fromLatin1("Menu") ) ).keyCodeQt();
+ saver.config()->setGroup( TQString::fromLatin1("ContextMenus") ) ;
+ showOnPress = saver.config()->readBoolEntry(TQString::fromLatin1("ShowOnPress"), true );
}
KContextMenuManager::~KContextMenuManager()
diff --git a/tdeui/kcolorbutton.cpp b/tdeui/kcolorbutton.cpp
index 34227a8fb..e697276d8 100644
--- a/tdeui/kcolorbutton.cpp
+++ b/tdeui/kcolorbutton.cpp
@@ -108,25 +108,25 @@ void KColorButton::drawButtonLabel( TQPainter *painter )
TQRect r = tqstyle().subRect( TQStyle::SR_PushButtonContents, this );
r.rect(&x, &y, &w, &h);
- int margin = tqstyle().tqpixelMetric( TQStyle::PM_ButtonMargin, this );
+ int margin = tqstyle().pixelMetric( TQStyle::PM_ButtonMargin, this );
x += margin;
y += margin;
w -= 2*margin;
h -= 2*margin;
if (isOn() || isDown()) {
- x += tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftHorizontal, this );
- y += tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftVertical, this );
+ x += tqstyle().pixelMetric( TQStyle::PM_ButtonShiftHorizontal, this );
+ y += tqstyle().pixelMetric( TQStyle::PM_ButtonShiftVertical, this );
}
TQColor fillCol = isEnabled() ? col : backgroundColor();
- qDrawShadePanel( painter, x, y, w, h, tqcolorGroup(), true, 1, NULL);
+ qDrawShadePanel( painter, x, y, w, h, colorGroup(), true, 1, NULL);
if ( fillCol.isValid() )
painter->fillRect( x+1, y+1, w-2, h-2, fillCol );
if ( hasFocus() ) {
TQRect focusRect = tqstyle().subRect( TQStyle::SR_PushButtonFocusRect, this );
- tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, painter, focusRect, tqcolorGroup() );
+ tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, painter, focusRect, colorGroup() );
}
}
diff --git a/tdeui/kcolordialog.cpp b/tdeui/kcolordialog.cpp
index a7a8540ce..efdad2385 100644
--- a/tdeui/kcolordialog.cpp
+++ b/tdeui/kcolordialog.cpp
@@ -376,7 +376,7 @@ void KColorCells::paintCell( TQPainter *painter, int row, int col )
if (shade)
{
qDrawShadePanel( painter, 1, 1, cellWidth()-2,
- cellHeight()-2, tqcolorGroup(), true, 1, &brush );
+ cellHeight()-2, colorGroup(), true, 1, &brush );
w = 2;
}
TQColor color = colors[ row * numCols() + col ];
@@ -1143,7 +1143,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal )
d->htmlName = new KLineEdit( page );
d->htmlName->setMaxLength( 13 ); // Qt's TQColor allows 12 hexa-digits
d->htmlName->setText("#FFFFFF"); // But HTML uses only 6, so do not worry about the size
- w = d->htmlName->fontMetrics().width(TQString::tqfromLatin1("#DDDDDDD"));
+ w = d->htmlName->fontMetrics().width(TQString::fromLatin1("#DDDDDDD"));
d->htmlName->setFixedWidth(w);
l_grid->addWidget(TQT_TQWIDGET(d->htmlName), 1, 2, Qt::AlignLeft);
diff --git a/tdeui/kcolordrag.cpp b/tdeui/kcolordrag.cpp
index 3beed82ca..be1e93aec 100644
--- a/tdeui/kcolordrag.cpp
+++ b/tdeui/kcolordrag.cpp
@@ -92,7 +92,7 @@ KColorDrag::decode( TQMimeSource *e, TQColor &color)
return true;
TQByteArray data = e->encodedData( text_mime_string);
- TQString colorName = TQString::tqfromLatin1(data.data(), data.size());
+ TQString colorName = TQString::fromLatin1(data.data(), data.size());
if ((colorName.length() < 4) || (colorName[0] != '#'))
return false;
color.setNamedColor(colorName);
diff --git a/tdeui/kcursor.cpp b/tdeui/kcursor.cpp
index 5907c4ba0..094e581be 100644
--- a/tdeui/kcursor.cpp
+++ b/tdeui/kcursor.cpp
@@ -370,9 +370,9 @@ KCursorPrivate::KCursorPrivate()
hideCursorDelay = 5000; // 5s default value
KConfig *kc = KGlobal::config();
- KConfigGroupSaver ks( kc, TQString::tqfromLatin1("KDE") );
+ KConfigGroupSaver ks( kc, TQString::fromLatin1("KDE") );
enabled = kc->readBoolEntry(
- TQString::tqfromLatin1("Autohiding cursor enabled"), true );
+ TQString::fromLatin1("Autohiding cursor enabled"), true );
}
KCursorPrivate::~KCursorPrivate()
diff --git a/tdeui/kdatepicker.cpp b/tdeui/kdatepicker.cpp
index 77ff907d7..82775be4f 100644
--- a/tdeui/kdatepicker.cpp
+++ b/tdeui/kdatepicker.cpp
@@ -175,17 +175,17 @@ void KDatePicker::init( const TQDate &dt )
line->installEventFilter( this );
if ( TQApplication::reverseLayout() )
{
- yearForward->setIconSet(BarIconSet(TQString::tqfromLatin1("2leftarrow")));
- yearBackward->setIconSet(BarIconSet(TQString::tqfromLatin1("2rightarrow")));
- monthForward->setIconSet(BarIconSet(TQString::tqfromLatin1("1leftarrow")));
- monthBackward->setIconSet(BarIconSet(TQString::tqfromLatin1("1rightarrow")));
+ yearForward->setIconSet(BarIconSet(TQString::fromLatin1("2leftarrow")));
+ yearBackward->setIconSet(BarIconSet(TQString::fromLatin1("2rightarrow")));
+ monthForward->setIconSet(BarIconSet(TQString::fromLatin1("1leftarrow")));
+ monthBackward->setIconSet(BarIconSet(TQString::fromLatin1("1rightarrow")));
}
else
{
- yearForward->setIconSet(BarIconSet(TQString::tqfromLatin1("2rightarrow")));
- yearBackward->setIconSet(BarIconSet(TQString::tqfromLatin1("2leftarrow")));
- monthForward->setIconSet(BarIconSet(TQString::tqfromLatin1("1rightarrow")));
- monthBackward->setIconSet(BarIconSet(TQString::tqfromLatin1("1leftarrow")));
+ yearForward->setIconSet(BarIconSet(TQString::fromLatin1("2rightarrow")));
+ yearBackward->setIconSet(BarIconSet(TQString::fromLatin1("2leftarrow")));
+ monthForward->setIconSet(BarIconSet(TQString::fromLatin1("1rightarrow")));
+ monthBackward->setIconSet(BarIconSet(TQString::fromLatin1("1leftarrow")));
}
connect(table, TQT_SIGNAL(dateChanged(TQDate)), TQT_SLOT(dateChangedSlot(TQDate)));
connect(table, TQT_SIGNAL(tableClicked()), TQT_SLOT(tableClickedSlot()));
@@ -529,7 +529,7 @@ KDatePicker::setCloseButton( bool enable )
TQToolTip::add(d->closeButton, i18n("Close"));
d->closeButton->setPixmap( SmallIcon("remove") );
connect( d->closeButton, TQT_SIGNAL( clicked() ),
- tqtopLevelWidget(), TQT_SLOT( close() ) );
+ topLevelWidget(), TQT_SLOT( close() ) );
}
else {
delete d->closeButton;
diff --git a/tdeui/kdatepicker.h b/tdeui/kdatepicker.h
index 381095c49..f1a5fd9a6 100644
--- a/tdeui/kdatepicker.h
+++ b/tdeui/kdatepicker.h
@@ -136,7 +136,7 @@ public:
/**
* By calling this method with @p enable = true, KDatePicker will show
* a little close-button in the upper button-row. Clicking the
- * close-button will cause the KDatePicker's tqtopLevelWidget()'s close()
+ * close-button will cause the KDatePicker's topLevelWidget()'s close()
* method being called. This is mostly useful for toplevel datepickers
* without a window manager decoration.
* @see hasCloseButton
diff --git a/tdeui/kdatetbl.cpp b/tdeui/kdatetbl.cpp
index e139ffd90..69fbc083b 100644
--- a/tdeui/kdatetbl.cpp
+++ b/tdeui/kdatetbl.cpp
@@ -233,7 +233,7 @@ KDateTable::paintCell(TQPainter *painter, int row, int col)
( daynum == 6 && calendar->calendarName() == "gregorian" ) )
normalday=false;
- TQBrush brushInvertTitle(tqcolorGroup().base());
+ TQBrush brushInvertTitle(colorGroup().base());
TQColor titleColor(isEnabled()?( KGlobalSettings::activeTitleColor() ):( KGlobalSettings::inactiveTitleColor() ) );
TQColor textColor(isEnabled()?( KGlobalSettings::activeTextColor() ):( KGlobalSettings::inactiveTextColor() ) );
if (!normalday)
@@ -250,7 +250,7 @@ KDateTable::paintCell(TQPainter *painter, int row, int col)
}
painter->drawText(0, 0, w, h-1, AlignCenter,
calendar->weekDayName(daynum, true), -1, &rect);
- painter->setPen(tqcolorGroup().text());
+ painter->setPen(colorGroup().text());
painter->moveTo(0, h-1);
painter->lineTo(w-1, h-1);
// ----- draw the weekday:
@@ -267,7 +267,7 @@ KDateTable::paintCell(TQPainter *painter, int row, int col)
// ° painting a day of the previous month or
// ° painting a day of the following month
// TODO: don't hardcode gray here! Use a color with less contrast to the background than normal text.
- painter->setPen( tqcolorGroup().mid() );
+ painter->setPen( colorGroup().mid() );
// painter->setPen(gray);
} else { // paint a day of the current month
if ( d->useCustomColors )
@@ -292,9 +292,9 @@ KDateTable::paintCell(TQPainter *painter, int row, int col)
}
painter->setPen( mode->fgColor );
} else
- painter->setPen(tqcolorGroup().text());
+ painter->setPen(colorGroup().text());
} else //if ( firstWeekDay < 4 ) // <- this doesn' make sense at all!
- painter->setPen(tqcolorGroup().text());
+ painter->setPen(colorGroup().text());
}
pen=painter->pen();
@@ -308,25 +308,25 @@ KDateTable::paintCell(TQPainter *painter, int row, int col)
// draw the currently selected date
if (isEnabled())
{
- painter->setPen(tqcolorGroup().highlight());
- painter->setBrush(tqcolorGroup().highlight());
+ painter->setPen(colorGroup().highlight());
+ painter->setBrush(colorGroup().highlight());
}
else
{
- painter->setPen(tqcolorGroup().text());
- painter->setBrush(tqcolorGroup().text());
+ painter->setPen(colorGroup().text());
+ painter->setBrush(colorGroup().text());
}
- pen=TQPen(tqcolorGroup().highlightedText());
+ pen=TQPen(colorGroup().highlightedText());
} else {
painter->setBrush(paletteBackgroundColor());
painter->setPen(paletteBackgroundColor());
-// painter->setBrush(tqcolorGroup().base());
-// painter->setPen(tqcolorGroup().base());
+// painter->setBrush(colorGroup().base());
+// painter->setPen(colorGroup().base());
}
if ( pCellDate == TQDate::currentDate() )
{
- painter->setPen(tqcolorGroup().text());
+ painter->setPen(colorGroup().text());
}
if ( paintRect ) painter->drawRect(0, 0, w, h);
@@ -439,7 +439,7 @@ KDateTable::setFontSize(int size)
maxCell.setHeight(QMAX(maxCell.height(), rect.height()));
}
// ----- compare with a real wide number and add some space:
- rect=metrics.boundingRect(TQString::tqfromLatin1("88"));
+ rect=metrics.boundingRect(TQString::fromLatin1("88"));
maxCell.setWidth(QMAX(maxCell.width()+2, rect.width()));
maxCell.setHeight(QMAX(maxCell.height()+4, rect.height()));
}
diff --git a/tdeui/kdialog.cpp b/tdeui/kdialog.cpp
index 959de3cc1..a0832b4e4 100644
--- a/tdeui/kdialog.cpp
+++ b/tdeui/kdialog.cpp
@@ -405,7 +405,7 @@ KSMModalDialog::KSMModalDialog(TQWidget* parent)
TQFrame* frame = new TQFrame( this );
frame->setFrameStyle( TQFrame::NoFrame );
- frame->setLineWidth( tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, frame ) );
+ frame->setLineWidth( tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth, frame ) );
// we need to set the minimum size for the window
frame->setMinimumWidth(400);
vbox->addWidget( frame );
diff --git a/tdeui/kdialogbase.cpp b/tdeui/kdialogbase.cpp
index 93d1cb58e..1fb00aa6d 100644
--- a/tdeui/kdialogbase.cpp
+++ b/tdeui/kdialogbase.cpp
@@ -454,7 +454,7 @@ TQSize KDialogBase::minimumSizeHint() const
//
if( mUrlHelp )
{
- s2 = mUrlHelp->tqminimumSize() + zeroByS;
+ s2 = mUrlHelp->minimumSize() + zeroByS;
}
s1.rwidth() = QMAX( s1.rwidth(), s2.rwidth() );
s1.rheight() += s2.rheight();
@@ -469,7 +469,7 @@ TQSize KDialogBase::minimumSizeHint() const
else if( mMainWidget )
{
s2 = mMainWidget->sizeHint() + zeroByS;
- s2 = s2.expandedTo( mMainWidget->tqminimumSize() );
+ s2 = s2.expandedTo( mMainWidget->minimumSize() );
s2 = s2.expandedTo( mMainWidget->minimumSizeHint() );
if( s2.isEmpty() )
{
@@ -486,7 +486,7 @@ TQSize KDialogBase::minimumSizeHint() const
if (d->detailsWidget && d->bDetails)
{
s2 = d->detailsWidget->sizeHint() + zeroByS;
- s2 = s2.expandedTo( d->detailsWidget->tqminimumSize() );
+ s2 = s2.expandedTo( d->detailsWidget->minimumSize() );
s2 = s2.expandedTo( d->detailsWidget->minimumSizeHint() );
s1.rwidth() = QMAX( s1.rwidth(), s2.rwidth() );
s1.rheight() += s2.rheight();
@@ -497,7 +497,7 @@ TQSize KDialogBase::minimumSizeHint() const
//
if( mActionSep )
{
- s1.rheight() += mActionSep->tqminimumSize().height() + s;
+ s1.rheight() += mActionSep->minimumSize().height() + s;
}
//
@@ -505,7 +505,7 @@ TQSize KDialogBase::minimumSizeHint() const
//
if( d->mButton.box )
{
- s2 = d->mButton.box->tqminimumSize();
+ s2 = d->mButton.box->minimumSize();
if( mButtonOrientation == Qt::Horizontal )
{
s1.rwidth() = QMAX( s1.rwidth(), s2.rwidth() );
@@ -1492,10 +1492,10 @@ TQRect KDialogBase::getContentsRect() const
r.setLeft( marginHint() );
r.setTop( marginHint() + (mUrlHelp ? mUrlHelp->height() : 0) );
r.setRight( width() - marginHint() );
- int h = (!mActionSep ? 0 : mActionSep->tqminimumSize().height()+marginHint());
+ int h = (!mActionSep ? 0 : mActionSep->minimumSize().height()+marginHint());
if( d->mButton.box )
{
- r.setBottom( height() - d->mButton.box->tqminimumSize().height() - h );
+ r.setBottom( height() - d->mButton.box->minimumSize().height() - h );
}
else
{
@@ -1513,14 +1513,14 @@ void KDialogBase::getBorderWidths(int& ulx, int& uly, int& lrx, int& lry) const
uly = marginHint();
if( mUrlHelp )
{
- uly += mUrlHelp->tqminimumSize().height();
+ uly += mUrlHelp->minimumSize().height();
}
lrx = marginHint();
- lry = d->mButton.box ? d->mButton.box->tqminimumSize().height() : 0;
+ lry = d->mButton.box ? d->mButton.box->minimumSize().height() : 0;
if( mActionSep )
{
- lry += mActionSep->tqminimumSize().height() + marginHint();
+ lry += mActionSep->minimumSize().height() + marginHint();
}
}
@@ -1755,8 +1755,8 @@ TQSize KDialogBase::configDialogSize( KConfig& config,
h = sizeHint().height();
KConfigGroupSaver cs(&config, groupName);
- w = config.readNumEntry( TQString::tqfromLatin1("Width %1").arg( desk.width()), w );
- h = config.readNumEntry( TQString::tqfromLatin1("Height %1").arg( desk.height()), h );
+ w = config.readNumEntry( TQString::fromLatin1("Width %1").arg( desk.width()), w );
+ h = config.readNumEntry( TQString::fromLatin1("Height %1").arg( desk.height()), h );
return TQSize( w, h );
}
@@ -1777,9 +1777,9 @@ void KDialogBase::saveDialogSize( KConfig& config, const TQString& groupName,
KConfigGroupSaver cs(&config, groupName);
TQSize sizeToSave = size();
- config.writeEntry( TQString::tqfromLatin1("Width %1").arg( desk.width()),
+ config.writeEntry( TQString::fromLatin1("Width %1").arg( desk.width()),
TQString::number( sizeToSave.width()), true, global);
- config.writeEntry( TQString::tqfromLatin1("Height %1").arg( desk.height()),
+ config.writeEntry( TQString::fromLatin1("Height %1").arg( desk.height()),
TQString::number( sizeToSave.height()), true, global);
}
diff --git a/tdeui/kdockwidget.cpp b/tdeui/kdockwidget.cpp
index 005f76b4b..219cfd0f6 100644
--- a/tdeui/kdockwidget.cpp
+++ b/tdeui/kdockwidget.cpp
@@ -203,7 +203,7 @@ void KDockWidgetHeaderDrag::paintEvent( TQPaintEvent* )
paint.begin( this );
- tqstyle().tqdrawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), tqcolorGroup());
+ tqstyle().tqdrawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), colorGroup());
paint.end();
}
@@ -266,7 +266,7 @@ KDockWidgetHeader::KDockWidgetHeader( KDockWidget* parent, const char* name )
layout->addWidget( closeButton );
layout->activate();
d->dummy->hide();
- drag->setFixedHeight( layout->tqminimumSize().height() );
+ drag->setFixedHeight( layout->minimumSize().height() );
}
void KDockWidgetHeader::setTopLevel( bool isTopLevel )
@@ -343,7 +343,7 @@ void KDockWidgetHeader::setDragPanel( KDockWidgetHeaderDrag* nd )
if (dontShowDummy) d->dummy->hide(); else d->dummy->show();
layout->addWidget( closeButton );
layout->activate();
- kdDebug(282)<<"KdockWidgetHeader::setDragPanel:minimum height="<<layout->tqminimumSize().height()<<endl;
+ kdDebug(282)<<"KdockWidgetHeader::setDragPanel:minimum height="<<layout->minimumSize().height()<<endl;
//FIXME somebody left this here, but we don't know what the hell it's for.
drag->setFixedHeight( closeButton->height()); // /*layout->minimumS*/sizeHint().height() );
}
@@ -378,7 +378,7 @@ void KDockWidgetHeader::addButton(KDockButton_Private* btn) {
if (dontShowDummy) d->dummy->hide(); else d->dummy->show();
layout->addWidget( closeButton );
layout->activate();
- drag->setFixedHeight( layout->tqminimumSize().height() );
+ drag->setFixedHeight( layout->minimumSize().height() );
}
void KDockWidgetHeader::removeButton(KDockButton_Private* btn) {
@@ -574,7 +574,7 @@ void KDockWidget::paintEvent(TQPaintEvent* pe)
TQWidget::paintEvent(pe);
TQPainter paint;
paint.begin( this );
- tqstyle().tqdrawPrimitive (TQStyle::PE_Panel, &paint, TQRect(0,0,width(), height()), tqcolorGroup());
+ tqstyle().tqdrawPrimitive (TQStyle::PE_Panel, &paint, TQRect(0,0,width(), height()), colorGroup());
paint.end();
}
@@ -601,7 +601,7 @@ void KDockWidget::mousePressEvent(TQMouseEvent* mme)
int styleheight;
TQPoint mp;
mp=mme->pos();
- styleheight=2*tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth,this);
+ styleheight=2*tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth,this);
bbottom=mp.y()>=height()-styleheight;
btop=mp.y()<=styleheight;
bleft=mp.x()<=styleheight;
@@ -689,7 +689,7 @@ void KDockWidget::mouseMoveEvent(TQMouseEvent* mme)
int styleheight;
TQPoint mp;
mp=mme->pos();
- styleheight=2*tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth,this);
+ styleheight=2*tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth,this);
bbottom=mp.y()>=height()-styleheight;
btop=mp.y()<=styleheight;
bleft=mp.x()<=styleheight;
@@ -791,7 +791,7 @@ void KDockWidget::updateHeader()
header->setTopLevel( true );
header->show();
#ifdef BORDERLESS_WINDOWS
- layout->setMargin(2*tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth,this));
+ layout->setMargin(2*tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth,this));
setMouseTracking(true);
#endif
}
@@ -1850,7 +1850,7 @@ KDockWidget* KDockManager::findDockWidgetAt( const TQPoint& pos )
return 0L;
}
#if defined(_OS_WIN32_) || defined(Q_OS_WIN32)
- p = p->tqtopLevelWidget();
+ p = p->topLevelWidget();
#endif
TQWidget* w = 0L;
findChildDockWidget( w, p, p->mapFromGlobal(pos) );
@@ -2105,7 +2105,7 @@ static TQDomElement createStringEntry(TQDomDocument &doc, const TQString &tagNam
static TQDomElement createBoolEntry(TQDomDocument &doc, const TQString &tagName, bool b)
{
- return createStringEntry(doc, tagName, TQString::tqfromLatin1(b? "true" : "false"));
+ return createStringEntry(doc, tagName, TQString::fromLatin1(b? "true" : "false"));
}
@@ -2144,7 +2144,7 @@ static TQDomElement createListEntry(TQDomDocument &doc, const TQString &tagName,
TQStrListIterator it(list);
for (; it.current(); ++it) {
TQDomElement subel = doc.createElement(subTagName);
- subel.appendChild(doc.createTextNode(TQString::tqfromLatin1(it.current())));
+ subel.appendChild(doc.createTextNode(TQString::fromLatin1(it.current())));
el.appendChild(subel);
}
@@ -2214,7 +2214,7 @@ void KDockManager::writeConfig(TQDomElement &base)
KDockWidget *obj1;
while ( (obj1=(KDockWidget*)it.current()) ) {
if ( TQT_BASE_OBJECT(obj1->parent()) == TQT_BASE_OBJECT(main) )
- mainWidgetStr = TQString::tqfromLatin1(obj1->name());
+ mainWidgetStr = TQString::fromLatin1(obj1->name());
nList.append(obj1->name());
++it;
}
@@ -2279,7 +2279,7 @@ void KDockManager::writeConfig(TQDomElement &base)
}
}
- groupEl.appendChild(createStringEntry(doc, "name", TQString::tqfromLatin1(obj->name())));
+ groupEl.appendChild(createStringEntry(doc, "name", TQString::fromLatin1(obj->name())));
groupEl.appendChild(createBoolEntry(doc, "hasParent", obj->parent()));
if ( !obj->parent() ) {
groupEl.appendChild(createRectEntry(doc, "geometry", TQRect(main->frameGeometry().topLeft(), main->size())));
@@ -2994,14 +2994,14 @@ void KDockManager::drawDragRectangle()
KDockMainWindow* pMain = 0L;
KDockWidget* pTLDockWdg = 0L;
TQWidget* topWdg;
- if (pDockWdgAtRect->tqtopLevelWidget() == main) {
+ if (pDockWdgAtRect->topLevelWidget() == main) {
isOverMainWdg = true;
topWdg = pMain = (KDockMainWindow*) main;
unclipped = pMain->testWFlags( WPaintUnclipped );
pMain->setWFlags( WPaintUnclipped );
}
else {
- topWdg = pTLDockWdg = (KDockWidget*) pDockWdgAtRect->tqtopLevelWidget();
+ topWdg = pTLDockWdg = (KDockWidget*) pDockWdgAtRect->topLevelWidget();
unclipped = pTLDockWdg->testWFlags( WPaintUnclipped );
pTLDockWdg->setWFlags( WPaintUnclipped );
}
diff --git a/tdeui/kdockwidget.h b/tdeui/kdockwidget.h
index c084dff5b..b2b740ca6 100644
--- a/tdeui/kdockwidget.h
+++ b/tdeui/kdockwidget.h
@@ -452,7 +452,7 @@ public:
*/
KDockWidget( KDockManager* dockManager, const char* name,
const TQPixmap &pixmap, TQWidget* parent = 0L, const TQString& strCaption = TQString::null,
- const TQString& strTabPageLabel = TQString::tqfromLatin1( " " ), WFlags f = 0);
+ const TQString& strTabPageLabel = TQString::fromLatin1( " " ), WFlags f = 0);
/**
* Destructs a dockwidget.
@@ -1377,7 +1377,7 @@ public:
* @return a pointer to the new created dockwidget
*/
KDockWidget* createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* parent = 0L,
- const TQString& strCaption = TQString::null, const TQString& strTabPageLabel = TQString::tqfromLatin1( " " ) );
+ const TQString& strCaption = TQString::null, const TQString& strTabPageLabel = TQString::fromLatin1( " " ) );
/**
* Saves the current dock window layout into a DOM tree below the given element.
@@ -1503,7 +1503,7 @@ public:
KDockWidget* getMainDockWidget(){ return mainDockWidget; }
KDockWidget* createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* parent = 0L,
- const TQString& strCaption = TQString::null, const TQString& strTabPageLabel = TQString::tqfromLatin1( " " ) );
+ const TQString& strCaption = TQString::null, const TQString& strTabPageLabel = TQString::fromLatin1( " " ) );
void writeDockConfig(TQDomElement &base);
void readDockConfig(TQDomElement &base);
diff --git a/tdeui/kdockwidget_private.cpp b/tdeui/kdockwidget_private.cpp
index 55ffc6229..c7838d4d9 100644
--- a/tdeui/kdockwidget_private.cpp
+++ b/tdeui/kdockwidget_private.cpp
@@ -497,8 +497,8 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e)
switch (e->type()) {
case TQEvent::MouseMove:
mev= (TQMouseEvent*)e;
- child0->tqsetUpdatesEnabled(mOpaqueResize);
- child1->tqsetUpdatesEnabled(mOpaqueResize);
+ child0->setUpdatesEnabled(mOpaqueResize);
+ child1->setUpdatesEnabled(mOpaqueResize);
if (m_orientation == Qt::Horizontal) {
if ((fixedHeight0!=-1) || (fixedHeight1!=-1))
{
@@ -536,8 +536,8 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e)
handled= true;
break;
case TQEvent::MouseButtonRelease:
- child0->tqsetUpdatesEnabled(true);
- child1->tqsetUpdatesEnabled(true);
+ child0->setUpdatesEnabled(true);
+ child1->setUpdatesEnabled(true);
mev= (TQMouseEvent*)e;
if (m_orientation == Qt::Horizontal){
if ((fixedHeight0!=-1) || (fixedHeight1!=-1))
@@ -634,7 +634,7 @@ KDockButton_Private::~KDockButton_Private()
void KDockButton_Private::drawButton( TQPainter* p )
{
- p->fillRect( 0,0, width(), height(), TQBrush(tqcolorGroup().brush(TQColorGroup::Background)) );
+ p->fillRect( 0,0, width(), height(), TQBrush(colorGroup().brush(TQColorGroup::Background)) );
p->drawPixmap( (width() - pixmap()->width()) / 2, (height() - pixmap()->height()) / 2, *pixmap() );
if ( moveMouse && !isDown() ){
p->setPen( white );
@@ -642,12 +642,12 @@ void KDockButton_Private::drawButton( TQPainter* p )
p->lineTo( 0, 0 );
p->lineTo( width() - 1, 0 );
- p->setPen( tqcolorGroup().dark() );
+ p->setPen( colorGroup().dark() );
p->lineTo( width() - 1, height() - 1 );
p->lineTo( 0, height() - 1 );
}
if ( isOn() || isDown() ){
- p->setPen( tqcolorGroup().dark() );
+ p->setPen( colorGroup().dark() );
p->moveTo( 0, height() - 1 );
p->lineTo( 0, 0 );
p->lineTo( width() - 1, 0 );
diff --git a/tdeui/kdualcolorbutton.cpp b/tdeui/kdualcolorbutton.cpp
index 64624df82..27cd28f43 100644
--- a/tdeui/kdualcolorbutton.cpp
+++ b/tdeui/kdualcolorbutton.cpp
@@ -152,13 +152,13 @@ void KDualColorButton::paintEvent(TQPaintEvent *)
TQPainter p(this);
metrics(fgRect, bgRect);
- TQBrush defBrush = tqcolorGroup().brush(TQColorGroup::Button);
+ TQBrush defBrush = colorGroup().brush(TQColorGroup::Button);
- qDrawShadeRect(&p, bgRect, tqcolorGroup(), curColor == Background, 2, 0,
+ qDrawShadeRect(&p, bgRect, colorGroup(), curColor == Background, 2, 0,
isEnabled() ? &bg : &defBrush);
- qDrawShadeRect(&p, fgRect, tqcolorGroup(), curColor == Foreground, 2, 0,
+ qDrawShadeRect(&p, fgRect, colorGroup(), curColor == Foreground, 2, 0,
isEnabled() ? &fg : &defBrush);
- p.setPen(tqcolorGroup().shadow());
+ p.setPen(colorGroup().shadow());
p.drawPixmap(fgRect.right()+2, 0, *arrowBitmap);
p.drawPixmap(0, fgRect.bottom()+2, *resetPixmap);
diff --git a/tdeui/keditcl1.cpp b/tdeui/keditcl1.cpp
index fe886f434..3e03fc019 100644
--- a/tdeui/keditcl1.cpp
+++ b/tdeui/keditcl1.cpp
@@ -164,7 +164,7 @@ KEdit::cleanWhiteSpace()
if (line.isEmpty())
{
if (addSpace)
- newText += TQString::tqfromLatin1("\n\n");
+ newText += TQString::fromLatin1("\n\n");
if (firstLine)
{
if (firstChar.isSpace())
diff --git a/tdeui/kedittoolbar.cpp b/tdeui/kedittoolbar.cpp
index 664e206bd..418fb755d 100644
--- a/tdeui/kedittoolbar.cpp
+++ b/tdeui/kedittoolbar.cpp
@@ -378,7 +378,7 @@ const char *KEditToolbar::s_defaultToolbar = 0L;
KEditToolbar::KEditToolbar(KActionCollection *collection, const TQString& file,
bool global, TQWidget* parent, const char* name)
: KDialogBase(Swallow, i18n("Configure Toolbars"), Default|Ok|Apply|Cancel, Ok, parent, name),
- m_widget(new KEditToolbarWidget(TQString::tqfromLatin1(s_defaultToolbar), collection, file, global, this))
+ m_widget(new KEditToolbarWidget(TQString::fromLatin1(s_defaultToolbar), collection, file, global, this))
{
init();
d->m_global = global;
@@ -400,7 +400,7 @@ KEditToolbar::KEditToolbar(const TQString& defaultToolbar, KActionCollection *co
KEditToolbar::KEditToolbar(KXMLGUIFactory* factory, TQWidget* parent, const char* name)
: KDialogBase(Swallow, i18n("Configure Toolbars"), Default|Ok|Apply|Cancel, Ok, parent, name),
- m_widget(new KEditToolbarWidget(TQString::tqfromLatin1(s_defaultToolbar), factory, this))
+ m_widget(new KEditToolbarWidget(TQString::fromLatin1(s_defaultToolbar), factory, this))
{
init();
d->m_factory = factory;
@@ -467,7 +467,7 @@ void KEditToolbar::slotDefault()
if (TQDir::isRelativePath(file))
{
const KInstance *instance = client->instance() ? client->instance() : KGlobal::instance();
- file = locateLocal("data", TQString::tqfromLatin1( instance->instanceName() + '/' ) + file);
+ file = locateLocal("data", TQString::fromLatin1( instance->instanceName() + '/' ) + file);
}
else
{
@@ -488,7 +488,7 @@ void KEditToolbar::slotDefault()
int slash = d->m_file.findRev('/')+1;
if (slash)
d->m_file = d->m_file.mid(slash);
- TQString xml_file = locateLocal("data", TQString::tqfromLatin1( KGlobal::instance()->instanceName() + '/' ) + d->m_file);
+ TQString xml_file = locateLocal("data", TQString::fromLatin1( KGlobal::instance()->instanceName() + '/' ) + d->m_file);
if ( TQFile::exists( xml_file ) )
if ( !TQFile::remove( xml_file ) )
@@ -816,7 +816,7 @@ void KEditToolbarWidget::setupLayout()
// "change icon" button
d->m_changeIcon = new KPushButton( i18n( "Change &Icon..." ), this );
- TQString kdialogExe = KStandardDirs::findExe(TQString::tqfromLatin1("kdialog"));
+ TQString kdialogExe = KStandardDirs::findExe(TQString::fromLatin1("kdialog"));
d->m_hasKDialog = !kdialogExe.isEmpty();
d->m_changeIcon->setEnabled( d->m_hasKDialog );
@@ -975,7 +975,7 @@ void KEditToolbarWidget::loadActionList(TQDomElement& elem)
if (it.tagName() == tagSeparator)
{
ToolbarItem *act = new ToolbarItem(m_activeList, tagSeparator, sep_name.arg(sep_num++), TQString::null);
- bool isLineSep = ( it.attribute(attrLineSeparator, "true").lower() == TQString::tqfromLatin1("true") );
+ bool isLineSep = ( it.attribute(attrLineSeparator, "true").lower() == TQString::fromLatin1("true") );
if(isLineSep)
act->setText(1, LINESEPARATORSTRING);
else
@@ -1382,10 +1382,10 @@ void KEditToolbarWidget::slotChangeIcon()
return;
d->m_kdialogProcess = new KProcIO;
- TQString kdialogExe = KStandardDirs::findExe(TQString::tqfromLatin1("kdialog"));
+ TQString kdialogExe = KStandardDirs::findExe(TQString::fromLatin1("kdialog"));
(*d->m_kdialogProcess) << kdialogExe;
(*d->m_kdialogProcess) << "--embed";
- (*d->m_kdialogProcess) << TQString::number( (ulong)tqtopLevelWidget()->winId() );
+ (*d->m_kdialogProcess) << TQString::number( (ulong)topLevelWidget()->winId() );
(*d->m_kdialogProcess) << "--geticon";
(*d->m_kdialogProcess) << "Toolbar";
(*d->m_kdialogProcess) << "Actions";
diff --git a/tdeui/kfontcombo.cpp b/tdeui/kfontcombo.cpp
index e62360521..9ef3af912 100644
--- a/tdeui/kfontcombo.cpp
+++ b/tdeui/kfontcombo.cpp
@@ -132,7 +132,7 @@ void KFontListItem::paint(TQPainter *p)
if (m_canPaintName)
p->setFont(*m_font);
else
- t = TQString::tqfromLatin1("(%1)").arg(m_fontName);
+ t = TQString::fromLatin1("(%1)").arg(m_fontName);
}
TQFontMetrics fm(p->fontMetrics());
p->drawText(3, (m_combo->d->lineSpacing + fm.ascent() + fm.leading() / 2) / 2, t);
diff --git a/tdeui/kfontdialog.cpp b/tdeui/kfontdialog.cpp
index a5609a81e..147b63901 100644
--- a/tdeui/kfontdialog.cpp
+++ b/tdeui/kfontdialog.cpp
@@ -331,8 +331,8 @@ KFontChooser::KFontChooser(TQWidget *parent, const char *name,
setSizeIsRelative( *sizeIsRelativeState );
KConfig *config = KGlobal::config();
- KConfigGroupSaver saver(config, TQString::tqfromLatin1("General"));
- showXLFDArea(config->readBoolEntry(TQString::tqfromLatin1("fontSelectorShowXLFD"), false));
+ KConfigGroupSaver saver(config, TQString::fromLatin1("General"));
+ showXLFDArea(config->readBoolEntry(TQString::fromLatin1("fontSelectorShowXLFD"), false));
}
KFontChooser::~KFontChooser()
@@ -526,7 +526,7 @@ void KFontChooser::style_chosen_slot(const TQString& style)
fillSizeList();
} else { // is bitmap font.
//sampleEdit->setPaletteBackgroundPixmap( BitmapPixmap ); // TODO
- TQValueList<int> sizes = dbase.tqsmoothSizes(familyListBox->currentText(), currentStyles[currentStyle]);
+ TQValueList<int> sizes = dbase.smoothSizes(familyListBox->currentText(), currentStyles[currentStyle]);
if(sizes.count() > 0) {
TQValueList<int>::iterator it;
diff=1000;
@@ -681,13 +681,13 @@ void KFontChooser::addFont( TQStringList &list, const char *xfont )
if ( !ptr )
return;
- TQString font = TQString::tqfromLatin1(ptr + 1);
+ TQString font = TQString::fromLatin1(ptr + 1);
int pos;
if ( ( pos = font.find( '-' ) ) > 0 ) {
font.truncate( pos );
- if ( font.find( TQString::tqfromLatin1("open look"), 0, false ) >= 0 )
+ if ( font.find( TQString::fromLatin1("open look"), 0, false ) >= 0 )
return;
TQStringList::Iterator it = list.begin();
diff --git a/tdeui/khelpmenu.cpp b/tdeui/khelpmenu.cpp
index 663838fa8..330362d45 100644
--- a/tdeui/khelpmenu.cpp
+++ b/tdeui/khelpmenu.cpp
@@ -119,7 +119,7 @@ KPopupMenu* KHelpMenu::menu()
// compatible.
//
const KAboutData *aboutData = d->mAboutData ? d->mAboutData : KGlobal::instance()->aboutData();
- TQString appName = (aboutData)? aboutData->programName() : TQString::tqfromLatin1(tqApp->name());
+ TQString appName = (aboutData)? aboutData->programName() : TQString::fromLatin1(tqApp->name());
mMenu = new KPopupMenu();
connect( mMenu, TQT_SIGNAL(destroyed()), this, TQT_SLOT(menuDestroyed()));
diff --git a/tdeui/kiconview.cpp b/tdeui/kiconview.cpp
index 6d3f51a2b..a26519729 100644
--- a/tdeui/kiconview.cpp
+++ b/tdeui/kiconview.cpp
@@ -184,7 +184,7 @@ void KIconView::slotAutoSelect()
bool select = !m_pCurrentItem->isSelected();
bool update = viewport()->isUpdatesEnabled();
- viewport()->tqsetUpdatesEnabled( false );
+ viewport()->setUpdatesEnabled( false );
//Calculate the smallest rectangle that contains the current Item
//and the one that got the autoselect event
@@ -216,7 +216,7 @@ void KIconView::slotAutoSelect()
}
blockSignals( block );
- viewport()->tqsetUpdatesEnabled( update );
+ viewport()->setUpdatesEnabled( update );
repaintContents( redraw, false );
emit selectionChanged();
@@ -485,7 +485,7 @@ void KIconViewItem::calcRect( const TQString& text_ )
KIconView *view = static_cast<KIconView *>(iconView());
TQRect itemIconRect = pixmapRect();
TQRect itemTextRect = textRect();
- TQRect tqitemRect = rect();
+ TQRect itemRect = rect();
int pw = 0;
int ph = 0;
@@ -507,9 +507,9 @@ void KIconViewItem::calcRect( const TQString& text_ )
itemIconRect.setWidth( pw );
#if 1 // FIXME
// There is a bug in Qt which prevents the item from being placed
- // properly when the pixmapRect is not at the top of the tqitemRect, so we
+ // properly when the pixmapRect is not at the top of the itemRect, so we
// have to increase the height of the pixmapRect and leave it at the top
- // of the tqitemRect...
+ // of the itemRect...
if ( d && !d->m_pixmapSize.isNull() )
itemIconRect.setHeight( d->m_pixmapSize.height() + 2 );
else
@@ -574,8 +574,8 @@ void KIconViewItem::calcRect( const TQString& text_ )
h = itemTextRect.height() + itemIconRect.height() + 1;
}
- tqitemRect.setWidth( w );
- tqitemRect.setHeight( h );
+ itemRect.setWidth( w );
+ itemRect.setHeight( h );
int width = QMAX( w, TQApplication::globalStrut().width() ); // see TQIconViewItem::width()
int height = QMAX( h, TQApplication::globalStrut().height() ); // see TQIconViewItem::height()
itemTextRect = TQRect( ( width - itemTextRect.width() ) / 2, height - itemTextRect.height(),
@@ -597,8 +597,8 @@ void KIconViewItem::calcRect( const TQString& text_ )
h = QMAX( itemTextRect.height(), itemIconRect.height() );
w = itemTextRect.width() + itemIconRect.width() + 1;
- tqitemRect.setWidth( w );
- tqitemRect.setHeight( h );
+ itemRect.setWidth( w );
+ itemRect.setHeight( h );
int width = QMAX( w, TQApplication::globalStrut().width() ); // see TQIconViewItem::width()
int height = QMAX( h, TQApplication::globalStrut().height() ); // see TQIconViewItem::height()
@@ -621,8 +621,8 @@ void KIconViewItem::calcRect( const TQString& text_ )
setPixmapRect( itemIconRect );
if ( itemTextRect != textRect() )
setTextRect( itemTextRect );
- if ( tqitemRect != rect() )
- setItemRect( tqitemRect );
+ if ( itemRect != rect() )
+ setItemRect( itemRect );
// Done by setPixmapRect, setTextRect and setItemRect ! [and useless if no rect changed]
//view->updateItemContainer( this );
@@ -680,7 +680,7 @@ void KIconViewItem::paintPixmap( TQPainter *p, const TQColorGroup &cg )
#if 1 // FIXME
// Move the pixmap manually because the pixmapRect is at the
- // top of the tqitemRect
+ // top of the itemRect
// (won't be needed anymore in future versions of qt)
if ( d && !d->m_pixmapSize.isNull() )
{
diff --git a/tdeui/kjanuswidget.cpp b/tdeui/kjanuswidget.cpp
index 584780c8e..0bf5199ff 100644
--- a/tdeui/kjanuswidget.cpp
+++ b/tdeui/kjanuswidget.cpp
@@ -542,7 +542,7 @@ bool KJanusWidget::setSwallowedWidget( TQWidget *widget )
}
gbox->addWidget(widget, 0, 0 );
gbox->activate();
- mSwallowPage->setMinimumSize( widget->tqminimumSize() );
+ mSwallowPage->setMinimumSize( widget->minimumSize() );
}
return true;
@@ -769,20 +769,20 @@ TQSize KJanusWidget::minimumSizeHint() const
if( mFace == TreeList )
{
- s1.rwidth() += tqstyle().tqpixelMetric( TQStyle::PM_SplitterWidth );
- s2 = mTreeList->tqminimumSize();
+ s1.rwidth() += tqstyle().pixelMetric( TQStyle::PM_SplitterWidth );
+ s2 = mTreeList->minimumSize();
}
else
{
mIconList->updateMinimumHeight();
mIconList->updateWidth();
- s2 = mIconList->tqminimumSize();
+ s2 = mIconList->minimumSize();
}
if( mTitleLabel->isVisible() )
{
s3 += mTitleLabel->sizeHint();
- s3.rheight() += mTitleSep->tqminimumSize().height();
+ s3.rheight() += mTitleSep->minimumSize().height();
}
//
@@ -799,7 +799,7 @@ TQSize KJanusWidget::minimumSizeHint() const
}
else if( mFace == Swallow )
{
- return mSwallowPage->tqminimumSize();
+ return mSwallowPage->minimumSize();
}
else if( mFace == Plain )
{
@@ -1074,13 +1074,13 @@ void KJanusWidget::IconListItem::highlight( bool erase )
// For now, always disable highlighting
erase = true;
- TQRect r = listBox()->tqitemRect( this );
+ TQRect r = listBox()->itemRect( this );
r.addCoords( 1, 1, -1, -1 );
TQPainter p( listBox()->viewport() );
p.setClipRegion( r );
- const TQColorGroup &cg = listBox()->tqcolorGroup();
+ const TQColorGroup &cg = listBox()->colorGroup();
if ( erase )
{
p.setPen( cg.base() );
@@ -1129,7 +1129,7 @@ const TQPixmap &KJanusWidget::IconListItem::defaultPixmap()
void KJanusWidget::IconListItem::paint( TQPainter *painter )
{
- TQRect itemPaintRegion( listBox()->tqitemRect( this ) );
+ TQRect itemPaintRegion( listBox()->itemRect( this ) );
TQRect r( 1, 1, itemPaintRegion.width() - 2, itemPaintRegion.height() - 2);
if ( isSelected() )
@@ -1137,7 +1137,7 @@ void KJanusWidget::IconListItem::paint( TQPainter *painter )
painter->eraseRect( r );
painter->save();
- painter->setPen( listBox()->tqcolorGroup().highlight().dark( 160 ) );
+ painter->setPen( listBox()->colorGroup().highlight().dark( 160 ) );
painter->drawRect( r );
painter->restore();
}
diff --git a/tdeui/kjanuswidget.h b/tdeui/kjanuswidget.h
index 4ddc8be17..8cc0c667c 100644
--- a/tdeui/kjanuswidget.h
+++ b/tdeui/kjanuswidget.h
@@ -50,7 +50,7 @@ class KGuiItem;
* This class provides KJanusWidget::TreeList, KJanusWidget::IconList,
* KJanusWidget::Tabbed, KJanusWidget::Plain and KJanusWidget::Swallow layouts.
*
- * For all modes it is important that you specify the TQWidget::tqminimumSize()
+ * For all modes it is important that you specify the TQWidget::minimumSize()
* on the page, plain widget or the swallowed widget. If you use a QLayout
* on the page, plain widget or the swallowed widget this will be taken care
* of automatically. The size is used when the KJanusWidget determines its
diff --git a/tdeui/kkeybutton.cpp b/tdeui/kkeybutton.cpp
index ee26cc6de..7a51d47f0 100644
--- a/tdeui/kkeybutton.cpp
+++ b/tdeui/kkeybutton.cpp
@@ -85,7 +85,7 @@ void KKeyButton::setShortcut( const KShortcut& cut, bool bQtShortcut )
d->bQtShortcut = bQtShortcut;
m_cut = cut;
TQString keyStr = m_cut.toString();
- keyStr.replace('&', TQString::tqfromLatin1("&&"));
+ keyStr.replace('&', TQString::fromLatin1("&&"));
setText( keyStr.isEmpty() ? i18n("None") : keyStr );
}
@@ -146,11 +146,11 @@ void KKeyButton::drawButton( TQPainter *painter )
painter->setClipping( false );
if( width() > 12 && height() > 8 )
qDrawShadePanel( painter, 6, 4, width() - 12, height() - 8,
- tqcolorGroup(), true, 1, 0L );
+ colorGroup(), true, 1, 0L );
if ( m_bEditing )
{
- painter->setPen( tqcolorGroup().base() );
- painter->setBrush( tqcolorGroup().base() );
+ painter->setPen( colorGroup().base() );
+ painter->setBrush( colorGroup().base() );
}
else
{
@@ -162,7 +162,7 @@ void KKeyButton::drawButton( TQPainter *painter )
drawButtonLabel( painter );
- painter->setPen( tqcolorGroup().text() );
+ painter->setPen( colorGroup().text() );
painter->setBrush( NoBrush );
if( hasFocus() || m_bEditing )
{
diff --git a/tdeui/klanguagebutton.cpp b/tdeui/klanguagebutton.cpp
index bfc160c8e..07cdc6db3 100644
--- a/tdeui/klanguagebutton.cpp
+++ b/tdeui/klanguagebutton.cpp
@@ -131,12 +131,12 @@ KLanguageButton::~KLanguageButton()
void KLanguageButton::insertLanguage( const TQString& path, const TQString& name,
const TQString&, const TQString &submenu, int index )
{
- TQString output = name + TQString::tqfromLatin1( " (" ) + path +
- TQString::tqfromLatin1( ")" );
+ TQString output = name + TQString::fromLatin1( " (" ) + path +
+ TQString::fromLatin1( ")" );
#if 0
// Nooooo ! Country != language
TQPixmap flag( locate( "locale", sub + path +
- TQString::tqfromLatin1( "/flag.png" ) ) );
+ TQString::fromLatin1( "/flag.png" ) ) );
#endif
insertItem( output, path, submenu, index );
}
diff --git a/tdeui/kled.cpp b/tdeui/kled.cpp
index b78b06a38..71b6e00c1 100644
--- a/tdeui/kled.cpp
+++ b/tdeui/kled.cpp
@@ -229,7 +229,7 @@ KLed::paintFlat() // paint a ROUND FLAT led lamp
brush.setColor( color );
pen.setWidth( scale );
- color = tqcolorGroup().dark();
+ color = colorGroup().dark();
pen.setColor( color ); // Set the pen accordingly
paint.setPen( pen ); // Select pen for drawing
@@ -325,7 +325,7 @@ KLed::paintRound() // paint a ROUND RAISED led lamp
// avoid that the border can be erased by the bright spot of the LED
pen.setWidth( 2 * scale + 1 );
- color = tqcolorGroup().dark();
+ color = colorGroup().dark();
pen.setColor( color ); // Set the pen accordingly
paint.setPen( pen ); // Select pen for drawing
brush.setStyle( Qt::NoBrush ); // Switch off the brush
@@ -428,7 +428,7 @@ KLed::paintSunken() // paint a ROUND SUNKEN led lamp
// drawing the shadow border at 45° (45*16 = 720).
int angle = -720;
- color = tqcolorGroup().light();
+ color = colorGroup().light();
for ( int arc = 120; arc < 2880; arc += 240 ) {
pen.setColor( color );
diff --git a/tdeui/klistbox.cpp b/tdeui/klistbox.cpp
index 30d418daf..13c5ab325 100644
--- a/tdeui/klistbox.cpp
+++ b/tdeui/klistbox.cpp
@@ -133,7 +133,7 @@ void KListBox::slotAutoSelect()
bool select = !m_pCurrentItem->isSelected();
bool update = viewport()->isUpdatesEnabled();
- viewport()->tqsetUpdatesEnabled( false );
+ viewport()->setUpdatesEnabled( false );
bool down = index( previousItem ) < index( m_pCurrentItem );
TQListBoxItem* it = down ? previousItem : m_pCurrentItem;
@@ -150,7 +150,7 @@ void KListBox::slotAutoSelect()
}
blockSignals( block );
- viewport()->tqsetUpdatesEnabled( update );
+ viewport()->setUpdatesEnabled( update );
triggerUpdate( false );
emit selectionChanged();
diff --git a/tdeui/klistview.cpp b/tdeui/klistview.cpp
index e7b13325d..197d90acd 100644
--- a/tdeui/klistview.cpp
+++ b/tdeui/klistview.cpp
@@ -197,7 +197,7 @@ void KListViewLineEdit::load(TQListViewItem *i, int c)
item=i;
col=c;
- TQRect rect(p->tqitemRect(i));
+ TQRect rect(p->itemRect(i));
setText(item->text(c));
home( true );
@@ -621,7 +621,7 @@ void KListView::slotAutoSelect()
bool select = !d->pCurrentItem->isSelected();
bool update = viewport()->isUpdatesEnabled();
- viewport()->tqsetUpdatesEnabled( false );
+ viewport()->setUpdatesEnabled( false );
bool down = previousItem->itemPos() < d->pCurrentItem->itemPos();
TQListViewItemIterator lit( down ? previousItem : d->pCurrentItem );
@@ -638,7 +638,7 @@ void KListView::slotAutoSelect()
}
blockSignals( block );
- viewport()->tqsetUpdatesEnabled( update );
+ viewport()->setUpdatesEnabled( update );
triggerUpdate();
emit selectionChanged();
@@ -1067,7 +1067,7 @@ void KListView::findDrop(const TQPoint &pos, TQListViewItem *&parent, TQListView
else
{
// Get the closest item before us ('atpos' or the one above, if any)
- if (p.y() - tqitemRect(atpos).topLeft().y() < (atpos->height()/2))
+ if (p.y() - itemRect(atpos).topLeft().y() < (atpos->height()/2))
above = atpos->itemAbove();
else
above = atpos;
@@ -1327,12 +1327,12 @@ TQRect KListView::drawDropVisualizer(TQPainter *p, TQListViewItem *parent,
it = it->firstChild();
}
- insertmarker = tqitemRect (it ? it : after);
+ insertmarker = itemRect (it ? it : after);
level = after->depth();
}
else if (parent)
{
- insertmarker = tqitemRect (parent);
+ insertmarker = itemRect (parent);
level = parent->depth() + 1;
}
insertmarker.setLeft( treeStepSize() * ( level + (rootIsDecorated() ? 1 : 0) ) + itemMargin() );
@@ -1355,11 +1355,11 @@ TQRect KListView::drawItemHighlighter(TQPainter *painter, TQListViewItem *item)
if (item)
{
- r = tqitemRect(item);
+ r = itemRect(item);
r.setLeft(r.left()+(item->depth()+(rootIsDecorated() ? 1 : 0))*treeStepSize());
if (painter)
- tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, painter, r, tqcolorGroup(),
- TQStyle::Style_FocusAtBorder, tqcolorGroup().highlight());
+ tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, painter, r, colorGroup(),
+ TQStyle::Style_FocusAtBorder, colorGroup().highlight());
}
return r;
@@ -1808,9 +1808,9 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e)
TQRect ir;
if (repaintItem1)
- ir = ir.unite( tqitemRect(repaintItem1) );
+ ir = ir.unite( itemRect(repaintItem1) );
if (repaintItem2)
- ir = ir.unite( tqitemRect(repaintItem2) );
+ ir = ir.unite( itemRect(repaintItem2) );
if ( !ir.isEmpty() )
{ // rectangle to be repainted
@@ -1895,7 +1895,7 @@ void KListView::emitContextMenu (KListView*, TQListViewItem* i)
TQPoint p;
if (i)
- p = viewport()->mapToGlobal(tqitemRect(i).center());
+ p = viewport()->mapToGlobal(itemRect(i).center());
else
p = mapToGlobal(rect().center());
@@ -1940,7 +1940,7 @@ void KListView::viewportPaintEvent(TQPaintEvent *e)
TQPainter painter(viewport());
// This is where we actually draw the drop-highlighter
- tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, &painter, d->mOldDropHighlighter, tqcolorGroup(),
+ tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, &painter, d->mOldDropHighlighter, colorGroup(),
TQStyle::Style_FocusAtBorder);
}
d->painting = false;
@@ -2231,7 +2231,7 @@ const TQColor &KListViewItem::backgroundColor()
{
if (isAlternate())
return static_cast< KListView* >(listView())->alternateBackground();
- return listView()->viewport()->tqcolorGroup().base();
+ return listView()->viewport()->colorGroup().base();
}
TQColor KListViewItem::backgroundColor(int column)
@@ -2239,7 +2239,7 @@ TQColor KListViewItem::backgroundColor(int column)
KListView* view = static_cast< KListView* >(listView());
TQColor color = isAlternate() ?
view->alternateBackground() :
- view->viewport()->tqcolorGroup().base();
+ view->viewport()->colorGroup().base();
// calculate a different color if the current column is sorted (only if more than 1 column)
if ( (view->columns() > 1) && view->shadeSortColumn() && (column == view->columnSorted()) )
diff --git a/tdeui/klistview.h b/tdeui/klistview.h
index 07b514457..4795299ed 100644
--- a/tdeui/klistview.h
+++ b/tdeui/klistview.h
@@ -685,7 +685,7 @@ protected:
*/
inline bool below (TQListViewItem* i, const TQPoint& p)
{
- return below (tqitemRect(i), contentsToViewport(p));
+ return below (itemRect(i), contentsToViewport(p));
}
/**
diff --git a/tdeui/klistviewsearchline.cpp b/tdeui/klistviewsearchline.cpp
index fb02a8259..7f96ed94d 100644
--- a/tdeui/klistviewsearchline.cpp
+++ b/tdeui/klistviewsearchline.cpp
@@ -145,7 +145,7 @@ void KListViewSearchLine::updateSearch(const TQString &s)
it.current() && !currentItem;
++it)
{
- if(d->listView->tqitemRect(it.current()).isValid())
+ if(d->listView->itemRect(it.current()).isValid())
currentItem = it.current();
}
}
@@ -302,7 +302,7 @@ void KListViewSearchLine::activateSearch()
void KListViewSearchLine::itemAdded(TQListViewItem *item) const
{
- item->tqsetVisible(itemMatches(item, text()));
+ item->setVisible(itemMatches(item, text()));
}
void KListViewSearchLine::listViewDeleted()
@@ -347,9 +347,9 @@ void KListViewSearchLine::checkItemParentsNotVisible()
{
TQListViewItem *item = it.current();
if(itemMatches(item, d->search))
- item->tqsetVisible(true);
+ item->setVisible(true);
else
- item->tqsetVisible(false);
+ item->setVisible(false);
}
}
@@ -381,23 +381,23 @@ bool KListViewSearchLine::checkItemParentsVisible(TQListViewItem *item, TQListVi
visible = true;
if (highestHiddenParent)
{
- highestHiddenParent->tqsetVisible(true);
- // Calling tqsetVisible on our ancestor will unhide all its descendents. Hide the ones
+ highestHiddenParent->setVisible(true);
+ // Calling setVisible on our ancestor will unhide all its descendents. Hide the ones
// before us that should not be shown.
for(TQListViewItem *hide = first; hide != item; hide = hide->nextSibling())
- hide->tqsetVisible(false);
+ hide->setVisible(false);
highestHiddenParent = 0;
- // If we matched, than none of our children matched, yet the tqsetVisible() call on our
+ // If we matched, than none of our children matched, yet the setVisible() call on our
// ancestor unhid them, undo the damage:
if(!childMatch)
for(TQListViewItem *hide = item->firstChild(); hide; hide = hide->nextSibling())
- hide->tqsetVisible(false);
+ hide->setVisible(false);
}
else
- item->tqsetVisible(true);
+ item->setVisible(true);
}
else
- item->tqsetVisible(false);
+ item->setVisible(false);
}
return visible;
}
diff --git a/tdeui/kmainwindow.cpp b/tdeui/kmainwindow.cpp
index e7d5469dc..17df3855e 100644
--- a/tdeui/kmainwindow.cpp
+++ b/tdeui/kmainwindow.cpp
@@ -105,8 +105,8 @@ public:
n++;
it.current()->savePropertiesInternal(config, n);
}
- config->setGroup(TQString::tqfromLatin1("Number"));
- config->writeEntry(TQString::tqfromLatin1("NumberOfWindows"), n );
+ config->setGroup(TQString::fromLatin1("Number"));
+ config->writeEntry(TQString::fromLatin1("NumberOfWindows"), n );
return true;
}
@@ -212,7 +212,7 @@ void KMainWindow::initKMainWindow(const char *name, int cflags)
unusedNumber = 0; // add numbers only when needed
}
for(;;) {
- TQWidgetList* list = kapp->tqtopLevelWidgets();
+ TQWidgetList* list = kapp->topLevelWidgets();
TQWidgetListIt it( *list );
bool found = false;
for( TQWidget* w = it.current();
@@ -286,8 +286,8 @@ void KMainWindow::parseGeometry(bool parsewidth)
int w, h;
int m = XParseGeometry( kapp->geometryArgument().latin1(), &x, &y, (unsigned int*)&w, (unsigned int*)&h);
if (parsewidth) {
- TQSize minSize = tqminimumSize();
- TQSize maxSize = tqmaximumSize();
+ TQSize minSize = minimumSize();
+ TQSize maxSize = maximumSize();
if ( !(m & WidthValue) )
w = width();
if ( !(m & HeightValue) )
@@ -356,8 +356,8 @@ bool KMainWindow::canBeRestored( int number )
KConfig *config = kapp->sessionConfig();
if ( !config )
return false;
- config->setGroup( TQString::tqfromLatin1("Number") );
- int n = config->readNumEntry( TQString::tqfromLatin1("NumberOfWindows") , 1 );
+ config->setGroup( TQString::fromLatin1("Number") );
+ int n = config->readNumEntry( TQString::fromLatin1("NumberOfWindows") , 1 );
return number >= 1 && number <= n;
}
@@ -370,12 +370,12 @@ const TQString KMainWindow::classNameOfToplevel( int number )
return TQString::null;
TQString s;
s.setNum( number );
- s.prepend( TQString::tqfromLatin1("WindowProperties") );
+ s.prepend( TQString::fromLatin1("WindowProperties") );
config->setGroup( s );
- if ( !config->hasKey( TQString::tqfromLatin1("ClassName") ) )
+ if ( !config->hasKey( TQString::fromLatin1("ClassName") ) )
return TQString::null;
else
- return config->readEntry( TQString::tqfromLatin1("ClassName") );
+ return config->readEntry( TQString::fromLatin1("ClassName") );
}
void KMainWindow::show()
@@ -491,7 +491,7 @@ void KMainWindow::setupGUI( TQSize defaultSize, int options, const TQString & xm
void KMainWindow::createGUI( const TQString &xmlfile, bool _conserveMemory )
{
// disabling the updates prevents unnecessary redraws
- tqsetUpdatesEnabled( false );
+ setUpdatesEnabled( false );
// just in case we are rebuilding, let's remove our old client
guiFactory()->removeClient( this );
@@ -564,7 +564,7 @@ void KMainWindow::createGUI( const TQString &xmlfile, bool _conserveMemory )
conserveMemory();
}
- tqsetUpdatesEnabled( true );
+ setUpdatesEnabled( true );
updateGeometry();
}
@@ -696,13 +696,13 @@ void KMainWindow::savePropertiesInternal( KConfig *config, int number )
TQString s;
s.setNum(number);
- s.prepend(TQString::tqfromLatin1("WindowProperties"));
+ s.prepend(TQString::fromLatin1("WindowProperties"));
config->setGroup(s);
// store objectName, className, Width and Height for later restoring
// (Only useful for session management)
- config->writeEntry(TQString::tqfromLatin1("ObjectName"), name());
- config->writeEntry(TQString::tqfromLatin1("ClassName"), className());
+ config->writeEntry(TQString::fromLatin1("ObjectName"), name());
+ config->writeEntry(TQString::fromLatin1("ClassName"), className());
saveMainWindowSettings(config); // Menubar, statusbar and Toolbar settings.
@@ -738,7 +738,7 @@ void KMainWindow::saveMainWindowSettings(KConfig *config, const TQString &config
TQMenuBar* mb = internalMenuBar();
if (mb) {
- TQString MenuBar = TQString::tqfromLatin1("MenuBar");
+ TQString MenuBar = TQString::fromLatin1("MenuBar");
if(!config->hasDefault("MenuBar") && !mb->isHidden() )
config->revertToDefault("MenuBar");
else
@@ -810,13 +810,13 @@ bool KMainWindow::readPropertiesInternal( KConfig *config, int number )
// in order they are in toolbar list
TQString s;
s.setNum(number);
- s.prepend(TQString::tqfromLatin1("WindowProperties"));
+ s.prepend(TQString::fromLatin1("WindowProperties"));
config->setGroup(s);
// restore the object name (window role)
- if ( config->hasKey(TQString::tqfromLatin1("ObjectName" )) )
- setName( config->readEntry(TQString::tqfromLatin1("ObjectName")).latin1()); // latin1 is right here
+ if ( config->hasKey(TQString::fromLatin1("ObjectName" )) )
+ setName( config->readEntry(TQString::fromLatin1("ObjectName")).latin1()); // latin1 is right here
applyMainWindowSettings(config); // Menubar, statusbar and toolbar settings.
@@ -918,8 +918,8 @@ void KMainWindow::saveWindowSize( KConfig * config ) const
#endif
TQRect size( desk.width(), w, desk.height(), h );
bool defaultSize = (size == d->defaultWindowSize);
- TQString widthString = TQString::tqfromLatin1("Width %1").arg(desk.width());
- TQString heightString = TQString::tqfromLatin1("Height %1").arg(desk.height());
+ TQString widthString = TQString::fromLatin1("Width %1").arg(desk.width());
+ TQString heightString = TQString::fromLatin1("Height %1").arg(desk.height());
if (!config->hasDefault(widthString) && defaultSize)
config->revertToDefault(widthString);
else
@@ -941,16 +941,16 @@ void KMainWindow::restoreWindowSize( KConfig * config )
TQRect desk = TQApplication::desktop()->screenGeometry(scnum);
if ( d->defaultWindowSize.isNull() ) // only once
d->defaultWindowSize = TQRect(desk.width(), width(), desk.height(), height()); // store default values
- TQSize size( config->readNumEntry( TQString::tqfromLatin1("Width %1").arg(desk.width()), 0 ),
- config->readNumEntry( TQString::tqfromLatin1("Height %1").arg(desk.height()), 0 ) );
+ TQSize size( config->readNumEntry( TQString::fromLatin1("Width %1").arg(desk.width()), 0 ),
+ config->readNumEntry( TQString::fromLatin1("Height %1").arg(desk.height()), 0 ) );
if (size.isEmpty()) {
// try the KDE 2.0 way
- size = TQSize( config->readNumEntry( TQString::tqfromLatin1("Width"), 0 ),
- config->readNumEntry( TQString::tqfromLatin1("Height"), 0 ) );
+ size = TQSize( config->readNumEntry( TQString::fromLatin1("Width"), 0 ),
+ config->readNumEntry( TQString::fromLatin1("Height"), 0 ) );
if (!size.isEmpty()) {
// make sure the other resolutions don't get old settings
- config->writeEntry( TQString::tqfromLatin1("Width"), 0 );
- config->writeEntry( TQString::tqfromLatin1("Height"), 0 );
+ config->writeEntry( TQString::fromLatin1("Width"), 0 );
+ config->writeEntry( TQString::fromLatin1("Height"), 0 );
}
}
if ( !size.isEmpty() ) {
@@ -1197,7 +1197,7 @@ TQSize KMainWindow::sizeForCentralWidgetSize(TQSize size)
break;
case KToolBar::Flat:
- size += TQSize(0, 3+kapp->tqstyle().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent ));
+ size += TQSize(0, 3+kapp->tqstyle().pixelMetric( TQStyle::PM_DockWindowHandleExtent ));
break;
default:
@@ -1207,7 +1207,7 @@ TQSize KMainWindow::sizeForCentralWidgetSize(TQSize size)
KMenuBar *mb = internalMenuBar();
if (mb && !mb->isHidden()) {
size += TQSize(0,mb->heightForWidth(size.width()));
- if (tqstyle().tqstyleHint(TQStyle::SH_MainWindow_SpaceBelowMenuBar, this))
+ if (tqstyle().styleHint(TQStyle::SH_MainWindow_SpaceBelowMenuBar, this))
size += TQSize( 0, dockWindowsMovable() ? 1 : 2);
}
TQStatusBar *sb = internalStatusBar();
diff --git a/tdeui/kmainwindow.h b/tdeui/kmainwindow.h
index 8fb99fb2e..8aba596f1 100644
--- a/tdeui/kmainwindow.h
+++ b/tdeui/kmainwindow.h
@@ -455,7 +455,7 @@ public:
* "virtual TQSize sizeHint() const;" to specify a default size rather
* than letting TQWidget::adjust use the default size of 0x0.
*/
- void setAutoSaveSettings( const TQString & groupName = TQString::tqfromLatin1("MainWindow"),
+ void setAutoSaveSettings( const TQString & groupName = TQString::fromLatin1("MainWindow"),
bool saveWindowSize = true );
/**
@@ -1036,7 +1036,7 @@ template <typename T>
inline void kRestoreMainWindows() {
for ( int n = 1 ; KMainWindow::canBeRestored( n ) ; ++n ) {
const TQString className = KMainWindow::classNameOfToplevel( n );
- if ( className == TQString::tqfromLatin1( T::staticMetaObject()->className() ) )
+ if ( className == TQString::fromLatin1( T::staticMetaObject()->className() ) )
(new T)->restore( n );
}
}
@@ -1048,9 +1048,9 @@ inline void kRestoreMainWindows() {
classNames[1] = T1::staticMetaObject()->className();
for ( int n = 1 ; KMainWindow::canBeRestored( n ) ; ++n ) {
const TQString className = KMainWindow::classNameOfToplevel( n );
- if ( className == TQString::tqfromLatin1( classNames[0] ) )
+ if ( className == TQString::fromLatin1( classNames[0] ) )
(new T0)->restore( n );
- else if ( className == TQString::tqfromLatin1( classNames[1] ) )
+ else if ( className == TQString::fromLatin1( classNames[1] ) )
(new T1)->restore( n );
}
}
@@ -1063,11 +1063,11 @@ inline void kRestoreMainWindows() {
classNames[2] = T2::staticMetaObject()->className();
for ( int n = 1 ; KMainWindow::canBeRestored( n ) ; ++n ) {
const TQString className = KMainWindow::classNameOfToplevel( n );
- if ( className == TQString::tqfromLatin1( classNames[0] ) )
+ if ( className == TQString::fromLatin1( classNames[0] ) )
(new T0)->restore( n );
- else if ( className == TQString::tqfromLatin1( classNames[1] ) )
+ else if ( className == TQString::fromLatin1( classNames[1] ) )
(new T1)->restore( n );
- else if ( className == TQString::tqfromLatin1( classNames[2] ) )
+ else if ( className == TQString::fromLatin1( classNames[2] ) )
(new T2)->restore( n );
}
}
diff --git a/tdeui/kmenubar.cpp b/tdeui/kmenubar.cpp
index b8f0f3326..2e98f85cc 100644
--- a/tdeui/kmenubar.cpp
+++ b/tdeui/kmenubar.cpp
@@ -168,7 +168,7 @@ void KMenuBar::setTopLevelMenuInternal(bool top_level)
d->wasTopLevel = top_level;
if( parentWidget()
- && parentWidget()->tqtopLevelWidget()->isFullScreen())
+ && parentWidget()->topLevelWidget()->isFullScreen())
top_level = false;
if ( isTopLevelMenu() == top_level )
@@ -193,7 +193,7 @@ void KMenuBar::setTopLevelMenuInternal(bool top_level)
#ifdef Q_WS_X11
KWin::setType( winId(), NET::TopMenu );
if( parentWidget())
- XSetTransientForHint( qt_xdisplay(), winId(), parentWidget()->tqtopLevelWidget()->winId());
+ XSetTransientForHint( qt_xdisplay(), winId(), parentWidget()->topLevelWidget()->winId());
#endif
TQMenuBar::setFrameStyle( NoFrame );
TQMenuBar::setLineWidth( 0 );
@@ -244,13 +244,13 @@ bool KMenuBar::eventFilter(TQObject *obj, TQEvent *ev)
{
if ( d->topLevel )
{
- if ( parentWidget() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(parentWidget()->tqtopLevelWidget()) )
+ if ( parentWidget() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(parentWidget()->topLevelWidget()) )
{
if( ev->type() == TQEvent::Resize )
return false; // ignore resizing of parent, TQMenuBar would try to adjust size
if ( ev->type() == TQEvent::Accel || ev->type() == TQEvent::AccelAvailable )
{
- if ( TQApplication::sendEvent( tqtopLevelWidget(), ev ) )
+ if ( TQApplication::sendEvent( topLevelWidget(), ev ) )
return true;
}
if(ev->type() == TQEvent::ShowFullScreen )
@@ -260,7 +260,7 @@ bool KMenuBar::eventFilter(TQObject *obj, TQEvent *ev)
if( parentWidget() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(parentWidget()) && ev->type() == TQEvent::Reparent )
{
#ifdef Q_WS_X11
- XSetTransientForHint( qt_xdisplay(), winId(), parentWidget()->tqtopLevelWidget()->winId());
+ XSetTransientForHint( qt_xdisplay(), winId(), parentWidget()->topLevelWidget()->winId());
#else
//TODO: WIN32?
#endif
@@ -271,7 +271,7 @@ bool KMenuBar::eventFilter(TQObject *obj, TQEvent *ev)
if( ev->type() == TQEvent::Show )
{
#ifdef Q_WS_X11
- XSetTransientForHint( qt_xdisplay(), winId(), parentWidget()->tqtopLevelWidget()->winId());
+ XSetTransientForHint( qt_xdisplay(), winId(), parentWidget()->topLevelWidget()->winId());
#else
//TODO: WIN32?
#endif
@@ -283,10 +283,10 @@ bool KMenuBar::eventFilter(TQObject *obj, TQEvent *ev)
}
else
{
- if( parentWidget() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(parentWidget()->tqtopLevelWidget()))
+ if( parentWidget() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(parentWidget()->topLevelWidget()))
{
if( ev->type() == TQEvent::WindowStateChange
- && !parentWidget()->tqtopLevelWidget()->isFullScreen() )
+ && !parentWidget()->topLevelWidget()->isFullScreen() )
setTopLevelMenuInternal( d->wasTopLevel );
}
}
@@ -506,14 +506,14 @@ void KMenuBar::drawContents( TQPainter* p )
BackgroundMode bg_mode = backgroundMode();
BackgroundOrigin bg_origin = backgroundOrigin();
- tqsetUpdatesEnabled(false);
+ setUpdatesEnabled(false);
setBackgroundMode(X11ParentRelative);
setBackgroundOrigin(WindowOrigin);
p->eraseRect( rect() );
erase();
- TQColorGroup g = tqcolorGroup();
+ TQColorGroup g = colorGroup();
bool e;
for ( int i=0; i<(int)count(); i++ )
@@ -522,7 +522,7 @@ void KMenuBar::drawContents( TQPainter* p )
if ( !mi->text().isNull() || mi->pixmap() )
{
- TQRect r = tqitemRect(i);
+ TQRect r = itemRect(i);
if(r.isEmpty() || !mi->isVisible())
continue;
@@ -548,7 +548,7 @@ void KMenuBar::drawContents( TQPainter* p )
flags |= TQStyle::Style_Down;
flags |= TQStyle::Style_HasFocus;
- tqstyle().tqdrawControl(TQStyle::CE_MenuBarItem, p, this,
+ tqstyle().drawControl(TQStyle::CE_MenuBarItem, p, this,
r, g, flags, TQStyleOption(mi));
}
else
@@ -561,7 +561,7 @@ void KMenuBar::drawContents( TQPainter* p )
setBackgroundOrigin(bg_origin);
setBackgroundMode(bg_mode);
- tqsetUpdatesEnabled(up_enabled);
+ setUpdatesEnabled(up_enabled);
}
}
diff --git a/tdeui/kmessagebox.cpp b/tdeui/kmessagebox.cpp
index 43284076c..8ffdc0e6d 100644
--- a/tdeui/kmessagebox.cpp
+++ b/tdeui/kmessagebox.cpp
@@ -288,7 +288,7 @@ int KMessageBox::createKMessageBox(KDialogBase *dialog, TQPixmap icon,
btn->setFocus();
if ( (options & KMessageBox::Notify) )
- sendNotification( text, strlist, notifyType, dialog->tqtopLevelWidget()->winId());
+ sendNotification( text, strlist, notifyType, dialog->topLevelWidget()->winId());
if (KMessageBox_queue)
{
@@ -342,7 +342,7 @@ KMessageBox::shouldBeShownYesNo(const TQString &dontShowAgainName,
ButtonCode &result)
{
if ( dontShowAgainName.isEmpty() ) return true;
- TQString grpNotifMsgs = TQString::tqfromLatin1("Notification Messages");
+ TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages");
KConfig *config = againConfig ? againConfig : KGlobal::config();
KConfigGroupSaver saver( config, grpNotifMsgs );
TQString dontAsk = config->readEntry(dontShowAgainName).lower();
@@ -361,7 +361,7 @@ bool
KMessageBox::shouldBeShownContinue(const TQString &dontShowAgainName)
{
if ( dontShowAgainName.isEmpty() ) return true;
- TQString grpNotifMsgs = TQString::tqfromLatin1("Notification Messages");
+ TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages");
KConfig *config = againConfig ? againConfig : KGlobal::config();
KConfigGroupSaver saver( config, grpNotifMsgs );
return config->readBoolEntry(dontShowAgainName, true);
@@ -372,7 +372,7 @@ KMessageBox::saveDontShowAgainYesNo(const TQString &dontShowAgainName,
ButtonCode result)
{
if ( dontShowAgainName.isEmpty() ) return;
- TQString grpNotifMsgs = TQString::tqfromLatin1("Notification Messages");
+ TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages");
KConfig *config = againConfig ? againConfig : KGlobal::config();
KConfigGroupSaver saver( config, grpNotifMsgs );
config->writeEntry( dontShowAgainName, result==Yes ? "yes" : "no", true, (dontShowAgainName[0] == ':'));
@@ -383,7 +383,7 @@ void
KMessageBox::saveDontShowAgainContinue(const TQString &dontShowAgainName)
{
if ( dontShowAgainName.isEmpty() ) return;
- TQString grpNotifMsgs = TQString::tqfromLatin1("Notification Messages");
+ TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages");
KConfig *config = againConfig ? againConfig : KGlobal::config();
KConfigGroupSaver saver( config, grpNotifMsgs );
config->writeEntry( dontShowAgainName, false, true, (dontShowAgainName[0] == ':'));
@@ -936,7 +936,7 @@ void
KMessageBox::enableAllMessages()
{
KConfig *config = againConfig ? againConfig : KGlobal::config();
- TQString grpNotifMsgs = TQString::tqfromLatin1("Notification Messages");
+ TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages");
if (!config->hasGroup(grpNotifMsgs))
return;
@@ -956,7 +956,7 @@ void
KMessageBox::enableMessage(const TQString &dontShowAgainName)
{
KConfig *config = againConfig ? againConfig : KGlobal::config();
- TQString grpNotifMsgs = TQString::tqfromLatin1("Notification Messages");
+ TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages");
if (!config->hasGroup(grpNotifMsgs))
return;
diff --git a/tdeui/knumvalidator.cpp b/tdeui/knumvalidator.cpp
index 5ab97e840..fdc51022c 100644
--- a/tdeui/knumvalidator.cpp
+++ b/tdeui/knumvalidator.cpp
@@ -67,7 +67,7 @@ TQValidator::State KIntValidator::validate ( TQString &str, int & ) const
if (_base > 10)
newStr = newStr.upper();
- if (newStr == TQString::tqfromLatin1("-")) // a special case
+ if (newStr == TQString::fromLatin1("-")) // a special case
if ((_min || _max) && _min >= 0)
ok = false;
else
@@ -209,12 +209,12 @@ TQValidator::State KFloatValidator::validate ( TQString &str, int & ) const
TQString newStr;
newStr = str.stripWhiteSpace();
- if (newStr == TQString::tqfromLatin1("-")) // a special case
+ if (newStr == TQString::fromLatin1("-")) // a special case
if ((_min || _max) && _min >= 0)
ok = false;
else
return TQValidator::Acceptable;
- else if (newStr == TQString::tqfromLatin1(".") || (d->acceptLocalizedNumbers && newStr==KGlobal::locale()->decimalSymbol())) // another special case
+ else if (newStr == TQString::fromLatin1(".") || (d->acceptLocalizedNumbers && newStr==KGlobal::locale()->decimalSymbol())) // another special case
return TQValidator::Acceptable;
else if (newStr.length())
{
diff --git a/tdeui/kpassdlg.cpp b/tdeui/kpassdlg.cpp
index 8d024ac32..cdd238706 100644
--- a/tdeui/kpassdlg.cpp
+++ b/tdeui/kpassdlg.cpp
@@ -187,9 +187,9 @@ void KPasswordEdit::erase()
void KPasswordEdit::focusInEvent(TQFocusEvent *e)
{
const TQString txt = text();
- tqsetUpdatesEnabled(false);
+ setUpdatesEnabled(false);
TQLineEdit::focusInEvent(e);
- tqsetUpdatesEnabled(true);
+ setUpdatesEnabled(true);
setText(txt);
}
diff --git a/tdeui/kpopupmenu.cpp b/tdeui/kpopupmenu.cpp
index 7ca5ea21f..d0ebf25f3 100644
--- a/tdeui/kpopupmenu.cpp
+++ b/tdeui/kpopupmenu.cpp
@@ -117,7 +117,7 @@ void KPopupTitle::paintEvent(TQPaintEvent *)
TQSize KPopupTitle::sizeHint() const
{
- return tqminimumSize();
+ return minimumSize();
}
class KPopupMenu::KPopupMenuPrivate
diff --git a/tdeui/kprogress.cpp b/tdeui/kprogress.cpp
index 34bc211d4..9b72dcf2c 100644
--- a/tdeui/kprogress.cpp
+++ b/tdeui/kprogress.cpp
@@ -132,9 +132,9 @@ bool KProgress::setIndicator(TQString &indicator, int progress, int totalSteps)
if (!totalSteps)
return false;
TQString newString(mFormat);
- newString.replace(TQString::tqfromLatin1("%v"),
+ newString.replace(TQString::fromLatin1("%v"),
TQString::number(progress));
- newString.replace(TQString::tqfromLatin1("%m"),
+ newString.replace(TQString::fromLatin1("%m"),
TQString::number(totalSteps));
if (totalSteps > INT_MAX / 1000) {
@@ -142,7 +142,7 @@ bool KProgress::setIndicator(TQString &indicator, int progress, int totalSteps)
totalSteps /= 1000;
}
- newString.replace(TQString::tqfromLatin1("%p"),
+ newString.replace(TQString::fromLatin1("%p"),
TQString::number((progress * 100) / totalSteps));
if (newString != indicator)
diff --git a/tdeui/krootpixmap.cpp b/tdeui/krootpixmap.cpp
index b87e887d7..8bcd7827b 100644
--- a/tdeui/krootpixmap.cpp
+++ b/tdeui/krootpixmap.cpp
@@ -77,7 +77,7 @@ void KRootPixmap::init()
connect(d->twin, TQT_SIGNAL(currentDesktopChanged(int)), TQT_SLOT(desktopChanged(int)));
#endif
- d->toplevel = m_pWidget->tqtopLevelWidget();
+ d->toplevel = m_pWidget->topLevelWidget();
d->toplevel->installEventFilter(this);
m_pWidget->installEventFilter(this);
}
@@ -170,7 +170,7 @@ bool KRootPixmap::eventFilter(TQObject *, TQEvent *event)
case TQEvent::Reparent:
d->toplevel->removeEventFilter(this);
- d->toplevel = m_pWidget->tqtopLevelWidget();
+ d->toplevel = m_pWidget->topLevelWidget();
d->toplevel->installEventFilter(this);
break;
@@ -188,7 +188,7 @@ void KRootPixmap::desktopChanged(int desktop)
return;
#ifdef Q_WS_X11
- if (KWin::windowInfo(m_pWidget->tqtopLevelWidget()->winId()).desktop() == NET::OnAllDesktops &&
+ if (KWin::windowInfo(m_pWidget->topLevelWidget()->winId()).desktop() == NET::OnAllDesktops &&
pixmapName(m_Desk) != pixmapName(desktop))
#endif
tqrepaint(true);
@@ -198,7 +198,7 @@ void KRootPixmap::desktopChanged( WId window, unsigned int properties )
{
#ifdef Q_WS_X11
if( !(properties & NET::WMDesktop) ||
- (window != m_pWidget->tqtopLevelWidget()->winId()))
+ (window != m_pWidget->topLevelWidget()->winId()))
return;
#endif
@@ -233,7 +233,7 @@ void KRootPixmap::tqrepaint(bool force)
}
m_Rect = TQRect(p1, p2);
#ifdef Q_WS_X11
- m_Desk = KWin::windowInfo(m_pWidget->tqtopLevelWidget()->winId()).desktop();
+ m_Desk = KWin::windowInfo(m_pWidget->topLevelWidget()->winId()).desktop();
if (m_Desk == NET::OnAllDesktops)
m_Desk = currentDesktop();
diff --git a/tdeui/kruler.cpp b/tdeui/kruler.cpp
index 56d3703d8..e9651424b 100644
--- a/tdeui/kruler.cpp
+++ b/tdeui/kruler.cpp
@@ -432,19 +432,19 @@ KRuler::setRulerMetricStyle(KRuler::MetricStyle style)
}
switch (style) {
case Pixel:
- setEndLabel(TQString::tqfromLatin1("pixel"));
+ setEndLabel(TQString::fromLatin1("pixel"));
break;
case Inch:
- setEndLabel(TQString::tqfromLatin1("inch"));
+ setEndLabel(TQString::fromLatin1("inch"));
break;
case Millimetres:
- setEndLabel(TQString::tqfromLatin1("mm"));
+ setEndLabel(TQString::fromLatin1("mm"));
break;
case Centimetres:
- setEndLabel(TQString::tqfromLatin1("cm"));
+ setEndLabel(TQString::fromLatin1("cm"));
break;
case Metres:
- setEndLabel(TQString::tqfromLatin1("m"));
+ setEndLabel(TQString::fromLatin1("m"));
default: /* never reached, see above switch */
/* empty command */;
}
diff --git a/tdeui/ksconfig.cpp b/tdeui/ksconfig.cpp
index aa2b62d49..5ca0c2b85 100644
--- a/tdeui/ksconfig.cpp
+++ b/tdeui/ksconfig.cpp
@@ -363,8 +363,8 @@ KSpellConfig::interpret( TQString &fname, TQString &lname,
}
//We have explicitly chosen English as the default here.
- if ( ( KGlobal::locale()->language() == TQString::tqfromLatin1("C") &&
- lname==TQString::tqfromLatin1("en") ) ||
+ if ( ( KGlobal::locale()->language() == TQString::fromLatin1("C") &&
+ lname==TQString::fromLatin1("en") ) ||
KGlobal::locale()->language() == lname )
return true;
diff --git a/tdeui/kselect.cpp b/tdeui/kselect.cpp
index 8801f5570..367ebdb1b 100644
--- a/tdeui/kselect.cpp
+++ b/tdeui/kselect.cpp
@@ -53,7 +53,7 @@ KXYSelector::~KXYSelector()
void KXYSelector::setRange( int _minX, int _minY, int _maxX, int _maxY )
{
- int w = tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth);
+ int w = tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth);
px = w;
py = w;
minX = _minX;
@@ -74,7 +74,7 @@ void KXYSelector::setYValue( int _yPos )
void KXYSelector::setValues( int _xPos, int _yPos )
{
- int w = tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth);
+ int w = tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth);
if (w < 5) w = 5;
xPos = _xPos;
@@ -98,7 +98,7 @@ void KXYSelector::setValues( int _xPos, int _yPos )
TQRect KXYSelector::contentsRect() const
{
- int w = tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth);
+ int w = tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth);
if (w < 5) {
w = 5;
}
@@ -113,7 +113,7 @@ void KXYSelector::paintEvent( TQPaintEvent *ev )
TQRect paintRect = ev->rect();
TQRect borderRect = rect();
- int w = tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth);
+ int w = tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth);
if (w < 5) {
w = 5 - w;
}
@@ -123,7 +123,7 @@ void KXYSelector::paintEvent( TQPaintEvent *ev )
painter.begin( this );
tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, &painter,
- borderRect, tqcolorGroup(),
+ borderRect, colorGroup(),
TQStyle::Style_Sunken);
drawContents( &painter );
@@ -150,7 +150,7 @@ void KXYSelector::mouseMoveEvent( TQMouseEvent *e )
{
int xVal, yVal;
- int w = tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth);
+ int w = tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth);
valuesFromPosition( e->pos().x() - w, e->pos().y() - w, xVal, yVal );
setValues( xVal, yVal );
@@ -170,7 +170,7 @@ void KXYSelector::wheelEvent( TQWheelEvent *e )
void KXYSelector::valuesFromPosition( int x, int y, int &xVal, int &yVal ) const
{
- int w = tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth);
+ int w = tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth);
if (w < 5) w = 5;
xVal = ( (maxX-minX) * (x-w) ) / ( width()-2*w );
yVal = maxY - ( ( (maxY-minY) * (y-w) ) / ( height()-2*w ) );
@@ -188,7 +188,7 @@ void KXYSelector::valuesFromPosition( int x, int y, int &xVal, int &yVal ) const
void KXYSelector::setPosition( int xp, int yp )
{
- int w = tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth);
+ int w = tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth);
if (w < 5) w = 5;
if ( xp < w )
xp = w;
@@ -256,7 +256,7 @@ KSelector::~KSelector()
TQRect KSelector::contentsRect() const
{
- int w = tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth);
+ int w = tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth);
int iw = (w < 5) ? 5 : w;
if ( orientation() == Qt::Vertical )
return TQRect( w, iw, width() - w * 2 - 5, height() - 2 * iw );
@@ -267,7 +267,7 @@ TQRect KSelector::contentsRect() const
void KSelector::paintEvent( TQPaintEvent * )
{
TQPainter painter;
- int w = tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth);
+ int w = tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth);
int iw = (w < 5) ? 5 : w;
painter.begin( this );
@@ -282,7 +282,7 @@ void KSelector::paintEvent( TQPaintEvent * )
else
r.addCoords(iw - w, 0, w - iw, -iw);
tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, &painter,
- r, tqcolorGroup(),
+ r, colorGroup(),
TQStyle::Style_Sunken);
}
@@ -329,7 +329,7 @@ void KSelector::valueChange()
void KSelector::moveArrow( const TQPoint &pos )
{
int val;
- int w = tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth);
+ int w = tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth);
int iw = (w < 5) ? 5 : w;
if ( orientation() == Qt::Vertical )
@@ -346,7 +346,7 @@ TQPoint KSelector::calcArrowPos( int val )
{
TQPoint p;
- int w = tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth);
+ int w = tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth);
int iw = (w < 5) ? 5 : w;
if ( orientation() == Qt::Vertical )
{
@@ -374,7 +374,7 @@ void KSelector::drawArrow( TQPainter *painter, bool show, const TQPoint &pos )
TQPointArray array(3);
painter->setPen( TQPen() );
- painter->setBrush( TQBrush( tqcolorGroup().buttonText() ) );
+ painter->setBrush( TQBrush( colorGroup().buttonText() ) );
array.setPoint( 0, pos.x()+0, pos.y()+0 );
array.setPoint( 1, pos.x()+5, pos.y()+5 );
if ( orientation() == Qt::Vertical )
diff --git a/tdeui/kselect.h b/tdeui/kselect.h
index cc011dcfe..58efab293 100644
--- a/tdeui/kselect.h
+++ b/tdeui/kselect.h
@@ -351,7 +351,7 @@ public:
protected:
virtual void drawContents( TQPainter * );
- virtual TQSize tqminimumSize() const
+ virtual TQSize minimumSize() const
{ return sizeHint(); }
private:
diff --git a/tdeui/kseparator.cpp b/tdeui/kseparator.cpp
index 07d143266..2f3a1cde8 100644
--- a/tdeui/kseparator.cpp
+++ b/tdeui/kseparator.cpp
@@ -83,7 +83,7 @@ void KSeparator::drawFrame(TQPainter *p)
{
TQPoint p1, p2;
TQRect r = frameRect();
- const TQColorGroup & g = tqcolorGroup();
+ const TQColorGroup & g = colorGroup();
if ( frameStyle() & HLine ) {
p1 = TQPoint( r.x(), r.height()/2 );
diff --git a/tdeui/kshortcutdialog.cpp b/tdeui/kshortcutdialog.cpp
index fbdd46519..27d721626 100644
--- a/tdeui/kshortcutdialog.cpp
+++ b/tdeui/kshortcutdialog.cpp
@@ -169,8 +169,8 @@ void KShortcutDialog::updateShortcutDisplay()
this->setFocus();
}
- s[0].replace('&', TQString::tqfromLatin1("&&"));
- s[1].replace('&', TQString::tqfromLatin1("&&"));
+ s[0].replace('&', TQString::fromLatin1("&&"));
+ s[1].replace('&', TQString::fromLatin1("&&"));
m_simple->m_txtShortcut->setText( s[0] );
m_adv->m_txtPrimary->setText( s[0] );
diff --git a/tdeui/kspell.cpp b/tdeui/kspell.cpp
index 9ca882962..aa65dc484 100644
--- a/tdeui/kspell.cpp
+++ b/tdeui/kspell.cpp
@@ -1220,10 +1220,10 @@ void KSpell::dialog( const TQString & word, TQStringList & sugg, const char *_sl
TQString marker( "_MARKER_" );
tmpBuf.replace( lastpos, word.length(), marker );
TQString context = tmpBuf.mid(QMAX(lastpos-18,0), 2*18+marker.length());
- context.replace( '\n',TQString::tqfromLatin1(" "));
- context.replace( '<', TQString::tqfromLatin1("&lt;") );
- context.replace( '>', TQString::tqfromLatin1("&gt;") );
- context.replace( marker, TQString::tqfromLatin1("<b>%1</b>").arg( word ) );
+ context.replace( '\n',TQString::fromLatin1(" "));
+ context.replace( '<', TQString::fromLatin1("&lt;") );
+ context.replace( '>', TQString::fromLatin1("&gt;") );
+ context.replace( marker, TQString::fromLatin1("<b>%1</b>").arg( word ) );
context = "<qt>" + context + "</qt>";
ksdlg->init( word, &sugg, context );
diff --git a/tdeui/kstatusbar.cpp b/tdeui/kstatusbar.cpp
index 696f1294c..b70c8ae9c 100644
--- a/tdeui/kstatusbar.cpp
+++ b/tdeui/kstatusbar.cpp
@@ -65,8 +65,8 @@ KStatusBar::KStatusBar( TQWidget *parent, const char *name )
// ...but off by default (sven)
KConfig *config = KGlobal::config();
TQString group(config->group());
- config->setGroup(TQString::tqfromLatin1("StatusBar style"));
- bool grip_enabled = config->readBoolEntry(TQString::tqfromLatin1("SizeGripEnabled"), false);
+ config->setGroup(TQString::fromLatin1("StatusBar style"));
+ bool grip_enabled = config->readBoolEntry(TQString::fromLatin1("SizeGripEnabled"), false);
setSizeGripEnabled(grip_enabled);
config->setGroup(group);
}
diff --git a/tdeui/kstdaction.cpp b/tdeui/kstdaction.cpp
index e9a87d71d..e1adac16a 100644
--- a/tdeui/kstdaction.cpp
+++ b/tdeui/kstdaction.cpp
@@ -72,7 +72,7 @@ KAction* create( StdAction id, const char *name, const TQObject *recvr, const ch
else
aboutData = KGlobal::instance()->aboutData();
*/
- TQString appName = (aboutData) ? aboutData->programName() : TQString::tqfromLatin1(tqApp->name());
+ TQString appName = (aboutData) ? aboutData->programName() : TQString::fromLatin1(tqApp->name());
sLabel = i18n(pInfo->psLabel).arg(appName);
}
break;
diff --git a/tdeui/kstdguiitem.cpp b/tdeui/kstdguiitem.cpp
index fa9d99341..2367804a8 100644
--- a/tdeui/kstdguiitem.cpp
+++ b/tdeui/kstdguiitem.cpp
@@ -62,34 +62,34 @@ KGuiItem KStdGuiItem::guiItem ( StdItem ui_enum )
TQString KStdGuiItem::stdItem( StdItem ui_enum )
{
switch (ui_enum ) {
- case Ok : return TQString::tqfromLatin1("ok");
- case Cancel : return TQString::tqfromLatin1("cancel");
- case Yes : return TQString::tqfromLatin1("yes");
- case No : return TQString::tqfromLatin1("no");
- case Discard : return TQString::tqfromLatin1("discard");
- case Save : return TQString::tqfromLatin1("save");
- case DontSave : return TQString::tqfromLatin1("dontSave");
- case SaveAs : return TQString::tqfromLatin1("saveAs");
- case Apply : return TQString::tqfromLatin1("apply");
- case Help : return TQString::tqfromLatin1("help");
- case Close : return TQString::tqfromLatin1("close");
- case Defaults : return TQString::tqfromLatin1("defaults");
- case Back : return TQString::tqfromLatin1("back");
- case Forward : return TQString::tqfromLatin1("forward");
- case Print : return TQString::tqfromLatin1("print");
- case Continue : return TQString::tqfromLatin1("continue");
- case Open : return TQString::tqfromLatin1("open");
- case Quit : return TQString::tqfromLatin1("quit");
- case AdminMode: return TQString::tqfromLatin1("adminMode");
- case Delete : return TQString::tqfromLatin1("delete");
- case Insert : return TQString::tqfromLatin1("insert");
- case Find : return TQString::tqfromLatin1("find");
- case Stop : return TQString::tqfromLatin1("stop");
- case Add : return TQString::tqfromLatin1("add");
- case Remove : return TQString::tqfromLatin1("remove");
- case Test : return TQString::tqfromLatin1("test");
- case Properties : return TQString::tqfromLatin1("properties");
- case Overwrite : return TQString::tqfromLatin1("overwrite");
+ case Ok : return TQString::fromLatin1("ok");
+ case Cancel : return TQString::fromLatin1("cancel");
+ case Yes : return TQString::fromLatin1("yes");
+ case No : return TQString::fromLatin1("no");
+ case Discard : return TQString::fromLatin1("discard");
+ case Save : return TQString::fromLatin1("save");
+ case DontSave : return TQString::fromLatin1("dontSave");
+ case SaveAs : return TQString::fromLatin1("saveAs");
+ case Apply : return TQString::fromLatin1("apply");
+ case Help : return TQString::fromLatin1("help");
+ case Close : return TQString::fromLatin1("close");
+ case Defaults : return TQString::fromLatin1("defaults");
+ case Back : return TQString::fromLatin1("back");
+ case Forward : return TQString::fromLatin1("forward");
+ case Print : return TQString::fromLatin1("print");
+ case Continue : return TQString::fromLatin1("continue");
+ case Open : return TQString::fromLatin1("open");
+ case Quit : return TQString::fromLatin1("quit");
+ case AdminMode: return TQString::fromLatin1("adminMode");
+ case Delete : return TQString::fromLatin1("delete");
+ case Insert : return TQString::fromLatin1("insert");
+ case Find : return TQString::fromLatin1("find");
+ case Stop : return TQString::fromLatin1("stop");
+ case Add : return TQString::fromLatin1("add");
+ case Remove : return TQString::fromLatin1("remove");
+ case Test : return TQString::fromLatin1("test");
+ case Properties : return TQString::fromLatin1("properties");
+ case Overwrite : return TQString::fromLatin1("overwrite");
default : return TQString::null;
};
}
diff --git a/tdeui/ksyntaxhighlighter.cpp b/tdeui/ksyntaxhighlighter.cpp
index 5e334ac11..e118fcd74 100644
--- a/tdeui/ksyntaxhighlighter.cpp
+++ b/tdeui/ksyntaxhighlighter.cpp
@@ -148,14 +148,14 @@ int KSyntaxHighlighter::highlightParagraph( const TQString &text, int )
}
TQString simplified = text;
- simplified = TQString(simplified.replace( TQRegExp( "\\s" ), TQString() )).replace( '|', TQString::tqfromLatin1(">") );
- while ( simplified.startsWith( TQString::tqfromLatin1(">>>>") ) )
+ simplified = TQString(simplified.replace( TQRegExp( "\\s" ), TQString() )).replace( '|', TQString::fromLatin1(">") );
+ while ( simplified.startsWith( TQString::fromLatin1(">>>>") ) )
simplified = simplified.mid(3);
- if ( simplified.startsWith( TQString::tqfromLatin1(">>>") ) || simplified.startsWith( TQString::tqfromLatin1("> > >") ) )
+ if ( simplified.startsWith( TQString::fromLatin1(">>>") ) || simplified.startsWith( TQString::fromLatin1("> > >") ) )
setFormat( 0, text.length(), d->col2 );
- else if ( simplified.startsWith( TQString::tqfromLatin1(">>") ) || simplified.startsWith( TQString::tqfromLatin1("> >") ) )
+ else if ( simplified.startsWith( TQString::fromLatin1(">>") ) || simplified.startsWith( TQString::fromLatin1("> >") ) )
setFormat( 0, text.length(), d->col3 );
- else if ( simplified.startsWith( TQString::tqfromLatin1(">") ) )
+ else if ( simplified.startsWith( TQString::fromLatin1(">") ) )
setFormat( 0, text.length(), d->col4 );
else
setFormat( 0, text.length(), d->col5 );
diff --git a/tdeui/ksystemtray.cpp b/tdeui/ksystemtray.cpp
index dec85b7e8..b35924375 100644
--- a/tdeui/ksystemtray.cpp
+++ b/tdeui/ksystemtray.cpp
@@ -69,7 +69,7 @@ KSystemTray::KSystemTray( TQWidget* parent, const char* name )
d->actionCollection = new KActionCollection(this);
#ifdef Q_WS_X11
- KWin::setSystemTrayWindowFor( winId(), parent?parent->tqtopLevelWidget()->winId(): qt_xrootwin() );
+ KWin::setSystemTrayWindowFor( winId(), parent?parent->topLevelWidget()->winId(): qt_xrootwin() );
#endif
setBackgroundMode(X11ParentRelative);
setBackgroundOrigin(WindowOrigin);
diff --git a/tdeui/ktabbar.cpp b/tdeui/ktabbar.cpp
index eed23ebfe..cfc6ce481 100644
--- a/tdeui/ktabbar.cpp
+++ b/tdeui/ktabbar.cpp
@@ -172,8 +172,8 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e )
int xoff = 0, yoff = 0;
// The additional offsets were found by try and error, TODO: find the rational behind them
if ( t == tab( currentTab() ) ) {
- xoff = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabShiftHorizontal, this ) + 3;
- yoff = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabShiftVertical, this ) - 4;
+ xoff = tqstyle().pixelMetric( TQStyle::PM_TabBarTabShiftHorizontal, this ) + 3;
+ yoff = tqstyle().pixelMetric( TQStyle::PM_TabBarTabShiftVertical, this ) - 4;
}
else {
xoff = 7;
@@ -303,7 +303,7 @@ const TQColor &KTabBar::tabColor( int id ) const
if ( mTabColors.contains( id ) )
return mTabColors[id];
- return tqcolorGroup().foreground();
+ return colorGroup().foreground();
}
int KTabBar::insertTab( TQTab *t, int index )
@@ -341,8 +341,8 @@ void KTabBar::paintLabel( TQPainter *p, const TQRect& br,
r.setLeft( r.left() + pixw + 4 );
r.setRight( r.right() + 2 );
- int inactiveXShift = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabShiftHorizontal, this );
- int inactiveYShift = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabShiftVertical, this );
+ int inactiveXShift = tqstyle().pixelMetric( TQStyle::PM_TabBarTabShiftHorizontal, this );
+ int inactiveYShift = tqstyle().pixelMetric( TQStyle::PM_TabBarTabShiftVertical, this );
int right = t->text().isEmpty() ? br.right() - pixw : br.left() + 2;
@@ -358,11 +358,11 @@ void KTabBar::paintLabel( TQPainter *p, const TQRect& br,
if ( has_focus )
flags |= TQStyle::Style_HasFocus;
- TQColorGroup cg( tqcolorGroup() );
+ TQColorGroup cg( colorGroup() );
if ( mTabColors.contains( t->identifier() ) )
cg.setColor( TQColorGroup::Foreground, mTabColors[t->identifier()] );
- tqstyle().tqdrawControl( TQStyle::CE_TabBarLabel, p, this, r,
+ tqstyle().drawControl( TQStyle::CE_TabBarLabel, p, this, r,
t->isEnabled() ? cg : tqpalette().disabled(),
flags, TQStyleOption(t) );
}
diff --git a/tdeui/ktabctl.cpp b/tdeui/ktabctl.cpp
index 204a0979e..dc31a5a0f 100644
--- a/tdeui/ktabctl.cpp
+++ b/tdeui/ktabctl.cpp
@@ -104,7 +104,7 @@ bool KTabCtl::isTabEnabled(const TQString& name)
unsigned int i;
for(i = 0; i < pages.size(); i++)
- if (TQString::tqfromLatin1(pages[i]->name()) == name)
+ if (TQString::fromLatin1(pages[i]->name()) == name)
return tabs->isTabEnabled(i); /* return the enabled status */
return false; /* tab does not exist */
}
@@ -117,7 +117,7 @@ void KTabCtl::setTabEnabled(const TQString& name, bool state)
return;
for (i = 0; i < pages.size(); i++)
- if (TQString::tqfromLatin1(pages[i]->name()) == name)
+ if (TQString::fromLatin1(pages[i]->name()) == name)
tabs->setTabEnabled(i, state);
}
@@ -138,14 +138,14 @@ void KTabCtl::setSizes()
* check the actual minimum and maximum sizes
*/
- if (pages[i]->tqmaximumSize().height() < max.height())
- max.setHeight(pages[i]->tqmaximumSize().height());
- if (pages[i]->tqmaximumSize().width() < max.width())
- max.setWidth( pages[i]->tqmaximumSize().width());
- if ( pages[i]->tqminimumSize().height() > min.height())
- min.setHeight( pages[i]->tqminimumSize().height());
- if ( pages[i]->tqminimumSize().width() > min.width())
- min.setWidth( pages[i]->tqminimumSize().width());
+ if (pages[i]->maximumSize().height() < max.height())
+ max.setHeight(pages[i]->maximumSize().height());
+ if (pages[i]->maximumSize().width() < max.width())
+ max.setWidth( pages[i]->maximumSize().width());
+ if ( pages[i]->minimumSize().height() > min.height())
+ min.setHeight( pages[i]->minimumSize().height());
+ if ( pages[i]->minimumSize().width() > min.width())
+ min.setWidth( pages[i]->minimumSize().width());
}
// BL: min and max are sizes of children, not tabcontrol
@@ -251,16 +251,16 @@ void KTabCtl::paintEvent(TQPaintEvent *)
int x1 = getChildRect().right() + 2;
int x0 = getChildRect().left() - 1;
- p.setPen(tqcolorGroup().light());
+ p.setPen(colorGroup().light());
p.drawLine(x0, y0 - 1, x1 - 1, y0 - 1); /* 1st top line */
- p.setPen(tqcolorGroup().midlight());
+ p.setPen(colorGroup().midlight());
p.drawLine(x0, y0, x1 - 1, y0); /* 2nd top line */
- p.setPen(tqcolorGroup().light());
+ p.setPen(colorGroup().light());
p.drawLine(x0, y0 + 1, x0, y1); /* left line */
p.setPen(black);
p.drawLine(x1, y1, x0, y1); /* bottom line */
p.drawLine(x1, y1 - 1, x1, y0);
- p.setPen(tqcolorGroup().dark());
+ p.setPen(colorGroup().dark());
p.drawLine(x0 + 1, y1 - 1, x1 - 1, y1 - 1); /* bottom */
p.drawLine(x1 - 1, y1 - 2, x1 - 1, y0 + 1);
p.end();
diff --git a/tdeui/ktabwidget.cpp b/tdeui/ktabwidget.cpp
index 36410921e..7423a126f 100644
--- a/tdeui/ktabwidget.cpp
+++ b/tdeui/ktabwidget.cpp
@@ -163,8 +163,8 @@ bool KTabWidget::tabCloseActivatePrevious() const
unsigned int KTabWidget::tabBarWidthForMaxChars( uint maxLength )
{
int hframe, overlap;
- hframe = tabBar()->tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabHSpace, tabBar() );
- overlap = tabBar()->tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabOverlap, tabBar() );
+ hframe = tabBar()->tqstyle().pixelMetric( TQStyle::PM_TabBarTabHSpace, tabBar() );
+ overlap = tabBar()->tqstyle().pixelMetric( TQStyle::PM_TabBarTabOverlap, tabBar() );
TQFontMetrics fm = tabBar()->fontMetrics();
int x = 0;
diff --git a/tdeui/ktextedit.cpp b/tdeui/ktextedit.cpp
index 73bbf3c5f..be8e2925f 100644
--- a/tdeui/ktextedit.cpp
+++ b/tdeui/ktextedit.cpp
@@ -182,7 +182,7 @@ void KTextEdit::keyPressEvent( TQKeyEvent *e )
// ignore Ctrl-Return so that KDialogs can close the dialog
else if ( e->state() == ControlButton &&
(e->key() == Key_Return || e->key() == Key_Enter) &&
- tqtopLevelWidget()->inherits( "KDialog" ) )
+ topLevelWidget()->inherits( "KDialog" ) )
{
e->ignore();
return;
diff --git a/tdeui/ktip.cpp b/tdeui/ktip.cpp
index 70290f62c..3be1d57e6 100644
--- a/tdeui/ktip.cpp
+++ b/tdeui/ktip.cpp
@@ -59,7 +59,7 @@ KTipDatabase::KTipDatabase(const TQString &_tipFile)
{
TQString tipFile = _tipFile;
if (tipFile.isEmpty())
- tipFile = TQString::tqfromLatin1(KGlobal::instance()->aboutData()->appName()) + "/tips";
+ tipFile = TQString::fromLatin1(KGlobal::instance()->aboutData()->appName()) + "/tips";
loadTips(tipFile);
@@ -72,7 +72,7 @@ KTipDatabase::KTipDatabase( const TQStringList& tipsFiles )
{
if ( tipsFiles.isEmpty() || ( ( tipsFiles.count() == 1 ) && tipsFiles.first().isEmpty() ) )
{
- addTips(TQString::tqfromLatin1(KGlobal::instance()->aboutData()->appName()) + "/tips");
+ addTips(TQString::fromLatin1(KGlobal::instance()->aboutData()->appName()) + "/tips");
}
else
{
@@ -347,10 +347,10 @@ void KTipDialog::showMultiTip(TQWidget *parent, const TQStringList &tipFiles, bo
const int oneDay = 24*60*60;
TQDateTime lastShown = configGroup.readDateTimeEntry("TipLastShown");
// Show tip roughly once a week
- if (lastShown.secsTo(TQDateTime::tqcurrentDateTime()) < (oneDay + (kapp->random() % (10*oneDay))))
+ if (lastShown.secsTo(TQDateTime::currentDateTime()) < (oneDay + (kapp->random() % (10*oneDay))))
return;
}
- configGroup.writeEntry("TipLastShown", TQDateTime::tqcurrentDateTime());
+ configGroup.writeEntry("TipLastShown", TQDateTime::currentDateTime());
kapp->config()->sync();
if (!hasLastShown)
return; // Don't show tip on first start
@@ -384,7 +384,7 @@ static TQString fixTip(TQString tip)
void KTipDialog::prevTip()
{
mDatabase->prevTip();
- TQString currentTip = TQString::tqfromLatin1(
+ TQString currentTip = TQString::fromLatin1(
"<qt text=\"%1\" bgcolor=\"%2\">%3</qt>")
.arg(mTextColor.name())
.arg(mBaseColor.name())
@@ -399,7 +399,7 @@ static TQString fixTip(TQString tip)
void KTipDialog::nextTip()
{
mDatabase->nextTip();
- TQString currentTip = TQString::tqfromLatin1(
+ TQString currentTip = TQString::fromLatin1(
"<qt text=\"%1\" bgcolor=\"%2\">%3</qt>")
.arg(mTextColor.name())
.arg(mBaseColor.name())
diff --git a/tdeui/ktoolbar.cpp b/tdeui/ktoolbar.cpp
index ee531e102..2a9a56ef3 100644
--- a/tdeui/ktoolbar.cpp
+++ b/tdeui/ktoolbar.cpp
@@ -170,7 +170,7 @@ void KToolBarSeparator::drawContents( TQPainter* p )
flags = flags | TQStyle::Style_Horizontal;
tqstyle().tqdrawPrimitive(TQStyle::PE_DockWindowSeparator, p,
- contentsRect(), tqcolorGroup(), flags);
+ contentsRect(), colorGroup(), flags);
} else {
TQFrame::drawContents(p);
}
@@ -183,7 +183,7 @@ void KToolBarSeparator::styleChange( TQStyle& )
TQSize KToolBarSeparator::sizeHint() const
{
- int dim = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowSeparatorExtent, this );
+ int dim = tqstyle().pixelMetric( TQStyle::PM_DockWindowSeparatorExtent, this );
return orientation() == Qt::Vertical ? TQSize( 0, dim ) : TQSize( dim, 0 );
}
@@ -193,7 +193,7 @@ TQSizePolicy KToolBarSeparator::sizePolicy() const
}
KToolBar::KToolBar( TQWidget *parent, const char *name, bool honorStyle, bool readConfig )
- : TQToolBar( TQString::tqfromLatin1( name ),
+ : TQToolBar( TQString::fromLatin1( name ),
tqt_dynamic_cast<TQMainWindow*>(parent),
parent, false,
name ? name : "mainToolBar")
@@ -202,7 +202,7 @@ KToolBar::KToolBar( TQWidget *parent, const char *name, bool honorStyle, bool re
}
KToolBar::KToolBar( TQMainWindow *parentWindow, TQMainWindow::ToolBarDock dock, bool newLine, const char *name, bool honorStyle, bool readConfig )
- : TQToolBar( TQString::tqfromLatin1( name ),
+ : TQToolBar( TQString::fromLatin1( name ),
parentWindow, dock, newLine,
name ? name : "mainToolBar")
{
@@ -210,7 +210,7 @@ KToolBar::KToolBar( TQMainWindow *parentWindow, TQMainWindow::ToolBarDock dock,
}
KToolBar::KToolBar( TQMainWindow *parentWindow, TQWidget *dock, bool newLine, const char *name, bool honorStyle, bool readConfig )
- : TQToolBar( TQString::tqfromLatin1( name ),
+ : TQToolBar( TQString::fromLatin1( name ),
parentWindow, dock, newLine,
name ? name : "mainToolBar")
{
@@ -856,11 +856,11 @@ void KToolBar::setIconText(IconText icontext, bool update)
// ugly hack to force a TQMainWindow::triggerLayout( true )
TQMainWindow *mw = mainWindow();
if ( mw ) {
- mw->tqsetUpdatesEnabled( false );
+ mw->setUpdatesEnabled( false );
// mw->setToolBarsMovable( !mw->toolBarsMovable() ); // Old way
// mw->setToolBarsMovable( !mw->toolBarsMovable() );
mw->setCentralWidget(mw->centralWidget()); // This is a faster hack
- mw->tqsetUpdatesEnabled( true );
+ mw->setUpdatesEnabled( true );
}
}
@@ -894,11 +894,11 @@ void KToolBar::setIconSize(int size, bool update)
// ugly hack to force a TQMainWindow::triggerLayout( true )
if ( mainWindow() ) {
TQMainWindow *mw = mainWindow();
- mw->tqsetUpdatesEnabled( false );
+ mw->setUpdatesEnabled( false );
// mw->setToolBarsMovable( !mw->toolBarsMovable() ); // Old way
// mw->setToolBarsMovable( !mw->toolBarsMovable() );
mw->setCentralWidget(mw->centralWidget()); // This is a faster hack
- mw->tqsetUpdatesEnabled( true );
+ mw->setUpdatesEnabled( true );
}
}
@@ -1358,12 +1358,12 @@ TQSize KToolBar::sizeHint() const
for ( TQWidget *w = ncThis->widgets.first(); w; w = ncThis->widgets.next() )
{
TQSize sh = w->sizeHint();
- if ( w->tqsizePolicy().horData() == TQSizePolicy::Ignored )
+ if ( w->sizePolicy().horData() == TQSizePolicy::Ignored )
sh.setWidth( 1 );
- if ( w->tqsizePolicy().verData() == TQSizePolicy::Ignored )
+ if ( w->sizePolicy().verData() == TQSizePolicy::Ignored )
sh.setHeight( 1 );
- sh = sh.boundedTo( w->tqmaximumSize() )
- .expandedTo( w->tqminimumSize() ).expandedTo( TQSize(1, 1) );
+ sh = sh.boundedTo( w->maximumSize() )
+ .expandedTo( w->minimumSize() ).expandedTo( TQSize(1, 1) );
minSize = minSize.expandedTo(TQSize(0, sh.height()));
minSize += TQSize(sh.width()+1, 0);
@@ -1371,7 +1371,7 @@ TQSize KToolBar::sizeHint() const
minSize += TQSize(2, 0); // A little bit extra spacing behind it.
}
- minSize += TQSize(TQApplication::tqstyle().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent ), 0);
+ minSize += TQSize(TQApplication::tqstyle().pixelMetric( TQStyle::PM_DockWindowHandleExtent ), 0);
minSize += TQSize(margin*2, margin*2);
break;
@@ -1380,17 +1380,17 @@ TQSize KToolBar::sizeHint() const
for ( TQWidget *w = ncThis->widgets.first(); w; w = ncThis->widgets.next() )
{
TQSize sh = w->sizeHint();
- if ( w->tqsizePolicy().horData() == TQSizePolicy::Ignored )
+ if ( w->sizePolicy().horData() == TQSizePolicy::Ignored )
sh.setWidth( 1 );
- if ( w->tqsizePolicy().verData() == TQSizePolicy::Ignored )
+ if ( w->sizePolicy().verData() == TQSizePolicy::Ignored )
sh.setHeight( 1 );
- sh = sh.boundedTo( w->tqmaximumSize() )
- .expandedTo( w->tqminimumSize() ).expandedTo( TQSize(1, 1) );
+ sh = sh.boundedTo( w->maximumSize() )
+ .expandedTo( w->minimumSize() ).expandedTo( TQSize(1, 1) );
minSize = minSize.expandedTo(TQSize(sh.width(), 0));
minSize += TQSize(0, sh.height()+1);
}
- minSize += TQSize(0, TQApplication::tqstyle().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent ));
+ minSize += TQSize(0, TQApplication::tqstyle().pixelMetric( TQStyle::PM_DockWindowHandleExtent ));
minSize += TQSize(margin*2, margin*2);
break;
@@ -1401,7 +1401,7 @@ TQSize KToolBar::sizeHint() const
return minSize;
}
-TQSize KToolBar::tqminimumSize() const
+TQSize KToolBar::minimumSize() const
{
return minimumSizeHint();
}
@@ -1429,7 +1429,7 @@ void KToolBar::show()
void KToolBar::resizeEvent( TQResizeEvent *e )
{
bool b = isUpdatesEnabled();
- tqsetUpdatesEnabled( false );
+ setUpdatesEnabled( false );
TQToolBar::resizeEvent( e );
if (b)
{
@@ -1446,7 +1446,7 @@ void KToolBar::resizeEvent( TQResizeEvent *e )
}
// else {
// printf("[WARNING] In KToolBar::resizeEvent, but this code block should not be executing. Preventing toolbar lockup. [Code 0045]\n\r");
-// tqsetUpdatesEnabled( true );
+// setUpdatesEnabled( true );
// }
}
@@ -1486,25 +1486,25 @@ void KToolBar::slotAppearanceChanged()
//static
bool KToolBar::highlightSetting()
{
- TQString grpToolbar(TQString::tqfromLatin1("Toolbar style"));
+ TQString grpToolbar(TQString::fromLatin1("Toolbar style"));
KConfigGroupSaver saver(KGlobal::config(), grpToolbar);
- return KGlobal::config()->readBoolEntry(TQString::tqfromLatin1("Highlighting"),true);
+ return KGlobal::config()->readBoolEntry(TQString::fromLatin1("Highlighting"),true);
}
//static
bool KToolBar::transparentSetting()
{
- TQString grpToolbar(TQString::tqfromLatin1("Toolbar style"));
+ TQString grpToolbar(TQString::fromLatin1("Toolbar style"));
KConfigGroupSaver saver(KGlobal::config(), grpToolbar);
- return KGlobal::config()->readBoolEntry(TQString::tqfromLatin1("TransparentMoving"),true);
+ return KGlobal::config()->readBoolEntry(TQString::fromLatin1("TransparentMoving"),true);
}
//static
KToolBar::IconText KToolBar::iconTextSetting()
{
- TQString grpToolbar(TQString::tqfromLatin1("Toolbar style"));
+ TQString grpToolbar(TQString::fromLatin1("Toolbar style"));
KConfigGroupSaver saver(KGlobal::config(), grpToolbar);
- TQString icontext = KGlobal::config()->readEntry(TQString::tqfromLatin1("IconText"),TQString::tqfromLatin1("IconOnly"));
+ TQString icontext = KGlobal::config()->readEntry(TQString::fromLatin1("IconText"),TQString::fromLatin1("IconOnly"));
if ( icontext == "IconTextRight" )
return IconTextRight;
else if ( icontext == "IconTextBottom" )
@@ -1546,7 +1546,7 @@ void KToolBar::applyAppearanceSettings(KConfig *config, const TQString &_configG
TQString iconText = d->IconTextDefault;
// this is the first iteration
- TQString grpToolbar(TQString::tqfromLatin1("Toolbar style"));
+ TQString grpToolbar(TQString::fromLatin1("Toolbar style"));
{ // start block for KConfigGroupSaver
KConfigGroupSaver saver(gconfig, grpToolbar);
@@ -1732,14 +1732,14 @@ bool KToolBar::event( TQEvent *e )
void KToolBar::slotRepaint()
{
- tqsetUpdatesEnabled( false );
+ setUpdatesEnabled( false );
// Send a resizeEvent to update the "toolbar extension arrow"
// (The button you get when your toolbar-items don't fit in
// the available space)
TQResizeEvent ev(size(), size());
resizeEvent(&ev);
TQApplication::sendPostedEvents( this, TQEvent::LayoutHint );
- tqsetUpdatesEnabled( true );
+ setUpdatesEnabled( true );
tqrepaint( true );
}
diff --git a/tdeui/ktoolbar.h b/tdeui/ktoolbar.h
index 96d0872bc..bbf0bfc65 100644
--- a/tdeui/ktoolbar.h
+++ b/tdeui/ktoolbar.h
@@ -947,7 +947,7 @@ public:
bool highlight() const;
TQSize sizeHint() const;
TQSize minimumSizeHint() const;
- TQSize tqminimumSize() const;
+ TQSize minimumSize() const;
void hide();
void show();
diff --git a/tdeui/ktoolbarbutton.cpp b/tdeui/ktoolbarbutton.cpp
index b7801a2f8..5e89c175a 100644
--- a/tdeui/ktoolbarbutton.cpp
+++ b/tdeui/ktoolbarbutton.cpp
@@ -263,7 +263,7 @@ void KToolBarButton::setTextLabel( const TQString& text, bool tipToo)
return;
TQString txt(text);
- if (txt.endsWith(TQString::tqfromLatin1("...")))
+ if (txt.endsWith(TQString::fromLatin1("...")))
txt.truncate(txt.length() - 3);
TQToolButton::setTextLabel(txt, tipToo);
@@ -494,8 +494,8 @@ void KToolBarButton::drawButton( TQPainter *_painter )
if (hasFocus()) flags |= TQStyle::Style_HasFocus;
// Draw a styled toolbutton
- tqstyle().tqdrawComplexControl(TQStyle::CC_ToolButton, _painter, this, rect(),
- tqcolorGroup(), flags, TQStyle::SC_ToolButton, active, TQStyleOption());
+ tqstyle().drawComplexControl(TQStyle::CC_ToolButton, _painter, this, rect(),
+ colorGroup(), flags, TQStyle::SC_ToolButton, active, TQStyleOption());
int dx, dy;
TQFont tmp_font(KGlobalSettings::toolBarFont());
@@ -513,7 +513,7 @@ void KToolBarButton::drawButton( TQPainter *_painter )
{
dx = ( width() - pixmap.width() ) / 2;
dy = ( height() - pixmap.height() ) / 2;
- if ( isDown() && tqstyle().tqstyleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
+ if ( isDown() && tqstyle().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
{
++dx;
++dy;
@@ -531,7 +531,7 @@ void KToolBarButton::drawButton( TQPainter *_painter )
{
dx = 4;
dy = ( height() - pixmap.height() ) / 2;
- if ( isDown() && tqstyle().tqstyleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
+ if ( isDown() && tqstyle().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
{
++dx;
++dy;
@@ -547,7 +547,7 @@ void KToolBarButton::drawButton( TQPainter *_painter )
else
dx = 4;
dy = 0;
- if ( isDown() && tqstyle().tqstyleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
+ if ( isDown() && tqstyle().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
{
++dx;
++dy;
@@ -562,7 +562,7 @@ void KToolBarButton::drawButton( TQPainter *_painter )
textFlags = AlignVCenter|AlignLeft;
dx = (width() - fm.width(textLabel())) / 2;
dy = (height() - fm.lineSpacing()) / 2;
- if ( isDown() && tqstyle().tqstyleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
+ if ( isDown() && tqstyle().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
{
++dx;
++dy;
@@ -580,7 +580,7 @@ void KToolBarButton::drawButton( TQPainter *_painter )
{
dx = (width() - pixmap.width()) / 2;
dy = (height() - fm.lineSpacing() - pixmap.height()) / 2;
- if ( isDown() && tqstyle().tqstyleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
+ if ( isDown() && tqstyle().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
{
++dx;
++dy;
@@ -594,7 +594,7 @@ void KToolBarButton::drawButton( TQPainter *_painter )
dx = (width() - fm.width(textLabel())) / 2;
dy = height() - fm.lineSpacing() - 4;
- if ( isDown() && tqstyle().tqstyleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
+ if ( isDown() && tqstyle().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
{
++dx;
++dy;
@@ -612,7 +612,7 @@ void KToolBarButton::drawButton( TQPainter *_painter )
else if(d->m_isRaised)
_painter->setPen(KGlobalSettings::toolBarHighlightColor());
else
- _painter->setPen( tqcolorGroup().buttonText() );
+ _painter->setPen( colorGroup().buttonText() );
_painter->drawText(textRect, textFlags, textLabel());
}
@@ -624,7 +624,7 @@ void KToolBarButton::drawButton( TQPainter *_painter )
if (isEnabled()) arrowFlags |= TQStyle::Style_Enabled;
tqstyle().tqdrawPrimitive(TQStyle::PE_ArrowDown, _painter,
- TQRect(width()-7, height()-7, 7, 7), tqcolorGroup(),
+ TQRect(width()-7, height()-7, 7, 7), colorGroup(),
arrowFlags, TQStyleOption() );
}
}
@@ -744,7 +744,7 @@ TQSize KToolBarButton::minimumSizeHint() const
return d->size;
}
-TQSize KToolBarButton::tqminimumSize() const
+TQSize KToolBarButton::minimumSize() const
{
return d->size;
}
diff --git a/tdeui/ktoolbarbutton.h b/tdeui/ktoolbarbutton.h
index 9f02a1f6b..e1da25ae8 100644
--- a/tdeui/ktoolbarbutton.h
+++ b/tdeui/ktoolbarbutton.h
@@ -294,7 +294,7 @@ protected:
void showMenu();
TQSize sizeHint() const;
TQSize minimumSizeHint() const;
- TQSize tqminimumSize() const;
+ TQSize minimumSize() const;
/// @since 3.1
bool isRaised() const;
diff --git a/tdeui/ktoolbarhandler.cpp b/tdeui/ktoolbarhandler.cpp
index 34bfe7046..bdeba7281 100644
--- a/tdeui/ktoolbarhandler.cpp
+++ b/tdeui/ktoolbarhandler.cpp
@@ -209,7 +209,7 @@ void ToolBarHandler::init( KMainWindow *mainWindow )
if ( domDocument().documentElement().isNull() ) {
- TQString completeDescription = TQString::tqfromLatin1( guiDescription )
+ TQString completeDescription = TQString::fromLatin1( guiDescription )
.arg( actionListName );
setXML( completeDescription, false /*merge*/ );
diff --git a/tdeui/ktoolbarlabelaction.cpp b/tdeui/ktoolbarlabelaction.cpp
index 8fb5a1341..b86906e57 100644
--- a/tdeui/ktoolbarlabelaction.cpp
+++ b/tdeui/ktoolbarlabelaction.cpp
@@ -68,7 +68,7 @@ KToolBarLabelAction::KToolBarLabelAction(TQLabel* label,
: KWidgetAction(label, label->text(), cut, receiver, slot, parent, name),
d(new KToolBarLabelActionPrivate)
{
- Q_ASSERT(TQString::tqfromLatin1("kde toolbar widget") == label->name());
+ Q_ASSERT(TQString::fromLatin1("kde toolbar widget") == label->name());
init();
}
diff --git a/tdeui/kurllabel.cpp b/tdeui/kurllabel.cpp
index f9f5591ce..8a996fe5b 100644
--- a/tdeui/kurllabel.cpp
+++ b/tdeui/kurllabel.cpp
@@ -367,7 +367,7 @@ bool KURLLabel::event (TQEvent *e)
if (result && hasFocus()) {
TQPainter p(this);
TQRect r( activeRect() );
- tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, r, tqcolorGroup() );
+ tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, r, colorGroup() );
}
return result;
}
diff --git a/tdeui/kwhatsthismanager.cpp b/tdeui/kwhatsthismanager.cpp
index b7873ed0e..2f4d1750f 100644
--- a/tdeui/kwhatsthismanager.cpp
+++ b/tdeui/kwhatsthismanager.cpp
@@ -68,11 +68,11 @@ bool KWhatsThisUndefined::clicked (const TQString& href)
body . append ("Widget text: '" + (m_widget -> property ("text") . toString ()) + "'\n");
TQString dsc = TQString ("current --> ") + m_widget -> name ();
dsc . append (TQString (" (") + m_widget -> className () + ")\n");
- for (w = m_widget; w && w != m_widget -> tqtopLevelWidget (); w = w -> parentWidget ()) {
+ for (w = m_widget; w && w != m_widget -> topLevelWidget (); w = w -> parentWidget ()) {
dsc . append (w -> name ());
dsc . append (TQString (" (") + w -> className () + ")\n");
}
- w = m_widget -> tqtopLevelWidget ();
+ w = m_widget -> topLevelWidget ();
if (w) {
dsc . append ("toplevel --> ");
dsc . append (w -> name ());
diff --git a/tdeui/kxmlguibuilder.cpp b/tdeui/kxmlguibuilder.cpp
index 123d85b2c..c31242ff1 100644
--- a/tdeui/kxmlguibuilder.cpp
+++ b/tdeui/kxmlguibuilder.cpp
@@ -70,24 +70,24 @@ KXMLGUIBuilder::KXMLGUIBuilder( TQWidget *widget )
d = new KXMLGUIBuilderPrivate;
d->m_widget = widget;
- d->tagMainWindow = TQString::tqfromLatin1( "mainwindow" );
- d->tagMenuBar = TQString::tqfromLatin1( "menubar" );
- d->tagMenu = TQString::tqfromLatin1( "menu" );
- d->tagToolBar = TQString::tqfromLatin1( "toolbar" );
- d->tagStatusBar = TQString::tqfromLatin1( "statusbar" );
+ d->tagMainWindow = TQString::fromLatin1( "mainwindow" );
+ d->tagMenuBar = TQString::fromLatin1( "menubar" );
+ d->tagMenu = TQString::fromLatin1( "menu" );
+ d->tagToolBar = TQString::fromLatin1( "toolbar" );
+ d->tagStatusBar = TQString::fromLatin1( "statusbar" );
- d->tagSeparator = TQString::tqfromLatin1( "separator" );
- d->tagTearOffHandle = TQString::tqfromLatin1( "tearoffhandle" );
- d->tagMenuTitle = TQString::tqfromLatin1( "title" );
+ d->tagSeparator = TQString::fromLatin1( "separator" );
+ d->tagTearOffHandle = TQString::fromLatin1( "tearoffhandle" );
+ d->tagMenuTitle = TQString::fromLatin1( "title" );
- d->attrName = TQString::tqfromLatin1( "name" );
- d->attrLineSeparator = TQString::tqfromLatin1( "lineseparator" );
+ d->attrName = TQString::fromLatin1( "name" );
+ d->attrLineSeparator = TQString::fromLatin1( "lineseparator" );
- d->attrText1 = TQString::tqfromLatin1( "text" );
- d->attrText2 = TQString::tqfromLatin1( "Text" );
- d->attrContext = TQString::tqfromLatin1( "context" );
+ d->attrText1 = TQString::fromLatin1( "text" );
+ d->attrText2 = TQString::fromLatin1( "Text" );
+ d->attrContext = TQString::fromLatin1( "context" );
- d->attrIcon = TQString::tqfromLatin1( "icon" );
+ d->attrIcon = TQString::fromLatin1( "icon" );
d->m_instance = 0;
d->m_client = 0;
@@ -332,7 +332,7 @@ int KXMLGUIBuilder::createCustomElement( TQWidget *parent, int index, const TQDo
TQDomAttr attr = attributes.item( i ).toAttr();
if ( attr.name().lower() == d->attrLineSeparator &&
- attr.value().lower() == TQString::tqfromLatin1("false") )
+ attr.value().lower() == TQString::fromLatin1("false") )
{
isLineSep = false;
break;
diff --git a/tdeui/kxmlguiclient.cpp b/tdeui/kxmlguiclient.cpp
index dd7458ede..63da79fc6 100644
--- a/tdeui/kxmlguiclient.cpp
+++ b/tdeui/kxmlguiclient.cpp
@@ -143,7 +143,7 @@ TQString KXMLGUIClient::localXMLFile() const
if ( !TQDir::isRelativePath(d->m_xmlFile) )
return TQString::null; // can't save anything here
- return locateLocal( "data", TQString::tqfromLatin1( instance()->instanceName() + '/' ) + d->m_xmlFile );
+ return locateLocal( "data", TQString::fromLatin1( instance()->instanceName() + '/' ) + d->m_xmlFile );
}
@@ -178,7 +178,7 @@ void KXMLGUIClient::setXMLFile( const TQString& _file, bool merge, bool setXMLDo
{
TQString doc;
- TQString filter = TQString::tqfromLatin1( instance()->instanceName() + '/' ) + _file;
+ TQString filter = TQString::fromLatin1( instance()->instanceName() + '/' ) + _file;
TQStringList allFiles = instance()->dirs()->findAllResources( "data", filter ) + instance()->dirs()->findAllResources( "data", _file );
@@ -699,7 +699,7 @@ TQString KXMLGUIClient::findMostRecentXMLFile( const TQStringList &files, TQStri
else
{
TQString f = (*local).file;
- TQString backup = f + TQString::tqfromLatin1( ".backup" );
+ TQString backup = f + TQString::fromLatin1( ".backup" );
TQDir dir;
dir.rename( f, backup );
}
diff --git a/tdeui/kxmlguifactory.cpp b/tdeui/kxmlguifactory.cpp
index 2714b1207..a8c437571 100644
--- a/tdeui/kxmlguifactory.cpp
+++ b/tdeui/kxmlguifactory.cpp
@@ -110,7 +110,7 @@ TQString KXMLGUIFactory::readConfigFile( const TQString &filename, bool never_nu
xml_file = filename;
else
{
- xml_file = locate("data", TQString::tqfromLatin1(instance->instanceName() + '/' ) + filename);
+ xml_file = locate("data", TQString::fromLatin1(instance->instanceName() + '/' ) + filename);
if ( !TQFile::exists( xml_file ) )
xml_file = locate( "data", filename );
}
@@ -120,7 +120,7 @@ TQString KXMLGUIFactory::readConfigFile( const TQString &filename, bool never_nu
{
kdError(240) << "No such XML file " << filename << endl;
if ( never_null )
- return TQString::tqfromLatin1( "<!DOCTYPE kpartgui>\n<kpartgui name=\"empty\">\n</kpartgui>" );
+ return TQString::fromLatin1( "<!DOCTYPE kpartgui>\n<kpartgui name=\"empty\">\n</kpartgui>" );
else
return TQString::null;
}
@@ -146,7 +146,7 @@ bool KXMLGUIFactory::saveConfigFile( const TQDomDocument& doc,
TQString xml_file(filename);
if (TQDir::isRelativePath(xml_file))
- xml_file = locateLocal("data", TQString::tqfromLatin1( instance->instanceName() + '/' )
+ xml_file = locateLocal("data", TQString::fromLatin1( instance->instanceName() + '/' )
+ filename);
TQFile file( xml_file );
@@ -566,7 +566,7 @@ int KXMLGUIFactory::configureShortcuts(bool bAllowLetterShortcuts , bool bSaveSe
TQDomElement KXMLGUIFactory::actionPropertiesElement( TQDomDocument& doc )
{
- const TQString tagActionProp = TQString::tqfromLatin1("ActionProperties");
+ const TQString tagActionProp = TQString::fromLatin1("ActionProperties");
// first, lets see if we have existing properties
TQDomElement elem;
TQDomNode it = doc.documentElement().firstChild();
diff --git a/tdeui/qxembed.cpp b/tdeui/qxembed.cpp
index e0ce2166b..95bd1bc9b 100644
--- a/tdeui/qxembed.cpp
+++ b/tdeui/qxembed.cpp
@@ -310,8 +310,8 @@ bool QXEmbedAppFilter::eventFilter( TQObject *o, TQEvent * e)
// active and has just been given the Qt focus (L0614) or
// because the widget already had the Qt focus and just became
// active (L0615).
- if ( TQT_BASE_OBJECT(tqApp->tqfocusWidget()) == TQT_BASE_OBJECT(o) &&
- ((QPublicWidget*)tqApp->tqfocusWidget()->tqtopLevelWidget())->topData()->embedded ) {
+ if ( TQT_BASE_OBJECT(tqApp->focusWidget()) == TQT_BASE_OBJECT(o) &&
+ ((QPublicWidget*)tqApp->focusWidget()->topLevelWidget())->topData()->embedded ) {
TQFocusEvent* fe = (TQFocusEvent*) e;
if ( obeyFocus || fe->reason() != TQFocusEvent::ActiveWindow /*|| fe->reason() == TQFocusEvent::Mouse ||
fe->reason() == TQFocusEvent::Shortcut*/ ) {
@@ -320,11 +320,11 @@ bool QXEmbedAppFilter::eventFilter( TQObject *o, TQEvent * e)
// activity in the client. The XEMBED_REQUEST_FOCUS message causes
// the embedding widget to take the Qt focus (L2085).
#ifdef USE_QT4
- WId window = ((QPublicWidget*)tqApp->tqfocusWidget()->tqtopLevelWidget())->effectiveWinId();
+ WId window = ((QPublicWidget*)tqApp->focusWidget()->topLevelWidget())->effectiveWinId();
#else // USE_QT4
- WId window = ((QPublicWidget*)tqApp->tqfocusWidget()->tqtopLevelWidget())->topData()->parentWinId;
+ WId window = ((QPublicWidget*)tqApp->focusWidget()->topLevelWidget())->topData()->parentWinId;
#endif // USE_QT4
- focusMap->remove( tqApp->tqfocusWidget()->tqtopLevelWidget() );
+ focusMap->remove( tqApp->focusWidget()->topLevelWidget() );
sendXEmbedMessage( window, XEMBED_REQUEST_FOCUS );
} else if ( fe->reason() == TQFocusEvent::ActiveWindow ) {
// L0615: Both the embedder and the embedded client became active.
@@ -332,20 +332,20 @@ bool QXEmbedAppFilter::eventFilter( TQObject *o, TQEvent * e)
// So we clear the Qt focus for now. If indeed the QXEmbed widget
// has the focus, it will receive a FocusIn message (L1530) and
// tell us to restore the focus (L0680, L0683).
- focusMap->remove( tqApp->tqfocusWidget()->tqtopLevelWidget() );
- focusMap->insert( tqApp->tqfocusWidget()->tqtopLevelWidget(),
- new TQGuardedPtr<TQWidget>(tqApp->tqfocusWidget()->tqtopLevelWidget()->tqfocusWidget() ) );
- // L0616: tqApp->tqfocusWidget() might belong to a modal dialog and not be
- // equal to tqApp->tqfocusWidget()->tqtopLevelWidget()->tqfocusWidget() !
- tqApp->tqfocusWidget()->clearFocus();
+ focusMap->remove( tqApp->focusWidget()->topLevelWidget() );
+ focusMap->insert( tqApp->focusWidget()->topLevelWidget(),
+ new TQGuardedPtr<TQWidget>(tqApp->focusWidget()->topLevelWidget()->focusWidget() ) );
+ // L0616: tqApp->focusWidget() might belong to a modal dialog and not be
+ // equal to tqApp->focusWidget()->topLevelWidget()->focusWidget() !
+ tqApp->focusWidget()->clearFocus();
// L0617: ??? [why not {obeyFocus=false; return true;} here?]
}
obeyFocus = false;
}
break;
case TQEvent::KeyPress:
- if (TQT_BASE_OBJECT(tqApp->tqfocusWidget()) == TQT_BASE_OBJECT(o) &&
- ((QPublicWidget*)tqApp->tqfocusWidget()->tqtopLevelWidget())->topData()->embedded ) {
+ if (TQT_BASE_OBJECT(tqApp->focusWidget()) == TQT_BASE_OBJECT(o) &&
+ ((QPublicWidget*)tqApp->focusWidget()->topLevelWidget())->topData()->embedded ) {
// L0620: The following code replaces the Qt code that
// handles focus focus changes with the tab key. See the
// XEMBED specification for details. The keypress event
@@ -359,7 +359,7 @@ bool QXEmbedAppFilter::eventFilter( TQObject *o, TQEvent * e)
// (L0653, L0654) which then performs tab navigation
// (L2081).
TQKeyEvent *k = (TQKeyEvent *)e;
- TQWidget *w = tqApp->tqfocusWidget();
+ TQWidget *w = tqApp->focusWidget();
// L0621: The following tests are copied from TQWidget::event().
bool res = false;
bool tabForward = true;
@@ -387,19 +387,19 @@ bool QXEmbedAppFilter::eventFilter( TQObject *o, TQEvent * e)
// Now check whether we have been looping around.
TQFocusData *fd = ((QPublicWidget*)w)->focusData();
#ifdef USE_QT4
- WId window = ((QPublicWidget*)w->tqtopLevelWidget())->effectiveWinId();
+ WId window = ((QPublicWidget*)w->topLevelWidget())->effectiveWinId();
#else // USE_QT4
- WId window = ((QPublicWidget*)w->tqtopLevelWidget())->topData()->parentWinId;
+ WId window = ((QPublicWidget*)w->topLevelWidget())->topData()->parentWinId;
#endif // USE_QT4
TQWidget *cw = 0;
TQWidget *fw = fd->home();
if (tabForward && window) {
- while (cw != w && cw != fw && cw != w->tqtopLevelWidget())
+ while (cw != w && cw != fw && cw != w->topLevelWidget())
cw = fd->prev();
if (cw != w)
sendXEmbedMessage( window, XEMBED_FOCUS_NEXT );
} else if (window) {
- while (cw != w && cw != fw && cw != w->tqtopLevelWidget())
+ while (cw != w && cw != fw && cw != w->topLevelWidget())
cw = fd->next();
if (cw != w)
sendXEmbedMessage( window, XEMBED_FOCUS_PREV );
@@ -443,7 +443,7 @@ static int qxembed_x11_event_filter( XEvent* e)
switch ( message) {
case XEMBED_EMBEDDED_NOTIFY: {
// L0675: We just have been embedded into a XEMBED aware widget.
- TQTLWExtra *extra = ((QPublicWidget*)w->tqtopLevelWidget())->topData();
+ TQTLWExtra *extra = ((QPublicWidget*)w->topLevelWidget())->topData();
extra->embedded = 1;
#ifdef USE_QT4
// [FIXME]
@@ -451,7 +451,7 @@ static int qxembed_x11_event_filter( XEvent* e)
#else // USE_QT4
extra->parentWinId = e->xclient.data.l[3];
#endif // USE_QT4
- w->tqtopLevelWidget()->show();
+ w->topLevelWidget()->show();
break;
}
case XEMBED_WINDOW_ACTIVATE: {
@@ -464,7 +464,7 @@ static int qxembed_x11_event_filter( XEvent* e)
memset(&ev, 0, sizeof(ev));
ev.xfocus.display = qt_xdisplay();
ev.xfocus.type = XFocusIn;
- ev.xfocus.window = w->tqtopLevelWidget()->winId();
+ ev.xfocus.window = w->topLevelWidget()->winId();
ev.xfocus.mode = NotifyNormal;
ev.xfocus.detail = NotifyAncestor;
tqApp->x11ProcessEvent( &ev );
@@ -478,7 +478,7 @@ static int qxembed_x11_event_filter( XEvent* e)
memset(&ev, 0, sizeof(ev));
ev.xfocus.display = qt_xdisplay();
ev.xfocus.type = XFocusOut;
- ev.xfocus.window = w->tqtopLevelWidget()->winId();
+ ev.xfocus.window = w->topLevelWidget()->winId();
ev.xfocus.mode = NotifyNormal;
ev.xfocus.detail = NotifyAncestor;
tqApp->x11ProcessEvent( &ev );
@@ -489,11 +489,11 @@ static int qxembed_x11_event_filter( XEvent* e)
{
// L0681: Search saved focus widget.
TQWidget* focusCurrent = 0;
- TQGuardedPtr<TQWidget>* fw = focusMap->find( w->tqtopLevelWidget() );
+ TQGuardedPtr<TQWidget>* fw = focusMap->find( w->topLevelWidget() );
if ( fw ) {
focusCurrent = *fw;
// L0682: Remove it from the map
- focusMap->remove( w->tqtopLevelWidget() );
+ focusMap->remove( w->topLevelWidget() );
}
switch ( detail ) {
case XEMBED_FOCUS_CURRENT:
@@ -503,19 +503,19 @@ static int qxembed_x11_event_filter( XEvent* e)
if( QXEmbed* emb = tqt_dynamic_cast< QXEmbed* >( focusCurrent ))
emb->updateEmbeddedFocus( true );
}
- else if ( !w->tqtopLevelWidget()->tqfocusWidget() )
- w->tqtopLevelWidget()->setFocus();
+ else if ( !w->topLevelWidget()->focusWidget() )
+ w->topLevelWidget()->setFocus();
break;
case XEMBED_FOCUS_FIRST:
{
// L0684: Search first widget in tab chain
#ifdef USE_QT4
- w->tqtopLevelWidget()->setFocus();
- ((QPublicWidget*)w->tqtopLevelWidget())->focusNextPrev(true);
+ w->topLevelWidget()->setFocus();
+ ((QPublicWidget*)w->topLevelWidget())->focusNextPrev(true);
#else // USE_QT4
TQFocusEvent::setReason( TQFocusEvent::Tab );
- w->tqtopLevelWidget()->setFocus();
- ((QPublicWidget*)w->tqtopLevelWidget())->focusNextPrev(true);
+ w->topLevelWidget()->setFocus();
+ ((QPublicWidget*)w->topLevelWidget())->focusNextPrev(true);
TQFocusEvent::resetReason();
#endif // USE_QT4
}
@@ -524,12 +524,12 @@ static int qxembed_x11_event_filter( XEvent* e)
{
// L0686: Search last widget in tab chain
#ifdef USE_QT4
- w->tqtopLevelWidget()->setFocus();
- ((QPublicWidget*)w->tqtopLevelWidget())->focusNextPrev(false);
+ w->topLevelWidget()->setFocus();
+ ((QPublicWidget*)w->topLevelWidget())->focusNextPrev(false);
#else // USE_QT4
TQFocusEvent::setReason( TQFocusEvent::Backtab );
- w->tqtopLevelWidget()->setFocus();
- ((QPublicWidget*)w->tqtopLevelWidget())->focusNextPrev(false);
+ w->topLevelWidget()->setFocus();
+ ((QPublicWidget*)w->topLevelWidget())->focusNextPrev(false);
TQFocusEvent::resetReason();
#endif // USE_QT4
}
@@ -543,12 +543,12 @@ static int qxembed_x11_event_filter( XEvent* e)
// L0688: Embedding application takes the focus away
// We first record what the focus widget was
// and clear the Qt focus.
- if ( w->tqtopLevelWidget()->tqfocusWidget() ) {
- if( QXEmbed* emb = tqt_dynamic_cast< QXEmbed* >( w->tqtopLevelWidget()->tqfocusWidget()))
+ if ( w->topLevelWidget()->focusWidget() ) {
+ if( QXEmbed* emb = tqt_dynamic_cast< QXEmbed* >( w->topLevelWidget()->focusWidget()))
emb->updateEmbeddedFocus( false );
- focusMap->insert( w->tqtopLevelWidget(),
- new TQGuardedPtr<TQWidget>(w->tqtopLevelWidget()->tqfocusWidget() ) );
- w->tqtopLevelWidget()->tqfocusWidget()->clearFocus();
+ focusMap->insert( w->topLevelWidget(),
+ new TQGuardedPtr<TQWidget>(w->topLevelWidget()->focusWidget() ) );
+ w->topLevelWidget()->focusWidget()->clearFocus();
}
break;
default:
@@ -651,7 +651,7 @@ QXEmbed::QXEmbed(TQWidget *parent, const char *name, WFlags f)
// whole embedding application. They compete between themselves and
// against Qt (L0690, L0914, L1040, L1310, L1510, L1580).
// This would be much simpler if implemented within Qt.
- d->focusProxy = new TQWidget( tqtopLevelWidget(), "xembed_focus" );
+ d->focusProxy = new TQWidget( topLevelWidget(), "xembed_focus" );
d->focusProxy->setGeometry( -1, -1, 1, 1 );
d->focusProxy->show();
// make sure it's shown - for XSetInputFocus
@@ -686,13 +686,13 @@ QXEmbed::QXEmbed(TQWidget *parent, const char *name, WFlags f)
// L0913: all application events pass through eventFilter().
// This is mostly used to force the X11 focus on the
// proxy focus window. See L1300.
- tqtopLevelWidget()->installEventFilter( this );
+ topLevelWidget()->installEventFilter( this );
tqApp->installEventFilter( this );
// L0914: Start moving the X11 focus on the focus proxy window.
// See L1581 to know why we do not use isActiveWindow().
- if ( tqApp->activeWindow() == tqtopLevelWidget() )
- if ( !((QPublicWidget*) tqtopLevelWidget())->topData()->embedded )
+ if ( tqApp->activeWindow() == topLevelWidget() )
+ if ( !((QPublicWidget*) topLevelWidget())->topData()->embedded )
XSetInputFocus( qt_xdisplay(), d->focusProxy->winId(),
RevertToParent, GET_QT_X_TIME() );
// L0915: ??? [drag&drop?]
@@ -746,7 +746,7 @@ QXEmbed::~QXEmbed()
int revert;
XGetInputFocus( qt_xdisplay(), &focus, &revert );
if( focus == d->focusProxy->winId())
- XSetInputFocus( qt_xdisplay(), tqtopLevelWidget()->winId(), RevertToParent, GET_QT_X_TIME() );
+ XSetInputFocus( qt_xdisplay(), topLevelWidget()->winId(), RevertToParent, GET_QT_X_TIME() );
// L01045: Delete our private data.
delete d;
}
@@ -810,10 +810,10 @@ bool QXEmbed::eventFilter( TQObject *o, TQEvent * e)
switch ( e->type() ) {
case TQEvent::WindowActivate:
- if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(tqtopLevelWidget()) ) {
+ if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(topLevelWidget()) ) {
// L1310: Qt thinks the application window has just been activated.
// Make sure the X11 focus is on the focus proxy window. See L0686.
- if ( !((QPublicWidget*) tqtopLevelWidget())->topData()->embedded )
+ if ( !((QPublicWidget*) topLevelWidget())->topData()->embedded )
if (! hasFocus() )
XSetInputFocus( qt_xdisplay(), d->focusProxy->winId(),
RevertToParent, GET_QT_X_TIME() );
@@ -826,7 +826,7 @@ bool QXEmbed::eventFilter( TQObject *o, TQEvent * e)
}
break;
case TQEvent::WindowDeactivate:
- if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(tqtopLevelWidget()) ) {
+ if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(topLevelWidget()) ) {
if (d->xplain)
// L1321: Activation has changed. Grab state might change. See L2800.
checkGrab();
@@ -838,7 +838,7 @@ bool QXEmbed::eventFilter( TQObject *o, TQEvent * e)
case TQEvent::Move:
{
TQWidget* pos = this;
- while( TQT_BASE_OBJECT(pos) != TQT_BASE_OBJECT(o) && TQT_BASE_OBJECT(pos) != TQT_BASE_OBJECT(tqtopLevelWidget()))
+ while( TQT_BASE_OBJECT(pos) != TQT_BASE_OBJECT(o) && TQT_BASE_OBJECT(pos) != TQT_BASE_OBJECT(topLevelWidget()))
pos = pos->parentWidget();
if( TQT_BASE_OBJECT(pos) == TQT_BASE_OBJECT(o) ) {
// L1390: Send fake configure notify events whenever the
@@ -894,8 +894,8 @@ void QXEmbed::focusInEvent( TQFocusEvent * e ){
return;
// L1510: This is a good time to set the X11 focus on the focus proxy window.
// Except if the the embedding application itself is embedded into another.
- if ( !((QPublicWidget*) tqtopLevelWidget())->topData()->embedded )
- if ( tqApp->activeWindow() == tqtopLevelWidget() )
+ if ( !((QPublicWidget*) topLevelWidget())->topData()->embedded )
+ if ( tqApp->activeWindow() == topLevelWidget() )
// L1511: Alter X focus only when window is active.
// This is dual safety here because FocusIn implies this.
// But see L1581 for an example where this really matters.
@@ -943,8 +943,8 @@ void QXEmbed::focusOutEvent( TQFocusEvent * ){
// is properly set to the X11 focus widget. We do this because
// the client application might have moved the X11 focus after
// receiving the fake focus messages.
- if ( !((QPublicWidget*) tqtopLevelWidget())->topData()->embedded )
- if ( tqApp->activeWindow() == tqtopLevelWidget() )
+ if ( !((QPublicWidget*) topLevelWidget())->topData()->embedded )
+ if ( tqApp->activeWindow() == topLevelWidget() )
// L1581: Alter X focus only when window is active.
// The test above is not the same as isActiveWindow().
// Function isActiveWindow() also returns true when a modal
@@ -1210,13 +1210,13 @@ bool QXEmbed::x11Event( XEvent* e)
break;
// L2085: The client asks for the focus.
case XEMBED_REQUEST_FOCUS:
- if( ((QPublicWidget*)tqtopLevelWidget())->topData()->embedded ) {
- focusMap->remove( tqtopLevelWidget() );
- focusMap->insert( tqtopLevelWidget(), new TQGuardedPtr<TQWidget>( this ));
+ if( ((QPublicWidget*)topLevelWidget())->topData()->embedded ) {
+ focusMap->remove( topLevelWidget() );
+ focusMap->insert( topLevelWidget(), new TQGuardedPtr<TQWidget>( this ));
#ifdef USE_QT4
- WId window = ((QPublicWidget*)tqtopLevelWidget())->effectiveWinId();
+ WId window = ((QPublicWidget*)topLevelWidget())->effectiveWinId();
#else // USE_QT4
- WId window = ((QPublicWidget*)tqtopLevelWidget())->topData()->parentWinId;
+ WId window = ((QPublicWidget*)topLevelWidget())->topData()->parentWinId;
#endif // USE_QT4
sendXEmbedMessage( window, XEMBED_REQUEST_FOCUS );
} else {
diff --git a/tdeui/tests/kdialogbasetest.cpp b/tdeui/tests/kdialogbasetest.cpp
index 35da840a1..07e8a8ca9 100644
--- a/tdeui/tests/kdialogbasetest.cpp
+++ b/tdeui/tests/kdialogbasetest.cpp
@@ -64,7 +64,7 @@ int main(int argc, char** argv)
widget may change before the dialog is shown. Additionally, setting a
help chapter may cause a need for adjustment since it modifies the height
of the upper frame. */
- dialog.resize(dialog.tqminimumSize());
+ dialog.resize(dialog.minimumSize());
/* The dialog object is used just as any other TQDialog: */
if(dialog.exec())
{
diff --git a/tdeui/tests/kdockwidgetdemo.cpp b/tdeui/tests/kdockwidgetdemo.cpp
index 9b65db594..b4d1bd30b 100644
--- a/tdeui/tests/kdockwidgetdemo.cpp
+++ b/tdeui/tests/kdockwidgetdemo.cpp
@@ -82,7 +82,7 @@ SFileDialog::SFileDialog( TQString initially, const TQStringList& filter, const
:TQDialog(0L,name,true)
{
KConfig* config = kapp->config();
- config->setGroup( TQString::tqfromLatin1("SFileDialogData:") + name );
+ config->setGroup( TQString::fromLatin1("SFileDialogData:") + name );
if ( initially.isNull() ){
initially = config->readPathEntry( "InitiallyDir", TQDir::currentDirPath() );
}
@@ -643,7 +643,7 @@ void Directory::setOpen( bool o )
return;
}
- listView()->tqsetUpdatesEnabled( false );
+ listView()->setUpdatesEnabled( false );
const QFileInfoList * files = thisDir.entryInfoList();
if ( files ){
QFileInfoListIterator it( *files );
@@ -654,7 +654,7 @@ void Directory::setOpen( bool o )
(void)new Directory( this, f->fileName() );
}
}
- listView()->tqsetUpdatesEnabled( true );
+ listView()->setUpdatesEnabled( true );
}
TQListViewItem::setOpen( o );
}
@@ -777,13 +777,13 @@ int main(int argc, char* argv[]) {
#endif
#if 0
- qDebug ( SFileDialog::getOpenFileName( TQString::null, TQString::tqfromLatin1("All (*)"),
- TQString::tqfromLatin1("DockWidget Demo"), "dialog1" ) );
+ qDebug ( SFileDialog::getOpenFileName( TQString::null, TQString::fromLatin1("All (*)"),
+ TQString::fromLatin1("DockWidget Demo"), "dialog1" ) );
#endif
#if 1
- TQStringList s = SFileDialog::getOpenFileNames( TQString::null, TQString::tqfromLatin1("All (*)"),
- TQString::tqfromLatin1("DockWidget Demo"), "dialog1" );
+ TQStringList s = SFileDialog::getOpenFileNames( TQString::null, TQString::fromLatin1("All (*)"),
+ TQString::fromLatin1("DockWidget Demo"), "dialog1" );
TQStringList::Iterator it = s.begin();
for ( ; it != s.end(); ++it ){
qDebug( "%s", (*it).local8Bit().data() );
diff --git a/tdeui/tests/kdualcolortest.cpp b/tdeui/tests/kdualcolortest.cpp
index 942d52f8d..2060a9842 100644
--- a/tdeui/tests/kdualcolortest.cpp
+++ b/tdeui/tests/kdualcolortest.cpp
@@ -10,8 +10,8 @@ KDualColorWidget::KDualColorWidget(TQWidget *parent, const char *name)
{
lbl = new TQLabel("Testing, testing, 1, 2, 3...", this);
KDualColorButton *colorBtn =
- new KDualColorButton(lbl->tqcolorGroup().text(),
- lbl->tqcolorGroup().background(), this);
+ new KDualColorButton(lbl->colorGroup().text(),
+ lbl->colorGroup().background(), this);
connect(colorBtn, TQT_SIGNAL(fgChanged(const TQColor &)),
TQT_SLOT(slotFgChanged(const TQColor &)));
connect(colorBtn, TQT_SIGNAL(bgChanged(const TQColor &)),
diff --git a/tdeui/tests/keditlistboxtest.cpp b/tdeui/tests/keditlistboxtest.cpp
index fdc90a742..90dbb74d0 100644
--- a/tdeui/tests/keditlistboxtest.cpp
+++ b/tdeui/tests/keditlistboxtest.cpp
@@ -7,14 +7,14 @@ int main( int argc, char **argv )
KApplication app( argc, argv, "keditlistboxtest" );
KEditListBox::CustomEditor editor( new KComboBox( true, 0L, "test" ) );
- KEditListBox *box = new KEditListBox( TQString::tqfromLatin1("KEditListBox"),
+ KEditListBox *box = new KEditListBox( TQString::fromLatin1("KEditListBox"),
editor );
- box->insertItem( TQString::tqfromLatin1("Test") );
- box->insertItem( TQString::tqfromLatin1("for") );
- box->insertItem( TQString::tqfromLatin1("this") );
- box->insertItem( TQString::tqfromLatin1("KEditListBox") );
- box->insertItem( TQString::tqfromLatin1("Widget") );
+ box->insertItem( TQString::fromLatin1("Test") );
+ box->insertItem( TQString::fromLatin1("for") );
+ box->insertItem( TQString::fromLatin1("this") );
+ box->insertItem( TQString::fromLatin1("KEditListBox") );
+ box->insertItem( TQString::fromLatin1("Widget") );
box->show();
return app.exec();
diff --git a/tdeui/tests/kmessageboxtest.cpp b/tdeui/tests/kmessageboxtest.cpp
index 31f8f1735..1b926739f 100644
--- a/tdeui/tests/kmessageboxtest.cpp
+++ b/tdeui/tests/kmessageboxtest.cpp
@@ -79,11 +79,11 @@ case 1:
i = KMessageBox::warningContinueCancel(w,
"You are about to <Print>.\n"
"Are you sure?",
- "Print", TQString::tqfromLatin1("&Print"), "dontask", false);
+ "Print", TQString::fromLatin1("&Print"), "dontask", false);
i = KMessageBox::warningContinueCancel(0,
"You are about to <Print>.\n"
"Are you sure?",
- "Print", TQString::tqfromLatin1("&Print"), "dontask", KMessageBox::AllowLink);
+ "Print", TQString::fromLatin1("&Print"), "dontask", KMessageBox::AllowLink);
i = KMessageBox::questionYesNo(0, "<p>Do you have a printer? thisisaverylongdkldhklghklghklashgkllasghkdlsghkldfghklsabla bla bbla bla. It also has <a href=http://www.kde.org>this URL</a>.</p>",
TQString("Bla"), TQString("Yes"), TQString("No"), "bla", KMessageBox::AllowLink);
break;
@@ -96,7 +96,7 @@ case 2:
case 3:
i = KMessageBox::questionYesNo(0,
"Does your printer support color or only black and white?",
- "Printer setup", TQString::tqfromLatin1("&Color"), TQString::tqfromLatin1("&Black & White"));
+ "Printer setup", TQString::fromLatin1("&Color"), TQString::fromLatin1("&Black & White"));
break;
case 4:
@@ -123,13 +123,13 @@ case 6:
i = KMessageBox::warningContinueCancel(0,
"You are about to print.\n"
"Are you sure?",
- "Print", TQString::tqfromLatin1("&Print"));
+ "Print", TQString::fromLatin1("&Print"));
break;
case 7:
i = KMessageBox::warningContinueCancel(0,
"You are about to <Print>.\n"
"Are you sure?",
- "Print", TQString::tqfromLatin1("&Print"), "dontask", false);
+ "Print", TQString::fromLatin1("&Print"), "dontask", false);
break;
case 8:
@@ -142,14 +142,14 @@ case 9:
i = KMessageBox::warningYesNoCancel(0,
"Your document contains unsaved changes.\n"
"Do you want to save your changes?\n",
- TQString::tqfromLatin1("Close"));
+ TQString::fromLatin1("Close"));
break;
case 10:
i = KMessageBox::warningYesNoCancel(0,
"Your document contains unsaved changes.\n"
"Do you want to save or discard your changes?\n",
- "Close", TQString::tqfromLatin1("&Save"), TQString::tqfromLatin1("&Discard") );
+ "Close", TQString::fromLatin1("&Save"), TQString::fromLatin1("&Discard") );
break;
case 11:
diff --git a/tdeui/twindowlistmenu.cpp b/tdeui/twindowlistmenu.cpp
index 1334abd6e..5058695a3 100644
--- a/tdeui/twindowlistmenu.cpp
+++ b/tdeui/twindowlistmenu.cpp
@@ -186,7 +186,7 @@ void KWindowListMenu::init()
}
// Avoid creating unwanted accelerators.
- itemText.replace('&', TQString::tqfromLatin1("&&"));
+ itemText.replace('&', TQString::fromLatin1("&&"));
insertItem( pm, itemText, i);
map.insert(i, info->win());
if (info->win() == active_window)