summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--KDE2PORTING.html2
-rw-r--r--KDE3PORTING.html6
-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/kde/kvideowidget.cpp2
-rw-r--r--arts/knotify/knotify.cpp6
-rw-r--r--dcop/KDE-ICE/ICEmsg.h4
-rw-r--r--dcop/client/dcop.cpp6
-rw-r--r--dcop/client/dcopfind.cpp4
-rw-r--r--dcop/client/dcopstart.cpp2
-rw-r--r--dcop/dcopclient.cpp28
-rw-r--r--dcop/dcopidl2cpp/main.cpp2
-rw-r--r--dcop/dcopidl2cpp/skel.cpp2
-rw-r--r--dcop/dcopidl2cpp/stub.cpp2
-rw-r--r--dcop/dcopidl2cpp/stubimpl.cpp2
-rw-r--r--dcop/dcopidl2cpp/type.h2
-rw-r--r--dcop/dcopref.h2
-rw-r--r--dcop/dcopserver.cpp10
-rw-r--r--interfaces/khexedit/byteseditinterface.h4
-rw-r--r--interfaces/kimproxy/interface/kimiface.h2
-rw-r--r--interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp2
-rw-r--r--interfaces/ktexteditor/editinterfaceext.h2
-rw-r--r--interfaces/ktexteditor/editorchooser.cpp4
-rw-r--r--interfaces/ktexteditor/editorchooser_ui.ui4
-rw-r--r--interfaces/ktexteditor/templateinterface.cpp2
-rw-r--r--kab/addressbook.h2
-rw-r--r--kab/kabapi.cc2
-rw-r--r--kab/qconfigDB.cc8
-rw-r--r--kabc/address.cpp4
-rw-r--r--kabc/addressbook.cpp2
-rw-r--r--kabc/addresseedialog.cpp2
-rw-r--r--kabc/distributionlistdialog.cpp2
-rw-r--r--kabc/distributionlisteditor.cpp2
-rw-r--r--kabc/formats/binaryformat.cpp2
-rw-r--r--kabc/kab2kabc.cpp22
-rw-r--r--kabc/ldapclient.cpp4
-rw-r--r--kabc/ldapconfigwidget.cpp2
-rw-r--r--kabc/ldifconverter.cpp114
-rw-r--r--kabc/ldifconverter.h2
-rw-r--r--kabc/plugins/dir/resourcedirconfig.cpp2
-rw-r--r--kabc/plugins/file/resourcefileconfig.cpp2
-rw-r--r--kabc/plugins/ldapkio/resourceldapkioconfig.cpp2
-rw-r--r--kabc/plugins/net/resourcenetconfig.cpp2
-rw-r--r--kabc/plugins/sql/resourcesqlconfig.cpp2
-rw-r--r--kabc/resourceselectdialog.cpp4
-rw-r--r--kabc/tests/kabcargl.cpp2
-rw-r--r--kabc/tests/testaddresseelist.cpp80
-rw-r--r--kabc/tests/testlock.cpp2
-rw-r--r--kabc/vcard/AdrValue.cpp14
-rw-r--r--kabc/vcard/ContentLine.cpp2
-rw-r--r--kabc/vcard/LangValue.cpp2
-rw-r--r--kabc/vcard/NValue.cpp10
-rw-r--r--kabc/vcard/OrgValue.cpp2
-rw-r--r--kabc/vcard/TextListValue.cpp2
-rw-r--r--kabc/vcard/VCard.cpp2
-rw-r--r--kabc/vcard/testread.cpp2
-rw-r--r--kabc/vcardparser/testread.cpp2
-rw-r--r--kabc/vcardparser/testwrite.cpp4
-rw-r--r--kabc/vcardparser/vcardparser.cpp4
-rw-r--r--kabc/vcardtool.cpp2
-rw-r--r--kate/part/kateautoindent.cpp24
-rw-r--r--kate/part/katebookmarks.cpp10
-rw-r--r--kate/part/katebuffer.cpp32
-rw-r--r--kate/part/katebuffer.h4
-rw-r--r--kate/part/katecmds.cpp10
-rw-r--r--kate/part/katecmds.h2
-rw-r--r--kate/part/katecodecompletion.cpp4
-rw-r--r--kate/part/katecodefoldinghelpers.cpp12
-rw-r--r--kate/part/kateconfig.cpp16
-rw-r--r--kate/part/katedialogs.cpp12
-rw-r--r--kate/part/katedocument.cpp58
-rw-r--r--kate/part/katefactory.cpp2
-rw-r--r--kate/part/katefiletype.cpp52
-rw-r--r--kate/part/katehighlight.cpp60
-rw-r--r--kate/part/katejscript.cpp10
-rw-r--r--kate/part/kateprinter.cpp6
-rw-r--r--kate/part/katerenderer.cpp24
-rw-r--r--kate/part/kateschema.cpp28
-rw-r--r--kate/part/katesearch.cpp8
-rw-r--r--kate/part/katetemplatehandler.cpp10
-rw-r--r--kate/part/katetextline.cpp44
-rw-r--r--kate/part/katetextline.h6
-rw-r--r--kate/part/kateundo.cpp8
-rw-r--r--kate/part/kateview.cpp18
-rw-r--r--kate/part/kateviewhelpers.cpp2
-rw-r--r--kate/part/kateviewinternal.cpp28
-rw-r--r--kate/part/kateviewinternal.h2
-rw-r--r--kate/part/test_regression.cpp12
-rw-r--r--kate/plugins/autobookmarker/autobookmarker.cpp4
-rw-r--r--kate/plugins/insertfile/insertfileplugin.cpp6
-rw-r--r--kate/plugins/isearch/ISearchPlugin.cpp4
-rw-r--r--kate/plugins/kdatatool/kate_kdatatool.cpp8
-rw-r--r--kate/plugins/wordcompletion/docwordcompletion.cpp6
-rw-r--r--kcert/kcertpart.cc12
-rw-r--r--kconf_update/kconf_update.cpp4
-rw-r--r--kded/kbuildservicefactory.cpp14
-rw-r--r--kded/kbuildservicegroupfactory.cpp6
-rw-r--r--kded/kbuildservicetypefactory.cpp18
-rw-r--r--kded/kbuildsycoca.cpp16
-rw-r--r--kded/kctimefactory.cpp8
-rw-r--r--kded/khostname.cpp2
-rw-r--r--kded/vfolder_menu.cpp4
-rw-r--r--kdewidgets/makekdewidgets.cpp18
-rw-r--r--kdoctools/kio_help.cpp18
-rw-r--r--kdoctools/kio_help.h2
-rw-r--r--kdoctools/meinproc.cpp2
-rw-r--r--kdoctools/xslt.cpp10
-rw-r--r--khtml/DESIGN.html2
-rw-r--r--khtml/css/css_base.h2
-rw-r--r--khtml/css/css_renderstyledeclarationimpl.cpp2
-rw-r--r--khtml/css/css_ruleimpl.h2
-rw-r--r--khtml/css/css_valueimpl.cpp6
-rw-r--r--khtml/css/css_valueimpl.h2
-rw-r--r--khtml/css/csshelper.cpp2
-rw-r--r--khtml/css/cssparser.cpp10
-rw-r--r--khtml/css/cssproperties.c4
-rw-r--r--khtml/css/cssstyleselector.cpp44
-rw-r--r--khtml/css/html4.css12
-rw-r--r--khtml/dom/css_extensions.cpp6
-rw-r--r--khtml/dom/css_extensions.h8
-rw-r--r--khtml/dom/css_value.h2
-rw-r--r--khtml/dom/dom_doc.cpp4
-rw-r--r--khtml/dom/dom_string.cpp18
-rw-r--r--khtml/dom/dom_string.h2
-rw-r--r--khtml/dom/html_block.h6
-rw-r--r--khtml/dom/html_form.h2
-rw-r--r--khtml/dom/html_image.cpp2
-rw-r--r--khtml/dom/html_image.h12
-rw-r--r--khtml/dom/html_inline.cpp2
-rw-r--r--khtml/dom/html_inline.h12
-rw-r--r--khtml/dom/html_table.h26
-rw-r--r--khtml/ecma/kjs_binding.cpp4
-rw-r--r--khtml/ecma/kjs_debugwin.cpp48
-rw-r--r--khtml/ecma/kjs_html.cpp8
-rw-r--r--khtml/ecma/kjs_navigator.cpp46
-rw-r--r--khtml/ecma/kjs_proxy.cpp10
-rw-r--r--khtml/ecma/kjs_window.cpp30
-rw-r--r--khtml/ecma/xmlhttprequest.cpp2
-rw-r--r--khtml/html/html_documentimpl.cpp12
-rw-r--r--khtml/html/html_elementimpl.cpp34
-rw-r--r--khtml/html/html_elementimpl.h2
-rw-r--r--khtml/html/html_formimpl.cpp20
-rw-r--r--khtml/html/html_imageimpl.cpp22
-rw-r--r--khtml/html/html_imageimpl.h4
-rw-r--r--khtml/html/html_miscimpl.cpp10
-rw-r--r--khtml/html/htmltokenizer.cpp30
-rw-r--r--khtml/html/htmltokenizer.h4
-rw-r--r--khtml/java/kjavaappletcontext.cpp16
-rw-r--r--khtml/java/kjavaappletserver.cpp22
-rw-r--r--khtml/java/kjavaappletviewer.cpp28
-rw-r--r--khtml/java/kjavaprocess.cpp12
-rw-r--r--khtml/khtml_caret.cpp18
-rw-r--r--khtml/khtml_caret_p.h4
-rw-r--r--khtml/khtml_ext.cpp32
-rw-r--r--khtml/khtml_pagecache.cpp4
-rw-r--r--khtml/khtml_part.cpp150
-rw-r--r--khtml/khtml_printsettings.cpp2
-rw-r--r--khtml/khtml_run.cpp2
-rw-r--r--khtml/khtml_settings.cc32
-rw-r--r--khtml/khtmlview.cpp34
-rw-r--r--khtml/khtmlview.h4
-rw-r--r--khtml/kmultipart/kmultipart.cpp8
-rw-r--r--khtml/misc/arena.cpp4
-rw-r--r--khtml/misc/decoder.cpp2
-rw-r--r--khtml/misc/htmlattrs.c4
-rw-r--r--khtml/misc/khtmllayout.h2
-rw-r--r--khtml/misc/knsplugininstaller.cpp4
-rw-r--r--khtml/misc/loader.cpp12
-rw-r--r--khtml/misc/loader.h2
-rw-r--r--khtml/misc/multimap.h2
-rw-r--r--khtml/misc/stringit.h6
-rw-r--r--khtml/rendering/bidi.cpp26
-rw-r--r--khtml/rendering/break_lines.cpp2
-rw-r--r--khtml/rendering/break_lines.h8
-rw-r--r--khtml/rendering/enumerate.cpp2
-rw-r--r--khtml/rendering/font.cpp4
-rw-r--r--khtml/rendering/render_applet.cpp14
-rw-r--r--khtml/rendering/render_arena.cpp4
-rw-r--r--khtml/rendering/render_block.cpp2
-rw-r--r--khtml/rendering/render_body.cpp4
-rw-r--r--khtml/rendering/render_body.h2
-rw-r--r--khtml/rendering/render_box.cpp6
-rw-r--r--khtml/rendering/render_box.h2
-rw-r--r--khtml/rendering/render_canvas.cpp16
-rw-r--r--khtml/rendering/render_canvas.h2
-rw-r--r--khtml/rendering/render_container.cpp4
-rw-r--r--khtml/rendering/render_flow.cpp6
-rw-r--r--khtml/rendering/render_flow.h2
-rw-r--r--khtml/rendering/render_form.cpp26
-rw-r--r--khtml/rendering/render_frames.cpp42
-rw-r--r--khtml/rendering/render_generated.cpp4
-rw-r--r--khtml/rendering/render_image.cpp4
-rw-r--r--khtml/rendering/render_layer.cpp56
-rw-r--r--khtml/rendering/render_layer.h4
-rw-r--r--khtml/rendering/render_list.cpp12
-rw-r--r--khtml/rendering/render_object.cpp32
-rw-r--r--khtml/rendering/render_object.h8
-rw-r--r--khtml/rendering/render_replaced.cpp10
-rw-r--r--khtml/rendering/render_style.cpp6
-rw-r--r--khtml/rendering/render_style.h10
-rw-r--r--khtml/rendering/render_table.cpp2
-rw-r--r--khtml/rendering/render_text.cpp14
-rw-r--r--khtml/rendering/render_text.h4
-rw-r--r--khtml/test/align2.html10
-rw-r--r--khtml/test/image_map.html10
-rw-r--r--khtml/test_regression.cpp18
-rw-r--r--khtml/test_regression_fontoverload.cpp4
-rw-r--r--khtml/testkhtml.cpp10
-rw-r--r--khtml/xml/dom2_eventsimpl.cpp28
-rw-r--r--khtml/xml/dom_docimpl.cpp4
-rw-r--r--khtml/xml/dom_docimpl.h2
-rw-r--r--khtml/xml/dom_elementimpl.cpp4
-rw-r--r--khtml/xml/dom_nodeimpl.cpp6
-rw-r--r--khtml/xml/dom_stringimpl.cpp12
-rw-r--r--khtml/xml/dom_stringimpl.h2
-rw-r--r--khtml/xml/xml_tokenizer.cpp14
-rw-r--r--khtml/xml/xml_tokenizer.h2
-rw-r--r--kimgio/dds.cpp14
-rw-r--r--kimgio/eps.cpp8
-rw-r--r--kimgio/exr.cpp2
-rw-r--r--kimgio/hdr.cpp10
-rw-r--r--kimgio/ico.cpp14
-rw-r--r--kimgio/jp2.cpp6
-rw-r--r--kimgio/pcx.cpp20
-rw-r--r--kimgio/psd.cpp14
-rw-r--r--kimgio/rgb.cpp8
-rw-r--r--kimgio/tga.cpp12
-rw-r--r--kimgio/tiffr.cpp8
-rw-r--r--kimgio/xcf.cpp60
-rw-r--r--kimgio/xview.cpp4
-rw-r--r--kinit/kdostartupconfig.cpp2
-rw-r--r--kinit/kinit.cpp2
-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/kbookmarkexporter.cc4
-rw-r--r--kio/bookmarks/kbookmarkexporter.h2
-rw-r--r--kio/bookmarks/kbookmarkimporter.cc2
-rw-r--r--kio/bookmarks/kbookmarkimporter_crash.cc2
-rw-r--r--kio/bookmarks/kbookmarkimporter_ie.cc2
-rw-r--r--kio/bookmarks/kbookmarkimporter_kde1.cc2
-rw-r--r--kio/bookmarks/kbookmarkimporter_ns.cc6
-rw-r--r--kio/bookmarks/kbookmarkimporter_opera.cc2
-rw-r--r--kio/bookmarks/kbookmarkmanager.cc18
-rw-r--r--kio/bookmarks/kbookmarkmenu.cc8
-rw-r--r--kio/httpfilter/httpfilter.cc2
-rw-r--r--kio/kfile/config-kfile.h30
-rw-r--r--kio/kfile/kacleditwidget.cpp20
-rw-r--r--kio/kfile/kacleditwidget_p.h4
-rw-r--r--kio/kfile/kcombiview.cpp2
-rw-r--r--kio/kfile/kdiroperator.cpp80
-rw-r--r--kio/kfile/kdirselectdialog.cpp8
-rw-r--r--kio/kfile/kdiskfreesp.cpp4
-rw-r--r--kio/kfile/kencodingfiledialog.cpp8
-rw-r--r--kio/kfile/kfiledetailview.cpp2
-rw-r--r--kio/kfile/kfiledetailview.h2
-rw-r--r--kio/kfile/kfiledialog.cpp38
-rw-r--r--kio/kfile/kfilefiltercombo.cpp4
-rw-r--r--kio/kfile/kfileiconview.cpp26
-rw-r--r--kio/kfile/kfilemetainfowidget.cpp2
-rw-r--r--kio/kfile/kfilemetapreview.cpp2
-rw-r--r--kio/kfile/kfilepreview.cpp2
-rw-r--r--kio/kfile/kfilesharedlg.cpp2
-rw-r--r--kio/kfile/kfilespeedbar.cpp4
-rw-r--r--kio/kfile/kfiletreeview.cpp6
-rw-r--r--kio/kfile/kfileview.cpp2
-rw-r--r--kio/kfile/kfileview.h4
-rw-r--r--kio/kfile/kicondialog.cpp20
-rw-r--r--kio/kfile/kimagefilepreview.cpp2
-rw-r--r--kio/kfile/kmetaprops.cpp4
-rw-r--r--kio/kfile/knotifydialog.cpp22
-rw-r--r--kio/kfile/kopenwith.cpp38
-rw-r--r--kio/kfile/kpreviewprops.cpp2
-rw-r--r--kio/kfile/kpropertiesdialog.cpp90
-rw-r--r--kio/kfile/krecentdirs.cpp4
-rw-r--r--kio/kfile/krecentdocument.cpp32
-rw-r--r--kio/kfile/kurlbar.cpp20
-rw-r--r--kio/kfile/kurlcombobox.cpp8
-rw-r--r--kio/kfile/kurlrequester.cpp2
-rw-r--r--kio/kfile/kurlrequesterdlg.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.cpp40
-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.cpp6
-rw-r--r--kio/kio/dataslave.cpp2
-rw-r--r--kio/kio/defaultprogress.cpp4
-rw-r--r--kio/kio/global.cpp26
-rw-r--r--kio/kio/job.cpp42
-rw-r--r--kio/kio/kacl.cpp10
-rw-r--r--kio/kio/kar.cpp8
-rw-r--r--kio/kio/karchive.cpp6
-rw-r--r--kio/kio/kdatatool.cpp6
-rw-r--r--kio/kio/kdirlister.cpp4
-rw-r--r--kio/kio/kfileitem.cpp4
-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/klimitediodevice.h8
-rw-r--r--kio/kio/kmimemagic.cpp2
-rw-r--r--kio/kio/kmimetype.cpp12
-rw-r--r--kio/kio/kmimetypechooser.cpp6
-rw-r--r--kio/kio/knfsshare.cpp2
-rw-r--r--kio/kio/kprotocolmanager.cpp10
-rw-r--r--kio/kio/kremoteencoding.cpp4
-rw-r--r--kio/kio/kremoteencoding.h2
-rw-r--r--kio/kio/krun.cpp6
-rw-r--r--kio/kio/ksambashare.cpp4
-rw-r--r--kio/kio/kservicefactory.cpp12
-rw-r--r--kio/kio/kservicegroupfactory.cpp4
-rw-r--r--kio/kio/kservicetypefactory.cpp8
-rw-r--r--kio/kio/kshred.cpp6
-rw-r--r--kio/kio/ktar.cpp26
-rw-r--r--kio/kio/kurifilter.cpp12
-rw-r--r--kio/kio/kurlcompletion.cpp14
-rw-r--r--kio/kio/kurlpixmapprovider.cpp2
-rw-r--r--kio/kio/kzip.cpp56
-rw-r--r--kio/kio/netaccess.cpp4
-rw-r--r--kio/kio/netaccess.h2
-rw-r--r--kio/kio/passdlg.cpp6
-rw-r--r--kio/kio/paste.cpp18
-rw-r--r--kio/kio/pastedialog.cpp6
-rw-r--r--kio/kio/previewjob.cpp6
-rw-r--r--kio/kio/renamedlg.cpp2
-rw-r--r--kio/kio/scheduler.cpp4
-rw-r--r--kio/kio/sessiondata.cpp6
-rw-r--r--kio/kio/skipdlg.cpp2
-rw-r--r--kio/kio/slave.cpp4
-rw-r--r--kio/kio/slavebase.h12
-rw-r--r--kio/kio/statusbarprogress.cpp2
-rw-r--r--kio/kpasswdserver/kpasswdserver.cpp2
-rw-r--r--kio/kssl/keygenwizard.ui2
-rw-r--r--kio/kssl/keygenwizard2.ui2
-rw-r--r--kio/kssl/ksslcertdlg.cc2
-rw-r--r--kio/kssl/ksslcertificate.cc6
-rw-r--r--kio/kssl/ksslinfodlg.cc12
-rw-r--r--kio/kssl/ksslpeerinfo.cc2
-rw-r--r--kio/kssl/ksslsettings.cc2
-rw-r--r--kio/misc/kntlm/kntlm.cpp38
-rw-r--r--kio/misc/kntlm/kntlm.h4
-rw-r--r--kio/misc/kpac/downloader.cpp2
-rw-r--r--kio/misc/kpac/script.cpp2
-rw-r--r--kio/misc/ksendbugmail/main.cpp14
-rw-r--r--kio/misc/ksendbugmail/smtp.cpp14
-rw-r--r--kio/misc/kssld/kssld.cpp30
-rw-r--r--kio/misc/kwalletd/kwalletd.cpp4
-rw-r--r--kio/misc/kwalletd/kwalletwizard.ui12
-rw-r--r--kio/misc/uiserver.cpp6
-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/kdirlistertest.cpp2
-rw-r--r--kio/tests/kfiltertest.cpp6
-rw-r--r--kio/tests/kioslavetest.cpp2
-rw-r--r--kio/tests/kruntest.cpp2
-rw-r--r--kio/tests/ksycocatest.cpp2
-rw-r--r--kio/tests/kurifiltertest.cpp4
-rw-r--r--kio/tests/previewtest.cpp2
-rw-r--r--kioslave/file/file.cc30
-rw-r--r--kioslave/ftp/ftp.cc6
-rw-r--r--kioslave/http/http.cc106
-rw-r--r--kioslave/http/http_cache_cleaner.cpp8
-rw-r--r--kioslave/http/kcookiejar/kcookiejar.cpp28
-rw-r--r--kioslave/http/kcookiejar/kcookiejar.h2
-rw-r--r--kioslave/http/kcookiejar/kcookiewin.cpp2
-rw-r--r--kioslave/http/kcookiejar/tests/kcookiejartest.cpp10
-rw-r--r--kioslave/iso/iso.cpp12
-rw-r--r--kioslave/iso/kiso.cpp2
-rw-r--r--kioslave/iso/kisofile.cpp4
-rw-r--r--kjs/internal.cpp2
-rw-r--r--kjs/lexer.cpp2
-rw-r--r--kjs/lexer.h2
-rw-r--r--kjs/regexp.cpp10
-rw-r--r--kjs/regexp_object.cpp2
-rw-r--r--kjs/ustring.cpp6
-rw-r--r--kjs/ustring.h6
-rw-r--r--kmdi/kmdi/dockcontainer.cpp6
-rw-r--r--kmdi/kmdi/guiclient.cpp6
-rw-r--r--kmdi/kmdi/mainwindow.cpp4
-rw-r--r--kmdi/kmdi/tabwidget.cpp6
-rw-r--r--kmdi/kmdichildarea.cpp6
-rw-r--r--kmdi/kmdichildfrm.cpp58
-rw-r--r--kmdi/kmdichildfrm.h2
-rw-r--r--kmdi/kmdichildfrmcaption.cpp4
-rw-r--r--kmdi/kmdidockcontainer.cpp6
-rw-r--r--kmdi/kmdidocumentviewtabwidget.cpp6
-rw-r--r--kmdi/kmdiguiclient.cpp6
-rw-r--r--kmdi/kmdimainfrm.cpp22
-rw-r--r--kmdi/kmdimainfrm.h2
-rw-r--r--kmdi/kmditaskbar.cpp4
-rw-r--r--kmdi/test/hello.cpp2
-rw-r--r--kmdi/test/mainwidget.cpp2
-rw-r--r--kmdi/test/mainwidget.h2
-rw-r--r--knewstuff/downloaddialog.cpp26
-rw-r--r--knewstuff/ghns.cpp4
-rw-r--r--knewstuff/knewstuffgeneric.cpp2
-rw-r--r--knewstuff/providerdialog.cpp2
-rw-r--r--knewstuff/testnewstuff.cpp4
-rw-r--r--knewstuff/uploaddialog.cpp2
-rw-r--r--kparts/browserextension.cpp8
-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.cpp8
-rw-r--r--kparts/partmanager.cpp2
-rw-r--r--kparts/plugin.cpp6
-rw-r--r--kparts/statusbarextension.cpp2
-rw-r--r--kparts/tests/notepad.cpp2
-rw-r--r--kparts/tests/parts.cpp2
-rw-r--r--krandr/ktimerdialog.cpp2
-rw-r--r--krandr/libkrandr.cc12
-rw-r--r--krandr/randr.cpp4
-rw-r--r--kresources/configdialog.cpp2
-rw-r--r--kresources/configpage.cpp10
-rw-r--r--kresources/kcmkresources.cpp2
-rw-r--r--kresources/manager.h2
-rw-r--r--kresources/resource.h2
-rw-r--r--kresources/selectdialog.cpp4
-rw-r--r--krsync/krsync.h2
-rw-r--r--krsync/rsyncconfigdialog.cpp12
-rw-r--r--kspell2/broker.cpp4
-rw-r--r--kspell2/plugins/aspell/kspell_aspelldict.cpp2
-rw-r--r--kspell2/plugins/hspell/kspell_hspelldict.cpp2
-rw-r--r--kspell2/plugins/ispell/ispell_checker.h4
-rw-r--r--kspell2/plugins/ispell/makedent.cpp2
-rw-r--r--kspell2/tests/test_highlighter.cpp2
-rw-r--r--kspell2/ui/configwidget.cpp2
-rw-r--r--kspell2/ui/highlighter.cpp2
-rw-r--r--kspell2/ui/kspell2ui.ui4
-rw-r--r--kstyles/asteroid/asteroid.cpp150
-rw-r--r--kstyles/asteroid/asteroid.h12
-rw-r--r--kstyles/highcolor/highcolor.cpp90
-rw-r--r--kstyles/highcolor/highcolor.h10
-rw-r--r--kstyles/highcontrast/config/highcontrastconfig.cpp2
-rw-r--r--kstyles/highcontrast/highcontrast.cpp70
-rw-r--r--kstyles/highcontrast/highcontrast.h10
-rw-r--r--kstyles/keramik/genembed.cpp2
-rw-r--r--kstyles/keramik/keramik.cpp126
-rw-r--r--kstyles/keramik/keramik.h10
-rw-r--r--kstyles/klegacy/klegacystyle.cpp32
-rw-r--r--kstyles/kthemestyle/kthemebase.cpp24
-rw-r--r--kstyles/kthemestyle/kthemebase.h28
-rw-r--r--kstyles/kthemestyle/kthemestyle.cpp182
-rw-r--r--kstyles/kthemestyle/kthemestyle.h12
-rw-r--r--kstyles/light/lightstyle-v2.cpp130
-rw-r--r--kstyles/light/lightstyle-v2.h10
-rw-r--r--kstyles/light/lightstyle-v3.cpp166
-rw-r--r--kstyles/light/lightstyle-v3.h10
-rw-r--r--kstyles/plastik/config/plastikconf.cpp2
-rw-r--r--kstyles/plastik/plastik.cpp106
-rw-r--r--kstyles/plastik/plastik.h12
-rw-r--r--kstyles/web/webstyle.cpp32
-rw-r--r--kstyles/web/webstyle.h2
-rw-r--r--kunittest/module.h4
-rw-r--r--kunittest/tester.cpp2
-rw-r--r--kunittest/tester.h2
-rw-r--r--kutils/kcmodulecontainer.cpp2
-rw-r--r--kutils/kcmoduleloader.cpp2
-rw-r--r--kutils/kcmoduleproxy.cpp8
-rw-r--r--kutils/kcmultidialog.cpp2
-rw-r--r--kutils/kfind.cpp2
-rw-r--r--kutils/kfinddialog.cpp20
-rw-r--r--kutils/kmultitabbar.cpp124
-rw-r--r--kutils/kmultitabbar.h2
-rw-r--r--kutils/kpluginselector.cpp6
-rw-r--r--kutils/kreplace.cpp2
-rw-r--r--kutils/kreplace.h2
-rw-r--r--kutils/kreplacedialog.cpp2
-rw-r--r--kutils/ksettings/componentsdialog.cpp2
-rw-r--r--kutils/ksettings/pluginpage.cpp2
-rw-r--r--kwallet/backend/kwalletbackend.cc2
-rw-r--r--kwallet/backend/kwalletbackend.h2
-rw-r--r--kwallet/tests/kwalletasync.cpp2
-rw-r--r--kwallet/tests/kwalletboth.cpp2
-rw-r--r--kwallet/tests/kwalletsync.cpp2
-rw-r--r--networkstatus/connectionmanager.cpp2
-rw-r--r--tdecore/kaboutdata.cpp8
-rw-r--r--tdecore/kaccel.cpp6
-rw-r--r--tdecore/kaccelmanager.cpp14
-rw-r--r--tdecore/kallocator.cpp6
-rw-r--r--tdecore/kapplication.cpp34
-rw-r--r--tdecore/kcalendarsystem.cpp4
-rw-r--r--tdecore/kcalendarsystemfactory.h2
-rw-r--r--tdecore/kcalendarsystemgregorian.cpp2
-rw-r--r--tdecore/kcalendarsystemhebrew.cpp14
-rw-r--r--tdecore/kcalendarsystemhijri.cpp2
-rw-r--r--tdecore/kcalendarsystemjalali.cpp2
-rw-r--r--tdecore/kcatalogue.cpp2
-rw-r--r--tdecore/kcharsets.cpp26
-rw-r--r--tdecore/kcheckaccelerators.cpp4
-rw-r--r--tdecore/kclipboard.cpp12
-rw-r--r--tdecore/kclipboard.h2
-rw-r--r--tdecore/kcmdlineargs.cpp4
-rw-r--r--tdecore/kcompletion.cpp24
-rw-r--r--tdecore/kcompletion.h2
-rw-r--r--tdecore/kcompletion_private.h6
-rw-r--r--tdecore/kconfig_compiler/kconfig_compiler.cpp22
-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.cpp14
-rw-r--r--tdecore/kconfigbase.cpp32
-rw-r--r--tdecore/kconfigbase.h8
-rw-r--r--tdecore/kconfigdialogmanager.cpp6
-rw-r--r--tdecore/kconfigskeleton.h10
-rw-r--r--tdecore/kdcoppropertyproxy.cpp10
-rw-r--r--tdecore/kde-config.cpp.cmake4
-rw-r--r--tdecore/kde-config.cpp.in2
-rw-r--r--tdecore/kdebug.cpp12
-rw-r--r--tdecore/kdebug.h8
-rw-r--r--tdecore/kdesktopfile.cpp24
-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.cpp10
-rw-r--r--tdecore/kglobalsettings.cpp6
-rw-r--r--tdecore/kiconeffect.cpp6
-rw-r--r--tdecore/kiconloader.cpp6
-rw-r--r--tdecore/kicontheme.cpp6
-rw-r--r--tdecore/kidna.cpp4
-rw-r--r--tdecore/kkeyserver_x11.cpp14
-rw-r--r--tdecore/klibloader.cpp16
-rw-r--r--tdecore/klocale.cpp80
-rw-r--r--tdecore/klockfile.cpp2
-rw-r--r--tdecore/kmacroexpander.cpp26
-rw-r--r--tdecore/knotifyclient.cpp12
-rw-r--r--tdecore/kpalette.cpp8
-rw-r--r--tdecore/kprocctrl.cpp2
-rw-r--r--tdecore/kprocess.h2
-rw-r--r--tdecore/kprocio.cpp2
-rw-r--r--tdecore/kprocio.h2
-rw-r--r--tdecore/kprotocolinfo_tdecore.cpp2
-rw-r--r--tdecore/kregexp.h4
-rw-r--r--tdecore/krfcdate.cpp2
-rw-r--r--tdecore/krootprop.cpp2
-rw-r--r--tdecore/ksavefile.cpp2
-rw-r--r--tdecore/ksavefile.h2
-rw-r--r--tdecore/kshell.cpp36
-rw-r--r--tdecore/ksimpleconfig.cpp2
-rw-r--r--tdecore/ksockaddr.cpp4
-rw-r--r--tdecore/kstandarddirs.cpp42
-rw-r--r--tdecore/kstartupinfo.cpp72
-rw-r--r--tdecore/kstringhandler.cpp24
-rw-r--r--tdecore/ksycoca.cpp12
-rw-r--r--tdecore/ksycocadict.cpp24
-rw-r--r--tdecore/ksycocaentry.h2
-rw-r--r--tdecore/ksycocafactory.cpp20
-rw-r--r--tdecore/ktempfile.cpp2
-rw-r--r--tdecore/ktimezones.cpp6
-rw-r--r--tdecore/kurl.cpp28
-rw-r--r--tdecore/kurl.h10
-rw-r--r--tdecore/kurldrag.h2
-rw-r--r--tdecore/malloc/malloc.c106
-rw-r--r--tdecore/network/kclientsocketbase.cpp2
-rw-r--r--tdecore/network/khttpproxysocketdevice.cpp2
-rw-r--r--tdecore/network/kresolver.cpp30
-rw-r--r--tdecore/network/kresolver.h4
-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.cpp28
-rw-r--r--tdecore/network/ksocketaddress.h4
-rw-r--r--tdecore/network/ksocketbase.cpp2
-rw-r--r--tdecore/network/ksrvresolverworker.cpp8
-rw-r--r--tdecore/svgicons/ksvgiconengine.cpp14
-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/kconfigtestgui.h2
-rw-r--r--tdecore/tests/klocaletest.cpp26
-rw-r--r--tdecore/tests/kresolvertest.cpp8
-rw-r--r--tdecore/tests/krfcdatetest.cpp2
-rw-r--r--tdecore/tests/ktimezonestest.cpp2
-rw-r--r--tdecore/tests/kurltest.cpp4
-rw-r--r--tdefx/kdrawutil.h4
-rw-r--r--tdefx/kimageeffect.cpp6
-rw-r--r--tdefx/kstyle.cpp66
-rw-r--r--tdefx/kstyle.h12
-rw-r--r--tdeprint/cups/cupsaddsmb2.cpp6
-rw-r--r--tdeprint/cups/cupsdconf2/addressdialog.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/browsedialog.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/cupsdconf.h2
-rw-r--r--tdeprint/cups/cupsdconf2/cupsddirpage.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/cupsdfilterpage.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/cupsdjobspage.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/cupsdlogpage.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp6
-rw-r--r--tdeprint/cups/cupsdconf2/cupsdserverpage.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/cupsdsplash.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/editlist.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/locationdialog.cpp4
-rw-r--r--tdeprint/cups/cupsdconf2/portdialog.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/qdirlineedit.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/sizewidget.cpp2
-rw-r--r--tdeprint/cups/cupsinfos.cpp4
-rw-r--r--tdeprint/cups/imagepreview.cpp2
-rw-r--r--tdeprint/cups/ippreportdlg.cpp2
-rw-r--r--tdeprint/cups/ipprequest.cpp2
-rw-r--r--tdeprint/cups/ipprequest.h2
-rw-r--r--tdeprint/cups/kcupsprinterimpl.cpp6
-rw-r--r--tdeprint/cups/kmconfigcups.cpp2
-rw-r--r--tdeprint/cups/kmconfigcupsdir.cpp2
-rw-r--r--tdeprint/cups/kmcupsconfigwidget.cpp6
-rw-r--r--tdeprint/cups/kmcupsjobmanager.cpp6
-rw-r--r--tdeprint/cups/kmcupsmanager.cpp24
-rw-r--r--tdeprint/cups/kmpropbanners.cpp2
-rw-r--r--tdeprint/cups/kmpropquota.cpp2
-rw-r--r--tdeprint/cups/kmpropusers.cpp6
-rw-r--r--tdeprint/cups/kmwbanners.cpp2
-rw-r--r--tdeprint/cups/kmwfax.cpp6
-rw-r--r--tdeprint/cups/kmwipp.cpp2
-rw-r--r--tdeprint/cups/kmwippprinter.cpp10
-rw-r--r--tdeprint/cups/kmwippselect.cpp8
-rw-r--r--tdeprint/cups/kmwother.cpp2
-rw-r--r--tdeprint/cups/kmwquota.cpp2
-rw-r--r--tdeprint/cups/kmwusers.cpp2
-rw-r--r--tdeprint/cups/kphpgl2page.cpp2
-rw-r--r--tdeprint/cups/kpimagepage.cpp10
-rw-r--r--tdeprint/cups/kpschedulepage.cpp2
-rw-r--r--tdeprint/cups/kptagspage.cpp2
-rw-r--r--tdeprint/cups/kptextpage.cpp2
-rw-r--r--tdeprint/driver.cpp4
-rw-r--r--tdeprint/driveritem.cpp6
-rw-r--r--tdeprint/driverview.cpp2
-rw-r--r--tdeprint/droptionview.cpp2
-rw-r--r--tdeprint/foomatic/kfoomaticprinterimpl.cpp2
-rw-r--r--tdeprint/foomatic/kmfoomaticmanager.cpp2
-rw-r--r--tdeprint/kfilelist.cpp2
-rw-r--r--tdeprint/kmfactory.cpp6
-rw-r--r--tdeprint/kmjob.cpp2
-rw-r--r--tdeprint/kmjobmanager.cpp2
-rw-r--r--tdeprint/kmmanager.cpp6
-rw-r--r--tdeprint/kmspecialmanager.cpp6
-rw-r--r--tdeprint/kmthreadjob.cpp2
-rw-r--r--tdeprint/kmvirtualmanager.cpp2
-rw-r--r--tdeprint/kpcopiespage.cpp8
-rw-r--r--tdeprint/kpdriverpage.cpp2
-rw-r--r--tdeprint/kpfileselectpage.cpp2
-rw-r--r--tdeprint/kpfilterpage.cpp2
-rw-r--r--tdeprint/kpgeneralpage.cpp16
-rw-r--r--tdeprint/kpmarginpage.cpp2
-rw-r--r--tdeprint/kpposterpage.cpp2
-rw-r--r--tdeprint/kpqtpage.cpp10
-rw-r--r--tdeprint/kprintdialog.cpp14
-rw-r--r--tdeprint/kprinter.cpp4
-rw-r--r--tdeprint/kprinterimpl.cpp2
-rw-r--r--tdeprint/kprintpreview.cpp4
-rw-r--r--tdeprint/lpd/gschecker.cpp4
-rw-r--r--tdeprint/lpd/klpdprinterimpl.cpp2
-rw-r--r--tdeprint/lpd/kmlpdmanager.cpp54
-rw-r--r--tdeprint/lpd/lpdtools.cpp10
-rw-r--r--tdeprint/lpd/lpdtools.h2
-rw-r--r--tdeprint/lpdunix/klpdunixprinterimpl.cpp4
-rw-r--r--tdeprint/lpdunix/kmlpdunixmanager.cpp6
-rw-r--r--tdeprint/lpr/apshandler.cpp10
-rw-r--r--tdeprint/lpr/editentrydialog.cpp2
-rw-r--r--tdeprint/lpr/klprprinterimpl.cpp4
-rw-r--r--tdeprint/lpr/kmconfiglpr.cpp2
-rw-r--r--tdeprint/lpr/kmlprmanager.cpp4
-rw-r--r--tdeprint/lpr/lpchelper.cpp2
-rw-r--r--tdeprint/lpr/lpchelper.h2
-rw-r--r--tdeprint/lpr/lprhandler.cpp2
-rw-r--r--tdeprint/lpr/lprngtoolhandler.cpp8
-rw-r--r--tdeprint/lpr/lprsettings.cpp2
-rw-r--r--tdeprint/lpr/matichandler.cpp10
-rw-r--r--tdeprint/lpr/printcapentry.h2
-rw-r--r--tdeprint/lpr/printcapreader.cpp2
-rw-r--r--tdeprint/lpr/printcapreader.h2
-rw-r--r--tdeprint/management/cjanuswidget.cpp2
-rw-r--r--tdeprint/management/kmconfigcommand.cpp2
-rw-r--r--tdeprint/management/kmconfigdialog.cpp2
-rw-r--r--tdeprint/management/kmconfigfilter.cpp2
-rw-r--r--tdeprint/management/kmconfigfonts.cpp2
-rw-r--r--tdeprint/management/kmconfiggeneral.cpp2
-rw-r--r--tdeprint/management/kmconfigjobs.cpp2
-rw-r--r--tdeprint/management/kmconfigpreview.cpp2
-rw-r--r--tdeprint/management/kmdbcreator.cpp2
-rw-r--r--tdeprint/management/kmdriverdb.cpp4
-rw-r--r--tdeprint/management/kmdriverdbwidget.cpp4
-rw-r--r--tdeprint/management/kmiconview.cpp6
-rw-r--r--tdeprint/management/kminfopage.cpp4
-rw-r--r--tdeprint/management/kminstancepage.cpp2
-rw-r--r--tdeprint/management/kmjobviewer.cpp8
-rw-r--r--tdeprint/management/kmlistview.cpp4
-rw-r--r--tdeprint/management/kmmainview.cpp2
-rw-r--r--tdeprint/management/kmprinterview.cpp2
-rw-r--r--tdeprint/management/kmpropbackend.cpp2
-rw-r--r--tdeprint/management/kmpropcontainer.cpp2
-rw-r--r--tdeprint/management/kmpropdriver.cpp2
-rw-r--r--tdeprint/management/kmpropgeneral.cpp2
-rw-r--r--tdeprint/management/kmpropmembers.cpp6
-rw-r--r--tdeprint/management/kmspecialprinterdlg.cpp4
-rw-r--r--tdeprint/management/kmwbackend.cpp4
-rw-r--r--tdeprint/management/kmwclass.cpp2
-rw-r--r--tdeprint/management/kmwdriver.cpp2
-rw-r--r--tdeprint/management/kmwdriverselect.cpp8
-rw-r--r--tdeprint/management/kmwdrivertest.cpp2
-rw-r--r--tdeprint/management/kmwend.cpp16
-rw-r--r--tdeprint/management/kmwfile.cpp4
-rw-r--r--tdeprint/management/kmwinfobase.cpp14
-rw-r--r--tdeprint/management/kmwinfopage.cpp2
-rw-r--r--tdeprint/management/kmwizard.cpp2
-rw-r--r--tdeprint/management/kmwlocal.cpp2
-rw-r--r--tdeprint/management/kmwlpd.cpp2
-rw-r--r--tdeprint/management/kmwpassword.cpp4
-rw-r--r--tdeprint/management/kmwsmb.cpp2
-rw-r--r--tdeprint/management/kmwsocket.cpp4
-rw-r--r--tdeprint/management/kmwsocketutil.cpp4
-rw-r--r--tdeprint/management/kxmlcommanddlg.cpp16
-rw-r--r--tdeprint/management/kxmlcommandselector.cpp2
-rw-r--r--tdeprint/management/networkscanner.cpp4
-rw-r--r--tdeprint/management/smbview.cpp2
-rw-r--r--tdeprint/marginwidget.cpp2
-rw-r--r--tdeprint/messagewindow.cpp2
-rw-r--r--tdeprint/plugincombobox.cpp2
-rw-r--r--tdeprint/posterpreview.cpp4
-rw-r--r--tdeprint/rlpr/kmconfigproxy.cpp2
-rw-r--r--tdeprint/rlpr/kmproprlpr.cpp2
-rw-r--r--tdeprint/rlpr/kmproxywidget.cpp4
-rw-r--r--tdeprint/rlpr/kmrlprmanager.cpp4
-rw-r--r--tdeprint/rlpr/kmwrlpr.cpp8
-rw-r--r--tdeprint/rlpr/krlprprinterimpl.cpp2
-rw-r--r--tdeprint/tdeprintcheck.cpp4
-rw-r--r--tdeprint/tdeprintd.cpp2
-rw-r--r--tdeprint/tests/drawdemo.cpp4
-rw-r--r--tdeprint/tests/helpwindow.cpp6
-rw-r--r--tdeprint/tests/helpwindow.h2
-rw-r--r--tdeprint/tests/main.cpp2
-rw-r--r--tdeprint/tests/richpage.cpp4
-rw-r--r--tdeprint/tools/escputil/escpwidget.cpp2
-rw-r--r--tdeprint/treecombobox.cpp2
-rw-r--r--tdesu/process.cpp2
-rw-r--r--tdeui/kaboutdialog.cpp16
-rw-r--r--tdeui/kaboutdialog.h4
-rw-r--r--tdeui/kaboutkde.cpp8
-rw-r--r--tdeui/kaction.cpp4
-rw-r--r--tdeui/kactionclasses.cpp14
-rw-r--r--tdeui/kactioncollection.cpp10
-rw-r--r--tdeui/kactionselector.cpp2
-rw-r--r--tdeui/kactivelabel.cpp2
-rw-r--r--tdeui/kactivelabel.h2
-rw-r--r--tdeui/kanimwidget.cpp4
-rw-r--r--tdeui/karrowbutton.cpp8
-rw-r--r--tdeui/karrowbutton.h4
-rw-r--r--tdeui/kauthicon.cpp4
-rw-r--r--tdeui/kbugreport.cpp68
-rw-r--r--tdeui/kbuttonbox.cpp2
-rw-r--r--tdeui/kcharselect.cpp42
-rw-r--r--tdeui/kcmenumngr.cpp8
-rw-r--r--tdeui/kcmodule.cpp2
-rw-r--r--tdeui/kcolorbutton.cpp18
-rw-r--r--tdeui/kcolorcombo.cpp2
-rw-r--r--tdeui/kcolordialog.cpp8
-rw-r--r--tdeui/kcolordrag.cpp2
-rw-r--r--tdeui/kcombobox.cpp2
-rw-r--r--tdeui/kcombobox.h2
-rw-r--r--tdeui/kcompletionbox.cpp2
-rw-r--r--tdeui/kconfigdialog.cpp2
-rw-r--r--tdeui/kcursor.cpp4
-rw-r--r--tdeui/kcursor.h2
-rw-r--r--tdeui/kdatepicker.cpp20
-rw-r--r--tdeui/kdatepicker.h2
-rw-r--r--tdeui/kdatetbl.cpp32
-rw-r--r--tdeui/kdatetimewidget.cpp2
-rw-r--r--tdeui/kdatewidget.cpp2
-rw-r--r--tdeui/kdialog.cpp4
-rw-r--r--tdeui/kdialogbase.cpp30
-rw-r--r--tdeui/kdialogbase.h8
-rw-r--r--tdeui/kdockwidget.cpp44
-rw-r--r--tdeui/kdockwidget.h6
-rw-r--r--tdeui/kdockwidget_private.cpp28
-rw-r--r--tdeui/kdualcolorbutton.cpp22
-rw-r--r--tdeui/kdualcolorbutton.h2
-rw-r--r--tdeui/keditcl1.cpp16
-rw-r--r--tdeui/keditcl2.cpp2
-rw-r--r--tdeui/keditlistbox.cpp2
-rw-r--r--tdeui/kedittoolbar.cpp20
-rw-r--r--tdeui/kfontcombo.cpp2
-rw-r--r--tdeui/kfontdialog.cpp16
-rw-r--r--tdeui/kfontrequester.cpp2
-rw-r--r--tdeui/kguiitem.cpp2
-rw-r--r--tdeui/khelpmenu.cpp2
-rw-r--r--tdeui/kiconview.cpp24
-rw-r--r--tdeui/kinputdialog.cpp2
-rw-r--r--tdeui/kjanuswidget.cpp24
-rw-r--r--tdeui/kjanuswidget.h2
-rw-r--r--tdeui/kkeybutton.cpp14
-rw-r--r--tdeui/kkeydialog.cpp4
-rw-r--r--tdeui/klanguagebutton.cpp16
-rw-r--r--tdeui/kled.cpp26
-rw-r--r--tdeui/kled.h14
-rw-r--r--tdeui/klineedit.cpp18
-rw-r--r--tdeui/klineeditdlg.cpp2
-rw-r--r--tdeui/klistbox.cpp4
-rw-r--r--tdeui/klistview.cpp60
-rw-r--r--tdeui/klistview.h4
-rw-r--r--tdeui/klistviewsearchline.cpp22
-rw-r--r--tdeui/kmainwindow.cpp60
-rw-r--r--tdeui/kmainwindow.h14
-rw-r--r--tdeui/kmainwindowiface.cpp4
-rw-r--r--tdeui/kmenubar.cpp32
-rw-r--r--tdeui/kmessagebox.cpp18
-rw-r--r--tdeui/knuminput.cpp30
-rw-r--r--tdeui/knuminput.h8
-rw-r--r--tdeui/knumvalidator.cpp6
-rw-r--r--tdeui/kpanelapplet.cpp6
-rw-r--r--tdeui/kpanelapplet.h8
-rw-r--r--tdeui/kpanelextension.cpp6
-rw-r--r--tdeui/kpanelextension.h8
-rw-r--r--tdeui/kpassdlg.cpp6
-rw-r--r--tdeui/kpassivepopup.cpp2
-rw-r--r--tdeui/kpixmapregionselectorwidget.cpp2
-rw-r--r--tdeui/kpopupmenu.cpp6
-rw-r--r--tdeui/kprogress.cpp8
-rw-r--r--tdeui/kprogressbox.cpp2
-rw-r--r--tdeui/krootpixmap.cpp28
-rw-r--r--tdeui/krootpixmap.h8
-rw-r--r--tdeui/kruler.cpp20
-rw-r--r--tdeui/kruler.h8
-rw-r--r--tdeui/ksconfig.cpp6
-rw-r--r--tdeui/kselect.cpp34
-rw-r--r--tdeui/kselect.h2
-rw-r--r--tdeui/kseparator.cpp2
-rw-r--r--tdeui/ksharedpixmap.cpp2
-rw-r--r--tdeui/kshortcutdialog.cpp6
-rw-r--r--tdeui/kspell.cpp12
-rw-r--r--tdeui/kspelldlg.cpp2
-rw-r--r--tdeui/kspellui.ui2
-rw-r--r--tdeui/ksqueezedtextlabel.cpp4
-rw-r--r--tdeui/kstatusbar.cpp4
-rw-r--r--tdeui/kstatusbar.h2
-rw-r--r--tdeui/kstdaction.cpp2
-rw-r--r--tdeui/kstdguiitem.cpp56
-rw-r--r--tdeui/kswitchlanguagedialog.cpp2
-rw-r--r--tdeui/ksyntaxhighlighter.cpp10
-rw-r--r--tdeui/ksyntaxhighlighter.h2
-rw-r--r--tdeui/ksystemtray.cpp4
-rw-r--r--tdeui/ktabbar.cpp24
-rw-r--r--tdeui/ktabctl.cpp40
-rw-r--r--tdeui/ktabctl.h2
-rw-r--r--tdeui/ktabwidget.cpp14
-rw-r--r--tdeui/ktextbrowser.h2
-rw-r--r--tdeui/ktextedit.cpp6
-rw-r--r--tdeui/ktextedit.h2
-rw-r--r--tdeui/ktimewidget.cpp2
-rw-r--r--tdeui/ktip.cpp16
-rw-r--r--tdeui/ktoolbar.cpp70
-rw-r--r--tdeui/ktoolbar.h4
-rw-r--r--tdeui/ktoolbarbutton.cpp40
-rw-r--r--tdeui/ktoolbarbutton.h2
-rw-r--r--tdeui/ktoolbarhandler.cpp2
-rw-r--r--tdeui/ktoolbarlabelaction.cpp2
-rw-r--r--tdeui/kurllabel.cpp6
-rw-r--r--tdeui/kwhatsthismanager.cpp6
-rw-r--r--tdeui/kwordwrap.cpp4
-rw-r--r--tdeui/kwordwrap.h4
-rw-r--r--tdeui/kxmlguibuilder.cpp30
-rw-r--r--tdeui/kxmlguiclient.cpp12
-rw-r--r--tdeui/kxmlguifactory.cpp10
-rw-r--r--tdeui/qxembed.cpp114
-rw-r--r--tdeui/tests/itemcontainertest.cpp2
-rw-r--r--tdeui/tests/kbuttonboxtest.cpp2
-rw-r--r--tdeui/tests/kcomboboxtest.cpp2
-rw-r--r--tdeui/tests/kcompletiontest.cpp2
-rw-r--r--tdeui/tests/kdesattest.cpp2
-rw-r--r--tdeui/tests/kdialogbasetest.cpp4
-rw-r--r--tdeui/tests/kdockwidgetdemo.cpp20
-rw-r--r--tdeui/tests/kdualcolortest.cpp8
-rw-r--r--tdeui/tests/keditlistboxtest.cpp12
-rw-r--r--tdeui/tests/kledtest.cpp6
-rw-r--r--tdeui/tests/kledtest.h2
-rw-r--r--tdeui/tests/klineeditdlgtest.cpp2
-rw-r--r--tdeui/tests/klineedittest.cpp2
-rw-r--r--tdeui/tests/kmessageboxtest.cpp16
-rw-r--r--tdeui/tests/knuminputtest.cpp2
-rw-r--r--tdeui/tests/krulertest.cpp2
-rw-r--r--tdeui/tests/kseparatortest.cpp2
-rw-r--r--tdeui/tests/kspelltest.cpp2
-rw-r--r--tdeui/tests/ktabctltest.cpp2
-rw-r--r--tdeui/tests/ktabwidgettest.cpp8
-rw-r--r--tdeui/tests/kunbalancedgrdtest.cpp4
-rw-r--r--tdeui/tests/kwizardtest.cpp2
-rw-r--r--tdeui/twindowlistmenu.cpp2
-rw-r--r--win/qeventloopex.cpp2
918 files changed, 5008 insertions, 5008 deletions
diff --git a/KDE2PORTING.html b/KDE2PORTING.html
index 8c174889..d8c3c0ab 100644
--- a/KDE2PORTING.html
+++ b/KDE2PORTING.html
@@ -189,7 +189,7 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
to klocale-&gt;translate with i18n.<P>
The return value of i18n is also no longer a const char*,
- but a unicode TQString.<P>
+ but a tqunicode TQString.<P>
<H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
diff --git a/KDE3PORTING.html b/KDE3PORTING.html
index 167d4aed..e5849d74 100644
--- a/KDE3PORTING.html
+++ b/KDE3PORTING.html
@@ -647,13 +647,13 @@ For more details please consult the HOWTO file in the kcontrol directory.
<p>The API for Kicker panel applets and extensions has changed. Panels can now be
left/top, center, or right/bottom aligned, and applets and extensions may receive
-notification about a change in alignment.
+notification about a change in tqalignment.
<H4>KPanelApplet</H4>
<p>The virtual methods orientationChange() and popupDirectionChange() are deprecated.
Instead you should reimplement positionChange() and alignmentChange() to be
-notified of changes in the position and alignment of the panel on which your applet
+notified of changes in the position and tqalignment of the panel on which your applet
resides. In addition, the popupDirection() method and the Direction enum are
deprecated. Instead you should use the position() method and Position enum. Applets that use
the deprecated methods will still work with KDE 3, but may not compile or work with
@@ -662,7 +662,7 @@ a future version.
<H4>KPanelExtension</H4>
<p>There is a new method alignmentChange() that your extension should reimplement if
-it needs to know about changes in alignment.
+it needs to know about changes in tqalignment.
<H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
<p>
diff --git a/arts/kde/kartsserver.cpp b/arts/kde/kartsserver.cpp
index e030cb41..50e8b3a2 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::fromLatin1("tdeinit_wrapper"))).data();
+ proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("tdeinit_wrapper"))).data();
if(rt)
- proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("artswrapper"))).data();
+ proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("artswrapper"))).data();
else
- proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("artsd"))).data();
+ proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("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 8c131bfd..15994625 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::fromLatin1("aRts/") + TQString::fromLatin1(ARTS_VERSION));
+ m_job->addMetaData("UserAgent", TQString::tqfromLatin1("aRts/") + TQString::tqfromLatin1(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 becb20a5..7c71be31 100644
--- a/arts/kde/kplayobject.cc
+++ b/arts/kde/kplayobject.cc
@@ -65,7 +65,7 @@ void KPlayObject::halt()
TQString KPlayObject::description()
{
- return TQString::fromLatin1(object().description().c_str());
+ return TQString::tqfromLatin1(object().description().c_str());
}
Arts::poTime KPlayObject::currentTime()
@@ -85,7 +85,7 @@ Arts::poCapabilities KPlayObject::capabilities()
TQString KPlayObject::mediaName()
{
- return TQString::fromLatin1(object().mediaName().c_str());
+ return TQString::tqfromLatin1(object().mediaName().c_str());
}
Arts::poState KPlayObject::state()
@@ -243,7 +243,7 @@ TQString KDE::PlayObject::description()
{
if ( object().isNull() )
return TQString();
- return TQString::fromLatin1(object().description().c_str());
+ return TQString::tqfromLatin1(object().description().c_str());
}
Arts::poTime KDE::PlayObject::currentTime()
@@ -271,7 +271,7 @@ TQString KDE::PlayObject::mediaName()
{
if ( object().isNull() )
return TQString();
- return TQString::fromLatin1(object().mediaName().c_str());
+ return TQString::tqfromLatin1(object().mediaName().c_str());
}
Arts::poState KDE::PlayObject::state()
diff --git a/arts/kde/kvideowidget.cpp b/arts/kde/kvideowidget.cpp
index 7199a55a..8ea6d4cf 100644
--- a/arts/kde/kvideowidget.cpp
+++ b/arts/kde/kvideowidget.cpp
@@ -147,7 +147,7 @@ void KVideoWidget::embed( Arts::VideoPlayObject vpo )
}
setBackgroundMode( PaletteBackground );
- repaint();
+ tqrepaint();
// Resize GUI
videoWidth = 0;
diff --git a/arts/knotify/knotify.cpp b/arts/knotify/knotify.cpp
index 047b3bf6..b8d5b8d2 100644
--- a/arts/knotify/knotify.cpp
+++ b/arts/knotify/knotify.cpp
@@ -40,7 +40,7 @@
#include <tqfile.h>
#include <tqfileinfo.h>
#include <tqstringlist.h>
-#include <textstream.h>
+#include <tqtextstream.h>
// KDE headers
#include <dcopclient.h>
@@ -642,7 +642,7 @@ bool KNotify::notifyByLogfile(const TQString &text, const TQString &file)
// append msg
TQTextStream strm( &logFile );
- strm << "- KNotify " << TQDateTime::currentDateTime().toString() << ": ";
+ strm << "- KNotify " << TQDateTime::tqcurrentDateTime().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::currentDateTime().toString() << ": ";
+ strm << "KNotify " << TQDateTime::tqcurrentDateTime().toString() << ": ";
strm << text << endl;
return true;
diff --git a/dcop/KDE-ICE/ICEmsg.h b/dcop/KDE-ICE/ICEmsg.h
index cf4d9897..666d776b 100644
--- a/dcop/KDE-ICE/ICEmsg.h
+++ b/dcop/KDE-ICE/ICEmsg.h
@@ -221,7 +221,7 @@ extern void _IceErrorBadValue (
/*
- * Write pad bytes. Used to force 32 or 64 bit alignment.
+ * Write pad bytes. Used to force 32 or 64 bit tqalignment.
* A maxium of 7 pad bytes can be specified.
*/
@@ -306,7 +306,7 @@ extern void _IceErrorBadValue (
/*
- * Read pad bytes (for 32 or 64 bit alignment).
+ * Read pad bytes (for 32 or 64 bit tqalignment).
* A maxium of 7 pad bytes can be specified.
*/
diff --git a/dcop/client/dcop.cpp b/dcop/client/dcop.cpp
index 46a6e64b..0eafb505 100644
--- a/dcop/client/dcop.cpp
+++ b/dcop/client/dcop.cpp
@@ -38,7 +38,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqimage.h>
#include <tqmap.h>
#include <tqstringlist.h>
-#include <textstream.h>
+#include <tqtextstream.h>
#include <tqvariant.h>
#include "../dcopclient.h"
@@ -158,7 +158,7 @@ void queryFunctions( const char* app, const char* obj )
int callFunction( const char* app, const char* obj, const char* func, const QCStringList args )
{
- TQString f = func; // Qt is better with unicode strings, so use one.
+ TQString f = func; // Qt is better with tqunicode strings, so use one.
int left = f.find( '(' );
int right = f.find( ')' );
@@ -262,7 +262,7 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt
}
if ( s == static_cast<int>(partl.count())-1)
{
- partl.remove(partl.at(s));
+ partl.remove(partl.tqat(s));
}
lt = partl.join(" ");
diff --git a/dcop/client/dcopfind.cpp b/dcop/client/dcopfind.cpp
index cd3e4d51..bde116f6 100644
--- a/dcop/client/dcopfind.cpp
+++ b/dcop/client/dcopfind.cpp
@@ -40,7 +40,7 @@ static bool bLaunchApp = 0;
bool findObject( const char* app, const char* obj, const char* func, QCStringList args )
{
- TQString f = func; // Qt is better with unicode strings, so use one.
+ TQString f = func; // Qt is better with tqunicode strings, so use one.
int left = f.find( '(' );
int right = f.find( ')' );
@@ -98,7 +98,7 @@ bool findObject( const char* app, const char* obj, const char* func, QCStringLis
}
if (s==(int)partl.count()-1)
{
- partl.remove(partl.at(s));
+ partl.remove(partl.tqat(s));
}
lt = partl.join(" ");
diff --git a/dcop/client/dcopstart.cpp b/dcop/client/dcopstart.cpp
index 5741ef77..f4653173 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::fromLatin1(_app);
+ TQString app = TQString::tqfromLatin1(_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 1cb439b5..ae1b85f9 100644
--- a/dcop/dcopclient.cpp
+++ b/dcop/dcopclient.cpp
@@ -54,7 +54,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define QT_CLEAN_NAMESPACE
#endif
#include <tqguardedptr.h>
-#include <textstream.h>
+#include <tqtextstream.h>
#include <tqfile.h>
#include <tqdir.h>
#include <tqapplication.h>
@@ -764,7 +764,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
DCOPAuthCount,
const_cast<char **>(DCOPAuthNames),
DCOPClientAuthProcs, 0L)) < 0) {
- emit attachFailed(TQString::fromLatin1( "Communications could not be established." ));
+ emit attachFailed(TQString::tqfromLatin1( "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::fromLatin1( "Could not read network connection list.\n" )+TQFile::decodeName(fName));
+ emit attachFailed(TQString::tqfromLatin1( "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::fromLatin1( errBuf ));
+ emit attachFailed(TQString::tqfromLatin1( 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::fromLatin1( errBuf ));
+ emit attachFailed(TQString::tqfromLatin1( 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::fromLatin1( "internal error in IceOpenConnection" ));
+ emit attachFailed(TQString::tqfromLatin1( "internal error in IceOpenConnection" ));
return false;
}
@@ -863,7 +863,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
delete [] d->serverAddr;
d->serverAddr = 0;
}
- emit attachFailed(TQString::fromLatin1( "DCOP server did not accept the connection." ));
+ emit attachFailed(TQString::tqfromLatin1( "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->metaObject()->slotNames( true );
+ TQStrList lst = o->tqmetaObject()->slotNames( true );
int i = 0;
for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) {
- if ( o->metaObject()->slot( i++, true )->tqt_mo_access != TQMetaData::Public )
+ if ( o->tqmetaObject()->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->metaObject();
+ TQMetaObject *meta = o->tqmetaObject();
while ( meta ) {
l.prepend( meta->className() );
- meta = meta->superClass();
+ meta = meta->tqsuperClass();
}
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->metaObject()->propertyNames( true );
+ TQStrList lst = o->tqmetaObject()->propertyNames( true );
for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) {
- TQMetaObject *mo = o->metaObject();
+ TQMetaObject *mo = o->tqmetaObject();
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->metaObject()->findSlot( fun, true );
+ int slot = o->tqmetaObject()->findSlot( fun, true );
if ( slot != -1 ) {
replyType = "void";
TQUObject uo[ 1 ];
diff --git a/dcop/dcopidl2cpp/main.cpp b/dcop/dcopidl2cpp/main.cpp
index b4df274a..5e0f2752 100644
--- a/dcop/dcopidl2cpp/main.cpp
+++ b/dcop/dcopidl2cpp/main.cpp
@@ -22,7 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
#include <tqdom.h>
#include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
#include <tqstring.h>
#include <string.h>
diff --git a/dcop/dcopidl2cpp/skel.cpp b/dcop/dcopidl2cpp/skel.cpp
index b8612eac..5cc30de3 100644
--- a/dcop/dcopidl2cpp/skel.cpp
+++ b/dcop/dcopidl2cpp/skel.cpp
@@ -22,7 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
#include <tqdom.h>
#include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
#include <tqstring.h>
#include <tqstringlist.h>
diff --git a/dcop/dcopidl2cpp/stub.cpp b/dcop/dcopidl2cpp/stub.cpp
index 445c468e..88794526 100644
--- a/dcop/dcopidl2cpp/stub.cpp
+++ b/dcop/dcopidl2cpp/stub.cpp
@@ -22,7 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
#include <tqdom.h>
#include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
#include <tqstring.h>
#include <tqstringlist.h>
diff --git a/dcop/dcopidl2cpp/stubimpl.cpp b/dcop/dcopidl2cpp/stubimpl.cpp
index 700437f2..5cdd2a00 100644
--- a/dcop/dcopidl2cpp/stubimpl.cpp
+++ b/dcop/dcopidl2cpp/stubimpl.cpp
@@ -22,7 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
#include <tqdom.h>
#include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
#include <tqstring.h>
#include <tqstringlist.h>
diff --git a/dcop/dcopidl2cpp/type.h b/dcop/dcopidl2cpp/type.h
index 173b7fca..2a99c83a 100644
--- a/dcop/dcopidl2cpp/type.h
+++ b/dcop/dcopidl2cpp/type.h
@@ -1,7 +1,7 @@
#ifndef TYPE_H
#define TYPE_H
-#include <textstream.h>
+#include <tqtextstream.h>
#include <tqdom.h>
static TQString writeType( TQTextStream& str, const TQDomElement& r )
diff --git a/dcop/dcopref.h b/dcop/dcopref.h
index 46116124..f1f2f5af 100644
--- a/dcop/dcopref.h
+++ b/dcop/dcopref.h
@@ -396,7 +396,7 @@ public:
* Flag for allowing entering the event loop if the call blocks too long.
* @p NoEventLoop disables entering the event loop.
* @p UseEventLoop allows entering the event loop while waiting for long
- * blocking DCOP call, thus making the GUI repaint if needed, and possibly
+ * blocking DCOP call, thus making the GUI tqrepaint if needed, and possibly
* allowing also other code in the application to be executed.
* @see DCOPClient::call()
*/
diff --git a/dcop/dcopserver.cpp b/dcop/dcopserver.cpp
index fe08871b..8da59df0 100644
--- a/dcop/dcopserver.cpp
+++ b/dcop/dcopserver.cpp
@@ -49,7 +49,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define QT_CLEAN_NAMESPACE 1
#include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
#include <tqdatastream.h>
#include <tqptrstack.h>
#include <tqtimer.h>
@@ -126,8 +126,8 @@ static TQCString readQCString(TQDataStream &ds)
TQCString result;
TQ_UINT32 len;
ds >> len;
- TQIODevice *device = ds.device();
- int bytesLeft = device->size()-device->at();
+ TQIODevice *device = ds.tqdevice();
+ int bytesLeft = device->size()-device->tqat();
if ((bytesLeft < 0 ) || (len > (uint) bytesLeft))
{
qWarning("Corrupt data!\n");
@@ -145,8 +145,8 @@ static TQByteArray readQByteArray(TQDataStream &ds)
TQByteArray result;
TQ_UINT32 len;
ds >> len;
- TQIODevice *device = ds.device();
- int bytesLeft = device->size()-device->at();
+ TQIODevice *device = ds.tqdevice();
+ int bytesLeft = device->size()-device->tqat();
if ((bytesLeft < 0 ) || (len > (uint) bytesLeft))
{
qWarning("Corrupt data!\n");
diff --git a/interfaces/khexedit/byteseditinterface.h b/interfaces/khexedit/byteseditinterface.h
index 3bff3509..4a78d59b 100644
--- a/interfaces/khexedit/byteseditinterface.h
+++ b/interfaces/khexedit/byteseditinterface.h
@@ -143,7 +143,7 @@ class BytesEditInterface
virtual bool isModified() const = 0;
public: // call for action
- /** repaint the indizes from i1 to i2 */
+ /** tqrepaint the indizes from i1 to i2 */
virtual void repaintRange( int i1, int i2 ) = 0;
};
@@ -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::fromLatin1("KHexEdit/KBytesEdit"), TQString::null, TQT_TQOBJECT(Parent), Name );
+ ( TQString::tqfromLatin1("KHexEdit/KBytesEdit"), TQString::null, TQT_TQOBJECT(Parent), Name );
}
}
diff --git a/interfaces/kimproxy/interface/kimiface.h b/interfaces/kimproxy/interface/kimiface.h
index f3212df6..a41172fd 100644
--- a/interfaces/kimproxy/interface/kimiface.h
+++ b/interfaces/kimproxy/interface/kimiface.h
@@ -467,7 +467,7 @@ k_dcop_signals:
/**
* @brief Indicates that a contact's presence has changed
*
- * Notifies connected DCOP receivers about a change in a contact's
+ * Notifies connected DCOP tqreceivers about a change in a contact's
* presence.
*
* Implementations just have to call this method with the appropriate
diff --git a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp b/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
index 4dbf8851..639be9bf 100644
--- a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
+++ b/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
@@ -2,7 +2,7 @@
#include <tqcheckbox.h>
#include <tqhbox.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqvgroupbox.h>
#include <kglobal.h>
diff --git a/interfaces/ktexteditor/editinterfaceext.h b/interfaces/ktexteditor/editinterfaceext.h
index a4fcb414..b025d980 100644
--- a/interfaces/ktexteditor/editinterfaceext.h
+++ b/interfaces/ktexteditor/editinterfaceext.h
@@ -44,7 +44,7 @@ class KTEXTEDITOR_EXPORT EditInterfaceExt
/**
* Begin an editing sequence. Edit commands during this sequence will be
* bunched together such that they represent a single undo command in the
- * editor, and so that repaint events do not occur inbetween.
+ * editor, and so that tqrepaint events do not occur inbetween.
*
* Your application should not return control to the event loop while it
* has an unterminated (no matching editEnd() call) editing sequence
diff --git a/interfaces/ktexteditor/editorchooser.cpp b/interfaces/ktexteditor/editorchooser.cpp
index c80fe7bf..ed0ab0cb 100644
--- a/interfaces/ktexteditor/editorchooser.cpp
+++ b/interfaces/ktexteditor/editorchooser.cpp
@@ -9,7 +9,7 @@
#include <klocale.h>
#include <tqlabel.h>
#include <kapplication.h>
-#include <layout.h>
+#include <tqlayout.h>
#include "editorchooser_ui.h"
@@ -95,7 +95,7 @@ void EditorChooser::writeAppSetting(const TQString& postfix){
cfg->setGroup("KTEXTEDITOR:"+postfix);
cfg->writeEntry("DEVELOPER_INFO","NEVER TRY TO USE VALUES FROM THAT GROUP, THEY ARE SUBJECT TO CHANGES");
cfg->writePathEntry("editor", (d->chooser->editorCombo->currentItem()==0) ?
- TQString::null : (*d->elements.at(d->chooser->editorCombo->currentItem()-1)));
+ TQString::null : (*d->elements.tqat(d->chooser->editorCombo->currentItem()-1)));
cfg->sync();
cfg->setGroup(previousGroup);
diff --git a/interfaces/ktexteditor/editorchooser_ui.ui b/interfaces/ktexteditor/editorchooser_ui.ui
index e2bc82ad..816a1d19 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="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>460</width>
<height>0</height>
@@ -40,7 +40,7 @@
<property name="text">
<string>Please choose the default text editing component that you wish to use in this application. If you choose &lt;B&gt;System Default&lt;/B&gt;, the application will honor your changes in the Control Center. All other choices will override that setting.</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignVCenter|AlignLeft</set>
</property>
</widget>
diff --git a/interfaces/ktexteditor/templateinterface.cpp b/interfaces/ktexteditor/templateinterface.cpp
index 0cb52db7..c5ea9393 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::currentDateTime();
+ TQDateTime datetime = TQDateTime::tqcurrentDateTime();
TQDate date = TQT_TQDATE_OBJECT(datetime.date());
TQTime time = TQT_TQTIME_OBJECT(datetime.time());
diff --git a/kab/addressbook.h b/kab/addressbook.h
index f87c2512..af8eeb92 100644
--- a/kab/addressbook.h
+++ b/kab/addressbook.h
@@ -127,7 +127,7 @@ class CategoriesMap : public TQMap<int, TQString>
* keys). Of course, in different files a key might be used twice. <BR>
* The keys are objects of the type KabKey and define the section in the
* addressbook database where the entry is stored (see QConfigDB
- * reference). Keys invalidate on file changes, so keep track of the
+ * reference). Keys tqinvalidate on file changes, so keep track of the
* signal ::changed. <BR>
* kab watches file changes. If the opened file changes on disk, it is
* automatically reloaded and ::changed() is emitted.
diff --git a/kab/kabapi.cc b/kab/kabapi.cc
index 0cf97905..6ec29028 100644
--- a/kab/kabapi.cc
+++ b/kab/kabapi.cc
@@ -74,7 +74,7 @@ int KabAPI::exec()
}
listbox->setMinimumSize(listbox->sizeHint());
adjustSize();
- resize(minimumSize());
+ resize(tqminimumSize());
return KDialogBase::exec();
} else {
kdDebug(KAB_KDEBUG_AREA) << "KabAPI::exec: error creating interface."
diff --git a/kab/qconfigDB.cc b/kab/qconfigDB.cc
index debd7a01..b084ccab 100644
--- a/kab/qconfigDB.cc
+++ b/kab/qconfigDB.cc
@@ -25,7 +25,7 @@ extern "C" {
}
// #include <tqstring.h>
-#include <textstream.h>
+#include <tqtextstream.h>
#include <tqfile.h>
#include <tqtimer.h>
#include <tqdatetime.h>
@@ -1188,7 +1188,7 @@ KeyValueMap::insert(const TQCString& key, const TQStrList& values, bool force)
// ----- create coded string list:
for(count=0; count<values.count(); ++count)
{ // create strings like "abc\efgh\eijk":
- temp=makeComplexString(((TQStrList)values).at(count));
+ temp=makeComplexString(((TQStrList)values).tqat(count));
temp.remove(0, 1); // remove the leading "\""
temp.remove(temp.length()-1, 1); // the trailing "\""
value+=temp;
@@ -1231,7 +1231,7 @@ KeyValueMap::get(const TQCString& key, TQStringList& values) const
// ----- do the conversion:
for(count=0; count<temp.count(); ++count)
{
- values.append(TQString::fromUtf8(temp.at(count)));
+ values.append(TQString::fromUtf8(temp.tqat(count)));
}
// -----
kdDebug(GUARD, KAB_KDEBUG_AREA) << "KeyValueMap::get[QStringList]: done." << endl;
@@ -1252,7 +1252,7 @@ KeyValueMap::insert(const TQCString& key, const TQStringList& values, bool force
// ----- create TQCString list:
for(count=0; count<values.count(); ++count)
{
- utf8strings.append((*values.at(count)).utf8());
+ utf8strings.append((*values.tqat(count)).utf8());
}
kdDebug(GUARD, KAB_KDEBUG_AREA) << "KeyValueMap::insert[QStringList]: done." << endl;
return insert(key, utf8strings, force);
diff --git a/kabc/address.cpp b/kabc/address.cpp
index 0787bcc4..714dd571 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::fromLatin1( "kabc/countrytransl.map" ) );
+ TQString::tqfromLatin1( "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::fromLatin1( "kabc/countrytransl.map" ) );
+ TQString::tqfromLatin1( "kabc/countrytransl.map" ) );
TQFile file( mapfile );
if ( file.open( IO_ReadOnly ) ) {
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index bf6d0d17..29bbd0f1 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::currentDateTime() );
+ addr.setRevision( TQDateTime::tqcurrentDateTime() );
else {
if ( fAddr.resource() == 0 ) {
fAddr.setResource( resource );
diff --git a/kabc/addresseedialog.cpp b/kabc/addresseedialog.cpp
index 052f2599..ec8e7be0 100644
--- a/kabc/addresseedialog.cpp
+++ b/kabc/addresseedialog.cpp
@@ -18,7 +18,7 @@
Boston, MA 02110-1301, USA.
*/
-#include <layout.h>
+#include <tqlayout.h>
#include <tqpushbutton.h>
#include <tqgroupbox.h>
#include <tqregexp.h>
diff --git a/kabc/distributionlistdialog.cpp b/kabc/distributionlistdialog.cpp
index 0bad0041..b00b14d4 100644
--- a/kabc/distributionlistdialog.cpp
+++ b/kabc/distributionlistdialog.cpp
@@ -19,7 +19,7 @@
*/
#include <tqlistview.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlabel.h>
#include <tqpushbutton.h>
#include <tqcombobox.h>
diff --git a/kabc/distributionlisteditor.cpp b/kabc/distributionlisteditor.cpp
index d3575aed..573f0970 100644
--- a/kabc/distributionlisteditor.cpp
+++ b/kabc/distributionlisteditor.cpp
@@ -19,7 +19,7 @@
*/
#include <tqlistview.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqpushbutton.h>
#include <tqcombobox.h>
#include <tqbuttongroup.h>
diff --git a/kabc/formats/binaryformat.cpp b/kabc/formats/binaryformat.cpp
index a82a017a..f9d0d705 100644
--- a/kabc/formats/binaryformat.cpp
+++ b/kabc/formats/binaryformat.cpp
@@ -113,7 +113,7 @@ void BinaryFormat::saveAll( AddressBook*, Resource *resource, TQFile *file )
}
// set real number of entries
- stream.device()->at( 2 * sizeof( TQ_UINT32 ) );
+ stream.tqdevice()->tqat( 2 * sizeof( TQ_UINT32 ) );
stream << counter;
}
diff --git a/kabc/kab2kabc.cpp b/kabc/kab2kabc.cpp
index f350371b..2a368359 100644
--- a/kabc/kab2kabc.cpp
+++ b/kabc/kab2kabc.cpp
@@ -19,7 +19,7 @@
*/
#include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
#include <kabapi.h>
#include <kaboutdata.h>
@@ -57,12 +57,12 @@ void readKMailEntry( const TQString &kmailEntry, KABC::AddressBook *ab )
TQString name;
TQString comment;
- if ( entry.at( entry.length() -1 ) == ')' ) {
+ if ( entry.tqat( entry.length() -1 ) == ')' ) {
int br = entry.findRev( '(' );
if ( br >= 0 ) {
comment = entry.mid( br + 1, entry.length() - br - 2 );
entry.truncate( br );
- if ( entry.at( entry.length() - 1 ).isSpace() ) {
+ if ( entry.tqat( entry.length() - 1 ).isSpace() ) {
entry.truncate( br - 1 );
}
}
@@ -80,22 +80,22 @@ void readKMailEntry( const TQString &kmailEntry, KABC::AddressBook *ab )
name = entry.left( posSpace );
}
- if ( email.at( 0 ) == '<' && email.at( email.length() - 1) == '>' ) {
+ if ( email.tqat( 0 ) == '<' && email.tqat( email.length() - 1) == '>' ) {
email = email.mid( 1, email.length() - 2 );
}
- if ( name.at( 0 ) == '"' && name.at( name.length() - 1) == '"' ) {
+ if ( name.tqat( 0 ) == '"' && name.tqat( name.length() - 1) == '"' ) {
name = name.mid( 1, name.length() - 2 );
}
- if ( name.at( 0 ) == '\'' && name.at( name.length() - 1) == '\'' ) {
+ if ( name.tqat( 0 ) == '\'' && name.tqat( name.length() - 1) == '\'' ) {
name = name.mid( 1, name.length() - 2 );
}
- if ( name.at( name.length() -1 ) == ')' ) {
+ if ( name.tqat( name.length() -1 ) == ')' ) {
int br = name.findRev( '(' );
if ( br >= 0 ) {
comment = name.mid( br + 1, name.length() - br - 2 ) + " " + comment;
name.truncate( br );
- if ( name.at( name.length() - 1 ).isSpace() ) {
+ if ( name.tqat( name.length() - 1 ).isSpace() ) {
name.truncate( br - 1 );
}
}
@@ -148,16 +148,16 @@ void importKMailAddressBook( KABC::AddressBook *ab )
TQStringList::ConstIterator it;
for ( it = kmailEntries.begin(); it != kmailEntries.end(); ++it ) {
- if ( (*it).at( 0 ) == '#' ) continue;
+ if ( (*it).tqat( 0 ) == '#' ) continue;
bool insideQuote = false;
int end = (*it).length() - 1;
for ( int i = end; i; i-- ) {
- if ( (*it).at( i ) == '"' ) {
+ if ( (*it).tqat( i ) == '"' ) {
if ( insideQuote )
insideQuote = false;
else
insideQuote = true;
- } else if ( (*it).at( i ) == ',' && !insideQuote ) {
+ } else if ( (*it).tqat( i ) == ',' && !insideQuote ) {
readKMailEntry( (*it).mid( i + 1, end - i ), ab );
end = i - 1;
}
diff --git a/kabc/ldapclient.cpp b/kabc/ldapclient.cpp
index 5ca506be..6ce467a4 100644
--- a/kabc/ldapclient.cpp
+++ b/kabc/ldapclient.cpp
@@ -26,7 +26,7 @@
#include <tqimage.h>
#include <tqlabel.h>
#include <tqpixmap.h>
-#include <textstream.h>
+#include <tqtextstream.h>
#include <tqurl.h>
#include <kapplication.h>
@@ -50,7 +50,7 @@ public:
TQString LdapObject::toString() const
{
- TQString result = TQString::fromLatin1( "\ndn: %1\n" ).arg( dn );
+ TQString result = TQString::tqfromLatin1( "\ndn: %1\n" ).arg( dn );
for ( LdapAttrMap::ConstIterator it = attrs.begin(); it != attrs.end(); ++it ) {
TQString attr = it.key();
for ( LdapAttrValue::ConstIterator it2 = (*it).begin(); it2 != (*it).end(); ++it2 ) {
diff --git a/kabc/ldapconfigwidget.cpp b/kabc/ldapconfigwidget.cpp
index bb1ed3ad..b0a899d8 100644
--- a/kabc/ldapconfigwidget.cpp
+++ b/kabc/ldapconfigwidget.cpp
@@ -22,7 +22,7 @@
#include <tqobjectlist.h>
#include <tqcheckbox.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqpushbutton.h>
#include <tqspinbox.h>
#include <tqvgroupbox.h>
diff --git a/kabc/ldifconverter.cpp b/kabc/ldifconverter.cpp
index 96024a0e..d4c7b22d 100644
--- a/kabc/ldifconverter.cpp
+++ b/kabc/ldifconverter.cpp
@@ -36,7 +36,7 @@
#include <tqstring.h>
#include <tqstringlist.h>
#include <tqregexp.h>
-#include <textstream.h>
+#include <tqtextstream.h>
#include <klocale.h>
#include <kdebug.h>
@@ -183,7 +183,7 @@ bool LDIFConverter::LDIFToAddressee( const TQString &str, AddresseeList &addrLis
data.setRawData( latinstr, latinstrlen );
ldif.setLDIF( data );
if (!dt.isValid())
- dt = TQDateTime::currentDateTime();
+ dt = TQDateTime::tqcurrentDateTime();
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::fromLatin1( "dn" ) ) // ignore & return false!
+ if ( fieldname == TQString::tqfromLatin1( "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::fromLatin1( "givenname" ) ) {
+ if ( fieldname == TQString::tqfromLatin1( "givenname" ) ) {
a.setGivenName( value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "xmozillanickname") ||
- fieldname == TQString::fromLatin1( "nickname") ) {
+ if ( fieldname == TQString::tqfromLatin1( "xmozillanickname") ||
+ fieldname == TQString::tqfromLatin1( "nickname") ) {
a.setNickName( value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "sn" ) ) {
+ if ( fieldname == TQString::tqfromLatin1( "sn" ) ) {
a.setFamilyName( value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "uid" ) ) {
+ if ( fieldname == TQString::tqfromLatin1( "uid" ) ) {
a.setUid( value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "mail" ) ||
- fieldname == TQString::fromLatin1( "mozillasecondemail" ) ) { // mozilla
+ if ( fieldname == TQString::tqfromLatin1( "mail" ) ||
+ fieldname == TQString::tqfromLatin1( "mozillasecondemail" ) ) { // mozilla
if ( a.emails().findIndex( value ) == -1 )
a.insertEmail( value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "title" ) ) {
+ if ( fieldname == TQString::tqfromLatin1( "title" ) ) {
a.setTitle( value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "vocation" ) ) {
+ if ( fieldname == TQString::tqfromLatin1( "vocation" ) ) {
a.setPrefix( value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "cn" ) ) {
+ if ( fieldname == TQString::tqfromLatin1( "cn" ) ) {
a.setFormattedName( value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "o" ) ||
- fieldname == TQString::fromLatin1( "organization" ) || // Exchange
- fieldname == TQString::fromLatin1( "organizationname" ) ) { // Exchange
+ if ( fieldname == TQString::tqfromLatin1( "o" ) ||
+ fieldname == TQString::tqfromLatin1( "organization" ) || // Exchange
+ fieldname == TQString::tqfromLatin1( "organizationname" ) ) { // Exchange
a.setOrganization( value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "description" ) ) {
+ if ( fieldname == TQString::tqfromLatin1( "description" ) ) {
addComment:
if ( !a.note().isEmpty() )
a.setNote( a.note() + "\n" );
@@ -306,15 +306,15 @@ addComment:
return true;
}
- if ( fieldname == TQString::fromLatin1( "custom1" ) ||
- fieldname == TQString::fromLatin1( "custom2" ) ||
- fieldname == TQString::fromLatin1( "custom3" ) ||
- fieldname == TQString::fromLatin1( "custom4" ) ) {
+ if ( fieldname == TQString::tqfromLatin1( "custom1" ) ||
+ fieldname == TQString::tqfromLatin1( "custom2" ) ||
+ fieldname == TQString::tqfromLatin1( "custom3" ) ||
+ fieldname == TQString::tqfromLatin1( "custom4" ) ) {
goto addComment;
}
- if ( fieldname == TQString::fromLatin1( "homeurl" ) ||
- fieldname == TQString::fromLatin1( "workurl" ) ) {
+ if ( fieldname == TQString::tqfromLatin1( "homeurl" ) ||
+ fieldname == TQString::tqfromLatin1( "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::fromLatin1( "homephone" ) ) {
+ if ( fieldname == TQString::tqfromLatin1( "homephone" ) ) {
a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Home ) );
return true;
}
- if ( fieldname == TQString::fromLatin1( "telephonenumber" ) ) {
+ if ( fieldname == TQString::tqfromLatin1( "telephonenumber" ) ) {
a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Work ) );
return true;
}
- if ( fieldname == TQString::fromLatin1( "mobile" ) ) { // mozilla/Netscape 7
+ if ( fieldname == TQString::tqfromLatin1( "mobile" ) ) { // mozilla/Netscape 7
a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Cell ) );
return true;
}
- if ( fieldname == TQString::fromLatin1( "cellphone" ) ) {
+ if ( fieldname == TQString::tqfromLatin1( "cellphone" ) ) {
a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Cell ) );
return true;
}
- if ( fieldname == TQString::fromLatin1( "pager" ) || // mozilla
- fieldname == TQString::fromLatin1( "pagerphone" ) ) { // mozilla
+ if ( fieldname == TQString::tqfromLatin1( "pager" ) || // mozilla
+ fieldname == TQString::tqfromLatin1( "pagerphone" ) ) { // mozilla
a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Pager ) );
return true;
}
- if ( fieldname == TQString::fromLatin1( "facsimiletelephonenumber" ) ) {
+ if ( fieldname == TQString::tqfromLatin1( "facsimiletelephonenumber" ) ) {
a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Fax ) );
return true;
}
- if ( fieldname == TQString::fromLatin1( "xmozillaanyphone" ) ) { // mozilla
+ if ( fieldname == TQString::tqfromLatin1( "xmozillaanyphone" ) ) { // mozilla
a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Work ) );
return true;
}
- if ( fieldname == TQString::fromLatin1( "street" ) ||
- fieldname == TQString::fromLatin1( "streethomeaddress" ) ) {
+ if ( fieldname == TQString::tqfromLatin1( "street" ) ||
+ fieldname == TQString::tqfromLatin1( "streethomeaddress" ) ) {
homeAddr.setStreet( value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "postaladdress" ) ) { // mozilla
+ if ( fieldname == TQString::tqfromLatin1( "postaladdress" ) ) { // mozilla
workAddr.setStreet( value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "mozillapostaladdress2" ) ) { // mozilla
- workAddr.setStreet( workAddr.street() + TQString::fromLatin1( "\n" ) + value );
+ if ( fieldname == TQString::tqfromLatin1( "mozillapostaladdress2" ) ) { // mozilla
+ workAddr.setStreet( workAddr.street() + TQString::tqfromLatin1( "\n" ) + value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "postalcode" ) ) {
+ if ( fieldname == TQString::tqfromLatin1( "postalcode" ) ) {
workAddr.setPostalCode( value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "postofficebox" ) ) {
+ if ( fieldname == TQString::tqfromLatin1( "postofficebox" ) ) {
workAddr.setPostOfficeBox( value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "homepostaladdress" ) ) { // Netscape 7
+ if ( fieldname == TQString::tqfromLatin1( "homepostaladdress" ) ) { // Netscape 7
homeAddr.setStreet( value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "mozillahomepostaladdress2" ) ) { // mozilla
- homeAddr.setStreet( homeAddr.street() + TQString::fromLatin1( "\n" ) + value );
+ if ( fieldname == TQString::tqfromLatin1( "mozillahomepostaladdress2" ) ) { // mozilla
+ homeAddr.setStreet( homeAddr.street() + TQString::tqfromLatin1( "\n" ) + value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "mozillahomelocalityname" ) ) { // mozilla
+ if ( fieldname == TQString::tqfromLatin1( "mozillahomelocalityname" ) ) { // mozilla
homeAddr.setLocality( value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "mozillahomestate" ) ) { // mozilla
+ if ( fieldname == TQString::tqfromLatin1( "mozillahomestate" ) ) { // mozilla
homeAddr.setRegion( value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "mozillahomepostalcode" ) ) { // mozilla
+ if ( fieldname == TQString::tqfromLatin1( "mozillahomepostalcode" ) ) { // mozilla
homeAddr.setPostalCode( value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "mozillahomecountryname" ) ) { // mozilla
+ if ( fieldname == TQString::tqfromLatin1( "mozillahomecountryname" ) ) { // mozilla
if ( value.length() <= 2 )
value = Address::ISOtoCountry(value);
homeAddr.setCountry( value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "locality" ) ) {
+ if ( fieldname == TQString::tqfromLatin1( "locality" ) ) {
workAddr.setLocality( value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "streetaddress" ) ) { // Netscape 4.x
+ if ( fieldname == TQString::tqfromLatin1( "streetaddress" ) ) { // Netscape 4.x
workAddr.setStreet( value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "countryname" ) ||
- fieldname == TQString::fromLatin1( "c" ) ) { // mozilla
+ if ( fieldname == TQString::tqfromLatin1( "countryname" ) ||
+ fieldname == TQString::tqfromLatin1( "c" ) ) { // mozilla
if ( value.length() <= 2 )
value = Address::ISOtoCountry(value);
workAddr.setCountry( value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "l" ) ) { // mozilla
+ if ( fieldname == TQString::tqfromLatin1( "l" ) ) { // mozilla
workAddr.setLocality( value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "st" ) ) {
+ if ( fieldname == TQString::tqfromLatin1( "st" ) ) {
workAddr.setRegion( value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "ou" ) ) {
+ if ( fieldname == TQString::tqfromLatin1( "ou" ) ) {
a.setRole( value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "department" ) ) {
+ if ( fieldname == TQString::tqfromLatin1( "department" ) ) {
a.setDepartment( value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "member" ) ) {
+ if ( fieldname == TQString::tqfromLatin1( "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::fromLatin1( "modifytimestamp" ) ) {
- if (value == TQString::fromLatin1("0Z")) // ignore
+ if ( fieldname == TQString::tqfromLatin1( "modifytimestamp" ) ) {
+ if (value == TQString::tqfromLatin1("0Z")) // ignore
return true;
TQDateTime dt = VCardStringToDate( value );
if ( dt.isValid() ) {
@@ -486,7 +486,7 @@ addComment:
}
}
- if ( fieldname == TQString::fromLatin1( "objectclass" ) ) // ignore
+ if ( fieldname == TQString::tqfromLatin1( "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 a8052a65..a2225ad2 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::currentDateTime() );
+ KABC_EXPORT bool LDIFToAddressee( const TQString &str, AddresseeList &addrList, TQDateTime dt = TQDateTime::tqcurrentDateTime() );
/**
* Converts a list of addressees to a LDIF string.
diff --git a/kabc/plugins/dir/resourcedirconfig.cpp b/kabc/plugins/dir/resourcedirconfig.cpp
index cb2bd310..819d75d9 100644
--- a/kabc/plugins/dir/resourcedirconfig.cpp
+++ b/kabc/plugins/dir/resourcedirconfig.cpp
@@ -19,7 +19,7 @@
*/
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <kdebug.h>
#include <klocale.h>
diff --git a/kabc/plugins/file/resourcefileconfig.cpp b/kabc/plugins/file/resourcefileconfig.cpp
index ae8bdbfa..92b07594 100644
--- a/kabc/plugins/file/resourcefileconfig.cpp
+++ b/kabc/plugins/file/resourcefileconfig.cpp
@@ -19,7 +19,7 @@
*/
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <kdebug.h>
#include <klocale.h>
diff --git a/kabc/plugins/ldapkio/resourceldapkioconfig.cpp b/kabc/plugins/ldapkio/resourceldapkioconfig.cpp
index fa8176a2..27132852 100644
--- a/kabc/plugins/ldapkio/resourceldapkioconfig.cpp
+++ b/kabc/plugins/ldapkio/resourceldapkioconfig.cpp
@@ -21,7 +21,7 @@
#include <tqcheckbox.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqpushbutton.h>
#include <tqspinbox.h>
#include <tqvbox.h>
diff --git a/kabc/plugins/net/resourcenetconfig.cpp b/kabc/plugins/net/resourcenetconfig.cpp
index af2e3ba9..b441fbd9 100644
--- a/kabc/plugins/net/resourcenetconfig.cpp
+++ b/kabc/plugins/net/resourcenetconfig.cpp
@@ -19,7 +19,7 @@
*/
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <kdebug.h>
#include <klocale.h>
diff --git a/kabc/plugins/sql/resourcesqlconfig.cpp b/kabc/plugins/sql/resourcesqlconfig.cpp
index 1b750a12..ef1651cd 100644
--- a/kabc/plugins/sql/resourcesqlconfig.cpp
+++ b/kabc/plugins/sql/resourcesqlconfig.cpp
@@ -19,7 +19,7 @@
*/
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqspinbox.h>
#include <tqvbox.h>
diff --git a/kabc/resourceselectdialog.cpp b/kabc/resourceselectdialog.cpp
index d548b52a..3d01bfc8 100644
--- a/kabc/resourceselectdialog.cpp
+++ b/kabc/resourceselectdialog.cpp
@@ -24,7 +24,7 @@
#include <kstdguiitem.h>
#include <tqgroupbox.h>
-#include <layout.h>
+#include <tqlayout.h>
#include "resource.h"
#include "addressbook.h"
@@ -64,7 +64,7 @@ ResourceSelectDialog::ResourceSelectDialog( AddressBook *ab, TQWidget *parent, c
uint counter = 0;
TQPtrList<Resource> list = ab->resources();
for ( uint i = 0; i < list.count(); ++i ) {
- Resource *resource = list.at( i );
+ Resource *resource = list.tqat( i );
if ( resource && !resource->readOnly() ) {
mResourceMap.insert( counter, resource );
mResourceId->insertItem( resource->resourceName() );
diff --git a/kabc/tests/kabcargl.cpp b/kabc/tests/kabcargl.cpp
index 4a6322d5..b57724c1 100644
--- a/kabc/tests/kabcargl.cpp
+++ b/kabc/tests/kabcargl.cpp
@@ -19,7 +19,7 @@
*/
#include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
#include <tqregexp.h>
#include <kaboutdata.h>
diff --git a/kabc/tests/testaddresseelist.cpp b/kabc/tests/testaddresseelist.cpp
index e7cc123f..7075dcdd 100644
--- a/kabc/tests/testaddresseelist.cpp
+++ b/kabc/tests/testaddresseelist.cpp
@@ -64,12 +64,12 @@ int main(int /*argc*/,char /* **argv*/)
list.append(f);
list.sortBy(FamilyName);
- if ( !( (*list.at(0)).uid()=="78ze"
- && (*list.at(1)).uid()=="Rsdf"
- && (*list.at(2)).uid()=="Fhwn"
- && (*list.at(3)).uid()=="kk45"
- && (*list.at(4)).uid()=="Asdf"
- && (*list.at(5)).uid()=="Z2hk"
+ if ( !( (*list.tqat(0)).uid()=="78ze"
+ && (*list.tqat(1)).uid()=="Rsdf"
+ && (*list.tqat(2)).uid()=="Fhwn"
+ && (*list.tqat(3)).uid()=="kk45"
+ && (*list.tqat(4)).uid()=="Asdf"
+ && (*list.tqat(5)).uid()=="Z2hk"
) ) {
kdError() << "SORTING BY FAMILY NAME NOT CORRECT!" << endl;
kdDebug() << "list sorted by family name:" << endl;
@@ -79,12 +79,12 @@ int main(int /*argc*/,char /* **argv*/)
}
list.setReverseSorting(true);
list.sort();
- if ( !( (*list.at(5)).uid()=="78ze"
- && (*list.at(4)).uid()=="Rsdf"
- && (*list.at(3)).uid()=="Fhwn"
- && (*list.at(2)).uid()=="kk45"
- && (*list.at(1)).uid()=="Asdf"
- && (*list.at(0)).uid()=="Z2hk"
+ if ( !( (*list.tqat(5)).uid()=="78ze"
+ && (*list.tqat(4)).uid()=="Rsdf"
+ && (*list.tqat(3)).uid()=="Fhwn"
+ && (*list.tqat(2)).uid()=="kk45"
+ && (*list.tqat(1)).uid()=="Asdf"
+ && (*list.tqat(0)).uid()=="Z2hk"
) ) {
kdError() << "REVERSE SORTING BY FAMILY NAME NOT CORRECT!" << endl;
kdDebug() << "list reverse sorted by family name:" << endl;
@@ -95,12 +95,12 @@ int main(int /*argc*/,char /* **argv*/)
list.setReverseSorting(false);
list.sortBy(FormattedName);
- if ( !( (*list.at(0)).uid()=="78ze"
- && (*list.at(1)).uid()=="Rsdf"
- && (*list.at(2)).uid()=="Fhwn"
- && (*list.at(3)).uid()=="kk45"
- && (*list.at(4)).uid()=="Z2hk"
- && (*list.at(5)).uid()=="Asdf"
+ if ( !( (*list.tqat(0)).uid()=="78ze"
+ && (*list.tqat(1)).uid()=="Rsdf"
+ && (*list.tqat(2)).uid()=="Fhwn"
+ && (*list.tqat(3)).uid()=="kk45"
+ && (*list.tqat(4)).uid()=="Z2hk"
+ && (*list.tqat(5)).uid()=="Asdf"
) ) {
kdError() << "SORTING BY FORMATTED NAME NOT CORRECT!" << endl;
kdDebug() << "list sorted by formatted name:" << endl;
@@ -110,12 +110,12 @@ int main(int /*argc*/,char /* **argv*/)
}
list.setReverseSorting(true);
list.sort();
- if ( !( (*list.at(5)).uid()=="78ze"
- && (*list.at(4)).uid()=="Rsdf"
- && (*list.at(3)).uid()=="Fhwn"
- && (*list.at(2)).uid()=="kk45"
- && (*list.at(1)).uid()=="Z2hk"
- && (*list.at(0)).uid()=="Asdf"
+ if ( !( (*list.tqat(5)).uid()=="78ze"
+ && (*list.tqat(4)).uid()=="Rsdf"
+ && (*list.tqat(3)).uid()=="Fhwn"
+ && (*list.tqat(2)).uid()=="kk45"
+ && (*list.tqat(1)).uid()=="Z2hk"
+ && (*list.tqat(0)).uid()=="Asdf"
) ) {
kdError() << "REVERSE SORTING BY FORMATTED NAME NOT CORRECT!" << endl;
kdDebug() << "list reverse sorted by formatted name:" << endl;
@@ -127,12 +127,12 @@ int main(int /*argc*/,char /* **argv*/)
list.setReverseSorting(false);
list.sortBy(Uid);
- if ( !( (*list.at(0)).uid()=="78ze"
- && (*list.at(1)).uid()=="Asdf"
- && (*list.at(2)).uid()=="Fhwn"
- && (*list.at(3)).uid()=="Rsdf"
- && (*list.at(4)).uid()=="Z2hk"
- && (*list.at(5)).uid()=="kk45"
+ if ( !( (*list.tqat(0)).uid()=="78ze"
+ && (*list.tqat(1)).uid()=="Asdf"
+ && (*list.tqat(2)).uid()=="Fhwn"
+ && (*list.tqat(3)).uid()=="Rsdf"
+ && (*list.tqat(4)).uid()=="Z2hk"
+ && (*list.tqat(5)).uid()=="kk45"
) ) {
kdError() << "SORTING BY UID NOT CORRECT!" << endl;
kdDebug() << "list sorted by Uid:" << endl;
@@ -142,12 +142,12 @@ int main(int /*argc*/,char /* **argv*/)
}
list.setReverseSorting(true);
list.sortBy(Uid);
- if ( !( (*list.at(5)).uid()=="78ze"
- && (*list.at(4)).uid()=="Asdf"
- && (*list.at(3)).uid()=="Fhwn"
- && (*list.at(2)).uid()=="Rsdf"
- && (*list.at(1)).uid()=="Z2hk"
- && (*list.at(0)).uid()=="kk45"
+ if ( !( (*list.tqat(5)).uid()=="78ze"
+ && (*list.tqat(4)).uid()=="Asdf"
+ && (*list.tqat(3)).uid()=="Fhwn"
+ && (*list.tqat(2)).uid()=="Rsdf"
+ && (*list.tqat(1)).uid()=="Z2hk"
+ && (*list.tqat(0)).uid()=="kk45"
) ) {
kdError() << "REVERSE SORTING BY UID NOT CORRECT!" << endl;
kdDebug() << "list sorted by Uid:" << endl;
@@ -170,8 +170,8 @@ int main(int /*argc*/,char /* **argv*/)
list2.append(f);
list2.setReverseSorting(false);
list2.sort();
- if ( !( (*list2.at(0)).uid()=="78ze"
- && (*list2.at(1)).uid()=="Asdf"
+ if ( !( (*list2.tqat(0)).uid()=="78ze"
+ && (*list2.tqat(1)).uid()=="Asdf"
) ) {
kdError() << "SORTING BY FORMATTED NAME IN A TWO ENTRY LIST NOT CORRECT!" << endl;
kdDebug() << "list sorted by formatted name, two entries:" << endl;
@@ -181,8 +181,8 @@ int main(int /*argc*/,char /* **argv*/)
}
list2.setReverseSorting(true);
list2.sort();
- if ( !( (*list2.at(1)).uid()=="78ze"
- && (*list2.at(0)).uid()=="Asdf"
+ if ( !( (*list2.tqat(1)).uid()=="78ze"
+ && (*list2.tqat(0)).uid()=="Asdf"
) ) {
kdError() << "REVERSE SORTING BY FORMATTED NAME IN A TWO ENTRY LIST NOT CORRECT!" << endl;
kdDebug() << "list reverse sorted by formatted name, two entries:" << endl;
diff --git a/kabc/tests/testlock.cpp b/kabc/tests/testlock.cpp
index 2d72317a..4674606e 100644
--- a/kabc/tests/testlock.cpp
+++ b/kabc/tests/testlock.cpp
@@ -35,7 +35,7 @@
#include <tqwidget.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqpushbutton.h>
#include <tqlistview.h>
#include <tqdir.h>
diff --git a/kabc/vcard/AdrValue.cpp b/kabc/vcard/AdrValue.cpp
index 535ba698..dc638441 100644
--- a/kabc/vcard/AdrValue.cpp
+++ b/kabc/vcard/AdrValue.cpp
@@ -112,13 +112,13 @@ AdrValue::_parse()
switch (i) {
- case 0: poBox_ = l.at(0); break;
- case 1: extAddress_ = l.at(1); break;
- case 2: street_ = l.at(2); break;
- case 3: locality_ = l.at(3); break;
- case 4: region_ = l.at(4); break;
- case 5: postCode_ = l.at(5); break;
- case 6: countryName_ = l.at(6); break;
+ case 0: poBox_ = l.tqat(0); break;
+ case 1: extAddress_ = l.tqat(1); break;
+ case 2: street_ = l.tqat(2); break;
+ case 3: locality_ = l.tqat(3); break;
+ case 4: region_ = l.tqat(4); break;
+ case 5: postCode_ = l.tqat(5); break;
+ case 6: countryName_ = l.tqat(6); break;
default: break;
}
}
diff --git a/kabc/vcard/ContentLine.cpp b/kabc/vcard/ContentLine.cpp
index 52bcdf4f..034cb1d3 100644
--- a/kabc/vcard/ContentLine.cpp
+++ b/kabc/vcard/ContentLine.cpp
@@ -174,7 +174,7 @@ ContentLine::_parse()
return;
}
- name_ = l.at(0);
+ name_ = l.tqat(0);
// Now we have the name, so the rest of 'l' is the params.
// Remove the name part.
diff --git a/kabc/vcard/LangValue.cpp b/kabc/vcard/LangValue.cpp
index f7e5a759..d41c61d9 100644
--- a/kabc/vcard/LangValue.cpp
+++ b/kabc/vcard/LangValue.cpp
@@ -79,7 +79,7 @@ LangValue::_parse()
if (l.count() == 0) return;
- primary_ = l.at(0);
+ primary_ = l.tqat(0);
l.remove(0u);
diff --git a/kabc/vcard/NValue.cpp b/kabc/vcard/NValue.cpp
index e6326813..7bcfa139 100644
--- a/kabc/vcard/NValue.cpp
+++ b/kabc/vcard/NValue.cpp
@@ -106,11 +106,11 @@ NValue::_parse()
for (unsigned int i = 0; i < l.count(); i++) {
switch (i) {
- case 0: family_ = l.at(0); break;
- case 1: given_ = l.at(1); break;
- case 2: middle_ = l.at(2); break;
- case 3: prefix_ = l.at(3); break;
- case 4: suffix_ = l.at(4); break;
+ case 0: family_ = l.tqat(0); break;
+ case 1: given_ = l.tqat(1); break;
+ case 2: middle_ = l.tqat(2); break;
+ case 3: prefix_ = l.tqat(3); break;
+ case 4: suffix_ = l.tqat(4); break;
default: break;
}
}
diff --git a/kabc/vcard/OrgValue.cpp b/kabc/vcard/OrgValue.cpp
index 94ca1824..d3fb93ac 100644
--- a/kabc/vcard/OrgValue.cpp
+++ b/kabc/vcard/OrgValue.cpp
@@ -102,6 +102,6 @@ OrgValue::numValues()
OrgValue::value(unsigned int i)
{
parse();
- return valueList_.at(i);
+ return valueList_.tqat(i);
}
diff --git a/kabc/vcard/TextListValue.cpp b/kabc/vcard/TextListValue.cpp
index 2bec2e18..ef2b5d07 100644
--- a/kabc/vcard/TextListValue.cpp
+++ b/kabc/vcard/TextListValue.cpp
@@ -102,6 +102,6 @@ TextListValue::numValues()
TextListValue::value(unsigned int i)
{
parse();
- return valueList_.at(i);
+ return valueList_.tqat(i);
}
diff --git a/kabc/vcard/VCard.cpp b/kabc/vcard/VCard.cpp
index 50c25da5..a1a9d1ba 100644
--- a/kabc/vcard/VCard.cpp
+++ b/kabc/vcard/VCard.cpp
@@ -95,7 +95,7 @@ VCard::_parse()
}
// Get the first line
- TQCString beginLine = TQCString(l.at(0)).stripWhiteSpace();
+ TQCString beginLine = TQCString(l.tqat(0)).stripWhiteSpace();
vDebug("Begin line == \"" + beginLine + "\"");
diff --git a/kabc/vcard/testread.cpp b/kabc/vcard/testread.cpp
index d1341fb4..3a33c7d5 100644
--- a/kabc/vcard/testread.cpp
+++ b/kabc/vcard/testread.cpp
@@ -3,7 +3,7 @@
#include <assert.h>
#include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
#include <VCard.h>
diff --git a/kabc/vcardparser/testread.cpp b/kabc/vcardparser/testread.cpp
index 8926e5bc..bad2ceb7 100644
--- a/kabc/vcardparser/testread.cpp
+++ b/kabc/vcardparser/testread.cpp
@@ -21,7 +21,7 @@
#include <stdlib.h>
#include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
#include <kprocess.h>
#include <kdebug.h>
diff --git a/kabc/vcardparser/testwrite.cpp b/kabc/vcardparser/testwrite.cpp
index 04d72f53..f24f1ad2 100644
--- a/kabc/vcardparser/testwrite.cpp
+++ b/kabc/vcardparser/testwrite.cpp
@@ -29,7 +29,7 @@
#include <kcmdlineargs.h>
#include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
#include "vcardconverter.h"
@@ -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::currentDateTime() );
+ addressee.setRevision( TQDateTime::tqcurrentDateTime() );
addressee.setSortString( "koenig" );
addressee.setUrl( KURL( "http://wgess16.dyndns.org") );
addressee.setSecrecy( KABC::Secrecy( KABC::Secrecy::Confidential ) );
diff --git a/kabc/vcardparser/vcardparser.cpp b/kabc/vcardparser/vcardparser.cpp
index 8fb9ab10..82ab9671 100644
--- a/kabc/vcardparser/vcardparser.cpp
+++ b/kabc/vcardparser/vcardparser.cpp
@@ -19,7 +19,7 @@
*/
#include <tqregexp.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
#include <kmdcodec.h>
@@ -144,7 +144,7 @@ VCard::List VCardParser::parseVCards( const TQString& text )
}
else if ( vCardLine.parameter( "encoding" ).lower() == "quoted-printable" ) {
// join any qp-folded lines
- while ( value.at( value.length() - 1 ) == '=' && it != linesEnd ) {
+ while ( value.tqat( value.length() - 1 ) == '=' && it != linesEnd ) {
value = value.remove( value.length() - 1, 1 ) + (*it);
++it;
}
diff --git a/kabc/vcardtool.cpp b/kabc/vcardtool.cpp
index 295360a0..08bcf93e 100644
--- a/kabc/vcardtool.cpp
+++ b/kabc/vcardtool.cpp
@@ -36,7 +36,7 @@ static bool needsEncoding( const TQString &value )
{
uint length = value.length();
for ( uint i = 0; i < length; ++i ) {
- char c = value.at( i ).latin1();
+ char c = value.tqat( i ).latin1();
if ( (c < 33 || c > 126) && c != ' ' && c != '=' )
return true;
}
diff --git a/kate/part/kateautoindent.cpp b/kate/part/kateautoindent.cpp
index ed9a6169..0aabde87 100644
--- a/kate/part/kateautoindent.cpp
+++ b/kate/part/kateautoindent.cpp
@@ -223,7 +223,7 @@ void KateNormalIndent::updateConfig ()
for (uint i=0; i<items.count(); i++)
{
- TQString name = items.at(i)->name;
+ TQString name = items.tqat(i)->name;
if (name.find("Comment") != -1 && commentAttrib == 255)
{
commentAttrib = i;
@@ -748,7 +748,7 @@ void KateCSmartIndent::processChar(TQChar c)
if (c == 'n')
{
- if (firstChar != '#' || textLine->string(curCol-5, 5) != TQString::fromLatin1("regio"))
+ if (firstChar != '#' || textLine->string(curCol-5, 5) != TQString::tqfromLatin1("regio"))
return;
}
@@ -1411,7 +1411,7 @@ void KateXmlIndent::getLineInfo (uint line, uint &prevIndent, int &numTags,
uint pos, len = text.length();
bool seenOpen = false;
for(pos = 0; pos < len; ++pos) {
- int ch = text.at(pos).unicode();
+ int ch = text.tqat(pos).tqunicode();
switch(ch) {
case '<':
seenOpen = true;
@@ -1467,11 +1467,11 @@ void KateXmlIndent::getLineInfo (uint line, uint &prevIndent, int &numTags,
if(unclosedTag) {
// find the start of the next attribute, so we can align with it
do {
- lastCh = text.at(++attrCol).unicode();
+ lastCh = text.tqat(++attrCol).tqunicode();
}while(lastCh && lastCh != ' ' && lastCh != '\t');
while(lastCh == ' ' || lastCh == '\t') {
- lastCh = text.at(++attrCol).unicode();
+ lastCh = text.tqat(++attrCol).tqunicode();
}
attrCol = prevLine->cursorX(attrCol, tabWidth);
@@ -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::fromLatin1("region") ) &&
- !currLine->stringAtPos( currLineFirst+1, TQString::fromLatin1("endregion") ) )
+ if( !currLine->stringAtPos( currLineFirst+1, TQString::tqfromLatin1("region") ) &&
+ !currLine->stringAtPos( currLineFirst+1, TQString::tqfromLatin1("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::fromLatin1(scopeKeywords[n]) ) )
+ if( textLine->stringAtPos(pos, TQString::tqfromLatin1(scopeKeywords[n]) ) )
return calcIndentAfterKeyword( begin, cur, pos, false );
for( uint n = 0; n < ARRLEN(blockScopeKeywords); ++n )
- if( textLine->stringAtPos(pos, TQString::fromLatin1(blockScopeKeywords[n]) ) )
+ if( textLine->stringAtPos(pos, TQString::tqfromLatin1(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::fromLatin1( "namespace" ) ) )
+ braceLine->stringAtPos( braceFirst, TQString::tqfromLatin1( "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::fromLatin1( "namespace" ) ) )
+ prevLine->stringAtPos( firstPrev, TQString::tqfromLatin1( "namespace" ) ) )
return continuationIndent(indentCursor) + whitespaceToOpenBrace;
}
}
@@ -2384,7 +2384,7 @@ void KateVarIndent::slotVariableChanged( const TQString &var, const TQString &va
for (uint i=0; i<items.count(); i++)
{
- if ( items.at(i)->name.section( ':', 1 ) == val )
+ if ( items.tqat(i)->name.section( ':', 1 ) == val )
{
d->coupleAttrib = i;
break;
diff --git a/kate/part/katebookmarks.cpp b/kate/part/katebookmarks.cpp
index ac1ee73d..6498d993 100644
--- a/kate/part/katebookmarks.cpp
+++ b/kate/part/katebookmarks.cpp
@@ -128,7 +128,7 @@ void KateBookmarks::clearBookmarks ()
TQPtrList<KTextEditor::Mark> m = m_view->getDoc()->marks();
for (uint i=0; i < m.count(); i++)
- m_view->getDoc()->removeMark( m.at(i)->line, KTextEditor::MarkInterface::markType01 );
+ m_view->getDoc()->removeMark( m.tqat(i)->line, KTextEditor::MarkInterface::markType01 );
// just to be sure ;)
marksChanged ();
@@ -255,8 +255,8 @@ void KateBookmarks::goNext()
int found = -1;
for (uint z=0; z < m.count(); z++)
- if ( (m.at(z)->line > line) && ((found == -1) || (uint(found) > m.at(z)->line)) )
- found = m.at(z)->line;
+ if ( (m.tqat(z)->line > line) && ((found == -1) || (uint(found) > m.tqat(z)->line)) )
+ found = m.tqat(z)->line;
if (found != -1)
m_view->gotoLineNumber ( found );
@@ -272,8 +272,8 @@ void KateBookmarks::goPrevious()
int found = -1;
for (uint z=0; z < m.count(); z++)
- if ((m.at(z)->line < line) && ((found == -1) || (uint(found) < m.at(z)->line)))
- found = m.at(z)->line;
+ if ((m.tqat(z)->line < line) && ((found == -1) || (uint(found) < m.tqat(z)->line)))
+ found = m.tqat(z)->line;
if (found != -1)
m_view->gotoLineNumber ( found );
diff --git a/kate/part/katebuffer.cpp b/kate/part/katebuffer.cpp
index 2ffc8f50..05af27ff 100644
--- a/kate/part/katebuffer.cpp
+++ b/kate/part/katebuffer.cpp
@@ -36,9 +36,9 @@
#include <tqpopupmenu.h>
#include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
#include <tqtimer.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
#include <tqcstring.h>
#include <tqdatetime.h>
@@ -172,10 +172,10 @@ class KateFileLoader
// should spaces be ignored at end of line?
inline bool removeTrailingSpaces () const { return m_removeTrailingSpaces; }
- // internal unicode data array
- inline const TQChar *unicode () const { return m_text.unicode(); }
+ // internal tqunicode data array
+ inline const TQChar *tqunicode () const { return m_text.tqunicode(); }
- // read a line, return length + offset in unicode data
+ // read a line, return length + offset in tqunicode data
void readLine (uint &offset, uint &length)
{
length = 0;
@@ -543,7 +543,7 @@ bool KateBuffer::canEncode ()
kdDebug(13020) << "ENC NAME: " << codec->name() << endl;
- // hardcode some unicode encodings which can encode all chars
+ // hardcode some tqunicode encodings which can encode all chars
if ((TQString(codec->name()) == "UTF-8") || (TQString(codec->name()) == "ISO-10646-UCS-2"))
return true;
@@ -860,12 +860,12 @@ void KateBuffer::setHighlight(uint hlMode)
// aha, hl will change
if (h != m_highlight)
{
- bool invalidate = !h->noHighlighting();
+ bool tqinvalidate = !h->noHighlighting();
if (m_highlight)
{
m_highlight->release();
- invalidate = true;
+ tqinvalidate = true;
}
h->use();
@@ -880,7 +880,7 @@ void KateBuffer::setHighlight(uint hlMode)
m_highlight = h;
- if (invalidate)
+ if (tqinvalidate)
invalidateHighlighting();
// inform the document that the hl was really changed
@@ -949,7 +949,7 @@ void KateBuffer::addIndentBasedFoldingInformation(TQMemArray<uint> &foldingList,
}
}
-bool KateBuffer::doHighlight (KateBufBlock *buf, uint startLine, uint endLine, bool invalidate)
+bool KateBuffer::doHighlight (KateBufBlock *buf, uint startLine, uint endLine, bool tqinvalidate)
{
// no hl around, no stuff to do
if (!m_highlight)
@@ -971,7 +971,7 @@ bool KateBuffer::doHighlight (KateBufBlock *buf, uint startLine, uint endLine, b
//kdDebug (13020) << "HL UNTIL LINE: " << m_lineHighlighted << " MAX: " << m_lineHighlightedMax << endl;
//kdDebug (13020) << "HL DYN COUNT: " << KateHlManager::self()->countDynamicCtxs() << " MAX: " << m_maxDynamicContexts << endl;
- // see if there are too many dynamic contexts; if yes, invalidate HL of all documents
+ // see if there are too many dynamic contexts; if yes, tqinvalidate HL of all documents
if (KateHlManager::self()->countDynamicCtxs() >= m_maxDynamicContexts)
{
{
@@ -1240,7 +1240,7 @@ bool KateBuffer::doHighlight (KateBufBlock *buf, uint startLine, uint endLine, b
buf->markDirty ();
// tag the changed lines !
- if (invalidate)
+ if (tqinvalidate)
emit tagLines (startLine, current_line + buf->startLine());
// emit that we have changed the folding
@@ -1353,14 +1353,14 @@ void KateBufBlock::fillBlock (KateFileLoader *stream)
{
uint offset = 0, length = 0;
stream->readLine(offset, length);
- const TQChar *unicodeData = stream->unicode () + offset;
+ const TQChar *tqunicodeData = stream->tqunicode () + offset;
// strip spaces at end of line
if ( stream->removeTrailingSpaces() )
{
while (length > 0)
{
- if (unicodeData[length-1].isSpace())
+ if (tqunicodeData[length-1].isSpace())
--length;
else
break;
@@ -1391,13 +1391,13 @@ void KateBufBlock::fillBlock (KateFileLoader *stream)
memcpy(buf+pos, (char *) &length, sizeof(uint));
pos += sizeof(uint);
- memcpy(buf+pos, (char *) unicodeData, sizeof(TQChar)*length);
+ memcpy(buf+pos, (char *) tqunicodeData, sizeof(TQChar)*length);
pos += sizeof(TQChar)*length;
}
else
{
KateTextLine::Ptr textLine = new KateTextLine ();
- textLine->insertText (0, length, unicodeData);
+ textLine->insertText (0, length, tqunicodeData);
m_stringList.push_back (textLine);
}
diff --git a/kate/part/katebuffer.h b/kate/part/katebuffer.h
index 04ee264e..450f260a 100644
--- a/kate/part/katebuffer.h
+++ b/kate/part/katebuffer.h
@@ -116,7 +116,7 @@ class KateBufBlock
void removeLine(uint i);
/**
- * mark this block as dirty, will invalidate the swap data
+ * mark this block as dirty, will tqinvalidate the swap data
* insert/removeLine will mark the block dirty itself
*/
void markDirty ();
@@ -611,7 +611,7 @@ class KateBuffer : public TQObject
* @returns true when the highlighting in the next block needs to be updated,
* false otherwise.
*/
- bool doHighlight (KateBufBlock *buf, uint from, uint to, bool invalidate);
+ bool doHighlight (KateBufBlock *buf, uint from, uint to, bool tqinvalidate);
signals:
/**
diff --git a/kate/part/katecmds.cpp b/kate/part/katecmds.cpp
index c5feb507..d4879cfd 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.capturedTexts();
+ TQStringList backrefs=matcher.tqcapturedTexts();
int refnum=1;
TQStringList::Iterator i = backrefs.begin();
@@ -578,7 +578,7 @@ bool KateCommands::Character::exec (Kate::View *view, const TQString &_cmd, TQSt
view->insertText(TQString(buf));
}
else
- { // do the unicode thing
+ { // do the tqunicode thing
TQChar c(number);
view->insertText(TQString(&c, 1));
}
@@ -593,10 +593,10 @@ bool KateCommands::Date::exec (Kate::View *view, const TQString &cmd, TQString &
if (cmd.left(4) != "date")
return false;
- if (TQDateTime::currentDateTime().toString(cmd.mid(5, cmd.length()-5)).length() > 0)
- view->insertText(TQDateTime::currentDateTime().toString(cmd.mid(5, cmd.length()-5)));
+ if (TQDateTime::tqcurrentDateTime().toString(cmd.mid(5, cmd.length()-5)).length() > 0)
+ view->insertText(TQDateTime::tqcurrentDateTime().toString(cmd.mid(5, cmd.length()-5)));
else
- view->insertText(TQDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss"));
+ view->insertText(TQDateTime::tqcurrentDateTime().toString("yyyy-MM-dd hh:mm:ss"));
return true;
}
diff --git a/kate/part/katecmds.h b/kate/part/katecmds.h
index 55c8d807..e55e2ac8 100644
--- a/kate/part/katecmds.h
+++ b/kate/part/katecmds.h
@@ -119,7 +119,7 @@ class SedReplace : public Kate::Command
};
/**
- * insert a unicode or ascii character
+ * insert a tqunicode or ascii character
* base 9+1: 1234
* hex: 0x1234 or x1234
* octal: 01231
diff --git a/kate/part/katecodecompletion.cpp b/kate/part/katecodecompletion.cpp
index 99fb1925..1bff647f 100644
--- a/kate/part/katecodecompletion.cpp
+++ b/kate/part/katecodecompletion.cpp
@@ -42,7 +42,7 @@
#include <tqapplication.h>
#include <tqsizegrip.h>
#include <tqfontmetrics.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqregexp.h>
/**
@@ -384,7 +384,7 @@ void KateCodeCompletion::showComment()
m_completionListBox->ensureCurrentVisible();
finalPoint.setY(
- m_completionListBox->viewport()->mapToGlobal(m_completionListBox->itemRect(
+ m_completionListBox->viewport()->mapToGlobal(m_completionListBox->tqitemRect(
m_completionListBox->item(m_completionListBox->currentItem())).topLeft()).y());
m_commentLabel->move(finalPoint);
diff --git a/kate/part/katecodefoldinghelpers.cpp b/kate/part/katecodefoldinghelpers.cpp
index ab571d9d..15ba05cb 100644
--- a/kate/part/katecodefoldinghelpers.cpp
+++ b/kate/part/katecodefoldinghelpers.cpp
@@ -1259,7 +1259,7 @@ void KateCodeFoldingTree::cleanupUnneededNodes(unsigned int line)
for (int i=0; i<(int)markedForDeleting.count(); i++)
{
- KateCodeFoldingNode *node = markedForDeleting.at(i);
+ KateCodeFoldingNode *node = markedForDeleting.tqat(i);
if (node->deleteOpening)
kdDebug(13000)<<"DELETE OPENING SET"<<endl;
if (node->deleteEnding)
@@ -1335,7 +1335,7 @@ void KateCodeFoldingTree::toggleRegionVisibility(unsigned int line)
findAllNodesOpenedOrClosedAt(line);
for (int i=0; i<(int)nodesForLine.count(); i++)
{
- KateCodeFoldingNode *node=nodesForLine.at(i);
+ KateCodeFoldingNode *node=nodesForLine.tqat(i);
if ( (!node->startLineValid) || (getStartLine(node) != line) )
{
nodesForLine.remove(i);
@@ -1346,10 +1346,10 @@ void KateCodeFoldingTree::toggleRegionVisibility(unsigned int line)
if (nodesForLine.isEmpty())
return;
- nodesForLine.at(0)->visible = !nodesForLine.at(0)->visible;
+ nodesForLine.tqat(0)->visible = !nodesForLine.tqat(0)->visible;
- if (!nodesForLine.at(0)->visible)
- addHiddenLineBlock(nodesForLine.at(0),line);
+ if (!nodesForLine.tqat(0)->visible)
+ addHiddenLineBlock(nodesForLine.tqat(0),line);
else
{
for (TQValueList<KateHiddenLineBlock>::Iterator it=hiddenLines.begin(); it!=hiddenLines.end();++it)
@@ -1359,7 +1359,7 @@ void KateCodeFoldingTree::toggleRegionVisibility(unsigned int line)
break;
}
- updateHiddenSubNodes(nodesForLine.at(0));
+ updateHiddenSubNodes(nodesForLine.tqat(0));
}
emit regionVisibilityChangedAt(line);
diff --git a/kate/part/kateconfig.cpp b/kate/part/kateconfig.cpp
index 7929f781..5bfe55fb 100644
--- a/kate/part/kateconfig.cpp
+++ b/kate/part/kateconfig.cpp
@@ -38,7 +38,7 @@
#include <kstaticdeleter.h>
#include <tqpopupmenu.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
#include <kdebug.h>
@@ -237,7 +237,7 @@ void KateDocumentConfig::updateConfig ()
{
for (uint z=0; z < KateFactory::self()->documents()->count(); z++)
{
- KateFactory::self()->documents()->at(z)->updateConfig ();
+ KateFactory::self()->documents()->tqat(z)->updateConfig ();
}
}
}
@@ -422,7 +422,7 @@ TQTextCodec *KateDocumentConfig::codec ()
if (m_encodingSet || isGlobal())
{
if (m_encoding.isEmpty() && isGlobal())
- return KGlobal::charsets()->codecForName (TQString::fromLatin1(KGlobal::locale()->encoding()));
+ return KGlobal::charsets()->codecForName (TQString::tqfromLatin1(KGlobal::locale()->encoding()));
else if (m_encoding.isEmpty())
return s_global->codec ();
else
@@ -570,8 +570,8 @@ bool KateDocumentConfig::plugin (uint index) const
if (index >= m_plugins.size())
return false;
- if (m_pluginsSet.at(index) || isGlobal())
- return m_plugins.at(index);
+ if (m_pluginsSet.tqat(index) || isGlobal())
+ return m_plugins.tqat(index);
return s_global->plugin (index);
}
@@ -734,7 +734,7 @@ void KateViewConfig::updateConfig ()
{
for (uint z=0; z < KateFactory::self()->views()->count(); z++)
{
- KateFactory::self()->views()->at(z)->updateConfig ();
+ KateFactory::self()->views()->tqat(z)->updateConfig ();
}
}
}
@@ -1088,7 +1088,7 @@ void KateRendererConfig::updateConfig ()
{
for (uint z=0; z < KateFactory::self()->renderers()->count(); z++)
{
- KateFactory::self()->renderers()->at(z)->updateConfig ();
+ KateFactory::self()->renderers()->tqat(z)->updateConfig ();
}
}
}
@@ -1114,7 +1114,7 @@ void KateRendererConfig::reloadSchema()
{
if ( isGlobal() )
for ( uint z=0; z < KateFactory::self()->renderers()->count(); z++ )
- KateFactory::self()->renderers()->at(z)->config()->reloadSchema();
+ KateFactory::self()->renderers()->tqat(z)->config()->reloadSchema();
else if ( m_renderer && m_schemaSet )
setSchemaInternal( m_schema );
diff --git a/kate/part/katedialogs.cpp b/kate/part/katedialogs.cpp
index d341603d..f9c5dadb 100644
--- a/kate/part/katedialogs.cpp
+++ b/kate/part/katedialogs.cpp
@@ -86,7 +86,7 @@
#include <tqheader.h>
#include <tqhgroupbox.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlineedit.h>
#include <tqlistbox.h>
#include <tqlistview.h>
@@ -101,7 +101,7 @@
#include <tqspinbox.h>
#include <tqstringlist.h>
#include <tqtabwidget.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
#include <tqtoolbutton.h>
#include <tqvbox.h>
#include <tqvgroupbox.h>
@@ -712,7 +712,7 @@ KateViewDefaultsConfig::KateViewDefaultsConfig(TQWidget *parent)
"you to set a maximum width of the screen, as a percentage, after which "
"dynamically wrapped lines will no longer be vertically aligned. For "
"example, at 50%, lines whose indentation levels are deeper than 50% of "
- "the width of the screen will not have vertical alignment applied to "
+ "the width of the screen will not have vertical tqalignment applied to "
"subsequent wrapped lines.</p>"));
TQWhatsThis::add(m_line,i18n(
"If this option is checked, every new view will display line numbers "
@@ -819,7 +819,7 @@ void KateEditKeyConfiguration::showEvent ( TQShowEvent * )
if (!m_ready)
{
(new TQVBoxLayout(this))->setAutoAdd(true);
- KateView* view = (KateView*)m_doc->views().at(0);
+ KateView* view = (KateView*)m_doc->views().tqat(0);
m_ac = view->editActionCollection();
m_keyChooser = new KKeyChooser( m_ac, this, false );
connect( m_keyChooser, TQT_SIGNAL( keyChange() ), this, TQT_SLOT( slotChanged() ) );
@@ -1154,7 +1154,7 @@ void KatePartPluginConfigPage::apply ()
KateDocumentConfig::global()->configStart ();
for (uint i=0; i < m_items.count(); i++)
- KateDocumentConfig::global()->setPlugin (m_items.at(i)->pluginIndex(), m_items.at(i)->isOn());
+ KateDocumentConfig::global()->setPlugin (m_items.tqat(i)->pluginIndex(), m_items.tqat(i)->isOn());
KateDocumentConfig::global()->configEnd ();
}
@@ -1243,7 +1243,7 @@ void KatePartPluginConfigPage::slotConfigure()
for( uint i=0; i<editorPages.count(); i++ )
{
- editorPages.at( i )->apply();
+ editorPages.tqat( i )->apply();
}
}
diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp
index 81d05b21..93875885 100644
--- a/kate/part/katedocument.cpp
+++ b/kate/part/katedocument.cpp
@@ -72,9 +72,9 @@
#include <tqtimer.h>
#include <tqfile.h>
-#include <clipboard.h>
-#include <textstream.h>
-#include <textcodec.h>
+#include <tqclipboard.h>
+#include <tqtextstream.h>
+#include <tqtextcodec.h>
#include <tqmap.h>
//END includes
@@ -323,7 +323,7 @@ void KateDocument::enablePluginGUI (KTextEditor::Plugin *plugin)
if (!KTextEditor::pluginViewInterface(plugin)) return;
for (uint i=0; i< m_views.count(); i++)
- enablePluginGUI (plugin, m_views.at(i));
+ enablePluginGUI (plugin, m_views.tqat(i));
}
void KateDocument::disablePluginGUI (KTextEditor::Plugin *plugin, KateView *view)
@@ -347,7 +347,7 @@ void KateDocument::disablePluginGUI (KTextEditor::Plugin *plugin)
if (!KTextEditor::pluginViewInterface(plugin)) return;
for (uint i=0; i< m_views.count(); i++)
- disablePluginGUI (plugin, m_views.at(i));
+ disablePluginGUI (plugin, m_views.tqat(i));
}
//END
@@ -641,7 +641,7 @@ bool KateDocument::setText(const TQString &s)
TQValueList<KTextEditor::Mark> msave;
for (uint i=0; i < m.count(); i++)
- msave.append (*m.at(i));
+ msave.append (*m.tqat(i));
editStart ();
@@ -924,7 +924,7 @@ void KateDocument::editStart (bool withUndo)
for (uint z = 0; z < m_views.count(); z++)
{
- m_views.at(z)->editStart ();
+ m_views.tqat(z)->editStart ();
}
m_buffer->editStart ();
@@ -1029,7 +1029,7 @@ void KateDocument::editEnd ()
// edit end for all views !!!!!!!!!
for (uint z = 0; z < m_views.count(); z++)
- m_views.at(z)->editEnd (m_buffer->editTagStart(), m_buffer->editTagEnd(), m_buffer->editTagFrom());
+ m_views.tqat(z)->editEnd (m_buffer->editTagStart(), m_buffer->editTagEnd(), m_buffer->editTagFrom());
if (m_buffer->editChanged())
{
@@ -1187,7 +1187,7 @@ bool KateDocument::editInsertText ( uint line, uint col, const TQString &str )
editAddUndo (KateUndoGroup::editInsertText, line, col, s.length(), s);
- l->insertText (col, s.length(), s.unicode());
+ l->insertText (col, s.length(), s.tqunicode());
// removeTrailingSpace(line); // ### nessecary?
m_buffer->changeLine(line);
@@ -1410,7 +1410,7 @@ bool KateDocument::editInsertLine ( uint line, const TQString &s )
removeTrailingSpace( line ); // old line
KateTextLine::Ptr tl = new KateTextLine();
- tl->insertText (0, s.length(), s.unicode(), 0);
+ tl->insertText (0, s.length(), s.tqunicode(), 0);
m_buffer->insertLine(line, tl);
m_buffer->changeLine(line);
@@ -2011,7 +2011,7 @@ void KateDocument::configDialog()
for (uint i=0; i<editorPages.count(); i++)
{
- editorPages.at(i)->apply();
+ editorPages.tqat(i)->apply();
}
KateDocumentConfig::global()->configEnd ();
@@ -2316,7 +2316,7 @@ bool KateDocument::openURL( const KURL &url )
w = m_views.first();
if (w)
- m_job->setWindow (w->topLevelWidget());
+ m_job->setWindow (w->tqtopLevelWidget());
emit started( m_job );
@@ -2589,7 +2589,7 @@ bool KateDocument::saveFile()
//
if (!m_buffer->canEncode ()
&& (KMessageBox::warningContinueCancel(0,
- i18n("The selected encoding cannot encode every unicode character in this document. Do you really want to save it? There could be some data lost."),i18n("Possible Data Loss"),i18n("Save Nevertheless")) != KMessageBox::Continue))
+ i18n("The selected encoding cannot encode every tqunicode character in this document. Do you really want to save it? There could be some data lost."),i18n("Possible Data Loss"),i18n("Save Nevertheless")) != KMessageBox::Continue))
{
return false;
}
@@ -2869,7 +2869,7 @@ void KateDocument::setModified(bool m) {
void KateDocument::makeAttribs(bool needInvalidate)
{
for (uint z = 0; z < m_views.count(); z++)
- m_views.at(z)->renderer()->updateAttributes ();
+ m_views.tqat(z)->renderer()->updateAttributes ();
if (needInvalidate)
m_buffer->invalidateHighlighting();
@@ -3195,7 +3195,7 @@ void KateDocument::backspace( KateView *view, const KateTextCursor& c )
if (!textLine)
return;
- if (config()->wordWrap() && textLine->endingWith(TQString::fromLatin1(" ")))
+ if (config()->wordWrap() && textLine->endingWith(TQString::tqfromLatin1(" ")))
{
// gg: in hard wordwrap mode, backspace must also eat the trailing space
removeText (line-1, textLine->length()-1, line, 0);
@@ -3227,7 +3227,7 @@ void KateDocument::del( KateView *view, const KateTextCursor& c )
void KateDocument::paste ( KateView* view )
{
- TQString s = TQApplication::clipboard()->text();
+ TQString s = TQApplication::tqclipboard()->text();
if (s.isEmpty())
return;
@@ -3981,9 +3981,9 @@ void KateDocument::transform( KateView *v, const KateTextCursor &c,
if ( ( ! start && ! p ) ||
( ( ln == selstart.line() || v->blockSelectionMode() ) &&
! p && ! highlight()->isInWord( l->getChar( start - 1 )) ) ||
- ( p && ! highlight()->isInWord( s.at( p-1 ) ) )
+ ( p && ! highlight()->isInWord( s.tqat( p-1 ) ) )
)
- s[p] = s.at(p).upper();
+ s[p] = s.tqat(p).upper();
p++;
}
}
@@ -4096,7 +4096,7 @@ TQString KateDocument::getWord( const KateTextCursor& cursor ) {
void KateDocument::tagLines(int start, int end)
{
for (uint z = 0; z < m_views.count(); z++)
- m_views.at(z)->tagLines (start, end, true);
+ m_views.tqat(z)->tagLines (start, end, true);
}
void KateDocument::tagLines(KateTextCursor start, KateTextCursor end)
@@ -4109,21 +4109,21 @@ void KateDocument::tagLines(KateTextCursor start, KateTextCursor end)
}
for (uint z = 0; z < m_views.count(); z++)
- m_views.at(z)->tagLines(start, end, true);
+ m_views.tqat(z)->tagLines(start, end, true);
}
void KateDocument::repaintViews(bool paintOnlyDirty)
{
for (uint z = 0; z < m_views.count(); z++)
- m_views.at(z)->repaintText(paintOnlyDirty);
+ m_views.tqat(z)->repaintText(paintOnlyDirty);
}
void KateDocument::tagAll()
{
for (uint z = 0; z < m_views.count(); z++)
{
- m_views.at(z)->tagAll();
- m_views.at(z)->updateView (true);
+ m_views.tqat(z)->tagAll();
+ m_views.tqat(z)->updateView (true);
}
}
@@ -4287,9 +4287,9 @@ void KateDocument::setDocName (TQString name )
for (uint z=0; z < KateFactory::self()->documents()->count(); z++)
{
- if ( (KateFactory::self()->documents()->at(z) != this) && (KateFactory::self()->documents()->at(z)->url().filename() == url().filename()) )
- if ( KateFactory::self()->documents()->at(z)->m_docNameNumber > count )
- count = KateFactory::self()->documents()->at(z)->m_docNameNumber;
+ if ( (KateFactory::self()->documents()->tqat(z) != this) && (KateFactory::self()->documents()->tqat(z)->url().filename() == url().filename()) )
+ if ( KateFactory::self()->documents()->tqat(z)->m_docNameNumber > count )
+ count = KateFactory::self()->documents()->tqat(z)->m_docNameNumber;
}
m_docNameNumber = count + 1;
@@ -4437,14 +4437,14 @@ void KateDocument::reloadFile()
TQValueList<int> lines, cols;
for ( uint i=0; i < m_views.count(); i++ )
{
- lines.append( m_views.at( i )->cursorLine() );
- cols.append( m_views.at( i )->cursorColumn() );
+ lines.append( m_views.tqat( i )->cursorLine() );
+ cols.append( m_views.tqat( i )->cursorColumn() );
}
KateDocument::openURL( url() );
for ( uint i=0; i < m_views.count(); i++ )
- m_views.at( i )->setCursorPositionInternal( lines[ i ], cols[ i ], m_config->tabWidth(), false );
+ m_views.tqat( i )->setCursorPositionInternal( lines[ i ], cols[ i ], m_config->tabWidth(), false );
m_reloading = false;
diff --git a/kate/part/katefactory.cpp b/kate/part/katefactory.cpp
index 64bde871..c42f698a 100644
--- a/kate/part/katefactory.cpp
+++ b/kate/part/katefactory.cpp
@@ -267,7 +267,7 @@ KateIndentScript KateFactory::indentScript (const TQString &scriptname)
KateIndentScript result;
for(uint i=0;i<m_indentScriptManagers.count();i++)
{
- result=m_indentScriptManagers.at(i)->script(scriptname);
+ result=m_indentScriptManagers.tqat(i)->script(scriptname);
if (!result.isNull()) return result;
}
return result;
diff --git a/kate/part/katefiletype.cpp b/kate/part/katefiletype.cpp
index c18961ac..c29b8641 100644
--- a/kate/part/katefiletype.cpp
+++ b/kate/part/katefiletype.cpp
@@ -43,7 +43,7 @@
#include <tqheader.h>
#include <tqhgroupbox.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlineedit.h>
#include <tqpushbutton.h>
#include <tqtoolbutton.h>
@@ -106,20 +106,20 @@ void KateFileTypeManager::save (TQPtrList<KateFileType> *v)
TQStringList newg;
for (uint z=0; z < v->count(); z++)
{
- config.setGroup (v->at(z)->name);
+ config.setGroup (v->tqat(z)->name);
- config.writeEntry ("Section", v->at(z)->section);
- config.writeEntry ("Wildcards", v->at(z)->wildcards, ';');
- config.writeEntry ("Mimetypes", v->at(z)->mimetypes, ';');
- config.writeEntry ("Priority", v->at(z)->priority);
+ config.writeEntry ("Section", v->tqat(z)->section);
+ config.writeEntry ("Wildcards", v->tqat(z)->wildcards, ';');
+ config.writeEntry ("Mimetypes", v->tqat(z)->mimetypes, ';');
+ config.writeEntry ("Priority", v->tqat(z)->priority);
- TQString varLine = v->at(z)->varLine;
+ TQString varLine = v->tqat(z)->varLine;
if (TQRegExp("kate:(.*)").search(varLine) < 0)
varLine.prepend ("kate: ");
config.writeEntry ("Variables", varLine);
- newg << v->at(z)->name;
+ newg << v->tqat(z)->name;
}
TQStringList g (config.groupList());
@@ -187,8 +187,8 @@ int KateFileTypeManager::fileType (KateDocument *doc)
for (uint z=0; z < m_types.count(); z++)
{
- if (m_types.at(z)->mimetypes.findIndex (mt->name()) > -1)
- types.append (m_types.at(z));
+ if (m_types.tqat(z)->mimetypes.findIndex (mt->name()) > -1)
+ types.append (m_types.tqat(z));
}
if ( !types.isEmpty() )
@@ -218,13 +218,13 @@ int KateFileTypeManager::wildcardsFind (const TQString &fileName)
for (uint z=0; z < m_types.count(); z++)
{
- for( TQStringList::Iterator it = m_types.at(z)->wildcards.begin(); it != m_types.at(z)->wildcards.end(); ++it )
+ for( TQStringList::Iterator it = m_types.tqat(z)->wildcards.begin(); it != m_types.tqat(z)->wildcards.end(); ++it )
{
// anders: we need to be sure to match the end of string, as eg a css file
// would otherwise end up with the c hl
TQRegExp re(*it, true, true);
if ( ( re.search( fileName ) > -1 ) && ( re.matchedLength() == (int)fileName.length() ) )
- types.append (m_types.at(z));
+ types.append (m_types.tqat(z));
}
}
@@ -251,7 +251,7 @@ int KateFileTypeManager::wildcardsFind (const TQString &fileName)
const KateFileType *KateFileTypeManager::fileType (uint number)
{
if (number < m_types.count())
- return m_types.at(number);
+ return m_types.tqat(number);
return 0;
}
@@ -373,7 +373,7 @@ void KateFileTypeConfigTab::reload()
{
KateFileType *type = new KateFileType ();
- *type = *KateFactory::self()->fileTypeManager()->list()->at(z);
+ *type = *KateFactory::self()->fileTypeManager()->list()->tqat(z);
m_types.append (type);
}
@@ -398,10 +398,10 @@ void KateFileTypeConfigTab::update ()
typeCombo->clear ();
for( uint i = 0; i < m_types.count(); i++) {
- if (m_types.at(i)->section.length() > 0)
- typeCombo->insertItem(m_types.at(i)->section + TQString ("/") + m_types.at(i)->name);
+ if (m_types.tqat(i)->section.length() > 0)
+ typeCombo->insertItem(m_types.tqat(i)->section + TQString ("/") + m_types.tqat(i)->name);
else
- typeCombo->insertItem(m_types.at(i)->name);
+ typeCombo->insertItem(m_types.tqat(i)->name);
}
typeCombo->setCurrentItem (0);
@@ -427,7 +427,7 @@ void KateFileTypeConfigTab::newType ()
TQString newN = i18n("New Filetype");
for( uint i = 0; i < m_types.count(); i++) {
- if (m_types.at(i)->name == newN)
+ if (m_types.tqat(i)->name == newN)
{
typeCombo->setCurrentItem (i);
typeChanged (i);
@@ -464,7 +464,7 @@ void KateFileTypeConfigTab::typeChanged (int type)
KateFileType *t = 0;
if ((type > -1) && ((uint)type < m_types.count()))
- t = m_types.at(type);
+ t = m_types.tqat(type);
if (t)
{
@@ -536,8 +536,8 @@ void KateViewFileTypeAction::slotAboutToShow()
for (int z=0; z<count; z++)
{
- TQString hlName = KateFactory::self()->fileTypeManager()->list()->at(z)->name;
- TQString hlSection = KateFactory::self()->fileTypeManager()->list()->at(z)->section;
+ TQString hlName = KateFactory::self()->fileTypeManager()->list()->tqat(z)->name;
+ TQString hlSection = KateFactory::self()->fileTypeManager()->list()->tqat(z)->section;
if ( !hlSection.isEmpty() && (names.contains(hlName) < 1) )
{
@@ -551,7 +551,7 @@ void KateViewFileTypeAction::slotAboutToShow()
int m = subMenusName.findIndex (hlSection);
names << hlName;
- subMenus.at(m)->insertItem ( hlName, this, TQT_SLOT(setType(int)), 0, z+1);
+ subMenus.tqat(m)->insertItem ( hlName, this, TQT_SLOT(setType(int)), 0, z+1);
}
else if (names.contains(hlName) < 1)
{
@@ -564,8 +564,8 @@ void KateViewFileTypeAction::slotAboutToShow()
for (uint i=0;i<subMenus.count();i++)
{
- for (uint i2=0;i2<subMenus.at(i)->count();i2++)
- subMenus.at(i)->setItemChecked(subMenus.at(i)->idAt(i2),false);
+ for (uint i2=0;i2<subMenus.tqat(i)->count();i2++)
+ subMenus.tqat(i)->setItemChecked(subMenus.tqat(i)->idAt(i2),false);
}
popupMenu()->setItemChecked (0, false);
@@ -577,8 +577,8 @@ void KateViewFileTypeAction::slotAboutToShow()
if ((t = KateFactory::self()->fileTypeManager()->fileType (doc->fileType())))
{
int i = subMenusName.findIndex (t->section);
- if (i >= 0 && subMenus.at(i))
- subMenus.at(i)->setItemChecked (doc->fileType()+1, true);
+ if (i >= 0 && subMenus.tqat(i))
+ subMenus.tqat(i)->setItemChecked (doc->fileType()+1, true);
else
popupMenu()->setItemChecked (0, true);
}
diff --git a/kate/part/katehighlight.cpp b/kate/part/katehighlight.cpp
index 31b33677..7f5bcc88 100644
--- a/kate/part/katehighlight.cpp
+++ b/kate/part/katehighlight.cpp
@@ -47,7 +47,7 @@
#include <kapplication.h>
#include <tqstringlist.h>
-#include <textstream.h>
+#include <tqtextstream.h>
//END
//BEGIN defines
@@ -65,10 +65,10 @@ static const int KATE_DYNAMIC_CONTEXTS_RESET_DELAY = 30 * 1000;
inline bool kateInsideString (const TQString &str, TQChar ch)
{
- const TQChar *unicode = str.unicode();
+ const TQChar *tqunicode = str.tqunicode();
const uint len = str.length();
for (uint i=0; i < len; i++)
- if (unicode[i] == ch)
+ if (tqunicode[i] == ch)
return true;
return false;
@@ -661,7 +661,7 @@ int KateHlKeyword::checkHgl(const TQString& text, int offset, int len)
if (wordLen < minLen) return 0;
- if ( dict[wordLen] && dict[wordLen]->find(TQConstString(text.unicode() + offset, wordLen).string()) )
+ if ( dict[wordLen] && dict[wordLen]->find(TQConstString(text.tqunicode() + offset, wordLen).string()) )
return offset2;
return 0;
@@ -815,7 +815,7 @@ int KateHlCOct::checkHgl(const TQString& text, int offset, int len)
int offset2 = offset;
- while ((len > 0) && (text.at(offset2) >= TQChar('0') && text.at(offset2) <= TQChar('7')))
+ while ((len > 0) && (text.tqat(offset2) >= TQChar('0') && text.tqat(offset2) <= TQChar('7')))
{
offset2++;
len--;
@@ -958,7 +958,7 @@ int KateHlRegExpr::checkHgl(const TQString& text, int offset, int /*len*/)
TQStringList *KateHlRegExpr::capturedTexts()
{
- return new TQStringList(Expr->capturedTexts());
+ return new TQStringList(Expr->tqcapturedTexts());
}
KateHlItem *KateHlRegExpr::clone(const TQStringList *args)
@@ -1038,7 +1038,7 @@ static int checkEscapedChar(const TQString& text, int offset, int& len)
// replaced with something else but
// for right now they work
// check for hexdigits
- for (i = 0; (len > 0) && (i < 2) && (static_cast<const char>(text.at(offset)) >= '0' && static_cast<const char>(text.at(offset)) <= '9' || (text[offset] & 0xdf) >= 'A' && (text[offset] & 0xdf) <= 'F'); i++)
+ for (i = 0; (len > 0) && (i < 2) && (static_cast<const char>(text.tqat(offset)) >= '0' && static_cast<const char>(text.tqat(offset)) <= '9' || (text[offset] & 0xdf) >= 'A' && (text[offset] & 0xdf) <= 'F'); i++)
{
offset++;
len--;
@@ -1051,7 +1051,7 @@ static int checkEscapedChar(const TQString& text, int offset, int& len)
case '0': case '1': case '2': case '3' :
case '4': case '5': case '6': case '7' :
- for (i = 0; (len > 0) && (i < 3) && (static_cast<const char>(text.at(offset)) >= '0' && static_cast<const char>(text.at(offset)) <= '7'); i++)
+ for (i = 0; (len > 0) && (i < 3) && (static_cast<const char>(text.tqat(offset)) >= '0' && static_cast<const char>(text.tqat(offset)) <= '7'); i++)
{
offset++;
len--;
@@ -1890,7 +1890,7 @@ void KateHighlighting::addToKateHlItemDataList()
int KateHighlighting::lookupAttrName(const TQString& name, KateHlItemDataList &iDl)
{
for (uint i = 0; i < iDl.count(); i++)
- if (iDl.at(i)->name == buildPrefix+name)
+ if (iDl.tqat(i)->name == buildPrefix+name)
return i;
kdDebug(13010)<<"Couldn't resolve itemDataName:"<<name<<endl;
@@ -2885,13 +2885,13 @@ void KateHighlighting::clearAttributeArrays ()
for (uint z = 0; z < nAttribs; z++)
{
- KateHlItemData *itemData = itemDataList.at(z);
- KateAttribute n = *defaultStyleList.at(itemData->defStyleNum);
+ KateHlItemData *itemData = itemDataList.tqat(z);
+ KateAttribute n = *defaultStyleList.tqat(itemData->defStyleNum);
if (itemData && itemData->isSomethingSet())
n += *itemData;
- array->at(z) = n;
+ array->tqat(z) = n;
}
}
}
@@ -2924,13 +2924,13 @@ TQMemArray<KateAttribute> *KateHighlighting::attributes (uint schema)
for (uint z = 0; z < nAttribs; z++)
{
- KateHlItemData *itemData = itemDataList.at(z);
- KateAttribute n = *defaultStyleList.at(itemData->defStyleNum);
+ KateHlItemData *itemData = itemDataList.tqat(z);
+ KateAttribute n = *defaultStyleList.tqat(itemData->defStyleNum);
if (itemData && itemData->isSomethingSet())
n += *itemData;
- array->at(z) = n;
+ array->tqat(z) = n;
}
m_attributeArrays.insert(schema, array);
@@ -2946,7 +2946,7 @@ void KateHighlighting::getKateHlItemDataListCopy (uint schema, KateHlItemDataLis
outlist.clear ();
outlist.setAutoDelete (true);
for (uint z=0; z < itemDataList.count(); z++)
- outlist.append (new KateHlItemData (*itemDataList.at(z)));
+ outlist.append (new KateHlItemData (*itemDataList.tqat(z)));
}
//END
@@ -2974,7 +2974,7 @@ KateHlManager::KateHlManager()
if (insert == hlList.count())
break;
- if ( TQString(hlList.at(insert)->section() + hlList.at(insert)->nameTranslated()).lower()
+ if ( TQString(hlList.tqat(insert)->section() + hlList.tqat(insert)->nameTranslated()).lower()
> TQString(hl->section() + hl->nameTranslated()).lower() )
break;
}
@@ -3011,14 +3011,14 @@ KateHighlighting *KateHlManager::getHl(int n)
if (n < 0 || n >= (int) hlList.count())
n = 0;
- return hlList.at(n);
+ return hlList.tqat(n);
}
int KateHlManager::nameFind(const TQString &name)
{
int z (hlList.count() - 1);
for (; z > 0; z--)
- if (hlList.at(z)->name() == name)
+ if (hlList.tqat(z)->name() == name)
return z;
return z;
@@ -3269,7 +3269,7 @@ void KateHlManager::getDefaults(uint schema, KateAttributeList &list)
for (uint z = 0; z < defaultStyles(); z++)
{
- KateAttribute *i = list.at(z);
+ KateAttribute *i = list.tqat(z);
TQStringList s = config->readListEntry(defaultStyleName(z));
if (!s.isEmpty())
{
@@ -3323,7 +3323,7 @@ void KateHlManager::setDefaults(uint schema, KateAttributeList &list)
for (uint z = 0; z < defaultStyles(); z++)
{
TQStringList settings;
- KateAttribute *i = list.at(z);
+ KateAttribute *i = list.tqat(z);
settings<<(i->itemSet(KateAttribute::TextColor)?TQString::number(i->textColor().rgb(),16):"");
settings<<(i->itemSet(KateAttribute::SelectedTextColor)?TQString::number(i->selectedTextColor().rgb(),16):"");
@@ -3348,22 +3348,22 @@ int KateHlManager::highlights()
TQString KateHlManager::hlName(int n)
{
- return hlList.at(n)->name();
+ return hlList.tqat(n)->name();
}
TQString KateHlManager::hlNameTranslated(int n)
{
- return hlList.at(n)->nameTranslated();
+ return hlList.tqat(n)->nameTranslated();
}
TQString KateHlManager::hlSection(int n)
{
- return hlList.at(n)->section();
+ return hlList.tqat(n)->section();
}
bool KateHlManager::hlHidden(int n)
{
- return hlList.at(n)->hidden();
+ return hlList.tqat(n)->hidden();
}
TQString KateHlManager::identifierForName(const TQString& name)
@@ -3433,7 +3433,7 @@ void KateViewHighlightAction::slotAboutToShow()
int m = subMenusName.findIndex (hlSection);
names << hlName;
- subMenus.at(m)->insertItem ( '&' + hlName, this, TQT_SLOT(setHl(int)), 0, z);
+ subMenus.tqat(m)->insertItem ( '&' + hlName, this, TQT_SLOT(setHl(int)), 0, z);
}
else if (names.contains(hlName) < 1)
{
@@ -3447,16 +3447,16 @@ void KateViewHighlightAction::slotAboutToShow()
for (uint i=0;i<subMenus.count();i++)
{
- for (uint i2=0;i2<subMenus.at(i)->count();i2++)
+ for (uint i2=0;i2<subMenus.tqat(i)->count();i2++)
{
- subMenus.at(i)->setItemChecked(subMenus.at(i)->idAt(i2),false);
+ subMenus.tqat(i)->setItemChecked(subMenus.tqat(i)->idAt(i2),false);
}
}
popupMenu()->setItemChecked (0, false);
int i = subMenusName.findIndex (KateHlManager::self()->hlSection(doc->hlMode()));
- if (i >= 0 && subMenus.at(i))
- subMenus.at(i)->setItemChecked (doc->hlMode(), true);
+ if (i >= 0 && subMenus.tqat(i))
+ subMenus.tqat(i)->setItemChecked (doc->hlMode(), true);
else
popupMenu()->setItemChecked (0, true);
}
diff --git a/kate/part/katejscript.cpp b/kate/part/katejscript.cpp
index dda47003..615adab0 100644
--- a/kate/part/katejscript.cpp
+++ b/kate/part/katejscript.cpp
@@ -47,7 +47,7 @@
#include <tqfileinfo.h>
#include <tqpopupmenu.h>
#include <tqregexp.h>
-#include <textstream.h>
+#include <tqtextstream.h>
namespace KJS {
@@ -62,7 +62,7 @@ UString::UString(const TQString &d)
{
unsigned int len = d.length();
UChar *dat = new UChar[len];
- memcpy(dat, d.unicode(), len * sizeof(UChar));
+ memcpy(dat, d.tqunicode(), len * sizeof(UChar));
rep = UString::Rep::create(dat, len);
}
@@ -416,10 +416,10 @@ KJS::Value KJS::KateJSDocumentProtoFunc::call(KJS::ExecState *exec, KJS::Object
return KJS::Null ();
case KateJSDocument::IsInWord:
- return KJS::Boolean( doc->highlight()->isInWord( args[0].toString(exec).qstring().at(0), args[1].toUInt32(exec) ) );
+ return KJS::Boolean( doc->highlight()->isInWord( args[0].toString(exec).qstring().tqat(0), args[1].toUInt32(exec) ) );
case KateJSDocument::CanBreakAt:
- return KJS::Boolean( doc->highlight()->canBreakAt( args[0].toString(exec).qstring().at(0), args[1].toUInt32(exec) ) );
+ return KJS::Boolean( doc->highlight()->canBreakAt( args[0].toString(exec).qstring().tqat(0), args[1].toUInt32(exec) ) );
case KateJSDocument::CanComment:
return KJS::Boolean( doc->highlight()->canComment( args[0].toUInt32(exec), args[1].toUInt32(exec) ) );
@@ -1135,7 +1135,7 @@ void KateIndentJScriptManager::parseScriptHeader(const TQString &filePath,
if (currentState==NOTHING)
{
if (keyValue.exactMatch(line)) {
- TQStringList sl=keyValue.capturedTexts();
+ TQStringList sl=keyValue.tqcapturedTexts();
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 b6847dcc..925c99e1 100644
--- a/kate/part/kateprinter.cpp
+++ b/kate/part/kateprinter.cpp
@@ -48,7 +48,7 @@
#include <tqgroupbox.h>
#include <tqhbox.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlineedit.h>
#include <tqspinbox.h>
#include <tqstringlist.h>
@@ -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::currentDateTime();
+ TQDateTime dt = TQDateTime::tqcurrentDateTime();
TQMap<TQString,TQString> tags;
KUser u (KUser::UseRealUserID);
@@ -505,7 +505,7 @@ bool KatePrinter::print (KateDocument *doc)
// use color of dsNormal for the title string and the hline
KateAttributeList _dsList;
KateHlManager::self()->getDefaults ( renderer.config()->schema(), _dsList );
- paint.setPen( _dsList.at(0)->textColor() );
+ paint.setPen( _dsList.tqat(0)->textColor() );
int _marg = 0; // this could be available globally!??
if ( useBox )
{
diff --git a/kate/part/katerenderer.cpp b/kate/part/katerenderer.cpp
index 48b73d7e..143d24f6 100644
--- a/kate/part/katerenderer.cpp
+++ b/kate/part/katerenderer.cpp
@@ -69,9 +69,9 @@ void KateRenderer::updateAttributes ()
KateAttribute* KateRenderer::attribute(uint pos)
{
if (pos < m_attributes->size())
- return &m_attributes->at(pos);
+ return &m_attributes->tqat(pos);
- return &m_attributes->at(0);
+ return &m_attributes->tqat(0);
}
void KateRenderer::setDrawCaret(bool drawCaret)
@@ -537,13 +537,13 @@ void KateRenderer::paintTextLine(TQPainter& paint, const KateLineRange* range, i
if (isIMSel && !isTab)
{
// input method selection
- fillColor = m_view->colorGroup().color(TQColorGroup::Foreground);
+ fillColor = m_view->tqcolorGroup().color(TQColorGroup::Foreground);
}
else if (isIMEdit && !isTab)
{
// XIM support
// input method edit area
- const TQColorGroup& cg = m_view->colorGroup();
+ const TQColorGroup& cg = m_view->tqcolorGroup();
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->colorGroup().color( TQColorGroup::BrightText ) );
+ paint.setPen( m_view->tqcolorGroup().color( TQColorGroup::BrightText ) );
}
// Draw indentation markers.
@@ -745,7 +745,7 @@ uint KateRenderer::textWidth(const KateTextLine::Ptr &textLine, int cursorCol)
KateFontStruct *fs = config()->fontStruct();
- const TQChar *unicode = textLine->text();
+ const TQChar *tqunicode = textLine->text();
const TQString &textString = textLine->string();
int x = 0;
@@ -763,7 +763,7 @@ uint KateRenderer::textWidth(const KateTextLine::Ptr &textLine, int cursorCol)
x += width;
- if (z < len && unicode[z] == TQChar('\t'))
+ if (z < len && tqunicode[z] == TQChar('\t'))
x -= x % width;
}
@@ -787,7 +787,7 @@ uint KateRenderer::textWidth(const KateTextLine::Ptr &textLine, uint startcol, u
*needWrap = false;
const uint len = textLine->length();
- const TQChar *unicode = textLine->text();
+ const TQChar *tqunicode = textLine->text();
const TQString &textString = textLine->string();
uint z = startcol;
@@ -800,10 +800,10 @@ uint KateRenderer::textWidth(const KateTextLine::Ptr &textLine, uint startcol, u
// How should tabs be treated when they word-wrap on a print-out?
// if startcol != 0, this messes up (then again, word wrapping messes up anyway)
- if (unicode[z] == TQChar('\t'))
+ if (tqunicode[z] == TQChar('\t'))
x -= x % width;
- if (unicode[z].isSpace())
+ if (tqunicode[z].isSpace())
{
lastWhiteSpace = z+1;
lastWhiteSpaceX = x;
@@ -887,7 +887,7 @@ uint KateRenderer::textWidth( KateTextCursor &cursor, int xPos, uint startCol)
if (!textLine) return 0;
const uint len = textLine->length();
- const TQChar *unicode = textLine->text();
+ const TQChar *tqunicode = textLine->text();
const TQString &textString = textLine->string();
x = oldX = 0;
@@ -906,7 +906,7 @@ uint KateRenderer::textWidth( KateTextCursor &cursor, int xPos, uint startCol)
x += width;
- if (z < len && unicode[z] == TQChar('\t'))
+ if (z < len && tqunicode[z] == TQChar('\t'))
x -= x % width;
z++;
diff --git a/kate/part/kateschema.cpp b/kate/part/kateschema.cpp
index f4f0c552..704e2776 100644
--- a/kate/part/kateschema.cpp
+++ b/kate/part/kateschema.cpp
@@ -49,8 +49,8 @@
#include <tqgrid.h>
#include <tqgroupbox.h>
#include <tqlabel.h>
-#include <textcodec.h>
-#include <layout.h>
+#include <tqtextcodec.h>
+#include <tqlayout.h>
#include <tqlineedit.h>
#include <tqheader.h>
#include <tqlistbox.h>
@@ -643,14 +643,14 @@ void KateSchemaConfigFontColorTab::schemaChanged (uint schema)
p.setColor( TQColorGroup::Highlight,
KateFactory::self()->schemaManager()->schema(schema)->
readColorEntry( "Color Selection", &_c ) );
- _c = l->at(0)->textColor(); // not quite as much of an assumption ;)
+ _c = l->tqat(0)->textColor(); // not quite as much of an assumption ;)
p.setColor( TQColorGroup::Text, _c );
m_defaultStyles->viewport()->setPalette( p );
// insert the default styles backwards to get them in the right order
for ( int i = KateHlManager::self()->defaultStyles() - 1; i >= 0; i-- )
{
- new KateStyleListItem( m_defaultStyles, KateHlManager::self()->defaultStyleName(i, true), l->at( i ) );
+ new KateStyleListItem( m_defaultStyles, KateHlManager::self()->defaultStyleName(i, true), l->tqat( i ) );
}
}
@@ -770,7 +770,7 @@ void KateSchemaConfigHighlightTab::schemaChanged (uint schema)
p.setColor( TQColorGroup::Highlight,
KateFactory::self()->schemaManager()->schema(m_schema)->
readColorEntry( "Color Selection", &_c ) );
- _c = l->at(0)->textColor(); // not quite as much of an assumption ;)
+ _c = l->tqat(0)->textColor(); // not quite as much of an assumption ;)
p.setColor( TQColorGroup::Text, _c );
m_styles->viewport()->setPalette( p );
@@ -795,9 +795,9 @@ void KateSchemaConfigHighlightTab::schemaChanged (uint schema)
parent->setOpen(true);
prefixes.insert( prefix, parent );
}
- new KateStyleListItem( parent, name, l->at(itemData->defStyleNum), itemData );
+ new KateStyleListItem( parent, name, l->tqat(itemData->defStyleNum), itemData );
} else {
- new KateStyleListItem( m_styles, itemData->name, l->at(itemData->defStyleNum), itemData );
+ new KateStyleListItem( m_styles, itemData->name, l->tqat(itemData->defStyleNum), itemData );
}
}
}
@@ -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()->colorGroup().base() );
+ bgcl.fill( i->style()->itemSet(KateAttribute::BGColor) ? i->style()->bgColor() : viewport()->tqcolorGroup().base() );
TQPixmap sbgcl(16,16);
- sbgcl.fill( i->style()->itemSet(KateAttribute::SelectedBGColor) ? i->style()->selectedBGColor() : viewport()->colorGroup().base() );
+ sbgcl.fill( i->style()->itemSet(KateAttribute::SelectedBGColor) ? i->style()->selectedBGColor() : viewport()->tqcolorGroup().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, itemRect(i).top() ) );
+ ((KateStyleListItem*)i)->activate( c, viewport()->mapFromGlobal( pos ) - TQPoint( 0, tqitemRect(i).top() ) );
}
}
}
@@ -1357,7 +1357,7 @@ void KateStyleListItem::toggleDefStyle()
delete is;
is = new KateAttribute( *ds );
updateStyle();
- repaint();
+ tqrepaint();
}
}
@@ -1441,7 +1441,7 @@ void KateStyleListItem::setColor( int column )
break;
}
- repaint();
+ tqrepaint();
}
void KateStyleListItem::unsetColor( int c )
@@ -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()->colorGroup();
+ TQColorGroup mcg = lv->viewport()->tqcolorGroup();
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()->colorGroup();
+ TQColorGroup mcg = lv->viewport()->tqcolorGroup();
TQListViewItem::paintCell( p, mcg, col, width, align );
}
diff --git a/kate/part/katesearch.cpp b/kate/part/katesearch.cpp
index 57b8b1e9..5b362934 100644
--- a/kate/part/katesearch.cpp
+++ b/kate/part/katesearch.cpp
@@ -40,7 +40,7 @@
#include <kreplacedialog.h>
#include <kpushbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlabel.h>
//BEGIN KateSearch
@@ -386,7 +386,7 @@ void KateSearch::replaceOne()
int ncaps = m_re.numCaptures();
while ( pos >= 0 ) {
TQString substitute;
- TQChar argument = TQString(br.cap(1)).at(0);
+ TQChar argument = TQString(br.cap(1)).tqat(0);
if ( argument.isDigit() ) {
// the second character is a digit, this is a backreference
int ccap = argument.digitValue();
@@ -639,9 +639,9 @@ bool KateSearch::doSearch( const TQString& text )
{
found = (
( foundCol == 0 ||
- ! doc()->highlight()->isInWord( doc()->textLine( foundLine ).at( foundCol - 1 ) ) ) &&
+ ! doc()->highlight()->isInWord( doc()->textLine( foundLine ).tqat( foundCol - 1 ) ) ) &&
( foundCol + matchLen == doc()->lineLength( foundLine ) ||
- ! doc()->highlight()->isInWord( doc()->textLine( foundLine ).at( foundCol + matchLen ) ) )
+ ! doc()->highlight()->isInWord( doc()->textLine( foundLine ).tqat( foundCol + matchLen ) ) )
);
if ( found )
{
diff --git a/kate/part/katetemplatehandler.cpp b/kate/part/katetemplatehandler.cpp
index 52e07a2e..e9124e77 100644
--- a/kate/part/katetemplatehandler.cpp
+++ b/kate/part/katetemplatehandler.cpp
@@ -173,7 +173,7 @@ void KateTemplateHandler::generateRangeTable( uint insertLine, uint insertCol, c
{
++col;
- if ( insertString.at( colInText ) == '\n' )
+ if ( insertString.tqat( colInText ) == '\n' )
{
col = 0;
line++;
@@ -216,7 +216,7 @@ void KateTemplateHandler::slotTextInserted( int line, int col )
if ( !m_currentRange ) return ;
- KateTemplatePlaceHolder *ph = m_tabOrder.at( m_currentTabStop );
+ KateTemplatePlaceHolder *ph = m_tabOrder.tqat( m_currentTabStop );
TQString sourceText = m_doc->text ( m_currentRange->start().line(), m_currentRange->start().col(),
m_currentRange->end().line(), m_currentRange->end().col(), false );
@@ -257,7 +257,7 @@ void KateTemplateHandler::locateRange( const KateTextCursor& cursor )
for ( uint i = 0;i < m_tabOrder.count();i++ )
{
- KateTemplatePlaceHolder *ph = m_tabOrder.at( i );
+ KateTemplatePlaceHolder *ph = m_tabOrder.tqat( i );
for ( KateSuperRangeList::const_iterator it = ph->ranges.begin();it != ph->ranges.end();++it )
{
@@ -297,9 +297,9 @@ bool KateTemplateHandler::operator() ( KKey key )
if ( m_currentTabStop < 0 ) m_currentTabStop = m_tabOrder.count() - 1;
}
- m_currentRange = m_tabOrder.at( m_currentTabStop ) ->ranges.at( 0 );
+ m_currentRange = m_tabOrder.tqat( m_currentTabStop ) ->ranges.tqat( 0 );
- if ( m_tabOrder.at( m_currentTabStop ) ->isInitialValue )
+ if ( m_tabOrder.tqat( m_currentTabStop ) ->isInitialValue )
{
m_doc->activeView()->setSelection( m_currentRange->start(), m_currentRange->end() );
}
diff --git a/kate/part/katetextline.cpp b/kate/part/katetextline.cpp
index 6c701e1e..dbb82700 100644
--- a/kate/part/katetextline.cpp
+++ b/kate/part/katetextline.cpp
@@ -110,11 +110,11 @@ void KateTextLine::truncate(uint newLen)
int KateTextLine::nextNonSpaceChar(uint pos) const
{
const uint len = m_text.length();
- const TQChar *unicode = m_text.unicode();
+ const TQChar *tqunicode = m_text.tqunicode();
for(uint i = pos; i < len; i++)
{
- if(!unicode[i].isSpace())
+ if(!tqunicode[i].isSpace())
return i;
}
@@ -128,11 +128,11 @@ int KateTextLine::previousNonSpaceChar(uint pos) const
if (pos >= (uint)len)
pos = len - 1;
- const TQChar *unicode = m_text.unicode();
+ const TQChar *tqunicode = m_text.tqunicode();
for(int i = pos; i >= 0; i--)
{
- if(!unicode[i].isSpace())
+ if(!tqunicode[i].isSpace())
return i;
}
@@ -152,20 +152,20 @@ int KateTextLine::lastChar() const
const TQChar *KateTextLine::firstNonSpace() const
{
int first = firstChar();
- return (first > -1) ? ((TQChar*)m_text.unicode())+first : m_text.unicode();
+ return (first > -1) ? ((TQChar*)m_text.tqunicode())+first : m_text.tqunicode();
}
uint KateTextLine::indentDepth (uint tabwidth) const
{
uint d = 0;
const uint len = m_text.length();
- const TQChar *unicode = m_text.unicode();
+ const TQChar *tqunicode = m_text.tqunicode();
for(uint i = 0; i < len; i++)
{
- if(unicode[i].isSpace())
+ if(tqunicode[i].isSpace())
{
- if (unicode[i] == TQChar('\t'))
+ if (tqunicode[i] == TQChar('\t'))
d += tabwidth - (d % tabwidth);
else
d++;
@@ -189,11 +189,11 @@ bool KateTextLine::stringAtPos(uint pos, const TQString& match) const
// overflow again which (pos+matchlen > len) does not catch; see bugs #129263 and #129580
Q_ASSERT(pos < len);
- const TQChar *unicode = m_text.unicode();
- const TQChar *matchUnicode = match.unicode();
+ const TQChar *tqunicode = m_text.tqunicode();
+ const TQChar *matchUnicode = match.tqunicode();
for (uint i=0; i < matchlen; i++)
- if (unicode[i+pos] != matchUnicode[i])
+ if (tqunicode[i+pos] != matchUnicode[i])
return false;
return true;
@@ -206,11 +206,11 @@ bool KateTextLine::startingWith(const TQString& match) const
if (matchlen > m_text.length())
return false;
- const TQChar *unicode = m_text.unicode();
- const TQChar *matchUnicode = match.unicode();
+ const TQChar *tqunicode = m_text.tqunicode();
+ const TQChar *matchUnicode = match.tqunicode();
for (uint i=0; i < matchlen; i++)
- if (unicode[i] != matchUnicode[i])
+ if (tqunicode[i] != matchUnicode[i])
return false;
return true;
@@ -223,12 +223,12 @@ bool KateTextLine::endingWith(const TQString& match) const
if (matchlen > m_text.length())
return false;
- const TQChar *unicode = m_text.unicode();
- const TQChar *matchUnicode = match.unicode();
+ const TQChar *tqunicode = m_text.tqunicode();
+ const TQChar *matchUnicode = match.tqunicode();
uint start = m_text.length() - matchlen;
for (uint i=0; i < matchlen; i++)
- if (unicode[start+i] != matchUnicode[i])
+ if (tqunicode[start+i] != matchUnicode[i])
return false;
return true;
@@ -239,11 +239,11 @@ int KateTextLine::cursorX(uint pos, uint tabChars) const
uint x = 0;
const uint n = kMin (pos, (uint)m_text.length());
- const TQChar *unicode = m_text.unicode();
+ const TQChar *tqunicode = m_text.tqunicode();
for ( uint z = 0; z < n; z++)
{
- if (unicode[z] == TQChar('\t'))
+ if (tqunicode[z] == TQChar('\t'))
x += tabChars - (x % tabChars);
else
x++;
@@ -257,11 +257,11 @@ uint KateTextLine::lengthWithTabs (uint tabChars) const
{
uint x = 0;
const uint len = m_text.length();
- const TQChar *unicode = m_text.unicode();
+ const TQChar *tqunicode = m_text.tqunicode();
for ( uint z = 0; z < len; z++)
{
- if (unicode[z] == TQChar('\t'))
+ if (tqunicode[z] == TQChar('\t'))
x += tabChars - (x % tabChars);
else
x++;
@@ -346,7 +346,7 @@ char *KateTextLine::dump (char *buf, bool withHighlighting) const
memcpy(buf, &l, sizeof(uint));
buf += sizeof(uint);
- memcpy(buf, (char *) m_text.unicode(), sizeof(TQChar)*l);
+ memcpy(buf, (char *) m_text.tqunicode(), sizeof(TQChar)*l);
buf += sizeof(TQChar) * l;
if (!withHighlighting)
diff --git a/kate/part/katetextline.h b/kate/part/katetextline.h
index 3922d04d..84df8290 100644
--- a/kate/part/katetextline.h
+++ b/kate/part/katetextline.h
@@ -145,10 +145,10 @@ class KateTextLine : public KShared
inline TQChar getChar (uint pos) const { return m_text[pos]; }
/**
- * Gets the text as a unicode representation
+ * Gets the text as a tqunicode representation
* @return text of this line as TQChar array
*/
- inline const TQChar *text() const { return m_text.unicode(); }
+ inline const TQChar *text() const { return m_text.tqunicode(); }
/**
* Highlighting array
@@ -419,7 +419,7 @@ class KateTextLine : public KShared
*/
private:
/**
- * text of line as unicode
+ * text of line as tqunicode
*/
TQString m_text;
diff --git a/kate/part/kateundo.cpp b/kate/part/kateundo.cpp
index 379df16f..81901d9f 100644
--- a/kate/part/kateundo.cpp
+++ b/kate/part/kateundo.cpp
@@ -296,9 +296,9 @@ void KateUndoGroup::undo ()
if (m_doc->activeView())
{
for (uint z=0; z < m_items.count(); z++)
- if (m_items.at(z)->type() != KateUndoGroup::editMarkLineAutoWrapped)
+ if (m_items.tqat(z)->type() != KateUndoGroup::editMarkLineAutoWrapped)
{
- m_doc->activeView()->editSetCursor (m_items.at(z)->cursorBefore());
+ m_doc->activeView()->editSetCursor (m_items.tqat(z)->cursorBefore());
break;
}
}
@@ -319,9 +319,9 @@ void KateUndoGroup::redo ()
if (m_doc->activeView())
{
for (uint z=0; z < m_items.count(); z++)
- if (m_items.at(z)->type() != KateUndoGroup::editMarkLineAutoWrapped)
+ if (m_items.tqat(z)->type() != KateUndoGroup::editMarkLineAutoWrapped)
{
- m_doc->activeView()->editSetCursor (m_items.at(z)->cursorAfter());
+ m_doc->activeView()->editSetCursor (m_items.tqat(z)->cursorAfter());
break;
}
}
diff --git a/kate/part/kateview.cpp b/kate/part/kateview.cpp
index 8acad1f2..a0310ecb 100644
--- a/kate/part/kateview.cpp
+++ b/kate/part/kateview.cpp
@@ -76,9 +76,9 @@
#include <tqstyle.h>
#include <tqevent.h>
#include <tqpopupmenu.h>
-#include <layout.h>
-#include <clipboard.h>
-#include <stylesheet.h>
+#include <tqlayout.h>
+#include <tqclipboard.h>
+#include <tqstylesheet.h>
//END includes
KateView::KateView( KateDocument *doc, TQWidget *parent, const char * name )
@@ -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::fromLatin1( "text/plain" ) );
+ TQString::tqfromLatin1( "text/plain" ) );
ev->accept();
}
@@ -1233,11 +1233,11 @@ void KateView::updateRendererConfig()
// update the text area
m_viewInternal->updateView (true);
- m_viewInternal->repaint ();
+ m_viewInternal->tqrepaint ();
// update the left border right, for example linenumbers
m_viewInternal->leftBorder->updateFont();
- m_viewInternal->leftBorder->repaint ();
+ m_viewInternal->leftBorder->tqrepaint ();
// @@ showIndentLines is not cached anymore.
// m_renderer->setShowIndentLines (m_renderer->config()->showIndentationLines());
@@ -1596,7 +1596,7 @@ void KateView::paste()
{
m_doc->paste( this );
emit selectionChanged();
- m_viewInternal->repaint();
+ m_viewInternal->tqrepaint();
}
void KateView::cut()
@@ -1613,7 +1613,7 @@ void KateView::copy() const
if (!hasSelection())
return;
- TQApplication::clipboard()->setText(selection ());
+ TQApplication::tqclipboard()->setText(selection ());
}
void KateView::copyHTML()
@@ -1629,7 +1629,7 @@ void KateView::copyHTML()
drag->addDragObject( htmltextdrag);
drag->addDragObject( new TQTextDrag( selection()));
- TQApplication::clipboard()->setData(drag);
+ TQApplication::tqclipboard()->setData(drag);
}
TQString KateView::selectionAsHtml()
diff --git a/kate/part/kateviewhelpers.cpp b/kate/part/kateviewhelpers.cpp
index d4b47ccc..2b717d5c 100644
--- a/kate/part/kateviewhelpers.cpp
+++ b/kate/part/kateviewhelpers.cpp
@@ -47,7 +47,7 @@
#include <tqtimer.h>
#include <tqwhatsthis.h>
#include <tqregexp.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
#include <math.h>
diff --git a/kate/part/kateviewinternal.cpp b/kate/part/kateviewinternal.cpp
index 33e0826f..831866ef 100644
--- a/kate/part/kateviewinternal.cpp
+++ b/kate/part/kateviewinternal.cpp
@@ -46,8 +46,8 @@
#include <tqpopupmenu.h>
#include <tqdropsite.h>
#include <tqpainter.h>
-#include <layout.h>
-#include <clipboard.h>
+#include <tqlayout.h>
+#include <tqclipboard.h>
#include <tqpixmap.h>
#include <tqvbox.h>
@@ -89,7 +89,7 @@ KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc)
// cursor
cursor.setMoveOnInsert (true);
- // invalidate selStartCached, or keyb selection is screwed initially
+ // tqinvalidate selStartCached, or keyb selection is screwed initially
selStartCached.setLine( -1 );
//
// scrollbar for lines
@@ -2649,9 +2649,9 @@ void KateViewInternal::keyReleaseEvent( TQKeyEvent* e )
if (m_selChangedByUser)
{
- TQApplication::clipboard()->setSelectionMode( true );
+ TQApplication::tqclipboard()->setSelectionMode( true );
m_view->copy();
- TQApplication::clipboard()->setSelectionMode( false );
+ TQApplication::tqclipboard()->setSelectionMode( false );
m_selChangedByUser = false;
}
@@ -2711,9 +2711,9 @@ void KateViewInternal::mousePressEvent( TQMouseEvent* e )
m_view->selectLine( cursor );
}
- TQApplication::clipboard()->setSelectionMode( true );
+ TQApplication::tqclipboard()->setSelectionMode( true );
m_view->copy();
- TQApplication::clipboard()->setSelectionMode( false );
+ TQApplication::tqclipboard()->setSelectionMode( false );
// Keep the line at the select anchor selected during further
// mouse selection
@@ -2759,7 +2759,7 @@ void KateViewInternal::mousePressEvent( TQMouseEvent* e )
}
else
{
- selStartCached.setLine( -1 ); // invalidate
+ selStartCached.setLine( -1 ); // tqinvalidate
}
if( !( e->state() & TQt::ShiftButton ) && isTargetSelected( e->pos() ) )
@@ -2889,9 +2889,9 @@ void KateViewInternal::mouseDoubleClickEvent(TQMouseEvent *e)
// Move cursor to end (or beginning) of selected word
if (m_view->hasSelection())
{
- TQApplication::clipboard()->setSelectionMode( true );
+ TQApplication::tqclipboard()->setSelectionMode( true );
m_view->copy();
- TQApplication::clipboard()->setSelectionMode( false );
+ TQApplication::tqclipboard()->setSelectionMode( false );
// Shift+DC before the "cached" word should move the cursor to the
// beginning of the selection, not the end
@@ -2933,9 +2933,9 @@ void KateViewInternal::mouseReleaseEvent( TQMouseEvent* e )
if (m_selChangedByUser)
{
- TQApplication::clipboard()->setSelectionMode( true );
+ TQApplication::tqclipboard()->setSelectionMode( true );
m_view->copy();
- TQApplication::clipboard()->setSelectionMode( false );
+ TQApplication::tqclipboard()->setSelectionMode( false );
// Set cursor to edge of selection... which edge depends on what
// "direction" the selection was made in
if ( m_view->selectStart < selectAnchor )
@@ -2961,9 +2961,9 @@ void KateViewInternal::mouseReleaseEvent( TQMouseEvent* e )
if( m_doc->isReadWrite() )
{
- TQApplication::clipboard()->setSelectionMode( true );
+ TQApplication::tqclipboard()->setSelectionMode( true );
m_view->paste ();
- TQApplication::clipboard()->setSelectionMode( false );
+ TQApplication::tqclipboard()->setSelectionMode( false );
}
e->accept ();
diff --git a/kate/part/kateviewinternal.h b/kate/part/kateviewinternal.h
index 4dbc08bf..0d706ffc 100644
--- a/kate/part/kateviewinternal.h
+++ b/kate/part/kateviewinternal.h
@@ -222,7 +222,7 @@ class KateViewInternal : public TQWidget
int scrollX;
int scrollY;
- TQt::CursorShape m_mouseCursor;
+ TQt::tqCursorShape m_mouseCursor;
KateSuperCursor cursor;
KateTextCursor displayCursor;
diff --git a/kate/part/test_regression.cpp b/kate/part/test_regression.cpp
index 07388689..6d440922 100644
--- a/kate/part/test_regression.cpp
+++ b/kate/part/test_regression.cpp
@@ -56,7 +56,7 @@
#include <tqscrollview.h>
#include <tqstring.h>
#include <tqregexp.h>
-#include <textstream.h>
+#include <tqtextstream.h>
#include <tqvaluelist.h>
#include <tqwidget.h>
#include <tqfileinfo.h>
@@ -871,8 +871,8 @@ static TQString makeRelativePath(const TQString &base, const TQString &path)
pos++;
int newpos = absBase.find('/', pos);
if (newpos == -1) newpos = absBase.length();
- TQConstString cmpPathComp(absPath.unicode() + pos, newpos - pos);
- TQConstString cmpBaseComp(absBase.unicode() + pos, newpos - pos);
+ TQConstString cmpPathComp(absPath.tqunicode() + pos, newpos - pos);
+ TQConstString cmpBaseComp(absBase.tqunicode() + pos, newpos - pos);
// kdDebug() << "cmpPathComp: \"" << cmpPathComp.string() << "\"" << endl;
// kdDebug() << "cmpBaseComp: \"" << cmpBaseComp.string() << "\"" << endl;
// kdDebug() << "pos: " << pos << " newpos: " << newpos << endl;
@@ -886,8 +886,8 @@ static TQString makeRelativePath(const TQString &base, const TQString &path)
TQString rel;
{
- TQConstString relBase(absBase.unicode() + basepos, absBase.length() - basepos);
- TQConstString relPath(absPath.unicode() + pathpos, absPath.length() - pathpos);
+ TQConstString relBase(absBase.tqunicode() + basepos, absBase.length() - basepos);
+ TQConstString relPath(absPath.tqunicode() + pathpos, absPath.length() - pathpos);
// generate as many .. as there are path elements in relBase
if (relBase.string().length() > 0) {
for (int i = relBase.string().contains('/'); i > 0; --i)
@@ -935,7 +935,7 @@ void RegressionTest::doFailureReport( const TQString& test, int failures )
if ( failures & ResultFailure ) {
domDiff += "<pre>";
- FILE *pipe = popen( TQString::fromLatin1( "diff -u baseline/%1-result %3/%2-result" )
+ FILE *pipe = popen( TQString::tqfromLatin1( "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/kate/plugins/autobookmarker/autobookmarker.cpp b/kate/plugins/autobookmarker/autobookmarker.cpp
index 002d7f77..3f1e7fc2 100644
--- a/kate/plugins/autobookmarker/autobookmarker.cpp
+++ b/kate/plugins/autobookmarker/autobookmarker.cpp
@@ -44,7 +44,7 @@
#include <tqcheckbox.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlineedit.h>
#include <tqlistview.h>
#include <tqpopupmenu.h>
@@ -235,7 +235,7 @@ void ABGlobal::writeConfig()
// fill in the current list
for ( uint i = 0; i < m_ents->count(); i++ )
{
- AutoBookmarkEnt *e = m_ents->at( i );
+ AutoBookmarkEnt *e = m_ents->tqat( i );
config->setGroup( TQString("autobookmark%1").arg( i ) );
config->writeEntry( "pattern", e->pattern );
config->writeEntry( "filemask", e->filemask, ';' );
diff --git a/kate/plugins/insertfile/insertfileplugin.cpp b/kate/plugins/insertfile/insertfileplugin.cpp
index 2dd2eb5c..df8c31ca 100644
--- a/kate/plugins/insertfile/insertfileplugin.cpp
+++ b/kate/plugins/insertfile/insertfileplugin.cpp
@@ -35,7 +35,7 @@
#include <kurl.h>
#include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
K_EXPORT_COMPONENT_FACTORY( ktexteditor_insertfile, KGenericFactory<InsertFilePlugin>( "ktexteditor_insertfile" ) )
@@ -59,9 +59,9 @@ void InsertFilePlugin::addView(KTextEditor::View *view)
void InsertFilePlugin::removeView(KTextEditor::View *view)
{
for (uint z=0; z < m_views.count(); z++)
- if (m_views.at(z)->parentClient() == view)
+ if (m_views.tqat(z)->parentClient() == view)
{
- InsertFilePluginView *nview = m_views.at(z);
+ InsertFilePluginView *nview = m_views.tqat(z);
m_views.remove (nview);
delete nview;
}
diff --git a/kate/plugins/isearch/ISearchPlugin.cpp b/kate/plugins/isearch/ISearchPlugin.cpp
index 249abf9f..fef94b1d 100644
--- a/kate/plugins/isearch/ISearchPlugin.cpp
+++ b/kate/plugins/isearch/ISearchPlugin.cpp
@@ -485,9 +485,9 @@ void ISearchPlugin::removeView(KTextEditor::View *view)
{
for (uint z=0; z < m_views.count(); z++)
{
- if (m_views.at(z)->parentClient() == view)
+ if (m_views.tqat(z)->parentClient() == view)
{
- ISearchPluginView *nview = m_views.at(z);
+ ISearchPluginView *nview = m_views.tqat(z);
m_views.remove (nview);
delete nview;
}
diff --git a/kate/plugins/kdatatool/kate_kdatatool.cpp b/kate/plugins/kdatatool/kate_kdatatool.cpp
index e78bb422..3678c26f 100644
--- a/kate/plugins/kdatatool/kate_kdatatool.cpp
+++ b/kate/plugins/kdatatool/kate_kdatatool.cpp
@@ -58,9 +58,9 @@ void KDataToolPlugin::removeView(KTextEditor::View *view)
{
for (uint z=0; z < m_views.count(); z++)
{
- if (m_views.at(z)->parentClient() == view)
+ if (m_views.tqat(z)->parentClient() == view)
{
- KDataToolPluginView *nview = m_views.at(z);
+ KDataToolPluginView *nview = m_views.tqat(z);
m_views.remove (nview);
delete nview;
}
@@ -126,7 +126,7 @@ void KDataToolPluginView::aboutToShow()
// find begin of word:
m_singleWord_start = 0;
for(int i = col; i >= 0; i--) {
- TQChar ch = tmp_line.at(i);
+ TQChar ch = tmp_line.tqat(i);
if( ! (ch.isLetter() || ch == '-' || ch == '\'') )
{
m_singleWord_start = i+1;
@@ -137,7 +137,7 @@ void KDataToolPluginView::aboutToShow()
// find end of word:
m_singleWord_end = tmp_line.length();
for(uint i = col+1; i < tmp_line.length(); i++) {
- TQChar ch = tmp_line.at(i);
+ TQChar ch = tmp_line.tqat(i);
if( ! (ch.isLetter() || ch == '-' || ch == '\'') )
{
m_singleWord_end = i;
diff --git a/kate/plugins/wordcompletion/docwordcompletion.cpp b/kate/plugins/wordcompletion/docwordcompletion.cpp
index 81af51f0..435578d6 100644
--- a/kate/plugins/wordcompletion/docwordcompletion.cpp
+++ b/kate/plugins/wordcompletion/docwordcompletion.cpp
@@ -48,7 +48,7 @@
#include <tqdict.h>
#include <tqspinbox.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqhbox.h>
#include <tqwhatsthis.h>
#include <tqcheckbox.h>
@@ -91,9 +91,9 @@ void DocWordCompletionPlugin::addView(KTextEditor::View *view)
void DocWordCompletionPlugin::removeView(KTextEditor::View *view)
{
for (uint z=0; z < m_views.count(); z++)
- if (m_views.at(z)->parentClient() == view)
+ if (m_views.tqat(z)->parentClient() == view)
{
- DocWordCompletionPluginView *nview = m_views.at(z);
+ DocWordCompletionPluginView *nview = m_views.tqat(z);
m_views.remove (nview);
delete nview;
}
diff --git a/kcert/kcertpart.cc b/kcert/kcertpart.cc
index df0aff1d..d0e09104 100644
--- a/kcert/kcertpart.cc
+++ b/kcert/kcertpart.cc
@@ -27,7 +27,7 @@
#include <klocale.h>
#include <kdebug.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqbutton.h>
#include <tqpushbutton.h>
#include <tqcombobox.h>
@@ -636,7 +636,7 @@ void KCertPart::displayCACert(KSSLCertificate *c) {
// Set the valid period
TQPalette cspl = _ca_validFrom->palette();
- if (TQDateTime::currentDateTime() < c->getQDTNotBefore()) {
+ if (TQDateTime::tqcurrentDateTime() < 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::currentDateTime() > c->getQDTNotAfter()) {
+ if (TQDateTime::tqcurrentDateTime() > 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::currentDateTime() < c->getQDTNotBefore()) {
+ if (TQDateTime::tqcurrentDateTime() < 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::currentDateTime() > c->getQDTNotAfter()) {
+ if (TQDateTime::tqcurrentDateTime() > c->getQDTNotAfter()) {
cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
} else {
cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@@ -716,7 +716,7 @@ void KCertPart::slotChain(int c) {
displayPKCS12Cert(_p12->getCertificate());
_p12_certState->setText(KSSLCertificate::verifyText(_p12->validate()));
} else {
- displayPKCS12Cert(_p12->getCertificate()->chain().getChain().at(c-1));
+ displayPKCS12Cert(_p12->getCertificate()->chain().getChain().tqat(c-1));
}
}
diff --git a/kconf_update/kconf_update.cpp b/kconf_update/kconf_update.cpp
index 7b4a3375..4d3846f2 100644
--- a/kconf_update/kconf_update.cpp
+++ b/kconf_update/kconf_update.cpp
@@ -26,7 +26,7 @@
#include <stdlib.h>
#include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
#include <kconfig.h>
#include <ksimpleconfig.h>
@@ -201,7 +201,7 @@ KonfUpdate::log()
}
}
- (*m_textStream) << TQDateTime::currentDateTime().toString( Qt::ISODate ) << " ";
+ (*m_textStream) << TQDateTime::tqcurrentDateTime().toString( Qt::ISODate ) << " ";
return *m_textStream;
}
diff --git a/kded/kbuildservicefactory.cpp b/kded/kbuildservicefactory.cpp
index 8cc2e946..30be4f21 100644
--- a/kded/kbuildservicefactory.cpp
+++ b/kded/kbuildservicefactory.cpp
@@ -113,32 +113,32 @@ KBuildServiceFactory::save(TQDataStream &str)
{
KSycocaFactory::save(str);
- m_nameDictOffset = str.device()->at();
+ m_nameDictOffset = str.tqdevice()->tqat();
m_nameDict->save(str);
- m_relNameDictOffset = str.device()->at();
+ m_relNameDictOffset = str.tqdevice()->tqat();
m_relNameDict->save(str);
saveOfferList(str);
saveInitList(str);
- m_menuIdDictOffset = str.device()->at();
+ m_menuIdDictOffset = str.tqdevice()->tqat();
m_menuIdDict->save(str);
- int endOfFactoryData = str.device()->at();
+ int endOfFactoryData = str.tqdevice()->tqat();
// Update header (pass #3)
saveHeader(str);
// Seek to end.
- str.device()->at(endOfFactoryData);
+ str.tqdevice()->tqat(endOfFactoryData);
}
void
KBuildServiceFactory::saveOfferList(TQDataStream &str)
{
- m_offerListOffset = str.device()->at();
+ m_offerListOffset = str.tqdevice()->tqat();
bool isNumber;
for(TQDictIterator<KSycocaEntry::Ptr> itserv ( *m_entryDict );
@@ -201,7 +201,7 @@ KBuildServiceFactory::saveOfferList(TQDataStream &str)
void
KBuildServiceFactory::saveInitList(TQDataStream &str)
{
- m_initListOffset = str.device()->at();
+ m_initListOffset = str.tqdevice()->tqat();
KService::List initList;
diff --git a/kded/kbuildservicegroupfactory.cpp b/kded/kbuildservicegroupfactory.cpp
index e231cd5d..7499eda8 100644
--- a/kded/kbuildservicegroupfactory.cpp
+++ b/kded/kbuildservicegroupfactory.cpp
@@ -165,14 +165,14 @@ KBuildServiceGroupFactory::save(TQDataStream &str)
{
KSycocaFactory::save(str);
- m_baseGroupDictOffset = str.device()->at();
+ m_baseGroupDictOffset = str.tqdevice()->tqat();
m_baseGroupDict->save(str);
- int endOfFactoryData = str.device()->at();
+ int endOfFactoryData = str.tqdevice()->tqat();
// Update header (pass #3)
saveHeader(str);
// Seek to end.
- str.device()->at(endOfFactoryData);
+ str.tqdevice()->tqat(endOfFactoryData);
}
diff --git a/kded/kbuildservicetypefactory.cpp b/kded/kbuildservicetypefactory.cpp
index 27b55176..1b09d10c 100644
--- a/kded/kbuildservicetypefactory.cpp
+++ b/kded/kbuildservicetypefactory.cpp
@@ -152,13 +152,13 @@ KBuildServiceTypeFactory::save(TQDataStream &str)
savePatternLists(str);
- int endOfFactoryData = str.device()->at();
+ int endOfFactoryData = str.tqdevice()->tqat();
// Update header (pass #3)
saveHeader(str);
// Seek to end.
- str.device()->at(endOfFactoryData);
+ str.tqdevice()->tqat(endOfFactoryData);
}
void
@@ -203,10 +203,10 @@ KBuildServiceTypeFactory::savePatternLists(TQDataStream &str)
TQ_INT32 entrySize = 0;
TQ_INT32 nrOfEntries = 0;
- m_fastPatternOffset = str.device()->at();
+ m_fastPatternOffset = str.tqdevice()->tqat();
// Write out fastPatternHeader (Pass #1)
- str.device()->at(m_fastPatternOffset);
+ str.tqdevice()->tqat(m_fastPatternOffset);
str << nrOfEntries;
str << entrySize;
@@ -214,27 +214,27 @@ KBuildServiceTypeFactory::savePatternLists(TQDataStream &str)
TQStringList::ConstIterator it = fastPatterns.begin();
for ( ; it != fastPatterns.end() ; ++it )
{
- int start = str.device()->at();
+ int start = str.tqdevice()->tqat();
// Justify to 6 chars with spaces, so that the size remains constant
// in the database file.
TQString paddedPattern = (*it).leftJustify(6).right(4); // remove leading "*."
//kdDebug(7021) << TQString("FAST : '%1' '%2'").arg(paddedPattern).arg(dict[(*it)]->name()) << endl;
str << paddedPattern;
str << dict[(*it)]->offset();
- entrySize = str.device()->at() - start;
+ entrySize = str.tqdevice()->tqat() - start;
nrOfEntries++;
}
// store position
- m_otherPatternOffset = str.device()->at();
+ m_otherPatternOffset = str.tqdevice()->tqat();
// Write out fastPatternHeader (Pass #2)
- str.device()->at(m_fastPatternOffset);
+ str.tqdevice()->tqat(m_fastPatternOffset);
str << nrOfEntries;
str << entrySize;
// For the other patterns
- str.device()->at(m_otherPatternOffset);
+ str.tqdevice()->tqat(m_otherPatternOffset);
it = otherPatterns.begin();
for ( ; it != otherPatterns.end() ; ++it )
diff --git a/kded/kbuildsycoca.cpp b/kded/kbuildsycoca.cpp
index 19f7a367..da5059a9 100644
--- a/kded/kbuildsycoca.cpp
+++ b/kded/kbuildsycoca.cpp
@@ -160,12 +160,12 @@ void KBuildSycoca::processGnomeVfs()
if (line[0] != '\t')
{
- app = TQString::fromLatin1(line);
+ app = TQString::tqfromLatin1(line);
app.truncate(app.length()-1);
}
else if (strncmp(line+1, "mime_types=", 11) == 0)
{
- TQString mimetypes = TQString::fromLatin1(line+12);
+ TQString mimetypes = TQString::tqfromLatin1(line+12);
mimetypes.truncate(mimetypes.length()-1);
mimetypes.replace(TQRegExp("\\*"), "all");
KService *s = g_bsf->findServiceByName(app);
@@ -500,7 +500,7 @@ bool KBuildSycoca::recreate()
if( build()) // Parse dirs
{
save(); // Save database
- if (m_str->device()->status())
+ if (m_str->tqdevice()->status())
database->abort(); // Error
m_str = 0L;
if (!database->close())
@@ -541,7 +541,7 @@ bool KBuildSycoca::recreate()
void KBuildSycoca::save()
{
// Write header (#pass 1)
- m_str->device()->at(0);
+ m_str->tqdevice()->tqat(0);
(*m_str) << (TQ_INT32) KSycoca::version();
KSycocaFactory * servicetypeFactory = 0L;
@@ -575,14 +575,14 @@ void KBuildSycoca::save()
factory = m_lstFactories->next())
{
factory->save(*m_str);
- if (m_str->device()->status())
+ if (m_str->tqdevice()->status())
return; // error
}
- int endOfData = m_str->device()->at();
+ int endOfData = m_str->tqdevice()->tqat();
// Write header (#pass 2)
- m_str->device()->at(0);
+ m_str->tqdevice()->tqat(0);
(*m_str) << (TQ_INT32) KSycoca::version();
for(KSycocaFactory *factory = m_lstFactories->first();
@@ -599,7 +599,7 @@ void KBuildSycoca::save()
(*m_str) << (TQ_INT32) 0; // No more factories.
// Jump to end of database
- m_str->device()->at(endOfData);
+ m_str->tqdevice()->tqat(endOfData);
}
bool KBuildSycoca::checkDirTimestamps( const TQString& dirname, const TQDateTime& stamp, bool top )
diff --git a/kded/kctimefactory.cpp b/kded/kctimefactory.cpp
index 966966a4..746a1c43 100644
--- a/kded/kctimefactory.cpp
+++ b/kded/kctimefactory.cpp
@@ -53,7 +53,7 @@ KCTimeInfo::save(TQDataStream &str)
{
KSycocaFactory::save(str);
- m_dictOffset = str.device()->at();
+ m_dictOffset = str.tqdevice()->tqat();
TQDictIterator<TQ_UINT32> it(ctimeDict);
while( it.current())
{
@@ -62,10 +62,10 @@ KCTimeInfo::save(TQDataStream &str)
}
str << TQString::null << (TQ_UINT32) 0;
- int endOfFactoryData = str.device()->at();
+ int endOfFactoryData = str.tqdevice()->tqat();
saveHeader(str);
- str.device()->at(endOfFactoryData);
+ str.tqdevice()->tqat(endOfFactoryData);
}
void
@@ -86,7 +86,7 @@ void
KCTimeInfo::fillCTimeDict(TQDict<TQ_UINT32> &dict)
{
assert(m_str);
- m_str->device()->at(m_dictOffset);
+ m_str->tqdevice()->tqat(m_dictOffset);
TQString path;
TQ_UINT32 ctime;
while(true)
diff --git a/kded/khostname.cpp b/kded/khostname.cpp
index 3f5d8f62..e7b1cf20 100644
--- a/kded/khostname.cpp
+++ b/kded/khostname.cpp
@@ -23,7 +23,7 @@
#include <stdio.h>
#include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
#include <tqregexp.h>
#include <dcopclient.h>
diff --git a/kded/vfolder_menu.cpp b/kded/vfolder_menu.cpp
index e147dcfa..b1c3a612 100644
--- a/kded/vfolder_menu.cpp
+++ b/kded/vfolder_menu.cpp
@@ -1000,7 +1000,7 @@ VFolderMenu::loadApplications(const TQString &dir, const TQString &prefix)
while( ( ep = readdir( dp ) ) != 0L )
{
TQString fn( TQFile::decodeName(ep->d_name));
- if (fn == _dot || fn == _dotdot || TQChar(fn.at(fn.length() - 1)).latin1() == '~')
+ if (fn == _dot || fn == _dotdot || TQChar(fn.tqat(fn.length() - 1)).latin1() == '~')
continue;
TQString pathfn = dir + fn;
@@ -1110,7 +1110,7 @@ kdDebug(7021) << "processLegacyDir(" << dir << ", " << relDir << ", " << prefix
while( ( ep = readdir( dp ) ) != 0L )
{
TQString fn( TQFile::decodeName(ep->d_name));
- if (fn == _dot || fn == _dotdot || TQChar(fn.at(fn.length() - 1)).latin1() == '~')
+ if (fn == _dot || fn == _dotdot || TQChar(fn.tqat(fn.length() - 1)).latin1() == '~')
continue;
TQString pathfn = dir + fn;
diff --git a/kdewidgets/makekdewidgets.cpp b/kdewidgets/makekdewidgets.cpp
index 0248a4b5..c5141d3f 100644
--- a/kdewidgets/makekdewidgets.cpp
+++ b/kdewidgets/makekdewidgets.cpp
@@ -6,7 +6,7 @@
#include <kmacroexpander.h>
#include <kdebug.h>
-#include <textstream.h>
+#include <tqtextstream.h>
#include <tqfileinfo.h>
#include <tqfile.h>
#include <tqbuffer.h>
@@ -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::fromLatin1(\"%PluginNameLower/pics/\") + m_widgets[key].iconSet));\n"
+ " TQString::tqfromLatin1(\"%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::fromLatin1(\"%Group\");\n"
+static const char widgetDef[] = " widget.group = TQString::tqfromLatin1(\"%Group\");\n"
"#ifdef EMBED_IMAGES\n"
" widget.iconSet = TQPixmap(%Pixmap);\n"
"#else\n"
- " widget.iconSet = TQString::fromLatin1(\"%IconSet\");\n"
+ " widget.iconSet = TQString::tqfromLatin1(\"%IconSet\");\n"
"#endif\n"
- " widget.includeFile = TQString::fromLatin1(\"%IncludeFile\");\n"
- " widget.toolTip = TQString::fromLatin1(\"%ToolTip\");\n"
- " widget.whatsThis = TQString::fromLatin1(\"%WhatsThis\");\n"
+ " widget.includeFile = TQString::tqfromLatin1(\"%IncludeFile\");\n"
+ " widget.toolTip = TQString::tqfromLatin1(\"%ToolTip\");\n"
+ " widget.whatsThis = TQString::tqfromLatin1(\"%WhatsThis\");\n"
" widget.isContainer = %IsContainer;\n"
- " m_widgets.insert(TQString::fromLatin1(\"%Class\"), widget);\n";
+ " m_widgets.insert(TQString::tqfromLatin1(\"%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::fromLatin1(\"%Class\"))\n"
+static const char widgetCreate[] = " if (key == TQString::tqfromLatin1(\"%Class\"))\n"
" return new %ImplClass%ConstructorArgs;\n";
static const char endCreate[] = " return 0;\n"
"}\n"
diff --git a/kdoctools/kio_help.cpp b/kdoctools/kio_help.cpp
index 78873af7..9da16d83 100644
--- a/kdoctools/kio_help.cpp
+++ b/kdoctools/kio_help.cpp
@@ -19,9 +19,9 @@
#include <tqvaluelist.h>
#include <tqfileinfo.h>
#include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
#include <tqregexp.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
#include <kdebug.h>
#include <kurl.h>
@@ -112,7 +112,7 @@ TQString HelpProtocol::lookupFile(const TQString &fname,
}
else
{
- unicodeError( i18n("There is no documentation available for %1." ).arg(path) );
+ tqunicodeError( i18n("There is no documentation available for %1." ).arg(path) );
finished();
return TQString::null;
}
@@ -123,7 +123,7 @@ TQString HelpProtocol::lookupFile(const TQString &fname,
}
-void HelpProtocol::unicodeError( const TQString &t )
+void HelpProtocol::tqunicodeError( const TQString &t )
{
data(fromUnicode( TQString(
"<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=%1\"></head>\n"
@@ -148,10 +148,10 @@ void HelpProtocol::get( const KURL& url )
doc = url.path();
if ( !mGhelp ) {
- if (doc.at(0) != '/')
+ if (doc.tqat(0) != '/')
doc = doc.prepend('/');
- if (doc.at(doc.length() - 1) == '/')
+ if (doc.tqat(doc.length() - 1) == '/')
doc += "index.html";
}
@@ -215,7 +215,7 @@ void HelpProtocol::get( const KURL& url )
kdDebug( 7119 ) << "parsed " << mParsed.length() << endl;
if (mParsed.isEmpty()) {
- unicodeError( i18n( "The requested help file could not be parsed:<br>%1" ).arg( file ) );
+ tqunicodeError( i18n( "The requested help file could not be parsed:<br>%1" ).arg( file ) );
} else {
int pos1 = mParsed.find( "charset=" );
if ( pos1 > 0 ) {
@@ -248,7 +248,7 @@ void HelpProtocol::get( const KURL& url )
kdDebug( 7119 ) << "parsed " << mParsed.length() << endl;
if (mParsed.isEmpty()) {
- unicodeError( i18n( "The requested help file could not be parsed:<br>%1" ).arg( file ) );
+ tqunicodeError( i18n( "The requested help file could not be parsed:<br>%1" ).arg( file ) );
} else {
TQString query = url.query(), anchor;
@@ -316,7 +316,7 @@ void HelpProtocol::emitFile( const KURL& url )
return;
}
- unicodeError( i18n("Could not find filename %1 in %2.").arg(filename).arg( url.url() ) );
+ tqunicodeError( i18n("Could not find filename %1 in %2.").arg(filename).arg( url.url() ) );
return;
}
diff --git a/kdoctools/kio_help.h b/kdoctools/kio_help.h
index 13c198af..c442e7c6 100644
--- a/kdoctools/kio_help.h
+++ b/kdoctools/kio_help.h
@@ -37,7 +37,7 @@ private:
TQString lookupFile(const TQString &fname, const TQString &query,
bool &redirect);
- void unicodeError( const TQString &t );
+ void tqunicodeError( const TQString &t );
TQString mParsed;
bool mGhelp;
diff --git a/kdoctools/meinproc.cpp b/kdoctools/meinproc.cpp
index 5c51457c..8f20c200 100644
--- a/kdoctools/meinproc.cpp
+++ b/kdoctools/meinproc.cpp
@@ -23,7 +23,7 @@
#include <kaboutdata.h>
#include <stdlib.h>
#include <kdebug.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
#include <tqfileinfo.h>
#include <kprocess.h>
#include <tqvaluevector.h>
diff --git a/kdoctools/xslt.cpp b/kdoctools/xslt.cpp
index e4f57e10..5a40d6e6 100644
--- a/kdoctools/xslt.cpp
+++ b/kdoctools/xslt.cpp
@@ -16,7 +16,7 @@
#include <assert.h>
#include <kfilterbase.h>
#include <kfilterdev.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
#include <stdlib.h>
#include <config.h>
#include <stdarg.h>
@@ -133,7 +133,7 @@ xmlParserInputPtr meinExternalEntityLoader(const char *URL, const char *ID,
TQString splitOut(const TQString &parsed, int index)
{
int start_index = index + 1;
- while (parsed.at(start_index - 1) != '>') start_index++;
+ while (parsed.tqat(start_index - 1) != '>') start_index++;
int inside = 0;
@@ -170,7 +170,7 @@ TQString splitOut(const TQString &parsed, int index)
if (index > 0) {
int endindex = filedata.findRev("</FILENAME>");
- while (filedata.at(endindex) != '>') endindex++;
+ while (filedata.tqat(endindex) != '>') endindex++;
endindex++;
filedata = filedata.left(index) + filedata.mid(endindex);
}
@@ -279,7 +279,7 @@ TQString lookForCache( const TQString &filename )
{
kdDebug() << "lookForCache " << filename << endl;
assert( filename.endsWith( ".docbook" ) );
- assert( filename.at( 0 ) == '/' );
+ assert( filename.tqat( 0 ) == '/' );
TQString cache = filename.left( filename.length() - 7 );
TQString output;
@@ -336,7 +336,7 @@ TQCString fromUnicode( const TQString &data )
buffer_len += test.length();
} else {
TQString res;
- res.sprintf( "&#%d;", TQChar(part.at( i )).unicode() );
+ res.sprintf( "&#%d;", TQChar(part.tqat( i )).tqunicode() );
test = locale->fromUnicode( res );
if (buffer_len + test.length() + 1 > sizeof(buffer))
break;
diff --git a/khtml/DESIGN.html b/khtml/DESIGN.html
index 16484d4f..b6419c89 100644
--- a/khtml/DESIGN.html
+++ b/khtml/DESIGN.html
@@ -291,7 +291,7 @@ that defines the DTD to use for HTML (used mainly in the parser).
<dd>Java related stuff.
<dt><a href="misc/">misc:</a>
<dd>Some misc stuff needed in khtml. Contains the image loader, some misc definitions and the
-decoder class that converts the incoming stream to unicode.
+decoder class that converts the incoming stream to tqunicode.
<dt><a href="rendering">rendering:</a>
<dd>Everything thats related to bringing a DOM tree with CSS declarations to the screen. Contains
the definition of the objects used in the rendering tree, the layouting code, and the RenderStyle objects.
diff --git a/khtml/css/css_base.h b/khtml/css/css_base.h
index 9a877410..b38024be 100644
--- a/khtml/css/css_base.h
+++ b/khtml/css/css_base.h
@@ -256,7 +256,7 @@ namespace DOM {
virtual ~StyleListImpl();
unsigned long length() const { return m_lstChildren->count(); }
- StyleBaseImpl *item(unsigned long num) const { return m_lstChildren->at(num); }
+ StyleBaseImpl *item(unsigned long num) const { return m_lstChildren->tqat(num); }
void append(StyleBaseImpl *item) { m_lstChildren->append(item); }
diff --git a/khtml/css/css_renderstyledeclarationimpl.cpp b/khtml/css/css_renderstyledeclarationimpl.cpp
index daf607a9..eef98f41 100644
--- a/khtml/css/css_renderstyledeclarationimpl.cpp
+++ b/khtml/css/css_renderstyledeclarationimpl.cpp
@@ -930,7 +930,7 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID )
case CSS_PROP_TOP:
return getPositionOffsetValue(renderer, CSS_PROP_TOP);
case CSS_PROP_UNICODE_BIDI:
- switch (style->unicodeBidi()) {
+ switch (style->tqunicodeBidi()) {
case UBNormal:
return new CSSPrimitiveValueImpl(CSS_VAL_NORMAL);
case Embed:
diff --git a/khtml/css/css_ruleimpl.h b/khtml/css/css_ruleimpl.h
index 2753fcf8..d9928994 100644
--- a/khtml/css/css_ruleimpl.h
+++ b/khtml/css/css_ruleimpl.h
@@ -137,7 +137,7 @@ public:
~CSSRuleListImpl();
unsigned long length() const { return m_lstCSSRules.count(); }
- CSSRuleImpl *item ( unsigned long index ) { return m_lstCSSRules.at( index ); }
+ CSSRuleImpl *item ( unsigned long index ) { return m_lstCSSRules.tqat( index ); }
/* not part of the DOM */
diff --git a/khtml/css/css_valueimpl.cpp b/khtml/css/css_valueimpl.cpp
index a6150c78..3fa38efe 100644
--- a/khtml/css/css_valueimpl.cpp
+++ b/khtml/css/css_valueimpl.cpp
@@ -281,7 +281,7 @@ void CSSStyleDeclarationImpl::removeCSSHints()
return;
for (int i = (int)m_lstValues->count()-1; i >= 0; i--) {
- if (!m_lstValues->at(i)->nonCSSHint)
+ if (!m_lstValues->tqat(i)->nonCSSHint)
m_lstValues->remove(i);
}
}
@@ -358,8 +358,8 @@ unsigned long CSSStyleDeclarationImpl::length() const
DOMString CSSStyleDeclarationImpl::item( unsigned long index ) const
{
- if(m_lstValues && index < m_lstValues->count() && m_lstValues->at(index))
- return getPropertyName(m_lstValues->at(index)->m_id);
+ if(m_lstValues && index < m_lstValues->count() && m_lstValues->tqat(index))
+ return getPropertyName(m_lstValues->tqat(index)->m_id);
return DOMString();
}
diff --git a/khtml/css/css_valueimpl.h b/khtml/css/css_valueimpl.h
index 3566c00c..668c53d9 100644
--- a/khtml/css/css_valueimpl.h
+++ b/khtml/css/css_valueimpl.h
@@ -136,7 +136,7 @@ public:
virtual ~CSSValueListImpl();
unsigned long length() const { return m_values.count(); }
- CSSValueImpl *item ( unsigned long index ) { return m_values.at(index); }
+ CSSValueImpl *item ( unsigned long index ) { return m_values.tqat(index); }
virtual bool isValueList() const { return true; }
diff --git a/khtml/css/csshelper.cpp b/khtml/css/csshelper.cpp
index b388d221..96e184f2 100644
--- a/khtml/css/csshelper.cpp
+++ b/khtml/css/csshelper.cpp
@@ -78,7 +78,7 @@ DOMString khtml::parseURL(const DOMString &url)
int nl = 0;
for(int k = o; k < o+l; k++)
- if(i->s[k].unicode() > '\r')
+ if(i->s[k].tqunicode() > '\r')
j->s[nl++] = i->s[k];
j->l = nl;
diff --git a/khtml/css/cssparser.cpp b/khtml/css/cssparser.cpp
index 6ca1a069..474067cf 100644
--- a/khtml/css/cssparser.cpp
+++ b/khtml/css/cssparser.cpp
@@ -166,7 +166,7 @@ void CSSParser::parseSheet( CSSStyleSheetImpl *sheet, const DOMString &string )
int length = string.length() + 3;
data = (unsigned short *)malloc( length *sizeof( unsigned short ) );
- memcpy( data, string.unicode(), string.length()*sizeof( unsigned short) );
+ memcpy( data, string.tqunicode(), string.length()*sizeof( unsigned short) );
#ifdef CSS_DEBUG
kdDebug( 6080 ) << ">>>>>>> start parsing style sheet" << endl;
@@ -190,7 +190,7 @@ CSSRuleImpl *CSSParser::parseRule( DOM::CSSStyleSheetImpl *sheet, const DOM::DOM
data = (unsigned short *)malloc( length *sizeof( unsigned short ) );
for ( unsigned int i = 0; i < strlen(khtml_rule); i++ )
data[i] = khtml_rule[i];
- memcpy( data + strlen( khtml_rule ), string.unicode(), string.length()*sizeof( unsigned short) );
+ memcpy( data + strlen( khtml_rule ), string.tqunicode(), string.length()*sizeof( unsigned short) );
// qDebug("parse string = '%s'", TQConstString( (const TQChar *)data, length ).string().latin1() );
data[length-4] = '}';
@@ -218,7 +218,7 @@ bool CSSParser::parseValue( DOM::CSSStyleDeclarationImpl *declaration, int _id,
data = (unsigned short *)malloc( length *sizeof( unsigned short ) );
for ( unsigned int i = 0; i < strlen(khtml_value); i++ )
data[i] = khtml_value[i];
- memcpy( data + strlen( khtml_value ), string.unicode(), string.length()*sizeof( unsigned short) );
+ memcpy( data + strlen( khtml_value ), string.tqunicode(), string.length()*sizeof( unsigned short) );
data[length-4] = '}';
// qDebug("parse string = '%s'", TQConstString( (const TQChar *)data, length ).string().latin1() );
@@ -260,7 +260,7 @@ bool CSSParser::parseDeclaration( DOM::CSSStyleDeclarationImpl *declaration, con
data = (unsigned short *)malloc( length *sizeof( unsigned short ) );
for ( unsigned int i = 0; i < strlen(khtml_decls); i++ )
data[i] = khtml_decls[i];
- memcpy( data + strlen( khtml_decls ), string.unicode(), string.length()*sizeof( unsigned short) );
+ memcpy( data + strlen( khtml_decls ), string.tqunicode(), string.length()*sizeof( unsigned short) );
data[length-4] = '}';
nonCSSHint = _nonCSSHint;
@@ -522,7 +522,7 @@ bool CSSParser::parseValue( int propId, bool important )
valid_primitive = true;
break;
- case CSS_PROP_CLIP: // <shape> | auto | inherit
+ case CSS_PROP_CLIP: // <tqshape> | auto | inherit
if ( id == CSS_VAL_AUTO )
valid_primitive = true;
else if ( value->unit == Value::Function )
diff --git a/khtml/css/cssproperties.c b/khtml/css/cssproperties.c
index c86f2d32..894ab787 100644
--- a/khtml/css/cssproperties.c
+++ b/khtml/css/cssproperties.c
@@ -281,7 +281,7 @@ findProp (register const char *str, register unsigned int len)
#line 102 "cssproperties.gperf"
{"text-align", CSS_PROP_TEXT_ALIGN},
#line 109 "cssproperties.gperf"
- {"unicode-bidi", CSS_PROP_UNICODE_BIDI},
+ {"tqunicode-bidi", CSS_PROP_UNICODE_BIDI},
#line 82 "cssproperties.gperf"
{"outline-color", CSS_PROP_OUTLINE_COLOR},
#line 60 "cssproperties.gperf"
@@ -632,7 +632,7 @@ static const char * const propertyList[] = {
"text-shadow",
"text-transform",
"top",
-"unicode-bidi",
+"tqunicode-bidi",
"vertical-align",
"visibility",
"white-space",
diff --git a/khtml/css/cssstyleselector.cpp b/khtml/css/cssstyleselector.cpp
index 35a5ff70..32391bb7 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::fromLatin1( file.data() );
+ TQString style = TQString::tqfromLatin1( 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::fromLatin1( file.data() );
+ TQString style = TQString::tqfromLatin1( file.data() );
DOMString str(style);
s_quirksSheet = new DOM::CSSStyleSheetImpl(doc);
@@ -742,7 +742,7 @@ void CSSStyleSelector::adjustRenderStyle(RenderStyle* style, DOM::ElementImpl *e
style->adjustBackgroundLayers();
// Only use slow repaints if we actually have a background image.
- // FIXME: We only need to invalidate the fixed regions when scrolling. It's total overkill to
+ // FIXME: We only need to tqinvalidate the fixed regions when scrolling. It's total overkill to
// prevent the entire view from blitting on a scroll.
if (style->hasFixedBackgroundImage() && view)
view->useSlowRepaints();
@@ -786,7 +786,7 @@ unsigned int CSSStyleSelector::addInlineDeclarations(DOM::ElementImpl* e,
if (i == firstLen)
values = addValues;
- CSSProperty *prop = values->at(i >= firstLen ? i - firstLen : i);
+ CSSProperty *prop = values->tqat(i >= firstLen ? i - firstLen : i);
Source source = Inline;
if( prop->m_important ) source = InlineImportant;
@@ -871,7 +871,7 @@ static PseudoState checkPseudoState( const CSSStyleSelector::Encodedurl& encoded
if( attr.isNull() ) {
return PseudoNone;
}
- TQConstString cu(attr.unicode(), attr.length());
+ TQConstString cu(attr.tqunicode(), attr.length());
TQString u = cu.string();
if ( !u.contains("://") ) {
if ( u[0] == '/' )
@@ -1165,8 +1165,8 @@ bool CSSStyleSelector::checkSimpleSelector(DOM::CSSSelector *sel, DOM::ElementIm
// else the value is longer and can be a list
if ( sel->match == CSSSelector::Class && !e->hasClassList() ) return false;
- TQChar* sel_uc = sel->value.unicode();
- TQChar* val_uc = value->unicode();
+ TQChar* sel_uc = sel->value.tqunicode();
+ TQChar* val_uc = value->tqunicode();
TQConstString sel_str(sel_uc, sel_len);
TQConstString val_str(val_uc, val_len);
@@ -1187,29 +1187,29 @@ bool CSSStyleSelector::checkSimpleSelector(DOM::CSSSelector *sel, DOM::ElementIm
case CSSSelector::Contain:
{
//kdDebug( 6080 ) << "checking for contains match" << endl;
- TQConstString val_str(value->unicode(), value->length());
- TQConstString sel_str(sel->value.unicode(), sel->value.length());
+ TQConstString val_str(value->tqunicode(), value->length());
+ TQConstString sel_str(sel->value.tqunicode(), sel->value.length());
return val_str.string().contains(sel_str.string(), caseSensitive);
}
case CSSSelector::Begin:
{
//kdDebug( 6080 ) << "checking for beginswith match" << endl;
- TQConstString val_str(value->unicode(), value->length());
- TQConstString sel_str(sel->value.unicode(), sel->value.length());
- return val_str.string().startsWith(sel_str.string(), caseSensitive);
+ 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);
}
case CSSSelector::End:
{
//kdDebug( 6080 ) << "checking for endswith match" << endl;
- TQConstString val_str(value->unicode(), value->length());
- TQConstString sel_str(sel->value.unicode(), sel->value.length());
- return val_str.string().endsWith(sel_str.string(), caseSensitive);
+ 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);
}
case CSSSelector::Hyphen:
{
//kdDebug( 6080 ) << "checking for hyphen match" << endl;
- TQConstString val_str(value->unicode(), value->length());
- TQConstString sel_str(sel->value.unicode(), sel->value.length());
+ TQConstString val_str(value->tqunicode(), value->length());
+ TQConstString sel_str(sel->value.tqunicode(), sel->value.length());
const TQString& str = val_str.string();
const TQString& selStr = sel_str.string();
if(str.length() < selStr.length()) return false;
@@ -1782,7 +1782,7 @@ void CSSStyleSelectorList::append( CSSStyleSheetImpl *sheet,
TQPtrList<CSSSelector> *s = r->selector();
for(int j = 0; j < (int)s->count(); j++)
{
- CSSOrderedRule *rule = new CSSOrderedRule(r, s->at(j), count());
+ CSSOrderedRule *rule = new CSSOrderedRule(r, s->tqat(j), count());
TQPtrList<CSSOrderedRule>::append(rule);
//kdDebug( 6080 ) << "appending StyleRule!" << endl;
}
@@ -1829,7 +1829,7 @@ void CSSStyleSelectorList::append( CSSStyleSheetImpl *sheet,
for( int j = 0; j < ( int ) s->count(); j++ )
{
CSSOrderedRule *orderedRule = new CSSOrderedRule(
- styleRule, s->at( j ), count() );
+ styleRule, s->tqat( j ), count() );
TQPtrList<CSSOrderedRule>::append( orderedRule );
}
}
@@ -1891,7 +1891,7 @@ void CSSOrderedPropertyList::append(DOM::CSSStyleDeclarationImpl *decl, uint sel
int len = values->count();
for(int i = 0; i < len; i++)
{
- CSSProperty *prop = values->at(i);
+ CSSProperty *prop = values->tqat(i);
Source source = regular;
if( prop->m_important ) source = important;
@@ -2079,7 +2079,7 @@ static TQColor colorForCSSValue( int css_value )
KConfig bckgrConfig("kdesktoprc", true, false); // No multi-screen support
bckgrConfig.setGroup("Desktop0");
// Desktop background.
- return bckgrConfig.readColorEntry("Color1", &tqApp->palette().disabled().background());
+ return bckgrConfig.readColorEntry("Color1", &tqApp->tqpalette().disabled().background());
}
return TQColor();
}
@@ -2597,7 +2597,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
}
case CSS_PROP_UNICODE_BIDI: {
- HANDLE_INHERIT_AND_INITIAL(unicodeBidi, UnicodeBidi)
+ HANDLE_INHERIT_AND_INITIAL(tqunicodeBidi, UnicodeBidi)
if(!primitiveValue) break;
switch (primitiveValue->getIdent()) {
case CSS_VAL_NORMAL:
diff --git a/khtml/css/html4.css b/khtml/css/html4.css
index c3fd1a34..57594546 100644
--- a/khtml/css/html4.css
+++ b/khtml/css/html4.css
@@ -486,27 +486,27 @@ a:visited:active { color: red; outline: 1px dotted invert; }
bdo[dir="ltr"] {
direction: ltr;
- unicode-bidi: bidi-override;
+ tqunicode-bidi: bidi-override;
}
bdo[dir="rtl"] {
direction: rtl;
- unicode-bidi: bidi-override;
+ tqunicode-bidi: bidi-override;
}
/* ### this selector seems to be still broken ...
- *[dir="ltr"] { direction: ltr; unicode-bidi: embed }
- *[dir="rtl"] { direction: rtl; unicode-bidi: embed }
+ *[dir="ltr"] { direction: ltr; tqunicode-bidi: embed }
+ *[dir="rtl"] { direction: rtl; tqunicode-bidi: embed }
*/
/* elements that are block-level in html4 */
-/* ### don't support unicode-bidi at the moment
+/* ### don't support tqunicode-bidi at the moment
address, blockquote, body, dd, div, dl, dt, fieldset,
form, frame, frameset, h1, h2, h3, h4, h5, h6, iframe,
noscript, noframes, object, ol, p, ul, applet, center,
dir, hr, menu, pre, li, table, tr, thead, tbody, tfoot,
col, colgroup, td, th, caption
- { unicode-bidi: embed }
+ { tqunicode-bidi: embed }
*/
/* end bidi settings */
diff --git a/khtml/dom/css_extensions.cpp b/khtml/dom/css_extensions.cpp
index 23f7739d..01a47d5f 100644
--- a/khtml/dom/css_extensions.cpp
+++ b/khtml/dom/css_extensions.cpp
@@ -1881,15 +1881,15 @@ void CSS2Properties::setTop( const DOMString &value )
if(impl) ((ElementImpl *)impl)->setAttribute("top", value);
}
-DOMString CSS2Properties::unicodeBidi() const
+DOMString CSS2Properties::tqunicodeBidi() const
{
if(!impl) return 0;
- return ((ElementImpl *)impl)->getAttribute("unicodeBidi");
+ return ((ElementImpl *)impl)->getAttribute("tqunicodeBidi");
}
void CSS2Properties::setUnicodeBidi( const DOMString &value )
{
- if(impl) ((ElementImpl *)impl)->setAttribute("unicodeBidi", value);
+ if(impl) ((ElementImpl *)impl)->setAttribute("tqunicodeBidi", value);
}
DOMString CSS2Properties::verticalAlign() const
diff --git a/khtml/dom/css_extensions.h b/khtml/dom/css_extensions.h
index a6cdb214..bda2cfbb 100644
--- a/khtml/dom/css_extensions.h
+++ b/khtml/dom/css_extensions.h
@@ -2515,14 +2515,14 @@ public:
/**
* See the <a
- * href="http://www.w3.org/TR/REC-CSS2/visuren.html#propdef-unicode-bidi">
- * unicode-bidi property definition </a> in CSS2.
+ * href="http://www.w3.org/TR/REC-CSS2/visuren.html#propdef-tqunicode-bidi">
+ * tqunicode-bidi property definition </a> in CSS2.
*
*/
- DOM::DOMString unicodeBidi() const;
+ DOM::DOMString tqunicodeBidi() const;
/**
- * see unicodeBidi
+ * see tqunicodeBidi
*/
void setUnicodeBidi( const DOM::DOMString & );
diff --git a/khtml/dom/css_value.h b/khtml/dom/css_value.h
index 5d4a043c..7523a279 100644
--- a/khtml/dom/css_value.h
+++ b/khtml/dom/css_value.h
@@ -633,7 +633,7 @@ class RectImpl;
/**
* The \c Rect interface is used to represent any <a
- * href="http://www.w3.org/TR/REC-CSS2/visufx.html#value-def-shape">
+ * href="http://www.w3.org/TR/REC-CSS2/visufx.html#value-def-tqshape">
* rect </a> value. This interface reflects the values in the
* underlying style property. Hence, modifications made through this
* interface modify the style property.
diff --git a/khtml/dom/dom_doc.cpp b/khtml/dom/dom_doc.cpp
index 0ff12344..088a7a94 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::fromLatin1("<HTML><HEAD><TITLE>") + title.string() +
- TQString::fromLatin1("</TITLE></HEAD>"));
+ r->write(TQString::tqfromLatin1("<HTML><HEAD><TITLE>") + title.string() +
+ TQString::tqfromLatin1("</TITLE></HEAD>"));
return r;
}
diff --git a/khtml/dom/dom_string.cpp b/khtml/dom/dom_string.cpp
index 14bdc261..f8487cf5 100644
--- a/khtml/dom/dom_string.cpp
+++ b/khtml/dom/dom_string.cpp
@@ -39,7 +39,7 @@ DOMString::DOMString(const TQString &str)
return;
}
- impl = new DOMStringImpl( str.unicode(), str.length() );
+ impl = new DOMStringImpl( str.tqunicode(), str.length() );
impl->ref();
}
@@ -193,10 +193,10 @@ bool DOMString::percentage(int &_percentage) const
return true;
}
-TQChar *DOMString::unicode() const
+TQChar *DOMString::tqunicode() const
{
if(!impl) return 0;
- return impl->unicode();
+ return impl->tqunicode();
}
TQString DOMString::string() const
@@ -225,8 +225,8 @@ bool DOM::strcasecmp( const DOMString &as, const DOMString &bs )
{
if ( as.length() != bs.length() ) return true;
- const TQChar *a = as.unicode();
- const TQChar *b = bs.unicode();
+ const TQChar *a = as.tqunicode();
+ const TQChar *b = bs.tqunicode();
if ( a == b ) return false;
if ( !( a && b ) ) return true;
int l = as.length();
@@ -239,7 +239,7 @@ bool DOM::strcasecmp( const DOMString &as, const DOMString &bs )
bool DOM::strcasecmp( const DOMString &as, const char* bs )
{
- const TQChar *a = as.unicode();
+ const TQChar *a = as.tqunicode();
int l = as.length();
if ( !bs ) return ( l != 0 );
while ( l-- ) {
@@ -265,7 +265,7 @@ bool DOM::operator==( const DOMString &a, const DOMString &b )
if( l != b.length() ) return false;
- if(!memcmp(a.unicode(), b.unicode(), l*sizeof(TQChar)))
+ if(!memcmp(a.tqunicode(), b.tqunicode(), l*sizeof(TQChar)))
return true;
return false;
}
@@ -276,7 +276,7 @@ bool DOM::operator==( const DOMString &a, const TQString &b )
if( l != b.length() ) return false;
- if(!memcmp(a.unicode(), b.unicode(), l*sizeof(TQChar)))
+ if(!memcmp(a.tqunicode(), b.tqunicode(), l*sizeof(TQChar)))
return true;
return false;
}
@@ -291,7 +291,7 @@ bool DOM::operator==( const DOMString &a, const char *b )
const TQChar *aptr = aimpl->s;
while ( alen-- ) {
unsigned char c = *b++;
- if ( !c || ( *aptr++ ).unicode() != c )
+ if ( !c || ( *aptr++ ).tqunicode() != c )
return false;
}
}
diff --git a/khtml/dom/dom_string.h b/khtml/dom/dom_string.h
index 3d4706b5..dec25988 100644
--- a/khtml/dom/dom_string.h
+++ b/khtml/dom/dom_string.h
@@ -97,7 +97,7 @@ public:
*/
DOMString upper() const;
- TQChar *unicode() const;
+ TQChar *tqunicode() const;
TQString string() const;
int toInt() const;
diff --git a/khtml/dom/html_block.h b/khtml/dom/html_block.h
index 4283bafa..b318d8cb 100644
--- a/khtml/dom/html_block.h
+++ b/khtml/dom/html_block.h
@@ -105,7 +105,7 @@ public:
~HTMLDivElement();
/**
- * Horizontal text alignment. See the <a
+ * Horizontal text tqalignment. See the <a
* href="http://www.w3.org/TR/REC-html40/present/graphics.html#adef-align">
* align attribute definition </a> in HTML 4.0. This attribute is
* deprecated in HTML 4.0.
@@ -231,7 +231,7 @@ public:
~HTMLHeadingElement();
/**
- * Horizontal text alignment. See the <a
+ * Horizontal text tqalignment. See the <a
* href="http://www.w3.org/TR/REC-html40/present/graphics.html#adef-align">
* align attribute definition </a> in HTML 4.0. This attribute is
* deprecated in HTML 4.0.
@@ -272,7 +272,7 @@ public:
~HTMLParagraphElement();
/**
- * Horizontal text alignment. See the <a
+ * Horizontal text tqalignment. See the <a
* href="http://www.w3.org/TR/REC-html40/present/graphics.html#adef-align">
* align attribute definition </a> in HTML 4.0. This attribute is
* deprecated in HTML 4.0.
diff --git a/khtml/dom/html_form.h b/khtml/dom/html_form.h
index 0623e421..ef318ba0 100644
--- a/khtml/dom/html_form.h
+++ b/khtml/dom/html_form.h
@@ -798,7 +798,7 @@ public:
void setAccessKey( const DOMString & );
/**
- * Text alignment relative to \c FIELDSET . See the <a
+ * Text tqalignment relative to \c FIELDSET . See the <a
* href="http://www.w3.org/TR/REC-html40/interact/forms.html#adef-align-LEGEND">
* align attribute definition </a> in HTML 4.0. This attribute is
* deprecated in HTML 4.0.
diff --git a/khtml/dom/html_image.cpp b/khtml/dom/html_image.cpp
index f7c9dac2..a5cdb3b7 100644
--- a/khtml/dom/html_image.cpp
+++ b/khtml/dom/html_image.cpp
@@ -122,7 +122,7 @@ void HTMLAreaElement::setNoHref( bool _noHref )
}
}
-DOMString HTMLAreaElement::shape() const
+DOMString HTMLAreaElement::tqshape() const
{
if(!impl) return DOMString();
return ((ElementImpl *)impl)->getAttribute(ATTR_SHAPE);
diff --git a/khtml/dom/html_image.h b/khtml/dom/html_image.h
index 9f30aaa1..9b1334c8 100644
--- a/khtml/dom/html_image.h
+++ b/khtml/dom/html_image.h
@@ -90,7 +90,7 @@ public:
/**
* Comma-separated list of lengths, defining an active region
- * geometry. See also \c shape for the shape of the
+ * geometry. See also \c tqshape for the tqshape of the
* region. See the <a
* href="http://www.w3.org/TR/REC-html40/struct/objects.html#adef-coords">
* coords attribute definition </a> in HTML 4.0.
@@ -131,16 +131,16 @@ public:
void setNoHref( bool );
/**
- * The shape of the active area. The coordinates are given by
+ * The tqshape of the active area. The coordinates are given by
* \c coords . See the <a
- * href="http://www.w3.org/TR/REC-html40/struct/objects.html#adef-shape">
- * shape attribute definition </a> in HTML 4.0.
+ * href="http://www.w3.org/TR/REC-html40/struct/objects.html#adef-tqshape">
+ * tqshape attribute definition </a> in HTML 4.0.
*
*/
- DOMString shape() const;
+ DOMString tqshape() const;
/**
- * see shape
+ * see tqshape
*/
void setShape( const DOMString & );
diff --git a/khtml/dom/html_inline.cpp b/khtml/dom/html_inline.cpp
index 56876168..9f40da2f 100644
--- a/khtml/dom/html_inline.cpp
+++ b/khtml/dom/html_inline.cpp
@@ -148,7 +148,7 @@ void HTMLAnchorElement::setRev( const DOMString &value )
if(impl) ((ElementImpl *)impl)->setAttribute(ATTR_REV, value);
}
-DOMString HTMLAnchorElement::shape() const
+DOMString HTMLAnchorElement::tqshape() const
{
if(!impl) return DOMString();
return ((ElementImpl *)impl)->getAttribute(ATTR_SHAPE);
diff --git a/khtml/dom/html_inline.h b/khtml/dom/html_inline.h
index f92ed691..041c43db 100644
--- a/khtml/dom/html_inline.h
+++ b/khtml/dom/html_inline.h
@@ -89,7 +89,7 @@ public:
/**
* Comma-separated list of lengths, defining an active region
- * geometry. See also \c shape for the shape of the
+ * geometry. See also \c tqshape for the tqshape of the
* region. See the <a
* href="http://www.w3.org/TR/REC-html40/struct/objects.html#adef-coords">
* coords attribute definition </a> in HTML 4.0.
@@ -168,16 +168,16 @@ public:
void setRev( const DOMString & );
/**
- * The shape of the active area. The coordinates are given by
+ * The tqshape of the active area. The coordinates are given by
* \c coords . See the <a
- * href="http://www.w3.org/TR/REC-html40/struct/objects.html#adef-shape">
- * shape attribute definition </a> in HTML 4.0.
+ * href="http://www.w3.org/TR/REC-html40/struct/objects.html#adef-tqshape">
+ * tqshape attribute definition </a> in HTML 4.0.
*
*/
- DOMString shape() const;
+ DOMString tqshape() const;
/**
- * see shape
+ * see tqshape
*/
void setShape( const DOMString & );
diff --git a/khtml/dom/html_table.h b/khtml/dom/html_table.h
index 6b9a2d99..72e38d7f 100644
--- a/khtml/dom/html_table.h
+++ b/khtml/dom/html_table.h
@@ -63,7 +63,7 @@ public:
~HTMLTableCaptionElement();
/**
- * Caption alignment with respect to the table. See the <a
+ * Caption tqalignment with respect to the table. See the <a
* href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-align-CAPTION">
* align attribute definition </a> in HTML 4.0. This attribute is
* deprecated in HTML 4.0.
@@ -134,7 +134,7 @@ public:
void setAbbr( const DOMString & );
/**
- * Horizontal alignment of data in cell. See the <a
+ * Horizontal tqalignment of data in cell. See the <a
* href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-align-TD">
* align attribute definition </a> in HTML 4.0.
*
@@ -187,7 +187,7 @@ public:
void setCh( const DOMString & );
/**
- * Offset of alignment character. See the <a
+ * Offset of tqalignment character. See the <a
* href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-charoff">
* charoff attribute definition </a> in HTML 4.0.
*
@@ -281,7 +281,7 @@ public:
void setScope( const DOMString & );
/**
- * Vertical alignment of data in cell. See the <a
+ * Vertical tqalignment of data in cell. See the <a
* href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-valign">
* valign attribute definition </a> in HTML 4.0.
*
@@ -338,7 +338,7 @@ public:
~HTMLTableColElement();
/**
- * Horizontal alignment of cell data in column. See the <a
+ * Horizontal tqalignment of cell data in column. See the <a
* href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-align-TD">
* align attribute definition </a> in HTML 4.0.
*
@@ -364,7 +364,7 @@ public:
void setCh( const DOMString & );
/**
- * Offset of alignment character. See the <a
+ * Offset of tqalignment character. See the <a
* href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-charoff">
* charoff attribute definition </a> in HTML 4.0.
*
@@ -391,7 +391,7 @@ public:
void setSpan( long );
/**
- * Vertical alignment of cell data in column. See the <a
+ * Vertical tqalignment of cell data in column. See the <a
* href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-valign">
* valign attribute definition </a> in HTML 4.0.
*
@@ -790,7 +790,7 @@ public:
void setCells( const HTMLCollection & );
/**
- * Horizontal alignment of data within cells of this row. See the
+ * Horizontal tqalignment of data within cells of this row. See the
* <a
* href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-align-TD">
* align attribute definition </a> in HTML 4.0.
@@ -831,7 +831,7 @@ public:
void setCh( const DOMString & );
/**
- * Offset of alignment character. See the <a
+ * Offset of tqalignment character. See the <a
* href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-charoff">
* charoff attribute definition </a> in HTML 4.0.
*
@@ -844,7 +844,7 @@ public:
void setChOff( const DOMString & );
/**
- * Vertical alignment of data within cells of this row. See the <a
+ * Vertical tqalignment of data within cells of this row. See the <a
* href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-valign">
* valign attribute definition </a> in HTML 4.0.
*
@@ -913,7 +913,7 @@ public:
~HTMLTableSectionElement();
/**
- * Horizontal alignment of data in cells. See the \c align
+ * Horizontal tqalignment of data in cells. See the \c align
* attribute for HTMLTheadElement for details.
*
*/
@@ -938,7 +938,7 @@ public:
void setCh( const DOMString & );
/**
- * Offset of alignment character. See the <a
+ * Offset of tqalignment character. See the <a
* href="http://www.w3.org/TR/REC-html40/struct/tables.html#adef-charoff">
* charoff attribute definition </a> in HTML 4.0.
*
@@ -951,7 +951,7 @@ public:
void setChOff( const DOMString & );
/**
- * Vertical alignment of data in cells. See the \c valign
+ * Vertical tqalignment of data in cells. See the \c valign
* attribute for HTMLTheadElement for details.
*
*/
diff --git a/khtml/ecma/kjs_binding.cpp b/khtml/ecma/kjs_binding.cpp
index 125401ca..4fa87e2c 100644
--- a/khtml/ecma/kjs_binding.cpp
+++ b/khtml/ecma/kjs_binding.cpp
@@ -261,7 +261,7 @@ UString::UString(const TQString &d)
{
unsigned int len = d.length();
UChar *dat = new UChar[len];
- memcpy(dat, d.unicode(), len * sizeof(UChar));
+ memcpy(dat, d.tqunicode(), len * sizeof(UChar));
rep = UString::Rep::create(dat, len);
}
@@ -277,7 +277,7 @@ UString::UString(const DOM::DOMString &d)
unsigned int len = d.length();
UChar *dat = new UChar[len];
- memcpy(dat, d.unicode(), len * sizeof(UChar));
+ memcpy(dat, d.tqunicode(), len * sizeof(UChar));
rep = UString::Rep::create(dat, len);
}
diff --git a/khtml/ecma/kjs_debugwin.cpp b/khtml/ecma/kjs_debugwin.cpp
index c6fac2ab..b3c2a41b 100644
--- a/khtml/ecma/kjs_debugwin.cpp
+++ b/khtml/ecma/kjs_debugwin.cpp
@@ -25,9 +25,9 @@
#include <assert.h>
#include <stdlib.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqpushbutton.h>
-#include <textedit.h>
+#include <tqtextedit.h>
#include <tqlistbox.h>
#include <tqmultilineedit.h>
#include <tqapplication.h>
@@ -107,7 +107,7 @@ void SourceDisplay::setSource(SourceFile *sourceFile)
}
TQString code = sourceFile->getCode();
- const TQChar *chars = code.unicode();
+ const TQChar *chars = code.tqunicode();
uint len = code.length();
TQChar newLine('\n');
TQChar cr('\r');
@@ -182,7 +182,7 @@ void SourceDisplay::showEvent(TQShowEvent *)
void SourceDisplay::drawContents(TQPainter *p, int clipx, int clipy, int clipw, int cliph)
{
if (!m_sourceFile) {
- p->fillRect(clipx,clipy,clipw,cliph,palette().active().base());
+ p->fillRect(clipx,clipy,clipw,cliph,tqpalette().active().base());
return;
}
@@ -207,26 +207,26 @@ void SourceDisplay::drawContents(TQPainter *p, int clipx, int clipy, int clipw,
TQString linenoStr = TQString().sprintf("%d",lineno+1);
- p->fillRect(0,height*lineno,linenoWidth,height,palette().active().mid());
+ p->fillRect(0,height*lineno,linenoWidth,height,tqpalette().active().mid());
- p->setPen(palette().active().text());
+ p->setPen(tqpalette().active().text());
p->drawText(0,height*lineno,linenoWidth,height,Qt::AlignRight,linenoStr);
TQColor bgColor;
TQColor textColor;
if (lineno == m_currentLine) {
- bgColor = palette().active().highlight();
- textColor = palette().active().highlightedText();
+ bgColor = tqpalette().active().highlight();
+ textColor = tqpalette().active().highlightedText();
}
else if (m_debugWin->haveBreakpoint(m_sourceFile,lineno+1,lineno+1)) {
- bgColor = palette().active().text();
- textColor = palette().active().base();
+ bgColor = tqpalette().active().text();
+ textColor = tqpalette().active().base();
p->drawPixmap(2,height*lineno+height/2-m_breakpointIcon.height()/2,m_breakpointIcon);
}
else {
- bgColor = palette().active().base();
- textColor = palette().active().text();
+ bgColor = tqpalette().active().base();
+ textColor = tqpalette().active().text();
}
p->fillRect(linenoWidth,height*lineno,right-linenoWidth,height,bgColor);
@@ -236,10 +236,10 @@ void SourceDisplay::drawContents(TQPainter *p, int clipx, int clipy, int clipw,
}
int remainingTop = height*(lastLine+1);
- p->fillRect(0,remainingTop,linenoWidth,bottom-remainingTop,palette().active().mid());
+ p->fillRect(0,remainingTop,linenoWidth,bottom-remainingTop,tqpalette().active().mid());
p->fillRect(linenoWidth,remainingTop,
- right-linenoWidth,bottom-remainingTop,palette().active().base());
+ right-linenoWidth,bottom-remainingTop,tqpalette().active().base());
}
//-------------------------------------------------------------------------
@@ -548,7 +548,7 @@ void KJSDebugWin::slotToggleBreakpoint(int lineno)
if (m_sourceSel->currentItem() < 0)
return;
- SourceFile *sourceFile = m_sourceSelFiles.at(m_sourceSel->currentItem());
+ SourceFile *sourceFile = m_sourceSelFiles.tqat(m_sourceSel->currentItem());
// Find the source fragment containing the selected line (if any)
int sourceId = -1;
@@ -592,14 +592,14 @@ void KJSDebugWin::slotSourceSelected(int sourceSelIndex)
// A source file has been selected from the drop-down list - display the file
if (sourceSelIndex < 0 || sourceSelIndex >= (int)m_sourceSel->count())
return;
- SourceFile *sourceFile = m_sourceSelFiles.at(sourceSelIndex);
+ SourceFile *sourceFile = m_sourceSelFiles.tqat(sourceSelIndex);
displaySourceFile(sourceFile,true);
// If the currently selected context is in the current source file, then hilight
// the line it's on.
if (m_contextList->currentItem() >= 0) {
Context ctx = m_execs[m_contextList->currentItem()]->context();
- if (m_sourceFragments[ctx.sourceId()]->sourceFile == m_sourceSelFiles.at(sourceSelIndex))
+ if (m_sourceFragments[ctx.sourceId()]->sourceFile == m_sourceSelFiles.tqat(sourceSelIndex))
setSourceLine(ctx.sourceId(),ctx.curStmtFirstLine());
}
}
@@ -614,7 +614,7 @@ void KJSDebugWin::slotEval()
if (m_execStates.isEmpty()) {
if (m_sourceSel->currentItem() < 0)
return;
- SourceFile *sourceFile = m_sourceSelFiles.at(m_sourceSel->currentItem());
+ SourceFile *sourceFile = m_sourceSelFiles.tqat(m_sourceSel->currentItem());
if (!sourceFile->interpreter)
return;
exec = sourceFile->interpreter->globalExec();
@@ -690,7 +690,7 @@ bool KJSDebugWin::eventFilter(TQObject *o, TQEvent *e)
void KJSDebugWin::disableOtherWindows()
{
- TQWidgetList *widgets = TQApplication::allWidgets();
+ TQWidgetList *widgets = TQApplication::tqallWidgets();
TQWidgetListIt it(*widgets);
for (; it.current(); ++it)
it.current()->installEventFilter(this);
@@ -698,7 +698,7 @@ void KJSDebugWin::disableOtherWindows()
void KJSDebugWin::enableOtherWindows()
{
- TQWidgetList *widgets = TQApplication::allWidgets();
+ TQWidgetList *widgets = TQApplication::tqallWidgets();
TQWidgetListIt it(*widgets);
for (; it.current(); ++it)
it.current()->removeEventFilter(this);
@@ -744,7 +744,7 @@ bool KJSDebugWin::sourceParsed(KJS::ExecState *exec, int sourceId,
if (!sourceFile->interpreter)
sourceFile->interpreter = exec->interpreter();
for (index = 0; index < m_sourceSel->count(); index++) {
- if (m_sourceSelFiles.at(index) == sourceFile)
+ if (m_sourceSelFiles.tqat(index) == sourceFile)
break;
}
assert(index < m_sourceSel->count());
@@ -782,7 +782,7 @@ bool KJSDebugWin::sourceUnused(KJS::ExecState *exec, int sourceId)
SourceFile *sourceFile = fragment->sourceFile;
if (sourceFile->hasOneRef()) {
for (int i = 0; i < m_sourceSel->count(); i++) {
- if (m_sourceSelFiles.at(i) == sourceFile) {
+ if (m_sourceSelFiles.tqat(i) == sourceFile) {
m_sourceSel->removeItem(i);
m_sourceSelFiles.remove(i);
break;
@@ -861,7 +861,7 @@ bool KJSDebugWin::exception(ExecState *exec, const Value &value, bool inTryCatch
if (dontShowAgain) {
KConfig *config = kapp->config();
- KConfigGroupSaver saver(config,TQString::fromLatin1("Java/JavaScript Settings"));
+ KConfigGroupSaver saver(config,TQString::tqfromLatin1("Java/JavaScript Settings"));
config->writeEntry("ReportJavaScriptErrors",TQVariant(false,0));
config->sync();
TQByteArray data;
@@ -930,7 +930,7 @@ void KJSDebugWin::setSourceLine(int sourceId, int lineno)
SourceFile *sourceFile = source->sourceFile;
if (m_curSourceFile != source->sourceFile) {
for (int i = 0; i < m_sourceSel->count(); i++)
- if (m_sourceSelFiles.at(i) == sourceFile)
+ if (m_sourceSelFiles.tqat(i) == sourceFile)
m_sourceSel->setCurrentItem(i);
displaySourceFile(sourceFile,false);
}
diff --git a/khtml/ecma/kjs_html.cpp b/khtml/ecma/kjs_html.cpp
index 57762ffd..3fdc35bb 100644
--- a/khtml/ecma/kjs_html.cpp
+++ b/khtml/ecma/kjs_html.cpp
@@ -896,7 +896,7 @@ const ClassInfo* KJS::HTMLElement::classInfo() const
rel KJS::HTMLElement::AnchorRel DontDelete
rev KJS::HTMLElement::AnchorRev DontDelete
search KJS::HTMLElement::AnchorSearch DontDelete
- shape KJS::HTMLElement::AnchorShape DontDelete
+ tqshape KJS::HTMLElement::AnchorShape DontDelete
tabIndex KJS::HTMLElement::AnchorTabIndex DontDelete
target KJS::HTMLElement::AnchorTarget DontDelete
text KJS::HTMLElement::AnchorText DontDelete|ReadOnly
@@ -981,7 +981,7 @@ const ClassInfo* KJS::HTMLElement::classInfo() const
protocol KJS::HTMLElement::AreaProtocol DontDelete|ReadOnly
search KJS::HTMLElement::AreaSearch DontDelete|ReadOnly
noHref KJS::HTMLElement::AreaNoHref DontDelete
- shape KJS::HTMLElement::AreaShape DontDelete
+ tqshape KJS::HTMLElement::AreaShape DontDelete
tabIndex KJS::HTMLElement::AreaTabIndex DontDelete
target KJS::HTMLElement::AreaTarget DontDelete
@end
@@ -1599,7 +1599,7 @@ Value KJS::HTMLElement::getValueProperty(ExecState *exec, int token) const
case AnchorName: return String(anchor.name());
case AnchorRel: return String(anchor.rel());
case AnchorRev: return String(anchor.rev());
- case AnchorShape: return String(anchor.shape());
+ case AnchorShape: return String(anchor.tqshape());
case AnchorTabIndex: return Number(anchor.tabIndex());
case AnchorTarget: return String(anchor.target());
// Not specified in http://msdn.microsoft.com/workshop/author/dhtml/reference/objects/a.asp
@@ -1735,7 +1735,7 @@ Value KJS::HTMLElement::getValueProperty(ExecState *exec, int token) const
}
}
case AreaNoHref: return Boolean(area.noHref());
- case AreaShape: return String(area.shape());
+ case AreaShape: return String(area.tqshape());
case AreaTabIndex: return Number(area.tabIndex());
case AreaTarget: return String(area.target());
}
diff --git a/khtml/ecma/kjs_navigator.cpp b/khtml/ecma/kjs_navigator.cpp
index 32f836ba..637b6a8e 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::fromLatin1("Mozilla")) >= 0 &&
- userAgent.find(TQString::fromLatin1("compatible")) == -1)
+ if (userAgent.find(TQString::tqfromLatin1("Mozilla")) >= 0 &&
+ userAgent.find(TQString::tqfromLatin1("compatible")) == -1)
{
//kdDebug() << "appName -> Mozilla" << endl;
return String("Netscape");
}
- if (userAgent.find(TQString::fromLatin1("Microsoft")) >= 0 ||
- userAgent.find(TQString::fromLatin1("MSIE")) >= 0)
+ if (userAgent.find(TQString::tqfromLatin1("Microsoft")) >= 0 ||
+ userAgent.find(TQString::tqfromLatin1("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::fromLatin1("Mozilla")) >= 0 &&
- userAgent.find(TQString::fromLatin1("compatible")) == -1)
+ if (userAgent.find(TQString::tqfromLatin1("Mozilla")) >= 0 &&
+ userAgent.find(TQString::tqfromLatin1("compatible")) == -1)
{
return String("Gecko");
}
// When spoofing as IE, we use Undefined().
- if (userAgent.find(TQString::fromLatin1("Microsoft")) >= 0 ||
- userAgent.find(TQString::fromLatin1("MSIE")) >= 0)
+ if (userAgent.find(TQString::tqfromLatin1("Microsoft")) >= 0 ||
+ userAgent.find(TQString::tqfromLatin1("MSIE")) >= 0)
{
return Undefined();
}
@@ -223,7 +223,7 @@ Value Navigator::getValueProperty(ExecState *exec, int token) const
case ProductSub:
{
int ix = userAgent.find("Gecko");
- if (ix >= 0 && userAgent.length() >= (uint)ix+14 && userAgent.unicode()[ix+5] == TQChar('/') &&
+ if (ix >= 0 && userAgent.length() >= (uint)ix+14 && userAgent.tqunicode()[ix+5] == TQChar('/') &&
userAgent.find(TQRegExp("\\d{8}"), ix+6) == ix+6)
{
// We have Gecko/<productSub> in the UA string
@@ -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::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"));
+ 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"));
else
{
struct utsname name;
int ret = uname(&name);
if ( ret >= 0 )
- return String(TQString(TQString::fromLatin1("%1 %1 X11").arg(name.sysname).arg(name.machine)));
+ return String(TQString(TQString::tqfromLatin1("%1 %1 X11").arg(name.sysname).arg(name.machine)));
else // can't happen
- return String(TQString(TQString::fromLatin1("Unix X11")));
+ return String(TQString(TQString::tqfromLatin1("Unix X11")));
}
case CpuClass:
{
@@ -394,7 +394,7 @@ Value Plugins::get(ExecState *exec, const Identifier &propertyName) const
bool ok;
unsigned int i = propertyName.toULong(&ok);
if( ok && i<plugins->count() )
- return Value( new Plugin( exec, plugins->at(i) ) );
+ return Value( new Plugin( exec, plugins->tqat(i) ) );
// plugin[name]
Value val = pluginByName( exec, propertyName.qstring() );
@@ -439,7 +439,7 @@ Value PluginsFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
bool ok;
unsigned int i = args[0].toString(exec).toArrayIndex(&ok);
if( ok && i<base->plugins->count() )
- return Value( new Plugin( exec, base->plugins->at(i) ) );
+ return Value( new Plugin( exec, base->plugins->tqat(i) ) );
return Undefined();
}
case Plugins_NamedItem:
@@ -479,7 +479,7 @@ Value MimeTypes::get(ExecState *exec, const Identifier &propertyName) const
bool ok;
unsigned int i = propertyName.toULong(&ok);
if( ok && i<mimes->count() )
- return Value( new MimeType( exec, mimes->at(i) ) );
+ return Value( new MimeType( exec, mimes->tqat(i) ) );
// mimeTypes[name]
Value val = mimeTypeByName( exec, propertyName.qstring() );
@@ -522,7 +522,7 @@ Value MimeTypesFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
bool ok;
unsigned int i = args[0].toString(exec).toArrayIndex(&ok);
if( ok && i<base->mimes->count() )
- return Value( new MimeType( exec, base->mimes->at(i) ) );
+ return Value( new MimeType( exec, base->mimes->tqat(i) ) );
return Undefined();
}
case MimeTypes_NamedItem:
@@ -562,8 +562,8 @@ Value Plugin::get(ExecState *exec, const Identifier &propertyName) const
//kdDebug(6070) << "Plugin::get plugin[" << i << "]" << endl;
if( ok && i<m_info->mimes.count() )
{
- //kdDebug(6070) << "returning mimetype " << m_info->mimes.at(i)->type << endl;
- return Value(new MimeType(exec, m_info->mimes.at(i)));
+ //kdDebug(6070) << "returning mimetype " << m_info->mimes.tqat(i)->type << endl;
+ return Value(new MimeType(exec, m_info->mimes.tqat(i)));
}
// plugin["name"]
@@ -609,7 +609,7 @@ Value PluginFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
bool ok;
unsigned int i = args[0].toString(exec).toArrayIndex(&ok);
if( ok && i< plugin->pluginInfo()->mimes.count() )
- return Value( new MimeType( exec, plugin->pluginInfo()->mimes.at(i) ) );
+ return Value( new MimeType( exec, plugin->pluginInfo()->mimes.tqat(i) ) );
return Undefined();
}
case Plugin_NamedItem:
diff --git a/khtml/ecma/kjs_proxy.cpp b/khtml/ecma/kjs_proxy.cpp
index ca26c5a0..2469ac68 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::fromLatin1("Microsoft")) >= 0 ||
- userAgent.find(TQString::fromLatin1("MSIE")) >= 0)
+ if (userAgent.find(TQString::tqfromLatin1("Microsoft")) >= 0 ||
+ userAgent.find(TQString::tqfromLatin1("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::fromLatin1("Mozilla")) >= 0 &&
- userAgent.find(TQString::fromLatin1("compatible")) == -1 &&
- userAgent.find(TQString::fromLatin1("KHTML")) == -1)
+ if (userAgent.find(TQString::tqfromLatin1("Mozilla")) >= 0 &&
+ userAgent.find(TQString::tqfromLatin1("compatible")) == -1 &&
+ userAgent.find(TQString::tqfromLatin1("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 47d5ac81..bed6b83c 100644
--- a/khtml/ecma/kjs_window.cpp
+++ b/khtml/ecma/kjs_window.cpp
@@ -31,7 +31,7 @@
#include "html/html_documentimpl.h"
#include "rendering/render_frames.h"
-#include <stylesheet.h>
+#include <tqstylesheet.h>
#include <tqtimer.h>
#include <tqpaintdevicemetrics.h>
#include <tqapplication.h>
@@ -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()->topLevelWidget()->winId());
+ KWin::WindowInfo inf = KWin::windowInfo(part->widget()->tqtopLevelWidget()->winId());
return Number(entry->value == OuterHeight ?
inf.geometry().height() : inf.geometry().width());
#else
@@ -1013,7 +1013,7 @@ Value Window::get(ExecState *exec, const Identifier &p) const
TQPtrList<KParts::ReadOnlyPart> frames = part->frames();
unsigned int len = frames.count();
if (i < len) {
- KParts::ReadOnlyPart* frame = frames.at(i);
+ KParts::ReadOnlyPart* frame = frames.tqat(i);
if (frame)
return Window::retrieve(frame);
}
@@ -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::fromLatin1("javascript:"), 0, false) != 0 )
+ dstUrl.find(TQString::tqfromLatin1("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->topLevelWidget());
+ TQRect screen = KGlobalSettings::desktopGeometry(widget->tqtopLevelWidget());
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().pixelMetric( TQStyle::PM_DefaultFrameWidth ) + 2;
+ winargs.height = (int)val.toFloat() + 2*tqApp->tqstyle().tqpixelMetric( 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().pixelMetric( TQStyle::PM_DefaultFrameWidth ) + 2;
+ winargs.width = (int)val.toFloat() + 2*tqApp->tqstyle().tqpixelMetric( 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->topLevelWidget()->raise();
- KWin::deIconifyWindow( widget->topLevelWidget()->winId() );
+ widget->tqtopLevelWidget()->raise();
+ KWin::deIconifyWindow( widget->tqtopLevelWidget()->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->topLevelWidget();
+ TQWidget * tl = widget->tqtopLevelWidget();
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->topLevelWidget();
+ TQWidget * tl = widget->tqtopLevelWidget();
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->topLevelWidget();
+ TQWidget * tl = widget->tqtopLevelWidget();
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->topLevelWidget();
+ TQWidget * tl = widget->tqtopLevelWidget();
window->resizeTo( tl, args[0].toInt32(exec), args[1].toInt32(exec) );
}
return Undefined();
@@ -2412,7 +2412,7 @@ Value FrameArray::get(ExecState *exec, const Identifier &p) const
bool ok;
unsigned int i = p.toArrayIndex(&ok);
if (ok && i < len)
- frame = frames.at(i);
+ frame = frames.tqat(i);
}
// we are potentially fetching a reference to a another Window object here.
@@ -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::fromLatin1("") );
+ return String( url.port() ? TQString::number((int)url.port()) : TQString::tqfromLatin1("") );
case Protocol:
return String( url.protocol()+":" );
case Search:
diff --git a/khtml/ecma/xmlhttprequest.cpp b/khtml/ecma/xmlhttprequest.cpp
index 08ba0751..7b88477f 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::fromLatin1(BANNED_HTTP_HEADERS));
+ TQString::tqfromLatin1(BANNED_HTTP_HEADERS));
if (bannedHeaders.contains(name))
return; // Denied
diff --git a/khtml/html/html_documentimpl.cpp b/khtml/html/html_documentimpl.cpp
index e2ee3ba5..a5c78657 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->topLevelWidget() )
- windowId = v->topLevelWidget()->winId();
+ if ( v && v->tqtopLevelWidget() )
+ windowId = v->tqtopLevelWidget()->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->topLevelWidget() )
- windowId = v->topLevelWidget()->winId();
+ if ( v && v->tqtopLevelWidget() )
+ windowId = v->tqtopLevelWidget()->winId();
TQByteArray params;
TQDataStream stream(params, IO_WriteOnly);
@@ -226,7 +226,7 @@ void HTMLDocumentImpl::slotHistoryChanged()
return;
recalcStyle( Force );
- m_render->repaint();
+ m_render->tqrepaint();
}
HTMLMapElementImpl* HTMLDocumentImpl::getMap(const DOMString& _url)
@@ -235,7 +235,7 @@ HTMLMapElementImpl* HTMLDocumentImpl::getMap(const DOMString& _url)
TQString s;
int pos = url.find('#');
//kdDebug(0) << "map pos of #:" << pos << endl;
- s = TQString(_url.unicode() + pos + 1, _url.length() - pos - 1);
+ s = TQString(_url.tqunicode() + pos + 1, _url.length() - pos - 1);
TQMapConstIterator<TQString,HTMLMapElementImpl*> it = mapMap.find(s);
diff --git a/khtml/html/html_elementimpl.cpp b/khtml/html/html_elementimpl.cpp
index f635fcc3..736b5a3b 100644
--- a/khtml/html/html_elementimpl.cpp
+++ b/khtml/html/html_elementimpl.cpp
@@ -176,7 +176,7 @@ void HTMLElementImpl::parseAttribute(AttributeImpl *attr)
case ATTR_CLASS:
if (attr->val()) {
DOMString v = attr->value();
- const TQChar* s = v.unicode();
+ const TQChar* s = v.tqunicode();
int l = v.length();
while( l && !s->isSpace() )
l--,s++;
@@ -354,11 +354,11 @@ static inline bool isHexDigit( const TQChar &c ) {
static inline int toHex( const TQChar &c ) {
return ( (c >= TQChar('0') && c <= TQChar('9'))
- ? (c.unicode() - '0')
+ ? (c.tqunicode() - '0')
: ( ( c >= TQChar('a') && c <= TQChar('f') )
- ? (c.unicode() - 'a' + 10)
+ ? (c.tqunicode() - 'a' + 10)
: ( ( c >= TQChar('A') && c <= TQChar('F') )
- ? (c.unicode() - 'A' + 10)
+ ? (c.tqunicode() - 'A' + 10)
: -1 ) ) );
}
@@ -457,7 +457,7 @@ DOMString HTMLElementImpl::innerHTML() const
TQString result; //Use TQString to accumulate since DOMString is poor for appends
for (NodeImpl *child = firstChild(); child != NULL; child = child->nextSibling()) {
DOMString kid = child->toString();
- result += TQConstString(kid.unicode(), kid.length()).string();
+ result += TQConstString(kid.tqunicode(), kid.length()).string();
}
return result;
}
@@ -620,32 +620,32 @@ void HTMLElementImpl::setInnerText( const DOMString &text, int& exceptioncode )
appendChild( t, exceptioncode );
}
-void HTMLElementImpl::addHTMLAlignment( DOMString alignment )
+void HTMLElementImpl::addHTMLAlignment( DOMString tqalignment )
{
- //qDebug("alignment is %s", alignment.string().latin1() );
- // vertical alignment with respect to the current baseline of the text
+ //qDebug("tqalignment is %s", tqalignment.string().latin1() );
+ // vertical tqalignment with respect to the current baseline of the text
// right or left means floating images
int propfloat = -1;
int propvalign = -1;
- if ( strcasecmp( alignment, "absmiddle" ) == 0 ) {
+ if ( strcasecmp( tqalignment, "absmiddle" ) == 0 ) {
propvalign = CSS_VAL_MIDDLE;
- } else if ( strcasecmp( alignment, "absbottom" ) == 0 ) {
+ } else if ( strcasecmp( tqalignment, "absbottom" ) == 0 ) {
propvalign = CSS_VAL_BOTTOM;
- } else if ( strcasecmp( alignment, "left" ) == 0 ) {
+ } else if ( strcasecmp( tqalignment, "left" ) == 0 ) {
propfloat = CSS_VAL_LEFT;
propvalign = CSS_VAL_TOP;
- } else if ( strcasecmp( alignment, "right" ) == 0 ) {
+ } else if ( strcasecmp( tqalignment, "right" ) == 0 ) {
propfloat = CSS_VAL_RIGHT;
propvalign = CSS_VAL_TOP;
- } else if ( strcasecmp( alignment, "top" ) == 0 ) {
+ } else if ( strcasecmp( tqalignment, "top" ) == 0 ) {
propvalign = CSS_VAL_TOP;
- } else if ( strcasecmp( alignment, "middle" ) == 0 ) {
+ } else if ( strcasecmp( tqalignment, "middle" ) == 0 ) {
propvalign = CSS_VAL__KHTML_BASELINE_MIDDLE;
- } else if ( strcasecmp( alignment, "center" ) == 0 ) {
+ } else if ( strcasecmp( tqalignment, "center" ) == 0 ) {
propvalign = CSS_VAL_MIDDLE;
- } else if ( strcasecmp( alignment, "bottom" ) == 0 ) {
+ } else if ( strcasecmp( tqalignment, "bottom" ) == 0 ) {
propvalign = CSS_VAL_BASELINE;
- } else if ( strcasecmp ( alignment, "texttop") == 0 ) {
+ } else if ( strcasecmp ( tqalignment, "texttop") == 0 ) {
propvalign = CSS_VAL_TEXT_TOP;
}
diff --git a/khtml/html/html_elementimpl.h b/khtml/html/html_elementimpl.h
index f71ae9b2..83836f15 100644
--- a/khtml/html/html_elementimpl.h
+++ b/khtml/html/html_elementimpl.h
@@ -68,7 +68,7 @@ public:
protected:
// for IMG, OBJECT and APPLET
- void addHTMLAlignment( DOMString alignment );
+ void addHTMLAlignment( DOMString tqalignment );
};
class HTMLGenericElementImpl : public HTMLElementImpl
diff --git a/khtml/html/html_formimpl.cpp b/khtml/html/html_formimpl.cpp
index b456d520..1512395e 100644
--- a/khtml/html/html_formimpl.cpp
+++ b/khtml/html/html_formimpl.cpp
@@ -60,7 +60,7 @@
#include <kfileitem.h>
#include <tqfile.h>
#include <tqdir.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
// for keygen
#include <tqstring.h>
@@ -193,7 +193,7 @@ inline static TQString escapeUnencodeable(const TQTextCodec* codec, const TQStri
enc_string.append(c);
else {
TQString ampersandEscape;
- ampersandEscape.sprintf("&#%u;", c.unicode());
+ ampersandEscape.sprintf("&#%u;", c.tqunicode());
enc_string.append(ampersandEscape);
}
}
@@ -1322,10 +1322,10 @@ TQString HTMLInputElementImpl::state( )
{
switch (m_type) {
case PASSWORD:
- return TQString::fromLatin1("."); // empty string, avoid restoring
+ return TQString::tqfromLatin1("."); // empty string, avoid restoring
case CHECKBOX:
case RADIO:
- return TQString::fromLatin1(checked() ? "on" : "off");
+ return TQString::tqfromLatin1(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::fromLatin1("on")));
+ setChecked((state == TQString::tqfromLatin1("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::fromLatin1("x") : nme + ".x");
+ TQString astr(nme.isEmpty() ? TQString::tqfromLatin1("x") : nme + ".x");
encoding += fixUpfromUnicode(codec, astr);
astr.setNum(KMAX( clickX(), 0 ));
encoding += fixUpfromUnicode(codec, astr);
- astr = nme.isEmpty() ? TQString::fromLatin1("y") : nme + ".y";
+ astr = nme.isEmpty() ? TQString::tqfromLatin1("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()->topLevelWidget();
+ TQWidget* const toplevel = static_cast<RenderSubmitButton*>(m_render)->widget()->tqtopLevelWidget();
if (multipart) {
TQCString filearray( "" );
if ( KIO::NetAccess::stat(fileurl, filestat, toplevel)) {
@@ -2761,8 +2761,8 @@ static TQString expandLF(const TQString& s)
unsigned pos2 = 0;
for(unsigned pos = 0; pos < len; pos++)
{
- TQChar c = s.at(pos);
- switch(c.unicode())
+ TQChar c = s.tqat(pos);
+ switch(c.tqunicode())
{
case '\n':
r[pos2++] = '\r';
diff --git a/khtml/html/html_imageimpl.cpp b/khtml/html/html_imageimpl.cpp
index be13e93c..9ced3bf1 100644
--- a/khtml/html/html_imageimpl.cpp
+++ b/khtml/html/html_imageimpl.cpp
@@ -418,8 +418,8 @@ void HTMLMapElementImpl::parseAttribute(AttributeImpl *attr)
case ATTR_NAME:
{
DOMString s = attr->value();
- if(*s.unicode() == '#')
- name = TQString(s.unicode()+1, s.length()-1).lower();
+ if(*s.tqunicode() == '#')
+ name = TQString(s.tqunicode()+1, s.length()-1).lower();
else
name = s.string().lower();
// ### make this work for XML documents, e.g. in case of <html:map...>
@@ -441,7 +441,7 @@ HTMLAreaElementImpl::HTMLAreaElementImpl(DocumentImpl *doc)
m_coords=0;
m_coordsLen = 0;
nohref = false;
- shape = Unknown;
+ tqshape = Unknown;
lasth = lastw = -1;
}
@@ -461,13 +461,13 @@ void HTMLAreaElementImpl::parseAttribute(AttributeImpl *attr)
{
case ATTR_SHAPE:
if ( strcasecmp( attr->value(), "default" ) == 0 )
- shape = Default;
+ tqshape = Default;
else if ( strcasecmp( attr->value(), "circle" ) == 0 )
- shape = Circle;
+ tqshape = Circle;
else if ( strcasecmp( attr->value(), "poly" ) == 0 || strcasecmp( attr->value(), "polygon" ) == 0 )
- shape = Poly;
+ tqshape = Poly;
else if ( strcasecmp( attr->value(), "rect" ) == 0 )
- shape = Rect;
+ tqshape = Rect;
break;
case ATTR_COORDS:
delete [] m_coords;
@@ -530,7 +530,7 @@ TQRegion HTMLAreaElementImpl::getRegion(int width_, int height_) const
// what the HTML author tried to tell us.
// a Poly needs at least 3 points (6 coords), so this is correct
- if ((shape==Poly || shape==Unknown) && m_coordsLen > 5) {
+ if ((tqshape==Poly || tqshape==Unknown) && m_coordsLen > 5) {
// make sure its even
int len = m_coordsLen >> 1;
TQPointArray points(len);
@@ -539,19 +539,19 @@ TQRegion HTMLAreaElementImpl::getRegion(int width_, int height_) const
m_coords[(i<<1)+1].minWidth(height_));
region = TQRegion(points);
}
- else if (shape==Circle && m_coordsLen>=3 || shape==Unknown && m_coordsLen == 3) {
+ else if (tqshape==Circle && m_coordsLen>=3 || tqshape==Unknown && m_coordsLen == 3) {
int r = kMin(m_coords[2].minWidth(width_), m_coords[2].minWidth(height_));
region = TQRegion(m_coords[0].minWidth(width_)-r,
m_coords[1].minWidth(height_)-r, 2*r, 2*r,TQRegion::Ellipse);
}
- else if (shape==Rect && m_coordsLen>=4 || shape==Unknown && m_coordsLen == 4) {
+ else if (tqshape==Rect && m_coordsLen>=4 || tqshape==Unknown && m_coordsLen == 4) {
int x0 = m_coords[0].minWidth(width_);
int y0 = m_coords[1].minWidth(height_);
int x1 = m_coords[2].minWidth(width_);
int y1 = m_coords[3].minWidth(height_);
region = TQRegion(x0,y0,x1-x0,y1-y0);
}
- else if (shape==Default)
+ else if (tqshape==Default)
region = TQRegion(0,0,width_,height_);
// else
// return null region
diff --git a/khtml/html/html_imageimpl.h b/khtml/html/html_imageimpl.h
index 6f26cd2d..1a389e89 100644
--- a/khtml/html/html_imageimpl.h
+++ b/khtml/html/html_imageimpl.h
@@ -102,7 +102,7 @@ public:
virtual void parseAttribute(AttributeImpl *attr);
- bool isDefault() const { return shape==Default; }
+ bool isDefault() const { return tqshape==Default; }
bool mapMouseEvent(int x_, int y_, int width_, int height_,
khtml::RenderObject::NodeInfo& info);
@@ -117,7 +117,7 @@ protected:
khtml::Length* m_coords;
int m_coordsLen;
int lastw, lasth;
- Shape shape : 3;
+ Shape tqshape : 3;
bool nohref : 1;
};
diff --git a/khtml/html/html_miscimpl.cpp b/khtml/html/html_miscimpl.cpp
index 58804bff..d5e81202 100644
--- a/khtml/html/html_miscimpl.cpp
+++ b/khtml/html/html_miscimpl.cpp
@@ -328,14 +328,14 @@ NodeImpl *HTMLFormCollectionImpl::item( unsigned long index ) const
TQPtrList<HTMLGenericFormElementImpl>& l = static_cast<HTMLFormElementImpl*>( m_refNode )->formElements;
for (unsigned i = strt; i < l.count(); i++)
{
- if (l.at( i )->isEnumeratable())
+ if (l.tqat( i )->isEnumeratable())
{
if (dist == 0)
{
//Found it!
m_cache->position = index;
m_cache->current.index = i;
- return l.at( i );
+ return l.tqat( i );
}
else
--dist;
@@ -349,7 +349,7 @@ unsigned long HTMLFormCollectionImpl::calcLength(NodeImpl *start) const
unsigned length = 0;
TQPtrList<HTMLGenericFormElementImpl> l = static_cast<HTMLFormElementImpl*>( start )->formElements;
for ( unsigned i = 0; i < l.count(); i++ )
- if ( l.at( i )->isEnumeratable() )
+ if ( l.tqat( i )->isEnumeratable() )
++length;
return length;
}
@@ -369,7 +369,7 @@ NodeImpl *HTMLFormCollectionImpl::nextNamedItem( const DOMString &name ) const
//Go through the list, trying to find the appropriate named form element.
for ( ; currentNamePos < l.count(); ++currentNamePos )
{
- HTMLGenericFormElementImpl* el = l.at(currentNamePos);
+ HTMLGenericFormElementImpl* el = l.tqat(currentNamePos);
if (el->isEnumeratable() &&
((el->getAttribute(ATTR_ID) == name) ||
(el->getAttribute(ATTR_NAME) == name)))
@@ -387,7 +387,7 @@ NodeImpl *HTMLFormCollectionImpl::nextNamedItem( const DOMString &name ) const
TQPtrList<HTMLImageElementImpl>& il = static_cast<HTMLFormElementImpl*>( m_refNode )->imgElements;
for ( ; currentNameImgPos < il.count(); ++currentNameImgPos )
{
- HTMLImageElementImpl* el = il.at(currentNameImgPos);
+ HTMLImageElementImpl* el = il.tqat(currentNameImgPos);
if ((el->getAttribute(ATTR_ID) == name) ||
(el->getAttribute(ATTR_NAME) == name))
{
diff --git a/khtml/html/htmltokenizer.cpp b/khtml/html/htmltokenizer.cpp
index 5da6edd1..0b9b5f34 100644
--- a/khtml/html/htmltokenizer.cpp
+++ b/khtml/html/htmltokenizer.cpp
@@ -89,7 +89,7 @@ static const char titleEnd [] = "</title";
#define fixUpChar(x)
#else
#define fixUpChar(x) \
- switch ((x).unicode()) \
+ switch ((x).tqunicode()) \
{ \
case 0x80: (x) = 0x20ac; break; \
case 0x82: (x) = 0x201a; break; \
@@ -471,7 +471,7 @@ void HTMLTokenizer::parseComment(TokenizerString &src)
if (strict)
{
- if (src->unicode() == '-') {
+ if (src->tqunicode() == '-') {
delimiterCount++;
if (delimiterCount == 2) {
delimiterCount = 0;
@@ -482,7 +482,7 @@ void HTMLTokenizer::parseComment(TokenizerString &src)
delimiterCount = 0;
}
- if ((!strict || canClose) && src->unicode() == '>')
+ if ((!strict || canClose) && src->tqunicode() == '>')
{
bool handleBrokenComments = brokenComments && !( script || style );
bool scriptEnd=false;
@@ -521,7 +521,7 @@ void HTMLTokenizer::parseServer(TokenizerString &src)
checkScriptBuffer(src.length());
while ( !src.isEmpty() ) {
scriptCode[ scriptCodeSize++ ] = *src;
- if (src->unicode() == '>' &&
+ if (src->tqunicode() == '>' &&
scriptCodeSize > 1 && scriptCode[scriptCodeSize-2] == '%') {
++src;
server = false;
@@ -607,7 +607,7 @@ void HTMLTokenizer::parseEntity(TokenizerString &src, TQChar *&dest, bool start)
while( !src.isEmpty() )
{
- ushort cc = src->unicode();
+ ushort cc = src->tqunicode();
switch(Entity) {
case NoEntity:
return;
@@ -639,7 +639,7 @@ void HTMLTokenizer::parseEntity(TokenizerString &src, TQChar *&dest, bool start)
case Hexadecimal:
{
- int uc = EntityChar.unicode();
+ int uc = EntityChar.tqunicode();
int ll = kMin<uint>(src.length(), 8);
while(ll--) {
TQChar csrc(src->lower());
@@ -658,7 +658,7 @@ void HTMLTokenizer::parseEntity(TokenizerString &src, TQChar *&dest, bool start)
}
case Decimal:
{
- int uc = EntityChar.unicode();
+ int uc = EntityChar.tqunicode();
int ll = kMin(src.length(), 9-cBufferPos);
while(ll--) {
cc = src->cell();
@@ -718,7 +718,7 @@ void HTMLTokenizer::parseEntity(TokenizerString &src, TQChar *&dest, bool start)
}
case SearchSemicolon:
#ifdef TOKEN_DEBUG
- kdDebug( 6036 ) << "ENTITY " << EntityChar.unicode() << endl;
+ kdDebug( 6036 ) << "ENTITY " << EntityChar.tqunicode() << endl;
#endif
fixUpChar(EntityChar);
@@ -919,7 +919,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src)
a = khtml::getAttrID(cBuffer, cBufferPos-1);
}
if (!a)
- attrName = TQString::fromLatin1(TQCString(cBuffer, cBufferPos+1).data());
+ attrName = TQString::tqfromLatin1(TQCString(cBuffer, cBufferPos+1).data());
}
dest = buffer;
@@ -941,7 +941,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src)
}
if ( cBufferPos == CBUFLEN ) {
cBuffer[cBufferPos] = '\0';
- attrName = TQString::fromLatin1(TQCString(cBuffer, cBufferPos+1).data());
+ attrName = TQString::tqfromLatin1(TQCString(cBuffer, cBufferPos+1).data());
dest = buffer;
*dest++ = 0;
tag = SearchEqual;
@@ -956,7 +956,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src)
ushort curchar;
bool atespace = false;
while(!src.isEmpty()) {
- curchar = src->unicode();
+ curchar = src->tqunicode();
if(curchar > ' ') {
if(curchar == '=') {
#ifdef TOKEN_DEBUG
@@ -988,7 +988,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src)
{
ushort curchar;
while(!src.isEmpty()) {
- curchar = src->unicode();
+ curchar = src->tqunicode();
if(curchar > ' ') {
if(( curchar == '\'' || curchar == '\"' )) {
tquote = curchar == '\"' ? DoubleQuote : SingleQuote;
@@ -1012,7 +1012,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src)
while(!src.isEmpty()) {
checkBuffer();
- curchar = src->unicode();
+ curchar = src->tqunicode();
if(curchar <= '\'' && !src.escaped()) {
// ### attributes like '&{blaa....};' are supposed to be treated as jscript.
if ( curchar == '&' )
@@ -1050,7 +1050,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src)
ushort curchar;
while(!src.isEmpty()) {
checkBuffer();
- curchar = src->unicode();
+ curchar = src->tqunicode();
if(curchar <= '>' && !src.escaped()) {
// parse Entities
if ( curchar == '&' )
@@ -1351,7 +1351,7 @@ void HTMLTokenizer::write( const TokenizerString &str, bool appendData )
// do we need to enlarge the buffer?
checkBuffer();
- ushort cc = src->unicode();
+ ushort cc = src->tqunicode();
if (skipLF && (cc != '\n'))
skipLF = false;
diff --git a/khtml/html/htmltokenizer.h b/khtml/html/htmltokenizer.h
index 8e36353b..2197a508 100644
--- a/khtml/html/htmltokenizer.h
+++ b/khtml/html/htmltokenizer.h
@@ -76,8 +76,8 @@ namespace khtml {
{
DOMStringImpl *value = 0;
NodeImpl::Id tid = 0;
- if(buffer->unicode()) {
- tid = buffer->unicode();
+ if(buffer->tqunicode()) {
+ tid = buffer->tqunicode();
value = v.implementation();
}
else if ( !attrName.isEmpty() && attrName != "/" ) {
diff --git a/khtml/java/kjavaappletcontext.cpp b/khtml/java/kjavaappletcontext.cpp
index 76914a5d..776eb8a6 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::fromLatin1("showstatus")
+ if ( cmd == TQString::tqfromLatin1("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::fromLatin1( "showurlinframe" )
+ else if ( cmd == TQString::tqfromLatin1( "showurlinframe" )
&& arg.count() > 1 )
{
kdDebug(6100) << "url = " << arg[0] << ", frame = " << arg[1] << endl;
emit showDocument( arg[0], arg[1] );
}
- else if ( cmd == TQString::fromLatin1( "showdocument" )
+ else if ( cmd == TQString::tqfromLatin1( "showdocument" )
&& !arg.empty() )
{
kdDebug(6100) << "url = " << arg.first() << endl;
emit showDocument( arg.first(), "_top" );
}
- else if ( cmd == TQString::fromLatin1( "resizeapplet" )
+ else if ( cmd == TQString::tqfromLatin1( "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::fromLatin1("audioclip_"))) {
+ else if (cmd.startsWith(TQString::tqfromLatin1("audioclip_"))) {
kdDebug(DEBUGAREA) << "process Audio command (not yet implemented): " << cmd << " " << arg[0] << endl;
}
- else if ( cmd == TQString::fromLatin1( "JS_Event" )
+ else if ( cmd == TQString::tqfromLatin1( "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::fromLatin1( "AppletStateNotification" ) )
+ else if ( cmd == TQString::tqfromLatin1( "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::fromLatin1( "AppletFailed" ) ) {
+ else if ( cmd == TQString::tqfromLatin1( "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 4852a547..4eab5697 100644
--- a/khtml/java/kjavaappletserver.cpp
+++ b/khtml/java/kjavaappletserver.cpp
@@ -48,7 +48,7 @@
#include <tqlabel.h>
#include <tqdialog.h>
#include <tqpushbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqregexp.h>
#include <stdlib.h>
@@ -531,19 +531,19 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb )
switch( cmd_code )
{
case KJAS_SHOW_DOCUMENT:
- cmd = TQString::fromLatin1( "showdocument" );
+ cmd = TQString::tqfromLatin1( "showdocument" );
break;
case KJAS_SHOW_URLINFRAME:
- cmd = TQString::fromLatin1( "showurlinframe" );
+ cmd = TQString::tqfromLatin1( "showurlinframe" );
break;
case KJAS_SHOW_STATUS:
- cmd = TQString::fromLatin1( "showstatus" );
+ cmd = TQString::tqfromLatin1( "showstatus" );
break;
case KJAS_RESIZE_APPLET:
- cmd = TQString::fromLatin1( "resizeapplet" );
+ cmd = TQString::tqfromLatin1( "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::fromLatin1( "JS_Event" );
+ cmd = TQString::tqfromLatin1( "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::fromLatin1( "audioclip_play" );
+ cmd = TQString::tqfromLatin1( "audioclip_play" );
kdDebug(6100) << "Audio Play: url=" << args[0] << endl;
break;
case KJAS_AUDIOCLIP_LOOP:
- cmd = TQString::fromLatin1( "audioclip_loop" );
+ cmd = TQString::tqfromLatin1( "audioclip_loop" );
kdDebug(6100) << "Audio Loop: url=" << args[0] << endl;
break;
case KJAS_AUDIOCLIP_STOP:
- cmd = TQString::fromLatin1( "audioclip_stop" );
+ cmd = TQString::tqfromLatin1( "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::fromLatin1( "AppletStateNotification" );
+ cmd = TQString::tqfromLatin1( "AppletStateNotification" );
break;
case KJAS_APPLET_FAILED:
kdDebug(6100) << "Applet " << args[0] << " Failed: " << args[1] << endl;
- cmd = TQString::fromLatin1( "AppletFailed" );
+ cmd = TQString::tqfromLatin1( "AppletFailed" );
break;
case KJAS_SECURITY_CONFIRM: {
if (KSSL::doesSSLWork() && !d->kssl)
diff --git a/khtml/java/kjavaappletviewer.cpp b/khtml/java/kjavaappletviewer.cpp
index e17e7011..9071fa5d 100644
--- a/khtml/java/kjavaappletviewer.cpp
+++ b/khtml/java/kjavaappletviewer.cpp
@@ -234,7 +234,7 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *,
if (equalPos > 0) {
const TQString name = (*it).left (equalPos).upper ();
TQString value = (*it).right ((*it).length () - equalPos - 1);
- if (value.at(0)=='\"')
+ if (value.tqat(0)=='\"')
value = value.right (value.length () - 1);
if (value.at (value.length () - 1) == '\"')
value.truncate (value.length () - 1);
@@ -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::fromLatin1("codebase") ||
- name_lower == TQString::fromLatin1("java_codebase")) {
+ else if (name_lower == TQString::tqfromLatin1("codebase") ||
+ name_lower == TQString::tqfromLatin1("java_codebase")) {
if (!value.isEmpty ())
codebase = value;
} else if (name == "__KHTML__CLASSID")
- //else if (name.lower()==TQString::fromLatin1("classid"))
+ //else if (name.lower()==TQString::tqfromLatin1("classid"))
classid = value;
- else if (name_lower == TQString::fromLatin1("code") ||
- name_lower == TQString::fromLatin1("java_code"))
+ else if (name_lower == TQString::tqfromLatin1("code") ||
+ name_lower == TQString::tqfromLatin1("java_code"))
classname = value;
- else if (name_lower == TQString::fromLatin1("src"))
+ else if (name_lower == TQString::tqfromLatin1("src"))
src_param = value;
- else if (name_lower == TQString::fromLatin1("archive") ||
- name_lower == TQString::fromLatin1("java_archive") ||
+ else if (name_lower == TQString::tqfromLatin1("archive") ||
+ name_lower == TQString::tqfromLatin1("java_archive") ||
name_lower.startsWith ("cache_archive"))
applet->setArchives (value);
- else if (name_lower == TQString::fromLatin1("name"))
+ else if (name_lower == TQString::tqfromLatin1("name"))
applet->setAppletName (value);
- else if (name_lower == TQString::fromLatin1("width"))
+ else if (name_lower == TQString::tqfromLatin1("width"))
width = value.toInt();
- else if (name_lower == TQString::fromLatin1("height"))
+ else if (name_lower == TQString::tqfromLatin1("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->topLevelWidget()->winId();
+ stream << info << m_view->tqtopLevelWidget()->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->topLevelWidget ()->installEventFilter (this);
+ wparent->tqtopLevelWidget ()->installEventFilter (this);
setInstance (KJavaAppletViewerFactory::instance ());
KParts::Part::setWidget (m_view);
diff --git a/khtml/java/kjavaprocess.cpp b/khtml/java/kjavaprocess.cpp
index 6156b5df..c86b922d 100644
--- a/khtml/java/kjavaprocess.cpp
+++ b/khtml/java/kjavaprocess.cpp
@@ -24,7 +24,7 @@
#include <kdebug.h>
#include <kio/kprotocolmanager.h>
-#include <textstream.h>
+#include <tqtextstream.h>
#include <tqmap.h>
#include <config.h>
@@ -168,7 +168,7 @@ void KJavaProcess::storeSize( TQByteArray* buff )
const char* size_ptr = size_str.latin1();
for( int i = 0; i < 8; ++i )
- buff->at(i) = size_ptr[i];
+ buff->tqat(i) = size_ptr[i];
}
void KJavaProcess::sendBuffer( TQByteArray* buff )
@@ -218,12 +218,12 @@ void KJavaProcess::popBuffer()
// kdDebug(6100) << "Sending buffer to java, buffer = >>";
// for( unsigned int i = 0; i < buf->size(); i++ )
// {
-// if( buf->at(i) == (char)0 )
+// if( buf->tqat(i) == (char)0 )
// kdDebug(6100) << "<SEP>";
-// else if( buf->at(i) > 0 && buf->at(i) < 10 )
-// kdDebug(6100) << "<CMD " << (int) buf->at(i) << ">";
+// else if( buf->tqat(i) > 0 && buf->tqat(i) < 10 )
+// kdDebug(6100) << "<CMD " << (int) buf->tqat(i) << ">";
// else
-// kdDebug(6100) << buf->at(i);
+// kdDebug(6100) << buf->tqat(i);
// }
// kdDebug(6100) << "<<" << endl;
diff --git a/khtml/khtml_caret.cpp b/khtml/khtml_caret.cpp
index 9b819ee6..0946685c 100644
--- a/khtml/khtml_caret.cpp
+++ b/khtml/khtml_caret.cpp
@@ -775,7 +775,7 @@ void CaretBoxLine::addCreatedFlowBoxInside(InlineFlowBox *flowBox, const TQFontM
caret_boxes.append(caretBox);
// afaik an inner flow box can only have the width 0, therefore we don't
- // have to care for rtl or alignment
+ // have to care for rtl or tqalignment
// ### can empty inline elements have a width? css 2 spec isn't verbose about it
caretBox->_y += flowBox->baseline() - fm.ascent();
@@ -1749,7 +1749,7 @@ void EditableCharacterIterator::initFirstChar()
if (_offset == box->maxOffset())
peekNext();
else if (b && !box->isOutside() && b->isInlineTextBox())
- _char = static_cast<RenderText *>(b->object())->str->s[_offset].unicode();
+ _char = static_cast<RenderText *>(b->object())->str->s[_offset].tqunicode();
else
_char = -1;
}
@@ -1849,7 +1849,7 @@ kdDebug(6200) << "_offset " << _offset << endl;
readchar:
// get character
if (b && !box->isOutside() && b->isInlineTextBox() && _offset < b->maxOffset())
- _char = static_cast<RenderText *>(b->object())->str->s[_offset].unicode();
+ _char = static_cast<RenderText *>(b->object())->str->s[_offset].tqunicode();
else
_char = -1;
}/*end if*/
@@ -1887,7 +1887,7 @@ kdDebug(6200) << "_offset == minofs: " << _offset << " == " << minofs << endl;
// _peekNext = b;
// get character
if (b && !box->isOutside() && b->isInlineTextBox())
- _char = static_cast<RenderText *>(b->object())->text()[_offset].unicode();
+ _char = static_cast<RenderText *>(b->object())->text()[_offset].tqunicode();
else
_char = -1;
@@ -1990,9 +1990,9 @@ kdDebug(6200) << "_offset: " << _offset << " _peekNext: " << _peekNext << endl;
#endif
// get character
if (_peekNext && _offset >= box->maxOffset() && _peekNext->isInlineTextBox())
- _char = static_cast<RenderText *>(_peekNext->object())->text()[_peekNext->minOffset()].unicode();
+ _char = static_cast<RenderText *>(_peekNext->object())->text()[_peekNext->minOffset()].tqunicode();
else if (b && _offset < b->maxOffset() && b->isInlineTextBox())
- _char = static_cast<RenderText *>(b->object())->text()[_offset].unicode();
+ _char = static_cast<RenderText *>(b->object())->text()[_offset].tqunicode();
else
_char = -1;
}/*end if*/
@@ -2103,7 +2103,7 @@ static RenderTableCell *findNearestTableCellInRow(KHTMLPart *part, int x,
int n = (int)row->row->size();
int i;
for (i = 0; i < n; i++) {
- RenderTableCell *cell = row->row->at(i);
+ RenderTableCell *cell = row->row->tqat(i);
if (!cell || (long)cell == -1) continue;
int absx, absy;
@@ -2127,7 +2127,7 @@ static RenderTableCell *findNearestTableCellInRow(KHTMLPart *part, int x,
int index = i - ((cnt >> 1) + 1)*(cnt & 1) + (cnt >> 1)*!(cnt & 1);
if (index < 0 || index >= n) continue;
- RenderTableCell *cell = row->row->at(index);
+ RenderTableCell *cell = row->row->tqat(index);
if (!cell || (long)cell == -1) continue;
#if DEBUG_CARETMODE > 1
@@ -2227,7 +2227,7 @@ static int findRowInSection(RenderTableSection *section, RenderTableCell *cell,
// check for cell
int m = row->row->size();
for (int j = 0; j < m; j++) {
- RenderTableCell *c = row->row->at(j);
+ RenderTableCell *c = row->row->tqat(j);
if (c == directCell) return i;
}/*next j*/
diff --git a/khtml/khtml_caret_p.h b/khtml/khtml_caret_p.h
index 9524f2df..a5c4bf60 100644
--- a/khtml/khtml_caret_p.h
+++ b/khtml/khtml_caret_p.h
@@ -1034,7 +1034,7 @@ public:
*/
int chr() const { return _char; }
- /** returns the current character as a unicode symbol, substituting
+ /** returns the current character as a tqunicode symbol, substituting
* a blank for a non-text node.
*/
TQChar operator *() const { return TQChar(_char >= 0 ? _char : ' '); }
@@ -1089,7 +1089,7 @@ protected:
CaretBox *box = *copy;
InlineBox *b = box->inlineBox();
if (b && !box->isOutside() && b->isInlineTextBox())
- _char = static_cast<RenderText *>(b->object())->str->s[b->minOffset()].unicode();
+ _char = static_cast<RenderText *>(b->object())->str->s[b->minOffset()].tqunicode();
else
_char = -1;
}
diff --git a/khtml/khtml_ext.cpp b/khtml/khtml_ext.cpp
index 20d2d9a5..5ff15fe5 100644
--- a/khtml/khtml_ext.cpp
+++ b/khtml/khtml_ext.cpp
@@ -35,7 +35,7 @@
#include "misc/loader.h"
#include "dom/html_form.h"
#include "dom/html_image.h"
-#include <clipboard.h>
+#include <tqclipboard.h>
#include <tqfileinfo.h>
#include <tqpopupmenu.h>
#include <tqurl.h>
@@ -112,7 +112,7 @@ void KHTMLPartBrowserExtension::editableWidgetFocused( TQWidget *widget )
if ( !m_connectedToClipboard && m_editableFormWidget )
{
- connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ),
+ connect( TQApplication::tqclipboard(), TQT_SIGNAL( dataChanged() ),
this, TQT_SLOT( updateEditActions() ) );
if ( m_editableFormWidget->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) || m_editableFormWidget->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) )
@@ -135,7 +135,7 @@ void KHTMLPartBrowserExtension::editableWidgetBlurred( TQWidget * /*widget*/ )
if ( m_connectedToClipboard )
{
- disconnect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ),
+ disconnect( TQApplication::tqclipboard(), TQT_SIGNAL( dataChanged() ),
this, TQT_SLOT( updateEditActions() ) );
if ( oldWidget )
@@ -223,7 +223,7 @@ void KHTMLPartBrowserExtension::copy()
text.replace( TQChar( 0xa0 ), ' ' );
- TQClipboard *cb = TQApplication::clipboard();
+ TQClipboard *cb = TQApplication::tqclipboard();
disconnect( cb, TQT_SIGNAL( selectionChanged() ), m_part, TQT_SLOT( slotClearSelection() ) );
#ifndef QT_NO_MIMECLIPBOARD
TQString htmltext;
@@ -315,7 +315,7 @@ void KHTMLPartBrowserExtension::callExtensionProxyMethod( const char *method )
if ( !m_extensionProxy )
return;
- int slot = m_extensionProxy->metaObject()->findSlot( method );
+ int slot = m_extensionProxy->tqmetaObject()->findSlot( method );
if ( slot == -1 )
return;
@@ -335,10 +335,10 @@ void KHTMLPartBrowserExtension::updateEditActions()
// ### duplicated from KonqMainWindow::slotClipboardDataChanged
#ifndef QT_NO_MIMECLIPBOARD // Handle minimalized versions of Qt Embedded
- TQMimeSource *data = TQApplication::clipboard()->data();
+ TQMimeSource *data = TQApplication::tqclipboard()->data();
enableAction( "paste", data->provides( "text/plain" ) );
#else
- TQString data=TQApplication::clipboard()->text();
+ TQString data=TQApplication::tqclipboard()->text();
enableAction( "paste", data.contains("://"));
#endif
bool hasSelection = false;
@@ -715,10 +715,10 @@ void KHTMLPopupGUIClient::slotCopyLinkLocation()
// Set it in both the mouse selection and in the clipboard
KURL::List lst;
lst.append( safeURL );
- TQApplication::clipboard()->setData( new KURLDrag( lst ), TQClipboard::Clipboard );
- TQApplication::clipboard()->setData( new KURLDrag( lst ), TQClipboard::Selection );
+ TQApplication::tqclipboard()->setData( new KURLDrag( lst ), TQClipboard::Clipboard );
+ TQApplication::tqclipboard()->setData( new KURLDrag( lst ), TQClipboard::Selection );
#else
- TQApplication::clipboard()->setText( safeURL.url() ); //FIXME(E): Handle multiple entries
+ TQApplication::tqclipboard()->setText( safeURL.url() ); //FIXME(E): Handle multiple entries
#endif
}
@@ -741,8 +741,8 @@ void KHTMLPopupGUIClient::slotCopyImage()
drag->addDragObject( new KURLDrag(lst, d->m_khtml->view(), "Image URL") );
// Set it in both the mouse selection and in the clipboard
- TQApplication::clipboard()->setData( drag, TQClipboard::Clipboard );
- TQApplication::clipboard()->setData( new KURLDrag(lst), TQClipboard::Selection );
+ TQApplication::tqclipboard()->setData( drag, TQClipboard::Clipboard );
+ TQApplication::tqclipboard()->setData( new KURLDrag(lst), TQClipboard::Selection );
#else
kdDebug() << "slotCopyImage called when the clipboard does not support this. This should not be possible." << endl;
#endif
@@ -756,10 +756,10 @@ void KHTMLPopupGUIClient::slotCopyImageLocation()
// Set it in both the mouse selection and in the clipboard
KURL::List lst;
lst.append( safeURL );
- TQApplication::clipboard()->setData( new KURLDrag( lst ), TQClipboard::Clipboard );
- TQApplication::clipboard()->setData( new KURLDrag( lst ), TQClipboard::Selection );
+ TQApplication::tqclipboard()->setData( new KURLDrag( lst ), TQClipboard::Clipboard );
+ TQApplication::tqclipboard()->setData( new KURLDrag( lst ), TQClipboard::Selection );
#else
- TQApplication::clipboard()->setText( safeURL.url() ); //FIXME(E): Handle multiple entries
+ TQApplication::tqclipboard()->setText( safeURL.url() ); //FIXME(E): Handle multiple entries
#endif
}
@@ -809,7 +809,7 @@ void KHTMLPopupGUIClient::saveURL( TQWidget *parent, const TQString &caption,
const TQString &filter, long cacheId,
const TQString & suggestedFilename )
{
- TQString name = TQString::fromLatin1( "index.html" );
+ TQString name = TQString::tqfromLatin1( "index.html" );
if ( !suggestedFilename.isEmpty() )
name = suggestedFilename;
else if ( !url.fileName().isEmpty() )
diff --git a/khtml/khtml_pagecache.cpp b/khtml/khtml_pagecache.cpp
index 935f31cc..e736df5c 100644
--- a/khtml/khtml_pagecache.cpp
+++ b/khtml/khtml_pagecache.cpp
@@ -95,8 +95,8 @@ KHTMLPageCacheEntry::endData()
{
m_complete = true;
if ( m_file->status() == 0) {
- m_file->dataStream()->device()->flush();
- m_file->dataStream()->device()->at(0);
+ m_file->dataStream()->tqdevice()->flush();
+ m_file->dataStream()->tqdevice()->tqat(0);
}
}
diff --git a/khtml/khtml_part.cpp b/khtml/khtml_part.cpp
index 42d7c2fd..fefc59fa 100644
--- a/khtml/khtml_part.cpp
+++ b/khtml/khtml_part.cpp
@@ -107,7 +107,7 @@ using namespace DOM;
#include <kstatusbar.h>
#include <kurllabel.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
#include <tqfile.h>
#include <tqtooltip.h>
#include <tqmetaobject.h>
@@ -717,7 +717,7 @@ bool KHTMLPart::openURL( const KURL &url )
}
if (widget())
- d->m_job->setWindow(widget()->topLevelWidget());
+ d->m_job->setWindow(widget()->tqtopLevelWidget());
d->m_job->addMetaData(args.metaData());
connect( d->m_job, TQT_SIGNAL( result( KIO::Job* ) ),
@@ -1480,7 +1480,7 @@ void KHTMLPart::clear()
d->m_startOffset = 0;
d->m_endOffset = 0;
#ifndef QT_NO_CLIPBOARD
- connect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), TQT_SLOT( slotClearSelection()));
+ connect( kapp->tqclipboard(), TQT_SIGNAL( selectionChanged()), TQT_SLOT( slotClearSelection()));
#endif
d->m_jobPercent = 0;
@@ -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::fromLatin1( "<HTML dir=%1><HEAD><TITLE>" )
+ TQString errText = TQString::tqfromLatin1( "<HTML dir=%1><HEAD><TITLE>" )
.arg(TQApplication::reverseLayout() ? "rtl" : "ltr");
errText += i18n( "Error while loading %1" ).arg( reqUrl.htmlURL() );
- errText += TQString::fromLatin1( "</TITLE></HEAD><BODY><P>" );
+ errText += TQString::tqfromLatin1( "</TITLE></HEAD><BODY><P>" );
errText += i18n( "An error occurred while loading <B>%1</B>:" ).arg( reqUrl.htmlURL() );
- errText += TQString::fromLatin1( "</P>" );
+ errText += TQString::tqfromLatin1( "</P>" );
errText += TQStyleSheet::convertFromPlainText( KIO::buildErrorString( errorCode, text ) );
- errText += TQString::fromLatin1( "</BODY></HTML>" );
+ errText += TQString::tqfromLatin1( "</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::currentDateTime(),
+ datetime = KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime(),
false );
- TQString doc = TQString::fromLatin1( "<html><head><title>" );
+ TQString doc = TQString::tqfromLatin1( "<html><head><title>" );
doc += i18n( "Error: " );
doc += errorName;
- doc += TQString::fromLatin1( " - %1</title></head><body><h1>" ).arg( url );
+ doc += TQString::tqfromLatin1( " - %1</title></head><body><h1>" ).arg( url );
doc += i18n( "The requested operation could not be completed" );
- doc += TQString::fromLatin1( "</h1><h2>" );
+ doc += TQString::tqfromLatin1( "</h1><h2>" );
doc += errorName;
- doc += TQString::fromLatin1( "</h2>" );
+ doc += TQString::tqfromLatin1( "</h2>" );
if ( !techName.isNull() ) {
- doc += TQString::fromLatin1( "<h2>" );
+ doc += TQString::tqfromLatin1( "<h2>" );
doc += i18n( "Technical Reason: " );
doc += techName;
- doc += TQString::fromLatin1( "</h2>" );
+ doc += TQString::tqfromLatin1( "</h2>" );
}
- doc += TQString::fromLatin1( "<h3>" );
+ doc += TQString::tqfromLatin1( "<h3>" );
doc += i18n( "Details of the Request:" );
- doc += TQString::fromLatin1( "</h3><ul><li>" );
+ doc += TQString::tqfromLatin1( "</h3><ul><li>" );
doc += i18n( "URL: %1" ).arg( url );
- doc += TQString::fromLatin1( "</li><li>" );
+ doc += TQString::tqfromLatin1( "</li><li>" );
if ( !protocol.isNull() ) {
// uncomment for 3.1... i18n change
// doc += i18n( "Protocol: %1" ).arg( protocol ).arg( protocol );
- doc += TQString::fromLatin1( "</li><li>" );
+ doc += TQString::tqfromLatin1( "</li><li>" );
}
doc += i18n( "Date and Time: %1" ).arg( datetime );
- doc += TQString::fromLatin1( "</li><li>" );
+ doc += TQString::tqfromLatin1( "</li><li>" );
doc += i18n( "Additional Information: %1" ).arg( text );
- doc += TQString::fromLatin1( "</li></ul><h3>" );
+ doc += TQString::tqfromLatin1( "</li></ul><h3>" );
doc += i18n( "Description:" );
- doc += TQString::fromLatin1( "</h3><p>" );
+ doc += TQString::tqfromLatin1( "</h3><p>" );
doc += description;
- doc += TQString::fromLatin1( "</p>" );
+ doc += TQString::tqfromLatin1( "</p>" );
if ( causes.count() ) {
- doc += TQString::fromLatin1( "<h3>" );
+ doc += TQString::tqfromLatin1( "<h3>" );
doc += i18n( "Possible Causes:" );
- doc += TQString::fromLatin1( "</h3><ul><li>" );
+ doc += TQString::tqfromLatin1( "</h3><ul><li>" );
doc += causes.join( "</li><li>" );
- doc += TQString::fromLatin1( "</li></ul>" );
+ doc += TQString::tqfromLatin1( "</li></ul>" );
}
if ( solutions.count() ) {
- doc += TQString::fromLatin1( "<h3>" );
+ doc += TQString::tqfromLatin1( "<h3>" );
doc += i18n( "Possible Solutions:" );
- doc += TQString::fromLatin1( "</h3><ul><li>" );
+ doc += TQString::tqfromLatin1( "</h3><ul><li>" );
doc += solutions.join( "</li><li>" );
- doc += TQString::fromLatin1( "</li></ul>" );
+ doc += TQString::tqfromLatin1( "</li></ul>" );
}
- doc += TQString::fromLatin1( "</body></html>" );
+ doc += TQString::tqfromLatin1( "</body></html>" );
write( doc );
end();
@@ -2286,7 +2286,7 @@ void KHTMLPart::checkCompleted()
}
// the view will emit completed on our behalf,
- // either now or at next repaint if one is pending
+ // either now or at next tqrepaint if one is pending
//kdDebug(6050) << this << " asks the view to emit completed. pendingAction=" << pendingAction << endl;
d->m_view->complete( pendingAction );
@@ -2402,7 +2402,7 @@ void KHTMLPart::slotRedirect()
d->m_redirectURL = TQString();
// SYNC check with ecma/kjs_window.cpp::goURL !
- if ( u.find( TQString::fromLatin1( "javascript:" ), 0, false ) == 0 )
+ if ( u.find( TQString::tqfromLatin1( "javascript:" ), 0, false ) == 0 )
{
TQString script = KURL::decode_string( u.right( u.length() - 11 ) );
kdDebug( 6050 ) << "KHTMLPart::slotRedirect script=" << script << endl;
@@ -3005,7 +3005,7 @@ void KHTMLPart::findText()
// The lineedit of the dialog would make khtml lose its selection, otherwise
#ifndef QT_NO_CLIPBOARD
- disconnect( kapp->clipboard(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotClearSelection()) );
+ disconnect( kapp->tqclipboard(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotClearSelection()) );
#endif
// Now show the dialog in which the user can choose options.
@@ -3036,7 +3036,7 @@ void KHTMLPart::findText( const TQString &str, long options, TQWidget *parent, K
return;
#ifndef QT_NO_CLIPBOARD
- connect( kapp->clipboard(), TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotClearSelection()) );
+ connect( kapp->tqclipboard(), TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotClearSelection()) );
#endif
// Create the KFind object
@@ -3731,7 +3731,7 @@ void KHTMLPart::overURL( const TQString &url, const TQString &target, bool /*shi
return;
}
- if (url.find( TQString::fromLatin1( "javascript:" ),0, false ) == 0 ) {
+ if (url.find( TQString::tqfromLatin1( "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::fromLatin1("mailto")) {
- TQString mailtoMsg /* = TQString::fromLatin1("<img src=%1>").arg(locate("icon", TQString::fromLatin1("locolor/16x16/actions/mail_send.png")))*/;
+ if (u.protocol() == TQString::tqfromLatin1("mailto")) {
+ TQString mailtoMsg /* = TQString::tqfromLatin1("<img src=%1>").arg(locate("icon", TQString::tqfromLatin1("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::fromLatin1("subject=")))
+ if ((*it).startsWith(TQString::tqfromLatin1("subject=")))
mailtoMsg += i18n(" - Subject: ") + KURL::decode_string((*it).mid(8));
- else if ((*it).startsWith(TQString::fromLatin1("cc=")))
+ else if ((*it).startsWith(TQString::tqfromLatin1("cc=")))
mailtoMsg += i18n(" - CC: ") + KURL::decode_string((*it).mid(3));
- else if ((*it).startsWith(TQString::fromLatin1("bcc=")))
+ else if ((*it).startsWith(TQString::tqfromLatin1("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::fromLatin1("http")) {
+ else if (u.protocol() == TQString::tqfromLatin1("http")) {
DOM::Node hrefNode = nodeUnderMouse().parentNode();
- while (hrefNode.nodeName().string() != TQString::fromLatin1("A") && !hrefNode.isNull())
+ while (hrefNode.nodeName().string() != TQString::tqfromLatin1("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::fromLatin1("en"))
- countryCode = TQString::fromLatin1("gb");
- TQString flagImg = TQString::fromLatin1("<img src=%1>").arg(
- locate("locale", TQString::fromLatin1("l10n/")
+ if (countryCode == TQString::tqfromLatin1("en"))
+ countryCode = TQString::tqfromLatin1("gb");
+ TQString flagImg = TQString::tqfromLatin1("<img src=%1>").arg(
+ locate("locale", TQString::tqfromLatin1("l10n/")
+ countryCode
- + TQString::fromLatin1("/flag.png")));
+ + TQString::tqfromLatin1("/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::fromLatin1( "javascript:" ), 0, false ) == 0 )
+ if ( url.find( TQString::tqfromLatin1( "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::fromLatin1("text/plain"), isTempFile );
+ (void) KRun::runURL( url, TQString::tqfromLatin1("text/plain"), isTempFile );
}
void KHTMLPart::slotViewPageInfo()
@@ -4108,7 +4108,7 @@ void KHTMLPart::slotViewFrameSource()
}
}
- (void) KRun::runURL( url, TQString::fromLatin1("text/plain"), isTempFile );
+ (void) KRun::runURL( url, TQString::tqfromLatin1("text/plain"), isTempFile );
}
KURL KHTMLPart::backgroundURL() const
@@ -4276,7 +4276,7 @@ void KHTMLPart::updateActions()
{
TQObject *ext = KParts::BrowserExtension::childObject( frame );
if ( ext )
- enablePrintFrame = ext->metaObject()->slotNames().contains( "print()" );
+ enablePrintFrame = ext->tqmetaObject()->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::fromLatin1( "javascript:" ), 0, false ) == 0 )
+ if ( url.find( TQString::tqfromLatin1( "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::fromLatin1("<!--frame %1-->").arg(d->m_frameNameId++);
+ return TQString::tqfromLatin1("<!--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::fromLatin1( "text/html" );
+ args.serviceType = TQString::tqfromLatin1( "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::fromLatin1( "Name == '%1'" ).arg( serviceName ) );
+ constr.append( TQString::tqfromLatin1( "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->topLevelWidget(), this, "khtml part manager" );
+ d->m_manager = new KParts::PartManager( d->m_view->tqtopLevelWidget(), 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::fromLatin1("Notification Messages");
+ TQString grpNotifMsgs = TQString::tqfromLatin1("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::fromLatin1( "javascript:" ), 0, false ) == 0 ) {
+ if ( urlstring.find( TQString::tqfromLatin1( "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::fromLatin1(formData.data(),
+ bodyEnc = KURL::encode_string(TQString::tqfromLatin1(formData.data(),
formData.size()));
} else if (contentType.lower() == "text/plain") {
// Convention seems to be to decode, and s/&/\n/
- TQString tmpbody = TQString::fromLatin1(formData.data(),
+ TQString tmpbody = TQString::tqfromLatin1(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::fromLatin1(formData.data(),
+ bodyEnc = KURL::encode_string(TQString::tqfromLatin1(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::fromLatin1( formData.data(), formData.size() ) );
+ u.setQuery( TQString::tqfromLatin1( 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::fromLatin1( "text/html" );
+ TQString mimetype = TQString::tqfromLatin1( "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::fromLatin1( "javascript:" ), 0, false ) == 0 ) {
+ if ( urlStr.find( TQString::tqfromLatin1( "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::fromLatin1( "_top" ) )
+ if ( frameName == TQString::tqfromLatin1( "_top" ) )
{
emit d->m_extension->openURLRequest( url, args );
return;
}
- else if ( frameName == TQString::fromLatin1( "_blank" ) )
+ else if ( frameName == TQString::tqfromLatin1( "_blank" ) )
{
emit d->m_extension->createNewWindow( url, args );
return;
}
- else if ( frameName == TQString::fromLatin1( "_parent" ) )
+ else if ( frameName == TQString::tqfromLatin1( "_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::fromLatin1( "_self" ) )
+ else if ( frameName != TQString::tqfromLatin1( "_self" ) )
{
khtml::ChildFrame *_frame = recursiveFrameRequest( callingHtmlPart, url, args );
@@ -6610,9 +6610,9 @@ void KHTMLPart::khtmlMouseReleaseEvent( khtml::MouseReleaseEvent *event )
#ifndef QT_NO_CLIPBOARD
TQString text = selectedText();
text.replace(TQChar(0xa0), ' ');
- disconnect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), this, TQT_SLOT( slotClearSelection()));
- kapp->clipboard()->setText(text,TQClipboard::Selection);
- connect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), TQT_SLOT( slotClearSelection()));
+ disconnect( kapp->tqclipboard(), TQT_SIGNAL( selectionChanged()), this, TQT_SLOT( slotClearSelection()));
+ kapp->tqclipboard()->setText(text,TQClipboard::Selection);
+ connect( kapp->tqclipboard(), TQT_SIGNAL( selectionChanged()), TQT_SLOT( slotClearSelection()));
#endif
//kdDebug( 6000 ) << "selectedText = " << text << endl;
emitSelectionChanged();
@@ -6658,7 +6658,7 @@ void KHTMLPart::slotPrintFrame()
if ( !ext )
return;
- TQMetaObject *mo = ext->metaObject();
+ TQMetaObject *mo = ext->tqmetaObject();
int idx = mo->findSlot( "print()", true );
if ( idx >= 0 ) {
@@ -6877,7 +6877,7 @@ void KHTMLPart::slotActiveFrameChanged( KParts::Part *part )
if (frame->frameStyle() != TQFrame::NoFrame)
{
frame->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken);
- frame->repaint();
+ frame->tqrepaint();
}
}
@@ -6905,7 +6905,7 @@ void KHTMLPart::slotActiveFrameChanged( KParts::Part *part )
if (frame->frameStyle() != TQFrame::NoFrame)
{
frame->setFrameStyle( TQFrame::StyledPanel | TQFrame::Plain);
- frame->repaint();
+ frame->tqrepaint();
}
kdDebug(6050) << "new active frame " << d->m_activeFrame << endl;
}
@@ -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()->topLevelWidget()->winId() : 0, KWallet::Wallet::Asynchronous);
+ KWallet::Wallet *wallet = KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), widget() ? widget()->tqtopLevelWidget()->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()->topLevelWidget()->winId() : 0, KWallet::Wallet::Asynchronous);
+ KWallet::Wallet *wallet = KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), widget() ? widget()->tqtopLevelWidget()->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_printsettings.cpp b/khtml/khtml_printsettings.cpp
index 355f50e7..ed998ffb 100644
--- a/khtml/khtml_printsettings.cpp
+++ b/khtml/khtml_printsettings.cpp
@@ -21,7 +21,7 @@
#include <klocale.h>
#include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqwhatsthis.h>
KHTMLPrintSettings::KHTMLPrintSettings(TQWidget *parent, const char *name)
diff --git a/khtml/khtml_run.cpp b/khtml/khtml_run.cpp
index 90770d38..c07b44b7 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()->topLevelWidget() : 0,
+ : KParts::BrowserRun( url, args, part, part->widget() ? part->widget()->tqtopLevelWidget() : 0,
false, false, hideErrorDialog ),
m_child( child )
{
diff --git a/khtml/khtml_settings.cc b/khtml/khtml_settings.cc
index 431aec0c..6b864960 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::fromLatin1("accept"))
+ if (_str.lower() == TQString::tqfromLatin1("accept"))
ret = KJavaScriptAccept;
- else if (_str.lower() == TQString::fromLatin1("reject"))
+ else if (_str.lower() == TQString::tqfromLatin1("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::fromLatin1("javascript.");
+ : TQString::tqfromLatin1("javascript.");
TQString javaPrefix = global ? TQString::null
- : TQString::fromLatin1("java.");
+ : TQString::tqfromLatin1("java.");
TQString pluginsPrefix = global ? TQString::null
- : TQString::fromLatin1("plugins.");
+ : TQString::tqfromLatin1("plugins.");
// The setting for Java
- TQString key = javaPrefix + TQString::fromLatin1("EnableJava");
+ TQString key = javaPrefix + TQString::tqfromLatin1("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::fromLatin1("EnablePlugins");
+ key = pluginsPrefix + TQString::tqfromLatin1("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::fromLatin1("EnableJavaScript");
+ key = jsPrefix + TQString::tqfromLatin1("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::fromLatin1("WindowOpenPolicy");
+ key = jsPrefix + TQString::tqfromLatin1("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::fromLatin1("WindowMovePolicy");
+ key = jsPrefix + TQString::tqfromLatin1("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::fromLatin1("WindowResizePolicy");
+ key = jsPrefix + TQString::tqfromLatin1("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::fromLatin1("WindowStatusPolicy");
+ key = jsPrefix + TQString::tqfromLatin1("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::fromLatin1("WindowFocusPolicy");
+ key = jsPrefix + TQString::tqfromLatin1("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::fromLatin1("%1:%2:%3").arg(it.key()).arg(javaPolicy).arg(javaScriptPolicy));
+ domainConfig.append(TQString::tqfromLatin1("%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::fromLatin1("%1:%2:%3").arg(it.key()).arg(javaPolicy).arg(javaScriptPolicy));
+ domainConfig.append(TQString::tqfromLatin1("%1:%2:%3").arg(it.key()).arg(javaPolicy).arg(javaScriptPolicy));
}
config->writeEntry( "ECMADomainSettings", domainConfig );
}
@@ -878,7 +878,7 @@ const TQString &KHTMLSettings::availableFamilies()
if ( !avFamilies ) {
avFamilies = new TQString;
TQFontDatabase db;
- TQStringList families = db.families();
+ TQStringList families = db.tqfamilies();
TQStringList s;
TQRegExp foundryExp(" \\[.+\\]");
diff --git a/khtml/khtmlview.cpp b/khtml/khtmlview.cpp
index 121bc196..80f031fe 100644
--- a/khtml/khtmlview.cpp
+++ b/khtml/khtmlview.cpp
@@ -84,7 +84,7 @@
#include <tqptrdict.h>
#include <tqtooltip.h>
#include <tqstring.h>
-#include <stylesheet.h>
+#include <tqstylesheet.h>
#include <tqtimer.h>
#include <tqvaluevector.h>
@@ -662,7 +662,7 @@ void KHTMLView::drawContents( TQPainter *p, int ex, int ey, int ew, int eh )
//kdDebug( 6000 ) << "drawContents this="<< this <<" x=" << ex << ",y=" << ey << ",w=" << ew << ",h=" << eh << endl;
if(!m_part || !m_part->xmlDocImpl() || !m_part->xmlDocImpl()->renderer()) {
- p->fillRect(ex, ey, ew, eh, palette().active().brush(TQColorGroup::Base));
+ p->fillRect(ex, ey, ew, eh, tqpalette().active().brush(TQColorGroup::Base));
return;
} else if ( d->complete && static_cast<RenderCanvas*>(m_part->xmlDocImpl()->renderer())->needsLayout() ) {
// an external update request happens while we have a layout scheduled
@@ -726,7 +726,7 @@ void KHTMLView::drawContents( TQPainter *p, int ex, int ey, int ew, int eh )
d->vertPaintBuffer->resize(10, visibleHeight());
d->tp->begin(d->vertPaintBuffer);
d->tp->translate(-ex, -ey);
- d->tp->fillRect(ex, ey, ew, eh, palette().active().brush(TQColorGroup::Base));
+ d->tp->fillRect(ex, ey, ew, eh, tqpalette().active().brush(TQColorGroup::Base));
m_part->xmlDocImpl()->renderer()->layer()->paint(d->tp, TQRect(ex, ey, ew, eh));
d->tp->end();
p->drawPixmap(ex, ey, *d->vertPaintBuffer, 0, 0, ew, eh);
@@ -740,7 +740,7 @@ void KHTMLView::drawContents( TQPainter *p, int ex, int ey, int ew, int eh )
int ph = eh-py < PAINT_BUFFER_HEIGHT ? eh-py : PAINT_BUFFER_HEIGHT;
d->tp->begin(d->paintBuffer);
d->tp->translate(-ex, -ey-py);
- d->tp->fillRect(ex, ey+py, ew, ph, palette().active().brush(TQColorGroup::Base));
+ d->tp->fillRect(ex, ey+py, ew, ph, tqpalette().active().brush(TQColorGroup::Base));
m_part->xmlDocImpl()->renderer()->layer()->paint(d->tp, TQRect(ex, ey+py, ew, ph));
d->tp->end();
@@ -756,7 +756,7 @@ static int cnt=0;
kdDebug() << "[" << ++cnt << "]" << " clip region: " << pr << endl;
// p->setClipRegion(TQRect(0,0,ew,eh));
// p->translate(-ex, -ey);
- p->fillRect(ex, ey, ew, eh, palette().active().brush(TQColorGroup::Base));
+ p->fillRect(ex, ey, ew, eh, tqpalette().active().brush(TQColorGroup::Base));
m_part->xmlDocImpl()->renderer()->layer()->paint(p, pr);
#endif // DEBUG_NO_PAINT_BUFFER
@@ -867,7 +867,7 @@ void KHTMLView::layout()
}
#if 0
ElementImpl *listitem = m_part->xmlDocImpl()->getElementById("__test_element__");
- if (listitem) kdDebug(6000) << "after layout, before repaint" << endl;
+ if (listitem) kdDebug(6000) << "after layout, before tqrepaint" << endl;
if (listitem) dumpLineBoxes(static_cast<RenderFlow *>(listitem->renderer()));
#endif
#ifndef KHTML_NO_CARET
@@ -2284,7 +2284,7 @@ void KHTMLView::displayAccessKeys( KHTMLView* caller, KHTMLView* origview, TQVal
TQRect rec=en->getRect();
TQLabel *lab=new TQLabel(accesskey,viewport(),0,(WFlags)WDestructiveClose);
connect( origview, TQT_SIGNAL(hideAccessKeys()), lab, TQT_SLOT(close()) );
- connect( this, TQT_SIGNAL(repaintAccessKeys()), lab, TQT_SLOT(repaint()));
+ connect( this, TQT_SIGNAL(repaintAccessKeys()), lab, TQT_SLOT(tqrepaint()));
lab->setPalette(TQToolTip::palette());
lab->setLineWidth(2);
lab->setFrameStyle(TQFrame::Box | TQFrame::Plain);
@@ -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.startsWith( "javascript:", false )) {
+ if( !url.isEmpty() && !url.tqstartsWith( "javascript:", false )) {
for( TQValueList< AccessKeyData >::Iterator it2 = data.begin();
it2 != data.end();
) {
@@ -2937,7 +2937,7 @@ void KHTMLView::print(bool quick)
root->layer()->paint(p, TQRect(0, top, pageWidth, pageHeight));
// m_part->xmlDocImpl()->renderer()->layer()->paint(p, TQRect(0, top, pageWidth, pageHeight));
-// root->repaint();
+// root->tqrepaint();
// p->flush();
kdDebug(6000) << "printed: page " << page <<" bottom At = " << bottom << endl;
@@ -2983,7 +2983,7 @@ void KHTMLView::paint(TQPainter *p, const TQRect &rc, int yOff, bool *more)
khtml::RenderCanvas *root = static_cast<khtml::RenderCanvas *>(m_part->xmlDocImpl()->renderer());
if(!root) return;
- m_part->xmlDocImpl()->setPaintDevice(p->device());
+ m_part->xmlDocImpl()->setPaintDevice(p->tqdevice());
root->setPagedMode(true);
root->setStaticMode(true);
root->setWidth(rc.width());
@@ -3510,12 +3510,12 @@ void KHTMLView::timerEvent ( TQTimerEvent *e )
setStaticBackground(d->useSlowRepaints);
-// kdDebug() << "scheduled repaint "<< d->repaintTimerId << endl;
+// kdDebug() << "scheduled tqrepaint "<< d->repaintTimerId << endl;
killTimer(d->repaintTimerId);
d->repaintTimerId = 0;
TQRect updateRegion;
- TQMemArray<TQRect> rects = d->updateRegion.rects();
+ TQMemArray<TQRect> rects = d->updateRegion.tqrects();
d->updateRegion = TQRegion();
@@ -3645,10 +3645,10 @@ void KHTMLView::complete( bool pendingAction )
KHTMLViewPrivate::CSActionPending : KHTMLViewPrivate::CSFull;
}
- // is there a repaint pending?
+ // is there a tqrepaint pending?
if (d->repaintTimerId)
{
-// kdDebug() << "requesting repaint now" << endl;
+// kdDebug() << "requesting tqrepaint now" << endl;
// do it now
killTimer(d->repaintTimerId);
d->repaintTimerId = startTimer( 20 );
@@ -3702,7 +3702,7 @@ void KHTMLView::initCaret(bool keepSelection)
}/*end if*/
// kdDebug(6200) << "d->m_selectionStart " << m_part->d->m_selectionStart.handle()
// << " d->m_selectionEnd " << m_part->d->m_selectionEnd.handle() << endl;
- // ### does not repaint the selection on keepSelection!=false
+ // ### does not tqrepaint the selection on keepSelection!=false
moveCaretTo(m_part->d->caretNode().handle(), m_part->d->caretOffset(), !keepSelection);
// kdDebug(6200) << "d->m_selectionStart " << m_part->d->m_selectionStart.handle()
// << " d->m_selectionEnd " << m_part->d->m_selectionEnd.handle() << endl;
@@ -3877,7 +3877,7 @@ void KHTMLView::hideCaret()
if (d->m_caretViewContext->visible) {
// kdDebug(6200) << "redraw caret hidden" << endl;
d->m_caretViewContext->visible = false;
- // force repaint, otherwise the event won't be handled
+ // force tqrepaint, otherwise the event won't be handled
// before the focus leaves the window
repaintContents(d->m_caretViewContext->x, d->m_caretViewContext->y,
d->m_caretViewContext->width,
@@ -4430,7 +4430,7 @@ void KHTMLView::placeCaretOnChar(CaretBox *hintBox)
d->m_caretViewContext->origX = d->m_caretViewContext->x;
d->scrollBarMoved = false;
#if DEBUG_CARETMODE > 3
- //if (caretNode->isTextNode()) kdDebug(6200) << "text[0] = " << (int)*((TextImpl *)caretNode)->data().unicode() << " text :\"" << ((TextImpl *)caretNode)->data().string() << "\"" << endl;
+ //if (caretNode->isTextNode()) kdDebug(6200) << "text[0] = " << (int)*((TextImpl *)caretNode)->data().tqunicode() << " text :\"" << ((TextImpl *)caretNode)->data().string() << "\"" << endl;
#endif
ensureNodeHasFocus(m_part->d->caretNode().handle());
caretOn();
diff --git a/khtml/khtmlview.h b/khtml/khtmlview.h
index 65e43209..212a02b4 100644
--- a/khtml/khtmlview.h
+++ b/khtml/khtmlview.h
@@ -384,8 +384,8 @@ private:
*
* These operations are executed unconditionally, regardless of the
* focus, and the caret display policy.
- * @param forceRepaint @p true to force an immediate repaint, otherwise
- * do a scheduled repaint
+ * @param forceRepaint @p true to force an immediate tqrepaint, otherwise
+ * do a scheduled tqrepaint
*/
void showCaret(bool forceRepaint = false);
/** makes the caret invisible, but does not influence the frequency timer.
diff --git a/khtml/kmultipart/kmultipart.cpp b/khtml/kmultipart/kmultipart.cpp
index 20768341..5d82742d 100644
--- a/khtml/kmultipart/kmultipart.cpp
+++ b/khtml/kmultipart/kmultipart.cpp
@@ -51,7 +51,7 @@ public:
Q_ASSERT( !m_lineComplete );
if ( storeNewline || c != '\n' ) {
int sz = m_currentLine.size();
- m_currentLine.resize( sz+1, TQGArray::SpeedOptim );
+ m_currentLine.tqresize( sz+1, TQGArray::SpeedOptim );
m_currentLine[sz] = c;
}
if ( c == '\n' )
@@ -68,7 +68,7 @@ public:
reset();
}
void reset() {
- m_currentLine.resize( 0, TQGArray::SpeedOptim );
+ m_currentLine.tqresize( 0, TQGArray::SpeedOptim );
m_lineComplete = false;
}
private:
@@ -234,7 +234,7 @@ void KMultiPart::slotData( KIO::Job *job, const TQByteArray &data )
}
else if ( !qstrnicmp( line.data(), "Content-Encoding:", 17 ) )
{
- TQString encoding = TQString::fromLatin1(line.data()+17).stripWhiteSpace().lower();
+ TQString encoding = TQString::tqfromLatin1(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::fromLatin1( line.data() + 14 ).stripWhiteSpace();
+ m_nextMimeType = TQString::tqfromLatin1( line.data() + 14 ).stripWhiteSpace();
int semicolon = m_nextMimeType.find( ';' );
if ( semicolon != -1 )
m_nextMimeType = m_nextMimeType.left( semicolon );
diff --git a/khtml/misc/arena.cpp b/khtml/misc/arena.cpp
index 5efcaf98..58d53138 100644
--- a/khtml/misc/arena.cpp
+++ b/khtml/misc/arena.cpp
@@ -143,7 +143,7 @@ void* ArenaAllocate(ArenaPool *pool, unsigned int nb)
assert((nb & pool->mask) == 0);
#endif
- nb = (uword)ARENA_ALIGN(pool, nb); /* force alignment */
+ nb = (uword)ARENA_ALIGN(pool, nb); /* force tqalignment */
/* attempt to allocate from arenas at pool->current */
{
@@ -197,7 +197,7 @@ void* ArenaAllocate(ArenaPool *pool, unsigned int nb)
} else
#endif
sz = pool->arenasize > nb ? pool->arenasize : nb;
- sz += sizeof *a + pool->mask; /* header and alignment slop */
+ sz += sizeof *a + pool->mask; /* header and tqalignment slop */
pool->cumul += sz;
#ifdef DEBUG_ARENA_MALLOC
i++;
diff --git a/khtml/misc/decoder.cpp b/khtml/misc/decoder.cpp
index 34689cae..f227f401 100644
--- a/khtml/misc/decoder.cpp
+++ b/khtml/misc/decoder.cpp
@@ -37,7 +37,7 @@ using namespace khtml;
#include "htmlhashes.h"
#include <tqregexp.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
#include <kglobal.h>
#include <kcharsets.h>
diff --git a/khtml/misc/htmlattrs.c b/khtml/misc/htmlattrs.c
index 779792e7..6f420e3b 100644
--- a/khtml/misc/htmlattrs.c
+++ b/khtml/misc/htmlattrs.c
@@ -188,7 +188,7 @@ struct spool_attr_t
char spool_attr_str42[sizeof("rules")];
char spool_attr_str43[sizeof("compact")];
char spool_attr_str44[sizeof("rev")];
- char spool_attr_str45[sizeof("shape")];
+ char spool_attr_str45[sizeof("tqshape")];
char spool_attr_str46[sizeof("charset")];
char spool_attr_str47[sizeof("charoff")];
char spool_attr_str48[sizeof("lang")];
@@ -343,7 +343,7 @@ static const struct spool_attr_t spool_attr_contents =
"rules",
"compact",
"rev",
- "shape",
+ "tqshape",
"charset",
"charoff",
"lang",
diff --git a/khtml/misc/khtmllayout.h b/khtml/misc/khtmllayout.h
index 1049d10c..b0c8dc61 100644
--- a/khtml/misc/khtmllayout.h
+++ b/khtml/misc/khtmllayout.h
@@ -33,7 +33,7 @@ namespace khtml
const int UNDEFINED = -1;
- // alignment
+ // tqalignment
enum VAlign { VNone=0, Bottom, VCenter, Top, Baseline };
enum HAlign { HDefault, Left, HCenter, Right, HNone = 0 };
diff --git a/khtml/misc/knsplugininstaller.cpp b/khtml/misc/knsplugininstaller.cpp
index aa3c93cb..09de5a14 100644
--- a/khtml/misc/knsplugininstaller.cpp
+++ b/khtml/misc/knsplugininstaller.cpp
@@ -36,10 +36,10 @@
#include <tqiodevice.h>
#include <tqfile.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqmap.h>
#include <tqstringlist.h>
-#include <textstream.h>
+#include <tqtextstream.h>
#include <sys/utsname.h>
diff --git a/khtml/misc/loader.cpp b/khtml/misc/loader.cpp
index 82a87dab..de7d5aea 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::fromLatin1( accept );
+ TQString ah = TQString::tqfromLatin1( 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::fromLatin1("*/*") );
+ setAccept( TQString::tqfromLatin1("*/*") );
// load the file
Cache::loader()->load(dl, this, false);
m_loading = true;
@@ -397,7 +397,7 @@ public:
void sendTo(TQDataSink* sink, int n)
{
- sink->receive((const uchar*)&buffer.at(pos), n);
+ sink->receive((const uchar*)&buffer.tqat(pos), n);
pos += n;
@@ -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->disconnecStatus( this, TQT_SLOT( movieStatus( int ) ));
+ m->disconnectqStatus( 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->connecStatus( this, TQT_SLOT( movieStatus(int)));
+ m->connectqStatus( 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()->topLevelWidget());
+ job->setWindow (part->widget()->tqtopLevelWidget());
}
}
diff --git a/khtml/misc/loader.h b/khtml/misc/loader.h
index 3baed31c..e950f176 100644
--- a/khtml/misc/loader.h
+++ b/khtml/misc/loader.h
@@ -45,7 +45,7 @@
#include <tqpixmap.h>
#include <tqbuffer.h>
#include <tqstringlist.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
#include <tqtimer.h>
#include <kurl.h>
diff --git a/khtml/misc/multimap.h b/khtml/misc/multimap.h
index 125e8e07..8f60dcf0 100644
--- a/khtml/misc/multimap.h
+++ b/khtml/misc/multimap.h
@@ -70,7 +70,7 @@ private:
static inline unsigned int stupidHash(void* ptr)
{
unsigned long val = (unsigned long)ptr;
- // remove alignment and multiply by a prime unlikely to be a factor of size
+ // remove tqalignment and multiply by a prime unlikely to be a factor of size
val = (val >> 4) * 1237;
return val;
}
diff --git a/khtml/misc/stringit.h b/khtml/misc/stringit.h
index 789f22af..d56a7839 100644
--- a/khtml/misc/stringit.h
+++ b/khtml/misc/stringit.h
@@ -46,7 +46,7 @@ public:
DOMStringIt(TQChar *str, uint len)
{ s = str, l = len; lines = 0; }
DOMStringIt(const TQString &str)
- { s = str.unicode(); l = str.length(); lines = 0; }
+ { s = str.tqunicode(); l = str.length(); lines = 0; }
DOMStringIt *operator++()
{
@@ -85,13 +85,13 @@ class TokenizerSubstring
friend class TokenizerString;
public:
TokenizerSubstring() : m_length(0), m_current(0) {}
- TokenizerSubstring(const TQString &str) : m_string(str), m_length(str.length()), m_current(m_length == 0 ? 0 : str.unicode()) {}
+ TokenizerSubstring(const TQString &str) : m_string(str), m_length(str.length()), m_current(m_length == 0 ? 0 : str.tqunicode()) {}
TokenizerSubstring(const TQChar *str, int length) : m_length(length), m_current(length == 0 ? 0 : str) {}
void clear() { m_length = 0; m_current = 0; }
void appendTo(TQString &str) const {
- if (m_string.unicode() == m_current) {
+ if (m_string.tqunicode() == m_current) {
if (str.isEmpty())
str = m_string;
else
diff --git a/khtml/rendering/bidi.cpp b/khtml/rendering/bidi.cpp
index bd010047..30beadd7 100644
--- a/khtml/rendering/bidi.cpp
+++ b/khtml/rendering/bidi.cpp
@@ -242,7 +242,7 @@ static inline RenderObject *Bidinext(RenderObject *par, RenderObject *current, B
if (!oldEndOfInline && !current->isFloating() && !current->isReplaced() && !current->isPositioned()) {
next = current->firstChild();
if ( next && adjustEmbedding ) {
- EUnicodeBidi ub = next->style()->unicodeBidi();
+ EUnicodeBidi ub = next->style()->tqunicodeBidi();
if ( ub != UBNormal && !emptyRun ) {
EDirection dir = next->style()->direction();
TQChar::Direction d = ( ub == Embed ? ( dir == RTL ? TQChar::DirRLE : TQChar::DirLRE )
@@ -261,7 +261,7 @@ static inline RenderObject *Bidinext(RenderObject *par, RenderObject *current, B
while (current && current != par) {
next = current->nextSibling();
if (next) break;
- if ( adjustEmbedding && current->style()->unicodeBidi() != UBNormal && !emptyRun ) {
+ if ( adjustEmbedding && current->style()->tqunicodeBidi() != UBNormal && !emptyRun ) {
embed( TQChar::DirPDF, bidi );
}
current = current->parent();
@@ -454,7 +454,7 @@ static void checkMidpoints(BidiIterator& lBreak, BidiState &bidi)
// Don't shave a character off the endpoint if it was from a soft hyphen.
RenderText* textObj = static_cast<RenderText*>(endpoint.obj);
if (endpoint.pos+1 < textObj->length() &&
- textObj->text()[endpoint.pos+1].unicode() == SOFT_HYPHEN)
+ textObj->text()[endpoint.pos+1].tqunicode() == SOFT_HYPHEN)
return;
}
endpoint.pos--;
@@ -484,7 +484,7 @@ static void appendRunsForObject(int start, int end, RenderObject* obj, BidiState
bool haveNextMidpoint = (smidpoints && sCurrMidpoint < sNumMidpoints);
BidiIterator nextMidpoint;
if (haveNextMidpoint)
- nextMidpoint = smidpoints->at(sCurrMidpoint);
+ nextMidpoint = smidpoints->tqat(sCurrMidpoint);
if (betweenMidpoints) {
if (!(haveNextMidpoint && nextMidpoint.obj == obj))
return;
@@ -1241,7 +1241,7 @@ void RenderBlock::bidiReorderLine(const BidiIterator &start, const BidiIterator
}
// this causes the operator ++ to open and close embedding levels as needed
- // for the CSS unicode-bidi property
+ // for the CSS tqunicode-bidi property
adjustEmbedding = true;
bidi.current.increment( bidi );
adjustEmbedding = false;
@@ -1611,11 +1611,11 @@ BidiIterator RenderBlock::findNextLineBreak(BidiIterator &start, BidiState &bidi
// be skipped.
while (!start.atEnd() && (start.obj->isInlineFlow() || (!start.obj->style()->preserveWS() && !start.obj->isBR() &&
#ifndef QT_NO_UNICODETABLES
- ( (start.current().unicode() == (ushort)0x0020) || // ASCII space
- (start.current().unicode() == (ushort)0x0009) || // ASCII tab
- (start.current().unicode() == (ushort)0x000A) || // ASCII line feed
- (start.current().unicode() == (ushort)0x000C) || // ASCII form feed
- (start.current().unicode() == (ushort)0x200B) || // Zero-width space
+ ( (start.current().tqunicode() == (ushort)0x0020) || // ASCII space
+ (start.current().tqunicode() == (ushort)0x0009) || // ASCII tab
+ (start.current().tqunicode() == (ushort)0x000A) || // ASCII line feed
+ (start.current().tqunicode() == (ushort)0x000C) || // ASCII form feed
+ (start.current().tqunicode() == (ushort)0x200B) || // Zero-width space
start.obj->isFloatingOrPositioned() )
#else
( start.current() == ' ' || start.current() == '\n' || start.obj->isFloatingOrPositioned() )
@@ -1824,7 +1824,7 @@ BidiIterator RenderBlock::findNextLineBreak(BidiIterator &start, BidiState &bidi
isLineEmpty = false;
// Check for soft hyphens. Go ahead and ignore them.
- if (c.unicode() == SOFT_HYPHEN && pos > 0) {
+ if (c.tqunicode() == SOFT_HYPHEN && pos > 0) {
nextIsSoftBreakable = true;
if (!ignoringSpaces) {
// Ignore soft hyphens
@@ -1911,7 +1911,7 @@ BidiIterator RenderBlock::findNextLineBreak(BidiIterator &start, BidiState &bidi
lBreak.endOfInline = false;
}
goto end;
- } else if ( (pos > 1 && str[pos-1].unicode() == SOFT_HYPHEN) )
+ } else if ( (pos > 1 && str[pos-1].tqunicode() == SOFT_HYPHEN) )
// Subtract the width of the soft hyphen out since we fit on a line.
tmpW -= t->width(pos-1, 1, f);
}
@@ -2189,7 +2189,7 @@ BidiIterator RenderBlock::findNextLineBreak(BidiIterator &start, BidiState &bidi
// For soft hyphens on line breaks, we have to chop out the midpoints that made us
// ignore the hyphen so that it will render at the end of the line.
TQChar c = static_cast<RenderText*>(lBreak.obj)->text()[lBreak.pos-1];
- if (c.unicode() == SOFT_HYPHEN)
+ if (c.tqunicode() == SOFT_HYPHEN)
chopMidpointsAt(lBreak.obj, lBreak.pos-2);
}
diff --git a/khtml/rendering/break_lines.cpp b/khtml/rendering/break_lines.cpp
index 2ae5b53c..a0d314ce 100644
--- a/khtml/rendering/break_lines.cpp
+++ b/khtml/rendering/break_lines.cpp
@@ -1,7 +1,7 @@
#include <break_lines.h>
#include <klibloader.h>
#include "tqcstring.h"
-#include <textcodec.h>
+#include <tqtextcodec.h>
#include <tqcleanuphandler.h>
#include <config.h>
diff --git a/khtml/rendering/break_lines.h b/khtml/rendering/break_lines.h
index 5176e5fb..ed6df2aa 100644
--- a/khtml/rendering/break_lines.h
+++ b/khtml/rendering/break_lines.h
@@ -6,7 +6,7 @@
namespace khtml {
/*
- array of unicode codes where breaking shouldn't occur.
+ array of tqunicode codes where breaking shouldn't occur.
(in sorted order because of using with binary search)
these are currently for Japanese, though simply adding
Korean, Chinese ones should work as well
@@ -122,7 +122,7 @@ namespace khtml {
inline bool isBreakable( const TQChar *str, const int pos, int len )
{
const TQChar *c = str+pos;
- unsigned short ch = c->unicode();
+ unsigned short ch = c->tqunicode();
if ( ch > 0xff ) {
// not latin1, need to do more sophisticated checks for asian fonts
unsigned char row = c->row();
@@ -147,8 +147,8 @@ namespace khtml {
return false;
// do binary search in dontbreak[]
- return break_bsearch(dontbreakbefore, c->unicode()) &&
- break_bsearch(dontbreakafter, (str+(pos-1))->unicode());
+ return break_bsearch(dontbreakbefore, c->tqunicode()) &&
+ break_bsearch(dontbreakafter, (str+(pos-1))->tqunicode());
} else // no asian font
return c->isSpace();
} else {
diff --git a/khtml/rendering/enumerate.cpp b/khtml/rendering/enumerate.cpp
index 9cfe149a..57445c12 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::fromLatin1("'");
+ letter = toHebrew(number/1000) + TQString::tqfromLatin1("'");
number = number%1000;
}
diff --git a/khtml/rendering/font.cpp b/khtml/rendering/font.cpp
index a33f0e08..766c8984 100644
--- a/khtml/rendering/font.cpp
+++ b/khtml/rendering/font.cpp
@@ -293,7 +293,7 @@ int Font::width( TQChar *chs, int, int pos, int len, int start, int end, int toA
const TQString qstr = cstr.string();
if ( scFont ) {
const TQString upper = qstr.upper();
- const TQChar *uc = qstr.unicode();
+ const TQChar *uc = qstr.tqunicode();
const TQFontMetrics sc_fm( *scFont );
for ( int i = 0; i < len; ++i ) {
if ( (uc+i)->category() == TQChar::Letter_Lowercase )
@@ -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.smoothSizes(font.family(), db.styleString(font));
+ (*scalSizesCache)[key] = db.tqsmoothSizes(font.family(), db.styleString(font));
}
}
diff --git a/khtml/rendering/render_applet.cpp b/khtml/rendering/render_applet.cpp
index fce22f7c..3a00589e 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::fromLatin1("baseURL") ] );
- applet->setAppletClass( args[TQString::fromLatin1("code") ] );
+ applet->setBaseURL( args[TQString::tqfromLatin1("baseURL") ] );
+ applet->setAppletClass( args[TQString::tqfromLatin1("code") ] );
- TQString str = args[TQString::fromLatin1("codeBase") ];
+ TQString str = args[TQString::tqfromLatin1("codeBase") ];
if( !str.isEmpty() )
applet->setCodeBase( str );
- str = args[TQString::fromLatin1("name") ];
+ str = args[TQString::tqfromLatin1("name") ];
if( !str.isNull() )
applet->setAppletName( str );
else
- applet->setAppletName( args[TQString::fromLatin1("code") ] );
+ applet->setAppletName( args[TQString::tqfromLatin1("code") ] );
- str = args[TQString::fromLatin1("archive") ];
+ str = args[TQString::tqfromLatin1("archive") ];
if( !str.isEmpty() )
- applet->setArchives( args[TQString::fromLatin1("archive") ] );
+ applet->setArchives( args[TQString::tqfromLatin1("archive") ] );
}
}
diff --git a/khtml/rendering/render_arena.cpp b/khtml/rendering/render_arena.cpp
index 99fbf4f4..023b98e3 100644
--- a/khtml/rendering/render_arena.cpp
+++ b/khtml/rendering/render_arena.cpp
@@ -88,7 +88,7 @@ void* RenderArena::allocate(size_t size)
#else
void* result = 0;
- // Ensure we have correct alignment for pointers. Important for Tru64
+ // Ensure we have correct tqalignment for pointers. Important for Tru64
size = KHTML_ROUNDUP(size, sizeof(void*));
// Check recyclers first
@@ -130,7 +130,7 @@ void RenderArena::free(size_t size, void* ptr)
VALGRIND_MEMPOOL_FREE(findContainingArena(&m_pool, ptr)->base, ptr);
#endif
- // Ensure we have correct alignment for pointers. Important for Tru64
+ // Ensure we have correct tqalignment for pointers. Important for Tru64
size = KHTML_ROUNDUP(size, sizeof(void*));
// See if it's a size that we recycle
diff --git a/khtml/rendering/render_block.cpp b/khtml/rendering/render_block.cpp
index ccbb6fad..5b30e2a5 100644
--- a/khtml/rendering/render_block.cpp
+++ b/khtml/rendering/render_block.cpp
@@ -881,7 +881,7 @@ static inline bool isAnonymousWhitespace( RenderObject* o ) {
return false;
RenderObject *fc = o->firstChild();
return fc && fc == o->lastChild() && fc->isText() && static_cast<RenderText *>(fc)->stringLength() == 1 &&
- static_cast<RenderText *>(fc)->text()[0].unicode() == ' ';
+ static_cast<RenderText *>(fc)->text()[0].tqunicode() == ' ';
}
RenderObject* RenderBlock::handleCompactChild(RenderObject* child, CompactInfo& compactInfo, const MarginInfo& marginInfo, bool& handled)
diff --git a/khtml/rendering/render_body.cpp b/khtml/rendering/render_body.cpp
index 930ec358..2ed114a5 100644
--- a/khtml/rendering/render_body.cpp
+++ b/khtml/rendering/render_body.cpp
@@ -81,11 +81,11 @@ void RenderBody::paintBoxDecorations(PaintInfo& paintInfo, int _tx, int _ty)
}
-void RenderBody::repaint(Priority p)
+void RenderBody::tqrepaint(Priority p)
{
RenderObject *cb = containingBlock();
if(cb)
- cb->repaint(p);
+ cb->tqrepaint(p);
}
void RenderBody::layout()
diff --git a/khtml/rendering/render_body.h b/khtml/rendering/render_body.h
index 7951f73e..17c237e9 100644
--- a/khtml/rendering/render_body.h
+++ b/khtml/rendering/render_body.h
@@ -40,7 +40,7 @@ public:
virtual bool isBody() const { return true; }
virtual const char *renderName() const { return "RenderBody"; }
- virtual void repaint(Priority p=NormalPriority);
+ virtual void tqrepaint(Priority p=NormalPriority);
virtual void layout();
virtual void setStyle(RenderStyle* style);
diff --git a/khtml/rendering/render_box.cpp b/khtml/rendering/render_box.cpp
index 7400752a..e6311536 100644
--- a/khtml/rendering/render_box.cpp
+++ b/khtml/rendering/render_box.cpp
@@ -346,7 +346,7 @@ void RenderBox::paintRootBoxDecorations(PaintInfo& paintInfo, int _tx, int _ty)
}
if( !bgColor.isValid() && canvas()->view())
- bgColor = canvas()->view()->palette().active().color(TQColorGroup::Base);
+ bgColor = canvas()->view()->tqpalette().active().color(TQColorGroup::Base);
int w = width();
int h = height();
@@ -622,7 +622,7 @@ void RenderBox::paintBackgroundExtended(TQPainter *p, const TQColor &c, const Ba
sy+=b.y()-cy;
cx=b.x();cy=b.y();cw=b.width();ch=b.height();
}
- // restrict painting to repaint-clip
+ // restrict painting to tqrepaint-clip
if (cy < clipy) {
ch -= (clipy - cy);
sy += (clipy - cy);
@@ -795,7 +795,7 @@ void RenderBox::position(InlineBox* box, int /*from*/, int /*len*/, bool /*rever
setPos( box->xPos(), box->yPos() );
}
-void RenderBox::repaint(Priority prior)
+void RenderBox::tqrepaint(Priority prior)
{
int ow = style() ? style()->outlineSize() : 0;
if( isInline() && !isReplaced() )
diff --git a/khtml/rendering/render_box.h b/khtml/rendering/render_box.h
index c0c618d5..78b85b5f 100644
--- a/khtml/rendering/render_box.h
+++ b/khtml/rendering/render_box.h
@@ -87,7 +87,7 @@ public:
virtual int rightmostPosition(bool includeOverflowInterior=true, bool includeSelf=true) const;
virtual int leftmostPosition(bool includeOverflowInterior=true, bool includeSelf=true) const;
- virtual void repaint(Priority p=NormalPriority);
+ virtual void tqrepaint(Priority p=NormalPriority);
virtual void repaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false);
diff --git a/khtml/rendering/render_canvas.cpp b/khtml/rendering/render_canvas.cpp
index e8540eba..e5947369 100644
--- a/khtml/rendering/render_canvas.cpp
+++ b/khtml/rendering/render_canvas.cpp
@@ -329,7 +329,7 @@ void RenderCanvas::paintBoxDecorations(PaintInfo& paintInfo, int /*_tx*/, int /*
if ((firstChild() && firstChild()->style()->visibility() == VISIBLE) || !view())
return;
- paintInfo.p->fillRect(paintInfo.r, view()->palette().active().color(TQColorGroup::Base));
+ paintInfo.p->fillRect(paintInfo.r, view()->tqpalette().active().color(TQColorGroup::Base));
}
void RenderCanvas::repaintRectangle(int x, int y, int w, int h, Priority p, bool f)
@@ -372,13 +372,13 @@ void RenderCanvas::scheduleDeferredRepaints()
if (!needsFullRepaint()) {
TQValueList<RenderObject*>::const_iterator it;
for ( it = m_dirtyChildren.begin(); it != m_dirtyChildren.end(); ++it )
- (*it)->repaint();
+ (*it)->tqrepaint();
}
- //kdDebug(6040) << "scheduled deferred repaints: " << m_dirtyChildren.count() << " needed full repaint: " << needsFullRepaint() << endl;
+ //kdDebug(6040) << "scheduled deferred repaints: " << m_dirtyChildren.count() << " needed full tqrepaint: " << needsFullRepaint() << endl;
m_dirtyChildren.clear();
}
-void RenderCanvas::repaint(Priority p)
+void RenderCanvas::tqrepaint(Priority p)
{
if (m_view && !m_staticMode) {
if (p == RealtimePriority) {
@@ -567,7 +567,7 @@ void RenderCanvas::setSelection(RenderObject *s, int sp, RenderObject *e, int ep
TQRect updateRect;
- // Don't use repaint() because it will cause all rects to
+ // Don't use tqrepaint() because it will cause all rects to
// be united (see khtmlview::scheduleRepaint()). Instead
// just draw damage rects for objects that have a change
// in selection state.
@@ -651,9 +651,9 @@ void RenderCanvas::clearSelection(bool doRepaint)
{
if (o->selectionState()!=SelectionNone)
if (doRepaint)
- o->repaint();
+ o->tqrepaint();
o->setSelectionState(SelectionNone);
- o->repaint();
+ o->tqrepaint();
RenderObject* no;
if ( !(no = o->firstChild()) )
if ( !(no = o->nextSibling()) )
@@ -669,7 +669,7 @@ void RenderCanvas::clearSelection(bool doRepaint)
if (m_selectionEnd) {
m_selectionEnd->setSelectionState(SelectionNone);
if (doRepaint)
- m_selectionEnd->repaint();
+ m_selectionEnd->tqrepaint();
}
// set selection start & end to 0
diff --git a/khtml/rendering/render_canvas.h b/khtml/rendering/render_canvas.h
index 17f279d7..cd4ef30c 100644
--- a/khtml/rendering/render_canvas.h
+++ b/khtml/rendering/render_canvas.h
@@ -61,7 +61,7 @@ public:
KHTMLView *view() const { return m_view; }
- virtual void repaint(Priority p=NormalPriority);
+ virtual void tqrepaint(Priority p=NormalPriority);
virtual void repaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false);
void repaintViewRectangle(int x, int y, int w, int h, bool asap=false);
bool needsFullRepaint() const;
diff --git a/khtml/rendering/render_container.cpp b/khtml/rendering/render_container.cpp
index 69f98747..13f17c08 100644
--- a/khtml/rendering/render_container.cpp
+++ b/khtml/rendering/render_container.cpp
@@ -170,11 +170,11 @@ RenderObject* RenderContainer::removeChildNode(RenderObject* oldChild)
KHTMLAssert(oldChild->parent() == this);
// So that we'll get the appropriate dirty bit set (either that a normal flow child got yanked or
- // that a positioned child got yanked). We also repaint, so that the area exposed when the child
+ // that a positioned child got yanked). We also tqrepaint, so that the area exposed when the child
// disappears gets repainted properly.
if ( document()->renderer() ) {
oldChild->setNeedsLayoutAndMinMaxRecalc();
- oldChild->repaint();
+ oldChild->tqrepaint();
// Keep our layer hierarchy updated.
oldChild->removeLayers(enclosingLayer());
diff --git a/khtml/rendering/render_flow.cpp b/khtml/rendering/render_flow.cpp
index ae579bd4..97dd4046 100644
--- a/khtml/rendering/render_flow.cpp
+++ b/khtml/rendering/render_flow.cpp
@@ -267,7 +267,7 @@ bool RenderFlow::hitTestLines(NodeInfo& i, int x, int y, int tx, int ty, HitTest
}
-void RenderFlow::repaint(Priority prior)
+void RenderFlow::tqrepaint(Priority prior)
{
if (isInlineFlow()) {
// Find our leftmost position.
@@ -280,7 +280,7 @@ void RenderFlow::repaint(Priority prior)
if (curr == firstLineBox() || curr->xPos() < left)
left = curr->xPos();
- // Now invalidate a rectangle.
+ // Now tqinvalidate a rectangle.
int ow = style() ? style()->outlineSize() : 0;
// We need to add in the relative position offsets of any inlines (including us) up to our
@@ -306,7 +306,7 @@ void RenderFlow::repaint(Priority prior)
effectiveWidth()+ow*2, effectiveHeight()+ow*2, prior);
}
else
- return RenderBox::repaint(prior);
+ return RenderBox::tqrepaint(prior);
}
}
diff --git a/khtml/rendering/render_flow.h b/khtml/rendering/render_flow.h
index 1e23822b..3267a92f 100644
--- a/khtml/rendering/render_flow.h
+++ b/khtml/rendering/render_flow.h
@@ -69,7 +69,7 @@ public:
void paintLines(PaintInfo& i, int _tx, int _ty);
bool hitTestLines(NodeInfo& i, int x, int y, int tx, int ty, HitTestAction hitTestAction);
- virtual void repaint(Priority p=NormalPriority);
+ virtual void tqrepaint(Priority p=NormalPriority);
virtual int highestPosition(bool includeOverflowInterior=true, bool includeSelf=true) const;
virtual int lowestPosition(bool includeOverflowInterior=true, bool includeSelf=true) const;
diff --git a/khtml/rendering/render_form.cpp b/khtml/rendering/render_form.cpp
index d55b32fe..5c53f025 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().pixelMetric( TQStyle::PM_IndicatorWidth ),
- cb->tqstyle().pixelMetric( TQStyle::PM_IndicatorHeight ) );
+ TQSize s( cb->tqstyle().tqpixelMetric( TQStyle::PM_IndicatorWidth ),
+ cb->tqstyle().tqpixelMetric( 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().pixelMetric( TQStyle::PM_ExclusiveIndicatorWidth ),
- rb->tqstyle().pixelMetric( TQStyle::PM_ExclusiveIndicatorHeight ) );
+ TQSize s( rb->tqstyle().tqpixelMetric( TQStyle::PM_ExclusiveIndicatorWidth ),
+ rb->tqstyle().tqpixelMetric( TQStyle::PM_ExclusiveIndicatorHeight ) );
setIntrinsicWidth( s.width() );
setIntrinsicHeight( s.height() );
@@ -260,17 +260,17 @@ void RenderSubmitButton::calcMinMaxWidth()
bool empty = raw.isEmpty();
if ( empty )
- raw = TQString::fromLatin1("X");
+ raw = TQString::tqfromLatin1("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().pixelMetric( TQStyle::PM_ButtonMargin, pb) +
- pb->tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth, pb ) * 2;
+ int margin = pb->tqstyle().tqpixelMetric( TQStyle::PM_ButtonMargin, pb) +
+ pb->tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, pb ) * 2;
int w = ts.width() + margin;
int h = s.height();
if (pb->isDefault() || pb->autoDefault()) {
- int dbw = pb->tqstyle().pixelMetric( TQStyle::PM_ButtonDefaultIndicator, pb ) * 2;
+ int dbw = pb->tqstyle().tqpixelMetric( 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::fromLatin1(" ")+text;
+ text = TQString::tqfromLatin1(" ")+text;
}
if(m_useListBox) {
@@ -1406,7 +1406,7 @@ void TextAreaWidget::slotReplaceNext()
}
if (!(m_replace->options() & KReplaceDialog::PromptOnReplace)) {
- viewport()->setUpdatesEnabled(false);
+ viewport()->tqsetUpdatesEnabled(false);
}
KFind::Result res = KFind::NoMatch;
@@ -1449,7 +1449,7 @@ void TextAreaWidget::slotReplaceNext()
}
if (!(m_replace->options() & KReplaceDialog::PromptOnReplace)) {
- viewport()->setUpdatesEnabled(true);
+ viewport()->tqsetUpdatesEnabled(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::fromLatin1("\n"));
+ paragraphText.insert(l+ll++, TQString::tqfromLatin1("\n"));
lindex = w->lineOfChar(p, l);
}
}
txt += paragraphText;
if (p < w->paragraphs() - 1)
- txt += TQString::fromLatin1("\n");
+ txt += TQString::tqfromLatin1("\n");
}
}
else
diff --git a/khtml/rendering/render_frames.cpp b/khtml/rendering/render_frames.cpp
index bc3f00be..9f58a0a4 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::fromLatin1("=\"");
+ aStr += TQString::tqfromLatin1("=\"");
aStr += p->value();
- aStr += TQString::fromLatin1("\"");
+ aStr += TQString::tqfromLatin1("\"");
TQString name_lower = p->name().lower();
- if (name_lower == TQString::fromLatin1("type") && objbase->id() != ID_APPLET) {
+ if (name_lower == TQString::tqfromLatin1("type") && objbase->id() != ID_APPLET) {
objbase->setServiceType(p->value());
} else if (url.isEmpty() &&
- (name_lower == TQString::fromLatin1("src") ||
- name_lower == TQString::fromLatin1("movie") ||
- name_lower == TQString::fromLatin1("code"))) {
+ (name_lower == TQString::tqfromLatin1("src") ||
+ name_lower == TQString::tqfromLatin1("movie") ||
+ name_lower == TQString::tqfromLatin1("code"))) {
url = p->value();
}
params.append(aStr);
@@ -754,8 +754,8 @@ void RenderPartObject::updateWidget()
}
}
}
- params.append( TQString::fromLatin1("__KHTML__PLUGINEMBED=\"YES\"") );
- params.append( TQString::fromLatin1("__KHTML__PLUGINBASEURL=\"%1\"").arg(element()->getDocument()->baseURL().url()));
+ params.append( TQString::tqfromLatin1("__KHTML__PLUGINEMBED=\"YES\"") );
+ params.append( TQString::tqfromLatin1("__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::fromLatin1("__KHTML__CLASSID=\"%1\"").arg( classId ) );
- params.append( TQString::fromLatin1("__KHTML__CODEBASE=\"%1\"").arg( objbase->getAttribute(ATTR_CODEBASE).string() ) );
+ params.append( TQString::tqfromLatin1("__KHTML__CLASSID=\"%1\"").arg( classId ) );
+ params.append( TQString::tqfromLatin1("__KHTML__CODEBASE=\"%1\"").arg( objbase->getAttribute(ATTR_CODEBASE).string() ) );
if (!objbase->getAttribute(ATTR_WIDTH).isEmpty())
- params.append( TQString::fromLatin1("WIDTH=\"%1\"").arg( objbase->getAttribute(ATTR_WIDTH).string() ) );
+ params.append( TQString::tqfromLatin1("WIDTH=\"%1\"").arg( objbase->getAttribute(ATTR_WIDTH).string() ) );
else if (embed && !embed->getAttribute(ATTR_WIDTH).isEmpty()) {
- params.append( TQString::fromLatin1("WIDTH=\"%1\"").arg( embed->getAttribute(ATTR_WIDTH).string() ) );
+ params.append( TQString::tqfromLatin1("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::fromLatin1("HEIGHT=\"%1\"").arg( objbase->getAttribute(ATTR_HEIGHT).string() ) );
+ params.append( TQString::tqfromLatin1("HEIGHT=\"%1\"").arg( objbase->getAttribute(ATTR_HEIGHT).string() ) );
else if (embed && !embed->getAttribute(ATTR_HEIGHT).isEmpty()) {
- params.append( TQString::fromLatin1("HEIGHT=\"%1\"").arg( embed->getAttribute(ATTR_HEIGHT).string() ) );
+ params.append( TQString::tqfromLatin1("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::fromLatin1("D27CDB6E-AE6D-11cf-96B8-444553540000")) >= 0) {
+ if(classId.find(TQString::tqfromLatin1("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::fromLatin1("CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA")) >= 0)
+ else if(classId.find(TQString::tqfromLatin1("CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA")) >= 0)
serviceType = "audio/x-pn-realaudio-plugin";
- else if(classId.find(TQString::fromLatin1("8AD9C840-044E-11D1-B3E9-00805F499D93")) >= 0 ||
- objbase->classId.find(TQString::fromLatin1("CAFEEFAC-0014-0000-0000-ABCDEFFEDCBA")) >= 0)
+ else if(classId.find(TQString::tqfromLatin1("8AD9C840-044E-11D1-B3E9-00805F499D93")) >= 0 ||
+ objbase->classId.find(TQString::tqfromLatin1("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::fromLatin1("02BF25D5-8C17-4B23-BC80-D3488ABDDC6B")) >= 0)
+ else if(classId.find(TQString::tqfromLatin1("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::fromLatin1("6BF52A52-394A-11d3-B153-00C04F79FAA6")) >= 0 ||
- classId.find(TQString::fromLatin1("22D6f312-B0F6-11D0-94AB-0080C74C7E95")) >= 0)
+ else if(objbase->classId.find(TQString::tqfromLatin1("6BF52A52-394A-11d3-B153-00C04F79FAA6")) >= 0 ||
+ classId.find(TQString::tqfromLatin1("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 17c65fc9..f5fc7068 100644
--- a/khtml/rendering/render_generated.cpp
+++ b/khtml/rendering/render_generated.cpp
@@ -53,7 +53,7 @@ void RenderCounterBase::calcMinMaxWidth()
generateContent();
if (str) str->deref();
- str = new DOM::DOMStringImpl(m_item.unicode(), m_item.length());
+ str = new DOM::DOMStringImpl(m_item.tqunicode(), m_item.length());
str->ref();
RenderText::calcMinMaxWidth();
@@ -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->drawConvexPolygon( diamond, 0, 4 );
+ p->tqdrawConvexPolygon( diamond, 0, 4 );
return;
}
case LNONE:
diff --git a/khtml/rendering/render_image.cpp b/khtml/rendering/render_image.cpp
index 46104adb..b5357bba 100644
--- a/khtml/rendering/render_image.cpp
+++ b/khtml/rendering/render_image.cpp
@@ -266,7 +266,7 @@ void RenderImage::paint(PaintInfo& paintInfo, int _tx, int _ty)
if ( !berrorPic ) {
//qDebug("qDrawShadePanel %d/%d/%d/%d", _tx + leftBorder, _ty + topBorder, cWidth, cHeight);
qDrawShadePanel( paintInfo.p, _tx + leftBorder + leftPad, _ty + topBorder + topPad, cWidth, cHeight,
- KApplication::palette().inactive(), true, 1 );
+ KApplication::tqpalette().inactive(), true, 1 );
}
TQPixmap const* pix = i ? &i->pixmap() : 0;
if(berrorPic && pix && (cWidth >= pix->width()+4) && (cHeight >= pix->height()+4) )
@@ -416,7 +416,7 @@ void RenderImage::notifyFinished(CachedObject *finishedObj)
if ( ( m_cachedImage == finishedObj || m_oldImage == finishedObj ) && m_oldImage ) {
m_oldImage->deref( this );
m_oldImage = 0;
- repaint();
+ tqrepaint();
}
RenderReplaced::notifyFinished(finishedObj);
diff --git a/khtml/rendering/render_layer.cpp b/khtml/rendering/render_layer.cpp
index 96b0236c..3427bf1d 100644
--- a/khtml/rendering/render_layer.cpp
+++ b/khtml/rendering/render_layer.cpp
@@ -168,7 +168,7 @@ TQRegion RenderLayer::paintedRegion(RenderLayer* rootLayer)
if (m_negZOrderList) {
uint count = m_negZOrderList->count();
for (uint i = 0; i < count; i++) {
- RenderLayer* child = m_negZOrderList->at(i);
+ RenderLayer* child = m_negZOrderList->tqat(i);
r += child->paintedRegion(rootLayer);
}
}
@@ -188,19 +188,19 @@ TQRegion RenderLayer::paintedRegion(RenderLayer* rootLayer)
if (m_posZOrderList) {
uint count = m_posZOrderList->count();
for (uint i = 0; i < count; i++) {
- RenderLayer* child = m_posZOrderList->at(i);
+ RenderLayer* child = m_posZOrderList->tqat(i);
r += child->paintedRegion(rootLayer);
}
}
return r;
}
-void RenderLayer::repaint( Priority p, bool markForRepaint )
+void RenderLayer::tqrepaint( Priority p, bool markForRepaint )
{
if (markForRepaint && m_markedForRepaint)
return;
for (RenderLayer* child = firstChild(); child; child = child->nextSibling())
- child->repaint( p, markForRepaint );
+ child->tqrepaint( p, markForRepaint );
TQRect layerBounds, damageRect, fgrect;
calculateRects(renderer()->canvas()->layer(), renderer()->viewRect(), layerBounds, damageRect, fgrect);
m_visibleRect = damageRect.intersect( layerBounds );
@@ -213,7 +213,7 @@ void RenderLayer::repaint( Priority p, bool markForRepaint )
void RenderLayer::updateLayerPositions(RenderLayer* rootLayer, bool doFullRepaint, bool checkForRepaint)
{
if (doFullRepaint) {
- m_object->repaint();
+ m_object->tqrepaint();
checkForRepaint = doFullRepaint = false;
}
@@ -266,7 +266,7 @@ void RenderLayer::updateWidgetMasks(RenderLayer* rootLayer)
m_region = TQRect(0,0,sv->contentsWidth(),sv->contentsHeight());
for (uint i = 0; i < count; i++) {
- RenderLayer* child = m_posZOrderList->at(i);
+ RenderLayer* child = m_posZOrderList->tqat(i);
if (child->zIndex() == 0 && child->renderer()->style()->position() == STATIC)
continue; // we don't know the widget's exact stacking position within flow
m_region -= child->paintedRegion(rootLayer);
@@ -537,7 +537,7 @@ void RenderLayer::checkInlineRelOffset(const RenderObject* o, int& x, int& y)
y += sy;
}
-void RenderLayer::scrollToOffset(int x, int y, bool updateScrollbars, bool repaint)
+void RenderLayer::scrollToOffset(int x, int y, bool updateScrollbars, bool tqrepaint)
{
if (renderer()->style()->overflowX() != OMARQUEE || !renderer()->hasOverflowClip()) {
if (x < 0) x = 0;
@@ -569,9 +569,9 @@ void RenderLayer::scrollToOffset(int x, int y, bool updateScrollbars, bool repai
// Fire the scroll DOM event.
m_object->element()->dispatchHTMLEvent(EventImpl::SCROLL_EVENT, true, false);
- // Just schedule a full repaint of our object.
- if (repaint)
- m_object->repaint(RealtimePriority);
+ // Just schedule a full tqrepaint of our object.
+ if (tqrepaint)
+ m_object->tqrepaint(RealtimePriority);
if (updateScrollbars) {
if (m_hBar)
@@ -637,7 +637,7 @@ int RenderLayer::verticalScrollbarWidth()
#ifdef APPLE_CHANGES
return m_vBar->width();
#else
- return m_vBar->tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent);
+ return m_vBar->tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent);
#endif
}
@@ -650,7 +650,7 @@ int RenderLayer::horizontalScrollbarHeight()
#ifdef APPLE_CHANGES
return m_hBar->height();
#else
- return m_hBar->tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent);
+ return m_hBar->tqstyle().tqpixelMetric(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().pixelMetric(TQStyle::PM_ScrollBarExtent);
+ int sw = b->tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent);
if (m_vBar) {
TQRect vBarRect = TQRect(tx + w - sw + 1, ty, sw, h - (m_hBar ? sw : 0) + 1);
@@ -898,7 +898,7 @@ void RenderLayer::paintLayer(RenderLayer* rootLayer, TQPainter *p,
if (m_negZOrderList) {
uint count = m_negZOrderList->count();
for (uint i = 0; i < count; i++) {
- RenderLayer* child = m_negZOrderList->at(i);
+ RenderLayer* child = m_negZOrderList->tqat(i);
child->paintLayer(rootLayer, p, paintDirtyRect, selectionOnly);
}
}
@@ -946,7 +946,7 @@ void RenderLayer::paintLayer(RenderLayer* rootLayer, TQPainter *p,
if (m_posZOrderList) {
uint count = m_posZOrderList->count();
for (uint i = 0; i < count; i++) {
- RenderLayer* child = m_posZOrderList->at(i);
+ RenderLayer* child = m_posZOrderList->tqat(i);
child->paintLayer(rootLayer, p, paintDirtyRect, selectionOnly);
}
}
@@ -1026,7 +1026,7 @@ RenderLayer* RenderLayer::nodeAtPointForLayer(RenderLayer* rootLayer, RenderObje
if (m_posZOrderList) {
uint count = m_posZOrderList->count();
for (int i = count-1; i >= 0; i--) {
- RenderLayer* child = m_posZOrderList->at(i);
+ RenderLayer* child = m_posZOrderList->tqat(i);
insideLayer = child->nodeAtPointForLayer(rootLayer, info, xMousePos, yMousePos, hitTestRect);
if (insideLayer)
return insideLayer;
@@ -1057,7 +1057,7 @@ RenderLayer* RenderLayer::nodeAtPointForLayer(RenderLayer* rootLayer, RenderObje
if (m_negZOrderList) {
uint count = m_negZOrderList->count();
for (int i = count-1; i >= 0; i--) {
- RenderLayer* child = m_negZOrderList->at(i);
+ RenderLayer* child = m_negZOrderList->tqat(i);
insideLayer = child->nodeAtPointForLayer(rootLayer, info, xMousePos, yMousePos, hitTestRect);
if (insideLayer)
return insideLayer;
@@ -1261,8 +1261,8 @@ static void sortByZOrder(TQPtrVector<RenderLayer>* buffer,
for (uint i = end-1; i > start; i--) {
bool sorted = true;
for (uint j = start; j < i; j++) {
- RenderLayer* elt = buffer->at(j);
- RenderLayer* elt2 = buffer->at(j+1);
+ RenderLayer* elt = buffer->tqat(j);
+ RenderLayer* elt2 = buffer->tqat(j+1);
if (elt->zIndex() > elt2->zIndex()) {
sorted = false;
buffer->insert(j, elt2);
@@ -1279,8 +1279,8 @@ static void sortByZOrder(TQPtrVector<RenderLayer>* buffer,
sortByZOrder(buffer, mergeBuffer, start, mid);
sortByZOrder(buffer, mergeBuffer, mid, end);
- RenderLayer* elt = buffer->at(mid-1);
- RenderLayer* elt2 = buffer->at(mid);
+ RenderLayer* elt = buffer->tqat(mid-1);
+ RenderLayer* elt2 = buffer->tqat(mid);
// Handle the fast common case (of equal z-indices). The list may already
// be completely sorted.
@@ -1293,26 +1293,26 @@ static void sortByZOrder(TQPtrVector<RenderLayer>* buffer,
uint i1 = start;
uint i2 = mid;
- elt = buffer->at(i1);
- elt2 = buffer->at(i2);
+ elt = buffer->tqat(i1);
+ elt2 = buffer->tqat(i2);
while (i1 < mid || i2 < end) {
if (i1 < mid && (i2 == end || elt->zIndex() <= elt2->zIndex())) {
mergeBuffer->insert(mergeBuffer->count(), elt);
i1++;
if (i1 < mid)
- elt = buffer->at(i1);
+ elt = buffer->tqat(i1);
}
else {
mergeBuffer->insert(mergeBuffer->count(), elt2);
i2++;
if (i2 < end)
- elt2 = buffer->at(i2);
+ elt2 = buffer->tqat(i2);
}
}
for (uint i = start; i < end; i++)
- buffer->insert(i, mergeBuffer->at(i-start));
+ buffer->insert(i, mergeBuffer->tqat(i-start));
mergeBuffer->clear();
}
@@ -1471,7 +1471,7 @@ static void writeLayers(TQTextStream &ts, const RenderLayer* rootLayer, RenderLa
if (negList) {
for (unsigned i = 0; i != negList->count(); ++i)
- writeLayers(ts, rootLayer, negList->at(i), paintDirtyRect, indent );
+ writeLayers(ts, rootLayer, negList->tqat(i), paintDirtyRect, indent );
}
if (shouldPaint)
@@ -1485,7 +1485,7 @@ static void writeLayers(TQTextStream &ts, const RenderLayer* rootLayer, RenderLa
TQPtrVector<RenderLayer>* posList = l->posZOrderList();
if (posList) {
for (unsigned i = 0; i != posList->count(); ++i)
- writeLayers(ts, rootLayer, posList->at(i), paintDirtyRect, indent);
+ writeLayers(ts, rootLayer, posList->tqat(i), paintDirtyRect, indent);
}
}
diff --git a/khtml/rendering/render_layer.h b/khtml/rendering/render_layer.h
index a8f1e5ad..1176a63a 100644
--- a/khtml/rendering/render_layer.h
+++ b/khtml/rendering/render_layer.h
@@ -190,7 +190,7 @@ public:
void checkInlineRelOffset(const RenderObject* o, int& x, int& y);
short scrollXOffset() { return m_scrollX; }
int scrollYOffset() { return m_scrollY; }
- void scrollToOffset(int x, int y, bool updateScrollbars = true, bool repaint = true);
+ void scrollToOffset(int x, int y, bool updateScrollbars = true, bool tqrepaint = true);
void scrollToXOffset(int x) { scrollToOffset(x, m_scrollY); }
void scrollToYOffset(int y) { scrollToOffset(m_scrollX, y); }
void showScrollbar(Qt::Orientation, bool);
@@ -202,7 +202,7 @@ public:
void paintScrollbars(RenderObject::PaintInfo& pI);
void checkScrollbarsAfterLayout();
void slotValueChanged(int);
- void repaint(Priority p=NormalPriority, bool markForRepaint = false);
+ void tqrepaint(Priority p=NormalPriority, bool markForRepaint = false);
void updateScrollPositionFromScrollbars();
void updateLayerPosition();
diff --git a/khtml/rendering/render_list.cpp b/khtml/rendering/render_list.cpp
index 769b7967..c88f103d 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->drawConvexPolygon( diamond, 0, 4 );
+ p->tqdrawConvexPolygon( 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::fromLatin1(". "));
+ TQString::tqfromLatin1(". "));
}
else {
- const TQString& punct(TQString::fromLatin1(" ."));
+ const TQString& punct(TQString::tqfromLatin1(" ."));
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::fromLatin1(". "));
+ const TQString& punct(TQString::tqfromLatin1(". "));
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::fromLatin1(" ."));
+ const TQString& punct(TQString::tqfromLatin1(" ."));
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::fromLatin1(". "));
+ m_markerWidth = fm.width(m_item) + fm.width(TQString::tqfromLatin1(". "));
}
end:
diff --git a/khtml/rendering/render_object.cpp b/khtml/rendering/render_object.cpp
index 162ca495..1fc72c7d 100644
--- a/khtml/rendering/render_object.cpp
+++ b/khtml/rendering/render_object.cpp
@@ -535,9 +535,9 @@ bool RenderObject::hasStaticY() const
void RenderObject::setPixmap(const TQPixmap&, const TQRect& /*r*/, CachedImage* image)
{
- //repaint bg when it finished loading
+ //tqrepaint bg when it finished loading
if(image && parent() && style() && style()->backgroundLayers()->containsImage(image)) {
- isBody() ? canvas()->repaint() : repaint();
+ isBody() ? canvas()->tqrepaint() : tqrepaint();
}
}
@@ -1164,15 +1164,15 @@ TQString RenderObject::information() const
<< " mB: " << marginBottom() << " qB: " << isBottomMarginQuirk()
<< "}"
<< (isTableCell() ?
- ( TQString::fromLatin1(" [r=") +
+ ( TQString::tqfromLatin1(" [r=") +
TQString::number( static_cast<const RenderTableCell *>(this)->row() ) +
- TQString::fromLatin1(" c=") +
+ TQString::tqfromLatin1(" c=") +
TQString::number( static_cast<const RenderTableCell *>(this)->col() ) +
- TQString::fromLatin1(" rs=") +
+ TQString::tqfromLatin1(" rs=") +
TQString::number( static_cast<const RenderTableCell *>(this)->rowSpan() ) +
- TQString::fromLatin1(" cs=") +
+ TQString::tqfromLatin1(" cs=") +
TQString::number( static_cast<const RenderTableCell *>(this)->colSpan() ) +
- TQString::fromLatin1("]") ) : TQString::null );
+ TQString::tqfromLatin1("]") ) : TQString::null );
if ( layer() )
ts << " layer=" << layer();
if ( continuation() )
@@ -1283,11 +1283,11 @@ void RenderObject::setStyle(RenderStyle *style)
m_style->outlineWidth() > style->outlineWidth() ||
(!m_style->hidesOverflow() && style->hidesOverflow()) ||
( m_style->hasClip() && !(m_style->clip() == style->clip()) ) ) ) {
- // schedule a repaint with the old style
+ // schedule a tqrepaint with the old style
if (layer() && !isInlineFlow())
- layer()->repaint(pri);
+ layer()->tqrepaint(pri);
else
- repaint(pri);
+ tqrepaint(pri);
}
if ( ( isFloating() && m_style->floating() != style->floating() ) ||
@@ -1345,7 +1345,7 @@ void RenderObject::setStyle(RenderStyle *style)
}
setNeedsLayoutAndMinMaxRecalc();
} else if (!isText() && d >= RenderStyle::Visible) {
- // a repaint is enough
+ // a tqrepaint is enough
if (layer()) {
if (canvas() && canvas()->needsWidgetMasks()) {
// update our widget masks
@@ -1357,9 +1357,9 @@ void RenderObject::setStyle(RenderStyle *style)
}
}
if (layer() && !isInlineFlow())
- layer()->repaint(pri);
+ layer()->tqrepaint(pri);
else
- repaint(pri);
+ tqrepaint(pri);
}
}
}
@@ -1428,9 +1428,9 @@ void RenderObject::repaintDuringLayout()
if (canvas()->needsFullRepaint() || isText())
return;
if (layer() && !isInlineFlow()) {
- layer()->repaint( NormalPriority, true );
+ layer()->tqrepaint( NormalPriority, true );
} else {
- repaint();
+ tqrepaint();
canvas()->deferredRepaint( this );
}
}
@@ -1850,7 +1850,7 @@ short RenderObject::getVerticalPosition( bool firstLine, RenderObject* ref ) con
bool checkParent = ref->isInline() && !ref->isReplacedBlock() &&
!( ref->style()->verticalAlign() == TOP || ref->style()->verticalAlign() == BOTTOM );
vpos = checkParent ? ref->verticalPositionHint( firstLine ) : 0;
- // don't allow elements nested inside text-top to have a different valignment.
+ // don't allow elements nested inside text-top to have a different vtqalignment.
if ( va == BASELINE )
return vpos;
else if ( va == LENGTH )
diff --git a/khtml/rendering/render_object.h b/khtml/rendering/render_object.h
index f7f77238..e403601d 100644
--- a/khtml/rendering/render_object.h
+++ b/khtml/rendering/render_object.h
@@ -441,7 +441,7 @@ public:
void layoutIfNeeded() { if (needsLayout()) layout(); }
// used for element state updates that can not be fixed with a
- // repaint and do not need a relayout
+ // tqrepaint and do not need a relayout
virtual void updateFromElement() {}
// Called immediately after render-object is inserted
@@ -681,8 +681,8 @@ public:
// Used by collapsed border tables.
virtual void collectBorders(TQValueList<CollapsedBorderValue>& borderStyles);
- // force a complete repaint
- virtual void repaint(Priority p = NormalPriority) { if(m_parent) m_parent->repaint(p); }
+ // force a complete tqrepaint
+ virtual void tqrepaint(Priority p = NormalPriority) { if(m_parent) m_parent->tqrepaint(p); }
virtual void repaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false);
virtual unsigned int length() const { return 1; }
@@ -747,7 +747,7 @@ public:
virtual int leftmostPosition(bool /*includeOverflowInterior*/=true, bool /*includeSelf*/=true) const { return 0; }
virtual int highestPosition(bool /*includeOverflowInterior*/=true, bool /*includeSelf*/=true) const { return 0; }
- // recursively invalidate current layout
+ // recursively tqinvalidate current layout
// unused: void invalidateLayout();
virtual void calcVerticalMargins() {}
diff --git a/khtml/rendering/render_replaced.cpp b/khtml/rendering/render_replaced.cpp
index 7653b746..01379930 100644
--- a/khtml/rendering/render_replaced.cpp
+++ b/khtml/rendering/render_replaced.cpp
@@ -183,7 +183,7 @@ bool RenderWidget::event( TQEvent *e )
return true;
TQWidgetResizeEvent *re = static_cast<TQWidgetResizeEvent *>(e);
m_widget->resize( re->w, re->h );
- repaint();
+ tqrepaint();
}
// eat all events - except if this is a frame (in which case KHTMLView handles it all)
if ( ::tqqt_cast<KHTMLView *>( m_widget ) )
@@ -543,10 +543,10 @@ static void copyWidget(const TQRect& r, TQPainter *p, TQWidget *widget, int tx,
}
}
}
- TQMemArray<TQRect> br = blit.rects();
+ TQMemArray<TQRect> br = blit.tqrects();
const int cnt = br.size();
- const bool external = p->device()->isExtDev();
+ const bool external = p->tqdevice()->isExtDev();
TQPixmap* const pm = PaintBuffer::grab( widget->size() );
if (!pm)
{
@@ -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->colorGroup().base();
+ const TQColor c = widget->tqcolorGroup().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->focusWidget() != widget() &&
+ if (tqApp->tqfocusWidget() != widget() &&
widget()->focusPolicy() <= TQ_StrongFocus) {
TQT_TQWHEELEVENT(e)->ignore();
TQApplication::sendEvent(view(), e);
diff --git a/khtml/rendering/render_style.cpp b/khtml/rendering/render_style.cpp
index a71dd411..81d0b62e 100644
--- a/khtml/rendering/render_style.cpp
+++ b/khtml/rendering/render_style.cpp
@@ -726,7 +726,7 @@ bool RenderStyle::inheritedNotEqual( RenderStyle *other ) const
CbLayout: The containing block of the object needs a relayout.
Layout: the RenderObject needs a relayout after the style change
Visible: The change is visible, but no relayout is needed
- NonVisible: The object does need neither repaint nor relayout after
+ NonVisible: The object does need neither tqrepaint nor relayout after
the change.
### TODO:
@@ -744,7 +744,7 @@ RenderStyle::Diff RenderStyle::diff( const RenderStyle *other ) const
// EUserInput _user_input : 2; as long as :enabled is not impl'd
// ### this needs work to know more exactly if we need a relayout
-// or just a repaint
+// or just a tqrepaint
// non-inherited attributes
// DataRef<StyleBoxData> box;
@@ -786,7 +786,7 @@ RenderStyle::Diff RenderStyle::diff( const RenderStyle *other ) const
!(noninherited_flags.f._position == other->noninherited_flags.f._position) ||
!(noninherited_flags.f._floating == other->noninherited_flags.f._floating) ||
!(noninherited_flags.f._flowAroundFloats == other->noninherited_flags.f._flowAroundFloats) ||
- !(noninherited_flags.f._unicodeBidi == other->noninherited_flags.f._unicodeBidi) )
+ !(noninherited_flags.f._tqunicodeBidi == other->noninherited_flags.f._tqunicodeBidi) )
return CbLayout;
}
diff --git a/khtml/rendering/render_style.h b/khtml/rendering/render_style.h
index c60a7ef4..59e38277 100644
--- a/khtml/rendering/render_style.h
+++ b/khtml/rendering/render_style.h
@@ -39,7 +39,7 @@
#include <tqfont.h>
#include <tqfontmetrics.h>
#include <tqptrlist.h>
-#include <palette.h>
+#include <tqpalette.h>
#include <tqapplication.h>
#include "dom/dom_misc.h"
@@ -919,7 +919,7 @@ protected:
PseudoId _styleType : 4;
bool _hasClip : 1;
unsigned _pseudoBits : 8;
- EUnicodeBidi _unicodeBidi : 2;
+ EUnicodeBidi _tqunicodeBidi : 2;
// non CSS2 non-inherited
bool _textOverflow : 1; // Whether or not lines that spill out should be truncated with "..."
@@ -991,7 +991,7 @@ protected:
noninherited_flags.f._styleType = NOPSEUDO;
noninherited_flags.f._hasClip = false;
noninherited_flags.f._pseudoBits = 0;
- noninherited_flags.f._unicodeBidi = initialUnicodeBidi();
+ noninherited_flags.f._tqunicodeBidi = initialUnicodeBidi();
noninherited_flags.f._textOverflow = initialTextOverflow();
noninherited_flags.f.unused = 0;
}
@@ -1108,7 +1108,7 @@ public:
LengthBox clip() const { return visual->clip; }
bool hasClip() const { return noninherited_flags.f._hasClip; }
- EUnicodeBidi unicodeBidi() const { return noninherited_flags.f._unicodeBidi; }
+ EUnicodeBidi tqunicodeBidi() const { return noninherited_flags.f._tqunicodeBidi; }
EClear clear() const { return noninherited_flags.f._clear; }
ETableLayout tableLayout() const { return noninherited_flags.f._table_layout; }
@@ -1272,7 +1272,7 @@ public:
void setClip( Length top, Length right, Length bottom, Length left );
void setHasClip( bool b ) { noninherited_flags.f._hasClip = b; }
- void setUnicodeBidi( EUnicodeBidi b ) { noninherited_flags.f._unicodeBidi = b; }
+ void setUnicodeBidi( EUnicodeBidi b ) { noninherited_flags.f._tqunicodeBidi = b; }
void setClear(EClear v) { noninherited_flags.f._clear = v; }
void setTableLayout(ETableLayout v) { noninherited_flags.f._table_layout = v; }
diff --git a/khtml/rendering/render_table.cpp b/khtml/rendering/render_table.cpp
index 2cf1bf1f..26e9c26d 100644
--- a/khtml/rendering/render_table.cpp
+++ b/khtml/rendering/render_table.cpp
@@ -482,7 +482,7 @@ void RenderTable::paint( PaintInfo& pI, int _tx, int _ty)
#if 0
TQString m;
for (uint i = 0; i < borderStyles.count(); i++)
- m += TQString("%1 ").arg((*borderStyles.at(i)).width());
+ m += TQString("%1 ").arg((*borderStyles.tqat(i)).width());
kdDebug(6040) << m << endl;
#endif
TQValueListIterator<CollapsedBorderValue> it = borderStyles.begin();
diff --git a/khtml/rendering/render_text.cpp b/khtml/rendering/render_text.cpp
index f5fa2e37..cc41a168 100644
--- a/khtml/rendering/render_text.cpp
+++ b/khtml/rendering/render_text.cpp
@@ -738,7 +738,7 @@ void RenderText::deleteInlineBoxes(RenderArena* arena)
if (!arena)
arena = renderArena();
for(unsigned int i=0; i < len; i++) {
- InlineTextBox* s = m_lines.at(i);
+ InlineTextBox* s = m_lines.tqat(i);
if (s)
s->detach(arena);
m_lines.remove(i);
@@ -1036,7 +1036,7 @@ void RenderText::calcMinMaxWidth()
bool firstLine = true;
for(int i = 0; i < len; i++)
{
- unsigned short c = str->s[i].unicode();
+ unsigned short c = str->s[i].tqunicode();
bool isNewline = false;
// If line-breaks survive to here they are preserved
@@ -1056,7 +1056,7 @@ void RenderText::calcMinMaxWidth()
continue;
int wordlen = 0;
- while( i+wordlen < len && (i+wordlen == 0 || str->s[i+wordlen].unicode() != SOFT_HYPHEN) &&
+ while( i+wordlen < len && (i+wordlen == 0 || str->s[i+wordlen].tqunicode() != SOFT_HYPHEN) &&
!(isBreakable( str->s, i+wordlen, str->l )) )
wordlen++;
@@ -1328,11 +1328,11 @@ short RenderText::width() const
return w;
}
-void RenderText::repaint(Priority p)
+void RenderText::tqrepaint(Priority p)
{
RenderObject *cb = containingBlock();
if(cb)
- cb->repaint(p);
+ cb->tqrepaint(p);
}
bool RenderText::isFixedWidthFont() const
@@ -1464,13 +1464,13 @@ static TQString quoteAndEscapeNonPrintables(const TQString &s)
TQString result;
result += '"';
for (uint i = 0; i != s.length(); ++i) {
- TQChar c = s.at(i);
+ TQChar c = s.tqat(i);
if (c == '\\') {
result += "\\\\";
} else if (c == '"') {
result += "\\\"";
} else {
- ushort u = c.unicode();
+ ushort u = c.tqunicode();
if (u >= 0x20 && u < 0x7F) {
result += c;
} else {
diff --git a/khtml/rendering/render_text.h b/khtml/rendering/render_text.h
index 50132fbc..0923837b 100644
--- a/khtml/rendering/render_text.h
+++ b/khtml/rendering/render_text.h
@@ -36,7 +36,7 @@
class TQPainter;
class TQFontMetrics;
-// Define a constant for soft hyphen's unicode value.
+// Define a constant for soft hyphen's tqunicode value.
#define SOFT_HYPHEN 173
const int cNoTruncation = -1;
@@ -247,7 +247,7 @@ public:
virtual short marginLeft() const { return style()->marginLeft().minWidth(0); }
virtual short marginRight() const { return style()->marginRight().minWidth(0); }
- virtual void repaint(Priority p=NormalPriority);
+ virtual void tqrepaint(Priority p=NormalPriority);
bool hasBreakableChar() const { return m_hasBreakableChar; }
const TQFontMetrics &metrics(bool firstLine) const;
diff --git a/khtml/test/align2.html b/khtml/test/align2.html
index 56f3feb7..789fa320 100644
--- a/khtml/test/align2.html
+++ b/khtml/test/align2.html
@@ -4,14 +4,14 @@
</HEAD>
<BODY>
<H1>Align Test 2</H1>
-This page contains regression tests for vertical alignment of images.
+This page contains regression tests for vertical tqalignment of images.
Each test consist of a table with a colored background.
Within the table an empty image is shown with a border of 1 pixel around it.
<HR>
<TABLE width = 100%>
<tr><td bgcolor="0000ff">
<IMG SRC="unknown.gif" height=10 width=50 border=1>
-<FONT size=7>This image has no alignment</FONT>
+<FONT size=7>This image has no tqalignment</FONT>
</td></tr>
</TABLE>
<HR>
@@ -39,7 +39,7 @@ Within the table an empty image is shown with a border of 1 pixel around it.
<TABLE width = 100%>
<tr><td bgcolor="0000ff">
<IMG SRC="unknown.gif" height=150 width=50 border=1>
-<FONT size=7>This image has no alignment</FONT>
+<FONT size=7>This image has no tqalignment</FONT>
<IMG SRC="unknown.gif" height=50 width=50 border=1>
</td></tr>
</TABLE>
@@ -68,7 +68,7 @@ Within the table an empty image is shown with a border of 1 pixel around it.
<TABLE width = 100%>
<tr><td bgcolor="0000ff">
<IMG SRC="unknown.gif" height=10 width=50 border=1>
-<FONT>This image has no alignment</FONT>
+<FONT>This image has no tqalignment</FONT>
</td></tr>
</TABLE>
<HR>
@@ -96,7 +96,7 @@ Within the table an empty image is shown with a border of 1 pixel around it.
<TABLE width = 100%>
<tr><td bgcolor="0000ff">
<IMG SRC="unknown.gif" height=150 width=50 border=1>
-<FONT>This image has no alignment</FONT>
+<FONT>This image has no tqalignment</FONT>
<IMG SRC="unknown.gif" height=50 width=50 border=1>
</td></tr>
</TABLE>
diff --git a/khtml/test/image_map.html b/khtml/test/image_map.html
index 21e00238..35d170d2 100644
--- a/khtml/test/image_map.html
+++ b/khtml/test/image_map.html
@@ -13,11 +13,11 @@ Moving the mouse cursor over the image should show different destinations
<!-- =============== TOP IMAGE MAP =========== -->
<MAP name="topbar">
-<AREA shape="rect" coords="90,0,120,18" href="http://www.kde.org/faq/kdefaq.html">
-<AREA shape="rect" coords="130,0,205,18" href="ftp://ftp.kde.org/pub/kde/">
-<AREA shape="rect" coords="215,0,295,18" href="http://www.kde.org/absolute_url.html">
-<AREA shape="rect" coords="305,0,355,18" href="relative_url_index.html">
-<AREA shape="default" nohref>
+<AREA tqshape="rect" coords="90,0,120,18" href="http://www.kde.org/faq/kdefaq.html">
+<AREA tqshape="rect" coords="130,0,205,18" href="ftp://ftp.kde.org/pub/kde/">
+<AREA tqshape="rect" coords="215,0,295,18" href="http://www.kde.org/absolute_url.html">
+<AREA tqshape="rect" coords="305,0,355,18" href="relative_url_index.html">
+<AREA tqshape="default" nohref>
</MAP>
</BODY>
diff --git a/khtml/test_regression.cpp b/khtml/test_regression.cpp
index e8be1ed1..93c2deea 100644
--- a/khtml/test_regression.cpp
+++ b/khtml/test_regression.cpp
@@ -74,7 +74,7 @@
#include <tqpushbutton.h>
#include <tqscrollview.h>
#include <tqstring.h>
-#include <textstream.h>
+#include <tqtextstream.h>
#include <tqvaluelist.h>
#include <tqwidget.h>
#include <tqfileinfo.h>
@@ -943,7 +943,7 @@ TQString RegressionTest::getPartOutput( OutputType type)
getPartDOMOutput( outputStream, m_part, 0 );
}
- dump.replace( m_baseDir + "/tests", TQString::fromLatin1( "REGRESSION_SRCDIR" ) );
+ dump.replace( m_baseDir + "/tests", TQString::tqfromLatin1( "REGRESSION_SRCDIR" ) );
return dump;
}
@@ -1051,7 +1051,7 @@ void RegressionTest::doJavascriptReport( const TQString &test )
text.replace( TQRegExp( "\nFAIL" ), "\n<span style='color: red'>FAIL</span>" );
text.replace( TQRegExp( "\nPASSED" ), "\n<span style='color: green'>PASSED</span>" );
text.replace( TQRegExp( "\nPASS" ), "\n<span style='color: green'>PASS</span>" );
- if ( text.at( 0 ) == '\n' )
+ if ( text.tqat( 0 ) == '\n' )
text = text.mid( 1, text.length() );
text.replace( '\n', "<br>\n" );
cl += text;
@@ -1079,8 +1079,8 @@ static TQString makeRelativePath(const TQString &base, const TQString &path)
pos++;
int newpos = absBase.find('/', pos);
if (newpos == -1) newpos = absBase.length();
- TQConstString cmpPathComp(absPath.unicode() + pos, newpos - pos);
- TQConstString cmpBaseComp(absBase.unicode() + pos, newpos - pos);
+ TQConstString cmpPathComp(absPath.tqunicode() + pos, newpos - pos);
+ TQConstString cmpBaseComp(absBase.tqunicode() + pos, newpos - pos);
// kdDebug() << "cmpPathComp: \"" << cmpPathComp.string() << "\"" << endl;
// kdDebug() << "cmpBaseComp: \"" << cmpBaseComp.string() << "\"" << endl;
// kdDebug() << "pos: " << pos << " newpos: " << newpos << endl;
@@ -1094,8 +1094,8 @@ static TQString makeRelativePath(const TQString &base, const TQString &path)
TQString rel;
{
- TQConstString relBase(absBase.unicode() + basepos, absBase.length() - basepos);
- TQConstString relPath(absPath.unicode() + pathpos, absPath.length() - pathpos);
+ TQConstString relBase(absBase.tqunicode() + basepos, absBase.length() - basepos);
+ TQConstString relPath(absPath.tqunicode() + pathpos, absPath.length() - pathpos);
// generate as many .. as there are path elements in relBase
if (relBase.string().length() > 0) {
for (int i = relBase.string().contains('/'); i > 0; --i)
@@ -1138,7 +1138,7 @@ void RegressionTest::doFailureReport( const TQString& test, int failures )
if ( failures & RenderFailure ) {
renderDiff += "<pre>";
- FILE *pipe = popen( TQString::fromLatin1( "diff -u baseline/%1-render %3/%2-render" )
+ FILE *pipe = popen( TQString::tqfromLatin1( "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::fromLatin1( "diff -u baseline/%1-dom %3/%2-dom" )
+ FILE *pipe = popen( TQString::tqfromLatin1( "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 615dfc19..93f698ed 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::fromLatin1(name).contains("ahem");
+ ahem = TQString::tqfromLatin1(name).contains("ahem");
}
QFakeFontEngine::~QFakeFontEngine()
@@ -337,7 +337,7 @@ void DCOPClient::processSocketData( int )
}
#include <tqapplication.h>
-#include <palette.h>
+#include <tqpalette.h>
KDE_EXPORT void TQApplication::setPalette( const TQPalette &, bool ,
const char* )
diff --git a/khtml/testkhtml.cpp b/khtml/testkhtml.cpp
index 7765cee8..4a2b2daa 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()->topLevelWidget(), TQT_SLOT(setCaption(const TQString &)));
+ doc->widget()->tqtopLevelWidget(), 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::fromLatin1("Please select directory with tests"));
+ TQString::tqfromLatin1("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::fromLatin1("<td>(Cold):") + TQString::number(t) + "</td>");
+ m_part->write(TQString::tqfromLatin1("<td>(Cold):") + TQString::number(t) + "</td>");
else {
total += t;
- m_part->write(TQString::fromLatin1("<td><i>") + TQString::number(t) + "</i></td>");
+ m_part->write(TQString::tqfromLatin1("<td><i>") + TQString::number(t) + "</i></td>");
}
}
- m_part->write(TQString::fromLatin1("<td>Average:<b>") + TQString::number(double(total) / HOT_RUNS) + "</b></td>");
+ m_part->write(TQString::tqfromLatin1("<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 5121e9ca..c49a03e7 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::currentDateTime();
+ m_createTime = TQDateTime::tqcurrentDateTime();
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::currentDateTime();
+ m_createTime = TQDateTime::tqcurrentDateTime();
m_defaultHandled = false;
}
@@ -590,10 +590,10 @@ KeyEventBaseImpl::KeyEventBaseImpl(EventId id, bool canBubbleArg, bool cancelabl
m_keyVal = key->ascii();
m_virtKeyVal = virtKeyToQtKey()->toLeft(key->key());
- // m_keyVal should contain the unicode value
+ // m_keyVal should contain the tqunicode value
// of the pressed key if available.
if (m_virtKeyVal == DOM_VK_UNDEFINED && !key->text().isEmpty())
- m_keyVal = TQString(key->text()).unicode()[0];
+ m_keyVal = TQString(key->text()).tqunicode()[0];
// key->state returns enum ButtonState, which is ShiftButton, ControlButton and AltButton or'ed together.
m_modifier = key->state();
@@ -739,10 +739,10 @@ DOMString KeyboardEventImpl::keyIdentifier() const
{
if (unsigned special = virtKeyVal())
if (const char* id = keyIdentifiersToVirtKeys()->toLeft(special))
- return TQString::fromLatin1(id);
+ return TQString::tqfromLatin1(id);
- if (unsigned unicode = keyVal())
- return TQString(TQChar(unicode));
+ if (unsigned tqunicode = keyVal())
+ return TQString(TQChar(tqunicode));
return "Unidentified";
}
@@ -773,9 +773,9 @@ void KeyboardEventImpl::initKeyboardEvent(const DOMString &typeArg,
//Figure out the code information from the key identifier.
if (keyIdentifierArg.length() == 1) {
- //Likely to be normal unicode id, unless it's one of the few
+ //Likely to be normal tqunicode id, unless it's one of the few
//special values.
- unsigned short code = keyIdentifierArg.unicode()[0];
+ unsigned short code = keyIdentifierArg.tqunicode()[0];
if (code > 0x20 && code != 0x7F)
keyVal = code;
}
@@ -819,7 +819,7 @@ int KeyboardEventImpl::keyCode() const
if (m_virtKeyVal != DOM_VK_UNDEFINED)
return m_virtKeyVal;
else
- return TQChar((unsigned short)m_keyVal).upper().unicode();
+ return TQChar((unsigned short)m_keyVal).upper().tqunicode();
}
int KeyboardEventImpl::charCode() const
@@ -856,14 +856,14 @@ void TextEventImpl::initTextEvent(const DOMString &typeArg,
//See whether we can get a key out of this.
unsigned keyCode = 0;
if (text.length() == 1)
- keyCode = text.unicode()[0].unicode();
+ keyCode = text.tqunicode()[0].tqunicode();
initKeyBaseEvent(typeArg, canBubbleArg, cancelableArg, viewArg,
keyCode, 0, 0);
}
int TextEventImpl::keyCode() const
{
- //Mozilla returns 0 here unless this is a non-unicode key.
+ //Mozilla returns 0 here unless this is a non-tqunicode key.
//IE stuffs everything here, and so we try to match it..
if (m_keyVal)
return m_keyVal;
@@ -872,8 +872,8 @@ int TextEventImpl::keyCode() const
int TextEventImpl::charCode() const
{
- //On text events, in Mozilla charCode is 0 for non-unicode keys,
- //and the unicode key otherwise... IE doesn't support this.
+ //On text events, in Mozilla charCode is 0 for non-tqunicode keys,
+ //and the tqunicode key otherwise... IE doesn't support this.
if (m_virtKeyVal)
return 0;
return m_keyVal;
diff --git a/khtml/xml/dom_docimpl.cpp b/khtml/xml/dom_docimpl.cpp
index 922714a4..0f70610e 100644
--- a/khtml/xml/dom_docimpl.cpp
+++ b/khtml/xml/dom_docimpl.cpp
@@ -337,7 +337,7 @@ DocumentImpl::DocumentImpl(DOMImplementationImpl *_implementation, KHTMLView *v)
m_namespaceMap = new IdNameMapping(1);
TQString xhtml(XHTML_NAMESPACE);
m_namespaceMap->names.insert(emptyNamespace, new DOMStringImpl(""));
- m_namespaceMap->names.insert(xhtmlNamespace, new DOMStringImpl(xhtml.unicode(), xhtml.length()));
+ m_namespaceMap->names.insert(xhtmlNamespace, new DOMStringImpl(xhtml.tqunicode(), xhtml.length()));
m_namespaceMap->names[emptyNamespace]->ref();
m_namespaceMap->names[xhtmlNamespace]->ref();
m_namespaceMap->count+=2;
@@ -1387,7 +1387,7 @@ void DocumentImpl::write( const TQString &text )
if (m_view)
m_view->part()->resetFromScript();
m_tokenizer->setAutoClose();
- write(TQString::fromLatin1("<html>"));
+ write(TQString::tqfromLatin1("<html>"));
}
m_tokenizer->write(text, false);
}
diff --git a/khtml/xml/dom_docimpl.h b/khtml/xml/dom_docimpl.h
index 5e50c09a..8d20f47e 100644
--- a/khtml/xml/dom_docimpl.h
+++ b/khtml/xml/dom_docimpl.h
@@ -198,7 +198,7 @@ public:
DocumentFragmentImpl *createDocumentFragment ();
TextImpl *createTextNode ( DOMStringImpl* data ) { return new TextImpl( docPtr(), data); }
TextImpl *createTextNode ( const TQString& data )
- { return createTextNode(new DOMStringImpl(data.unicode(), data.length())); }
+ { return createTextNode(new DOMStringImpl(data.tqunicode(), data.length())); }
CommentImpl *createComment ( DOMStringImpl* data );
CDATASectionImpl *createCDATASection ( DOMStringImpl* data );
ProcessingInstructionImpl *createProcessingInstruction ( const DOMString &target, DOMStringImpl* data );
diff --git a/khtml/xml/dom_elementimpl.cpp b/khtml/xml/dom_elementimpl.cpp
index 552ac208..f4506c8b 100644
--- a/khtml/xml/dom_elementimpl.cpp
+++ b/khtml/xml/dom_elementimpl.cpp
@@ -46,7 +46,7 @@
#include "css/cssproperties.h"
#include "xml/dom_xmlimpl.h"
-#include <textstream.h>
+#include <tqtextstream.h>
#include <kdebug.h>
#include <stdlib.h>
@@ -855,7 +855,7 @@ DOMString ElementImpl::toString() const
for (NodeImpl *child = firstChild(); child != NULL; child = child->nextSibling()) {
DOMString kid = child->toString();
- result += TQConstString(kid.unicode(), kid.length()).string();
+ result += TQConstString(kid.tqunicode(), kid.length()).string();
}
result += "</";
diff --git a/khtml/xml/dom_nodeimpl.cpp b/khtml/xml/dom_nodeimpl.cpp
index 5febe695..834f4b67 100644
--- a/khtml/xml/dom_nodeimpl.cpp
+++ b/khtml/xml/dom_nodeimpl.cpp
@@ -588,7 +588,7 @@ void NodeImpl::handleLocalEvents(EventImpl *evt, bool useCapture)
Event ev = evt;
// removeEventListener (e.g. called from a JS event listener) might
- // invalidate the item after the current iterator (which "it" is pointing to).
+ // tqinvalidate the item after the current iterator (which "it" is pointing to).
// So we make a copy of the list.
TQValueList<RegisteredEventListener> listeners = *m_regdListeners.listeners;
TQValueList<RegisteredEventListener>::iterator it;
@@ -989,7 +989,7 @@ DOMStringImpl* NodeImpl::textContent() const
delete kidText;
}
}
- return new DOMStringImpl(out.unicode(), out.length());
+ return new DOMStringImpl(out.tqunicode(), out.length());
}
//-------------------------------------------------------------------------
@@ -1925,7 +1925,7 @@ NodeImpl *GenericRONamedNodeMapImpl::item ( unsigned long index ) const
if (index >= m_contents->count())
return 0;
- return m_contents->at(index);
+ return m_contents->tqat(index);
}
unsigned long GenericRONamedNodeMapImpl::length( ) const
diff --git a/khtml/xml/dom_stringimpl.cpp b/khtml/xml/dom_stringimpl.cpp
index 79bddf5d..14aa4f5e 100644
--- a/khtml/xml/dom_stringimpl.cpp
+++ b/khtml/xml/dom_stringimpl.cpp
@@ -61,8 +61,8 @@ bool DOMStringImpl::containsOnlyWhitespace() const
for (uint i = 0; i < l; i++) {
TQChar c = s[i];
- if (c.unicode() <= 0x7F) {
- if (c.unicode() > ' ')
+ if (c.tqunicode() <= 0x7F) {
+ if (c.tqunicode() > ' ')
return false;
} else {
if (c.direction() != TQChar::DirWS)
@@ -294,10 +294,10 @@ khtml::Length* DOMStringImpl::toCoordsArray(int& len) const
int pos2;
while((pos2 = str.find(' ', pos)) != -1) {
- r[i++] = parseLength((TQChar *) str.unicode()+pos, pos2-pos);
+ r[i++] = parseLength((TQChar *) str.tqunicode()+pos, pos2-pos);
pos = pos2+1;
}
- r[i] = parseLength((TQChar *) str.unicode()+pos, str.length()-pos);
+ r[i] = parseLength((TQChar *) str.tqunicode()+pos, str.length()-pos);
return r;
}
@@ -320,13 +320,13 @@ khtml::Length* DOMStringImpl::toLengthArray(int& len) const
int pos2;
while((pos2 = str.find(',', pos)) != -1) {
- r[i++] = parseLength((TQChar *) str.unicode()+pos, pos2-pos);
+ r[i++] = parseLength((TQChar *) str.tqunicode()+pos, pos2-pos);
pos = pos2+1;
}
/* IE Quirk: If the last comma is the last char skip it and reduce len by one */
if (str.length()-pos > 0)
- r[i] = parseLength((TQChar *) str.unicode()+pos, str.length()-pos);
+ r[i] = parseLength((TQChar *) str.tqunicode()+pos, str.length()-pos);
else
len--;
diff --git a/khtml/xml/dom_stringimpl.h b/khtml/xml/dom_stringimpl.h
index cd712896..edac4675 100644
--- a/khtml/xml/dom_stringimpl.h
+++ b/khtml/xml/dom_stringimpl.h
@@ -92,7 +92,7 @@ public:
DOMStringImpl *capitalize(bool noFirstCap=false) const;
DOMStringImpl *escapeHTML();
- TQChar *unicode() const { return s; }
+ TQChar *tqunicode() const { return s; }
uint length() const { return l; }
TQString string() const;
diff --git a/khtml/xml/xml_tokenizer.cpp b/khtml/xml/xml_tokenizer.cpp
index 7c043815..8f6164f5 100644
--- a/khtml/xml/xml_tokenizer.cpp
+++ b/khtml/xml/xml_tokenizer.cpp
@@ -42,7 +42,7 @@ using namespace DOM;
using namespace khtml;
XMLIncrementalSource::XMLIncrementalSource()
- : TQXmlInputSource(), m_pos( 0 ), m_unicode( 0 ),
+ : TQXmlInputSource(), m_pos( 0 ), m_tqunicode( 0 ),
m_finished( false )
{
}
@@ -59,13 +59,13 @@ TQChar XMLIncrementalSource::next()
else if ( m_data.length() <= m_pos )
return TQXmlInputSource::EndOfData;
else
- return m_unicode[m_pos++];
+ return m_tqunicode[m_pos++];
}
void XMLIncrementalSource::setData( const TQString& str )
{
m_data = str;
- m_unicode = m_data.unicode();
+ m_tqunicode = m_data.tqunicode();
m_pos = 0;
if ( !str.isEmpty() )
m_finished = false;
@@ -78,7 +78,7 @@ void XMLIncrementalSource::setData( const TQByteArray& data )
void XMLIncrementalSource::appendXML( const TQString& str )
{
m_data += str;
- m_unicode = m_data.unicode();
+ m_tqunicode = m_data.tqunicode();
}
TQString XMLIncrementalSource::data()
@@ -289,7 +289,7 @@ bool XMLHandler::comment(const TQString & ch)
if (currentNode()->nodeType() == Node::TEXT_NODE)
exitText();
// ### handle exceptions
- currentNode()->addChild(m_doc->createComment(new DOMStringImpl(ch.unicode(), ch.length())));
+ currentNode()->addChild(m_doc->createComment(new DOMStringImpl(ch.tqunicode(), ch.length())));
return true;
}
@@ -299,7 +299,7 @@ bool XMLHandler::processingInstruction(const TQString &target, const TQString &d
exitText();
// ### handle exceptions
ProcessingInstructionImpl *pi =
- m_doc->createProcessingInstruction(target, new DOMStringImpl(data.unicode(), data.length()));
+ m_doc->createProcessingInstruction(target, new DOMStringImpl(data.tqunicode(), data.length()));
currentNode()->addChild(pi);
pi->checkStyleSheet();
return true;
@@ -364,7 +364,7 @@ bool XMLHandler::internalEntityDecl(const TQString &name, const TQString &value)
{
EntityImpl *e = new EntityImpl(m_doc,name);
// ### further parse entities inside the value and add them as separate nodes (or entityreferences)?
- e->addChild(m_doc->createTextNode(new DOMStringImpl(value.unicode(), value.length())));
+ e->addChild(m_doc->createTextNode(new DOMStringImpl(value.tqunicode(), value.length())));
if (m_doc->doctype())
static_cast<GenericRONamedNodeMapImpl*>(m_doc->doctype()->entities())->addNode(e);
return true;
diff --git a/khtml/xml/xml_tokenizer.h b/khtml/xml/xml_tokenizer.h
index 749c423f..d2910472 100644
--- a/khtml/xml/xml_tokenizer.h
+++ b/khtml/xml/xml_tokenizer.h
@@ -155,7 +155,7 @@ public:
private:
TQString m_data;
uint m_pos;
- const TQChar *m_unicode;
+ const TQChar *m_tqunicode;
bool m_finished;
};
diff --git a/kimgio/dds.cpp b/kimgio/dds.cpp
index 080c73c9..1beb025c 100644
--- a/kimgio/dds.cpp
+++ b/kimgio/dds.cpp
@@ -910,7 +910,7 @@ namespace { // Private.
return false;
}
- int offset = s.device()->at();
+ int offset = s.tqdevice()->tqat();
int size = FaceOffset( header );
for( int i = 0; i < 6; i++ ) {
@@ -921,7 +921,7 @@ namespace { // Private.
}
// Seek device.
- s.device()->at( offset );
+ s.tqdevice()->tqat( offset );
offset += size;
// Load face from stream.
@@ -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->seStatus( -1 );
+ io->setqStatus( -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->seStatus( -1 );
+ io->setqStatus( -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->seStatus( -1 );
+ io->setqStatus( -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->seStatus( -1 );
+ io->setqStatus( -1 );
return;
}
io->setImage( img );
- io->seStatus( 0 );
+ io->setqStatus( 0 );
}
diff --git a/kimgio/eps.cpp b/kimgio/eps.cpp
index 496dd1e1..a2770cc7 100644
--- a/kimgio/eps.cpp
+++ b/kimgio/eps.cpp
@@ -61,7 +61,7 @@ static bool seekToCodeStart( TQIODevice * io, TQ_UINT32 & ps_offset, TQ_UINT32 &
+ ((unsigned char) buf[2] << 16)
+ ((unsigned char) buf[3] << 24);
kdDebug(399) << "kimgio EPS: Offset: " << ps_offset <<" Size: " << ps_size << endl;
- if ( !io->at(ps_offset) ) // Get offset of PostScript code in the MS-DOS EPS file.
+ if ( !io->tqat(ps_offset) ) // Get offset of PostScript code in the MS-DOS EPS file.
{
kdError(399) << "kimgio EPS: cannot seek in MS-DOS EPS file" << endl;
return false;
@@ -218,7 +218,7 @@ KDE_EXPORT void kimgio_eps_read (TQImageIO *image)
io->reset(); // Go back to start of file to give all the file to GhostScript
if (ps_offset>0L) // We have an offset
- io->at(ps_offset);
+ io->tqat(ps_offset);
TQByteArray buffer ( io->readAll() );
// If we have no MS-DOS EPS file or if the size seems wrong, then choose the buffer size
@@ -234,7 +234,7 @@ KDE_EXPORT void kimgio_eps_read (TQImageIO *image)
TQImage myimage;
if( myimage.load (tmpFile.name()) ) {
image->setImage (myimage);
- image->seStatus (0);
+ image->setqStatus (0);
kdDebug(399) << "kimgio EPS: success!" << endl;
}
else
@@ -290,5 +290,5 @@ KDE_EXPORT void kimgio_eps_write( TQImageIO *imageio )
inFile.close();
- imageio->seStatus(0);
+ imageio->setqStatus(0);
}
diff --git a/kimgio/exr.cpp b/kimgio/exr.cpp
index 88b3fbbb..2af22b34 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->seStatus( 0 );
+ io->setqStatus( 0 );
}
catch (const std::exception &exc)
{
diff --git a/kimgio/hdr.cpp b/kimgio/hdr.cpp
index cf761b23..82a2e111 100644
--- a/kimgio/hdr.cpp
+++ b/kimgio/hdr.cpp
@@ -127,7 +127,7 @@ namespace { // Private.
if (val != 2)
{
- s.device()->at( s.device()->at() - 1 );
+ s.tqdevice()->tqat( s.tqdevice()->tqat() - 1 );
Read_Old_Line(image.data(), width, s);
RGBE_To_QRgbLine(image.data(), scanline, width);
continue;
@@ -225,7 +225,7 @@ KDE_EXPORT void kimgio_hdr_read( TQImageIO * io )
{
kdDebug(399) << "Unknown HDR format." << endl;
io->setImage( TQImage() );
- io->seStatus( -1 );
+ io->setqStatus( -1 );
return;
}
@@ -238,7 +238,7 @@ KDE_EXPORT void kimgio_hdr_read( TQImageIO * io )
{
kdDebug(399) << "Invalid HDR file." << endl;