From a51cd9949c4e6c726a84a61de3cfadd30cefb5c7 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:57:02 -0600 Subject: [PATCH] Remove additional unneeded tq method conversions --- KDE3PORTING.html | 6 +- arts/kde/kvideowidget.cpp | 2 +- dcop/KDE-ICE/ICElib.h | 4 +- dcop/KDE-ICE/ICEmsg.h | 4 +- dcop/KDE-ICE/shutdown.c | 4 +- dcop/client/dcop.cpp | 2 +- dcop/client/dcopfind.cpp | 2 +- dcop/dcopref.h | 2 +- dcop/dcopserver.cpp | 8 +- interfaces/khexedit/byteseditinterface.h | 2 +- interfaces/kimproxy/interface/kimiface.h | 2 +- interfaces/ktexteditor/editinterfaceext.h | 2 +- interfaces/ktexteditor/editorchooser.cpp | 2 +- interfaces/ktexteditor/editorchooser_ui.ui | 2 +- kab/addressbook.h | 2 +- kab/qconfigDB.cc | 6 +- kabc/formats/binaryformat.cpp | 2 +- kabc/kab2kabc.cpp | 20 ++-- kabc/resourceselectdialog.cpp | 2 +- kabc/tests/testaddresseelist.cpp | 80 ++++++------- kabc/vcard/AdrValue.cpp | 14 +-- kabc/vcard/ContentLine.cpp | 2 +- kabc/vcard/LangValue.cpp | 2 +- kabc/vcard/NValue.cpp | 10 +- kabc/vcard/OrgValue.cpp | 2 +- kabc/vcard/TextListValue.cpp | 2 +- kabc/vcard/VCard.cpp | 2 +- kabc/vcardparser/vcardparser.cpp | 2 +- kabc/vcardtool.cpp | 2 +- kate/part/kateautoindent.cpp | 10 +- kate/part/katebookmarks.cpp | 10 +- kate/part/katebuffer.cpp | 12 +- kate/part/katebuffer.h | 4 +- kate/part/katecodefoldinghelpers.cpp | 12 +- kate/part/kateconfig.cpp | 12 +- kate/part/katedialogs.cpp | 8 +- kate/part/katedocument.cpp | 40 +++---- kate/part/katefactory.cpp | 2 +- kate/part/katefiletype.cpp | 50 ++++----- kate/part/katehighlight.cpp | 50 ++++----- kate/part/katejscript.cpp | 4 +- kate/part/kateprinter.cpp | 2 +- kate/part/katerenderer.cpp | 4 +- kate/part/kateschema.cpp | 14 +-- kate/part/katesearch.cpp | 6 +- kate/part/katetemplatehandler.cpp | 10 +- kate/part/kateundo.cpp | 8 +- kate/part/kateview.cpp | 6 +- kate/part/kateviewinternal.cpp | 4 +- .../plugins/autobookmarker/autobookmarker.cpp | 2 +- kate/plugins/insertfile/insertfileplugin.cpp | 4 +- kate/plugins/isearch/ISearchPlugin.cpp | 4 +- kate/plugins/kdatatool/kate_kdatatool.cpp | 8 +- .../wordcompletion/docwordcompletion.cpp | 4 +- kcert/kcertpart.cc | 2 +- kded/kbuildservicefactory.cpp | 14 +-- kded/kbuildservicegroupfactory.cpp | 6 +- kded/kbuildservicetypefactory.cpp | 18 +-- kded/kbuildsycoca.cpp | 12 +- kded/kctimefactory.cpp | 8 +- kded/vfolder_menu.cpp | 4 +- kdoctools/kio_help.cpp | 4 +- kdoctools/xslt.cpp | 8 +- khtml/css/css_base.h | 2 +- khtml/css/css_ruleimpl.h | 2 +- khtml/css/css_valueimpl.cpp | 6 +- khtml/css/css_valueimpl.h | 2 +- khtml/css/cssparser.cpp | 2 +- khtml/css/cssstyleselector.cpp | 10 +- khtml/dom/css_value.h | 2 +- khtml/dom/html_block.h | 6 +- khtml/dom/html_form.h | 2 +- khtml/dom/html_image.cpp | 2 +- khtml/dom/html_image.h | 12 +- khtml/dom/html_inline.cpp | 2 +- khtml/dom/html_inline.h | 12 +- khtml/dom/html_table.h | 26 ++--- khtml/ecma/kjs_debugwin.cpp | 14 +-- khtml/ecma/kjs_html.cpp | 8 +- khtml/ecma/kjs_navigator.cpp | 14 +-- khtml/ecma/kjs_window.cpp | 4 +- khtml/html/html_documentimpl.cpp | 2 +- khtml/html/html_elementimpl.cpp | 24 ++-- khtml/html/html_elementimpl.h | 2 +- khtml/html/html_formimpl.cpp | 2 +- khtml/html/html_imageimpl.cpp | 18 +-- khtml/html/html_imageimpl.h | 4 +- khtml/html/html_miscimpl.cpp | 10 +- khtml/java/kjavaappletviewer.cpp | 2 +- khtml/java/kjavaprocess.cpp | 10 +- khtml/khtml_caret.cpp | 8 +- khtml/khtml_pagecache.cpp | 4 +- khtml/khtml_part.cpp | 6 +- khtml/khtml_settings.cc | 2 +- khtml/khtmlview.cpp | 20 ++-- khtml/khtmlview.h | 4 +- khtml/kmultipart/kmultipart.cpp | 4 +- khtml/misc/arena.cpp | 4 +- khtml/misc/htmlattrs.c | 4 +- khtml/misc/khtmllayout.h | 2 +- khtml/misc/loader.cpp | 6 +- khtml/misc/multimap.h | 2 +- khtml/rendering/bidi.cpp | 2 +- khtml/rendering/render_arena.cpp | 4 +- khtml/rendering/render_body.cpp | 4 +- khtml/rendering/render_body.h | 2 +- khtml/rendering/render_box.cpp | 4 +- khtml/rendering/render_box.h | 2 +- khtml/rendering/render_canvas.cpp | 14 +-- khtml/rendering/render_canvas.h | 2 +- khtml/rendering/render_container.cpp | 4 +- khtml/rendering/render_flow.cpp | 6 +- khtml/rendering/render_flow.h | 2 +- khtml/rendering/render_image.cpp | 2 +- khtml/rendering/render_layer.cpp | 50 ++++----- khtml/rendering/render_layer.h | 4 +- khtml/rendering/render_object.cpp | 22 ++-- khtml/rendering/render_object.h | 8 +- khtml/rendering/render_replaced.cpp | 6 +- khtml/rendering/render_style.cpp | 4 +- khtml/rendering/render_table.cpp | 2 +- khtml/rendering/render_text.cpp | 8 +- khtml/rendering/render_text.h | 2 +- khtml/test/align2.html | 10 +- khtml/test/image_map.html | 10 +- khtml/test_regression.cpp | 2 +- khtml/xml/dom_nodeimpl.cpp | 4 +- kimgio/dds.cpp | 14 +-- kimgio/eps.cpp | 8 +- kimgio/exr.cpp | 2 +- kimgio/hdr.cpp | 10 +- kimgio/ico.cpp | 14 +-- kimgio/jp2.cpp | 6 +- kimgio/pcx.cpp | 20 ++-- kimgio/psd.cpp | 14 +-- kimgio/rgb.cpp | 8 +- kimgio/tga.cpp | 12 +- kimgio/tiffr.cpp | 8 +- kimgio/xcf.cpp | 60 +++++----- kimgio/xview.cpp | 4 +- kio/kfile/kacleditwidget.cpp | 14 +-- kio/kfile/kacleditwidget_p.h | 4 +- kio/kfile/kdirselectdialog.cpp | 2 +- kio/kfile/kencodingfiledialog.cpp | 4 +- kio/kfile/kfiledetailview.cpp | 2 +- kio/kfile/kfiledialog.cpp | 10 +- kio/kfile/kfilefiltercombo.cpp | 2 +- kio/kfile/kfileiconview.cpp | 8 +- kio/kfile/kfilepreview.cpp | 2 +- kio/kfile/kfiletreeview.cpp | 2 +- kio/kfile/kfileview.cpp | 2 +- kio/kfile/kfileview.h | 4 +- kio/kfile/kicondialog.cpp | 6 +- kio/kfile/knotifydialog.cpp | 2 +- kio/kfile/kpropertiesdialog.cpp | 4 +- kio/kfile/kurlbar.cpp | 2 +- kio/kfile/kurlcombobox.cpp | 4 +- kio/kio/defaultprogress.cpp | 2 +- kio/kio/job.cpp | 4 +- kio/kio/kar.cpp | 8 +- kio/kio/karchive.cpp | 4 +- kio/kio/kdirlister.cpp | 4 +- kio/kio/kimageio.cpp | 18 +-- kio/kio/klimitediodevice.h | 8 +- kio/kio/kservicefactory.cpp | 12 +- kio/kio/kservicegroupfactory.cpp | 4 +- kio/kio/kservicetypefactory.cpp | 8 +- kio/kio/kshred.cpp | 6 +- kio/kio/ktar.cpp | 26 ++--- kio/kio/kurlcompletion.cpp | 12 +- kio/kio/kurlpixmapprovider.cpp | 2 +- kio/kio/kzip.cpp | 56 ++++----- kio/kio/netaccess.h | 2 +- kio/kio/scheduler.cpp | 4 +- kio/kssl/keygenwizard.ui | 2 +- kio/kssl/keygenwizard2.ui | 2 +- kio/kssl/ksslcertificate.cc | 2 +- kio/kssl/ksslinfodlg.cc | 2 +- kio/kssl/ksslsettings.cc | 2 +- kio/misc/ksendbugmail/main.cpp | 4 +- kio/misc/kssld/kssld.cpp | 4 +- kio/misc/kwalletd/kwalletwizard.ui | 12 +- kio/tests/kfiltertest.cpp | 4 +- kioslave/http/http.cc | 4 +- kioslave/http/kcookiejar/kcookiejar.cpp | 2 +- kioslave/iso/iso.cpp | 4 +- kioslave/iso/kiso.cpp | 2 +- kioslave/iso/kisofile.cpp | 4 +- kjs/internal.cpp | 2 +- kmdi/kmdi/dockcontainer.cpp | 4 +- kmdi/kmdi/guiclient.cpp | 4 +- kmdi/kmdi/tabwidget.cpp | 6 +- kmdi/kmdichildfrm.cpp | 2 +- kmdi/kmdichildfrmcaption.cpp | 4 +- kmdi/kmdidockcontainer.cpp | 4 +- kmdi/kmdidocumentviewtabwidget.cpp | 6 +- kmdi/kmdiguiclient.cpp | 4 +- kmdi/kmdimainfrm.cpp | 4 +- kmdi/kmdimainfrm.h | 2 +- kmdi/test/hello.cpp | 2 +- knewstuff/downloaddialog.cpp | 22 ++-- krandr/libkrandr.cc | 6 +- krandr/randr.cpp | 4 +- kresources/selectdialog.cpp | 2 +- kspell2/ui/kspell2ui.ui | 2 +- kstyles/asteroid/asteroid.cpp | 34 +++--- kstyles/highcolor/highcolor.cpp | 6 +- kstyles/highcontrast/highcontrast.cpp | 14 +-- kstyles/keramik/keramik.cpp | 18 +-- kstyles/klegacy/klegacystyle.cpp | 16 +-- kstyles/kthemestyle/kthemebase.cpp | 2 +- kstyles/kthemestyle/kthemestyle.cpp | 10 +- kstyles/kthemestyle/kthemestyle.h | 2 +- kstyles/light/lightstyle-v2.cpp | 2 +- kstyles/light/lightstyle-v3.cpp | 4 +- kstyles/plastik/plastik.cpp | 42 +++---- kstyles/web/webstyle.cpp | 8 +- kutils/kcmoduleproxy.cpp | 2 +- kutils/kmultitabbar.cpp | 40 +++---- kutils/kreplace.h | 2 +- kwallet/backend/kwalletbackend.cc | 2 +- kwallet/backend/kwalletbackend.h | 2 +- tdecore/kallocator.cpp | 6 +- tdecore/kcalendarsystem.cpp | 4 +- tdecore/kclipboard.cpp | 4 +- tdecore/kcmdlineargs.cpp | 2 +- tdecore/kcompletion.cpp | 16 +-- tdecore/kcompletion_private.h | 4 +- tdecore/kconfigbackend.cpp | 2 +- tdecore/kconfigbase.cpp | 14 +-- tdecore/kde-config.cpp.cmake | 4 +- tdecore/kdebug.cpp | 4 +- tdecore/kdebug.h | 4 +- tdecore/kextsock.cpp | 2 +- tdecore/kglobalaccel_x11.cpp | 4 +- tdecore/kglobalsettings.cpp | 2 +- tdecore/kiconeffect.cpp | 2 +- tdecore/klocale.cpp | 44 ++++---- tdecore/kpalette.cpp | 6 +- tdecore/kprocctrl.cpp | 2 +- tdecore/krfcdate.cpp | 2 +- tdecore/kstandarddirs.cpp | 28 ++--- tdecore/kstringhandler.cpp | 10 +- tdecore/ksycoca.cpp | 8 +- tdecore/ksycocadict.cpp | 22 ++-- tdecore/ksycocaentry.h | 2 +- tdecore/ksycocafactory.cpp | 20 ++-- tdecore/malloc/malloc.c | 106 +++++++++--------- tdecore/network/ksocketaddress.cpp | 20 ++-- tdecore/network/ksocketaddress.h | 4 +- tdecore/network/ksocketbase.cpp | 2 +- tdecore/network/ksrvresolverworker.cpp | 2 +- tdecore/svgicons/ksvgiconengine.cpp | 6 +- tdecore/tests/kurltest.cpp | 2 +- tdefx/kimageeffect.cpp | 4 +- tdefx/kstyle.cpp | 22 ++-- .../cups/cupsdconf2/cupsdsecuritypage.cpp | 4 +- tdeprint/cups/cupsdconf2/locationdialog.cpp | 2 +- tdeprint/cups/imagepreview.cpp | 2 +- tdeprint/cups/kpimagepage.cpp | 2 +- tdeprint/driver.cpp | 2 +- tdeprint/driveritem.cpp | 2 +- tdeprint/kmjobmanager.cpp | 2 +- tdeprint/kmmanager.cpp | 2 +- tdeprint/kpgeneralpage.cpp | 6 +- tdeprint/kpqtpage.cpp | 2 +- tdeprint/kprintdialog.cpp | 6 +- tdeprint/lpr/lpchelper.cpp | 8 +- tdeprint/lpr/lpchelper.h | 4 +- tdeprint/lpr/printcapreader.cpp | 2 +- tdeprint/management/kmiconview.cpp | 4 +- tdeprint/management/kmjobviewer.cpp | 6 +- tdeprint/management/kmlistview.cpp | 4 +- tdeprint/management/kmwdriverselect.cpp | 6 +- tdeprint/management/kmwinfobase.cpp | 12 +- tdeprint/tests/drawdemo.cpp | 4 +- tdesu/process.cpp | 2 +- tdeui/kaboutdialog.cpp | 8 +- tdeui/kaboutdialog.h | 4 +- tdeui/kactionclasses.cpp | 2 +- tdeui/kactioncollection.cpp | 6 +- tdeui/kanimwidget.cpp | 4 +- tdeui/karrowbutton.cpp | 2 +- tdeui/karrowbutton.h | 4 +- tdeui/kcharselect.cpp | 2 +- tdeui/kcolorbutton.cpp | 2 +- tdeui/kcolordialog.cpp | 2 +- tdeui/kcompletionbox.cpp | 2 +- tdeui/kcursor.h | 2 +- tdeui/kdatetbl.cpp | 4 +- tdeui/kdialogbase.h | 8 +- tdeui/kdockwidget.cpp | 12 +- tdeui/kdockwidget_private.cpp | 14 +-- tdeui/kdualcolorbutton.cpp | 14 +-- tdeui/keditcl1.cpp | 8 +- tdeui/kfontdialog.cpp | 2 +- tdeui/kjanuswidget.cpp | 2 +- tdeui/kkeybutton.cpp | 4 +- tdeui/kkeydialog.cpp | 2 +- tdeui/klanguagebutton.cpp | 8 +- tdeui/kled.cpp | 20 ++-- tdeui/kled.h | 14 +-- tdeui/klistview.cpp | 30 ++--- tdeui/klistview.h | 2 +- tdeui/knuminput.cpp | 30 ++--- tdeui/knuminput.h | 8 +- tdeui/kpanelapplet.cpp | 6 +- tdeui/kpanelapplet.h | 8 +- tdeui/kpanelextension.cpp | 6 +- tdeui/kpanelextension.h | 8 +- tdeui/krootpixmap.cpp | 18 +-- tdeui/krootpixmap.h | 8 +- tdeui/kruler.cpp | 10 +- tdeui/kruler.h | 8 +- tdeui/kselect.cpp | 6 +- tdeui/ksharedpixmap.cpp | 2 +- tdeui/kspell.cpp | 2 +- tdeui/kspellui.ui | 2 +- tdeui/ksqueezedtextlabel.cpp | 4 +- tdeui/kstatusbar.h | 2 +- tdeui/ksystemtray.cpp | 2 +- tdeui/ktabbar.cpp | 8 +- tdeui/ktabctl.cpp | 12 +- tdeui/ktabctl.h | 2 +- tdeui/ktabwidget.cpp | 8 +- tdeui/ktoolbar.cpp | 6 +- tdeui/ktoolbar.h | 2 +- tdeui/ktoolbarbutton.cpp | 12 +- tdeui/kurllabel.cpp | 2 +- tdeui/kwordwrap.cpp | 4 +- tdeui/kwordwrap.h | 4 +- tdeui/tests/kdesattest.cpp | 2 +- tdeui/tests/kdockwidgetdemo.cpp | 2 +- tdeui/tests/kledtest.cpp | 6 +- tdeui/tests/kledtest.h | 2 +- tdeui/tests/ktabwidgettest.cpp | 6 +- tdeui/tests/kunbalancedgrdtest.cpp | 2 +- win/qeventloopex.cpp | 2 +- 338 files changed, 1322 insertions(+), 1322 deletions(-) diff --git a/KDE3PORTING.html b/KDE3PORTING.html index e5849d74c..167d4aed6 100644 --- a/KDE3PORTING.html +++ b/KDE3PORTING.html @@ -647,13 +647,13 @@ For more details please consult the HOWTO file in the kcontrol directory.

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 tqalignment. +notification about a change in alignment.

KPanelApplet

The virtual methods orientationChange() and popupDirectionChange() are deprecated. Instead you should reimplement positionChange() and alignmentChange() to be -notified of changes in the position and tqalignment of the panel on which your applet +notified of changes in the position and alignment 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.

KPanelExtension

There is a new method alignmentChange() that your extension should reimplement if -it needs to know about changes in tqalignment. +it needs to know about changes in alignment.

Return to the Table of Contents

diff --git a/arts/kde/kvideowidget.cpp b/arts/kde/kvideowidget.cpp index 8ea6d4cf4..7199a55a6 100644 --- a/arts/kde/kvideowidget.cpp +++ b/arts/kde/kvideowidget.cpp @@ -147,7 +147,7 @@ void KVideoWidget::embed( Arts::VideoPlayObject vpo ) } setBackgroundMode( PaletteBackground ); - tqrepaint(); + repaint(); // Resize GUI videoWidth = 0; diff --git a/dcop/KDE-ICE/ICElib.h b/dcop/KDE-ICE/ICElib.h index 69c2c2228..f22a36f4f 100644 --- a/dcop/KDE-ICE/ICElib.h +++ b/dcop/KDE-ICE/ICElib.h @@ -89,7 +89,7 @@ typedef enum { IceClosedASAP, IceConnectionInUse, IceStartedShutdownNegotiation -} IceCloseStatus; +} IceClosetStatus; typedef enum { IceProcessMessagesSuccess, @@ -398,7 +398,7 @@ extern Bool IceCheckShutdownNegotiation ( #define IceCloseConnection KDE_IceCloseConnection -extern IceCloseStatus IceCloseConnection ( +extern IceClosetStatus IceCloseConnection ( #if NeedFunctionPrototypes IceConn /* iceConn */ #endif diff --git a/dcop/KDE-ICE/ICEmsg.h b/dcop/KDE-ICE/ICEmsg.h index 666d776b6..cf4d98975 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 tqalignment. + * Write pad bytes. Used to force 32 or 64 bit alignment. * A maxium of 7 pad bytes can be specified. */ @@ -306,7 +306,7 @@ extern void _IceErrorBadValue ( /* - * Read pad bytes (for 32 or 64 bit tqalignment). + * Read pad bytes (for 32 or 64 bit alignment). * A maxium of 7 pad bytes can be specified. */ diff --git a/dcop/KDE-ICE/shutdown.c b/dcop/KDE-ICE/shutdown.c index 740126fa4..8059dec76 100644 --- a/dcop/KDE-ICE/shutdown.c +++ b/dcop/KDE-ICE/shutdown.c @@ -102,14 +102,14 @@ IceConn iceConn; -IceCloseStatus +IceClosetStatus IceCloseConnection (iceConn) IceConn iceConn; { int refCountReachedZero; - IceCloseStatus status; + IceClosetStatus status; /* * If this connection object was never valid, we can close diff --git a/dcop/client/dcop.cpp b/dcop/client/dcop.cpp index 0eafb5055..14cae2609 100644 --- a/dcop/client/dcop.cpp +++ b/dcop/client/dcop.cpp @@ -262,7 +262,7 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt } if ( s == static_cast(partl.count())-1) { - partl.remove(partl.tqat(s)); + partl.remove(partl.at(s)); } lt = partl.join(" "); diff --git a/dcop/client/dcopfind.cpp b/dcop/client/dcopfind.cpp index bde116f65..17bf7d727 100644 --- a/dcop/client/dcopfind.cpp +++ b/dcop/client/dcopfind.cpp @@ -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.tqat(s)); + partl.remove(partl.at(s)); } lt = partl.join(" "); diff --git a/dcop/dcopref.h b/dcop/dcopref.h index f1f2f5af5..46116124d 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 tqrepaint if needed, and possibly + * blocking DCOP call, thus making the GUI repaint 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 8da59df04..a4c123b85 100644 --- a/dcop/dcopserver.cpp +++ b/dcop/dcopserver.cpp @@ -126,8 +126,8 @@ static TQCString readQCString(TQDataStream &ds) TQCString result; TQ_UINT32 len; ds >> len; - TQIODevice *device = ds.tqdevice(); - int bytesLeft = device->size()-device->tqat(); + TQIODevice *device = ds.device(); + int bytesLeft = device->size()-device->at(); 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.tqdevice(); - int bytesLeft = device->size()-device->tqat(); + TQIODevice *device = ds.device(); + int bytesLeft = device->size()-device->at(); if ((bytesLeft < 0 ) || (len > (uint) bytesLeft)) { qWarning("Corrupt data!\n"); diff --git a/interfaces/khexedit/byteseditinterface.h b/interfaces/khexedit/byteseditinterface.h index b27a0bdb7..3bff35095 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 - /** tqrepaint the indizes from i1 to i2 */ + /** repaint the indizes from i1 to i2 */ virtual void repaintRange( int i1, int i2 ) = 0; }; diff --git a/interfaces/kimproxy/interface/kimiface.h b/interfaces/kimproxy/interface/kimiface.h index a41172fdf..f3212df6d 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 tqreceivers about a change in a contact's + * Notifies connected DCOP receivers about a change in a contact's * presence. * * Implementations just have to call this method with the appropriate diff --git a/interfaces/ktexteditor/editinterfaceext.h b/interfaces/ktexteditor/editinterfaceext.h index b025d9807..a4fcb414c 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 tqrepaint events do not occur inbetween. + * editor, and so that repaint 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 ed0ab0cbb..85466f55d 100644 --- a/interfaces/ktexteditor/editorchooser.cpp +++ b/interfaces/ktexteditor/editorchooser.cpp @@ -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.tqat(d->chooser->editorCombo->currentItem()-1))); + TQString::null : (*d->elements.at(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 0c1eda1cb..e2bc82adb 100644 --- a/interfaces/ktexteditor/editorchooser_ui.ui +++ b/interfaces/ktexteditor/editorchooser_ui.ui @@ -40,7 +40,7 @@ Please choose the default text editing component that you wish to use in this application. If you choose <B>System Default</B>, the application will honor your changes in the Control Center. All other choices will override that setting. - + WordBreak|AlignVCenter|AlignLeft diff --git a/kab/addressbook.h b/kab/addressbook.h index af8eeb92c..f87c25124 100644 --- a/kab/addressbook.h +++ b/kab/addressbook.h @@ -127,7 +127,7 @@ class CategoriesMap : public TQMap * keys). Of course, in different files a key might be used twice.
* 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 tqinvalidate on file changes, so keep track of the + * reference). Keys invalidate on file changes, so keep track of the * signal ::changed.
* kab watches file changes. If the opened file changes on disk, it is * automatically reloaded and ::changed() is emitted. diff --git a/kab/qconfigDB.cc b/kab/qconfigDB.cc index b084ccab0..a5d13b815 100644 --- a/kab/qconfigDB.cc +++ b/kab/qconfigDB.cc @@ -1188,7 +1188,7 @@ KeyValueMap::insert(const TQCString& key, const TQStrList& values, bool force) // ----- create coded string list: for(count=0; counttqat( 2 * sizeof( TQ_UINT32 ) ); + stream.device()->at( 2 * sizeof( TQ_UINT32 ) ); stream << counter; } diff --git a/kabc/kab2kabc.cpp b/kabc/kab2kabc.cpp index 2a3683597..9d8ea75ee 100644 --- a/kabc/kab2kabc.cpp +++ b/kabc/kab2kabc.cpp @@ -57,12 +57,12 @@ void readKMailEntry( const TQString &kmailEntry, KABC::AddressBook *ab ) TQString name; TQString comment; - if ( entry.tqat( entry.length() -1 ) == ')' ) { + if ( entry.at( entry.length() -1 ) == ')' ) { int br = entry.findRev( '(' ); if ( br >= 0 ) { comment = entry.mid( br + 1, entry.length() - br - 2 ); entry.truncate( br ); - if ( entry.tqat( entry.length() - 1 ).isSpace() ) { + if ( entry.at( 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.tqat( 0 ) == '<' && email.tqat( email.length() - 1) == '>' ) { + if ( email.at( 0 ) == '<' && email.at( email.length() - 1) == '>' ) { email = email.mid( 1, email.length() - 2 ); } - if ( name.tqat( 0 ) == '"' && name.tqat( name.length() - 1) == '"' ) { + if ( name.at( 0 ) == '"' && name.at( name.length() - 1) == '"' ) { name = name.mid( 1, name.length() - 2 ); } - if ( name.tqat( 0 ) == '\'' && name.tqat( name.length() - 1) == '\'' ) { + if ( name.at( 0 ) == '\'' && name.at( name.length() - 1) == '\'' ) { name = name.mid( 1, name.length() - 2 ); } - if ( name.tqat( name.length() -1 ) == ')' ) { + if ( name.at( 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.tqat( name.length() - 1 ).isSpace() ) { + if ( name.at( 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).tqat( 0 ) == '#' ) continue; + if ( (*it).at( 0 ) == '#' ) continue; bool insideQuote = false; int end = (*it).length() - 1; for ( int i = end; i; i-- ) { - if ( (*it).tqat( i ) == '"' ) { + if ( (*it).at( i ) == '"' ) { if ( insideQuote ) insideQuote = false; else insideQuote = true; - } else if ( (*it).tqat( i ) == ',' && !insideQuote ) { + } else if ( (*it).at( i ) == ',' && !insideQuote ) { readKMailEntry( (*it).mid( i + 1, end - i ), ab ); end = i - 1; } diff --git a/kabc/resourceselectdialog.cpp b/kabc/resourceselectdialog.cpp index 3d01bfc8e..256125cd2 100644 --- a/kabc/resourceselectdialog.cpp +++ b/kabc/resourceselectdialog.cpp @@ -64,7 +64,7 @@ ResourceSelectDialog::ResourceSelectDialog( AddressBook *ab, TQWidget *parent, c uint counter = 0; TQPtrList list = ab->resources(); for ( uint i = 0; i < list.count(); ++i ) { - Resource *resource = list.tqat( i ); + Resource *resource = list.at( i ); if ( resource && !resource->readOnly() ) { mResourceMap.insert( counter, resource ); mResourceId->insertItem( resource->resourceName() ); diff --git a/kabc/tests/testaddresseelist.cpp b/kabc/tests/testaddresseelist.cpp index 7075dcdd8..e7cc123f1 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.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" + 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" ) ) { 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.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" + 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" ) ) { 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.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" + 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" ) ) { 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.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" + 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" ) ) { 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.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" + 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" ) ) { 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.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" + 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" ) ) { 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.tqat(0)).uid()=="78ze" - && (*list2.tqat(1)).uid()=="Asdf" + if ( !( (*list2.at(0)).uid()=="78ze" + && (*list2.at(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.tqat(1)).uid()=="78ze" - && (*list2.tqat(0)).uid()=="Asdf" + if ( !( (*list2.at(1)).uid()=="78ze" + && (*list2.at(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/vcard/AdrValue.cpp b/kabc/vcard/AdrValue.cpp index dc6384417..535ba6980 100644 --- a/kabc/vcard/AdrValue.cpp +++ b/kabc/vcard/AdrValue.cpp @@ -112,13 +112,13 @@ AdrValue::_parse() switch (i) { - 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; + 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; default: break; } } diff --git a/kabc/vcard/ContentLine.cpp b/kabc/vcard/ContentLine.cpp index 034cb1d32..52bcdf4f5 100644 --- a/kabc/vcard/ContentLine.cpp +++ b/kabc/vcard/ContentLine.cpp @@ -174,7 +174,7 @@ ContentLine::_parse() return; } - name_ = l.tqat(0); + name_ = l.at(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 d41c61d96..f7e5a759e 100644 --- a/kabc/vcard/LangValue.cpp +++ b/kabc/vcard/LangValue.cpp @@ -79,7 +79,7 @@ LangValue::_parse() if (l.count() == 0) return; - primary_ = l.tqat(0); + primary_ = l.at(0); l.remove(0u); diff --git a/kabc/vcard/NValue.cpp b/kabc/vcard/NValue.cpp index 7bcfa1397..e63268134 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.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; + 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; default: break; } } diff --git a/kabc/vcard/OrgValue.cpp b/kabc/vcard/OrgValue.cpp index d3fb93ac7..94ca18243 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_.tqat(i); + return valueList_.at(i); } diff --git a/kabc/vcard/TextListValue.cpp b/kabc/vcard/TextListValue.cpp index ef2b5d07d..2bec2e181 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_.tqat(i); + return valueList_.at(i); } diff --git a/kabc/vcard/VCard.cpp b/kabc/vcard/VCard.cpp index a1a9d1ba1..50c25da59 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.tqat(0)).stripWhiteSpace(); + TQCString beginLine = TQCString(l.at(0)).stripWhiteSpace(); vDebug("Begin line == \"" + beginLine + "\""); diff --git a/kabc/vcardparser/vcardparser.cpp b/kabc/vcardparser/vcardparser.cpp index 82ab96714..40a0dbba0 100644 --- a/kabc/vcardparser/vcardparser.cpp +++ b/kabc/vcardparser/vcardparser.cpp @@ -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.tqat( value.length() - 1 ) == '=' && it != linesEnd ) { + while ( value.at( 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 08bcf93e4..295360a03 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.tqat( i ).latin1(); + char c = value.at( i ).latin1(); if ( (c < 33 || c > 126) && c != ' ' && c != '=' ) return true; } diff --git a/kate/part/kateautoindent.cpp b/kate/part/kateautoindent.cpp index 4d36f5918..16a1627a7 100644 --- a/kate/part/kateautoindent.cpp +++ b/kate/part/kateautoindent.cpp @@ -223,7 +223,7 @@ void KateNormalIndent::updateConfig () for (uint i=0; iname; + TQString name = items.at(i)->name; if (name.find("Comment") != -1 && commentAttrib == 255) { commentAttrib = i; @@ -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.tqat(pos).tqunicode(); + int ch = text.at(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.tqat(++attrCol).tqunicode(); + lastCh = text.at(++attrCol).tqunicode(); }while(lastCh && lastCh != ' ' && lastCh != '\t'); while(lastCh == ' ' || lastCh == '\t') { - lastCh = text.tqat(++attrCol).tqunicode(); + lastCh = text.at(++attrCol).tqunicode(); } attrCol = prevLine->cursorX(attrCol, tabWidth); @@ -2384,7 +2384,7 @@ void KateVarIndent::slotVariableChanged( const TQString &var, const TQString &va for (uint i=0; iname.section( ':', 1 ) == val ) + if ( items.at(i)->name.section( ':', 1 ) == val ) { d->coupleAttrib = i; break; diff --git a/kate/part/katebookmarks.cpp b/kate/part/katebookmarks.cpp index 6498d9936..ac1ee73d9 100644 --- a/kate/part/katebookmarks.cpp +++ b/kate/part/katebookmarks.cpp @@ -128,7 +128,7 @@ void KateBookmarks::clearBookmarks () TQPtrList m = m_view->getDoc()->marks(); for (uint i=0; i < m.count(); i++) - m_view->getDoc()->removeMark( m.tqat(i)->line, KTextEditor::MarkInterface::markType01 ); + m_view->getDoc()->removeMark( m.at(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.tqat(z)->line > line) && ((found == -1) || (uint(found) > m.tqat(z)->line)) ) - found = m.tqat(z)->line; + if ( (m.at(z)->line > line) && ((found == -1) || (uint(found) > m.at(z)->line)) ) + found = m.at(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.tqat(z)->line < line) && ((found == -1) || (uint(found) < m.tqat(z)->line))) - found = m.tqat(z)->line; + if ((m.at(z)->line < line) && ((found == -1) || (uint(found) < m.at(z)->line))) + found = m.at(z)->line; if (found != -1) m_view->gotoLineNumber ( found ); diff --git a/kate/part/katebuffer.cpp b/kate/part/katebuffer.cpp index 05af27ff8..8a3ff0f03 100644 --- a/kate/part/katebuffer.cpp +++ b/kate/part/katebuffer.cpp @@ -860,12 +860,12 @@ void KateBuffer::setHighlight(uint hlMode) // aha, hl will change if (h != m_highlight) { - bool tqinvalidate = !h->noHighlighting(); + bool invalidate = !h->noHighlighting(); if (m_highlight) { m_highlight->release(); - tqinvalidate = true; + invalidate = true; } h->use(); @@ -880,7 +880,7 @@ void KateBuffer::setHighlight(uint hlMode) m_highlight = h; - if (tqinvalidate) + if (invalidate) invalidateHighlighting(); // inform the document that the hl was really changed @@ -949,7 +949,7 @@ void KateBuffer::addIndentBasedFoldingInformation(TQMemArray &foldingList, } } -bool KateBuffer::doHighlight (KateBufBlock *buf, uint startLine, uint endLine, bool tqinvalidate) +bool KateBuffer::doHighlight (KateBufBlock *buf, uint startLine, uint endLine, bool invalidate) { // 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, tqinvalidate HL of all documents + // see if there are too many dynamic contexts; if yes, invalidate 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 (tqinvalidate) + if (invalidate) emit tagLines (startLine, current_line + buf->startLine()); // emit that we have changed the folding diff --git a/kate/part/katebuffer.h b/kate/part/katebuffer.h index 450f260ab..04ee264e8 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 tqinvalidate the swap data + * mark this block as dirty, will invalidate 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 tqinvalidate); + bool doHighlight (KateBufBlock *buf, uint from, uint to, bool invalidate); signals: /** diff --git a/kate/part/katecodefoldinghelpers.cpp b/kate/part/katecodefoldinghelpers.cpp index 15ba05cb7..ab571d9d0 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.tqat(i); + KateCodeFoldingNode *node = markedForDeleting.at(i); if (node->deleteOpening) kdDebug(13000)<<"DELETE OPENING SET"<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.tqat(i); + KateCodeFoldingNode *node=nodesForLine.at(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.tqat(0)->visible = !nodesForLine.tqat(0)->visible; + nodesForLine.at(0)->visible = !nodesForLine.at(0)->visible; - if (!nodesForLine.tqat(0)->visible) - addHiddenLineBlock(nodesForLine.tqat(0),line); + if (!nodesForLine.at(0)->visible) + addHiddenLineBlock(nodesForLine.at(0),line); else { for (TQValueList::Iterator it=hiddenLines.begin(); it!=hiddenLines.end();++it) @@ -1359,7 +1359,7 @@ void KateCodeFoldingTree::toggleRegionVisibility(unsigned int line) break; } - updateHiddenSubNodes(nodesForLine.tqat(0)); + updateHiddenSubNodes(nodesForLine.at(0)); } emit regionVisibilityChangedAt(line); diff --git a/kate/part/kateconfig.cpp b/kate/part/kateconfig.cpp index 9921fe605..4b3c2f52b 100644 --- a/kate/part/kateconfig.cpp +++ b/kate/part/kateconfig.cpp @@ -237,7 +237,7 @@ void KateDocumentConfig::updateConfig () { for (uint z=0; z < KateFactory::self()->documents()->count(); z++) { - KateFactory::self()->documents()->tqat(z)->updateConfig (); + KateFactory::self()->documents()->at(z)->updateConfig (); } } } @@ -570,8 +570,8 @@ bool KateDocumentConfig::plugin (uint index) const if (index >= m_plugins.size()) return false; - if (m_pluginsSet.tqat(index) || isGlobal()) - return m_plugins.tqat(index); + if (m_pluginsSet.at(index) || isGlobal()) + return m_plugins.at(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()->tqat(z)->updateConfig (); + KateFactory::self()->views()->at(z)->updateConfig (); } } } @@ -1088,7 +1088,7 @@ void KateRendererConfig::updateConfig () { for (uint z=0; z < KateFactory::self()->renderers()->count(); z++) { - KateFactory::self()->renderers()->tqat(z)->updateConfig (); + KateFactory::self()->renderers()->at(z)->updateConfig (); } } } @@ -1114,7 +1114,7 @@ void KateRendererConfig::reloadSchema() { if ( isGlobal() ) for ( uint z=0; z < KateFactory::self()->renderers()->count(); z++ ) - KateFactory::self()->renderers()->tqat(z)->config()->reloadSchema(); + KateFactory::self()->renderers()->at(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 f9c5dadb1..c4157e2e7 100644 --- a/kate/part/katedialogs.cpp +++ b/kate/part/katedialogs.cpp @@ -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 tqalignment applied to " + "the width of the screen will not have vertical alignment applied to " "subsequent wrapped lines.

")); 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().tqat(0); + KateView* view = (KateView*)m_doc->views().at(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.tqat(i)->pluginIndex(), m_items.tqat(i)->isOn()); + KateDocumentConfig::global()->setPlugin (m_items.at(i)->pluginIndex(), m_items.at(i)->isOn()); KateDocumentConfig::global()->configEnd (); } @@ -1243,7 +1243,7 @@ void KatePartPluginConfigPage::slotConfigure() for( uint i=0; iapply(); + editorPages.at( i )->apply(); } } diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp index b2ec1b411..dda723891 100644 --- a/kate/part/katedocument.cpp +++ b/kate/part/katedocument.cpp @@ -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.tqat(i)); + enablePluginGUI (plugin, m_views.at(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.tqat(i)); + disablePluginGUI (plugin, m_views.at(i)); } //END @@ -641,7 +641,7 @@ bool KateDocument::setText(const TQString &s) TQValueList msave; for (uint i=0; i < m.count(); i++) - msave.append (*m.tqat(i)); + msave.append (*m.at(i)); editStart (); @@ -924,7 +924,7 @@ void KateDocument::editStart (bool withUndo) for (uint z = 0; z < m_views.count(); z++) { - m_views.tqat(z)->editStart (); + m_views.at(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.tqat(z)->editEnd (m_buffer->editTagStart(), m_buffer->editTagEnd(), m_buffer->editTagFrom()); + m_views.at(z)->editEnd (m_buffer->editTagStart(), m_buffer->editTagEnd(), m_buffer->editTagFrom()); if (m_buffer->editChanged()) { @@ -2011,7 +2011,7 @@ void KateDocument::configDialog() for (uint i=0; iapply(); + editorPages.at(i)->apply(); } KateDocumentConfig::global()->configEnd (); @@ -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.tqat(z)->renderer()->updateAttributes (); + m_views.at(z)->renderer()->updateAttributes (); if (needInvalidate) m_buffer->invalidateHighlighting(); @@ -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.tqat( p-1 ) ) ) + ( p && ! highlight()->isInWord( s.at( p-1 ) ) ) ) - s[p] = s.tqat(p).upper(); + s[p] = s.at(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.tqat(z)->tagLines (start, end, true); + m_views.at(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.tqat(z)->tagLines(start, end, true); + m_views.at(z)->tagLines(start, end, true); } void KateDocument::repaintViews(bool paintOnlyDirty) { for (uint z = 0; z < m_views.count(); z++) - m_views.tqat(z)->repaintText(paintOnlyDirty); + m_views.at(z)->repaintText(paintOnlyDirty); } void KateDocument::tagAll() { for (uint z = 0; z < m_views.count(); z++) { - m_views.tqat(z)->tagAll(); - m_views.tqat(z)->updateView (true); + m_views.at(z)->tagAll(); + m_views.at(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()->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; + 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; } m_docNameNumber = count + 1; @@ -4437,14 +4437,14 @@ void KateDocument::reloadFile() TQValueList lines, cols; for ( uint i=0; i < m_views.count(); i++ ) { - lines.append( m_views.tqat( i )->cursorLine() ); - cols.append( m_views.tqat( i )->cursorColumn() ); + lines.append( m_views.at( i )->cursorLine() ); + cols.append( m_views.at( i )->cursorColumn() ); } KateDocument::openURL( url() ); for ( uint i=0; i < m_views.count(); i++ ) - m_views.tqat( i )->setCursorPositionInternal( lines[ i ], cols[ i ], m_config->tabWidth(), false ); + m_views.at( 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 c42f698a3..64bde8718 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;iscript(scriptname); + result=m_indentScriptManagers.at(i)->script(scriptname); if (!result.isNull()) return result; } return result; diff --git a/kate/part/katefiletype.cpp b/kate/part/katefiletype.cpp index c29b8641e..11d5e9a46 100644 --- a/kate/part/katefiletype.cpp +++ b/kate/part/katefiletype.cpp @@ -106,20 +106,20 @@ void KateFileTypeManager::save (TQPtrList *v) TQStringList newg; for (uint z=0; z < v->count(); z++) { - config.setGroup (v->tqat(z)->name); + config.setGroup (v->at(z)->name); - 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); + 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); - TQString varLine = v->tqat(z)->varLine; + TQString varLine = v->at(z)->varLine; if (TQRegExp("kate:(.*)").search(varLine) < 0) varLine.prepend ("kate: "); config.writeEntry ("Variables", varLine); - newg << v->tqat(z)->name; + newg << v->at(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.tqat(z)->mimetypes.findIndex (mt->name()) > -1) - types.append (m_types.tqat(z)); + if (m_types.at(z)->mimetypes.findIndex (mt->name()) > -1) + types.append (m_types.at(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.tqat(z)->wildcards.begin(); it != m_types.tqat(z)->wildcards.end(); ++it ) + for( TQStringList::Iterator it = m_types.at(z)->wildcards.begin(); it != m_types.at(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.tqat(z)); + types.append (m_types.at(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.tqat(number); + return m_types.at(number); return 0; } @@ -373,7 +373,7 @@ void KateFileTypeConfigTab::reload() { KateFileType *type = new KateFileType (); - *type = *KateFactory::self()->fileTypeManager()->list()->tqat(z); + *type = *KateFactory::self()->fileTypeManager()->list()->at(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.tqat(i)->section.length() > 0) - typeCombo->insertItem(m_types.tqat(i)->section + TQString ("/") + m_types.tqat(i)->name); + if (m_types.at(i)->section.length() > 0) + typeCombo->insertItem(m_types.at(i)->section + TQString ("/") + m_types.at(i)->name); else - typeCombo->insertItem(m_types.tqat(i)->name); + typeCombo->insertItem(m_types.at(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.tqat(i)->name == newN) + if (m_types.at(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.tqat(type); + t = m_types.at(type); if (t) { @@ -536,8 +536,8 @@ void KateViewFileTypeAction::slotAboutToShow() for (int z=0; zfileTypeManager()->list()->tqat(z)->name; - TQString hlSection = KateFactory::self()->fileTypeManager()->list()->tqat(z)->section; + TQString hlName = KateFactory::self()->fileTypeManager()->list()->at(z)->name; + TQString hlSection = KateFactory::self()->fileTypeManager()->list()->at(z)->section; if ( !hlSection.isEmpty() && (names.contains(hlName) < 1) ) { @@ -551,7 +551,7 @@ void KateViewFileTypeAction::slotAboutToShow() int m = subMenusName.findIndex (hlSection); names << hlName; - subMenus.tqat(m)->insertItem ( hlName, this, TQT_SLOT(setType(int)), 0, z+1); + subMenus.at(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;icount();i2++) - subMenus.tqat(i)->setItemChecked(subMenus.tqat(i)->idAt(i2),false); + for (uint i2=0;i2count();i2++) + subMenus.at(i)->setItemChecked(subMenus.at(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.tqat(i)) - subMenus.tqat(i)->setItemChecked (doc->fileType()+1, true); + if (i >= 0 && subMenus.at(i)) + subMenus.at(i)->setItemChecked (doc->fileType()+1, true); else popupMenu()->setItemChecked (0, true); } diff --git a/kate/part/katehighlight.cpp b/kate/part/katehighlight.cpp index 1b7a4d7c3..739ba78c8 100644 --- a/kate/part/katehighlight.cpp +++ b/kate/part/katehighlight.cpp @@ -815,7 +815,7 @@ int KateHlCOct::checkHgl(const TQString& text, int offset, int len) int offset2 = offset; - while ((len > 0) && (text.tqat(offset2) >= TQChar('0') && text.tqat(offset2) <= TQChar('7'))) + while ((len > 0) && (text.at(offset2) >= TQChar('0') && text.at(offset2) <= TQChar('7'))) { offset2++; len--; @@ -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(text.tqat(offset)) >= '0' && static_cast(text.tqat(offset)) <= '9' || (text[offset] & 0xdf) >= 'A' && (text[offset] & 0xdf) <= 'F'); i++) + for (i = 0; (len > 0) && (i < 2) && (static_cast(text.at(offset)) >= '0' && static_cast(text.at(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(text.tqat(offset)) >= '0' && static_cast(text.tqat(offset)) <= '7'); i++) + for (i = 0; (len > 0) && (i < 3) && (static_cast(text.at(offset)) >= '0' && static_cast(text.at(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.tqat(i)->name == buildPrefix+name) + if (iDl.at(i)->name == buildPrefix+name) return i; kdDebug(13010)<<"Couldn't resolve itemDataName:"<defStyleNum); + KateHlItemData *itemData = itemDataList.at(z); + KateAttribute n = *defaultStyleList.at(itemData->defStyleNum); if (itemData && itemData->isSomethingSet()) n += *itemData; - array->tqat(z) = n; + array->at(z) = n; } } } @@ -2924,13 +2924,13 @@ TQMemArray *KateHighlighting::attributes (uint schema) for (uint z = 0; z < nAttribs; z++) { - KateHlItemData *itemData = itemDataList.tqat(z); - KateAttribute n = *defaultStyleList.tqat(itemData->defStyleNum); + KateHlItemData *itemData = itemDataList.at(z); + KateAttribute n = *defaultStyleList.at(itemData->defStyleNum); if (itemData && itemData->isSomethingSet()) n += *itemData; - array->tqat(z) = n; + array->at(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.tqat(z))); + outlist.append (new KateHlItemData (*itemDataList.at(z))); } //END @@ -2974,7 +2974,7 @@ KateHlManager::KateHlManager() if (insert == hlList.count()) break; - if ( TQString(hlList.tqat(insert)->section() + hlList.tqat(insert)->nameTranslated()).lower() + if ( TQString(hlList.at(insert)->section() + hlList.at(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.tqat(n); + return hlList.at(n); } int KateHlManager::nameFind(const TQString &name) { int z (hlList.count() - 1); for (; z > 0; z--) - if (hlList.tqat(z)->name() == name) + if (hlList.at(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.tqat(z); + KateAttribute *i = list.at(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.tqat(z); + KateAttribute *i = list.at(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.tqat(n)->name(); + return hlList.at(n)->name(); } TQString KateHlManager::hlNameTranslated(int n) { - return hlList.tqat(n)->nameTranslated(); + return hlList.at(n)->nameTranslated(); } TQString KateHlManager::hlSection(int n) { - return hlList.tqat(n)->section(); + return hlList.at(n)->section(); } bool KateHlManager::hlHidden(int n) { - return hlList.tqat(n)->hidden(); + return hlList.at(n)->hidden(); } TQString KateHlManager::identifierForName(const TQString& name) @@ -3433,7 +3433,7 @@ void KateViewHighlightAction::slotAboutToShow() int m = subMenusName.findIndex (hlSection); names << hlName; - subMenus.tqat(m)->insertItem ( '&' + hlName, this, TQT_SLOT(setHl(int)), 0, z); + subMenus.at(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;icount();i2++) + for (uint i2=0;i2count();i2++) { - subMenus.tqat(i)->setItemChecked(subMenus.tqat(i)->idAt(i2),false); + subMenus.at(i)->setItemChecked(subMenus.at(i)->idAt(i2),false); } } popupMenu()->setItemChecked (0, false); int i = subMenusName.findIndex (KateHlManager::self()->hlSection(doc->hlMode())); - if (i >= 0 && subMenus.tqat(i)) - subMenus.tqat(i)->setItemChecked (doc->hlMode(), true); + if (i >= 0 && subMenus.at(i)) + subMenus.at(i)->setItemChecked (doc->hlMode(), true); else popupMenu()->setItemChecked (0, true); } diff --git a/kate/part/katejscript.cpp b/kate/part/katejscript.cpp index 8a7731f76..a9efac0e9 100644 --- a/kate/part/katejscript.cpp +++ b/kate/part/katejscript.cpp @@ -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().tqat(0), args[1].toUInt32(exec) ) ); + return KJS::Boolean( doc->highlight()->isInWord( args[0].toString(exec).qstring().at(0), args[1].toUInt32(exec) ) ); case KateJSDocument::CanBreakAt: - return KJS::Boolean( doc->highlight()->canBreakAt( args[0].toString(exec).qstring().tqat(0), args[1].toUInt32(exec) ) ); + return KJS::Boolean( doc->highlight()->canBreakAt( args[0].toString(exec).qstring().at(0), args[1].toUInt32(exec) ) ); case KateJSDocument::CanComment: return KJS::Boolean( doc->highlight()->canComment( args[0].toUInt32(exec), args[1].toUInt32(exec) ) ); diff --git a/kate/part/kateprinter.cpp b/kate/part/kateprinter.cpp index d1c44fdca..e9a74c50e 100644 --- a/kate/part/kateprinter.cpp +++ b/kate/part/kateprinter.cpp @@ -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.tqat(0)->textColor() ); + paint.setPen( _dsList.at(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 cbed7de67..ec1b84150 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->tqat(pos); + return &m_attributes->at(pos); - return &m_attributes->tqat(0); + return &m_attributes->at(0); } void KateRenderer::setDrawCaret(bool drawCaret) diff --git a/kate/part/kateschema.cpp b/kate/part/kateschema.cpp index 1a83df6d2..a5e295888 100644 --- a/kate/part/kateschema.cpp +++ b/kate/part/kateschema.cpp @@ -643,14 +643,14 @@ void KateSchemaConfigFontColorTab::schemaChanged (uint schema) p.setColor( TQColorGroup::Highlight, KateFactory::self()->schemaManager()->schema(schema)-> readColorEntry( "Color Selection", &_c ) ); - _c = l->tqat(0)->textColor(); // not quite as much of an assumption ;) + _c = l->at(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->tqat( i ) ); + new KateStyleListItem( m_defaultStyles, KateHlManager::self()->defaultStyleName(i, true), l->at( 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->tqat(0)->textColor(); // not quite as much of an assumption ;) + _c = l->at(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->tqat(itemData->defStyleNum), itemData ); + new KateStyleListItem( parent, name, l->at(itemData->defStyleNum), itemData ); } else { - new KateStyleListItem( m_styles, itemData->name, l->tqat(itemData->defStyleNum), itemData ); + new KateStyleListItem( m_styles, itemData->name, l->at(itemData->defStyleNum), itemData ); } } } @@ -1357,7 +1357,7 @@ void KateStyleListItem::toggleDefStyle() delete is; is = new KateAttribute( *ds ); updateStyle(); - tqrepaint(); + repaint(); } } @@ -1441,7 +1441,7 @@ void KateStyleListItem::setColor( int column ) break; } - tqrepaint(); + repaint(); } void KateStyleListItem::unsetColor( int c ) diff --git a/kate/part/katesearch.cpp b/kate/part/katesearch.cpp index 5b3629347..a7d37ead5 100644 --- a/kate/part/katesearch.cpp +++ b/kate/part/katesearch.cpp @@ -386,7 +386,7 @@ void KateSearch::replaceOne() int ncaps = m_re.numCaptures(); while ( pos >= 0 ) { TQString substitute; - TQChar argument = TQString(br.cap(1)).tqat(0); + TQChar argument = TQString(br.cap(1)).at(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 ).tqat( foundCol - 1 ) ) ) && + ! doc()->highlight()->isInWord( doc()->textLine( foundLine ).at( foundCol - 1 ) ) ) && ( foundCol + matchLen == doc()->lineLength( foundLine ) || - ! doc()->highlight()->isInWord( doc()->textLine( foundLine ).tqat( foundCol + matchLen ) ) ) + ! doc()->highlight()->isInWord( doc()->textLine( foundLine ).at( foundCol + matchLen ) ) ) ); if ( found ) { diff --git a/kate/part/katetemplatehandler.cpp b/kate/part/katetemplatehandler.cpp index e9124e77f..52e07a2e4 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.tqat( colInText ) == '\n' ) + if ( insertString.at( colInText ) == '\n' ) { col = 0; line++; @@ -216,7 +216,7 @@ void KateTemplateHandler::slotTextInserted( int line, int col ) if ( !m_currentRange ) return ; - KateTemplatePlaceHolder *ph = m_tabOrder.tqat( m_currentTabStop ); + KateTemplatePlaceHolder *ph = m_tabOrder.at( 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.tqat( i ); + KateTemplatePlaceHolder *ph = m_tabOrder.at( 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.tqat( m_currentTabStop ) ->ranges.tqat( 0 ); + m_currentRange = m_tabOrder.at( m_currentTabStop ) ->ranges.at( 0 ); - if ( m_tabOrder.tqat( m_currentTabStop ) ->isInitialValue ) + if ( m_tabOrder.at( m_currentTabStop ) ->isInitialValue ) { m_doc->activeView()->setSelection( m_currentRange->start(), m_currentRange->end() ); } diff --git a/kate/part/kateundo.cpp b/kate/part/kateundo.cpp index 81901d9f8..379df16f0 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.tqat(z)->type() != KateUndoGroup::editMarkLineAutoWrapped) + if (m_items.at(z)->type() != KateUndoGroup::editMarkLineAutoWrapped) { - m_doc->activeView()->editSetCursor (m_items.tqat(z)->cursorBefore()); + m_doc->activeView()->editSetCursor (m_items.at(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.tqat(z)->type() != KateUndoGroup::editMarkLineAutoWrapped) + if (m_items.at(z)->type() != KateUndoGroup::editMarkLineAutoWrapped) { - m_doc->activeView()->editSetCursor (m_items.tqat(z)->cursorAfter()); + m_doc->activeView()->editSetCursor (m_items.at(z)->cursorAfter()); break; } } diff --git a/kate/part/kateview.cpp b/kate/part/kateview.cpp index 232c51b6e..669d954b1 100644 --- a/kate/part/kateview.cpp +++ b/kate/part/kateview.cpp @@ -1233,11 +1233,11 @@ void KateView::updateRendererConfig() // update the text area m_viewInternal->updateView (true); - m_viewInternal->tqrepaint (); + m_viewInternal->repaint (); // update the left border right, for example linenumbers m_viewInternal->leftBorder->updateFont(); - m_viewInternal->leftBorder->tqrepaint (); + m_viewInternal->leftBorder->repaint (); // @@ 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->tqrepaint(); + m_viewInternal->repaint(); } void KateView::cut() diff --git a/kate/part/kateviewinternal.cpp b/kate/part/kateviewinternal.cpp index 831866ef0..464bb1c27 100644 --- a/kate/part/kateviewinternal.cpp +++ b/kate/part/kateviewinternal.cpp @@ -89,7 +89,7 @@ KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc) // cursor cursor.setMoveOnInsert (true); - // tqinvalidate selStartCached, or keyb selection is screwed initially + // invalidate selStartCached, or keyb selection is screwed initially selStartCached.setLine( -1 ); // // scrollbar for lines @@ -2759,7 +2759,7 @@ void KateViewInternal::mousePressEvent( TQMouseEvent* e ) } else { - selStartCached.setLine( -1 ); // tqinvalidate + selStartCached.setLine( -1 ); // invalidate } if( !( e->state() & TQt::ShiftButton ) && isTargetSelected( e->pos() ) ) diff --git a/kate/plugins/autobookmarker/autobookmarker.cpp b/kate/plugins/autobookmarker/autobookmarker.cpp index 3f1e7fc2a..a0e61f3d0 100644 --- a/kate/plugins/autobookmarker/autobookmarker.cpp +++ b/kate/plugins/autobookmarker/autobookmarker.cpp @@ -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->tqat( i ); + AutoBookmarkEnt *e = m_ents->at( 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 df8c31cad..6a350831f 100644 --- a/kate/plugins/insertfile/insertfileplugin.cpp +++ b/kate/plugins/insertfile/insertfileplugin.cpp @@ -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.tqat(z)->parentClient() == view) + if (m_views.at(z)->parentClient() == view) { - InsertFilePluginView *nview = m_views.tqat(z); + InsertFilePluginView *nview = m_views.at(z); m_views.remove (nview); delete nview; } diff --git a/kate/plugins/isearch/ISearchPlugin.cpp b/kate/plugins/isearch/ISearchPlugin.cpp index fef94b1dd..249abf9f2 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.tqat(z)->parentClient() == view) + if (m_views.at(z)->parentClient() == view) { - ISearchPluginView *nview = m_views.tqat(z); + ISearchPluginView *nview = m_views.at(z); m_views.remove (nview); delete nview; } diff --git a/kate/plugins/kdatatool/kate_kdatatool.cpp b/kate/plugins/kdatatool/kate_kdatatool.cpp index 3678c26f4..e78bb4228 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.tqat(z)->parentClient() == view) + if (m_views.at(z)->parentClient() == view) { - KDataToolPluginView *nview = m_views.tqat(z); + KDataToolPluginView *nview = m_views.at(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.tqat(i); + TQChar ch = tmp_line.at(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.tqat(i); + TQChar ch = tmp_line.at(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 435578d6d..37da55224 100644 --- a/kate/plugins/wordcompletion/docwordcompletion.cpp +++ b/kate/plugins/wordcompletion/docwordcompletion.cpp @@ -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.tqat(z)->parentClient() == view) + if (m_views.at(z)->parentClient() == view) { - DocWordCompletionPluginView *nview = m_views.tqat(z); + DocWordCompletionPluginView *nview = m_views.at(z); m_views.remove (nview); delete nview; } diff --git a/kcert/kcertpart.cc b/kcert/kcertpart.cc index 536bc9a83..e704ad339 100644 --- a/kcert/kcertpart.cc +++ b/kcert/kcertpart.cc @@ -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().tqat(c-1)); + displayPKCS12Cert(_p12->getCertificate()->chain().getChain().at(c-1)); } } diff --git a/kded/kbuildservicefactory.cpp b/kded/kbuildservicefactory.cpp index 30be4f213..8cc2e9462 100644 --- a/kded/kbuildservicefactory.cpp +++ b/kded/kbuildservicefactory.cpp @@ -113,32 +113,32 @@ KBuildServiceFactory::save(TQDataStream &str) { KSycocaFactory::save(str); - m_nameDictOffset = str.tqdevice()->tqat(); + m_nameDictOffset = str.device()->at(); m_nameDict->save(str); - m_relNameDictOffset = str.tqdevice()->tqat(); + m_relNameDictOffset = str.device()->at(); m_relNameDict->save(str); saveOfferList(str); saveInitList(str); - m_menuIdDictOffset = str.tqdevice()->tqat(); + m_menuIdDictOffset = str.device()->at(); m_menuIdDict->save(str); - int endOfFactoryData = str.tqdevice()->tqat(); + int endOfFactoryData = str.device()->at(); // Update header (pass #3) saveHeader(str); // Seek to end. - str.tqdevice()->tqat(endOfFactoryData); + str.device()->at(endOfFactoryData); } void KBuildServiceFactory::saveOfferList(TQDataStream &str) { - m_offerListOffset = str.tqdevice()->tqat(); + m_offerListOffset = str.device()->at(); bool isNumber; for(TQDictIterator itserv ( *m_entryDict ); @@ -201,7 +201,7 @@ KBuildServiceFactory::saveOfferList(TQDataStream &str) void KBuildServiceFactory::saveInitList(TQDataStream &str) { - m_initListOffset = str.tqdevice()->tqat(); + m_initListOffset = str.device()->at(); KService::List initList; diff --git a/kded/kbuildservicegroupfactory.cpp b/kded/kbuildservicegroupfactory.cpp index 7499eda84..e231cd5da 100644 --- a/kded/kbuildservicegroupfactory.cpp +++ b/kded/kbuildservicegroupfactory.cpp @@ -165,14 +165,14 @@ KBuildServiceGroupFactory::save(TQDataStream &str) { KSycocaFactory::save(str); - m_baseGroupDictOffset = str.tqdevice()->tqat(); + m_baseGroupDictOffset = str.device()->at(); m_baseGroupDict->save(str); - int endOfFactoryData = str.tqdevice()->tqat(); + int endOfFactoryData = str.device()->at(); // Update header (pass #3) saveHeader(str); // Seek to end. - str.tqdevice()->tqat(endOfFactoryData); + str.device()->at(endOfFactoryData); } diff --git a/kded/kbuildservicetypefactory.cpp b/kded/kbuildservicetypefactory.cpp index 1b09d10c6..27b55176d 100644 --- a/kded/kbuildservicetypefactory.cpp +++ b/kded/kbuildservicetypefactory.cpp @@ -152,13 +152,13 @@ KBuildServiceTypeFactory::save(TQDataStream &str) savePatternLists(str); - int endOfFactoryData = str.tqdevice()->tqat(); + int endOfFactoryData = str.device()->at(); // Update header (pass #3) saveHeader(str); // Seek to end. - str.tqdevice()->tqat(endOfFactoryData); + str.device()->at(endOfFactoryData); } void @@ -203,10 +203,10 @@ KBuildServiceTypeFactory::savePatternLists(TQDataStream &str) TQ_INT32 entrySize = 0; TQ_INT32 nrOfEntries = 0; - m_fastPatternOffset = str.tqdevice()->tqat(); + m_fastPatternOffset = str.device()->at(); // Write out fastPatternHeader (Pass #1) - str.tqdevice()->tqat(m_fastPatternOffset); + str.device()->at(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.tqdevice()->tqat(); + int start = str.device()->at(); // 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.tqdevice()->tqat() - start; + entrySize = str.device()->at() - start; nrOfEntries++; } // store position - m_otherPatternOffset = str.tqdevice()->tqat(); + m_otherPatternOffset = str.device()->at(); // Write out fastPatternHeader (Pass #2) - str.tqdevice()->tqat(m_fastPatternOffset); + str.device()->at(m_fastPatternOffset); str << nrOfEntries; str << entrySize; // For the other patterns - str.tqdevice()->tqat(m_otherPatternOffset); + str.device()->at(m_otherPatternOffset); it = otherPatterns.begin(); for ( ; it != otherPatterns.end() ; ++it ) diff --git a/kded/kbuildsycoca.cpp b/kded/kbuildsycoca.cpp index b09f40916..19f7a3671 100644 --- a/kded/kbuildsycoca.cpp +++ b/kded/kbuildsycoca.cpp @@ -500,7 +500,7 @@ bool KBuildSycoca::recreate() if( build()) // Parse dirs { save(); // Save database - if (m_str->tqdevice()->status()) + if (m_str->device()->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->tqdevice()->tqat(0); + m_str->device()->at(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->tqdevice()->status()) + if (m_str->device()->status()) return; // error } - int endOfData = m_str->tqdevice()->tqat(); + int endOfData = m_str->device()->at(); // Write header (#pass 2) - m_str->tqdevice()->tqat(0); + m_str->device()->at(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->tqdevice()->tqat(endOfData); + m_str->device()->at(endOfData); } bool KBuildSycoca::checkDirTimestamps( const TQString& dirname, const TQDateTime& stamp, bool top ) diff --git a/kded/kctimefactory.cpp b/kded/kctimefactory.cpp index 746a1c433..966966a48 100644 --- a/kded/kctimefactory.cpp +++ b/kded/kctimefactory.cpp @@ -53,7 +53,7 @@ KCTimeInfo::save(TQDataStream &str) { KSycocaFactory::save(str); - m_dictOffset = str.tqdevice()->tqat(); + m_dictOffset = str.device()->at(); TQDictIterator it(ctimeDict); while( it.current()) { @@ -62,10 +62,10 @@ KCTimeInfo::save(TQDataStream &str) } str << TQString::null << (TQ_UINT32) 0; - int endOfFactoryData = str.tqdevice()->tqat(); + int endOfFactoryData = str.device()->at(); saveHeader(str); - str.tqdevice()->tqat(endOfFactoryData); + str.device()->at(endOfFactoryData); } void @@ -86,7 +86,7 @@ void KCTimeInfo::fillCTimeDict(TQDict &dict) { assert(m_str); - m_str->tqdevice()->tqat(m_dictOffset); + m_str->device()->at(m_dictOffset); TQString path; TQ_UINT32 ctime; while(true) diff --git a/kded/vfolder_menu.cpp b/kded/vfolder_menu.cpp index b1c3a612a..e147dcfaf 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.tqat(fn.length() - 1)).latin1() == '~') + if (fn == _dot || fn == _dotdot || TQChar(fn.at(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.tqat(fn.length() - 1)).latin1() == '~') + if (fn == _dot || fn == _dotdot || TQChar(fn.at(fn.length() - 1)).latin1() == '~') continue; TQString pathfn = dir + fn; diff --git a/kdoctools/kio_help.cpp b/kdoctools/kio_help.cpp index 9da16d83e..2e3f58889 100644 --- a/kdoctools/kio_help.cpp +++ b/kdoctools/kio_help.cpp @@ -148,10 +148,10 @@ void HelpProtocol::get( const KURL& url ) doc = url.path(); if ( !mGhelp ) { - if (doc.tqat(0) != '/') + if (doc.at(0) != '/') doc = doc.prepend('/'); - if (doc.tqat(doc.length() - 1) == '/') + if (doc.at(doc.length() - 1) == '/') doc += "index.html"; } diff --git a/kdoctools/xslt.cpp b/kdoctools/xslt.cpp index 5a40d6e60..04e6c3636 100644 --- a/kdoctools/xslt.cpp +++ b/kdoctools/xslt.cpp @@ -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.tqat(start_index - 1) != '>') start_index++; + while (parsed.at(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(""); - while (filedata.tqat(endindex) != '>') endindex++; + while (filedata.at(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.tqat( 0 ) == '/' ); + assert( filename.at( 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.tqat( i )).tqunicode() ); + res.sprintf( "&#%d;", TQChar(part.at( i )).tqunicode() ); test = locale->fromUnicode( res ); if (buffer_len + test.length() + 1 > sizeof(buffer)) break; diff --git a/khtml/css/css_base.h b/khtml/css/css_base.h index b38024bee..9a8774107 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->tqat(num); } + StyleBaseImpl *item(unsigned long num) const { return m_lstChildren->at(num); } void append(StyleBaseImpl *item) { m_lstChildren->append(item); } diff --git a/khtml/css/css_ruleimpl.h b/khtml/css/css_ruleimpl.h index d9928994d..2753fcf83 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.tqat( index ); } + CSSRuleImpl *item ( unsigned long index ) { return m_lstCSSRules.at( index ); } /* not part of the DOM */ diff --git a/khtml/css/css_valueimpl.cpp b/khtml/css/css_valueimpl.cpp index 3fa38efe9..a6150c78b 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->tqat(i)->nonCSSHint) + if (!m_lstValues->at(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->tqat(index)) - return getPropertyName(m_lstValues->tqat(index)->m_id); + if(m_lstValues && index < m_lstValues->count() && m_lstValues->at(index)) + return getPropertyName(m_lstValues->at(index)->m_id); return DOMString(); } diff --git a/khtml/css/css_valueimpl.h b/khtml/css/css_valueimpl.h index 668c53d93..3566c00cb 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.tqat(index); } + CSSValueImpl *item ( unsigned long index ) { return m_values.at(index); } virtual bool isValueList() const { return true; } diff --git a/khtml/css/cssparser.cpp b/khtml/css/cssparser.cpp index 474067cf0..7d59c27d9 100644 --- a/khtml/css/cssparser.cpp +++ b/khtml/css/cssparser.cpp @@ -522,7 +522,7 @@ bool CSSParser::parseValue( int propId, bool important ) valid_primitive = true; break; - case CSS_PROP_CLIP: // | auto | inherit + case CSS_PROP_CLIP: // | auto | inherit if ( id == CSS_VAL_AUTO ) valid_primitive = true; else if ( value->unit == Value::Function ) diff --git a/khtml/css/cssstyleselector.cpp b/khtml/css/cssstyleselector.cpp index 03fbd1c02..e8af85459 100644 --- a/khtml/css/cssstyleselector.cpp +++ b/khtml/css/cssstyleselector.cpp @@ -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 tqinvalidate the fixed regions when scrolling. It's total overkill to + // FIXME: We only need to invalidate 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->tqat(i >= firstLen ? i - firstLen : i); + CSSProperty *prop = values->at(i >= firstLen ? i - firstLen : i); Source source = Inline; if( prop->m_important ) source = InlineImportant; @@ -1782,7 +1782,7 @@ void CSSStyleSelectorList::append( CSSStyleSheetImpl *sheet, TQPtrList *s = r->selector(); for(int j = 0; j < (int)s->count(); j++) { - CSSOrderedRule *rule = new CSSOrderedRule(r, s->tqat(j), count()); + CSSOrderedRule *rule = new CSSOrderedRule(r, s->at(j), count()); TQPtrList::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->tqat( j ), count() ); + styleRule, s->at( j ), count() ); TQPtrList::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->tqat(i); + CSSProperty *prop = values->at(i); Source source = regular; if( prop->m_important ) source = important; diff --git a/khtml/dom/css_value.h b/khtml/dom/css_value.h index 7523a2797..5d4a043c7 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 + * href="http://www.w3.org/TR/REC-CSS2/visufx.html#value-def-shape"> * rect 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/html_block.h b/khtml/dom/html_block.h index b318d8cb9..4283bafa2 100644 --- a/khtml/dom/html_block.h +++ b/khtml/dom/html_block.h @@ -105,7 +105,7 @@ public: ~HTMLDivElement(); /** - * Horizontal text tqalignment. See the * align attribute definition in HTML 4.0. This attribute is * deprecated in HTML 4.0. @@ -231,7 +231,7 @@ public: ~HTMLHeadingElement(); /** - * Horizontal text tqalignment. See the * align attribute definition in HTML 4.0. This attribute is * deprecated in HTML 4.0. @@ -272,7 +272,7 @@ public: ~HTMLParagraphElement(); /** - * Horizontal text tqalignment. See the * align attribute definition 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 ef318ba06..0623e421b 100644 --- a/khtml/dom/html_form.h +++ b/khtml/dom/html_form.h @@ -798,7 +798,7 @@ public: void setAccessKey( const DOMString & ); /** - * Text tqalignment relative to \c FIELDSET . See the * align attribute definition 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 a5cdb3b71..f7c9dac26 100644 --- a/khtml/dom/html_image.cpp +++ b/khtml/dom/html_image.cpp @@ -122,7 +122,7 @@ void HTMLAreaElement::setNoHref( bool _noHref ) } } -DOMString HTMLAreaElement::tqshape() const +DOMString HTMLAreaElement::shape() 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 9b1334c83..9f30aaa14 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 tqshape for the tqshape of the + * geometry. See also \c shape for the shape of the * region. See the * coords attribute definition in HTML 4.0. @@ -131,16 +131,16 @@ public: void setNoHref( bool ); /** - * The tqshape of the active area. The coordinates are given by + * The shape of the active area. The coordinates are given by * \c coords . See the - * tqshape attribute definition in HTML 4.0. + * href="http://www.w3.org/TR/REC-html40/struct/objects.html#adef-shape"> + * shape attribute definition in HTML 4.0. * */ - DOMString tqshape() const; + DOMString shape() const; /** - * see tqshape + * see shape */ void setShape( const DOMString & ); diff --git a/khtml/dom/html_inline.cpp b/khtml/dom/html_inline.cpp index 9f40da2fb..568761685 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::tqshape() const +DOMString HTMLAnchorElement::shape() 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 041c43db0..f92ed6917 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 tqshape for the tqshape of the + * geometry. See also \c shape for the shape of the * region. See the * coords attribute definition in HTML 4.0. @@ -168,16 +168,16 @@ public: void setRev( const DOMString & ); /** - * The tqshape of the active area. The coordinates are given by + * The shape of the active area. The coordinates are given by * \c coords . See the - * tqshape attribute definition in HTML 4.0. + * href="http://www.w3.org/TR/REC-html40/struct/objects.html#adef-shape"> + * shape attribute definition in HTML 4.0. * */ - DOMString tqshape() const; + DOMString shape() const; /** - * see tqshape + * see shape */ void setShape( const DOMString & ); diff --git a/khtml/dom/html_table.h b/khtml/dom/html_table.h index 72e38d7fe..6b9a2d99d 100644 --- a/khtml/dom/html_table.h +++ b/khtml/dom/html_table.h @@ -63,7 +63,7 @@ public: ~HTMLTableCaptionElement(); /** - * Caption tqalignment with respect to the table. See the * align attribute definition in HTML 4.0. This attribute is * deprecated in HTML 4.0. @@ -134,7 +134,7 @@ public: void setAbbr( const DOMString & ); /** - * Horizontal tqalignment of data in cell. See the * align attribute definition in HTML 4.0. * @@ -187,7 +187,7 @@ public: void setCh( const DOMString & ); /** - * Offset of tqalignment character. See the * charoff attribute definition in HTML 4.0. * @@ -281,7 +281,7 @@ public: void setScope( const DOMString & ); /** - * Vertical tqalignment of data in cell. See the * valign attribute definition in HTML 4.0. * @@ -338,7 +338,7 @@ public: ~HTMLTableColElement(); /** - * Horizontal tqalignment of cell data in column. See the * align attribute definition in HTML 4.0. * @@ -364,7 +364,7 @@ public: void setCh( const DOMString & ); /** - * Offset of tqalignment character. See the * charoff attribute definition in HTML 4.0. * @@ -391,7 +391,7 @@ public: void setSpan( long ); /** - * Vertical tqalignment of cell data in column. See the * valign attribute definition in HTML 4.0. * @@ -790,7 +790,7 @@ public: void setCells( const HTMLCollection & ); /** - * Horizontal tqalignment of data within cells of this row. See the + * Horizontal alignment of data within cells of this row. See the * * align attribute definition in HTML 4.0. @@ -831,7 +831,7 @@ public: void setCh( const DOMString & ); /** - * Offset of tqalignment character. See the * charoff attribute definition in HTML 4.0. * @@ -844,7 +844,7 @@ public: void setChOff( const DOMString & ); /** - * Vertical tqalignment of data within cells of this row. See the * valign attribute definition in HTML 4.0. * @@ -913,7 +913,7 @@ public: ~HTMLTableSectionElement(); /** - * Horizontal tqalignment of data in cells. See the \c align + * Horizontal alignment of data in cells. See the \c align * attribute for HTMLTheadElement for details. * */ @@ -938,7 +938,7 @@ public: void setCh( const DOMString & ); /** - * Offset of tqalignment character. See the * charoff attribute definition in HTML 4.0. * @@ -951,7 +951,7 @@ public: void setChOff( const DOMString & ); /** - * Vertical tqalignment of data in cells. See the \c valign + * Vertical alignment of data in cells. See the \c valign * attribute for HTMLTheadElement for details. * */ diff --git a/khtml/ecma/kjs_debugwin.cpp b/khtml/ecma/kjs_debugwin.cpp index 87d1b8a6c..7a083c28e 100644 --- a/khtml/ecma/kjs_debugwin.cpp +++ b/khtml/ecma/kjs_debugwin.cpp @@ -548,7 +548,7 @@ void KJSDebugWin::slotToggleBreakpoint(int lineno) if (m_sourceSel->currentItem() < 0) return; - SourceFile *sourceFile = m_sourceSelFiles.tqat(m_sourceSel->currentItem()); + SourceFile *sourceFile = m_sourceSelFiles.at(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.tqat(sourceSelIndex); + SourceFile *sourceFile = m_sourceSelFiles.at(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.tqat(sourceSelIndex)) + if (m_sourceFragments[ctx.sourceId()]->sourceFile == m_sourceSelFiles.at(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.tqat(m_sourceSel->currentItem()); + SourceFile *sourceFile = m_sourceSelFiles.at(m_sourceSel->currentItem()); if (!sourceFile->interpreter) return; exec = sourceFile->interpreter->globalExec(); @@ -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.tqat(index) == sourceFile) + if (m_sourceSelFiles.at(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.tqat(i) == sourceFile) { + if (m_sourceSelFiles.at(i) == sourceFile) { m_sourceSel->removeItem(i); m_sourceSelFiles.remove(i); break; @@ -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.tqat(i) == sourceFile) + if (m_sourceSelFiles.at(i) == sourceFile) m_sourceSel->setCurrentItem(i); displaySourceFile(sourceFile,false); } diff --git a/khtml/ecma/kjs_html.cpp b/khtml/ecma/kjs_html.cpp index 3fdc35bb2..57762ffd3 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 - tqshape KJS::HTMLElement::AnchorShape DontDelete + shape 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 - tqshape KJS::HTMLElement::AreaShape DontDelete + shape 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.tqshape()); + case AnchorShape: return String(anchor.shape()); 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.tqshape()); + case AreaShape: return String(area.shape()); 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 a14877be2..183c99078 100644 --- a/khtml/ecma/kjs_navigator.cpp +++ b/khtml/ecma/kjs_navigator.cpp @@ -394,7 +394,7 @@ Value Plugins::get(ExecState *exec, const Identifier &propertyName) const bool ok; unsigned int i = propertyName.toULong(&ok); if( ok && icount() ) - return Value( new Plugin( exec, plugins->tqat(i) ) ); + return Value( new Plugin( exec, plugins->at(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 && iplugins->count() ) - return Value( new Plugin( exec, base->plugins->tqat(i) ) ); + return Value( new Plugin( exec, base->plugins->at(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 && icount() ) - return Value( new MimeType( exec, mimes->tqat(i) ) ); + return Value( new MimeType( exec, mimes->at(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 && imimes->count() ) - return Value( new MimeType( exec, base->mimes->tqat(i) ) ); + return Value( new MimeType( exec, base->mimes->at(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 && imimes.count() ) { - //kdDebug(6070) << "returning mimetype " << m_info->mimes.tqat(i)->type << endl; - return Value(new MimeType(exec, m_info->mimes.tqat(i))); + //kdDebug(6070) << "returning mimetype " << m_info->mimes.at(i)->type << endl; + return Value(new MimeType(exec, m_info->mimes.at(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.tqat(i) ) ); + return Value( new MimeType( exec, plugin->pluginInfo()->mimes.at(i) ) ); return Undefined(); } case Plugin_NamedItem: diff --git a/khtml/ecma/kjs_window.cpp b/khtml/ecma/kjs_window.cpp index 02af22f55..27c26a822 100644 --- a/khtml/ecma/kjs_window.cpp +++ b/khtml/ecma/kjs_window.cpp @@ -1013,7 +1013,7 @@ Value Window::get(ExecState *exec, const Identifier &p) const TQPtrList frames = part->frames(); unsigned int len = frames.count(); if (i < len) { - KParts::ReadOnlyPart* frame = frames.tqat(i); + KParts::ReadOnlyPart* frame = frames.at(i); if (frame) return Window::retrieve(frame); } @@ -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.tqat(i); + frame = frames.at(i); } // we are potentially fetching a reference to a another Window object here. diff --git a/khtml/html/html_documentimpl.cpp b/khtml/html/html_documentimpl.cpp index bbfbc86f5..c0bef4434 100644 --- a/khtml/html/html_documentimpl.cpp +++ b/khtml/html/html_documentimpl.cpp @@ -226,7 +226,7 @@ void HTMLDocumentImpl::slotHistoryChanged() return; recalcStyle( Force ); - m_render->tqrepaint(); + m_render->repaint(); } HTMLMapElementImpl* HTMLDocumentImpl::getMap(const DOMString& _url) diff --git a/khtml/html/html_elementimpl.cpp b/khtml/html/html_elementimpl.cpp index 736b5a3b9..89b3587cc 100644 --- a/khtml/html/html_elementimpl.cpp +++ b/khtml/html/html_elementimpl.cpp @@ -620,32 +620,32 @@ void HTMLElementImpl::setInnerText( const DOMString &text, int& exceptioncode ) appendChild( t, exceptioncode ); } -void HTMLElementImpl::addHTMLAlignment( DOMString tqalignment ) +void HTMLElementImpl::addHTMLAlignment( DOMString alignment ) { - //qDebug("tqalignment is %s", tqalignment.string().latin1() ); - // vertical tqalignment with respect to the current baseline of the text + //qDebug("alignment is %s", alignment.string().latin1() ); + // vertical alignment with respect to the current baseline of the text // right or left means floating images int propfloat = -1; int propvalign = -1; - if ( strcasecmp( tqalignment, "absmiddle" ) == 0 ) { + if ( strcasecmp( alignment, "absmiddle" ) == 0 ) { propvalign = CSS_VAL_MIDDLE; - } else if ( strcasecmp( tqalignment, "absbottom" ) == 0 ) { + } else if ( strcasecmp( alignment, "absbottom" ) == 0 ) { propvalign = CSS_VAL_BOTTOM; - } else if ( strcasecmp( tqalignment, "left" ) == 0 ) { + } else if ( strcasecmp( alignment, "left" ) == 0 ) { propfloat = CSS_VAL_LEFT; propvalign = CSS_VAL_TOP; - } else if ( strcasecmp( tqalignment, "right" ) == 0 ) { + } else if ( strcasecmp( alignment, "right" ) == 0 ) { propfloat = CSS_VAL_RIGHT; propvalign = CSS_VAL_TOP; - } else if ( strcasecmp( tqalignment, "top" ) == 0 ) { + } else if ( strcasecmp( alignment, "top" ) == 0 ) { propvalign = CSS_VAL_TOP; - } else if ( strcasecmp( tqalignment, "middle" ) == 0 ) { + } else if ( strcasecmp( alignment, "middle" ) == 0 ) { propvalign = CSS_VAL__KHTML_BASELINE_MIDDLE; - } else if ( strcasecmp( tqalignment, "center" ) == 0 ) { + } else if ( strcasecmp( alignment, "center" ) == 0 ) { propvalign = CSS_VAL_MIDDLE; - } else if ( strcasecmp( tqalignment, "bottom" ) == 0 ) { + } else if ( strcasecmp( alignment, "bottom" ) == 0 ) { propvalign = CSS_VAL_BASELINE; - } else if ( strcasecmp ( tqalignment, "texttop") == 0 ) { + } else if ( strcasecmp ( alignment, "texttop") == 0 ) { propvalign = CSS_VAL_TEXT_TOP; } diff --git a/khtml/html/html_elementimpl.h b/khtml/html/html_elementimpl.h index 83836f15d..f71ae9b23 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 tqalignment ); + void addHTMLAlignment( DOMString alignment ); }; class HTMLGenericElementImpl : public HTMLElementImpl diff --git a/khtml/html/html_formimpl.cpp b/khtml/html/html_formimpl.cpp index b77dff16c..a45902cd9 100644 --- a/khtml/html/html_formimpl.cpp +++ b/khtml/html/html_formimpl.cpp @@ -2761,7 +2761,7 @@ static TQString expandLF(const TQString& s) unsigned pos2 = 0; for(unsigned pos = 0; pos < len; pos++) { - TQChar c = s.tqat(pos); + TQChar c = s.at(pos); switch(c.tqunicode()) { case '\n': diff --git a/khtml/html/html_imageimpl.cpp b/khtml/html/html_imageimpl.cpp index 9ced3bf1b..c1f7ac987 100644 --- a/khtml/html/html_imageimpl.cpp +++ b/khtml/html/html_imageimpl.cpp @@ -441,7 +441,7 @@ HTMLAreaElementImpl::HTMLAreaElementImpl(DocumentImpl *doc) m_coords=0; m_coordsLen = 0; nohref = false; - tqshape = Unknown; + shape = Unknown; lasth = lastw = -1; } @@ -461,13 +461,13 @@ void HTMLAreaElementImpl::parseAttribute(AttributeImpl *attr) { case ATTR_SHAPE: if ( strcasecmp( attr->value(), "default" ) == 0 ) - tqshape = Default; + shape = Default; else if ( strcasecmp( attr->value(), "circle" ) == 0 ) - tqshape = Circle; + shape = Circle; else if ( strcasecmp( attr->value(), "poly" ) == 0 || strcasecmp( attr->value(), "polygon" ) == 0 ) - tqshape = Poly; + shape = Poly; else if ( strcasecmp( attr->value(), "rect" ) == 0 ) - tqshape = Rect; + shape = 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 ((tqshape==Poly || tqshape==Unknown) && m_coordsLen > 5) { + if ((shape==Poly || shape==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 (tqshape==Circle && m_coordsLen>=3 || tqshape==Unknown && m_coordsLen == 3) { + else if (shape==Circle && m_coordsLen>=3 || shape==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 (tqshape==Rect && m_coordsLen>=4 || tqshape==Unknown && m_coordsLen == 4) { + else if (shape==Rect && m_coordsLen>=4 || shape==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 (tqshape==Default) + else if (shape==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 1a389e895..6f26cd2df 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 tqshape==Default; } + bool isDefault() const { return shape==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 tqshape : 3; + Shape shape : 3; bool nohref : 1; }; diff --git a/khtml/html/html_miscimpl.cpp b/khtml/html/html_miscimpl.cpp index d5e812029..58804bff5 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& l = static_cast( m_refNode )->formElements; for (unsigned i = strt; i < l.count(); i++) { - if (l.tqat( i )->isEnumeratable()) + if (l.at( i )->isEnumeratable()) { if (dist == 0) { //Found it! m_cache->position = index; m_cache->current.index = i; - return l.tqat( i ); + return l.at( i ); } else --dist; @@ -349,7 +349,7 @@ unsigned long HTMLFormCollectionImpl::calcLength(NodeImpl *start) const unsigned length = 0; TQPtrList l = static_cast( start )->formElements; for ( unsigned i = 0; i < l.count(); i++ ) - if ( l.tqat( i )->isEnumeratable() ) + if ( l.at( 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.tqat(currentNamePos); + HTMLGenericFormElementImpl* el = l.at(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& il = static_cast( m_refNode )->imgElements; for ( ; currentNameImgPos < il.count(); ++currentNameImgPos ) { - HTMLImageElementImpl* el = il.tqat(currentNameImgPos); + HTMLImageElementImpl* el = il.at(currentNameImgPos); if ((el->getAttribute(ATTR_ID) == name) || (el->getAttribute(ATTR_NAME) == name)) { diff --git a/khtml/java/kjavaappletviewer.cpp b/khtml/java/kjavaappletviewer.cpp index e55a915f2..e17e70110 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.tqat(0)=='\"') + if (value.at(0)=='\"') value = value.right (value.length () - 1); if (value.at (value.length () - 1) == '\"') value.truncate (value.length () - 1); diff --git a/khtml/java/kjavaprocess.cpp b/khtml/java/kjavaprocess.cpp index c86b922dd..48eb7b764 100644 --- a/khtml/java/kjavaprocess.cpp +++ b/khtml/java/kjavaprocess.cpp @@ -168,7 +168,7 @@ void KJavaProcess::storeSize( TQByteArray* buff ) const char* size_ptr = size_str.latin1(); for( int i = 0; i < 8; ++i ) - buff->tqat(i) = size_ptr[i]; + buff->at(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->tqat(i) == (char)0 ) +// if( buf->at(i) == (char)0 ) // kdDebug(6100) << ""; -// else if( buf->tqat(i) > 0 && buf->tqat(i) < 10 ) -// kdDebug(6100) << "tqat(i) << ">"; +// else if( buf->at(i) > 0 && buf->at(i) < 10 ) +// kdDebug(6100) << "at(i) << ">"; // else -// kdDebug(6100) << buf->tqat(i); +// kdDebug(6100) << buf->at(i); // } // kdDebug(6100) << "<<" << endl; diff --git a/khtml/khtml_caret.cpp b/khtml/khtml_caret.cpp index 0946685cb..80df392aa 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 tqalignment + // have to care for rtl or alignment // ### can empty inline elements have a width? css 2 spec isn't verbose about it caretBox->_y += flowBox->baseline() - fm.ascent(); @@ -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->tqat(i); + RenderTableCell *cell = row->row->at(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->tqat(index); + RenderTableCell *cell = row->row->at(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->tqat(j); + RenderTableCell *c = row->row->at(j); if (c == directCell) return i; }/*next j*/ diff --git a/khtml/khtml_pagecache.cpp b/khtml/khtml_pagecache.cpp index e736df5c2..935f31cc0 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()->tqdevice()->flush(); - m_file->dataStream()->tqdevice()->tqat(0); + m_file->dataStream()->device()->flush(); + m_file->dataStream()->device()->at(0); } } diff --git a/khtml/khtml_part.cpp b/khtml/khtml_part.cpp index c41811f59..28a31ad9e 100644 --- a/khtml/khtml_part.cpp +++ b/khtml/khtml_part.cpp @@ -2286,7 +2286,7 @@ void KHTMLPart::checkCompleted() } // the view will emit completed on our behalf, - // either now or at next tqrepaint if one is pending + // either now or at next repaint if one is pending //kdDebug(6050) << this << " asks the view to emit completed. pendingAction=" << pendingAction << endl; d->m_view->complete( pendingAction ); @@ -6877,7 +6877,7 @@ void KHTMLPart::slotActiveFrameChanged( KParts::Part *part ) if (frame->frameStyle() != TQFrame::NoFrame) { frame->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken); - frame->tqrepaint(); + frame->repaint(); } } @@ -6905,7 +6905,7 @@ void KHTMLPart::slotActiveFrameChanged( KParts::Part *part ) if (frame->frameStyle() != TQFrame::NoFrame) { frame->setFrameStyle( TQFrame::StyledPanel | TQFrame::Plain); - frame->tqrepaint(); + frame->repaint(); } kdDebug(6050) << "new active frame " << d->m_activeFrame << endl; } diff --git a/khtml/khtml_settings.cc b/khtml/khtml_settings.cc index 3a9a4e297..431aec0ca 100644 --- a/khtml/khtml_settings.cc +++ b/khtml/khtml_settings.cc @@ -878,7 +878,7 @@ const TQString &KHTMLSettings::availableFamilies() if ( !avFamilies ) { avFamilies = new TQString; TQFontDatabase db; - TQStringList families = db.tqfamilies(); + TQStringList families = db.families(); TQStringList s; TQRegExp foundryExp(" \\[.+\\]"); diff --git a/khtml/khtmlview.cpp b/khtml/khtmlview.cpp index b59781bf0..3a75744ce 100644 --- a/khtml/khtmlview.cpp +++ b/khtml/khtmlview.cpp @@ -867,7 +867,7 @@ void KHTMLView::layout() } #if 0 ElementImpl *listitem = m_part->xmlDocImpl()->getElementById("__test_element__"); - if (listitem) kdDebug(6000) << "after layout, before tqrepaint" << endl; + if (listitem) kdDebug(6000) << "after layout, before repaint" << endl; if (listitem) dumpLineBoxes(static_cast(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(tqrepaint())); + connect( this, TQT_SIGNAL(repaintAccessKeys()), lab, TQT_SLOT(repaint())); lab->setPalette(TQToolTip::palette()); lab->setLineWidth(2); lab->setFrameStyle(TQFrame::Box | TQFrame::Plain); @@ -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->tqrepaint(); +// root->repaint(); // 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(m_part->xmlDocImpl()->renderer()); if(!root) return; - m_part->xmlDocImpl()->setPaintDevice(p->tqdevice()); + m_part->xmlDocImpl()->setPaintDevice(p->device()); root->setPagedMode(true); root->setStaticMode(true); root->setWidth(rc.width()); @@ -3510,12 +3510,12 @@ void KHTMLView::timerEvent ( TQTimerEvent *e ) setStaticBackground(d->useSlowRepaints); -// kdDebug() << "scheduled tqrepaint "<< d->repaintTimerId << endl; +// kdDebug() << "scheduled repaint "<< d->repaintTimerId << endl; killTimer(d->repaintTimerId); d->repaintTimerId = 0; TQRect updateRegion; - TQMemArray rects = d->updateRegion.tqrects(); + TQMemArray rects = d->updateRegion.rects(); d->updateRegion = TQRegion(); @@ -3645,10 +3645,10 @@ void KHTMLView::complete( bool pendingAction ) KHTMLViewPrivate::CSActionPending : KHTMLViewPrivate::CSFull; } - // is there a tqrepaint pending? + // is there a repaint pending? if (d->repaintTimerId) { -// kdDebug() << "requesting tqrepaint now" << endl; +// kdDebug() << "requesting repaint 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 tqrepaint the selection on keepSelection!=false + // ### does not repaint 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 tqrepaint, otherwise the event won't be handled + // force repaint, 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, diff --git a/khtml/khtmlview.h b/khtml/khtmlview.h index 212a02b44..65e432090 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 tqrepaint, otherwise - * do a scheduled tqrepaint + * @param forceRepaint @p true to force an immediate repaint, otherwise + * do a scheduled repaint */ 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 fe47e8616..20768341f 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.tqresize( sz+1, TQGArray::SpeedOptim ); + m_currentLine.resize( sz+1, TQGArray::SpeedOptim ); m_currentLine[sz] = c; } if ( c == '\n' ) @@ -68,7 +68,7 @@ public: reset(); } void reset() { - m_currentLine.tqresize( 0, TQGArray::SpeedOptim ); + m_currentLine.resize( 0, TQGArray::SpeedOptim ); m_lineComplete = false; } private: diff --git a/khtml/misc/arena.cpp b/khtml/misc/arena.cpp index 58d531384..5efcaf98d 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 tqalignment */ + nb = (uword)ARENA_ALIGN(pool, nb); /* force alignment */ /* 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 tqalignment slop */ + sz += sizeof *a + pool->mask; /* header and alignment slop */ pool->cumul += sz; #ifdef DEBUG_ARENA_MALLOC i++; diff --git a/khtml/misc/htmlattrs.c b/khtml/misc/htmlattrs.c index 6f420e3b3..779792e71 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("tqshape")]; + char spool_attr_str45[sizeof("shape")]; 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", - "tqshape", + "shape", "charset", "charoff", "lang", diff --git a/khtml/misc/khtmllayout.h b/khtml/misc/khtmllayout.h index b0c8dc613..1049d10c4 100644 --- a/khtml/misc/khtmllayout.h +++ b/khtml/misc/khtmllayout.h @@ -33,7 +33,7 @@ namespace khtml const int UNDEFINED = -1; - // tqalignment + // alignment enum VAlign { VNone=0, Bottom, VCenter, Top, Baseline }; enum HAlign { HDefault, Left, HCenter, Right, HNone = 0 }; diff --git a/khtml/misc/loader.cpp b/khtml/misc/loader.cpp index 8320a51c3..c04f13e37 100644 --- a/khtml/misc/loader.cpp +++ b/khtml/misc/loader.cpp @@ -397,7 +397,7 @@ public: void sendTo(TQDataSink* sink, int n) { - sink->receive((const uchar*)&buffer.tqat(pos), n); + sink->receive((const uchar*)&buffer.at(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->disconnectStatus( 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->connectStatus( this, TQT_SLOT( movieStatus(int))); m->connectResize( this, TQT_SLOT( movieResize( const TQSize& ) ) ); } } diff --git a/khtml/misc/multimap.h b/khtml/misc/multimap.h index 8f60dcf02..125e8e07d 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 tqalignment and multiply by a prime unlikely to be a factor of size + // remove alignment and multiply by a prime unlikely to be a factor of size val = (val >> 4) * 1237; return val; } diff --git a/khtml/rendering/bidi.cpp b/khtml/rendering/bidi.cpp index 30beadd7c..e866f8838 100644 --- a/khtml/rendering/bidi.cpp +++ b/khtml/rendering/bidi.cpp @@ -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->tqat(sCurrMidpoint); + nextMidpoint = smidpoints->at(sCurrMidpoint); if (betweenMidpoints) { if (!(haveNextMidpoint && nextMidpoint.obj == obj)) return; diff --git a/khtml/rendering/render_arena.cpp b/khtml/rendering/render_arena.cpp index 023b98e36..99fbf4f4d 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 tqalignment for pointers. Important for Tru64 + // Ensure we have correct alignment 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 tqalignment for pointers. Important for Tru64 + // Ensure we have correct alignment 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_body.cpp b/khtml/rendering/render_body.cpp index 2ed114a53..930ec358c 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::tqrepaint(Priority p) +void RenderBody::repaint(Priority p) { RenderObject *cb = containingBlock(); if(cb) - cb->tqrepaint(p); + cb->repaint(p); } void RenderBody::layout() diff --git a/khtml/rendering/render_body.h b/khtml/rendering/render_body.h index 17c237e91..7951f73e1 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 tqrepaint(Priority p=NormalPriority); + virtual void repaint(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 e63115361..1dda168c2 100644 --- a/khtml/rendering/render_box.cpp +++ b/khtml/rendering/render_box.cpp @@ -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 tqrepaint-clip + // restrict painting to repaint-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::tqrepaint(Priority prior) +void RenderBox::repaint(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 78b85b5f4..c0c618d5c 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 tqrepaint(Priority p=NormalPriority); + virtual void repaint(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 e5947369d..6fdf45849 100644 --- a/khtml/rendering/render_canvas.cpp +++ b/khtml/rendering/render_canvas.cpp @@ -372,13 +372,13 @@ void RenderCanvas::scheduleDeferredRepaints() if (!needsFullRepaint()) { TQValueList::const_iterator it; for ( it = m_dirtyChildren.begin(); it != m_dirtyChildren.end(); ++it ) - (*it)->tqrepaint(); + (*it)->repaint(); } - //kdDebug(6040) << "scheduled deferred repaints: " << m_dirtyChildren.count() << " needed full tqrepaint: " << needsFullRepaint() << endl; + //kdDebug(6040) << "scheduled deferred repaints: " << m_dirtyChildren.count() << " needed full repaint: " << needsFullRepaint() << endl; m_dirtyChildren.clear(); } -void RenderCanvas::tqrepaint(Priority p) +void RenderCanvas::repaint(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 tqrepaint() because it will cause all rects to + // Don't use repaint() 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->tqrepaint(); + o->repaint(); o->setSelectionState(SelectionNone); - o->tqrepaint(); + o->repaint(); 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->tqrepaint(); + m_selectionEnd->repaint(); } // set selection start & end to 0 diff --git a/khtml/rendering/render_canvas.h b/khtml/rendering/render_canvas.h index cd4ef30ca..17f279d7b 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 tqrepaint(Priority p=NormalPriority); + virtual void repaint(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 13f17c08d..69f987477 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 tqrepaint, so that the area exposed when the child + // that a positioned child got yanked). We also repaint, so that the area exposed when the child // disappears gets repainted properly. if ( document()->renderer() ) { oldChild->setNeedsLayoutAndMinMaxRecalc(); - oldChild->tqrepaint(); + oldChild->repaint(); // Keep our layer hierarchy updated. oldChild->removeLayers(enclosingLayer()); diff --git a/khtml/rendering/render_flow.cpp b/khtml/rendering/render_flow.cpp index 97dd40468..ae579bd46 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::tqrepaint(Priority prior) +void RenderFlow::repaint(Priority prior) { if (isInlineFlow()) { // Find our leftmost position. @@ -280,7 +280,7 @@ void RenderFlow::tqrepaint(Priority prior) if (curr == firstLineBox() || curr->xPos() < left) left = curr->xPos(); - // Now tqinvalidate a rectangle. + // Now invalidate 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::tqrepaint(Priority prior) effectiveWidth()+ow*2, effectiveHeight()+ow*2, prior); } else - return RenderBox::tqrepaint(prior); + return RenderBox::repaint(prior); } } diff --git a/khtml/rendering/render_flow.h b/khtml/rendering/render_flow.h index 3267a92f1..1e23822bb 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 tqrepaint(Priority p=NormalPriority); + virtual void repaint(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_image.cpp b/khtml/rendering/render_image.cpp index b5357bba1..8626580d6 100644 --- a/khtml/rendering/render_image.cpp +++ b/khtml/rendering/render_image.cpp @@ -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; - tqrepaint(); + repaint(); } RenderReplaced::notifyFinished(finishedObj); diff --git a/khtml/rendering/render_layer.cpp b/khtml/rendering/render_layer.cpp index e82e0d831..96b0236cb 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->tqat(i); + RenderLayer* child = m_negZOrderList->at(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->tqat(i); + RenderLayer* child = m_posZOrderList->at(i); r += child->paintedRegion(rootLayer); } } return r; } -void RenderLayer::tqrepaint( Priority p, bool markForRepaint ) +void RenderLayer::repaint( Priority p, bool markForRepaint ) { if (markForRepaint && m_markedForRepaint) return; for (RenderLayer* child = firstChild(); child; child = child->nextSibling()) - child->tqrepaint( p, markForRepaint ); + child->repaint( 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::tqrepaint( Priority p, bool markForRepaint ) void RenderLayer::updateLayerPositions(RenderLayer* rootLayer, bool doFullRepaint, bool checkForRepaint) { if (doFullRepaint) { - m_object->tqrepaint(); + m_object->repaint(); 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->tqat(i); + RenderLayer* child = m_posZOrderList->at(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 tqrepaint) +void RenderLayer::scrollToOffset(int x, int y, bool updateScrollbars, bool repaint) { 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 tqrep // Fire the scroll DOM event. m_object->element()->dispatchHTMLEvent(EventImpl::SCROLL_EVENT, true, false); - // Just schedule a full tqrepaint of our object. - if (tqrepaint) - m_object->tqrepaint(RealtimePriority); + // Just schedule a full repaint of our object. + if (repaint) + m_object->repaint(RealtimePriority); if (updateScrollbars) { if (m_hBar) @@ -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->tqat(i); + RenderLayer* child = m_negZOrderList->at(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->tqat(i); + RenderLayer* child = m_posZOrderList->at(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->tqat(i); + RenderLayer* child = m_posZOrderList->at(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->tqat(i); + RenderLayer* child = m_negZOrderList->at(i); insideLayer = child->nodeAtPointForLayer(rootLayer, info, xMousePos, yMousePos, hitTestRect); if (insideLayer) return insideLayer; @@ -1261,8 +1261,8 @@ static void sortByZOrder(TQPtrVector* buffer, for (uint i = end-1; i > start; i--) { bool sorted = true; for (uint j = start; j < i; j++) { - RenderLayer* elt = buffer->tqat(j); - RenderLayer* elt2 = buffer->tqat(j+1); + RenderLayer* elt = buffer->at(j); + RenderLayer* elt2 = buffer->at(j+1); if (elt->zIndex() > elt2->zIndex()) { sorted = false; buffer->insert(j, elt2); @@ -1279,8 +1279,8 @@ static void sortByZOrder(TQPtrVector* buffer, sortByZOrder(buffer, mergeBuffer, start, mid); sortByZOrder(buffer, mergeBuffer, mid, end); - RenderLayer* elt = buffer->tqat(mid-1); - RenderLayer* elt2 = buffer->tqat(mid); + RenderLayer* elt = buffer->at(mid-1); + RenderLayer* elt2 = buffer->at(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* buffer, uint i1 = start; uint i2 = mid; - elt = buffer->tqat(i1); - elt2 = buffer->tqat(i2); + elt = buffer->at(i1); + elt2 = buffer->at(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->tqat(i1); + elt = buffer->at(i1); } else { mergeBuffer->insert(mergeBuffer->count(), elt2); i2++; if (i2 < end) - elt2 = buffer->tqat(i2); + elt2 = buffer->at(i2); } } for (uint i = start; i < end; i++) - buffer->insert(i, mergeBuffer->tqat(i-start)); + buffer->insert(i, mergeBuffer->at(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->tqat(i), paintDirtyRect, indent ); + writeLayers(ts, rootLayer, negList->at(i), paintDirtyRect, indent ); } if (shouldPaint) @@ -1485,7 +1485,7 @@ static void writeLayers(TQTextStream &ts, const RenderLayer* rootLayer, RenderLa TQPtrVector* posList = l->posZOrderList(); if (posList) { for (unsigned i = 0; i != posList->count(); ++i) - writeLayers(ts, rootLayer, posList->tqat(i), paintDirtyRect, indent); + writeLayers(ts, rootLayer, posList->at(i), paintDirtyRect, indent); } } diff --git a/khtml/rendering/render_layer.h b/khtml/rendering/render_layer.h index 1176a63a3..a8f1e5adc 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 tqrepaint = true); + void scrollToOffset(int x, int y, bool updateScrollbars = true, bool repaint = 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 tqrepaint(Priority p=NormalPriority, bool markForRepaint = false); + void repaint(Priority p=NormalPriority, bool markForRepaint = false); void updateScrollPositionFromScrollbars(); void updateLayerPosition(); diff --git a/khtml/rendering/render_object.cpp b/khtml/rendering/render_object.cpp index e69991930..162ca4956 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) { - //tqrepaint bg when it finished loading + //repaint bg when it finished loading if(image && parent() && style() && style()->backgroundLayers()->containsImage(image)) { - isBody() ? canvas()->tqrepaint() : tqrepaint(); + isBody() ? canvas()->repaint() : repaint(); } } @@ -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 tqrepaint with the old style + // schedule a repaint with the old style if (layer() && !isInlineFlow()) - layer()->tqrepaint(pri); + layer()->repaint(pri); else - tqrepaint(pri); + repaint(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 tqrepaint is enough + // a repaint 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()->tqrepaint(pri); + layer()->repaint(pri); else - tqrepaint(pri); + repaint(pri); } } } @@ -1428,9 +1428,9 @@ void RenderObject::repaintDuringLayout() if (canvas()->needsFullRepaint() || isText()) return; if (layer() && !isInlineFlow()) { - layer()->tqrepaint( NormalPriority, true ); + layer()->repaint( NormalPriority, true ); } else { - tqrepaint(); + repaint(); 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 vtqalignment. + // don't allow elements nested inside text-top to have a different valignment. if ( va == BASELINE ) return vpos; else if ( va == LENGTH ) diff --git a/khtml/rendering/render_object.h b/khtml/rendering/render_object.h index e403601d3..f7f772387 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 - // tqrepaint and do not need a relayout + // repaint 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& borderStyles); - // force a complete tqrepaint - virtual void tqrepaint(Priority p = NormalPriority) { if(m_parent) m_parent->tqrepaint(p); } + // force a complete repaint + virtual void repaint(Priority p = NormalPriority) { if(m_parent) m_parent->repaint(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 tqinvalidate current layout + // recursively invalidate current layout // unused: void invalidateLayout(); virtual void calcVerticalMargins() {} diff --git a/khtml/rendering/render_replaced.cpp b/khtml/rendering/render_replaced.cpp index f0a6f94a9..7653b746c 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(e); m_widget->resize( re->w, re->h ); - tqrepaint(); + repaint(); } // eat all events - except if this is a frame (in which case KHTMLView handles it all) if ( ::tqqt_cast( m_widget ) ) @@ -543,10 +543,10 @@ static void copyWidget(const TQRect& r, TQPainter *p, TQWidget *widget, int tx, } } } - TQMemArray br = blit.tqrects(); + TQMemArray br = blit.rects(); const int cnt = br.size(); - const bool external = p->tqdevice()->isExtDev(); + const bool external = p->device()->isExtDev(); TQPixmap* const pm = PaintBuffer::grab( widget->size() ); if (!pm) { diff --git a/khtml/rendering/render_style.cpp b/khtml/rendering/render_style.cpp index 81d0b62ed..ecbbf6de2 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 tqrepaint nor relayout after + NonVisible: The object does need neither repaint 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 tqrepaint +// or just a repaint // non-inherited attributes // DataRef box; diff --git a/khtml/rendering/render_table.cpp b/khtml/rendering/render_table.cpp index 26e9c26d5..2cf1bf1f9 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.tqat(i)).width()); + m += TQString("%1 ").arg((*borderStyles.at(i)).width()); kdDebug(6040) << m << endl; #endif TQValueListIterator it = borderStyles.begin(); diff --git a/khtml/rendering/render_text.cpp b/khtml/rendering/render_text.cpp index cc41a1688..58c9c33df 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.tqat(i); + InlineTextBox* s = m_lines.at(i); if (s) s->detach(arena); m_lines.remove(i); @@ -1328,11 +1328,11 @@ short RenderText::width() const return w; } -void RenderText::tqrepaint(Priority p) +void RenderText::repaint(Priority p) { RenderObject *cb = containingBlock(); if(cb) - cb->tqrepaint(p); + cb->repaint(p); } bool RenderText::isFixedWidthFont() const @@ -1464,7 +1464,7 @@ static TQString quoteAndEscapeNonPrintables(const TQString &s) TQString result; result += '"'; for (uint i = 0; i != s.length(); ++i) { - TQChar c = s.tqat(i); + TQChar c = s.at(i); if (c == '\\') { result += "\\\\"; } else if (c == '"') { diff --git a/khtml/rendering/render_text.h b/khtml/rendering/render_text.h index 0923837b3..fabf5e051 100644 --- a/khtml/rendering/render_text.h +++ b/khtml/rendering/render_text.h @@ -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 tqrepaint(Priority p=NormalPriority); + virtual void repaint(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 789fa3203..56f3feb70 100644 --- a/khtml/test/align2.html +++ b/khtml/test/align2.html @@ -4,14 +4,14 @@

Align Test 2

-This page contains regression tests for vertical tqalignment of images. +This page contains regression tests for vertical alignment 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.
-This image has no tqalignment +This image has no alignment
@@ -39,7 +39,7 @@ Within the table an empty image is shown with a border of 1 pixel around it.
-This image has no tqalignment +This image has no alignment
@@ -68,7 +68,7 @@ Within the table an empty image is shown with a border of 1 pixel around it.
-This image has no tqalignment +This image has no alignment
@@ -96,7 +96,7 @@ Within the table an empty image is shown with a border of 1 pixel around it.
-This image has no tqalignment +This image has no alignment
diff --git a/khtml/test/image_map.html b/khtml/test/image_map.html index 35d170d2a..21e002382 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 - - - - - + + + + + diff --git a/khtml/test_regression.cpp b/khtml/test_regression.cpp index 6da8d04f0..60a683bd8 100644 --- a/khtml/test_regression.cpp +++ b/khtml/test_regression.cpp @@ -1051,7 +1051,7 @@ void RegressionTest::doJavascriptReport( const TQString &test ) text.replace( TQRegExp( "\nFAIL" ), "\nFAIL" ); text.replace( TQRegExp( "\nPASSED" ), "\nPASSED" ); text.replace( TQRegExp( "\nPASS" ), "\nPASS" ); - if ( text.tqat( 0 ) == '\n' ) + if ( text.at( 0 ) == '\n' ) text = text.mid( 1, text.length() ); text.replace( '\n', "
\n" ); cl += text; diff --git a/khtml/xml/dom_nodeimpl.cpp b/khtml/xml/dom_nodeimpl.cpp index 834f4b674..0af9c75a2 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 - // tqinvalidate the item after the current iterator (which "it" is pointing to). + // invalidate the item after the current iterator (which "it" is pointing to). // So we make a copy of the list. TQValueList listeners = *m_regdListeners.listeners; TQValueList::iterator it; @@ -1925,7 +1925,7 @@ NodeImpl *GenericRONamedNodeMapImpl::item ( unsigned long index ) const if (index >= m_contents->count()) return 0; - return m_contents->tqat(index); + return m_contents->at(index); } unsigned long GenericRONamedNodeMapImpl::length( ) const diff --git a/kimgio/dds.cpp b/kimgio/dds.cpp index 1a2edee84..6fee86569 100644 --- a/kimgio/dds.cpp +++ b/kimgio/dds.cpp @@ -910,7 +910,7 @@ namespace { // Private. return false; } - int offset = s.tqdevice()->tqat(); + int offset = s.device()->at(); int size = FaceOffset( header ); for( int i = 0; i < 6; i++ ) { @@ -921,7 +921,7 @@ namespace { // Private. } // Seek device. - s.tqdevice()->tqat( offset ); + s.device()->at( 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->setStatus( -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->setStatus( -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->setStatus( -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->setStatus( -1 ); return; } io->setImage( img ); - io->seStatus( 0 ); + io->setStatus( 0 ); } diff --git a/kimgio/eps.cpp b/kimgio/eps.cpp index a06d43be3..a323feace 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->tqat(ps_offset) ) // Get offset of PostScript code in the MS-DOS EPS file. + if ( !io->at(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->tqat(ps_offset); + io->at(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->setStatus (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->setStatus(0); } diff --git a/kimgio/exr.cpp b/kimgio/exr.cpp index 88b3fbbbe..c28cb799b 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->setStatus( 0 ); } catch (const std::exception &exc) { diff --git a/kimgio/hdr.cpp b/kimgio/hdr.cpp index 99bcccbbf..82cba5c12 100644 --- a/kimgio/hdr.cpp +++ b/kimgio/hdr.cpp @@ -127,7 +127,7 @@ namespace { // Private. if (val != 2) { - s.tqdevice()->tqat( s.tqdevice()->tqat() - 1 ); + s.device()->at( s.device()->at() - 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->setStatus( -1 ); return; } @@ -238,7 +238,7 @@ KDE_EXPORT void kimgio_hdr_read( TQImageIO * io ) { kdDebug(399) << "Invalid HDR file." << endl; io->setImage( TQImage() ); - io->seStatus( -1 ); + io->setStatus( -1 ); return; } @@ -249,12 +249,12 @@ KDE_EXPORT void kimgio_hdr_read( TQImageIO * io ) { kdDebug(399) << "Error loading HDR file." << endl; io->setImage( TQImage() ); - io->seStatus( -1 ); + io->setStatus( -1 ); return; } io->setImage( img ); - io->seStatus( 0 ); + io->setStatus( 0 ); } diff --git a/kimgio/ico.cpp b/kimgio/ico.cpp index 3188ac238..e14f09fb5 100644 --- a/kimgio/ico.cpp +++ b/kimgio/ico.cpp @@ -243,7 +243,7 @@ namespace extern "C" KDE_EXPORT void kimgio_ico_read( TQImageIO* io ) { - TQIODevice::Offset offset = io->ioDevice()->tqat(); + TQIODevice::Offset offset = io->ioDevice()->at(); TQDataStream stream( io->ioDevice() ); stream.setByteOrder( TQDataStream::LittleEndian ); @@ -295,7 +295,7 @@ extern "C" KDE_EXPORT void kimgio_ico_read( TQImageIO* io ) offset + selected->offset > io->ioDevice()->size() ) return; - io->ioDevice()->tqat( offset + selected->offset ); + io->ioDevice()->at( offset + selected->offset ); TQImage icon; if ( loadFromDIB( stream, *selected, icon ) ) { @@ -306,7 +306,7 @@ extern "C" KDE_EXPORT void kimgio_ico_read( TQImageIO* io ) icon.setText( "X-HotspotY", 0, TQString::number( selected->hotspotY ) ); } io->setImage(icon); - io->seStatus(0); + io->setStatus(0); } } @@ -334,7 +334,7 @@ void kimgio_ico_write(TQImageIO *io) if (!qt_write_dib(dib, pixels)) return; - uint hdrPos = dib.device()->tqat(); + uint hdrPos = dib.device()->at(); if (!qt_write_dib(dib, mask)) return; memmove(dibData.data() + hdrPos, dibData.data() + hdrPos + BMP_WIN + 8, dibData.size() - hdrPos - BMP_WIN - 8); @@ -361,14 +361,14 @@ void kimgio_ico_write(TQImageIO *io) rec.dibSize = dibData.size(); ico << rec.width << rec.height << rec.colors << rec.hotspotX << rec.hotspotY << rec.dibSize; - rec.dibOffset = ico.device()->tqat() + sizeof(rec.dibOffset); + rec.dibOffset = ico.device()->at() + sizeof(rec.dibOffset); ico << rec.dibOffset; BMP_INFOHDR dibHeader; - dib.device()->tqat(0); + dib.device()->at(0); dib >> dibHeader; dibHeader.biHeight = io->image().height() << 1; - dib.device()->tqat(0); + dib.device()->at(0); dib << dibHeader; ico.writeRawBytes(dibData.data(), dibData.size()); diff --git a/kimgio/jp2.cpp b/kimgio/jp2.cpp index 4e74211e8..2200c948c 100644 --- a/kimgio/jp2.cpp +++ b/kimgio/jp2.cpp @@ -163,7 +163,7 @@ kimgio_jp2_read( TQImageIO* io ) if( gs.altimage ) jas_image_destroy( gs.altimage ); io->setImage( image ); - io->seStatus( 0 ); + io->setStatus( 0 ); } // kimgio_jp2_read @@ -291,7 +291,7 @@ kimgio_jp2_write( TQImageIO* io ) TQ_LONG size; // seek to the beginning of the file. - if( !in->tqat( 0 ) ) { delete ktempf; return; } + if( !in->at( 0 ) ) { delete ktempf; return; } // 0 or -1 is EOF / error while( ( size = in->readBlock( b.data(), 4096 ) ) > 0 ) { @@ -309,7 +309,7 @@ kimgio_jp2_write( TQImageIO* io ) // everything went fine - io->seStatus( IO_Ok ); + io->setStatus( IO_Ok ); } // kimgio_jp2_write #endif // HAVE_JASPER diff --git a/kimgio/pcx.cpp b/kimgio/pcx.cpp index bda7ef495..53ef4fe2c 100644 --- a/kimgio/pcx.cpp +++ b/kimgio/pcx.cpp @@ -46,7 +46,7 @@ static TQDataStream &operator>>( TQDataStream &s, PCXHEADER &ph ) // Skip the rest of the header TQ_UINT8 byte; - while ( s.tqdevice()->tqat() < 128 ) + while ( s.device()->at() < 128 ) s >> byte; return s; @@ -183,7 +183,7 @@ static void readImage4( TQImage &img, TQDataStream &s, const PCXHEADER &header ) TQ_UINT32 offset = i*header.BytesPerLine; for ( unsigned int x=0; x> ( x%8 ) ) ) - pixbuf[ x ] = static_cast(pixbuf.tqat(x)) + ( 1 << i ); + pixbuf[ x ] = static_cast(pixbuf.at(x)) + ( 1 << i ); } uchar *p = img.scanLine( y ); @@ -267,9 +267,9 @@ KDE_EXPORT void kimgio_pcx_read( TQImageIO *io ) TQDataStream s( io->ioDevice() ); s.setByteOrder( TQDataStream::LittleEndian ); - if ( s.tqdevice()->size() < 128 ) + if ( s.device()->size() < 128 ) { - io->seStatus( -1 ); + io->setStatus( -1 ); return; } @@ -279,7 +279,7 @@ KDE_EXPORT void kimgio_pcx_read( TQImageIO *io ) if ( header.Manufacturer != 10 || s.atEnd()) { - io->seStatus( -1 ); + io->setStatus( -1 ); return; } @@ -323,11 +323,11 @@ KDE_EXPORT void kimgio_pcx_read( TQImageIO *io ) if ( !img.isNull() ) { io->setImage( img ); - io->seStatus( 0 ); + io->setStatus( 0 ); } else { - io->seStatus( -1 ); + io->setStatus( -1 ); } } @@ -343,7 +343,7 @@ static void writeLine( TQDataStream &s, TQByteArray &buf ) count = 1; byte = buf[ i++ ]; - while ( ( i < size ) && ( TQChar(byte) == buf.tqat(i) ) && ( count < 63 ) ) + while ( ( i < size ) && ( TQChar(byte) == buf.at(i) ) && ( count < 63 ) ) { ++i; ++count; @@ -412,7 +412,7 @@ static void writeImage4( TQImage &img, TQDataStream &s, PCXHEADER &header ) { for ( int i=0; i<4; ++i ) if ( *( p+x ) & ( 1 << i ) ) - buf[ i ][ x/8 ] = buf[ i ].tqat(x/8) | 1 << ( 7-x%8 ); + buf[ i ][ x/8 ] = buf[ i ].at(x/8) | 1 << ( 7-x%8 ); } for ( int i=0; i<4; ++i ) @@ -526,7 +526,7 @@ KDE_EXPORT void kimgio_pcx_write( TQImageIO *io ) writeImage24( img, s, header ); } - io->seStatus( 0 ); + io->setStatus( 0 ); } /* vim: et sw=2 ts=2 diff --git a/kimgio/psd.cpp b/kimgio/psd.cpp index 5fa0d81a1..8859d1541 100644 --- a/kimgio/psd.cpp +++ b/kimgio/psd.cpp @@ -119,15 +119,15 @@ namespace { // Private. // Skip mode data. s >> tmp; - s.tqdevice()->tqat( s.tqdevice()->tqat() + tmp ); + s.device()->at( s.device()->at() + tmp ); // Skip image resources. s >> tmp; - s.tqdevice()->tqat( s.tqdevice()->tqat() + tmp ); + s.device()->at( s.device()->at() + tmp ); // Skip the reserved data. s >> tmp; - s.tqdevice()->tqat( s.tqdevice()->tqat() + tmp ); + s.device()->at( s.device()->at() + tmp ); // Find out if the data is compressed. // Known values: @@ -250,7 +250,7 @@ void kimgio_psd_read( TQImageIO *io ) if( s.atEnd() || !IsValid( header ) ) { kdDebug(399) << "This PSD file is not valid." << endl; io->setImage( TQImage() ); - io->seStatus( -1 ); + io->setStatus( -1 ); return; } @@ -258,7 +258,7 @@ void kimgio_psd_read( TQImageIO *io ) if( !IsSupported( header ) ) { kdDebug(399) << "This PSD file is not supported." << endl; io->setImage( TQImage() ); - io->seStatus( -1 ); + io->setStatus( -1 ); return; } @@ -266,12 +266,12 @@ void kimgio_psd_read( TQImageIO *io ) if( !LoadPSD(s, header, img) ) { kdDebug(399) << "Error loading PSD file." << endl; io->setImage( TQImage() ); - io->seStatus( -1 ); + io->setStatus( -1 ); return; } io->setImage( img ); - io->seStatus( 0 ); + io->setStatus( 0 ); } diff --git a/kimgio/rgb.cpp b/kimgio/rgb.cpp index 68da172fb..ae2439083 100644 --- a/kimgio/rgb.cpp +++ b/kimgio/rgb.cpp @@ -38,12 +38,12 @@ KDE_EXPORT void kimgio_rgb_read(TQImageIO *io) if (!sgi.readImage(img)) { io->setImage(TQImage()); - io->seStatus(-1); + io->setStatus(-1); return; } io->setImage(img); - io->seStatus(0); + io->setStatus(0); } @@ -53,9 +53,9 @@ KDE_EXPORT void kimgio_rgb_write(TQImageIO *io) TQImage img = io->image(); if (!sgi.writeImage(img)) - io->seStatus(-1); + io->setStatus(-1); - io->seStatus(0); + io->setStatus(0); } diff --git a/kimgio/tga.cpp b/kimgio/tga.cpp index 0a90aa514..3a9d88515 100644 --- a/kimgio/tga.cpp +++ b/kimgio/tga.cpp @@ -324,13 +324,13 @@ KDE_EXPORT void kimgio_tga_read( TQImageIO *io ) // Read image header. TgaHeader tga; s >> tga; - s.tqdevice()->tqat( TgaHeader::SIZE + tga.id_length ); + s.device()->at( TgaHeader::SIZE + tga.id_length ); // Check image file format. if( s.atEnd() ) { kdDebug(399) << "This TGA file is not valid." << endl; io->setImage( TQImage() ); - io->seStatus( -1 ); + io->setStatus( -1 ); return; } @@ -338,7 +338,7 @@ KDE_EXPORT void kimgio_tga_read( TQImageIO *io ) if( !IsSupported(tga) ) { kdDebug(399) << "This TGA file is not supported." << endl; io->setImage( TQImage() ); - io->seStatus( -1 ); + io->setStatus( -1 ); return; } @@ -349,13 +349,13 @@ KDE_EXPORT void kimgio_tga_read( TQImageIO *io ) if( result == false ) { kdDebug(399) << "Error loading TGA file." << endl; io->setImage( TQImage() ); - io->seStatus( -1 ); + io->setStatus( -1 ); return; } io->setImage( img ); - io->seStatus( 0 ); + io->setStatus( 0 ); } @@ -385,6 +385,6 @@ KDE_EXPORT void kimgio_tga_write( TQImageIO *io ) s << TQ_UINT8( tqAlpha( color ) ); } - io->seStatus( 0 ); + io->setStatus( 0 ); } diff --git a/kimgio/tiffr.cpp b/kimgio/tiffr.cpp index 2dcf28b9d..bbffa82a9 100644 --- a/kimgio/tiffr.cpp +++ b/kimgio/tiffr.cpp @@ -30,14 +30,14 @@ static toff_t tiff_seek( thandle_t handle, toff_t off, int whence ) TQIODevice *dev = reinterpret_cast( handle ); if ( whence == SEEK_CUR ) - off += dev->tqat(); + off += dev->at(); else if ( whence == SEEK_END ) off += dev->size(); - if ( !dev->tqat( off ) ) + if ( !dev->at( off ) ) return ( toff_t )-1; - return dev->tqat(); + return dev->at(); } static toff_t tiff_size( thandle_t handle ) @@ -140,7 +140,7 @@ KDE_EXPORT void kimgio_tiff_read( TQImageIO *io ) TIFFClose( tiff ); io->setImage( image ); - io->seStatus ( 0 ); + io->setStatus ( 0 ); } KDE_EXPORT void kimgio_tiff_write( TQImageIO * ) diff --git a/kimgio/xcf.cpp b/kimgio/xcf.cpp index 6a87ec237..252b3e036 100644 --- a/kimgio/xcf.cpp +++ b/kimgio/xcf.cpp @@ -42,7 +42,7 @@ KDE_EXPORT void kimgio_xcf_read(TQImageIO *io) KDE_EXPORT void kimgio_xcf_write(TQImageIO *io) { kdDebug(399) << "XCF: write support not implemented" << endl; - io->seStatus(-1); + io->setStatus(-1); } /////////////////////////////////////////////////////////////////////////////// @@ -127,14 +127,14 @@ void XCFImageFormat::readXCF(TQImageIO *io) char tag[14]; xcf_io.readRawBytes(tag, sizeof(tag)); - if (xcf_io.tqdevice()->status() != IO_Ok) { + if (xcf_io.device()->status() != IO_Ok) { kdDebug(399) << "XCF: read failure on header tag" << endl; return; } xcf_io >> xcf_image.width >> xcf_image.height >> xcf_image.type; - if (xcf_io.tqdevice()->status() != IO_Ok) { + if (xcf_io.device()->status() != IO_Ok) { kdDebug(399) << "XCF: read failure on image info" << endl; return; } @@ -156,7 +156,7 @@ kdDebug() << tag << " " << xcf_image.width << " " << xcf_image.height << " " << xcf_io >> layer_offset; - if (xcf_io.tqdevice()->status() != IO_Ok) { + if (xcf_io.device()->status() != IO_Ok) { kdDebug(399) << "XCF: read failure on layer offsets" << endl; return; } @@ -178,7 +178,7 @@ kdDebug() << tag << " " << xcf_image.width << " " << xcf_image.height << " " << while (!layer_offsets.isEmpty()) { TQ_INT32 layer_offset = layer_offsets.pop(); - xcf_io.tqdevice()->tqat(layer_offset); + xcf_io.device()->at(layer_offset); if (!loadLayer(xcf_io, xcf_image)) return; @@ -190,7 +190,7 @@ kdDebug() << tag << " " << xcf_image.width << " " << xcf_image.height << " " << } io->setImage(xcf_image.image); - io->seStatus(0); + io->setStatus(0); } @@ -294,7 +294,7 @@ bool XCFImageFormat::loadProperty(TQDataStream& xcf_io, PropType& type, TQByteAr xcf_io >> foo; type=PropType(foo); // TODO urks - if (xcf_io.tqdevice()->status() != IO_Ok) { + if (xcf_io.device()->status() != IO_Ok) { kdDebug(399) << "XCF: read failure on property type" << type << endl; return false; } @@ -309,7 +309,7 @@ bool XCFImageFormat::loadProperty(TQDataStream& xcf_io, PropType& type, TQByteAr if (type == PROP_COLORMAP) { xcf_io >> size; - if (xcf_io.tqdevice()->status() != IO_Ok) { + if (xcf_io.device()->status() != IO_Ok) { kdDebug(399) << "XCF: read failure on property " << type << " size" << endl; return false; } @@ -329,7 +329,7 @@ bool XCFImageFormat::loadProperty(TQDataStream& xcf_io, PropType& type, TQByteAr xcf_io >> size >> factor >> digits; - if (xcf_io.tqdevice()->status() != IO_Ok) { + if (xcf_io.device()->status() != IO_Ok) { kdDebug(399) << "XCF: read failure on property " << type << endl; return false; } @@ -337,7 +337,7 @@ bool XCFImageFormat::loadProperty(TQDataStream& xcf_io, PropType& type, TQByteAr for (int i = 0; i < 5; i++) { xcf_io >> unit_strings; - if (xcf_io.tqdevice()->status() != IO_Ok) { + if (xcf_io.device()->status() != IO_Ok) { kdDebug(399) << "XCF: read failure on property " << type << endl; return false; } @@ -354,7 +354,7 @@ bool XCFImageFormat::loadProperty(TQDataStream& xcf_io, PropType& type, TQByteAr xcf_io.readRawBytes(data, size); } - if (xcf_io.tqdevice()->status() != IO_Ok) { + if (xcf_io.device()->status() != IO_Ok) { kdDebug(399) << "XCF: read failure on property " << type << " data, size " << size << endl; return false; } @@ -382,7 +382,7 @@ bool XCFImageFormat::loadLayer(TQDataStream& xcf_io, XCFImage& xcf_image) xcf_io >> layer.width >> layer.height >> layer.type >> layer.name; - if (xcf_io.tqdevice()->status() != IO_Ok) { + if (xcf_io.device()->status() != IO_Ok) { kdDebug(399) << "XCF: read failure on layer" << endl; return false; } @@ -405,7 +405,7 @@ bool XCFImageFormat::loadLayer(TQDataStream& xcf_io, XCFImage& xcf_image) // If there are any more layers, merge them into the final TQImage. xcf_io >> layer.hierarchy_offset >> layer.mask_offset; - if (xcf_io.tqdevice()->status() != IO_Ok) { + if (xcf_io.device()->status() != IO_Ok) { kdDebug(399) << "XCF: read failure on layer image offsets" << endl; return false; } @@ -415,7 +415,7 @@ bool XCFImageFormat::loadLayer(TQDataStream& xcf_io, XCFImage& xcf_image) if( !composeTiles(xcf_image)) return false; - xcf_io.tqdevice()->tqat(layer.hierarchy_offset); + xcf_io.device()->at(layer.hierarchy_offset); // As tiles are loaded, they are copied into the layers tiles by // this routine. (loadMask(), below, uses a slightly different @@ -427,7 +427,7 @@ bool XCFImageFormat::loadLayer(TQDataStream& xcf_io, XCFImage& xcf_image) return false; if (layer.mask_offset != 0) { - xcf_io.tqdevice()->tqat(layer.mask_offset); + xcf_io.device()->at(layer.mask_offset); if (!loadMask(xcf_io, layer)) return false; @@ -739,7 +739,7 @@ bool XCFImageFormat::loadHierarchy(TQDataStream& xcf_io, Layer& layer) xcf_io >> width >> height >> bpp >> offset; - if (xcf_io.tqdevice()->status() != IO_Ok) { + if (xcf_io.device()->status() != IO_Ok) { kdDebug(399) << "XCF: read failure on layer " << layer.name << " image header" << endl; return false; } @@ -752,19 +752,19 @@ bool XCFImageFormat::loadHierarchy(TQDataStream& xcf_io, Layer& layer) do { xcf_io >> junk; - if (xcf_io.tqdevice()->status() != IO_Ok) { + if (xcf_io.device()->status() != IO_Ok) { kdDebug(399) << "XCF: read failure on layer " << layer.name << " level offsets" << endl; return false; } } while (junk != 0); - TQIODevice::Offset saved_pos = xcf_io.tqdevice()->tqat(); + TQIODevice::Offset saved_pos = xcf_io.device()->at(); - xcf_io.tqdevice()->tqat(offset); + xcf_io.device()->at(offset); if (!loadLevel(xcf_io, layer, bpp)) return false; - xcf_io.tqdevice()->tqat(saved_pos); + xcf_io.device()->at(saved_pos); return true; } @@ -785,7 +785,7 @@ bool XCFImageFormat::loadLevel(TQDataStream& xcf_io, Layer& layer, TQ_INT32 bpp) xcf_io >> width >> height >> offset; - if (xcf_io.tqdevice()->status() != IO_Ok) { + if (xcf_io.device()->status() != IO_Ok) { kdDebug(399) << "XCF: read failure on layer " << layer.name << " level info" << endl; return false; } @@ -801,11 +801,11 @@ bool XCFImageFormat::loadLevel(TQDataStream& xcf_io, Layer& layer, TQ_INT32 bpp) return false; } - TQIODevice::Offset saved_pos = xcf_io.tqdevice()->tqat(); + TQIODevice::Offset saved_pos = xcf_io.device()->at(); TQ_UINT32 offset2; xcf_io >> offset2; - if (xcf_io.tqdevice()->status() != IO_Ok) { + if (xcf_io.device()->status() != IO_Ok) { kdDebug(399) << "XCF: read failure on layer " << layer.name << " level offset look-ahead" << endl; return false; } @@ -815,7 +815,7 @@ bool XCFImageFormat::loadLevel(TQDataStream& xcf_io, Layer& layer, TQ_INT32 bpp) if (offset2 == 0) offset2 = offset + (uint)(TILE_WIDTH * TILE_HEIGHT * 4 * 1.5); - xcf_io.tqdevice()->tqat(offset); + xcf_io.device()->at(offset); int size = layer.image_tiles[j][i].width() * layer.image_tiles[j][i].height(); if (!loadTileRLE(xcf_io, layer.tile, size, offset2 - offset, bpp)) @@ -827,10 +827,10 @@ bool XCFImageFormat::loadLevel(TQDataStream& xcf_io, Layer& layer, TQ_INT32 bpp) layer.assignBytes(layer, i, j); - xcf_io.tqdevice()->tqat(saved_pos); + xcf_io.device()->at(saved_pos); xcf_io >> offset; - if (xcf_io.tqdevice()->status() != IO_Ok) { + if (xcf_io.device()->status() != IO_Ok) { kdDebug(399) << "XCF: read failure on layer " << layer.name << " level offset" << endl; return false; } @@ -855,7 +855,7 @@ bool XCFImageFormat::loadMask(TQDataStream& xcf_io, Layer& layer) xcf_io >> width >> height >> name; - if (xcf_io.tqdevice()->status() != IO_Ok) { + if (xcf_io.device()->status() != IO_Ok) { kdDebug(399) << "XCF: read failure on mask info" << endl; return false; } @@ -868,12 +868,12 @@ bool XCFImageFormat::loadMask(TQDataStream& xcf_io, Layer& layer) TQ_UINT32 hierarchy_offset; xcf_io >> hierarchy_offset; - if (xcf_io.tqdevice()->status() != IO_Ok) { + if (xcf_io.device()->status() != IO_Ok) { kdDebug(399) << "XCF: read failure on mask image offset" << endl; return false; } - xcf_io.tqdevice()->tqat(hierarchy_offset); + xcf_io.device()->at(hierarchy_offset); layer.assignBytes = assignMaskBytes; if (!loadHierarchy(xcf_io, layer)) @@ -919,7 +919,7 @@ bool XCFImageFormat::loadTileRLE(TQDataStream& xcf_io, uchar* tile, int image_si xcf_io.readRawBytes((char*)xcfdata, data_length); - if (xcf_io.tqdevice()->status() != IO_Ok) { + if (xcf_io.device()->status() != IO_Ok) { delete[] xcfodata; kdDebug(399) << "XCF: read failure on tile" << endl; return false; diff --git a/kimgio/xview.cpp b/kimgio/xview.cpp index 169ad1aa8..722eba348 100644 --- a/kimgio/xview.cpp +++ b/kimgio/xview.cpp @@ -94,7 +94,7 @@ KDE_EXPORT void kimgio_xv_read( TQImageIO *_imageio ) } _imageio->setImage( image ); - _imageio->seStatus( 0 ); + _imageio->setStatus( 0 ); free(block); return; @@ -164,6 +164,6 @@ KDE_EXPORT void kimgio_xv_write( TQImageIO *imageio ) } delete[] buffer; - imageio->seStatus( 0 ); + imageio->setStatus( 0 ); } diff --git a/kio/kfile/kacleditwidget.cpp b/kio/kfile/kacleditwidget.cpp index 64cb16b4b..7f253f8c5 100644 --- a/kio/kfile/kacleditwidget.cpp +++ b/kio/kfile/kacleditwidget.cpp @@ -148,7 +148,7 @@ KACLListViewItem::KACLListViewItem( TQListView* parent, qualifier( _qualifier ), isPartial( false ) { m_pACLListView = dynamic_cast( parent ); - tqrepaint(); + repaint(); } @@ -192,7 +192,7 @@ TQString KACLListViewItem::key( int, bool ) const } void KACLListViewItem::paintCell( TQPainter* p, const TQColorGroup &cg, - int column, int width, int tqalignment ) + int column, int width, int alignment ) { TQColorGroup mycg = cg; if ( isDefault ) { @@ -204,7 +204,7 @@ void KACLListViewItem::paintCell( TQPainter* p, const TQColorGroup &cg, mycg.setColor( TQColorGroup::Text, TQColor( 100, 100, 100 ) ); p->setFont( font ); } - KListViewItem::paintCell( p, mycg, column, width, tqalignment ); + KListViewItem::paintCell( p, mycg, column, width, alignment ); KACLListViewItem *below =0; if ( itemBelow() ) @@ -247,7 +247,7 @@ void KACLListViewItem::updatePermPixmaps() setPixmap( 4, TQPixmap() ); } -void KACLListViewItem::tqrepaint() +void KACLListViewItem::repaint() { int idx = 0; switch ( type ) @@ -527,7 +527,7 @@ void EditACLEntryDialog::slotOk() } if ( m_defaultCB ) m_item->isDefault = m_defaultCB->isChecked(); - m_item->tqrepaint(); + m_item->repaint(); KDialogBase::slotOk(); } @@ -1019,7 +1019,7 @@ void KACLListView::slotRemoveEntry() delete item; } else { item->value = 0; - item->tqrepaint(); + item->repaint(); } if ( !itemWasDefault ) calculateEffectiveRights(); @@ -1030,7 +1030,7 @@ void KACLListView::slotRemoveEntry() || item->type == Group || item->type == Others ) ) { item->value = 0; - item->tqrepaint(); + item->repaint(); } else { delete item; } diff --git a/kio/kfile/kacleditwidget_p.h b/kio/kfile/kacleditwidget_p.h index 9b4d9d48e..1a0c85064 100644 --- a/kio/kfile/kacleditwidget_p.h +++ b/kio/kfile/kacleditwidget_p.h @@ -186,10 +186,10 @@ public: void togglePerm( acl_perm_t perm ); virtual void paintCell( TQPainter *p, const TQColorGroup &cg, - int column, int width, int tqalignment ); + int column, int width, int alignment ); void updatePermPixmaps(); - void tqrepaint(); + void repaint(); KACLListView::EntryType type; unsigned short value; diff --git a/kio/kfile/kdirselectdialog.cpp b/kio/kfile/kdirselectdialog.cpp index 9a3d4fc6c..e1ffeb91e 100644 --- a/kio/kfile/kdirselectdialog.cpp +++ b/kio/kfile/kdirselectdialog.cpp @@ -391,7 +391,7 @@ void KDirSelectDialog::slotComboTextChanged( const TQString& text ) { item->setSelected( false ); // 2002/12/27, deselected item is not repainted, so force it - item->tqrepaint(); + item->repaint(); } } diff --git a/kio/kfile/kencodingfiledialog.cpp b/kio/kfile/kencodingfiledialog.cpp index 07098982e..396006504 100644 --- a/kio/kfile/kencodingfiledialog.cpp +++ b/kio/kfile/kencodingfiledialog.cpp @@ -170,7 +170,7 @@ KEncodingFileDialog::Result KEncodingFileDialog::getSaveFileNameAndEncoding(cons TQWidget *parent, const TQString& caption) { - bool specialDir = dir.tqat(0) == ':'; + bool specialDir = dir.at(0) == ':'; KEncodingFileDialog dlg(specialDir?dir:TQString::null, encoding,filter,caption.isNull() ? i18n("Save As") : caption, Saving,parent, "filedialog", true); @@ -193,7 +193,7 @@ KEncodingFileDialog::Result KEncodingFileDialog::getSaveURLAndEncoding(const TQ const TQString& dir, const TQString& filter, TQWidget *parent, const TQString& caption) { - bool specialDir = dir.tqat(0) == ':'; + bool specialDir = dir.at(0) == ':'; KEncodingFileDialog dlg(specialDir?dir:TQString::null, encoding,filter,caption.isNull() ? i18n("Save As") : caption, Saving,parent, "filedialog", true); diff --git a/kio/kfile/kfiledetailview.cpp b/kio/kfile/kfiledetailview.cpp index a68aec53b..823714396 100644 --- a/kio/kfile/kfiledetailview.cpp +++ b/kio/kfile/kfiledetailview.cpp @@ -317,7 +317,7 @@ void KFileDetailView::updateView( const KFileItem *i ) item->init(); setSortingKey( item, i ); - //item->tqrepaint(); // only repaints if visible + //item->repaint(); // only repaints if visible } void KFileDetailView::setSortingKey( KFileListViewItem *item, diff --git a/kio/kfile/kfiledialog.cpp b/kio/kfile/kfiledialog.cpp index 60f7a7c1c..688fce66e 100644 --- a/kio/kfile/kfiledialog.cpp +++ b/kio/kfile/kfiledialog.cpp @@ -1595,7 +1595,7 @@ TQString KFileDialog::getSaveFileName(const TQString& dir, const TQString& filte TQWidget *parent, const TQString& caption) { - bool specialDir = dir.tqat(0) == ':'; + bool specialDir = dir.at(0) == ':'; KFileDialog dlg( specialDir ? dir : TQString::null, filter, parent, "filedialog", true); if ( !specialDir ) dlg.setSelection( dir ); // may also be a filename @@ -1616,7 +1616,7 @@ TQString KFileDialog::getSaveFileNameWId(const TQString& dir, const TQString& fi WId parent_id, const TQString& caption) { - bool specialDir = dir.tqat(0) == ':'; + bool specialDir = dir.at(0) == ':'; TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id )); KFileDialog dlg( specialDir ? dir : TQString::null, filter, parent, "filedialog", true); #ifdef Q_WS_X11 @@ -1644,7 +1644,7 @@ TQString KFileDialog::getSaveFileNameWId(const TQString& dir, const TQString& fi KURL KFileDialog::getSaveURL(const TQString& dir, const TQString& filter, TQWidget *parent, const TQString& caption) { - bool specialDir = dir.tqat(0) == ':'; + bool specialDir = dir.at(0) == ':'; KFileDialog dlg(specialDir ? dir : TQString::null, filter, parent, "filedialog", true); if ( !specialDir ) dlg.setSelection( dir ); // may also be a filename @@ -1950,7 +1950,7 @@ void KFileDialog::updateAutoSelectExtension (void) // first try X-KDE-NativeExtension TQString nativeExtension = mime->property ("X-KDE-NativeExtension").toString (); - if (nativeExtension.tqat (0) == '.') + if (nativeExtension.at (0) == '.') { d->extension = nativeExtension.lower (); kdDebug (kfile_area) << "\tsetMimeFilter-style: native ext=\'" @@ -2361,7 +2361,7 @@ void KFileDialog::setNonExtSelection() TQString pattern, filename = locationEdit->currentText().stripWhiteSpace(); KServiceTypeFactory::self()->findFromPattern( filename, &pattern ); - if ( !pattern.isEmpty() && pattern.tqat( 0 ) == '*' && pattern.find( '*' , 1 ) == -1 ) + if ( !pattern.isEmpty() && pattern.at( 0 ) == '*' && pattern.find( '*' , 1 ) == -1 ) locationEdit->lineEdit()->setSelection( 0, filename.length() - pattern.stripWhiteSpace().length()+1 ); else { diff --git a/kio/kfile/kfilefiltercombo.cpp b/kio/kfile/kfilefiltercombo.cpp index 2849ceb0e..12a51db8e 100644 --- a/kio/kfile/kfilefiltercombo.cpp +++ b/kio/kfile/kfilefiltercombo.cpp @@ -95,7 +95,7 @@ TQString KFileFilterCombo::currentFilter() const { TQString f = currentText(); if (f == text(currentItem())) { // user didn't edit the text - f = *filters.tqat(currentItem()); + f = *filters.at(currentItem()); if ( d->isMimeFilter || (currentItem() == 0 && d->hasAllSupportedFiles) ) { return f; // we have a mimetype as filter } diff --git a/kio/kfile/kfileiconview.cpp b/kio/kfile/kfileiconview.cpp index 4171d88d7..fec9158de 100644 --- a/kio/kfile/kfileiconview.cpp +++ b/kio/kfile/kfileiconview.cpp @@ -338,7 +338,7 @@ void KFileIconView::insertItem( KFileItem *i ) KFileView::insertItem( i ); TQIconView* qview = static_cast( this ); - // Since creating and initializing an item leads to a tqrepaint, + // Since creating and initializing an item leads to a repaint, // we disable updates on the IconView for a while. qview->setUpdatesEnabled( false ); KFileIconViewItem *item = new KFileIconViewItem( qview, i ); @@ -450,7 +450,7 @@ void KFileIconView::updateView( bool b ) if ( !item->pixmapSize().isNull() ) item->setPixmapSize( TQSize( 0, 0 ) ); } - // recalculate item parameters but avoid an in-place tqrepaint + // recalculate item parameters but avoid an in-place repaint item->setPixmap( (item->fileInfo())->pixmap( myIconSize ), true, false ); item = static_cast(item->nextItem()); } while ( item != 0L ); @@ -632,7 +632,7 @@ bool KFileIconView::canPreview( const KFileItem *item ) const for ( ; it != d->previewMimeTypes.end(); ++it ) { TQString type = *it; // the "mimetype" can be "image/*" - if ( type.tqat( type.length() - 1 ) == '*' ) { + if ( type.at( type.length() - 1 ) == '*' ) { r.setPattern( type ); if ( r.search( item->mimetype() ) != -1 ) return true; @@ -763,7 +763,7 @@ void KFileIconView::initItem( KFileIconViewItem *item, const KFileItem *i, if ( updateTextAndPixmap ) { - // this causes a tqrepaint of the item, which we want to avoid during + // this causes a repaint of the item, which we want to avoid during // directory listing, when all items are created. We want to paint all // items at once, not every single item in that case. item->setText( i->text() , false, false ); diff --git a/kio/kfile/kfilepreview.cpp b/kio/kfile/kfilepreview.cpp index 877260a5f..b221a1ebb 100644 --- a/kio/kfile/kfilepreview.cpp +++ b/kio/kfile/kfilepreview.cpp @@ -149,7 +149,7 @@ void KFilePreview::updateView(bool b) { left->updateView(b); if(preview) - preview->tqrepaint(b); + preview->repaint(b); } void KFilePreview::updateView(const KFileItem *i) diff --git a/kio/kfile/kfiletreeview.cpp b/kio/kfile/kfiletreeview.cpp index 9efe41d46..e8451077d 100644 --- a/kio/kfile/kfiletreeview.cpp +++ b/kio/kfile/kfiletreeview.cpp @@ -342,7 +342,7 @@ void KFileTreeView::slotAutoOpenFolder() return; m_dropItem->setOpen( true ); - m_dropItem->tqrepaint(); + m_dropItem->repaint(); } diff --git a/kio/kfile/kfileview.cpp b/kio/kfile/kfileview.cpp index eb12a9498..165801652 100644 --- a/kio/kfile/kfileview.cpp +++ b/kio/kfile/kfileview.cpp @@ -258,7 +258,7 @@ sort_by_name: void KFileView::updateView(bool f) { - widget()->tqrepaint(f); + widget()->repaint(f); } void KFileView::updateView(const KFileItem *) diff --git a/kio/kfile/kfileview.h b/kio/kfile/kfileview.h index 1a13e264e..bce408327 100644 --- a/kio/kfile/kfileview.h +++ b/kio/kfile/kfileview.h @@ -146,11 +146,11 @@ public: virtual void clear(); /** - * does a tqrepaint of the view. + * does a repaint of the view. * * The default implementation calls * \code - * widget()->tqrepaint(f) + * widget()->repaint(f) * \endcode **/ virtual void updateView(bool f = true); diff --git a/kio/kfile/kicondialog.cpp b/kio/kfile/kicondialog.cpp index d5faf59b2..ef64de4cc 100644 --- a/kio/kfile/kicondialog.cpp +++ b/kio/kfile/kicondialog.cpp @@ -137,7 +137,7 @@ void KIconCanvas::slotLoadFiles() { // Calling kapp->processEvents() makes the iconview flicker like hell // (it's being repainted once for every new item), so we don't do this. - // Instead, we directly tqrepaint the progress bar without going through + // Instead, we directly repaint the progress bar without going through // the event-loop. We do that just once for every 10th item so that // the progress bar doesn't flicker in turn. (pfeiffer) if ( emitProgress >= 10 ) { @@ -631,8 +631,8 @@ void KIconDialog::slotProgress(int p) { mpProgress->setProgress(p); // commented out the following since setProgress already paints ther - // progress bar. ->tqrepaint() only makes it flicker - //mpProgress->tqrepaint(); + // progress bar. ->repaint() only makes it flicker + //mpProgress->repaint(); } void KIconDialog::slotFinished() diff --git a/kio/kfile/knotifydialog.cpp b/kio/kfile/knotifydialog.cpp index 8787fa19b..b3242e905 100644 --- a/kio/kfile/knotifydialog.cpp +++ b/kio/kfile/knotifydialog.cpp @@ -374,7 +374,7 @@ Application * KNotifyWidget::addApplicationEvents( const TQString& path ) kdDebug() << "**** knotify: adding path: " << path << endl; TQString relativePath = path; - if ( path.tqat(0) == '/' && KStandardDirs::exists( path ) ) + if ( path.at(0) == '/' && KStandardDirs::exists( path ) ) relativePath = makeRelative( path ); if ( !relativePath.isEmpty() ) diff --git a/kio/kfile/kpropertiesdialog.cpp b/kio/kfile/kpropertiesdialog.cpp index 2c86f582b..2f80b07e2 100644 --- a/kio/kfile/kpropertiesdialog.cpp +++ b/kio/kfile/kpropertiesdialog.cpp @@ -576,7 +576,7 @@ void KPropertiesDialog::rename( const TQString& _name ) else { TQString tmpurl = m_singleUrl.url(); - if ( tmpurl.tqat(tmpurl.length() - 1) == '/') + if ( tmpurl.at(tmpurl.length() - 1) == '/') // It's a directory, so strip the trailing slash first tmpurl.truncate( tmpurl.length() - 1); newUrl = tmpurl; @@ -908,7 +908,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) // Enhanced rename: Don't highlight the file extension. TQString pattern; KServiceTypeFactory::self()->findFromPattern( filename, &pattern ); - if (!pattern.isEmpty() && pattern.tqat(0)=='*' && pattern.find('*',1)==-1) + if (!pattern.isEmpty() && pattern.at(0)=='*' && pattern.find('*',1)==-1) d->m_lined->setSelection(0, filename.length()-pattern.stripWhiteSpace().length()+1); else { diff --git a/kio/kfile/kurlbar.cpp b/kio/kfile/kurlbar.cpp index 15ac9f35c..ee79b4e58 100644 --- a/kio/kfile/kurlbar.cpp +++ b/kio/kfile/kurlbar.cpp @@ -1010,7 +1010,7 @@ KURL KURLBarItemDialog::url() const { TQString text = m_urlEdit->url(); KURL u; - if ( text.tqat(0) == '/' ) + if ( text.at(0) == '/' ) u.setPath( text ); else u = text; diff --git a/kio/kfile/kurlcombobox.cpp b/kio/kfile/kurlcombobox.cpp index 98e29a90b..72c7cbd07 100644 --- a/kio/kfile/kurlcombobox.cpp +++ b/kio/kfile/kurlcombobox.cpp @@ -87,7 +87,7 @@ TQStringList KURLComboBox::urls() const for ( int i = defaultList.count(); i < count(); i++ ) { url = text( i ); if ( !url.isEmpty() ) { - //if ( url.tqat(0) == '/' ) + //if ( url.at(0) == '/' ) // list.append( url.prepend( fileProt ) ); //else list.append( url ); @@ -129,7 +129,7 @@ void KURLComboBox::setDefaults() KURLComboItem *item; for ( unsigned int id = 0; id < defaultList.count(); id++ ) { - item = defaultList.tqat( id ); + item = defaultList.at( id ); insertURLItem( item ); } } diff --git a/kio/kio/defaultprogress.cpp b/kio/kio/defaultprogress.cpp index 72144000b..12eacab5d 100644 --- a/kio/kio/defaultprogress.cpp +++ b/kio/kio/defaultprogress.cpp @@ -273,7 +273,7 @@ void DefaultProgress::slotPercent( KIO::Job*, unsigned long percent ) void DefaultProgress::slotInfoMessage( KIO::Job*, const TQString & msg ) { speedLabel->setText( msg ); - speedLabel->setAlignment( speedLabel->tqalignment() & ~TQt::WordBreak ); + speedLabel->setAlignment( speedLabel->alignment() & ~TQt::WordBreak ); } diff --git a/kio/kio/job.cpp b/kio/kio/job.cpp index beb5287e6..58bb00c58 100644 --- a/kio/kio/job.cpp +++ b/kio/kio/job.cpp @@ -1413,7 +1413,7 @@ void StoredTransferJob::slotStoredData( KIO::Job *, const TQByteArray &data ) if ( data.size() == 0 ) return; unsigned int oldSize = m_data.size(); - m_data.tqresize( oldSize + data.size(), TQGArray::SpeedOptim ); + m_data.resize( oldSize + data.size(), TQGArray::SpeedOptim ); memcpy( m_data.data() + oldSize, data.data(), data.size() ); } @@ -4533,7 +4533,7 @@ void MultiGetJob::slotFinished() // return slave to pool // fetch new slave for first entry in m_waitQueue and call start // again. - GetRequest *entry = m_waitQueue.tqat(0); + GetRequest *entry = m_waitQueue.at(0); m_url = entry->url; slaveDone(); Scheduler::doJob(this); diff --git a/kio/kio/kar.cpp b/kio/kio/kar.cpp index 376a748a4..07072d0c6 100644 --- a/kio/kio/kar.cpp +++ b/kio/kio/kar.cpp @@ -98,7 +98,7 @@ bool KAr::openArchive( int mode ) TQCString name; int date, uid, gid, mode, size; - dev->tqat( dev->tqat() + (2 - (dev->tqat() % 2)) % 2 ); // Ar headers are padded to byte boundary + dev->at( dev->at() + (2 - (dev->at() % 2)) % 2 ); // Ar headers are padded to byte boundary if ( dev->readBlock (ar_header.data(), 60) != 60 ) { // Read ar header kdWarning(7042) << "Couldn't read header" << endl; @@ -131,7 +131,7 @@ bool KAr::openArchive( int mode ) kdDebug(7042) << "Read in longnames entry" << endl; } else if (name.mid(1, 1) == " ") { // Symbol table entry kdDebug(7042) << "Skipped symbol entry" << endl; - dev->tqat( dev->tqat() + size ); + dev->at( dev->at() + size ); skip_entry = true; } else { // Longfilename kdDebug(7042) << "Longfilename #" << name.mid(1, 15).toInt() << endl; @@ -150,10 +150,10 @@ bool KAr::openArchive( int mode ) kdDebug(7042) << "Filename: " << name << " Size: " << size << endl; KArchiveEntry* entry; - entry = new KArchiveFile(this, name, mode, date, /*uid*/ 0, /*gid*/ 0, 0, dev->tqat(), size); + entry = new KArchiveFile(this, name, mode, date, /*uid*/ 0, /*gid*/ 0, 0, dev->at(), size); rootDir()->addEntry(entry); // Ar files don't support directorys, so everything in root - dev->tqat( dev->tqat() + size ); // Skip contents + dev->at( dev->at() + size ); // Skip contents } delete[] ar_longnames; diff --git a/kio/kio/karchive.cpp b/kio/kio/karchive.cpp index 732269523..0e8d6789d 100644 --- a/kio/kio/karchive.cpp +++ b/kio/kio/karchive.cpp @@ -90,7 +90,7 @@ KArchive::~KArchive() bool KArchive::open( int mode ) { - if ( m_dev && !m_dev->tqopen( mode ) ) + if ( m_dev && !m_dev->open( mode ) ) return false; if ( m_open ) @@ -491,7 +491,7 @@ int KArchiveFile::size() const TQByteArray KArchiveFile::data() const { - archive()->device()->tqat( m_pos ); + archive()->device()->at( m_pos ); // Read content TQByteArray arr( m_size ); diff --git a/kio/kio/kdirlister.cpp b/kio/kio/kdirlister.cpp index 652101310..a7fa515d7 100644 --- a/kio/kio/kdirlister.cpp +++ b/kio/kio/kdirlister.cpp @@ -1781,7 +1781,7 @@ void KDirListerCache::printDebug() << " rootItem: " << ( itu.current()->rootItem ? itu.current()->rootItem->url() : KURL() ) << " autoUpdates refcount: " << itu.current()->autoUpdates << " complete: " << itu.current()->complete - << ( itu.current()->lstItems ? TQString(" with %1 items.").tqarg(itu.current()->lstItems->count()) : TQString(" lstItems=NULL") ) << endl; + << ( itu.current()->lstItems ? TQString(" with %1 items.").arg(itu.current()->lstItems->count()) : TQString(" lstItems=NULL") ) << endl; } kdDebug(7004) << "urlsCurrentlyHeld: " << endl; @@ -1814,7 +1814,7 @@ void KDirListerCache::printDebug() for ( ; itc.current() ; ++itc ) kdDebug(7004) << " " << itc.currentKey() << " rootItem: " << ( itc.current()->rootItem ? itc.current()->rootItem->url().prettyURL() : TQString("NULL") ) - << ( itc.current()->lstItems ? TQString(" with %1 items.").tqarg(itc.current()->lstItems->count()) : TQString(" lstItems=NULL") ) << endl; + << ( itc.current()->lstItems ? TQString(" with %1 items.").arg(itc.current()->lstItems->count()) : TQString(" lstItems=NULL") ) << endl; } #endif diff --git a/kio/kio/kimageio.cpp b/kio/kio/kimageio.cpp index 7260f9e18..75622bf7d 100644 --- a/kio/kio/kimageio.cpp +++ b/kio/kio/kimageio.cpp @@ -100,18 +100,18 @@ KImageIOFormat::callLibFunc( bool read, TQImageIO *iio) { if (mLib.isEmpty()) { - iio->seStatus(1); // Error + iio->setStatus(1); // Error return; } TQString libpath = KLibLoader::findLibrary(mLib.ascii()); if ( libpath.isEmpty()) { - iio->seStatus(1); // Error + iio->setStatus(1); // Error return; } lt_dlhandle libhandle = lt_dlopen( TQFile::encodeName(libpath) ); if (libhandle == 0) { - iio->seStatus(1); // error + iio->setStatus(1); // error kdWarning() << "KImageIOFormat::callLibFunc: couldn't dlopen " << mLib << "(" << lt_dlerror() << ")" << endl; return; } @@ -123,7 +123,7 @@ KImageIOFormat::callLibFunc( bool read, TQImageIO *iio) lt_ptr func = lt_dlsym(libhandle, funcName.ascii()); if (func == NULL) { - iio->seStatus(1); // error + iio->setStatus(1); // error kdWarning() << "couln't find " << funcName << " (" << lt_dlerror() << ")" << endl; } mReadFunc = (void (*)(TQImageIO *))func; @@ -134,7 +134,7 @@ KImageIOFormat::callLibFunc( bool read, TQImageIO *iio) lt_ptr func = lt_dlsym(libhandle, funcName.ascii()); if (func == NULL) { - iio->seStatus(1); // error + iio->setStatus(1); // error kdWarning() << "couln't find " << funcName << " (" << lt_dlerror() << ")" << endl; } mWriteFunc = (void (*)(TQImageIO *))func; @@ -145,12 +145,12 @@ KImageIOFormat::callLibFunc( bool read, TQImageIO *iio) if (mReadFunc) mReadFunc(iio); else - iio->seStatus(1); // Error + iio->setStatus(1); // Error else if (mWriteFunc) mWriteFunc(iio); else - iio->seStatus(1); // Error + iio->setStatus(1); // Error } @@ -256,7 +256,7 @@ KImageIOFactory::readImage( TQImageIO *iio) } if (!format || !format->bRead) { - iio->seStatus(1); // error + iio->setStatus(1); // error return; } @@ -283,7 +283,7 @@ KImageIOFactory::writeImage( TQImageIO *iio) } if (!format || !format->bWrite) { - iio->seStatus(1); // error + iio->setStatus(1); // error return; } diff --git a/kio/kio/klimitediodevice.h b/kio/kio/klimitediodevice.h index 0c5a76b79..e2946d37a 100644 --- a/kio/kio/klimitediodevice.h +++ b/kio/kio/klimitediodevice.h @@ -56,7 +56,7 @@ public: else ok = m_dev->open( m ); if ( ok )*/ - m_dev->tqat( m_start ); // No concurrent access ! + m_dev->at( m_start ); // No concurrent access ! } else kdWarning(7005) << "KLimitedIODevice::open only supports IO_ReadOnly!" << endl; @@ -89,13 +89,13 @@ public: return c[0]; } virtual int ungetch( int c ) { return m_dev->ungetch(c); } // ## apply lower limit ? - virtual Offset at() const { return m_dev->tqat() - m_start; } + virtual Offset at() const { return m_dev->at() - m_start; } virtual bool at( Offset pos ) { Q_ASSERT( pos <= m_length ); pos = QMIN( pos, m_length ); // Apply upper limit - return m_dev->tqat( m_start + pos ); + return m_dev->at( m_start + pos ); } - virtual bool atEnd() const { return m_dev->atEnd() || m_dev->tqat() >= m_start + m_length; } + virtual bool atEnd() const { return m_dev->atEnd() || m_dev->at() >= m_start + m_length; } private: TQIODevice* m_dev; TQ_ULONG m_start; diff --git a/kio/kio/kservicefactory.cpp b/kio/kio/kservicefactory.cpp index 47c3fc06b..c5784e65a 100644 --- a/kio/kio/kservicefactory.cpp +++ b/kio/kio/kservicefactory.cpp @@ -52,14 +52,14 @@ KServiceFactory::KServiceFactory() (*m_str) >> i; m_menuIdDictOffset = i; - int saveOffset = m_str->tqdevice()->tqat(); + int saveOffset = m_str->device()->at(); // Init index tables m_nameDict = new KSycocaDict(m_str, m_nameDictOffset); // Init index tables m_relNameDict = new KSycocaDict(m_str, m_relNameDictOffset); // Init index tables m_menuIdDict = new KSycocaDict(m_str, m_menuIdDictOffset); - saveOffset = m_str->tqdevice()->tqat(saveOffset); + saveOffset = m_str->device()->at(saveOffset); } else { @@ -225,7 +225,7 @@ KService::List KServiceFactory::allInitServices() // Assume we're NOT building a database - m_str->tqdevice()->tqat(m_initListOffset); + m_str->device()->at(m_initListOffset); TQ_INT32 entryCount; (*m_str) >> entryCount; @@ -253,7 +253,7 @@ KService::List KServiceFactory::offers( int serviceTypeOffset ) TQDataStream *str = m_str; // Jump to the offer list - str->tqdevice()->tqat( m_offerListOffset ); + str->device()->at( m_offerListOffset ); TQ_INT32 aServiceTypeOffset; TQ_INT32 aServiceOffset; @@ -268,13 +268,13 @@ KService::List KServiceFactory::offers( int serviceTypeOffset ) if ( aServiceTypeOffset == serviceTypeOffset ) { // Save stream position ! - int savedPos = str->tqdevice()->tqat(); + int savedPos = str->device()->at(); // Create Service KService * serv = createEntry( aServiceOffset ); if (serv) list.append( KService::Ptr( serv ) ); // Restore position - str->tqdevice()->tqat( savedPos ); + str->device()->at( savedPos ); } else if ( aServiceTypeOffset > (TQ_INT32)serviceTypeOffset ) break; // too far } diff --git a/kio/kio/kservicegroupfactory.cpp b/kio/kio/kservicegroupfactory.cpp index b693035a6..d27fab3e2 100644 --- a/kio/kio/kservicegroupfactory.cpp +++ b/kio/kio/kservicegroupfactory.cpp @@ -40,10 +40,10 @@ KServiceGroupFactory::KServiceGroupFactory() (*m_str) >> i; m_baseGroupDictOffset = i; - int saveOffset = m_str->tqdevice()->tqat(); + int saveOffset = m_str->device()->at(); // Init index tables m_baseGroupDict = new KSycocaDict(m_str, m_baseGroupDictOffset); - m_str->tqdevice()->tqat(saveOffset); + m_str->device()->at(saveOffset); } else { diff --git a/kio/kio/kservicetypefactory.cpp b/kio/kio/kservicetypefactory.cpp index 393526eff..f7c0f5969 100644 --- a/kio/kio/kservicetypefactory.cpp +++ b/kio/kio/kservicetypefactory.cpp @@ -118,14 +118,14 @@ KMimeType * KServiceTypeFactory::findFromPattern(const TQString &_filename, TQSt // Get stream to the header TQDataStream *str = m_str; - str->tqdevice()->tqat( m_fastPatternOffset ); + str->device()->at( m_fastPatternOffset ); TQ_INT32 nrOfEntries; (*str) >> nrOfEntries; TQ_INT32 entrySize; (*str) >> entrySize; - TQ_INT32 fastOffset = str->tqdevice()->tqat( ); + TQ_INT32 fastOffset = str->device()->at( ); TQ_INT32 matchingOffset = 0; @@ -145,7 +145,7 @@ KMimeType * KServiceTypeFactory::findFromPattern(const TQString &_filename, TQSt while (left <= right) { middle = (left + right) / 2; // read pattern at position "middle" - str->tqdevice()->tqat( middle * entrySize + fastOffset ); + str->device()->at( middle * entrySize + fastOffset ); KSycocaEntry::read(*str, pattern); int cmp = pattern.compare( extension ); if (cmp < 0) @@ -166,7 +166,7 @@ KMimeType * KServiceTypeFactory::findFromPattern(const TQString &_filename, TQSt // Now try the "other" Pattern table if ( m_patterns.isEmpty() ) { - str->tqdevice()->tqat( m_otherPatternOffset ); + str->device()->at( m_otherPatternOffset ); TQString pattern; TQ_INT32 mimetypeOffset; diff --git a/kio/kio/kshred.cpp b/kio/kio/kshred.cpp index 151cc69a6..f3997bf58 100644 --- a/kio/kio/kshred.cpp +++ b/kio/kio/kshred.cpp @@ -95,7 +95,7 @@ KShred::fillbyte(unsigned int byte) } if (!flush()) return false; - return file->tqat(0); + return file->at(0); } @@ -114,7 +114,7 @@ KShred::fillpattern(unsigned char *data, unsigned int size) } if (!flush()) return false; - return file->tqat(0); + return file->at(0); } @@ -140,7 +140,7 @@ KShred::fillrandom() } if (!flush()) return false; - return file->tqat(0); + return file->at(0); } diff --git a/kio/kio/ktar.cpp b/kio/kio/ktar.cpp index a9bd1faca..687da26f5 100644 --- a/kio/kio/ktar.cpp +++ b/kio/kio/ktar.cpp @@ -461,14 +461,14 @@ bool KTar::openArchive( int mode ) //kdDebug(7041) << "KTar::openArchive file " << nm << " size=" << size << endl; e = new KArchiveFile( this, nm, access, time, user, group, symlink, - dev->tqat(), size ); + dev->at(), size ); } // Skip contents + align bytes int rest = size % 0x200; int skip = size + (rest ? 0x200 - rest : 0); - //kdDebug(7041) << "KTar::openArchive, at()=" << dev->tqat() << " rest=" << rest << " skipping " << skip << endl; - if (! dev->tqat( dev->tqat() + skip ) ) + //kdDebug(7041) << "KTar::openArchive, at()=" << dev->at() << " rest=" << rest << " skipping " << skip << endl; + if (! dev->at( dev->at() + skip ) ) kdWarning(7041) << "KTar::openArchive skipping " << skip << " failed" << endl; } @@ -495,7 +495,7 @@ bool KTar::openArchive( int mode ) else { //qDebug("Terminating. Read %d bytes, first one is %d", n, buffer[0]); - d->tarEnd = dev->tqat() - n; // Remember end of archive + d->tarEnd = dev->at() - n; // Remember end of archive ende = true; } } while( !ende ); @@ -591,7 +591,7 @@ bool KTar::writeDir( const TQString& name, const TQString& user, const TQString& char buffer[ 0x201 ]; memset( buffer, 0, 0x200 ); - if ( mode() & IO_ReadWrite ) device()->tqat(d->tarEnd); // Go to end of archive as might have moved with a read + if ( mode() & IO_ReadWrite ) device()->at(d->tarEnd); // Go to end of archive as might have moved with a read // If more than 100 chars, we need to use the LongLink trick if ( dirName.length() > 99 ) @@ -616,7 +616,7 @@ bool KTar::writeDir( const TQString& name, const TQString& user, const TQString& // Write header device()->writeBlock( buffer, 0x200 ); - if ( mode() & IO_ReadWrite ) d->tarEnd = device()->tqat(); + if ( mode() & IO_ReadWrite ) d->tarEnd = device()->at(); d->dirList.append( dirName ); // contains trailing slash return true; // TODO if wanted, better error control @@ -633,10 +633,10 @@ bool KTar::prepareWriting( const TQString& name, const TQString& user, const TQS bool KTar::doneWriting( uint size ) { - // Write tqalignment + // Write alignment int rest = size % 0x200; if ( mode() & IO_ReadWrite ) - d->tarEnd = device()->tqat() + (rest ? 0x200 - rest : 0); // Record our new end of archive + d->tarEnd = device()->at() + (rest ? 0x200 - rest : 0); // Record our new end of archive if ( rest ) { char buffer[ 0x201 ]; @@ -799,7 +799,7 @@ bool KTar::prepareWriting_impl(const TQString &name, const TQString &user, char buffer[ 0x201 ]; memset( buffer, 0, 0x200 ); - if ( mode() & IO_ReadWrite ) device()->tqat(d->tarEnd); // Go to end of archive as might have moved with a read + if ( mode() & IO_ReadWrite ) device()->at(d->tarEnd); // Go to end of archive as might have moved with a read // provide converted stuff we need lateron TQCString encodedFilename = TQFile::encodeName(fileName); @@ -858,7 +858,7 @@ bool KTar::writeDir_impl(const TQString &name, const TQString &user, char buffer[ 0x201 ]; memset( buffer, 0, 0x200 ); - if ( mode() & IO_ReadWrite ) device()->tqat(d->tarEnd); // Go to end of archive as might have moved with a read + if ( mode() & IO_ReadWrite ) device()->at(d->tarEnd); // Go to end of archive as might have moved with a read // provide converted stuff we need lateron TQCString encodedDirname = TQFile::encodeName(dirName); @@ -882,7 +882,7 @@ bool KTar::writeDir_impl(const TQString &name, const TQString &user, // Write header device()->writeBlock( buffer, 0x200 ); - if ( mode() & IO_ReadWrite ) d->tarEnd = device()->tqat(); + if ( mode() & IO_ReadWrite ) d->tarEnd = device()->at(); d->dirList.append( dirName ); // contains trailing slash return true; // TODO if wanted, better error control @@ -916,7 +916,7 @@ bool KTar::writeSymLink_impl(const TQString &name, const TQString &target, char buffer[ 0x201 ]; memset( buffer, 0, 0x200 ); - if ( mode() & IO_ReadWrite ) device()->tqat(d->tarEnd); // Go to end of archive as might have moved with a read + if ( mode() & IO_ReadWrite ) device()->at(d->tarEnd); // Go to end of archive as might have moved with a read // provide converted stuff we need lateron TQCString encodedFilename = TQFile::encodeName(fileName); @@ -946,7 +946,7 @@ bool KTar::writeSymLink_impl(const TQString &name, const TQString &target, // Write header bool retval = device()->writeBlock( buffer, 0x200 ) == 0x200; - if ( mode() & IO_ReadWrite ) d->tarEnd = device()->tqat(); + if ( mode() & IO_ReadWrite ) d->tarEnd = device()->at(); return retval; } diff --git a/kio/kio/kurlcompletion.cpp b/kio/kio/kurlcompletion.cpp index 79a939530..17caccb88 100644 --- a/kio/kio/kurlcompletion.cpp +++ b/kio/kio/kurlcompletion.cpp @@ -750,7 +750,7 @@ bool KURLCompletion::userCompletion(const MyURL &url, TQString *match) { if ( url.protocol() != "file" || !url.dir().isEmpty() - || url.file().tqat(0) != '~' ) + || url.file().at(0) != '~' ) return false; if ( !isListedURL( CTUser ) ) { @@ -782,7 +782,7 @@ extern char **environ; // Array of environment variables bool KURLCompletion::envCompletion(const MyURL &url, TQString *match) { - if ( url.file().tqat(0) != '$' ) + if ( url.file().at(0) != '$' ) return false; if ( !isListedURL( CTEnv ) ) { @@ -861,7 +861,7 @@ bool KURLCompletion::exeCompletion(const MyURL &url, TQString *match) } // No hidden files unless the user types "." - bool no_hidden_files = url.file().tqat(0) != '.'; + bool no_hidden_files = url.file().at(0) != '.'; // List files if needed // @@ -921,7 +921,7 @@ bool KURLCompletion::systemexeCompletion(const MyURL &url, TQString *match) } // No hidden files unless the user types "." - bool no_hidden_files = url.file().tqat(0) != '.'; + bool no_hidden_files = url.file().at(0) != '.'; // List files if needed // @@ -995,7 +995,7 @@ bool KURLCompletion::fileCompletion(const MyURL &url, TQString *match) } // No hidden files unless the user types "." - bool no_hidden_files = ( url.file().tqat(0) != '.' ); + bool no_hidden_files = ( url.file().at(0) != '.' ); // List files if needed // @@ -1365,7 +1365,7 @@ void KURLCompletion::postProcessMatch( TQString *match ) const void KURLCompletion::adjustMatch( TQString& match ) const { - if ( match.tqat( match.length()-1 ) != '/' ) + if ( match.at( match.length()-1 ) != '/' ) { TQString copy; diff --git a/kio/kio/kurlpixmapprovider.cpp b/kio/kio/kurlpixmapprovider.cpp index c55546c55..caeedf066 100644 --- a/kio/kio/kurlpixmapprovider.cpp +++ b/kio/kio/kurlpixmapprovider.cpp @@ -22,7 +22,7 @@ TQPixmap KURLPixmapProvider::pixmapFor( const TQString& url, int size ) { KURL u; - if ( url.tqat(0) == '/' ) + if ( url.at(0) == '/' ) u.setPath( url ); else u = url; diff --git a/kio/kio/kzip.cpp b/kio/kio/kzip.cpp index ccc573697..a0bad4492 100644 --- a/kio/kio/kzip.cpp +++ b/kio/kio/kzip.cpp @@ -394,7 +394,7 @@ bool KZip::openArchive( int mode ) // ReadWrite mode still uses TQFile for now; we'd need to copy to the tempfile, in fact. if ( !m_filename.isEmpty() ) { setDevice( TQT_TQIODEVICE(new TQFile( m_filename )) ); - if ( !device()->tqopen( mode ) ) + if ( !device()->open( mode ) ) return false; } break; // continued below @@ -427,7 +427,7 @@ bool KZip::openArchive( int mode ) for (;;) // repeat until 'end of entries' signature is reached { kdDebug(7040) << "loop starts" << endl; -kdDebug(7040) << "dev->tqat() now : " << dev->tqat() << endl; +kdDebug(7040) << "dev->at() now : " << dev->at() << endl; n = dev->readBlock( buffer, 4 ); if (n < 4) @@ -449,7 +449,7 @@ kdDebug(7040) << "dev->tqat() now : " << dev->tqat() << endl; kdDebug(7040) << "PK34 found local file header" << endl; startOfFile = false; // can this fail ??? - dev->tqat( dev->tqat() + 2 ); // skip 'version needed to extract' + dev->at( dev->at() + 2 ); // skip 'version needed to extract' // read static header stuff n = dev->readBlock( buffer, 24 ); @@ -490,7 +490,7 @@ kdDebug(7040) << "dev->tqat() now : " << dev->tqat() << endl; // read and parse the beginning of the extra field, // skip rest of extra field in case it is too long - unsigned int extraFieldEnd = dev->tqat() + extralen; + unsigned int extraFieldEnd = dev->at() + extralen; pfi->extralen = extralen; int handledextralen = QMIN(extralen, (int)sizeof buffer); @@ -505,7 +505,7 @@ kdDebug(7040) << "dev->tqat() now : " << dev->tqat() << endl; } // jump to end of extra field - dev->tqat( extraFieldEnd ); + dev->at( extraFieldEnd ); // we have to take care of the 'general purpose bit flag'. // if bit 3 is set, the header doesn't contain the length of @@ -544,18 +544,18 @@ kdDebug(7040) << "dev->tqat() now : " << dev->tqat() << endl; if ( buffer[0] == 'K' && buffer[1] == 7 && buffer[2] == 8 ) { foundSignature = true; - dev->tqat( dev->tqat() + 12 ); // skip the 'data_descriptor' + dev->at( dev->at() + 12 ); // skip the 'data_descriptor' } else if ( ( buffer[0] == 'K' && buffer[1] == 1 && buffer[2] == 2 ) || ( buffer[0] == 'K' && buffer[1] == 3 && buffer[2] == 4 ) ) { foundSignature = true; - dev->tqat( dev->tqat() - 4 ); // go back 4 bytes, so that the magic bytes can be found... + dev->at( dev->at() - 4 ); // go back 4 bytes, so that the magic bytes can be found... } else if ( buffer[0] == 'P' || buffer[1] == 'P' || buffer[2] == 'P' ) { // We have another P character so we must go back a little to check if it is a magic - dev->tqat( dev->tqat() - 3 ); + dev->at( dev->at() - 3 ); } } @@ -611,14 +611,14 @@ kdDebug(7040) << "dev->tqat() now : " << dev->tqat() << endl; if ( buffer[0] == 'K' && buffer[1] == 7 && buffer[2] == 8 ) { foundSignature = true; - dev->tqat( dev->tqat() + 12 ); // skip the 'data_descriptor' + dev->at( dev->at() + 12 ); // skip the 'data_descriptor' } if ( ( buffer[0] == 'K' && buffer[1] == 1 && buffer[2] == 2 ) || ( buffer[0] == 'K' && buffer[1] == 3 && buffer[2] == 4 ) ) { foundSignature = true; - dev->tqat( dev->tqat() - 4 ); + dev->at( dev->at() - 4 ); // go back 4 bytes, so that the magic bytes can be found // in the next cycle... } @@ -626,10 +626,10 @@ kdDebug(7040) << "dev->tqat() now : " << dev->tqat() << endl; } else { -// kdDebug(7040) << "before interesting dev->tqat(): " << dev->tqat() << endl; +// kdDebug(7040) << "before interesting dev->at(): " << dev->at() << endl; bool success; - success = dev->tqat( dev->tqat() + compr_size ); // can this fail ??? -/* kdDebug(7040) << "after interesting dev->tqat(): " << dev->tqat() << endl; + success = dev->at( dev->at() + compr_size ); // can this fail ??? +/* kdDebug(7040) << "after interesting dev->at(): " << dev->at() << endl; if ( success ) kdDebug(7040) << "dev->at was successful... " << endl; else @@ -653,7 +653,7 @@ kdDebug(7040) << "dev->tqat() now : " << dev->tqat() << endl; // so we reached the central header at the end of the zip file // here we get all interesting data out of the central header // of a file - offset = dev->tqat() - 4; + offset = dev->at() - 4; //set offset for appending new files if ( d->m_offset == 0L ) d->m_offset = offset; @@ -792,7 +792,7 @@ kdDebug(7040) << "dev->tqat() now : " << dev->tqat() << endl; //calculate offset to next entry offset += 46 + commlen + extralen + namelen; - bool b = dev->tqat(offset); + bool b = dev->at(offset); Q_ASSERT( b ); if ( !b ) return false; @@ -832,12 +832,12 @@ kdDebug(7040) << "dev->tqat() now : " << dev->tqat() << endl; if ( buffer[0] == 'K' && buffer[1] == 3 && buffer[2] == 4 ) { foundSignature = true; - dev->tqat( dev->tqat() - 4 ); // go back 4 bytes, so that the magic bytes can be found... + dev->at( dev->at() - 4 ); // go back 4 bytes, so that the magic bytes can be found... } else if ( buffer[0] == 'P' || buffer[1] == 'P' || buffer[2] == 'P' ) { // We have another P character so we must go back a little to check if it is a magic - dev->tqat( dev->tqat() - 3 ); + dev->at( dev->at() - 3 ); } } } @@ -871,14 +871,14 @@ bool KZip::closeArchive() char buffer[ 22 ]; // first used for 12, then for 22 at the end uLong crc = crc32(0L, Z_NULL, 0); - TQ_LONG centraldiroffset = device()->tqat(); + TQ_LONG centraldiroffset = device()->at(); //kdDebug(7040) << "closearchive: centraldiroffset: " << centraldiroffset << endl; TQ_LONG atbackup = centraldiroffset; TQPtrListIterator it( d->m_fileList ); for ( ; it.current() ; ++it ) { //set crc and compressed size in each local file header - if ( !device()->tqat( it.current()->headerStart() + 14 ) ) + if ( !device()->at( it.current()->headerStart() + 14 ) ) return false; //kdDebug(7040) << "closearchive setcrcandcsize: filename: " // << it.current()->path() @@ -905,7 +905,7 @@ bool KZip::closeArchive() if ( device()->writeBlock( buffer, 12 ) != 12 ) return false; } - device()->tqat( atbackup ); + device()->at( atbackup ); for ( it.toFirst(); it.current() ; ++it ) { @@ -994,9 +994,9 @@ bool KZip::closeArchive() if ( !ok ) return false; } - TQ_LONG centraldirendoffset = device()->tqat(); + TQ_LONG centraldirendoffset = device()->at(); //kdDebug(7040) << "closearchive: centraldirendoffset: " << centraldirendoffset << endl; - //kdDebug(7040) << "closearchive: device()->tqat(): " << device()->tqat() << endl; + //kdDebug(7040) << "closearchive: device()->at(): " << device()->at() << endl; //write end of central dir record. buffer[ 0 ] = 'P'; //end of central dir signature @@ -1107,7 +1107,7 @@ bool KZip::prepareWriting_impl(const TQString &name, const TQString &user, } // set right offset in zip. - if ( !device()->tqat( d->m_offset ) ) { + if ( !device()->at( d->m_offset ) ) { kdWarning(7040) << "prepareWriting_impl: cannot seek in ZIP file. Disk full?" << endl; abort(); return false; @@ -1144,9 +1144,9 @@ bool KZip::prepareWriting_impl(const TQString &name, const TQString &user, // construct a KZipFileEntry and add it to list KZipFileEntry * e = new KZipFileEntry( this, fileName, perm, mtime, user, group, TQString::null, - name, device()->tqat() + 30 + name.length(), // start + name, device()->at() + 30 + name.length(), // start 0 /*size unknown yet*/, d->m_compression, 0 /*csize unknown yet*/ ); - e->setHeaderStart( device()->tqat() ); + e->setHeaderStart( device()->at() ); //kdDebug(7040) << "wrote file start: " << e->position() << " name: " << name << endl; parentDir->addEntry( e ); @@ -1274,13 +1274,13 @@ bool KZip::doneWriting( uint size ) Q_ASSERT( d->m_currentFile ); //kdDebug(7040) << "donewriting reached." << endl; //kdDebug(7040) << "filename: " << d->m_currentFile->path() << endl; - //kdDebug(7040) << "getpos (at): " << device()->tqat() << endl; + //kdDebug(7040) << "getpos (at): " << device()->at() << endl; d->m_currentFile->setSize(size); int extra_field_len = 0; if ( d->m_extraField == ModificationTime ) extra_field_len = 17; // value also used in doneWriting() - int csize = device()->tqat() - + int csize = device()->at() - d->m_currentFile->headerStart() - 30 - d->m_currentFile->path().length() - extra_field_len; d->m_currentFile->setCompressedSize(csize); @@ -1294,7 +1294,7 @@ bool KZip::doneWriting( uint size ) d->m_currentFile = 0L; // update saved offset for appending new files - d->m_offset = device()->tqat(); + d->m_offset = device()->at(); return true; } diff --git a/kio/kio/netaccess.h b/kio/kio/netaccess.h index 3fb9103af..110c18053 100644 --- a/kio/kio/netaccess.h +++ b/kio/kio/netaccess.h @@ -92,7 +92,7 @@ public: * } * \endcode * - * Of course, your user interface will still process exposure/tqrepaint + * Of course, your user interface will still process exposure/repaint * events during the download. * * If the download fails, lastError() and lastErrorString() will be set. diff --git a/kio/kio/scheduler.cpp b/kio/kio/scheduler.cpp index 5bda16786..9b518b1ef 100644 --- a/kio/kio/scheduler.cpp +++ b/kio/kio/scheduler.cpp @@ -346,7 +346,7 @@ bool Scheduler::startJobScheduled(ProtocolInfo *protInfo) // Prevent starvation. We skip the first entry in the queue at most // 2 times in a row. The protInfo->skipCount = 0; - job = protInfo->joblist.tqat(0); + job = protInfo->joblist.at(0); slave = findIdleSlave(protInfo, job, dummy ); } else @@ -356,7 +356,7 @@ bool Scheduler::startJobScheduled(ProtocolInfo *protInfo) Slave *firstSlave = 0; for(uint i = 0; (i < protInfo->joblist.count()) && (i < 10); i++) { - job = protInfo->joblist.tqat(i); + job = protInfo->joblist.at(i); slave = findIdleSlave(protInfo, job, exact); if (!firstSlave) { diff --git a/kio/kssl/keygenwizard.ui b/kio/kssl/keygenwizard.ui index 2130c767b..4cb5fe1df 100644 --- a/kio/kssl/keygenwizard.ui +++ b/kio/kssl/keygenwizard.ui @@ -30,7 +30,7 @@ false - + WordBreak|AlignVCenter|AlignLeft diff --git a/kio/kssl/keygenwizard2.ui b/kio/kssl/keygenwizard2.ui index a0d200428..90fef8fef 100644 --- a/kio/kssl/keygenwizard2.ui +++ b/kio/kssl/keygenwizard2.ui @@ -24,7 +24,7 @@ You must now provide a password for the certificate request. Please choose a very secure password as this will be used to encrypt your private key. - + WordBreak|AlignVCenter|AlignLeft diff --git a/kio/kssl/ksslcertificate.cc b/kio/kssl/ksslcertificate.cc index 7d86726c8..285bb1d2d 100644 --- a/kio/kssl/ksslcertificate.cc +++ b/kio/kssl/ksslcertificate.cc @@ -246,7 +246,7 @@ TQString KSSLCertificate::getMD5DigestFromKDEKey(const TQString &k) { int pos = k.findRev('('); if (pos != -1) { unsigned int len = k.length(); - if (k.tqat(len-1) == ')') { + if (k.at(len-1) == ')') { rc = k.mid(pos+1, len-pos-2); } } diff --git a/kio/kssl/ksslinfodlg.cc b/kio/kssl/ksslinfodlg.cc index 9a43942c8..ae2a4a3ae 100644 --- a/kio/kssl/ksslinfodlg.cc +++ b/kio/kssl/ksslinfodlg.cc @@ -348,7 +348,7 @@ void KSSLInfoDlg::slotChain(int x) { cl.setAutoDelete(true); for (int i = 0; i < x-1; i++) cl.remove((unsigned int)0); - KSSLCertificate thisCert = *(cl.tqat(0)); + KSSLCertificate thisCert = *(cl.at(0)); cl.remove((unsigned int)0); thisCert.chain().setChain(cl); displayCert(&thisCert); diff --git a/kio/kssl/ksslsettings.cc b/kio/kssl/ksslsettings.cc index d9286433e..5a77b12bf 100644 --- a/kio/kssl/ksslsettings.cc +++ b/kio/kssl/ksslsettings.cc @@ -182,7 +182,7 @@ TQString KSSLSettings::getCipherList() { // Also remove NULL ciphers and 168bit ciphers for (unsigned int i = 0; i < cipherList.count(); i++) { CipherNode *j = 0L; - while ((j = cipherList.tqat(i)) != 0L) { + while ((j = cipherList.at(i)) != 0L) { if (j->name.contains("ADH-") || j->name.contains("NULL-") || j->name.contains("DES-CBC3-SHA") || j->name.contains("FZA")) { cipherList.remove(j); } else { diff --git a/kio/misc/ksendbugmail/main.cpp b/kio/misc/ksendbugmail/main.cpp index 764ed1a74..fbcaec7b6 100644 --- a/kio/misc/ksendbugmail/main.cpp +++ b/kio/misc/ksendbugmail/main.cpp @@ -74,7 +74,7 @@ int main(int argc, char **argv) { if (recipient.isEmpty()) recipient = "submit@bugs.kde.org"; else { - if (recipient.tqat(0) == '\'') { + if (recipient.at(0) == '\'') { recipient = recipient.mid(1).left(recipient.length() - 2); } } @@ -84,7 +84,7 @@ int main(int argc, char **argv) { if (subject.isEmpty()) subject = "(no subject)"; else { - if (subject.tqat(0) == '\'') + if (subject.at(0) == '\'') subject = subject.mid(1).left(subject.length() - 2); } TQTextIStream input(stdin); diff --git a/kio/misc/kssld/kssld.cpp b/kio/misc/kssld/kssld.cpp index b60d75226..760e654d7 100644 --- a/kio/misc/kssld/kssld.cpp +++ b/kio/misc/kssld/kssld.cpp @@ -867,7 +867,7 @@ void KSSLD::searchAddCert(KSSLCertificate *cert) { if (elem.findRef(cert) == -1) { unsigned int n = 0; for(; n < elem.size(); n++) { - if (!elem.tqat(n)) { + if (!elem.at(n)) { elem.insert(n, cert); break; } @@ -912,7 +912,7 @@ TQStringList KSSLD::getKDEKeyByEmail(const TQString &email) { TQPtrVector &elem = *it; for (unsigned int n = 0; n < elem.size(); n++) { - KSSLCertificate *cert = elem.tqat(n); + KSSLCertificate *cert = elem.at(n); if (cert) { rc.append(cert->getKDEKey()); } diff --git a/kio/misc/kwalletd/kwalletwizard.ui b/kio/misc/kwalletd/kwalletwizard.ui index 6f94e5643..9d9c83def 100644 --- a/kio/misc/kwalletd/kwalletwizard.ui +++ b/kio/misc/kwalletd/kwalletwizard.ui @@ -58,7 +58,7 @@ RichText - + WordBreak|AlignCenter @@ -83,7 +83,7 @@ RichText - + WordBreak|AlignVCenter @@ -233,7 +233,7 @@ Enter a new password: - + AlignVCenter|AlignRight @@ -250,7 +250,7 @@ Verify password: - + AlignVCenter|AlignRight @@ -376,7 +376,7 @@ - + WordBreak|AlignVCenter|AlignRight @@ -403,7 +403,7 @@ RichText - + WordBreak|AlignVCenter diff --git a/kio/tests/kfiltertest.cpp b/kio/tests/kfiltertest.cpp index 54599e838..e070418e4 100644 --- a/kio/tests/kfiltertest.cpp +++ b/kio/tests/kfiltertest.cpp @@ -41,8 +41,8 @@ void test_block( const TQString & fileName ) // TQCString s(array,n+1); // Terminate with 0 before printing // printf("%s", s.data()); - kdDebug() << "dev.at = " << dev->tqat() << endl; - //kdDebug() << "f.at = " << f.tqat() << endl; + kdDebug() << "dev.at = " << dev->at() << endl; + //kdDebug() << "f.at = " << f.at() << endl; } dev->close(); delete dev; diff --git a/kioslave/http/http.cc b/kioslave/http/http.cc index d509a3eb3..a1495d78b 100644 --- a/kioslave/http/http.cc +++ b/kioslave/http/http.cc @@ -4711,7 +4711,7 @@ FILE* HTTPProtocol::checkCacheEntry( bool readWrite) TQCString u = m_request.url.url().latin1(); for(int i = u.length(); i--;) { - hash = (hash * 12211 + static_cast(u.tqat(i))) % 2147483563; + hash = (hash * 12211 + static_cast(u.at(i))) % 2147483563; } TQString hashString; @@ -5943,7 +5943,7 @@ TQString HTTPProtocol::createDigestAuth ( bool isForProxy ) for (int i = 0; i < count; i++ ) { - KURL u ( info.digestURI.tqat(i) ); + KURL u ( info.digestURI.at(i) ); send &= (m_request.url.protocol().lower() == u.protocol().lower()); send &= (m_request.hostname.lower() == u.host().lower()); diff --git a/kioslave/http/kcookiejar/kcookiejar.cpp b/kioslave/http/kcookiejar/kcookiejar.cpp index c9c379c58..ec0a423a6 100644 --- a/kioslave/http/kcookiejar/kcookiejar.cpp +++ b/kioslave/http/kcookiejar/kcookiejar.cpp @@ -618,7 +618,7 @@ void KCookieJar::extractDomains(const TQString &_fqdn, return; } // Return numeric IPv4 addresses as is... - if ((_fqdn.tqat(0) >= TQChar('0')) && (_fqdn.tqat(0) <= TQChar('9'))) + if ((_fqdn.at(0) >= TQChar('0')) && (_fqdn.at(0) <= TQChar('9'))) { if (_fqdn.find(TQRegExp(IP_ADDRESS_EXPRESSION)) > -1) { diff --git a/kioslave/iso/iso.cpp b/kioslave/iso/iso.cpp index cde39702f..586513956 100644 --- a/kioslave/iso/iso.cpp +++ b/kioslave/iso/iso.cpp @@ -407,8 +407,8 @@ void kio_isoProtocol::getFile( const KIsoFile *isoFileEntry, const TQString &pat ptrblock_bytes = (nblocks+1) * 4; pointer_block=isoFileEntry->data( hdr->header_size << 2, ptrblock_bytes ); if (pointer_block.size() == ptrblock_bytes && - inbuf.tqresize(block_size2) && - outbuf.tqresize(block_size)) { + inbuf.resize(block_size2) && + outbuf.resize(block_size)) { pptr = pointer_block.data(); } else { diff --git a/kioslave/iso/kiso.cpp b/kioslave/iso/kiso.cpp index 7b682a783..47f71511d 100644 --- a/kioslave/iso/kiso.cpp +++ b/kioslave/iso/kiso.cpp @@ -192,7 +192,7 @@ static int readf(char *buf, int start, int len,void *udata) { TQIODevice* dev = ( static_cast (udata) )->device(); - if (dev->tqat(start<<11)) { + if (dev->at(start<<11)) { if ((dev->readBlock(buf, len<<11)) != -1) return (len); } kdDebug() << "KIso::ReadRequest failed start: " << start << " len: " << len << endl; diff --git a/kioslave/iso/kisofile.cpp b/kioslave/iso/kisofile.cpp index 5235ea4a0..afac16b74 100644 --- a/kioslave/iso/kisofile.cpp +++ b/kioslave/iso/kisofile.cpp @@ -42,8 +42,8 @@ TQByteArray KIsoFile::data(long long pos, int count) const { TQByteArray r; int rlen; - if ( archive()->device()->tqat(position()+pos) && - r.tqresize( ((pos+count) < size()) ? count : size()-pos) ) { + if ( archive()->device()->at(position()+pos) && + r.resize( ((pos+count) < size()) ? count : size()-pos) ) { rlen=archive()->device()->readBlock( r.data(), r.size() ); if (rlen ==- 1) r.resize(0); else if (rlen != (int)r.size()) r.resize(rlen); diff --git a/kjs/internal.cpp b/kjs/internal.cpp index c796cddd5..25f7b6e31 100644 --- a/kjs/internal.cpp +++ b/kjs/internal.cpp @@ -52,7 +52,7 @@ extern int kjsyyparse(); using namespace KJS; namespace KJS { - /* work around some strict tqalignment requirements + /* work around some strict alignment requirements for double variables on some architectures (e.g. PA-RISC) */ typedef union { unsigned char b[8]; double d; } kjs_double_t; diff --git a/kmdi/kmdi/dockcontainer.cpp b/kmdi/kmdi/dockcontainer.cpp index 16c4438c4..65433cfaa 100644 --- a/kmdi/kmdi/dockcontainer.cpp +++ b/kmdi/kmdi/dockcontainer.cpp @@ -633,7 +633,7 @@ void DockContainer::prevToolView() { if (pos==-1) return; pos--; if (pos<0) pos=tabs->count()-1; - KMultiTabBarTab *tab=tabs->tqat(pos); + KMultiTabBarTab *tab=tabs->at(pos); if (!tab) return; //can never happen here, but who knows m_tb->setTab(tab->id(),true); tabClicked(tab->id()); @@ -645,7 +645,7 @@ void DockContainer::nextToolView() { if (pos==-1) return; pos++; if (pos>=(int)tabs->count()) pos=0; - KMultiTabBarTab *tab=tabs->tqat(pos); + KMultiTabBarTab *tab=tabs->at(pos); if (!tab) return; //can never happen here, but who knows m_tb->setTab(tab->id(),true); tabClicked(tab->id()); diff --git a/kmdi/kmdi/guiclient.cpp b/kmdi/kmdi/guiclient.cpp index c12debcf2..1233bc64b 100644 --- a/kmdi/kmdi/guiclient.cpp +++ b/kmdi/kmdi/guiclient.cpp @@ -100,7 +100,7 @@ GUIClient::~GUIClient() { // actionCollection()->writeShortcutSettings( "KMDI Shortcuts", kapp->config() ); for (uint i=0;itqrepaint(); + tabBar()->repaint(); } void TabWidget::insertTab ( TQWidget * child, const TQIconSet & iconset, const TQString & label, int index ) @@ -190,7 +190,7 @@ void TabWidget::insertTab ( TQWidget * child, const TQIconSet & iconset, const T KTabWidget::insertTab(child,iconset,label,index); showPage(child); maybeShow(); - tabBar()->tqrepaint(); + tabBar()->repaint(); } void TabWidget::insertTab ( TQWidget * child, TQTab * tab, int index) @@ -198,7 +198,7 @@ void TabWidget::insertTab ( TQWidget * child, TQTab * tab, int index) KTabWidget::insertTab(child,tab,index); showPage(child); maybeShow(); - tabBar()->tqrepaint(); + tabBar()->repaint(); } void TabWidget::removePage ( TQWidget * w ) diff --git a/kmdi/kmdichildfrm.cpp b/kmdi/kmdichildfrm.cpp index f0605632c..e7c058a26 100644 --- a/kmdi/kmdichildfrm.cpp +++ b/kmdi/kmdichildfrm.cpp @@ -694,7 +694,7 @@ void KMdiChildFrm::setCaption( const TQString& text ) void KMdiChildFrm::enableClose( bool bEnable ) { m_pClose->setEnabled( bEnable ); - m_pClose->tqrepaint( false ); + m_pClose->repaint( false ); } //============ setIcon ==================// diff --git a/kmdi/kmdichildfrmcaption.cpp b/kmdi/kmdichildfrmcaption.cpp index 062fa6261..9ebbefb34 100644 --- a/kmdi/kmdichildfrmcaption.cpp +++ b/kmdi/kmdichildfrmcaption.cpp @@ -182,7 +182,7 @@ void KMdiChildFrmCaption::setActive( bool bActive ) m_pParent->m_pManager->m_captionInactiveBackColor ); m_bActive = bActive; - tqrepaint( false ); + repaint( false ); } //=============== setCaption ===============// @@ -190,7 +190,7 @@ void KMdiChildFrmCaption::setActive( bool bActive ) void KMdiChildFrmCaption::setCaption( const TQString& text ) { m_szCaption = text; - tqrepaint( false ); + repaint( false ); } //============== heightHint ===============// diff --git a/kmdi/kmdidockcontainer.cpp b/kmdi/kmdidockcontainer.cpp index 71b154a14..cf7053c51 100644 --- a/kmdi/kmdidockcontainer.cpp +++ b/kmdi/kmdidockcontainer.cpp @@ -826,7 +826,7 @@ void KMdiDockContainer::prevToolView() if ( pos < 0 ) pos = tabs->count() - 1; - KMultiTabBarTab *tab = tabs->tqat( pos ); + KMultiTabBarTab *tab = tabs->at( pos ); if ( !tab ) return ; //can never happen here, but who knows @@ -847,7 +847,7 @@ void KMdiDockContainer::nextToolView() if ( pos >= ( int ) tabs->count() ) pos = 0; - KMultiTabBarTab *tab = tabs->tqat( pos ); + KMultiTabBarTab *tab = tabs->at( pos ); if ( !tab ) return ; //can never happen here, but who knows diff --git a/kmdi/kmdidocumentviewtabwidget.cpp b/kmdi/kmdidocumentviewtabwidget.cpp index 7656bb358..a75000148 100644 --- a/kmdi/kmdidocumentviewtabwidget.cpp +++ b/kmdi/kmdidocumentviewtabwidget.cpp @@ -54,7 +54,7 @@ void KMdiDocumentViewTabWidget::insertTab ( TQWidget * child, const TQString & l KTabWidget::insertTab( child, label, index ); showPage( child ); TQTimer::singleShot(0, this, TQT_SLOT(maybeShow())); - tabBar() ->tqrepaint(); + tabBar() ->repaint(); } void KMdiDocumentViewTabWidget::insertTab ( TQWidget * child, const TQIconSet & iconset, const TQString & label, int index ) @@ -62,7 +62,7 @@ void KMdiDocumentViewTabWidget::insertTab ( TQWidget * child, const TQIconSet & KTabWidget::insertTab( child, iconset, label, index ); showPage( child ); TQTimer::singleShot(0, this, TQT_SLOT(maybeShow())); - tabBar() ->tqrepaint(); + tabBar() ->repaint(); } void KMdiDocumentViewTabWidget::insertTab ( TQWidget * child, TQTab * tab, int index ) @@ -70,7 +70,7 @@ void KMdiDocumentViewTabWidget::insertTab ( TQWidget * child, TQTab * tab, int i KTabWidget::insertTab( child, tab, index ); showPage( child ); TQTimer::singleShot(0, this, TQT_SLOT(maybeShow())); - tabBar() ->tqrepaint(); + tabBar() ->repaint(); } void KMdiDocumentViewTabWidget::removePage ( TQWidget * w ) diff --git a/kmdi/kmdiguiclient.cpp b/kmdi/kmdiguiclient.cpp index b2d95e169..0057172d6 100644 --- a/kmdi/kmdiguiclient.cpp +++ b/kmdi/kmdiguiclient.cpp @@ -174,7 +174,7 @@ KMDIGUIClient::~KMDIGUIClient() // actionCollection()->writeShortcutSettings( "KMDI Shortcuts", kapp->config() ); for ( uint i = 0;i < m_toolViewActions.count();i++ ) - disconnect( m_toolViewActions.tqat( i ), 0, this, 0 ); + disconnect( m_toolViewActions.at( i ), 0, this, 0 ); m_toolViewActions.setAutoDelete( false ); m_toolViewActions.clear(); @@ -230,7 +230,7 @@ void KMDIGUIClient::setupActions() TQPtrList addList; if ( m_toolViewActions.count() < 3 ) for ( uint i = 0;i < m_toolViewActions.count();i++ ) - addList.append( m_toolViewActions.tqat( i ) ); + addList.append( m_toolViewActions.at( i ) ); else addList.append( m_toolMenu ); if ( m_mdiMode == KMdi::IDEAlMode ) diff --git a/kmdi/kmdimainfrm.cpp b/kmdi/kmdimainfrm.cpp index 09bd89eb7..57fa26e6c 100644 --- a/kmdi/kmdimainfrm.cpp +++ b/kmdi/kmdimainfrm.cpp @@ -2733,7 +2733,7 @@ void KMdiMainFrm::windowMenuItemActivated( int id ) if ( id < 100 ) return ; id -= 100; - KMdiChildView *pView = m_pDocumentViews->tqat( id ); + KMdiChildView *pView = m_pDocumentViews->at( id ); if ( !pView ) return ; if ( pView->isMinimized() ) @@ -2759,7 +2759,7 @@ void KMdiMainFrm::dockMenuItemActivated( int id ) if ( id < 100 ) return ; id -= 100; - KMdiChildView *pView = m_pDocumentViews->tqat( id ); + KMdiChildView *pView = m_pDocumentViews->at( id ); if ( !pView ) return ; if ( pView->isMinimized() ) diff --git a/kmdi/kmdimainfrm.h b/kmdi/kmdimainfrm.h index 5143c8c68..af2134a39 100644 --- a/kmdi/kmdimainfrm.h +++ b/kmdi/kmdimainfrm.h @@ -142,7 +142,7 @@ public: * use fakeSDIApplication() to fake it and isFakingSDIApplication() to query whether or not an SDI * interface is being faked. * - * You can dynamically change the tqshape of the attached MDI views using setFrameDecorOfAttachedViews(). + * You can dynamically change the shape of the attached MDI views using setFrameDecorOfAttachedViews(). * * Additionally, here's a hint how to restore the mainframe's settings from config file: * \code diff --git a/kmdi/test/hello.cpp b/kmdi/test/hello.cpp index e00a4d705..d92233ea6 100644 --- a/kmdi/test/hello.cpp +++ b/kmdi/test/hello.cpp @@ -36,7 +36,7 @@ Hello::Hello( const char *title, const char *text, TQWidget *parentWidget ) void Hello::animate() { b = (b + 1) & 15; - tqrepaint( false ); + repaint( false ); } diff --git a/knewstuff/downloaddialog.cpp b/knewstuff/downloaddialog.cpp index cda530e86..e8e2bfb3f 100644 --- a/knewstuff/downloaddialog.cpp +++ b/knewstuff/downloaddialog.cpp @@ -182,9 +182,9 @@ void DownloadDialog::clear() kdDebug() << "clear listviews in " << v << endl; if(v) { - (*(v->tqat(0)))->clear(); - (*(v->tqat(1)))->clear(); - (*(v->tqat(2)))->clear(); + (*(v->at(0)))->clear(); + (*(v->at(1)))->clear(); + (*(v->at(2)))->clear(); //delete (*it); } @@ -570,7 +570,7 @@ void DownloadDialog::install(Entry *e) if(currentEntryItem() == m_entryitem) { TQPushButton *in; - in = *(m_buttons[d->m_page]->tqat(0)); + in = *(m_buttons[d->m_page]->at(0)); if(in) in->setEnabled(false); } @@ -625,8 +625,8 @@ void DownloadDialog::slotTab() else { TQPushButton *de, *in; - in = *(m_buttons[d->m_page]->tqat(0)); - de = *(m_buttons[d->m_page]->tqat(1)); + in = *(m_buttons[d->m_page]->at(0)); + de = *(m_buttons[d->m_page]->at(1)); if(in) in->setEnabled(false); if(de) de->setEnabled(false); @@ -705,8 +705,8 @@ void DownloadDialog::slotSelected() else enabled = true; TQPushButton *de, *in; - in = *(m_buttons[d->m_page]->tqat(0)); - de = *(m_buttons[d->m_page]->tqat(1)); + in = *(m_buttons[d->m_page]->at(0)); + de = *(m_buttons[d->m_page]->at(1)); if(in) in->setEnabled(enabled); if(de) de->setEnabled(true); } @@ -747,9 +747,9 @@ void DownloadDialog::slotPage(TQWidget *w) d->m_page = w; - lv_r = *(m_map[w]->tqat(0)); - lv_d = *(m_map[w]->tqat(1)); - lv_l = *(m_map[w]->tqat(2)); + lv_r = *(m_map[w]->at(0)); + lv_d = *(m_map[w]->at(1)); + lv_l = *(m_map[w]->at(2)); p = m_providers[w]; m_rt = m_rts[w]; diff --git a/krandr/libkrandr.cc b/krandr/libkrandr.cc index 2920c70cd..b4f21e5fe 100644 --- a/krandr/libkrandr.cc +++ b/krandr/libkrandr.cc @@ -55,7 +55,7 @@ unsigned int reverse_bits(register unsigned int x) TQString exec(const char * cmd) { TQString bashcommand = cmd; bashcommand = bashcommand.replace("\"", "\\\""); - bashcommand = TQString("/bin/bash -c \"%1\" 2>&1").tqarg(bashcommand); + bashcommand = TQString("/bin/bash -c \"%1\" 2>&1").arg(bashcommand); FILE* pipe = popen(bashcommand.ascii(), "r"); if (!pipe) return "ERROR"; char buffer[128]; @@ -1071,11 +1071,11 @@ TQPtrList KRandrSimpleAPI::readCurrentDisplayConfiguration() { if (cur_screen) { screendata->screen_connected = true; for (int j = 0; j < cur_screen->numSizes(); j++) { - screendata->resolutions.append(i18n("%1 x %2").tqarg(cur_screen->pixelSize(j).width()).tqarg(cur_screen->pixelSize(j).height())); + screendata->resolutions.append(i18n("%1 x %2").arg(cur_screen->pixelSize(j).width()).arg(cur_screen->pixelSize(j).height())); } screendata->current_resolution_index = 0; if (current_crtc) { - screendata->current_resolution_index = screendata->resolutions.findIndex(i18n("%1 x %2").tqarg(current_crtc->info->width).tqarg(current_crtc->info->height)); + screendata->current_resolution_index = screendata->resolutions.findIndex(i18n("%1 x %2").arg(current_crtc->info->width).arg(current_crtc->info->height)); } if (screendata->current_resolution_index < 0) { screendata->current_resolution_index = cur_screen->proposedSize(); diff --git a/krandr/randr.cpp b/krandr/randr.cpp index 85f360f52..bd57fdc9f 100644 --- a/krandr/randr.cpp +++ b/krandr/randr.cpp @@ -691,7 +691,7 @@ const TQString& RandRDisplay::version() const void RandRDisplay::setCurrentScreen(int index) { m_currentScreenIndex = index; - m_currentScreen = m_screens.tqat(m_currentScreenIndex); + m_currentScreen = m_screens.at(m_currentScreenIndex); Q_ASSERT(m_currentScreen); } @@ -719,7 +719,7 @@ int RandRDisplay::numScreens() const RandRScreen* RandRDisplay::screen(int index) { - return m_screens.tqat(index); + return m_screens.at(index); } RandRScreen* RandRDisplay::currentScreen() diff --git a/kresources/selectdialog.cpp b/kresources/selectdialog.cpp index 5ae9bdcea..3eb8ad332 100644 --- a/kresources/selectdialog.cpp +++ b/kresources/selectdialog.cpp @@ -66,7 +66,7 @@ SelectDialog::SelectDialog( TQPtrList list, TQWidget *parent, // setup listbox uint counter = 0; for ( uint i = 0; i < list.count(); ++i ) { - Resource *resource = list.tqat( i ); + Resource *resource = list.at( i ); if ( resource && !resource->readOnly() ) { mResourceMap.insert( counter, resource ); mResourceId->insertItem( resource->resourceName() ); diff --git a/kspell2/ui/kspell2ui.ui b/kspell2/ui/kspell2ui.ui index 0bca38515..e221c69ba 100644 --- a/kspell2/ui/kspell2ui.ui +++ b/kspell2/ui/kspell2ui.ui @@ -87,7 +87,7 @@ ... the <b>misspelled</b> word shown in context ... - + WordBreak|AlignCenter diff --git a/kstyles/asteroid/asteroid.cpp b/kstyles/asteroid/asteroid.cpp index 8908d71fe..88ee6ad7e 100644 --- a/kstyles/asteroid/asteroid.cpp +++ b/kstyles/asteroid/asteroid.cpp @@ -977,7 +977,7 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce, bool lastTab = (tb->indexOf( t->identifier() ) == tb->count()-1) ? TRUE : FALSE; TQRect r2( r ); - if ( tb->tqshape() == TQTabBar::RoundedAbove ) { + if ( tb->shape() == TQTabBar::RoundedAbove ) { p->setPen( cg.light() ); p->drawLine( r2.left(), r2.bottom()-1, r2.right(), r2.bottom()-1 ); if ( r2.left() == 0 ) @@ -1015,7 +1015,7 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce, x2++; p->drawLine( x2, r2.top() + 2, x2, r2.bottom() - (selected ? (lastTab ? 0:1) :2)); - } else if ( tb->tqshape() == TQTabBar::RoundedBelow ) { + } else if ( tb->shape() == TQTabBar::RoundedBelow ) { bool rightAligned = styleHint( SH_TabBar_Alignment, tb ) == TQt::AlignRight; bool firstTab = tb->indexOf( t->identifier() ) == 0; if ( selected ) { @@ -1081,9 +1081,9 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce, tr.setBottom( tr.bottom() - pixelMetric( TQStyle::PM_DefaultFrameWidth, tb ) ); - int tqalignment = TQt::AlignCenter | TQt::ShowPrefix; + int alignment = TQt::AlignCenter | TQt::ShowPrefix; if (!styleHint(SH_UnderlineAccelerator, w, TQStyleOption::Default, 0)) - tqalignment |= TQt::NoAccel; + alignment |= TQt::NoAccel; tr.setWidth(tr.width()+4); // Compensate for text appearing too far to the left // TQRect tr_offset = TQRect(tr.x()+ETCH_X_OFFSET, tr.y()+ETCH_Y_OFFSET, tr.width(), tr.height()); TQRect tr_offset = TQRect(tr.x()+0, tr.y()+0, tr.width(), tr.height()); @@ -1098,7 +1098,7 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce, etchedcg.setColor( TQColorGroup::HighlightedText, cg.light() ); etchedcg.setColor( TQColorGroup::BrightText, cg.light() ); etchedcg.setColor( TQColorGroup::ButtonText, cg.light() ); - drawItem( p, tr_offset, tqalignment, etchedcg, enabled, 0, t->text() ); + drawItem( p, tr_offset, alignment, etchedcg, enabled, 0, t->text() ); p->setPen( cg.dark() ); etchedcg.setColor( TQColorGroup::Text, cg.dark() ); etchedcg.setColor( TQColorGroup::Mid, cg.dark() ); @@ -1107,11 +1107,11 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce, etchedcg.setColor( TQColorGroup::HighlightedText, cg.dark() ); etchedcg.setColor( TQColorGroup::BrightText, cg.dark() ); etchedcg.setColor( TQColorGroup::ButtonText, cg.dark() ); - drawItem( p, tr, tqalignment, etchedcg, enabled, 0, t->text() ); + drawItem( p, tr, alignment, etchedcg, enabled, 0, t->text() ); p->setPen(savePen); } else { - drawItem( p, tr, tqalignment, cg, enabled, 0, t->text() ); + drawItem( p, tr, alignment, cg, enabled, 0, t->text() ); } if ( (sf & Style_HasFocus) && !t->text().isEmpty() ) @@ -1128,9 +1128,9 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce, const bool enabled = sf & Style_Enabled; bool etchtext = styleHint( SH_EtchDisabledText ); - int tqalignment = TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft; + int alignment = TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft; if (!styleHint(SH_UnderlineAccelerator, w, TQStyleOption::Default, 0)) - tqalignment |= TQt::NoAccel; + alignment |= TQt::NoAccel; //TQRect r_offset = TQRect(r.x()+ETCH_X_OFFSET, r.y()+ETCH_Y_OFFSET, r.width(), r.height()); TQRect r_offset = TQRect(r.x()+0, r.y()+0, r.width(), r.height()); @@ -1145,7 +1145,7 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce, etchedcg.setColor( TQColorGroup::HighlightedText, cg.light() ); etchedcg.setColor( TQColorGroup::BrightText, cg.light() ); etchedcg.setColor( TQColorGroup::ButtonText, cg.light() ); - drawItem(p, r_offset, tqalignment | TQt::AlignVCenter | TQt::ShowPrefix, etchedcg, sf & Style_Enabled, checkbox->pixmap(), checkbox->text()); + drawItem(p, r_offset, alignment | TQt::AlignVCenter | TQt::ShowPrefix, etchedcg, sf & Style_Enabled, checkbox->pixmap(), checkbox->text()); p->setPen( cg.dark() ); etchedcg.setColor( TQColorGroup::Text, cg.dark() ); etchedcg.setColor( TQColorGroup::Mid, cg.dark() ); @@ -1154,11 +1154,11 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce, etchedcg.setColor( TQColorGroup::HighlightedText, cg.dark() ); etchedcg.setColor( TQColorGroup::BrightText, cg.dark() ); etchedcg.setColor( TQColorGroup::ButtonText, cg.dark() ); - drawItem(p, r, tqalignment | TQt::AlignVCenter | TQt::ShowPrefix, etchedcg, sf & Style_Enabled, checkbox->pixmap(), checkbox->text()); + drawItem(p, r, alignment | TQt::AlignVCenter | TQt::ShowPrefix, etchedcg, sf & Style_Enabled, checkbox->pixmap(), checkbox->text()); p->setPen(savePen); } else { - drawItem(p, r, tqalignment | TQt::AlignVCenter | TQt::ShowPrefix, cg, sf & Style_Enabled, checkbox->pixmap(), checkbox->text()); + drawItem(p, r, alignment | TQt::AlignVCenter | TQt::ShowPrefix, cg, sf & Style_Enabled, checkbox->pixmap(), checkbox->text()); } if (sf & Style_HasFocus) { @@ -1177,9 +1177,9 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce, const bool enabled = sf & Style_Enabled; bool etchtext = styleHint( SH_EtchDisabledText ); - int tqalignment = TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft; + int alignment = TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft; if (!styleHint(SH_UnderlineAccelerator, w, TQStyleOption::Default, 0)) - tqalignment |= TQt::NoAccel; + alignment |= TQt::NoAccel; // TQRect r_offset = TQRect(r.x()+ETCH_X_OFFSET, r.y()+ETCH_Y_OFFSET, r.width(), r.height()); TQRect r_offset = TQRect(r.x()+0, r.y()+0, r.width(), r.height()); @@ -1194,7 +1194,7 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce, etchedcg.setColor( TQColorGroup::HighlightedText, cg.light() ); etchedcg.setColor( TQColorGroup::BrightText, cg.light() ); etchedcg.setColor( TQColorGroup::ButtonText, cg.light() ); - drawItem(p, r_offset, tqalignment | TQt::AlignVCenter | TQt::ShowPrefix, etchedcg, enabled, radiobutton->pixmap(), radiobutton->text()); + drawItem(p, r_offset, alignment | TQt::AlignVCenter | TQt::ShowPrefix, etchedcg, enabled, radiobutton->pixmap(), radiobutton->text()); p->setPen( cg.dark() ); etchedcg.setColor( TQColorGroup::Text, cg.dark() ); etchedcg.setColor( TQColorGroup::Mid, cg.dark() ); @@ -1203,10 +1203,10 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce, etchedcg.setColor( TQColorGroup::HighlightedText, cg.dark() ); etchedcg.setColor( TQColorGroup::BrightText, cg.dark() ); etchedcg.setColor( TQColorGroup::ButtonText, cg.dark() ); - drawItem(p, r, tqalignment | TQt::AlignVCenter | TQt::ShowPrefix, etchedcg, enabled, radiobutton->pixmap(), radiobutton->text()); + drawItem(p, r, alignment | TQt::AlignVCenter | TQt::ShowPrefix, etchedcg, enabled, radiobutton->pixmap(), radiobutton->text()); p->setPen(savePen); } - drawItem(p, r, tqalignment | TQt::AlignVCenter | TQt::ShowPrefix, cg, enabled, radiobutton->pixmap(), radiobutton->text()); + drawItem(p, r, alignment | TQt::AlignVCenter | TQt::ShowPrefix, cg, enabled, radiobutton->pixmap(), radiobutton->text()); if (sf & Style_HasFocus) { TQRect fr = visualRect(subRect(SR_RadioButtonFocusRect, w), w); diff --git a/kstyles/highcolor/highcolor.cpp b/kstyles/highcolor/highcolor.cpp index a1eb876fc..b2ab9e493 100644 --- a/kstyles/highcolor/highcolor.cpp +++ b/kstyles/highcolor/highcolor.cpp @@ -1926,7 +1926,7 @@ TQSize HighColorStyle::tqsizeFromContents( ContentsType contents, } -// Fix Qt's wacky image tqalignment +// Fix Qt's wacky image alignment TQPixmap HighColorStyle::stylePixmap(StylePixmap stylepixmap, const TQWidget* widget, const TQStyleOption& opt) const @@ -1958,12 +1958,12 @@ bool HighColorStyle::eventFilter( TQObject *object, TQEvent *event ) if ( (event->type() == TQEvent::Enter) && (button->isEnabled()) ) { hoverWidget = button; - button->tqrepaint( false ); + button->repaint( false ); } else if ( (event->type() == TQEvent::Leave) && (TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(hoverWidget)) ) { hoverWidget = 0L; - button->tqrepaint( false ); + button->repaint( false ); } } else if ( object->parent() && !qstrcmp( object->name(), kdeToolbarWidget ) ) { diff --git a/kstyles/highcontrast/highcontrast.cpp b/kstyles/highcontrast/highcontrast.cpp index 984465a4e..e6c3be350 100644 --- a/kstyles/highcontrast/highcontrast.cpp +++ b/kstyles/highcontrast/highcontrast.cpp @@ -759,9 +759,9 @@ void HighContrastStyle::drawControl (TQ_ControlElement element, drawRoundRect (p, r); const TQTabBar *tb = static_cast< const TQTabBar * >(widget); - TQTabBar::Shape tqshape = tb->tqshape(); - if (tqshape == TQTabBar::TriangularBelow || - tqshape == TQTabBar::RoundedBelow) { + TQTabBar::Shape shape = tb->shape(); + if (shape == TQTabBar::TriangularBelow || + shape == TQTabBar::RoundedBelow) { p->fillRect (r.left(), r.top(), r.width(), 2*basicLineWidth, p->pen().color()); @@ -1811,7 +1811,7 @@ bool HighContrastStyle::eventFilter (TQObject *object, TQEvent *event) || widget->inherits (TQSPINWIDGET_OBJECT_NAME_STRING))) { hoverWidget = widget; - widget->tqrepaint (false); + widget->repaint (false); } else if (event->type() == TQEvent::Leave && (widget->inherits (TQBUTTON_OBJECT_NAME_STRING) @@ -1820,7 +1820,7 @@ bool HighContrastStyle::eventFilter (TQObject *object, TQEvent *event) { if (TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(hoverWidget)) hoverWidget = 0L; - widget->tqrepaint (false); + widget->repaint (false); } // Make sure the focus rectangle is shown correctly. else if (event->type() == TQEvent::FocusIn || event->type() == TQEvent::FocusOut) @@ -1834,9 +1834,9 @@ bool HighContrastStyle::eventFilter (TQObject *object, TQEvent *event) } if (widgetparent) - widgetparent->tqrepaint (false); + widgetparent->repaint (false); else - widget->tqrepaint (false); + widget->repaint (false); } } diff --git a/kstyles/keramik/keramik.cpp b/kstyles/keramik/keramik.cpp index 4efa09787..7bd3c7362 100644 --- a/kstyles/keramik/keramik.cpp +++ b/kstyles/keramik/keramik.cpp @@ -956,7 +956,7 @@ void KeramikStyle::tqdrawPrimitive( TQ_PrimitiveElement pe, if (kickerMode) { if (p->device() && p->device()->devType() == TQInternal::Widget && - TQCString(TQT_TQWIDGET(static_cast(p->tqdevice()))->className()) == "FittsLawFrame" ) + TQCString(TQT_TQWIDGET(static_cast(p->device()))->className()) == "FittsLawFrame" ) { int x2 = x + r.width() - 1; int y2 = y + r.height() - 1; @@ -1496,8 +1496,8 @@ void KeramikStyle::drawControl( TQ_ControlElement element, { const TQTabBar* tabBar = static_cast< const TQTabBar* >( widget ); - bool bottom = tabBar->tqshape() == TQTabBar::RoundedBelow || - tabBar->tqshape() == TQTabBar::TriangularBelow; + bool bottom = tabBar->shape() == TQTabBar::RoundedBelow || + tabBar->shape() == TQTabBar::TriangularBelow; if ( flags & Style_Selected ) { @@ -1999,7 +1999,7 @@ void KeramikStyle::drawComplexControl( TQ_ComplexControl control, //but that also alters height and not just width. //readjust height to fake the other metrics (plus clear //the other areas, as appropriate). The automasker - //will take care of the overall tqshape. + //will take care of the overall shape. if ( compact ) { forceSmallMode = true; @@ -2397,8 +2397,8 @@ int KeramikStyle::pixelMetric(PixelMetric m, const TQWidget *widget) const const TQTabBar* tb = ::tqqt_cast(widget); if (tb) { - if (tb->tqshape() == TQTabBar::RoundedBelow || - tb->tqshape() == TQTabBar::TriangularBelow) + if (tb->shape() == TQTabBar::RoundedBelow || + tb->shape() == TQTabBar::TriangularBelow) return 0; } @@ -2751,7 +2751,7 @@ bool KeramikStyle::eventFilter( TQObject* object, TQEvent* event ) { TQWidget* button = TQT_TQWIDGET(object); hoverWidget = 0; - button->tqrepaint( false ); + button->repaint( false ); return false; } @@ -2761,7 +2761,7 @@ bool KeramikStyle::eventFilter( TQObject* object, TQEvent* event ) if (event->type() == TQEvent::Enter && TQT_TQWIDGET(object)->isEnabled() ) { hoverWidget = TQT_TQWIDGET(object); - hoverWidget->tqrepaint( false ); + hoverWidget->repaint( false ); } return false; } @@ -2789,7 +2789,7 @@ bool KeramikStyle::eventFilter( TQObject* object, TQEvent* event ) switch (event->type()) { #ifdef HAVE_X11_EXTENSIONS_SHAPE_H - //Combo dropdowns are tqshaped + //Combo dropdowns are shaped case TQEvent::Resize: { TQListBox* listbox = static_cast(TQT_TQWIDGET(object)); diff --git a/kstyles/klegacy/klegacystyle.cpp b/kstyles/klegacy/klegacystyle.cpp index ae9ff1614..e2cc43dce 100644 --- a/kstyles/klegacy/klegacystyle.cpp +++ b/kstyles/klegacy/klegacystyle.cpp @@ -2954,8 +2954,8 @@ void KLegacyStyle::drawTab(TQPainter *p, const TQTabBar *tabbar, TQTab *tab, boo key.data.function = KLegacy::Extension; key.data.state = (! selected) ? KLegacy::Active : KLegacy::Normal; key.data.shadow = KLegacy::Out; - key.data.gapSide = (tabbar->tqshape() == TQTabBar::RoundedAbove || - tabbar->tqshape() == TQTabBar::TriangularAbove) ? + key.data.gapSide = (tabbar->shape() == TQTabBar::RoundedAbove || + tabbar->shape() == TQTabBar::TriangularAbove) ? KLegacy::Bottom : KLegacy::Top; int ry = tab->r.top(), rh = tab->r.height(); @@ -2963,8 +2963,8 @@ void KLegacyStyle::drawTab(TQPainter *p, const TQTabBar *tabbar, TQTab *tab, boo if (! selected) { rh -= 2; - if (tabbar->tqshape() == TQTabBar::RoundedAbove || - tabbar->tqshape() == TQTabBar::TriangularAbove) + if (tabbar->shape() == TQTabBar::RoundedAbove || + tabbar->shape() == TQTabBar::TriangularAbove) ry += 2; } @@ -3261,7 +3261,7 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) { obj->inherits(TQSLIDER_OBJECT_NAME_STRING) || obj->inherits(TQSCROLLBAR_OBJECT_NAME_STRING)) { priv->lastWidget = (TQWidget *) obj; - priv->lastWidget->tqrepaint(false); + priv->lastWidget->repaint(false); } else if (obj->inherits(TQRADIOBUTTON_OBJECT_NAME_STRING)) { TQWidget *w = (TQWidget *) obj; @@ -3327,7 +3327,7 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) { { if (obj == priv->lastWidget) { priv->lastWidget = 0; - ((TQWidget *) obj)->tqrepaint(false); + ((TQWidget *) obj)->repaint(false); } else if (obj->inherits(TQRADIOBUTTON_OBJECT_NAME_STRING) || obj->inherits(TQCHECKBOX_OBJECT_NAME_STRING)) { TQWidget *w = (TQWidget *) obj; @@ -3335,7 +3335,7 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) { if (! w->isTopLevel()) { w->setBackgroundMode(TQWidget::X11ParentRelative); w->setBackgroundOrigin(TQWidget::WidgetOrigin); - w->tqrepaint(true); + w->repaint(true); } } @@ -3349,7 +3349,7 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) { if (obj->inherits(TQSCROLLBAR_OBJECT_NAME_STRING) && (! (me->state() & (LeftButton | MidButton | RightButton)))) { priv->hovering = true; - ((TQWidget *) obj)->tqrepaint(false); + ((TQWidget *) obj)->repaint(false); priv->hovering = false; } diff --git a/kstyles/kthemestyle/kthemebase.cpp b/kstyles/kthemestyle/kthemebase.cpp index f6da05a41..193d9c6d7 100644 --- a/kstyles/kthemestyle/kthemebase.cpp +++ b/kstyles/kthemestyle/kthemebase.cpp @@ -70,7 +70,7 @@ static TQColor readColorEntry( TQSettings* s, const char *pKey, TQString aValue = s->readEntry( pKey ); if ( !aValue.isEmpty() ) { - if ( aValue.tqat( 0 ) == '#' ) + if ( aValue.at( 0 ) == '#' ) { aRetColor.setNamedColor( aValue ); } diff --git a/kstyles/kthemestyle/kthemestyle.cpp b/kstyles/kthemestyle/kthemestyle.cpp index d34d6cd18..aaa3c0530 100644 --- a/kstyles/kthemestyle/kthemestyle.cpp +++ b/kstyles/kthemestyle/kthemestyle.cpp @@ -650,7 +650,7 @@ void KThemeStyle::drawBaseButton( TQPainter *p, int x, int y, int w, int h, if ( gradientHint( type ) == GrReverseBevel ) { int i; - bitBlt( p->tqdevice(), x, y, TQT_TQPAINTDEVICE(scalePixmap( w, h, type )), 0, 0, w, h, + bitBlt( p->device(), x, y, TQT_TQPAINTDEVICE(scalePixmap( w, h, type )), 0, 0, w, h, TQt::CopyROP, true ); p->setPen( g.text() ); for ( i = 0; i < borderWidth( type ); ++i, ++x, ++y, w -= 2, h -= 2 ) @@ -690,7 +690,7 @@ void KThemeStyle::drawBaseButton( TQPainter *p, int x, int y, int w, int h, } if ( borderPixmap( type ) ) { - bitBlt( p->tqdevice(), x, y, TQT_TQPAINTDEVICE(scaleBorder( w, h, type )), 0, 0, w, h, + bitBlt( p->device(), x, y, TQT_TQPAINTDEVICE(scaleBorder( w, h, type )), 0, 0, w, h, TQt::CopyROP, false ); } else @@ -1239,7 +1239,7 @@ void KThemeStyle::drawControl( ControlElement element, case CE_TabBarTab: { const TQTabBar* tb = ( const TQTabBar* ) widget; - TQTabBar::Shape tbs = tb->tqshape(); + TQTabBar::Shape tbs = tb->shape(); bool selected = how & Style_Selected; WidgetType widget = selected ? ActiveTab : InactiveTab; const TQColorGroup *cg = colorGroup( tb->colorGroup(), widget ); @@ -1315,8 +1315,8 @@ void KThemeStyle::drawControl( ControlElement element, else p->fillRect( x, y, x2 - x + 1, y2 - y + 1, cg->background() ); } - else if ( tb->tqshape() == TQTabBar::RoundedBelow || - tb->tqshape() == TQTabBar::TriangularBelow ) + else if ( tb->shape() == TQTabBar::RoundedBelow || + tb->shape() == TQTabBar::TriangularBelow ) { if ( widget == ActiveTab ) widget = RotActiveTab; diff --git a/kstyles/kthemestyle/kthemestyle.h b/kstyles/kthemestyle/kthemestyle.h index 0b7a220f1..6c2c0e332 100644 --- a/kstyles/kthemestyle/kthemestyle.h +++ b/kstyles/kthemestyle/kthemestyle.h @@ -192,7 +192,7 @@ public: * @param w The rectangle width. * @param h The rectangle height. * @param sunken Draws a sunken style if @p true. - * @param rounded Draws a rounded tqshape if @p true. Requires bWidth to be + * @param rounded Draws a rounded shape if @p true. Requires bWidth to be * at least 1. * @param hWidth The highlight width. * @param bWidth The border width. diff --git a/kstyles/light/lightstyle-v2.cpp b/kstyles/light/lightstyle-v2.cpp index 3601fbb68..a55e2edad 100644 --- a/kstyles/light/lightstyle-v2.cpp +++ b/kstyles/light/lightstyle-v2.cpp @@ -635,7 +635,7 @@ void LightStyleV2::drawControl( TQ_ControlElement control, tr.addCoords(0, 0, 0, -1); fr.addCoords(2, 2, -2, -2); - if ( tb->tqshape() == TQTabBar::RoundedBelow || tb->tqshape() == TQTabBar::TriangularBelow) { + if ( tb->shape() == TQTabBar::RoundedBelow || tb->shape() == TQTabBar::TriangularBelow) { tr = r; tr.addCoords(0, 1, 0, 0); fr = r; fr.addCoords(2, 2,-2, -4); below = true; diff --git a/kstyles/light/lightstyle-v3.cpp b/kstyles/light/lightstyle-v3.cpp index 7b5a8135e..a31dba078 100644 --- a/kstyles/light/lightstyle-v3.cpp +++ b/kstyles/light/lightstyle-v3.cpp @@ -818,7 +818,7 @@ void LightStyleV3::drawControl( TQ_ControlElement control, const TQTabBar *tb = (const TQTabBar *) widget; TQRect br = r; - if ( tb->tqshape() == TQTabBar::RoundedAbove ) { + if ( tb->shape() == TQTabBar::RoundedAbove ) { if ( ! ( flags & Style_Selected ) ) { p->setPen( cg.background() ); p->drawLine( br.left(), br.bottom(), @@ -853,7 +853,7 @@ void LightStyleV3::drawControl( TQ_ControlElement control, else br.addCoords( 1, 1, -1, 0 ); p->fillRect( br, cg.background() ); - } else if ( tb->tqshape() == TQTabBar::RoundedBelow ) { + } else if ( tb->shape() == TQTabBar::RoundedBelow ) { if ( ! ( flags & Style_Selected ) ) { p->setPen( cg.background() ); p->drawLine( br.left(), br.top(), diff --git a/kstyles/plastik/plastik.cpp b/kstyles/plastik/plastik.cpp index c41400390..609ec91b2 100644 --- a/kstyles/plastik/plastik.cpp +++ b/kstyles/plastik/plastik.cpp @@ -885,8 +885,8 @@ void PlastikStyle::renderPanel(TQPainter *p, r.coords(&x, &y, &x2, &y2); if (kickerMode && - p->tqdevice() && p->tqdevice()->devType() == TQInternal::Widget && - TQCString(TQT_TQWIDGET(static_cast(p->tqdevice()))->className()) == "FittsLawFrame") { + p->device() && p->device()->devType() == TQInternal::Widget && + TQCString(TQT_TQWIDGET(static_cast(p->device()))->className()) == "FittsLawFrame") { // Stolen wholesale from Keramik. I don't like it, but oh well. if (sunken) { const TQCOORD corners[] = { x2, y, x2, y2, x, y2, x, y }; @@ -1483,7 +1483,7 @@ void PlastikStyle::tqdrawPrimitive(TQ_PrimitiveElement pe, if(!kickerMode) { // detect if this is the left most header item bool isFirst = false; - TQHeader *header = dynamic_cast(p->tqdevice() ); + TQHeader *header = dynamic_cast(p->device() ); if (header) { isFirst = header->mapToIndex(header->sectionAt(r.x() ) ) == 0; } @@ -1819,7 +1819,7 @@ void PlastikStyle::tqdrawPrimitive(TQ_PrimitiveElement pe, // -------------- case PE_Splitter: { // highlight on mouse over - TQColor color = (static_cast(static_cast(hoverWidget)) == static_cast(p->tqdevice()))?TQColor(cg.background().light(100+_contrast)):cg.background(); + TQColor color = (static_cast(static_cast(hoverWidget)) == static_cast(p->device()))?TQColor(cg.background().light(100+_contrast)):cg.background(); p->fillRect(r, color); if (w > h) { if (h > 4) { @@ -1862,9 +1862,9 @@ void PlastikStyle::tqdrawPrimitive(TQ_PrimitiveElement pe, bool isEnabled = true; // panel is highlighted by default if it has focus, but if we have access to the // widget itself we can try to avoid highlighting in case it's readOnly or disabled. - if (p->tqdevice() && dynamic_cast(p->tqdevice())) + if (p->device() && dynamic_cast(p->device())) { - TQLineEdit* lineEdit = dynamic_cast(p->tqdevice()); + TQLineEdit* lineEdit = dynamic_cast(p->device()); isReadOnly = lineEdit->isReadOnly(); isEnabled = lineEdit->isEnabled(); } @@ -1881,7 +1881,7 @@ void PlastikStyle::tqdrawPrimitive(TQ_PrimitiveElement pe, // only thing we know is that khtml buffers its widgets into a pixmap. So // when the paint device is a TQPixmap, chances are high that we are in khtml. // It's possible that this breaks other things, so let's see how it works... - if (p->tqdevice() && dynamic_cast(p->tqdevice() ) ) { + if (p->device() && dynamic_cast(p->device() ) ) { contourFlags += Draw_AlphaBlend; } @@ -1942,7 +1942,7 @@ void PlastikStyle::tqdrawPrimitive(TQ_PrimitiveElement pe, case PE_PanelMenuBar: case PE_PanelDockWindow: { // fix for toolbar lag (from Mosfet Liquid) - TQWidget* w = dynamic_cast(p->tqdevice()); + TQWidget* w = dynamic_cast(p->device()); if(w && w->backgroundMode() == PaletteButton) w->setBackgroundMode(PaletteBackground); p->fillRect(r, cg.brush(TQColorGroup::Background)); @@ -2301,7 +2301,7 @@ void PlastikStyle::drawControl(TQ_ControlElement element, if(cw) cornerWidget = true; } - TQTabBar::Shape tbs = tb->tqshape(); + TQTabBar::Shape tbs = tb->shape(); bool selected = false; if (flags & Style_Selected) selected = true; TabPosition pos; @@ -3253,8 +3253,8 @@ int PlastikStyle::pixelMetric(PixelMetric m, const TQWidget *widget) const // ---- case PM_TabBarTabVSpace: { const TQTabBar * tb = (const TQTabBar *) widget; - if (tb->tqshape() == TQTabBar::RoundedAbove || - tb->tqshape() == TQTabBar::RoundedBelow) + if (tb->shape() == TQTabBar::RoundedAbove || + tb->shape() == TQTabBar::RoundedBelow) return 12; else return 4; @@ -3464,14 +3464,14 @@ bool PlastikStyle::eventFilter(TQObject *obj, TQEvent *ev) TQWidget* spinbox = widget->parentWidget(); if ((ev->type() == TQEvent::FocusIn) || (ev->type() == TQEvent::FocusOut)) { - spinbox->tqrepaint(false); + spinbox->repaint(false); } return false; } if ((ev->type() == TQEvent::FocusIn) || (ev->type() == TQEvent::FocusOut)) { - widget->tqrepaint(false); + widget->repaint(false); } return false; } @@ -3485,13 +3485,13 @@ bool PlastikStyle::eventFilter(TQObject *obj, TQEvent *ev) { TQWidget* button = TQT_TQWIDGET(obj); hoverWidget = button; - button->tqrepaint(false); + button->repaint(false); } else if ((ev->type() == TQEvent::Leave) && (TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(hoverWidget)) ) { TQWidget* button = TQT_TQWIDGET(obj); hoverWidget = 0; - button->tqrepaint(false); + button->repaint(false); } return false; } @@ -3501,7 +3501,7 @@ bool PlastikStyle::eventFilter(TQObject *obj, TQEvent *ev) TQWidget* tabbar = TQT_TQWIDGET(obj); hoverWidget = tabbar; hoverTab = 0; - tabbar->tqrepaint(false); + tabbar->repaint(false); } else if (ev->type() == TQEvent::MouseMove) { @@ -3512,15 +3512,15 @@ bool PlastikStyle::eventFilter(TQObject *obj, TQEvent *ev) // avoid unnecessary repaints (which otherwise would occour on every // MouseMove event causing high cpu load). - bool tqrepaint = true; + bool repaint = true; TQTab *tab = tabbar->selectTab(me->pos() ); if (hoverTab == tab) - tqrepaint = false; + repaint = false; hoverTab = tab; - if (tqrepaint) - tabbar->tqrepaint(false); + if (repaint) + tabbar->repaint(false); } } else if (ev->type() == TQEvent::Leave) @@ -3528,7 +3528,7 @@ bool PlastikStyle::eventFilter(TQObject *obj, TQEvent *ev) TQWidget* tabbar = TQT_TQWIDGET(obj); hoverWidget = 0; hoverTab = 0; - tabbar->tqrepaint(false); + tabbar->repaint(false); } return false; } diff --git a/kstyles/web/webstyle.cpp b/kstyles/web/webstyle.cpp index b9eff2f7b..ab5282e06 100644 --- a/kstyles/web/webstyle.cpp +++ b/kstyles/web/webstyle.cpp @@ -303,12 +303,12 @@ WebStyle::eventFilter(TQObject * o, TQEvent * e) if (e->type() == TQEvent::Enter) { _highlightedButton = pb; - pb->tqrepaint(false); + pb->repaint(false); } else if (e->type() == TQEvent::Leave) { _highlightedButton = 0; - pb->tqrepaint(false); + pb->repaint(false); } return false; @@ -754,7 +754,7 @@ WebStyle::drawExclusiveIndicator p->setBrush(g.brush(TQColorGroup::Background)); - // Avoid mistqshapen ellipses. Qt or X bug ? Who knows... + // Avoid misshapen ellipses. Qt or X bug ? Who knows... if (0 == w % 2) --w; @@ -1457,7 +1457,7 @@ WebStyle::drawTab p->setPen(selected ? g.dark() : g.mid()); p->fillRect(r, g.brush(TQColorGroup::Background)); - switch (tabBar->tqshape()) + switch (tabBar->shape()) { case TQTabBar::RoundedAbove: case TQTabBar::TriangularAbove: diff --git a/kutils/kcmoduleproxy.cpp b/kutils/kcmoduleproxy.cpp index ac51acb40..877dacb2a 100644 --- a/kutils/kcmoduleproxy.cpp +++ b/kutils/kcmoduleproxy.cpp @@ -416,7 +416,7 @@ void KCModuleProxy::rootExited() /* Such that the "ordinary" module loads again */ d->rootMode = false; - d->topLayout->tqinvalidate(); + d->topLayout->invalidate(); TQShowEvent ev; showEvent( &ev ); diff --git a/kutils/kmultitabbar.cpp b/kutils/kmultitabbar.cpp index ffd237846..92d37de6a 100644 --- a/kutils/kmultitabbar.cpp +++ b/kutils/kmultitabbar.cpp @@ -82,7 +82,7 @@ void KMultiTabBarInternal::setStyle(enum KMultiTabBar::KMultiTabBarStyle style) { m_style=style; for (uint i=0;isetStyle(m_style); + m_tabs.at(i)->setStyle(m_style); if ( (m_style==KMultiTabBar::KDEV3) || (m_style==KMultiTabBar::KDEV3ICON ) ) { @@ -106,11 +106,11 @@ void KMultiTabBarInternal::setStyle(enum KMultiTabBar::KMultiTabBarStyle style) } addChild(box); for (uint i=0;iadd(m_tabs.tqat(i)); + mainLayout->add(m_tabs.at(i)); mainLayout->setAutoAdd(true); } - viewport()->tqrepaint(); + viewport()->repaint(); } void KMultiTabBarInternal::drawContents ( TQPainter * paint, int clipx, int clipy, int clipw, int cliph ) @@ -175,7 +175,7 @@ void KMultiTabBarInternal::mousePressEvent(TQMouseEvent *ev) uint ulen=0;\ diff=0; \ for (uint i2=i;i2neededSize();\ + uint l1=m_tabs.at(i2)->neededSize();\ if ((ulen+l1)>space){\ if (ulen==0) diff=0;\ else diff=((float)(space-ulen))/(i2-i);\ @@ -208,7 +208,7 @@ void KMultiTabBarInternal::resizeEvent(TQResizeEvent *ev) { const uint tabCount=m_tabs.count(); for (uint i=0;ineededSize(); + tmp+=m_tabs.at(i)->neededSize(); if (tmp>space) { if (cnt>1)i--; else if (i==(tabCount-1)) break; @@ -232,7 +232,7 @@ void KMultiTabBarInternal::resizeEvent(TQResizeEvent *ev) { //kdDebug()<<"m_lines recalculated="<neededSize()+diff; if (tmp>space) { @@ -258,7 +258,7 @@ void KMultiTabBarInternal::resizeEvent(TQResizeEvent *ev) { //kdDebug()<<"starting new line:"<neededSize()<<"/"<neededSize()<<"/"<(encrypted.tqat(sz - 20 + i))) { + if (testhash[i] != static_cast(encrypted.at(sz - 20 + i))) { encrypted.fill(0); sha.reset(); return -8; // hash error. diff --git a/kwallet/backend/kwalletbackend.h b/kwallet/backend/kwalletbackend.h index 59df303d6..f43f56ec8 100644 --- a/kwallet/backend/kwalletbackend.h +++ b/kwallet/backend/kwalletbackend.h @@ -143,7 +143,7 @@ class MD5Digest : public TQByteArray { char x, y; for (; i < 16; ++i) { x = at(i); - y = const_cast(r).tqat(i); + y = const_cast(r).at(i); if (x != y) { break; } diff --git a/tdecore/kallocator.cpp b/tdecore/kallocator.cpp index 16c1b3625..c02bbf3ff 100644 --- a/tdecore/kallocator.cpp +++ b/tdecore/kallocator.cpp @@ -183,9 +183,9 @@ void KZoneAllocator::delBlock(MemBlock *b) void * KZoneAllocator::allocate(size_t _size) { - // Use the size of (void *) as tqalignment - const size_t tqalignment = sizeof(void *) - 1; - _size = (_size + tqalignment) & ~tqalignment; + // Use the size of (void *) as alignment + const size_t alignment = sizeof(void *) - 1; + _size = (_size + alignment) & ~alignment; if ((unsigned long) _size + blockOffset > blockSize) { diff --git a/tdecore/kcalendarsystem.cpp b/tdecore/kcalendarsystem.cpp index 782b272e7..57898da84 100644 --- a/tdecore/kcalendarsystem.cpp +++ b/tdecore/kcalendarsystem.cpp @@ -90,10 +90,10 @@ static int stringToInteger(const TQString & sNum, int & iLength) unsigned int iPos = 0; int result = 0; - for (; sNum.length() > iPos && sNum.tqat(iPos).isDigit(); iPos++) + for (; sNum.length() > iPos && sNum.at(iPos).isDigit(); iPos++) { result *= 10; - result += sNum.tqat(iPos).digitValue(); + result += sNum.at(iPos).digitValue(); } iLength = iPos; diff --git a/tdecore/kclipboard.cpp b/tdecore/kclipboard.cpp index b6b4fc357..f3c5b2840 100644 --- a/tdecore/kclipboard.cpp +++ b/tdecore/kclipboard.cpp @@ -67,7 +67,7 @@ public: virtual const char *format( int i ) const { if ( i < (int) m_formats.count() ) - return m_formats.tqat( i ); + return m_formats.at( i ); else return 0L; } @@ -78,7 +78,7 @@ public: { int index = m_formats.find( format ); if ( index > -1 ) - return *(m_data.tqat( index )); + return *(m_data.at( index )); return TQByteArray(); } diff --git a/tdecore/kcmdlineargs.cpp b/tdecore/kcmdlineargs.cpp index a3a941494..0e1dc7ea9 100644 --- a/tdecore/kcmdlineargs.cpp +++ b/tdecore/kcmdlineargs.cpp @@ -1239,7 +1239,7 @@ KCmdLineArgs::arg(int n) const exit(255); } - return parsedArgList->tqat(n); + return parsedArgList->at(n); } KURL diff --git a/tdecore/kcompletion.cpp b/tdecore/kcompletion.cpp index 784ad017b..84a4cfca2 100644 --- a/tdecore/kcompletion.cpp +++ b/tdecore/kcompletion.cpp @@ -127,7 +127,7 @@ void KCompletion::addItem( const TQString& item, uint weight ) // nodes. for ( uint i = 0; i < len; i++ ) { - node = node->insert( item.tqat(i), sorted ); + node = node->insert( item.at(i), sorted ); if ( weighted ) node->confirm( weight -1 ); // node->insert() sets weighting to 1 } @@ -419,7 +419,7 @@ TQString KCompletion::findCompletion( const TQString& string ) // start at the tree-root and try to find the search-string for( uint i = 0; i < string.length(); i++ ) { - ch = string.tqat( i ); + ch = string.at( i ); node = node->find( ch ); if ( node ) @@ -508,7 +508,7 @@ void KCompletion::findAllCompletions(const TQString& string, // start at the tree-root and try to find the search-string for( uint i = 0; i < string.length(); i++ ) { - ch = string.tqat( i ); + ch = string.at( i ); node = node->find( ch ); if ( node ) @@ -595,7 +595,7 @@ void KCompletion::extractStringsFromNodeCI( const KCompTreeNode *node, return; } - TQChar ch1 = restString.tqat(0); + TQChar ch1 = restString.at(0); TQString newRest = restString.mid(1); KCompTreeNode *child1, *child2; @@ -725,7 +725,7 @@ void KCompTreeNode::remove( const TQString& str ) uint i = 0; for ( ; i < string.length(); i++ ) { - child = parent->find( string.tqat( i ) ); + child = parent->find( string.at( i ) ); if ( child ) deletables.insert( i + 1, child ); else @@ -736,8 +736,8 @@ void KCompTreeNode::remove( const TQString& str ) for ( ; i >= 1; i-- ) { - parent = deletables.tqat( i - 1 ); - child = deletables.tqat( i ); + parent = deletables.at( i - 1 ); + child = deletables.at( i ); if ( child->myChildren.count() == 0 ) delete parent->myChildren.remove( child ); } @@ -874,7 +874,7 @@ KCompTreeNode *KCompTreeNodeList::remove(KCompTreeNode *item) return item; } -KCompTreeNode *KCompTreeNodeList::tqat(uint index) const +KCompTreeNode *KCompTreeNodeList::at(uint index) const { KCompTreeNode *cur = first; while (index-- && cur) cur = cur->next; diff --git a/tdecore/kcompletion_private.h b/tdecore/kcompletion_private.h index bd199bdfd..3d72586f3 100644 --- a/tdecore/kcompletion_private.h +++ b/tdecore/kcompletion_private.h @@ -38,7 +38,7 @@ public: KCompTreeNode *begin() const { return first; } KCompTreeNode *end() const { return last; } - KCompTreeNode *tqat(uint index) const; + KCompTreeNode *at(uint index) const; void append(KCompTreeNode *item); void prepend(KCompTreeNode *item); void insert(KCompTreeNode *after, KCompTreeNode *item); @@ -119,7 +119,7 @@ public: return &myChildren; } inline const KCompTreeNode * childAt(int index) const { - return myChildren.tqat(index); + return myChildren.at(index); } inline const KCompTreeNode * firstChild() const { return myChildren.begin(); diff --git a/tdecore/kconfigbackend.cpp b/tdecore/kconfigbackend.cpp index 85e44ebaa..fe4dfda8e 100644 --- a/tdecore/kconfigbackend.cpp +++ b/tdecore/kconfigbackend.cpp @@ -496,7 +496,7 @@ qWarning("SIGBUS while reading %s", rFile.name().latin1()); else #endif { - rFile.tqat(0); + rFile.at(0); data = rFile.readAll(); s = data.data(); eof = s + data.size(); diff --git a/tdecore/kconfigbase.cpp b/tdecore/kconfigbase.cpp index 0b3e05b35..9ad660037 100644 --- a/tdecore/kconfigbase.cpp +++ b/tdecore/kconfigbase.cpp @@ -969,7 +969,7 @@ TQColor KConfigBase::readColorEntry( const char *pKey, TQString aValue = readEntry( pKey ); if( !aValue.isEmpty() ) { - if ( aValue.tqat(0) == (QChar)'#' ) + if ( aValue.at(0) == (QChar)'#' ) { aRetColor.setNamedColor(aValue); } @@ -1040,10 +1040,10 @@ TQDateTime KConfigBase::readDateTimeEntry( const char *pKey, TQStrList list; int count = readListEntry( pKey, list, ',' ); if( count == 6 ) { - TQDate date( atoi( list.tqat( 0 ) ), atoi( list.tqat( 1 ) ), - atoi( list.tqat( 2 ) ) ); - TQTime time( atoi( list.tqat( 3 ) ), atoi( list.tqat( 4 ) ), - atoi( list.tqat( 5 ) ) ); + TQDate date( atoi( list.at( 0 ) ), atoi( list.at( 1 ) ), + atoi( list.at( 2 ) ) ); + TQTime time( atoi( list.at( 3 ) ), atoi( list.at( 4 ) ), + atoi( list.at( 5 ) ) ); return TQDateTime( date, time ); } @@ -1424,7 +1424,7 @@ void KConfigBase::writeEntry ( const char *pKey, const TQStrList &list, } str_list += sep; } - if( str_list.tqat(str_list.length() - 1) == (QChar)sep ) + if( str_list.at(str_list.length() - 1) == (QChar)sep ) str_list.truncate( str_list.length() -1 ); writeEntry( pKey, str_list, bPersistent, bGlobal, bNLS ); } @@ -1468,7 +1468,7 @@ void KConfigBase::writeEntry ( const char *pKey, const TQStringList &list, } str_list += sep; } - if( str_list.tqat(str_list.length() - 1) == (QChar)sep ) + if( str_list.at(str_list.length() - 1) == (QChar)sep ) str_list.truncate( str_list.length() -1 ); writeEntry( pKey, str_list, bPersistent, bGlobal, bNLS, bExpand ); } diff --git a/tdecore/kde-config.cpp.cmake b/tdecore/kde-config.cpp.cmake index 3a042705d..8b3dd7afd 100644 --- a/tdecore/kde-config.cpp.cmake +++ b/tdecore/kde-config.cpp.cmake @@ -201,7 +201,7 @@ int main(int argc, char **argv) if (helptexts[index]) { printf("%s - %s\n", helptexts[index], i18n(helptexts[index+1]).local8Bit().data()); } else { - printf("%s", i18n("%1 - unknown type\n").tqarg(*it).local8Bit().data()); + printf("%s", i18n("%1 - unknown type\n").arg(*it).local8Bit().data()); } } return 0; @@ -226,7 +226,7 @@ int main(int argc, char **argv) else if ( type == "document" ) printResult(KGlobalSettings::documentPath()); else - fprintf(stderr, "%s", i18n("%1 - unknown type of userpath\n").tqarg(type).local8Bit().data() ); + fprintf(stderr, "%s", i18n("%1 - unknown type of userpath\n").arg(type).local8Bit().data() ); return 0; } diff --git a/tdecore/kdebug.cpp b/tdecore/kdebug.cpp index 2914881db..44a45245c 100644 --- a/tdecore/kdebug.cpp +++ b/tdecore/kdebug.cpp @@ -415,7 +415,7 @@ kdbgstream& kdbgstream::operator << (const TQWidget* widget) return *this; } output += string; - if (output.tqat(output.length() -1 ) == (QChar)'\n') + if (output.at(output.length() -1 ) == (QChar)'\n') { flush(); } @@ -454,7 +454,7 @@ kdbgstream& kdbgstream::operator<<( const TQRect& r ) { kdbgstream& kdbgstream::operator<<( const TQRegion& reg ) { *this<< "[ "; - TQMemArrayrs=reg.tqrects(); + TQMemArrayrs=reg.rects(); for (uint i=0;isyserror = syserror; } diff --git a/tdecore/kglobalaccel_x11.cpp b/tdecore/kglobalaccel_x11.cpp index ae1360391..ce248ae02 100644 --- a/tdecore/kglobalaccel_x11.cpp +++ b/tdecore/kglobalaccel_x11.cpp @@ -287,7 +287,7 @@ void KGlobalAccelPrivate::fakeKeyPressed(unsigned int keyCode) { for( CodeModMap::ConstIterator it = m_rgCodeModToAction.begin(); it != m_rgCodeModToAction.end(); ++it ) { KAccelAction* pAction = *it; kdDebug(125) << "\tcode: " << TQString::number(it.key().code, 16) << " mod: " << TQString::number(it.key().mod, 16) - << (pAction ? TQString(" name: \"%1\" shortcut: %2").tqarg(pAction->name()).tqarg(pAction->shortcut().toStringInternal()) : TQString()) + << (pAction ? TQString(" name: \"%1\" shortcut: %2").arg(pAction->name()).arg(pAction->shortcut().toStringInternal()) : TQString()) << endl; } #endif @@ -365,7 +365,7 @@ bool KGlobalAccelPrivate::x11KeyPress( const XEvent *pEvent ) for( CodeModMap::ConstIterator it = m_rgCodeModToAction.begin(); it != m_rgCodeModToAction.end(); ++it ) { KAccelAction* pAction = *it; kdDebug(125) << "\tcode: " << TQString::number(it.key().code, 16) << " mod: " << TQString::number(it.key().mod, 16) - << (pAction ? TQString(" name: \"%1\" shortcut: %2").tqarg(pAction->name()).tqarg(pAction->shortcut().toStringInternal()) : TQString()) + << (pAction ? TQString(" name: \"%1\" shortcut: %2").arg(pAction->name()).arg(pAction->shortcut().toStringInternal()) : TQString()) << endl; } #endif diff --git a/tdecore/kglobalsettings.cpp b/tdecore/kglobalsettings.cpp index d539f56c9..d257097bf 100644 --- a/tdecore/kglobalsettings.cpp +++ b/tdecore/kglobalsettings.cpp @@ -451,7 +451,7 @@ TQFont KGlobalSettings::taskbarFont() TQFont KGlobalSettings::largeFont(const TQString &text) { TQFontDatabase db; - TQStringList fam = db.tqfamilies(); + TQStringList fam = db.families(); // Move a bunch of preferred fonts to the front. if (fam.remove("Arial")) diff --git a/tdecore/kiconeffect.cpp b/tdecore/kiconeffect.cpp index d866fa0d2..c8d088918 100644 --- a/tdecore/kiconeffect.cpp +++ b/tdecore/kiconeffect.cpp @@ -742,7 +742,7 @@ KIconEffect::visualActivate(TQWidget * widget, TQRect rect) TQPainter p(widget); - // Use NotROP to avoid having to tqrepaint the pixmap each time. + // Use NotROP to avoid having to repaint the pixmap each time. p.setPen(TQPen(Qt::black, 2, Qt::DotLine)); p.setRasterOp(TQt::NotROP); diff --git a/tdecore/klocale.cpp b/tdecore/klocale.cpp index d47de5a03..f0e3b1f21 100644 --- a/tdecore/klocale.cpp +++ b/tdecore/klocale.cpp @@ -1103,7 +1103,7 @@ KLocale::SignPosition KLocale::negativeMonetarySignPosition() const static inline void put_it_in( TQChar *buffer, uint& index, const TQString &s ) { for ( uint l = 0; l < s.length(); l++ ) - buffer[index++] = s.tqat( l ); + buffer[index++] = s.at( l ); } static inline void put_it_in( TQChar *buffer, uint& index, int number ) @@ -1352,14 +1352,14 @@ TQString KLocale::formatDate(const TQDate &pDate, bool shortFormat) const { if ( !escape ) { - if ( (TQChar(rst.tqat( format_index )).tqunicode()) == '%' ) + if ( (TQChar(rst.at( format_index )).tqunicode()) == '%' ) escape = true; else - buffer.append(rst.tqat(format_index)); + buffer.append(rst.at(format_index)); } else { - switch ( TQChar(rst.tqat( format_index )).tqunicode() ) + switch ( TQChar(rst.at( format_index )).tqunicode() ) { case '%': buffer.append('%'); @@ -1401,7 +1401,7 @@ TQString KLocale::formatDate(const TQDate &pDate, bool shortFormat) const buffer.append(calendar()->weekDayName(pDate, false)); break; default: - buffer.append(rst.tqat(format_index)); + buffer.append(rst.at(format_index)); break; } escape = false; @@ -1583,12 +1583,12 @@ double KLocale::readMoney(const TQString &_str, bool * ok) const */ static int readInt(const TQString &str, uint &pos) { - if (!str.tqat(pos).isDigit()) return -1; + if (!str.at(pos).isDigit()) return -1; int result = 0; - for (; str.length() > pos && str.tqat(pos).isDigit(); pos++) + for (; str.length() > pos && str.at(pos).isDigit(); pos++) { result *= 10; - result += str.tqat(pos).digitValue(); + result += str.at(pos).digitValue(); } return result; @@ -1625,22 +1625,22 @@ TQDate KLocale::readDate(const TQString &intstr, const TQString &fmt, bool* ok) while (fmt.length() > fmtpos && str.length() > strpos && !error) { - TQChar c = fmt.tqat(fmtpos++); + TQChar c = fmt.at(fmtpos++); if (c != (QChar)'%') { - if (c.isSpace() && str.tqat(strpos).isSpace()) + if (c.isSpace() && str.at(strpos).isSpace()) strpos++; - else if (c != str.tqat(strpos++)) + else if (c != str.at(strpos++)) error = true; } else { int j; // remove space at the beginning - if (str.length() > strpos && str.tqat(strpos).isSpace()) + if (str.length() > strpos && str.at(strpos).isSpace()) strpos++; - c = fmt.tqat(fmtpos++); + c = fmt.at(fmtpos++); switch (c) { case 'a': @@ -1765,22 +1765,22 @@ TQTime KLocale::readTime(const TQString &intstr, ReadTimeFlags flags, bool *ok) { if ( !(Format.length() > Formatpos && str.length() > strpos) ) goto error; - TQChar c = Format.tqat(Formatpos++); + TQChar c = Format.at(Formatpos++); if (c != (QChar)'%') { if (c.isSpace()) strpos++; - else if (c != str.tqat(strpos++)) + else if (c != str.at(strpos++)) goto error; continue; } // remove space at the beginning - if (str.length() > strpos && str.tqat(strpos).isSpace()) + if (str.length() > strpos && str.at(strpos).isSpace()) strpos++; - c = Format.tqat(Formatpos++); + c = Format.at(Formatpos++); switch (c) { case 'p': @@ -1876,14 +1876,14 @@ TQString KLocale::formatTime(const TQTime &pTime, bool includeSecs, bool isDurat { if ( !escape ) { - if ( (TQChar(rst.tqat( format_index )).tqunicode()) == '%' ) + if ( (TQChar(rst.at( format_index )).tqunicode()) == '%' ) escape = true; else - buffer[index++] = rst.tqat( format_index ); + buffer[index++] = rst.at( format_index ); } else { - switch ( TQChar(rst.tqat( format_index )).tqunicode() ) + switch ( TQChar(rst.at( format_index )).tqunicode() ) { case '%': buffer[index++] = (QChar)'%'; @@ -1915,7 +1915,7 @@ TQString KLocale::formatTime(const TQTime &pTime, bool includeSecs, bool isDurat number = pTime.hour(); case 'l': // to share the code - if ( (TQChar(rst.tqat( format_index )).tqunicode()) == 'l' ) + if ( (TQChar(rst.at( format_index )).tqunicode()) == 'l' ) number = isDuration ? pTime.hour() : (pTime.hour() + 11) % 12 + 1; if ( number / 10 ) buffer[index++] = number / 10 + '0'; @@ -1932,7 +1932,7 @@ TQString KLocale::formatTime(const TQTime &pTime, bool includeSecs, bool isDurat } break; default: - buffer[index++] = rst.tqat( format_index ); + buffer[index++] = rst.at( format_index ); break; } escape = false; diff --git a/tdecore/kpalette.cpp b/tdecore/kpalette.cpp index 9cc7b5635..073dff626 100644 --- a/tdecore/kpalette.cpp +++ b/tdecore/kpalette.cpp @@ -176,7 +176,7 @@ KPalette::color(int index) if ((index < 0) || (index >= nrColors())) return TQColor(); - kolor *node = mKolorList.tqat(index); + kolor *node = mKolorList.at(index); if (!node) return TQColor(); @@ -202,7 +202,7 @@ KPalette::colorName(int index) if ((index < 0) || (index >= nrColors())) return TQString::null; - kolor *node = mKolorList.tqat(index); + kolor *node = mKolorList.at(index); if (!node) return TQString::null; @@ -227,7 +227,7 @@ KPalette::changeColor(int index, if ((index < 0) || (index >= nrColors())) return -1; - kolor *node = mKolorList.tqat(index); + kolor *node = mKolorList.at(index); if (!node) return -1; diff --git a/tdecore/kprocctrl.cpp b/tdecore/kprocctrl.cpp index 6774eee5f..d8170c0a8 100644 --- a/tdecore/kprocctrl.cpp +++ b/tdecore/kprocctrl.cpp @@ -214,7 +214,7 @@ void KProcessController::slotDoHousekeeping() if( waitpid( *uit, 0, WNOHANG ) > 0 ) { uit = unixProcessList.remove( uit ); - deref(); // counterpart to addProcess, can tqinvalidate 'this' + deref(); // counterpart to addProcess, can invalidate 'this' } else ++uit; } diff --git a/tdecore/krfcdate.cpp b/tdecore/krfcdate.cpp index dabdc7afa..d9a374d0c 100644 --- a/tdecore/krfcdate.cpp +++ b/tdecore/krfcdate.cpp @@ -394,7 +394,7 @@ KRFCDate::parseDateISO8601( const TQString& input_ ) mday = l[2].toUInt(); // Z suffix means UTC. - if ((QChar)'Z' == timeString.tqat(timeString.length() - 1)) { + if ((QChar)'Z' == timeString.at(timeString.length() - 1)) { timeString.remove(timeString.length() - 1, 1); } diff --git a/tdecore/kstandarddirs.cpp b/tdecore/kstandarddirs.cpp index f9aaae586..55a3b5e8c 100644 --- a/tdecore/kstandarddirs.cpp +++ b/tdecore/kstandarddirs.cpp @@ -189,7 +189,7 @@ void KStandardDirs::addPrefix( const TQString& _dir, bool priority ) return; TQString dir = _dir; - if (dir.tqat(dir.length() - 1) != QChar('/')) + if (dir.at(dir.length() - 1) != QChar('/')) dir += QChar('/'); if (!prefixes.contains(dir)) { @@ -209,7 +209,7 @@ void KStandardDirs::addXdgConfigPrefix( const TQString& _dir, bool priority ) return; TQString dir = _dir; - if (dir.tqat(dir.length() - 1) != QChar('/')) + if (dir.at(dir.length() - 1) != QChar('/')) dir += QChar('/'); if (!d->xdgconf_prefixes.contains(dir)) { @@ -229,7 +229,7 @@ void KStandardDirs::addXdgDataPrefix( const TQString& _dir, bool priority ) return; TQString dir = _dir; - if (dir.tqat(dir.length() - 1) != QChar('/')) + if (dir.at(dir.length() - 1) != QChar('/')) dir += QChar('/'); if (!d->xdgdata_prefixes.contains(dir)) { @@ -271,7 +271,7 @@ bool KStandardDirs::addResourceType( const char *type, relatives.insert(type, rels); } TQString copy = relativename; - if (copy.tqat(copy.length() - 1) != QChar('/')) + if (copy.at(copy.length() - 1) != QChar('/')) copy += QChar('/'); if (!rels->contains(copy)) { if (priority) @@ -301,7 +301,7 @@ bool KStandardDirs::addResourceDir( const char *type, absolutes.insert(type, paths); } TQString copy = absdir; - if (copy.tqat(copy.length() - 1) != QChar('/')) + if (copy.at(copy.length() - 1) != QChar('/')) copy += QChar('/'); if (!paths->contains(copy)) { @@ -452,7 +452,7 @@ bool KStandardDirs::exists(const TQString &fullPath) { KDE_struct_stat buff; if (access(TQFile::encodeName(fullPath), R_OK) == 0 && KDE_stat( TQFile::encodeName(fullPath), &buff ) == 0) - if (fullPath.tqat(fullPath.length() - 1) != QChar('/')) { + if (fullPath.at(fullPath.length() - 1) != QChar('/')) { if (S_ISREG( buff.st_mode )) return true; } else @@ -478,9 +478,9 @@ static void lookupDirectory(const TQString& path, const TQString &relPart, return; #ifdef Q_WS_WIN - assert(path.tqat(path.length() - 1) == QChar('/') || path.tqat(path.length() - 1) == QChar('\\')); + assert(path.at(path.length() - 1) == QChar('/') || path.at(path.length() - 1) == QChar('\\')); #else - assert(path.tqat(path.length() - 1) == QChar('/')); + assert(path.at(path.length() - 1) == QChar('/')); #endif struct dirent *ep; @@ -492,7 +492,7 @@ static void lookupDirectory(const TQString& path, const TQString &relPart, while( ( ep = readdir( dp ) ) != 0L ) { TQString fn( TQFile::decodeName(ep->d_name)); - if (fn == _dot || fn == _dotdot || TQChar(fn.tqat(fn.length() - 1)).latin1() == TQChar('~').latin1()) + if (fn == _dot || fn == _dotdot || TQChar(fn.at(fn.length() - 1)).latin1() == TQChar('~').latin1()) continue; if (!recursive && !regexp.exactMatch(fn)) @@ -569,9 +569,9 @@ static void lookupPrefix(const TQString& prefix, const TQString& relpath, if (prefix.isEmpty()) //for sanity return; #ifdef Q_WS_WIN - assert(prefix.tqat(prefix.length() - 1) == QChar('/') || prefix.tqat(prefix.length() - 1) == QChar('\\')); + assert(prefix.at(prefix.length() - 1) == QChar('/') || prefix.at(prefix.length() - 1) == QChar('\\')); #else - assert(prefix.tqat(prefix.length() - 1) == QChar('/')); + assert(prefix.at(prefix.length() - 1) == QChar('/')); #endif KDE_struct_stat buff; @@ -591,7 +591,7 @@ static void lookupPrefix(const TQString& prefix, const TQString& relpath, while( ( ep = readdir( dp ) ) != 0L ) { TQString fn( TQFile::decodeName(ep->d_name)); - if (fn == _dot || fn == _dotdot || fn.tqat(fn.length() - 1) == QChar('~')) + if (fn == _dot || fn == _dotdot || fn.at(fn.length() - 1) == QChar('~')) continue; if ( !pathExp.exactMatch(fn) ) @@ -1130,7 +1130,7 @@ TQString KStandardDirs::saveLocation(const char *type, if (KDE_stat(TQFile::encodeName(fullPath), &st) != 0 || !(S_ISDIR(st.st_mode))) { if(!create) { #ifndef NDEBUG - kdDebug() << TQString("save location %1 doesn't exist").tqarg(fullPath) << endl; + kdDebug() << TQString("save location %1 doesn't exist").arg(fullPath) << endl; #endif return fullPath; } @@ -1176,7 +1176,7 @@ bool KStandardDirs::makeDir(const TQString& dir, int mode) uint len = target.length(); // append trailing slash if missing - if (dir.tqat(len - 1) != QChar('/')) + if (dir.at(len - 1) != QChar('/')) target += QChar('/'); TQString base(""); diff --git a/tdecore/kstringhandler.cpp b/tdecore/kstringhandler.cpp index dfabb49ea..2af77edf1 100644 --- a/tdecore/kstringhandler.cpp +++ b/tdecore/kstringhandler.cpp @@ -62,7 +62,7 @@ TQString KStringHandler::word( const TQString &text , const char *range ) // Extract words // int wordsToExtract = cnt-pos+1; - TQStringList::Iterator it = list.tqat( pos); + TQStringList::Iterator it = list.at( pos); while ( (it != list.end()) && (wordsToExtract-- > 0)) { @@ -91,7 +91,7 @@ TQString KStringHandler::insword( const TQString &text , const TQString &word , if ( pos >= list.count() ) list.append( word ); else - list.insert( list.tqat(pos) , word ); + list.insert( list.at(pos) , word ); // Rejoin return list.join( " " ); @@ -112,7 +112,7 @@ TQString KStringHandler::setword( const TQString &text , const TQString &word , list.append( word ); else { - list.insert( list.remove( list.tqat(pos) ) , word ); + list.insert( list.remove( list.at(pos) ) , word ); } // Rejoin @@ -140,7 +140,7 @@ TQString KStringHandler::remrange( const TQString &text , const char *range ) // Remove that range of words // int wordsToDelete = cnt-pos+1; - TQStringList::Iterator it = list.tqat( pos); + TQStringList::Iterator it = list.at( pos); while ( (it != list.end()) && (wordsToDelete-- > 0)) it = list.remove( it ); @@ -159,7 +159,7 @@ TQString KStringHandler::remword( const TQString &text , uint pos ) TQStringList list = TQStringList::split( " ", text, true ); if ( pos < list.count() ) - list.remove( list.tqat( pos ) ); + list.remove( list.at( pos ) ); // Rejoin return list.join( " " ); diff --git a/tdecore/ksycoca.cpp b/tdecore/ksycoca.cpp index f95062fa0..09ad97224 100644 --- a/tdecore/ksycoca.cpp +++ b/tdecore/ksycoca.cpp @@ -230,7 +230,7 @@ void KSycoca::closeDatabase() { QIODevice *device = 0; if (m_str) - device = m_str->tqdevice(); + device = m_str->device(); #ifdef HAVE_MMAP if (device && m_sycoca_mmap) { @@ -288,7 +288,7 @@ TQDataStream * KSycoca::findEntry(int offset, KSycocaType &type) if ( !m_str ) openDatabase(); //kdDebug(7011) << TQString("KSycoca::_findEntry(offset=%1)").arg(offset,8,16) << endl; - m_str->tqdevice()->tqat(offset); + m_str->device()->at(offset); TQ_INT32 aType; (*m_str) >> aType; type = (KSycocaType) aType; @@ -306,7 +306,7 @@ bool KSycoca::checkVersion(bool abortOnError) // We should never get here... if a database was found then m_str shouldn't be 0L. assert(m_str); } - m_str->tqdevice()->tqat(0); + m_str->device()->at(0); TQ_INT32 aVersion; (*m_str) >> aVersion; if ( aVersion < KSYCOCA_VERSION ) @@ -361,7 +361,7 @@ TQDataStream * KSycoca::findFactory(KSycocaFactoryId id) if (aId == id) { //kdDebug(7011) << TQString("KSycoca::findFactory(%1) offset %2").arg((int)id).arg(aOffset) << endl; - m_str->tqdevice()->tqat(aOffset); + m_str->device()->at(aOffset); return m_str; } } diff --git a/tdecore/ksycocadict.cpp b/tdecore/ksycocadict.cpp index 11b16b08b..e58b81e5f 100644 --- a/tdecore/ksycocadict.cpp +++ b/tdecore/ksycocadict.cpp @@ -60,7 +60,7 @@ KSycocaDict::KSycocaDict(TQDataStream *str, int offset) : d(0), mStr(str), mOffset(offset) { TQ_UINT32 test1, test2; - str->tqdevice()->tqat(offset); + str->device()->at(offset); (*str) >> test1 >> test2; if ((test1 > 0x000fffff) || (test2 > 1024)) { @@ -70,10 +70,10 @@ KSycocaDict::KSycocaDict(TQDataStream *str, int offset) return; } - str->tqdevice()->tqat(offset); + str->device()->at(offset); (*str) >> mHashTableSize; (*str) >> mHashList; - mOffset = str->tqdevice()->tqat(); // Start of hashtable + mOffset = str->device()->at(); // Start of hashtable } KSycocaDict::~KSycocaDict() @@ -131,7 +131,7 @@ KSycocaDict::find_string(const TQString &key ) uint off = mOffset+sizeof(TQ_INT32)*hash; //kdDebug(7011) << TQString("off is %1").arg(off,8,16) << endl; - mStr->tqdevice()->tqat( off ); + mStr->device()->at( off ); TQ_INT32 offset; (*mStr) >> offset; @@ -146,7 +146,7 @@ KSycocaDict::find_string(const TQString &key ) // Lookup duplicate list. offset = -offset; - mStr->tqdevice()->tqat(offset); + mStr->device()->at(offset); //kdDebug(7011) << TQString("Looking up duplicate list at %1").arg(offset,8,16) << endl; while(true) @@ -286,7 +286,7 @@ KSycocaDict::save(TQDataStream &str) return; } - mOffset = str.tqdevice()->tqat(); + mOffset = str.device()->at(); //kdDebug(7011) << TQString("KSycocaDict: %1 entries.").arg(count()) << endl; @@ -402,12 +402,12 @@ KSycocaDict::save(TQDataStream &str) str << mHashTableSize; str << mHashList; - mOffset = str.tqdevice()->tqat(); // mOffset points to start of hashTable + mOffset = str.device()->at(); // mOffset points to start of hashTable //kdDebug(7011) << TQString("Start of Hash Table, offset = %1").arg(mOffset,8,16) << endl; for(int pass = 1; pass <= 2; pass++) { - str.tqdevice()->tqat(mOffset); + str.device()->at(mOffset); //kdDebug(7011) << TQString("Writing hash table (pass #%1)").arg(pass) << endl; for(uint i=0; i < mHashTableSize; i++) { @@ -421,7 +421,7 @@ KSycocaDict::save(TQDataStream &str) str << tmpid; //kdDebug(7011) << TQString("Hash table : %1").arg(tmpid,8,16) << endl; } - //kdDebug(7011) << TQString("End of Hash Table, offset = %1").arg(str.tqdevice()->tqat(),8,16) << endl; + //kdDebug(7011) << TQString("End of Hash Table, offset = %1").arg(str.device()->at(),8,16) << endl; //kdDebug(7011) << TQString("Writing duplicate lists (pass #%1)").arg(pass) << endl; for(uint i=0; i < mHashTableSize; i++) @@ -429,7 +429,7 @@ KSycocaDict::save(TQDataStream &str) if (hashTable[i].duplicates) { TQPtrList *dups = hashTable[i].duplicates; - hashTable[i].duplicate_offset = str.tqdevice()->tqat(); + hashTable[i].duplicate_offset = str.device()->at(); /*kdDebug(7011) << TQString("Duplicate lists: Offset = %1 list_size = %2") .arg(hashTable[i].duplicate_offset,8,16).arg(dups->count()) << endl; */ @@ -441,7 +441,7 @@ KSycocaDict::save(TQDataStream &str) str << (TQ_INT32) 0; // End of list marker (0) } } - //kdDebug(7011) << TQString("End of Dict, offset = %1").arg(str.tqdevice()->tqat(),8,16) << endl; + //kdDebug(7011) << TQString("End of Dict, offset = %1").arg(str.device()->at(),8,16) << endl; } //kdDebug(7011) << "Cleaning up hash table." << endl; diff --git a/tdecore/ksycocaentry.h b/tdecore/ksycocaentry.h index a3cb9595f..a3071ec5a 100644 --- a/tdecore/ksycocaentry.h +++ b/tdecore/ksycocaentry.h @@ -101,7 +101,7 @@ public: // KDoc seems to barf on those typedefs and generates no docs after them */ virtual void save(TQDataStream &s) { - mOffset = s.tqdevice()->tqat(); // store position in member variable + mOffset = s.device()->at(); // store position in member variable s << (TQ_INT32) sycocaType() << mPath; } diff --git a/tdecore/ksycocafactory.cpp b/tdecore/ksycocafactory.cpp index da65619e6..c224ebe79 100644 --- a/tdecore/ksycocafactory.cpp +++ b/tdecore/ksycocafactory.cpp @@ -46,10 +46,10 @@ KSycocaFactory::KSycocaFactory(KSycocaFactoryId factory_id) (*m_str) >> i; m_endEntryOffset = i; - int saveOffset = m_str->tqdevice()->tqat(); + int saveOffset = m_str->device()->at(); // Init index tables m_sycocaDict = new KSycocaDict(m_str, m_sycocaDictOffset); - saveOffset = m_str->tqdevice()->tqat(saveOffset); + saveOffset = m_str->device()->at(saveOffset); } } else @@ -78,7 +78,7 @@ void KSycocaFactory::saveHeader(TQDataStream &str) { // Write header - str.tqdevice()->tqat(mOffset); + str.device()->at(mOffset); str << (TQ_INT32) m_sycocaDictOffset; str << (TQ_INT32) m_beginEntryOffset; str << (TQ_INT32) m_endEntryOffset; @@ -91,13 +91,13 @@ KSycocaFactory::save(TQDataStream &str) // building database if (!m_sycocaDict) return; // Error! - mOffset = str.tqdevice()->tqat(); // store position in member variable + mOffset = str.device()->at(); // store position in member variable m_sycocaDictOffset = 0; // Write header (pass #1) saveHeader(str); - m_beginEntryOffset = str.tqdevice()->tqat(); + m_beginEntryOffset = str.device()->at(); // Write all entries. int entryCount = 0; @@ -110,7 +110,7 @@ KSycocaFactory::save(TQDataStream &str) entryCount++; } - m_endEntryOffset = str.tqdevice()->tqat(); + m_endEntryOffset = str.device()->at(); // Write indices... // Linear index @@ -124,16 +124,16 @@ KSycocaFactory::save(TQDataStream &str) } // Dictionary index - m_sycocaDictOffset = str.tqdevice()->tqat(); + m_sycocaDictOffset = str.device()->at(); m_sycocaDict->save(str); - int endOfFactoryData = str.tqdevice()->tqat(); + int endOfFactoryData = str.device()->at(); // Update header (pass #2) saveHeader(str); // Seek to end. - str.tqdevice()->tqat(endOfFactoryData); + str.device()->at(endOfFactoryData); } void @@ -169,7 +169,7 @@ KSycocaEntry::List KSycocaFactory::allEntries() // Assume we're NOT building a database - m_str->tqdevice()->tqat(m_endEntryOffset); + m_str->device()->at(m_endEntryOffset); TQ_INT32 entryCount; (*m_str) >> entryCount; diff --git a/tdecore/malloc/malloc.c b/tdecore/malloc/malloc.c index c25800f5d..dba0fdef0 100644 --- a/tdecore/malloc/malloc.c +++ b/tdecore/malloc/malloc.c @@ -85,7 +85,7 @@ int kde_malloc_is_used = 0; calloc(size_t n_elements, size_t element_size); free(Void_t* p); realloc(Void_t* p, size_t n); - memalign(size_t tqalignment, size_t n); + memalign(size_t alignment, size_t n); valloc(size_t n); mallinfo() mallopt(int parameter_number, int parameter_value) @@ -107,7 +107,7 @@ int kde_malloc_is_used = 0; You can adjust this by defining INTERNAL_SIZE_T Alignment: 2 * sizeof(size_t) (default) - (i.e., 8 byte tqalignment with 4byte size_t). This suffices for + (i.e., 8 byte alignment with 4byte size_t). This suffices for nearly all current machines and C compilers. However, you can define MALLOC_ALIGNMENT to be wider than this if necessary. @@ -146,7 +146,7 @@ int kde_malloc_is_used = 0; default used to obtain memory from system) accepts signed arguments, and may not be able to handle size_t-wide arguments with negative sign bit. Generally, values that would - appear as negative after accounting for overhead and tqalignment + appear as negative after accounting for overhead and alignment are supported only via mmap(), which does not have this limitation. @@ -394,7 +394,7 @@ extern "C" { expense of not being able to handle more than 2^32 of malloced space. If this limitation is acceptable, you are encouraged to set this unless you are on a platform requiring 16byte alignments. In - this case the tqalignment requirements turn out to negate any + this case the alignment requirements turn out to negate any potential advantages of decreasing size_t word size. Implementors: Beware of the possible combinations of: @@ -419,11 +419,11 @@ extern "C" { /* - MALLOC_ALIGNMENT is the minimum tqalignment for malloc'ed chunks. + MALLOC_ALIGNMENT is the minimum alignment for malloc'ed chunks. It must be a power of two at least 2 * SIZE_SZ, even on machines for which smaller alignments would suffice. It may be defined as larger than this though. Note however that code and data structures - are optimized for the case of 8-byte tqalignment. + are optimized for the case of 8-byte alignment. */ @@ -957,13 +957,13 @@ Void_t* public_rEALLOc(); #endif /* - memalign(size_t tqalignment, size_t n); + memalign(size_t alignment, size_t n); Returns a pointer to a newly allocated chunk of n bytes, aligned - in accord with the tqalignment argument. + in accord with the alignment argument. - The tqalignment argument should be a power of two. If the argument is + The alignment argument should be a power of two. If the argument is not a power of two, the nearest greater power is used. - 8-byte tqalignment is guaranteed by normal malloc calls, so don't + 8-byte alignment is guaranteed by normal malloc calls, so don't bother calling memalign with an argument of 8 or less. Overreliance on memalign is a sure way to fragment space. @@ -1228,7 +1228,7 @@ int public_mTRIm(); Returns the number of bytes you can actually use in an allocated chunk, which may be more than you requested (although - often not) due to tqalignment and minimum size constraints. + often not) due to alignment and minimum size constraints. You can use this many bytes without worrying about overwriting other allocated objects. This is not a particularly great programming practice. malloc_usable_size can be more useful in @@ -1252,8 +1252,8 @@ size_t public_mUSABLe(); number of bytes allocated via malloc (or realloc, etc) but not yet freed. Note that this is the number of bytes allocated, not the number requested. It will be larger than the number requested - because of tqalignment and bookkeeping overhead. Because it includes - tqalignment wastage as being in use, this figure may be greater than + because of alignment and bookkeeping overhead. Because it includes + alignment wastage as being in use, this figure may be greater than zero even when no user-level chunks are allocated. The reported current and maximum system memory can be inaccurate if @@ -1290,7 +1290,7 @@ void public_mSTATs(); fragmentation without improving speed. M_MXFAST is set in REQUEST size units. It is internally used in - chunksize units, which adds padding and tqalignment. You can reduce + chunksize units, which adds padding and alignment. You can reduce M_MXFAST to 0 to disable all use of fastbins. This causes the malloc algorithm to be a closer approximation of fifo-best-fit in all cases, not just for larger requests, but will generally cause it to be @@ -1434,7 +1434,7 @@ void public_mSTATs(); 1. The space cannot be reclaimed, consolidated, and then used to service later requests, as happens with normal chunks. - 2. It can lead to more wastage because of mmap page tqalignment + 2. It can lead to more wastage because of mmap page alignment requirements 3. It causes malloc performance to be more dependent on host system memory management support routines which may vary in @@ -1614,12 +1614,12 @@ Void_t* public_rEALLOc(Void_t* m, size_t bytes) { return m; } -Void_t* public_mEMALIGn(size_t tqalignment, size_t bytes) { +Void_t* public_mEMALIGn(size_t alignment, size_t bytes) { Void_t* m; if (MALLOC_PREACTION != 0) { return 0; } - m = mEMALIGn(tqalignment, bytes); + m = mEMALIGn(alignment, bytes); if (MALLOC_POSTACTION != 0) { } return m; @@ -1956,7 +1956,7 @@ nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ */ /* - ---------- Size and tqalignment checks and conversions ---------- + ---------- Size and alignment checks and conversions ---------- */ /* conversion from malloc headers to user pointers, and back */ @@ -1972,7 +1972,7 @@ nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ #define MINSIZE \ (unsigned long)(((MIN_CHUNK_SIZE+MALLOC_ALIGN_MASK) & ~MALLOC_ALIGN_MASK)) -/* Check if m has acceptable tqalignment */ +/* Check if m has acceptable alignment */ #define aligned_OK(m) (((unsigned long)((m)) & (MALLOC_ALIGN_MASK)) == 0) @@ -2641,7 +2641,7 @@ static void do_check_remalloced_chunk(p, s) mchunkptr p; INTERNAL_SIZE_T s; /* Legal size ... */ assert((sz & MALLOC_ALIGN_MASK) == 0); assert((unsigned long)(sz) >= MINSIZE); - /* ... and tqalignment */ + /* ... and alignment */ assert(aligned_OK(chunk2mem(p))); /* chunk is less than MINSIZE more than request */ assert((long)(sz) - (long)(s) >= 0); @@ -2704,7 +2704,7 @@ static void do_check_malloc_state() /* internal size_t must be no wider than pointer type */ assert(sizeof(INTERNAL_SIZE_T) <= sizeof(char*)); - /* tqalignment is a power of 2 */ + /* alignment is a power of 2 */ assert((MALLOC_ALIGNMENT & (MALLOC_ALIGNMENT-1)) == 0); /* cannot run remaining checks until fully initialized */ @@ -3209,7 +3209,7 @@ static Void_t* sYSMALLOc(nb, av) INTERNAL_SIZE_T nb; mstate av; /* The offset to the start of the mmapped region is stored in the prev_size field of the chunk. This allows us to adjust - returned start address to meet tqalignment requirements here + returned start address to meet alignment requirements here and in memalign(), and still be able to compute proper address argument for later munmap in free() and realloc(). */ @@ -3288,7 +3288,7 @@ static Void_t* sYSMALLOc(nb, av) INTERNAL_SIZE_T nb; mstate av; Round to a multiple of page size. If MORECORE is not contiguous, this ensures that we only call it with whole-page arguments. And if MORECORE is contiguous and - this is not first time through, this preserves page-tqalignment of + this is not first time through, this preserves page-alignment of previous calls. Otherwise, we correct to page-align below. */ @@ -3384,7 +3384,7 @@ static Void_t* sYSMALLOc(nb, av) INTERNAL_SIZE_T nb; mstate av; /* handle contiguous cases */ if (contiguous(av)) { - /* Guarantee tqalignment of first new chunk made from this space */ + /* Guarantee alignment of first new chunk made from this space */ front_misalign = (INTERNAL_SIZE_T)chunk2mem(brk) & MALLOC_ALIGN_MASK; if (front_misalign > 0) { @@ -3554,7 +3554,7 @@ Void_t* mALLOc(size_t bytes) /* Convert request size to internal form by adding SIZE_SZ bytes - overhead plus possibly more to obtain necessary tqalignment and/or + overhead plus possibly more to obtain necessary alignment and/or to obtain a size of at least MINSIZE, the smallest allocatable size. Also, checked_request2size traps (returning 0) request sizes that are so large that they wrap around zero when padded and @@ -4127,54 +4127,54 @@ Void_t* rEALLOc(oldmem, bytes) Void_t* oldmem; size_t bytes; INLINE #if __STD_C -Void_t* mEMALIGn(size_t tqalignment, size_t bytes) +Void_t* mEMALIGn(size_t alignment, size_t bytes) #else -Void_t* mEMALIGn(tqalignment, bytes) size_t tqalignment; size_t bytes; +Void_t* mEMALIGn(alignment, bytes) size_t alignment; size_t bytes; #endif { INTERNAL_SIZE_T nb; /* padded request size */ char* m; /* memory returned by malloc call */ mchunkptr p; /* corresponding chunk */ - char* brk; /* tqalignment point within p */ + char* brk; /* alignment point within p */ mchunkptr newp; /* chunk to return */ INTERNAL_SIZE_T newsize; /* its size */ - INTERNAL_SIZE_T leadsize; /* leading space before tqalignment point */ + INTERNAL_SIZE_T leadsize; /* leading space before alignment point */ mchunkptr remainder; /* spare room at end to split off */ unsigned long remainder_size; /* its size */ INTERNAL_SIZE_T size; - /* If need less tqalignment than we give anyway, just relay to malloc */ + /* If need less alignment than we give anyway, just relay to malloc */ - if (tqalignment <= MALLOC_ALIGNMENT) return mALLOc(bytes); + if (alignment <= MALLOC_ALIGNMENT) return mALLOc(bytes); /* Otherwise, ensure that it is at least a minimum chunk size */ - if (tqalignment < MINSIZE) tqalignment = MINSIZE; + if (alignment < MINSIZE) alignment = MINSIZE; - /* Make sure tqalignment is power of 2 (in case MINSIZE is not). */ - if ((tqalignment & (tqalignment - 1)) != 0) { + /* Make sure alignment is power of 2 (in case MINSIZE is not). */ + if ((alignment & (alignment - 1)) != 0) { size_t a = MALLOC_ALIGNMENT * 2; - while ((unsigned long)a < (unsigned long)tqalignment) a <<= 1; - tqalignment = a; + while ((unsigned long)a < (unsigned long)alignment) a <<= 1; + alignment = a; } checked_request2size(bytes, nb); /* - Strategy: find a spot within that chunk that meets the tqalignment + Strategy: find a spot within that chunk that meets the alignment request, and then possibly free the leading and trailing space. */ - /* Call malloc with worst case padding to hit tqalignment. */ + /* Call malloc with worst case padding to hit alignment. */ - m = (char*)(mALLOc(nb + tqalignment + MINSIZE)); + m = (char*)(mALLOc(nb + alignment + MINSIZE)); if (m == 0) return 0; /* propagate failure */ p = mem2chunk(m); - if ((((unsigned long)(m)) % tqalignment) != 0) { /* misaligned */ + if ((((unsigned long)(m)) % alignment) != 0) { /* misaligned */ /* Find an aligned spot inside chunk. Since we need to give back @@ -4184,10 +4184,10 @@ Void_t* mEMALIGn(tqalignment, bytes) size_t tqalignment; size_t bytes; total room so that this is always possible. */ - brk = (char*)mem2chunk(((unsigned long)(m + tqalignment - 1)) & - -((signed long) tqalignment)); + brk = (char*)mem2chunk(((unsigned long)(m + alignment - 1)) & + -((signed long) alignment)); if ((unsigned long)(brk - (char*)(p)) < MINSIZE) - brk += tqalignment; + brk += alignment; newp = (mchunkptr)brk; leadsize = brk - (char*)(p); @@ -4208,7 +4208,7 @@ Void_t* mEMALIGn(tqalignment, bytes) size_t tqalignment; size_t bytes; p = newp; assert (newsize >= nb && - (((unsigned long)(chunk2mem(p))) % tqalignment) == 0); + (((unsigned long)(chunk2mem(p))) % alignment) == 0); } /* Also give back spare room at the end */ @@ -4375,7 +4375,7 @@ static Void_t** iALLOc(n_elements, sizes, opts, chunks) size_t n_elements; size_ contents_size += request2size(sizes[i]); } - /* subtract out tqalignment bytes from total to minimize overallocation */ + /* subtract out alignment bytes from total to minimize overallocation */ size = contents_size + array_size - MALLOC_ALIGN_MASK; /* @@ -5356,7 +5356,7 @@ History: and Anonymous. * Allow override of MALLOC_ALIGNMENT (Thanks to Ruud Waij for helping test this.) - * memalign: check tqalignment arg + * memalign: check alignment arg * realloc: don't try to shift chunks backwards, since this leads to more fragmentation in some programs and doesn't seem to help in any others. @@ -5409,7 +5409,7 @@ History: * Support another case of realloc via move into top * Fix error occurring when initial sbrk_base not word-aligned. * Rely on page size for units instead of SBRK_UNIT to - avoid surprises about sbrk tqalignment conventions. + avoid surprises about sbrk alignment conventions. * Add mallinfo, mallopt. Thanks to Raymond Nijssen (raymond@es.ele.tue.nl) for the suggestion. * Add `pad' argument to malloc_trim and top_pad mallopt parameter. @@ -5569,7 +5569,7 @@ Void_t* public_rEALLOc(Void_t* m, size_t bytes) { #endif } -Void_t* public_mEMALIGn(size_t tqalignment, size_t bytes) { +Void_t* public_mEMALIGn(size_t alignment, size_t bytes) { #ifndef KDE_MALLOC_FULL if( malloc_type == 1 ) { @@ -5578,16 +5578,16 @@ Void_t* public_mEMALIGn(size_t tqalignment, size_t bytes) { if (MALLOC_PREACTION != 0) { return 0; } - m = mEMALIGn(tqalignment, bytes); + m = mEMALIGn(alignment, bytes); if (MALLOC_POSTACTION != 0) { } return m; #ifndef KDE_MALLOC_FULL } if( malloc_type == 2 ) - return libc_memalign( tqalignment, bytes ); + return libc_memalign( alignment, bytes ); init_malloc_type(); - return public_mEMALIGn( tqalignment, bytes ); + return public_mEMALIGn( alignment, bytes ); #endif } @@ -5728,7 +5728,7 @@ int public_mALLOPt(int p, int v) { #endif int -posix_memalign (void **memptr, size_t tqalignment, size_t size) +posix_memalign (void **memptr, size_t alignment, size_t size) { void *mem; @@ -5737,7 +5737,7 @@ posix_memalign (void **memptr, size_t tqalignment, size_t size) if (size % sizeof (void *) != 0 || (size & (size - 1)) != 0) return EINVAL; - mem = memalign (tqalignment, size); + mem = memalign (alignment, size); if (mem != NULL) { *memptr = mem; diff --git a/tdecore/network/ksocketaddress.cpp b/tdecore/network/ksocketaddress.cpp index dccac12bd..7ceeba99d 100644 --- a/tdecore/network/ksocketaddress.cpp +++ b/tdecore/network/ksocketaddress.cpp @@ -270,7 +270,7 @@ public: { addr.generic = 0L; curlen = 0; - tqinvalidate(); + invalidate(); } ~KSocketAddressData() @@ -282,7 +282,7 @@ public: inline bool invalid() const { return reallen == 0; } - inline void tqinvalidate() + inline void invalidate() { reallen = 0; } void dup(const sockaddr* sa, TQ_UINT16 len, bool clear = true); @@ -348,7 +348,7 @@ void KSocketAddressData::dup(const sockaddr* sa, TQ_UINT16 len, bool clear) if (len < MIN_SOCKADDR_LEN) { // certainly invalid - tqinvalidate(); + invalidate(); return; } @@ -359,7 +359,7 @@ void KSocketAddressData::dup(const sockaddr* sa, TQ_UINT16 len, bool clear) (sa->sa_family == AF_UNIX && len < MIN_SOCKADDR_UN_LEN))) { // also invalid - tqinvalidate(); + invalidate(); return; } @@ -444,7 +444,7 @@ KSocketAddress& KSocketAddress::operator =(const KSocketAddress& other) if (other.d && !other.d->invalid()) d->dup(other.d->addr.generic, other.d->reallen); else - d->tqinvalidate(); + d->invalidate(); return *this; } @@ -467,7 +467,7 @@ KSocketAddress& KSocketAddress::setAddress(const sockaddr* sa, TQ_UINT16 len) if (sa != 0L && len >= MIN_SOCKADDR_LEN) d->dup(sa, len); else - d->tqinvalidate(); + d->invalidate(); return *this; } @@ -788,7 +788,7 @@ KInetSocketAddress& KInetSocketAddress::setHost(const KIpAddress& ip) default: // empty - d->tqinvalidate(); + d->invalidate(); } return *this; @@ -832,7 +832,7 @@ KInetSocketAddress& KInetSocketAddress::setPort(TQ_UINT16 port) #endif default: - d->tqinvalidate(); // setting the port on something else + d->invalidate(); // setting the port on something else } return *this; @@ -897,7 +897,7 @@ void KInetSocketAddress::update() return; #endif else - d->tqinvalidate(); + d->invalidate(); } KUnixSocketAddress::KUnixSocketAddress() @@ -908,7 +908,7 @@ KUnixSocketAddress::KUnixSocketAddress(const sockaddr* sa, TQ_UINT16 len) : KSocketAddress(sa, len) { if (!d->invalid() && d->addr.un->sun_family != AF_UNIX) - d->tqinvalidate(); + d->invalidate(); } KUnixSocketAddress::KUnixSocketAddress(const KUnixSocketAddress& other) diff --git a/tdecore/network/ksocketaddress.h b/tdecore/network/ksocketaddress.h index d02a6984c..a57d11e82 100644 --- a/tdecore/network/ksocketaddress.h +++ b/tdecore/network/ksocketaddress.h @@ -511,7 +511,7 @@ public: * buffer to fit needs. This function should not be used except for handling * unknown socket address structures. * - * Also note that this function may tqinvalidate the socket if a known + * Also note that this function may invalidate the socket if a known * family is set (Internet or Unix socket) and the new length would be * too small to hold the system's sockaddr_* structure. If unsure, reset * the family: @@ -535,7 +535,7 @@ public: /** * Sets the family of this object. * - * Note: setting the family will probably tqinvalidate any address data + * Note: setting the family will probably invalidate any address data * contained in this object. Use this function with care. * * @param family the new family to set diff --git a/tdecore/network/ksocketbase.cpp b/tdecore/network/ksocketbase.cpp index 8449dbdc8..ca4725a9f 100644 --- a/tdecore/network/ksocketbase.cpp +++ b/tdecore/network/ksocketbase.cpp @@ -309,7 +309,7 @@ int KActiveSocketBase::putch(int ch) void KActiveSocketBase::setError(int status, SocketError error) { KSocketBase::setError(error); - seStatus(status); + setStatus(status); } void KActiveSocketBase::resetError() diff --git a/tdecore/network/ksrvresolverworker.cpp b/tdecore/network/ksrvresolverworker.cpp index 31eaa1f1e..f3166b982 100644 --- a/tdecore/network/ksrvresolverworker.cpp +++ b/tdecore/network/ksrvresolverworker.cpp @@ -85,7 +85,7 @@ bool KSrvResolverWorker::preprocess() return false; protoname = "_"; - protoname += names.tqat(0); + protoname += names.at(0); } else if (sockettype == SOCK_STREAM || sockettype == 0) protoname = "_tcp"; diff --git a/tdecore/svgicons/ksvgiconengine.cpp b/tdecore/svgicons/ksvgiconengine.cpp index d035972ef..42ca8557c 100644 --- a/tdecore/svgicons/ksvgiconengine.cpp +++ b/tdecore/svgicons/ksvgiconengine.cpp @@ -225,9 +225,9 @@ printf("[FIXME] *current = matrix * *current locks up under Qt4; bypassing for n TQPtrList applyList; applyList.setAutoDelete(true); - TQDomNode tqshape = node.parentNode(); - for(; !tqshape.isNull() ; tqshape = tqshape.parentNode()) - applyList.prepend(new TQDomNamedNodeMap(tqshape.attributes())); + TQDomNode shape = node.parentNode(); + for(; !shape.isNull() ; shape = shape.parentNode()) + applyList.prepend(new TQDomNamedNodeMap(shape.attributes())); // Apply parent attributes for(TQDomNamedNodeMap *map = applyList.first(); map != 0; map = applyList.next()) diff --git a/tdecore/tests/kurltest.cpp b/tdecore/tests/kurltest.cpp index bcee63ac3..e5176aa9a 100644 --- a/tdecore/tests/kurltest.cpp +++ b/tdecore/tests/kurltest.cpp @@ -384,7 +384,7 @@ int main(int argc, char *argv[]) check("KURL::setFileName()", u2.url(), "file:///home/dfaure/myotherfile.txt"); // more tricky, renaming a directory (kpropsdlg.cc, line ~ 238) TQString tmpurl = "file:/home/dfaure/myolddir/"; - if ( tmpurl.tqat(tmpurl.length() - 1) == '/') + if ( tmpurl.at(tmpurl.length() - 1) == '/') // It's a directory, so strip the trailing slash first tmpurl.truncate( tmpurl.length() - 1); KURL newUrl = tmpurl; diff --git a/tdefx/kimageeffect.cpp b/tdefx/kimageeffect.cpp index 32b450f2e..c0086d884 100644 --- a/tdefx/kimageeffect.cpp +++ b/tdefx/kimageeffect.cpp @@ -1110,7 +1110,7 @@ TQImage& KImageEffect::blend(const TQColor& clr, TQImage& dst, float opacity) TQ_UINT32 *data = reinterpret_cast( dst.bits() ); - // Check how many pixels we need to process to achieve 16 byte tqalignment + // Check how many pixels we need to process to achieve 16 byte alignment int offset = (16 - (TQ_UINT32( data ) & 0x0f)) / 4; // The main loop processes 8 pixels / iteration @@ -1358,7 +1358,7 @@ TQImage& KImageEffect::blend(TQImage& src, TQImage& dst, float opacity) TQ_UINT32 *data1 = reinterpret_cast( src.bits() ); TQ_UINT32 *data2 = reinterpret_cast( dst.bits() ); - // Check how many pixels we need to process to achieve 16 byte tqalignment + // Check how many pixels we need to process to achieve 16 byte alignment int offset = (16 - (TQ_UINT32( data2 ) & 0x0f)) / 4; // The main loop processes 4 pixels / iteration diff --git a/tdefx/kstyle.cpp b/tdefx/kstyle.cpp index 60fdb4571..419ae90ae 100644 --- a/tdefx/kstyle.cpp +++ b/tdefx/kstyle.cpp @@ -264,8 +264,8 @@ void KStyle::polish( TQWidget* widget ) if ( d->useFilledFrameWorkaround ) { if ( TQFrame *frame = ::tqqt_cast< TQFrame* >( widget ) ) { - TQFrame::Shape tqshape = frame->frameShape(); - if (tqshape == TQFrame::ToolBarPanel || tqshape == TQFrame::MenuBarPanel) + TQFrame::Shape shape = frame->frameShape(); + if (shape == TQFrame::ToolBarPanel || shape == TQFrame::MenuBarPanel) widget->installEventFilter(this); } } @@ -285,8 +285,8 @@ void KStyle::unPolish( TQWidget* widget ) if ( d->useFilledFrameWorkaround ) { if ( TQFrame *frame = ::tqqt_cast< TQFrame* >( widget ) ) { - TQFrame::Shape tqshape = frame->frameShape(); - if (tqshape == TQFrame::ToolBarPanel || tqshape == TQFrame::MenuBarPanel) + TQFrame::Shape shape = frame->frameShape(); + if (shape == TQFrame::ToolBarPanel || shape == TQFrame::MenuBarPanel) widget->removeEventFilter(this); } } @@ -627,9 +627,9 @@ void KStyle::tqdrawPrimitive( TQ_PrimitiveElement pe, } XRenderFillRectangle( - p->tqdevice()->x11Display(), + p->device()->x11Display(), PictOpOver, - p->tqdevice()->x11RenderHandle(), + p->device()->x11RenderHandle(), &clr, rect.x() + point.x(), rect.y() + point.y(), @@ -668,7 +668,7 @@ void KStyle::drawControl( TQ_ControlElement element, // ------------------------------------------------------------------------ case CE_TabBarTab: { const TQTabBar* tb = (const TQTabBar*) widget; - TQTabBar::Shape tbs = tb->tqshape(); + TQTabBar::Shape tbs = tb->shape(); bool selected = flags & Style_Selected; int x = r.x(), y=r.y(), bottom=r.bottom(), right=r.right(); @@ -1010,8 +1010,8 @@ int KStyle::pixelMetric(PixelMetric m, const TQWidget* widget) const case PM_TabBarTabVSpace: { const TQTabBar * tb = (const TQTabBar *) widget; - if ( tb->tqshape() == TQTabBar::RoundedAbove || - tb->tqshape() == TQTabBar::RoundedBelow ) + if ( tb->shape() == TQTabBar::RoundedAbove || + tb->shape() == TQTabBar::RoundedBelow ) return 10; else return 4; @@ -1019,7 +1019,7 @@ int KStyle::pixelMetric(PixelMetric m, const TQWidget* widget) const case PM_TabBarTabOverlap: { const TQTabBar* tb = (const TQTabBar*)widget; - TQTabBar::Shape tbs = tb->tqshape(); + TQTabBar::Shape tbs = tb->shape(); if ( (tbs == TQTabBar::RoundedAbove) || (tbs == TQTabBar::RoundedBelow) ) @@ -1897,7 +1897,7 @@ bool KStyle::eventFilter( TQObject* object, TQEvent* event ) // ensure that the filled frame contents are properly painted. // We essentially modify the paintEvent's rect to include the // panel border, which also paints the widget's interior. - // This is nasty, but I see no other way to properly tqrepaint + // This is nasty, but I see no other way to properly repaint // filled frames in all QMenuBars and QToolBars. // -- Karol. TQFrame *frame = 0; diff --git a/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp b/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp index 092e1a7e5..d11851c60 100644 --- a/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp +++ b/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp @@ -127,7 +127,7 @@ void CupsdSecurityPage::slotAdd() { if (KMessageBox::warningContinueCancel(this, i18n("This location is already defined. Do you want to replace the existing one?"),TQString::null,i18n("Replace")) == KMessageBox::Continue) { - index = locs_.tqat(); + index = locs_.at(); locs_.remove(); break; } @@ -149,7 +149,7 @@ void CupsdSecurityPage::slotAdd() void CupsdSecurityPage::slotEdit(int index) { - CupsLocation *loc = locs_.tqat(index); + CupsLocation *loc = locs_.at(index); LocationDialog::editLocation(loc, this, conf_); } diff --git a/tdeprint/cups/cupsdconf2/locationdialog.cpp b/tdeprint/cups/cupsdconf2/locationdialog.cpp index 7e1858cc7..3896f7845 100644 --- a/tdeprint/cups/cupsdconf2/locationdialog.cpp +++ b/tdeprint/cups/cupsdconf2/locationdialog.cpp @@ -128,7 +128,7 @@ void LocationDialog::setInfos(CupsdConf *conf) void LocationDialog::fillLocation(CupsLocation *loc) { - loc->resource_ = conf_->resources_.tqat(resource_->currentItem()); + loc->resource_ = conf_->resources_.at(resource_->currentItem()); loc->resourcename_ = loc->resource_->path_; loc->authtype_ = authtype_->currentItem(); loc->authclass_ = (loc->authtype_ == AUTHTYPE_NONE ? AUTHCLASS_ANONYMOUS : authclass_->currentItem()); diff --git a/tdeprint/cups/imagepreview.cpp b/tdeprint/cups/imagepreview.cpp index 9912c1886..e2401d6d3 100644 --- a/tdeprint/cups/imagepreview.cpp +++ b/tdeprint/cups/imagepreview.cpp @@ -51,7 +51,7 @@ void ImagePreview::setParameters(int brightness, int hue, int saturation, int ga hue_ = hue; saturation_ = saturation; gamma_ = gamma; - tqrepaint(); + repaint(); } void ImagePreview::paintEvent(TQPaintEvent*){ diff --git a/tdeprint/cups/kpimagepage.cpp b/tdeprint/cups/kpimagepage.cpp index 13332dee3..701ffbc4d 100644 --- a/tdeprint/cups/kpimagepage.cpp +++ b/tdeprint/cups/kpimagepage.cpp @@ -192,7 +192,7 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name) TQString whatsThisPreviewPositionImagePage = i18n( " " "

Position Preview Thumbnail

" "

This position preview thumbnail indicates the position of the image on the paper sheet. " - "

Click on horizontal and vertical radio buttons to move image tqalignment on paper around. Options are: " + "

Click on horizontal and vertical radio buttons to move image alignment on paper around. Options are: " "

    " "
  • center
    • " "
  • top
    • " diff --git a/tdeprint/driver.cpp b/tdeprint/driver.cpp index 3bcc50066..abc468f7a 100644 --- a/tdeprint/driver.cpp +++ b/tdeprint/driver.cpp @@ -627,7 +627,7 @@ void DrListOption::setChoice(int choicenum) { if (choicenum >= 0 && choicenum < (int)m_choices.count()) { - setValueText(m_choices.tqat(choicenum)->name()); + setValueText(m_choices.at(choicenum)->name()); } } diff --git a/tdeprint/driveritem.cpp b/tdeprint/driveritem.cpp index 500443581..1ce2f5625 100644 --- a/tdeprint/driveritem.cpp +++ b/tdeprint/driveritem.cpp @@ -133,7 +133,7 @@ bool DriverItem::updateConflict() m_conflict = (m_item->conflict()); } } - tqrepaint(); + repaint(); return m_conflict; } diff --git a/tdeprint/kmjobmanager.cpp b/tdeprint/kmjobmanager.cpp index 918c14ff2..30a1fb993 100644 --- a/tdeprint/kmjobmanager.cpp +++ b/tdeprint/kmjobmanager.cpp @@ -53,7 +53,7 @@ void KMJobManager::discardAllJobs() void KMJobManager::removeDiscardedJobs() { for (uint i=0;iisDiscarded()) + if (m_jobs.at(i)->isDiscarded()) { m_jobs.remove(i); i--; diff --git a/tdeprint/kmmanager.cpp b/tdeprint/kmmanager.cpp index e995f86af..3316244de 100644 --- a/tdeprint/kmmanager.cpp +++ b/tdeprint/kmmanager.cpp @@ -253,7 +253,7 @@ TQPtrList* KMManager::printerList(bool reload) // remove discarded printers for (uint i=0; iisDiscarded()) { m_printers.remove(i); diff --git a/tdeprint/kpgeneralpage.cpp b/tdeprint/kpgeneralpage.cpp index 3b93e59af..ad889a6a9 100644 --- a/tdeprint/kpgeneralpage.cpp +++ b/tdeprint/kpgeneralpage.cpp @@ -622,17 +622,17 @@ void KPGeneralPage::getOptions(TQMap& opts, bool incldef) DrListOption *opt; if ((opt=(DrListOption*)driver()->findOption("PageSize")) != NULL) { - DrBase *ch = opt->choices()->tqat(m_pagesize->currentItem()); + DrBase *ch = opt->choices()->at(m_pagesize->currentItem()); if (incldef || ch->name() != opt->get("default")) opts["PageSize"] = ch->name(); } if ((opt=(DrListOption*)driver()->findOption("MediaType")) != NULL) { - DrBase *ch = opt->choices()->tqat(m_papertype->currentItem()); + DrBase *ch = opt->choices()->at(m_papertype->currentItem()); if (incldef || ch->name() != opt->get("default")) opts["MediaType"] = ch->name(); } if ((opt=(DrListOption*)driver()->findOption("InputSlot")) != NULL) { - DrBase *ch = opt->choices()->tqat(m_inputslot->currentItem()); + DrBase *ch = opt->choices()->at(m_inputslot->currentItem()); if (incldef || ch->name() != opt->get("default")) opts["InputSlot"] = ch->name(); } diff --git a/tdeprint/kpqtpage.cpp b/tdeprint/kpqtpage.cpp index 4049ab4f8..5b91e4fb5 100644 --- a/tdeprint/kpqtpage.cpp +++ b/tdeprint/kpqtpage.cpp @@ -305,7 +305,7 @@ void KPQtPage::getOptions(TQMap& opts, bool incldef) DrListOption *opt = static_cast(driver()->findOption("PageSize")); if (opt) { - DrBase *ch = opt->choices()->tqat(m_pagesize->currentItem()); + DrBase *ch = opt->choices()->at(m_pagesize->currentItem()); if (ch && (incldef || ch->name() != opt->get("default"))) { opts["PageSize"] = ch->name(); diff --git a/tdeprint/kprintdialog.cpp b/tdeprint/kprintdialog.cpp index 358ee70cd..50595e443 100644 --- a/tdeprint/kprintdialog.cpp +++ b/tdeprint/kprintdialog.cpp @@ -824,7 +824,7 @@ void KPrintDialog::reload() // remove printer dependent pages (usually from plugin) TQTabWidget *tabs = static_cast(TQT_TQWIDGET(d->m_dummy->child("TabWidget", TQTABWIDGET_OBJECT_NAME_STRING))); for (uint i=0; im_pages.count(); i++) - if (d->m_pages.tqat(i)->onlyRealPrinters()) + if (d->m_pages.at(i)->onlyRealPrinters()) { KPrintDialogPage *page = d->m_pages.take(i--); if (tabs) @@ -952,10 +952,10 @@ void KPrintDialog::enableDialogPage( int index, bool flag ) if ( d->m_pages.count() > 1 ) { TQTabWidget *tabs = static_cast(TQT_TQWIDGET(d->m_dummy->child("TabWidget", TQTABWIDGET_OBJECT_NAME_STRING))); - tabs->setTabEnabled( d->m_pages.tqat( index ), flag ); + tabs->setTabEnabled( d->m_pages.at( index ), flag ); } else - d->m_pages.tqat( 0 )->setEnabled( flag ); + d->m_pages.at( 0 )->setEnabled( flag ); } void KPrintDialog::slotOpenFileDialog() diff --git a/tdeprint/lpr/lpchelper.cpp b/tdeprint/lpr/lpchelper.cpp index c921a803c..05d09c40a 100644 --- a/tdeprint/lpr/lpchelper.cpp +++ b/tdeprint/lpr/lpchelper.cpp @@ -72,7 +72,7 @@ KMPrinter::PrinterState LpcHelper::state(KMPrinter *prt) const return state(prt->printerName()); } -void LpcHelper::parseStatusLPR(TQTextStream &t) +void LpcHelper::parsetStatusLPR(TQTextStream &t) { TQString printer, line; int p(-1); @@ -107,7 +107,7 @@ void LpcHelper::parseStatusLPR(TQTextStream &t) } } -void LpcHelper::parseStatusLPRng(TQTextStream& t) +void LpcHelper::parsetStatusLPRng(TQTextStream& t) { TQStringList l; int p(-1); @@ -152,10 +152,10 @@ void LpcHelper::updateStates() { default: case LprSettings::LPR: - parseStatusLPR(t); + parsetStatusLPR(t); break; case LprSettings::LPRng: - parseStatusLPRng(t); + parsetStatusLPRng(t); break; } proc.close(); diff --git a/tdeprint/lpr/lpchelper.h b/tdeprint/lpr/lpchelper.h index b1e20f089..24aec6bda 100644 --- a/tdeprint/lpr/lpchelper.h +++ b/tdeprint/lpr/lpchelper.h @@ -46,8 +46,8 @@ public: protected: bool changeState(const TQString&, const TQString&, TQString&); - void parseStatusLPR(TQTextStream&); - void parseStatusLPRng(TQTextStream&); + void parsetStatusLPR(TQTextStream&); + void parsetStatusLPRng(TQTextStream&); int parseStateChangeLPR(const TQString&, const TQString&); int parseStateChangeLPRng(const TQString&, const TQString&); diff --git a/tdeprint/lpr/printcapreader.cpp b/tdeprint/lpr/printcapreader.cpp index 00016c14f..718ffca21 100644 --- a/tdeprint/lpr/printcapreader.cpp +++ b/tdeprint/lpr/printcapreader.cpp @@ -56,7 +56,7 @@ void PrintcapReader::unputLine(const TQString& s) PrintcapEntry* PrintcapReader::nextEntry() { - if (!m_stream.tqdevice()) + if (!m_stream.device()) return NULL; TQString line, comment, name, fields, buf; diff --git a/tdeprint/management/kmiconview.cpp b/tdeprint/management/kmiconview.cpp index a11458730..0978c0782 100644 --- a/tdeprint/management/kmiconview.cpp +++ b/tdeprint/management/kmiconview.cpp @@ -114,7 +114,7 @@ void KMIconViewItem::updatePrinter(KMPrinter *p, int mode) setPixmap(SmallIcon(m_pixmap, 0, iconstate)); } //if (update) - // tqrepaint(); + // repaint(); setDiscarded(false); } @@ -180,7 +180,7 @@ void KMIconView::setPrinterList(TQPtrList *list) } for (uint i=0; iisDiscarded()) + if (m_items.at(i)->isDiscarded()) { delete m_items.take(i); i--; diff --git a/tdeprint/management/kmjobviewer.cpp b/tdeprint/management/kmjobviewer.cpp index 9fca665a7..19c46224f 100644 --- a/tdeprint/management/kmjobviewer.cpp +++ b/tdeprint/management/kmjobviewer.cpp @@ -398,7 +398,7 @@ void KMJobViewer::updateJobs() } for (uint i=0; iisDiscarded()) + if (m_items.at(i)->isDiscarded()) { delete m_items.take(i); i--; @@ -510,7 +510,7 @@ void KMJobViewer::slotMove(int prID) { if (prID >= 0 && prID < (int)(m_printers.count())) { - KMPrinter *p = m_printers.tqat(prID); + KMPrinter *p = m_printers.at(prID); send(KMJob::Move,i18n("Move to %1").arg(p->printerName()),p->printerName()); } } @@ -540,7 +540,7 @@ void KMJobViewer::slotPrinterSelected(int prID) { if (prID >= 0 && prID < (int)(m_printers.count()+1)) { - TQString prname = (prID == 0 ? i18n("All Printers") : m_printers.tqat(prID-1)->printerName()); + TQString prname = (prID == 0 ? i18n("All Printers") : m_printers.at(prID-1)->printerName()); emit printerChanged(this, prname); } } diff --git a/tdeprint/management/kmlistview.cpp b/tdeprint/management/kmlistview.cpp index 4332a8678..4bddf9203 100644 --- a/tdeprint/management/kmlistview.cpp +++ b/tdeprint/management/kmlistview.cpp @@ -89,7 +89,7 @@ void KMListViewItem::updatePrinter(KMPrinter *p) } setDiscarded(false); if (update) - tqrepaint(); + repaint(); } void KMListViewItem::paintCell(TQPainter *p, const TQColorGroup& cg, int c, int w, int a) @@ -216,7 +216,7 @@ void KMListView::setPrinterList(TQPtrList *list) TQPtrList deleteList; deleteList.setAutoDelete(true); for (uint i=0; iisDiscarded()) + if (m_items.at(i)->isDiscarded()) { // instance items are put in front of the list // so that they are destroyed first diff --git a/tdeprint/management/kmwdriverselect.cpp b/tdeprint/management/kmwdriverselect.cpp index e3d253660..88b9410d5 100644 --- a/tdeprint/management/kmwdriverselect.cpp +++ b/tdeprint/management/kmwdriverselect.cpp @@ -93,7 +93,7 @@ void KMWDriverSelect::updatePrinter(KMPrinter *p) int index = m_list->currentItem(); if (m_entries && index >= 0 && index < (int)(m_entries->count())) { - KMDBEntry *entry = m_entries->tqat(index); + KMDBEntry *entry = m_entries->at(index); p->setDbEntry(entry); p->setDriverInfo(entry->description); } @@ -107,8 +107,8 @@ void KMWDriverSelect::updatePrinter(KMPrinter *p) void KMWDriverSelect::slotDriverComment() { int index = m_list->currentItem(); - if (m_entries && index >=0 && index < (int)(m_entries->count()) && !m_entries->tqat(index)->drivercomment.isEmpty()) - KMessageBox::information(this, m_entries->tqat(index)->drivercomment, TQString::null, TQString::null, KMessageBox::AllowLink); + if (m_entries && index >=0 && index < (int)(m_entries->count()) && !m_entries->at(index)->drivercomment.isEmpty()) + KMessageBox::information(this, m_entries->at(index)->drivercomment, TQString::null, TQString::null, KMessageBox::AllowLink); else KMessageBox::error(this, i18n("No information about the selected driver.")); } diff --git a/tdeprint/management/kmwinfobase.cpp b/tdeprint/management/kmwinfobase.cpp index 993576334..218d077ee 100644 --- a/tdeprint/management/kmwinfobase.cpp +++ b/tdeprint/management/kmwinfobase.cpp @@ -56,19 +56,19 @@ void KMWInfoBase::setInfo(const TQString& s) void KMWInfoBase::setLabel(int i, const TQString& s) { if (i >= 0 && i < m_nlines) - m_labels.tqat(i)->setText(s); + m_labels.at(i)->setText(s); } void KMWInfoBase::setText(int i, const TQString& s) { if (i >= 0 && i < m_nlines) - m_edits.tqat(i)->setText(s); + m_edits.at(i)->setText(s); } TQString KMWInfoBase::text(int i) { if (i >= 0 && i < m_nlines) - return m_edits.tqat(i)->text(); + return m_edits.at(i)->text(); return TQString::null; } @@ -76,15 +76,15 @@ void KMWInfoBase::setCurrent(int i) { if (i >= 0 && i < m_nlines) { - m_edits.tqat(i)->selectAll(); - m_edits.tqat(i)->setFocus(); + m_edits.at(i)->selectAll(); + m_edits.at(i)->setFocus(); } } TQLineEdit* KMWInfoBase::lineEdit( int i ) { if ( i >= 0 && i < m_nlines ) - return m_edits.tqat( i ); + return m_edits.at( i ); else return NULL; } diff --git a/tdeprint/tests/drawdemo.cpp b/tdeprint/tests/drawdemo.cpp index 20fc3d12e..443cc89e8 100644 --- a/tdeprint/tests/drawdemo.cpp +++ b/tdeprint/tests/drawdemo.cpp @@ -78,7 +78,7 @@ void drawFonts( TQPainter *p ) // -// This function draws some tqshapes +// This function draws some shapes // void drawShapes( TQPainter *p ) @@ -115,7 +115,7 @@ struct DrawThing { DrawThing ourDrawFunctions[] = { { drawColorWheel, "Draw color wheel" }, { drawFonts, "Draw fonts" }, - { drawShapes, "Draw tqshapes" }, + { drawShapes, "Draw shapes" }, { 0, 0 } }; diff --git a/tdesu/process.cpp b/tdesu/process.cpp index 09deda5bf..692c01553 100644 --- a/tdesu/process.cpp +++ b/tdesu/process.cpp @@ -524,7 +524,7 @@ int PtyProcess::waitForChild() fputs(output, stdout); fflush(stdout); } - lineStart = output.tqat( output.length() - 1 ) == '\n'; + lineStart = output.at( output.length() - 1 ) == '\n'; output = readAll(false); } } diff --git a/tdeui/kaboutdialog.cpp b/tdeui/kaboutdialog.cpp index c7aaca01a..b1db10f12 100644 --- a/tdeui/kaboutdialog.cpp +++ b/tdeui/kaboutdialog.cpp @@ -890,7 +890,7 @@ void KAboutContainer::addPerson( const TQString &_name, const TQString &_email, } -void KAboutContainer::addTitle( const TQString &title, int tqalignment, +void KAboutContainer::addTitle( const TQString &title, int alignment, bool showFrame, bool showBold ) { @@ -905,11 +905,11 @@ void KAboutContainer::addTitle( const TQString &title, int tqalignment, { label->setFrameStyle(TQFrame::Panel | TQFrame::Raised); } - label->setAlignment( tqalignment ); + label->setAlignment( alignment ); } -void KAboutContainer::addImage( const TQString &fileName, int tqalignment ) +void KAboutContainer::addImage( const TQString &fileName, int alignment ) { if( fileName.isNull() ) { @@ -924,7 +924,7 @@ void KAboutContainer::addImage( const TQString &fileName, int tqalignment ) pix = logo; label->setPixmap( pix ); } - label->setAlignment( tqalignment ); + label->setAlignment( alignment ); } #if 0 diff --git a/tdeui/kaboutdialog.h b/tdeui/kaboutdialog.h index 01a515959..6f0d80149 100644 --- a/tdeui/kaboutdialog.h +++ b/tdeui/kaboutdialog.h @@ -62,9 +62,9 @@ class TDEUI_EXPORT KAboutContainer : public TQFrame const TQString &url, const TQString &task, bool showHeader = false, bool showframe = false, bool showBold = false ); - void addTitle( const TQString &title, int tqalignment=AlignLeft, + void addTitle( const TQString &title, int alignment=AlignLeft, bool showframe = false, bool showBold = false ); - void addImage( const TQString &fileName, int tqalignment=AlignLeft ); + void addImage( const TQString &fileName, int alignment=AlignLeft ); virtual TQSize sizeHint( void ) const; virtual TQSize minimumSizeHint( void ) const; diff --git a/tdeui/kactionclasses.cpp b/tdeui/kactionclasses.cpp index 8c3453fb3..c8b861e12 100644 --- a/tdeui/kactionclasses.cpp +++ b/tdeui/kactionclasses.cpp @@ -628,7 +628,7 @@ void KSelectAction::updateItems( int id ) for( ; it != lst.end(); ++it ) cb->insertItem( *it ); // qt caches and never recalculates the sizeHint() - // qcombobox.cpp recommends calling setFont to tqinvalidate the sizeHint + // qcombobox.cpp recommends calling setFont to invalidate the sizeHint // setFont sets own_font = True, so we're a bit mean and calll // unsetFont which calls setFont and then overwrites the own_font cb->unsetFont(); diff --git a/tdeui/kactioncollection.cpp b/tdeui/kactioncollection.cpp index 23cc55917..ba809087c 100644 --- a/tdeui/kactioncollection.cpp +++ b/tdeui/kactioncollection.cpp @@ -250,8 +250,8 @@ void KActionCollection::removeWidget( TQWidget* w ) } delete pKAccel; - d->m_widgetList.remove( d->m_widgetList.tqat( i ) ); - d->m_kaccelList.remove( d->m_kaccelList.tqat( i ) ); + d->m_widgetList.remove( d->m_widgetList.at( i ) ); + d->m_kaccelList.remove( d->m_kaccelList.at( i ) ); if( d->m_iWidgetCurrent == (int)i ) d->m_iWidgetCurrent = -1; @@ -402,7 +402,7 @@ KAction* KActionCollection::action( int index ) const TQAsciiDictIterator it( d->m_actionDict ); it += index; return it.current(); -// return d->m_actions.tqat( index ); +// return d->m_actions.at( index ); } bool KActionCollection::readShortcutSettings( const TQString& sConfigGroup, KConfigBase* pConfig ) diff --git a/tdeui/kanimwidget.cpp b/tdeui/kanimwidget.cpp index d538bea20..899ba7bd3 100644 --- a/tdeui/kanimwidget.cpp +++ b/tdeui/kanimwidget.cpp @@ -74,7 +74,7 @@ void KAnimWidget::stop() { d->current_frame = 0; d->timer.stop(); - tqrepaint(); + repaint(); } void KAnimWidget::setSize( int size ) @@ -162,7 +162,7 @@ void KAnimWidget::slotTimerUpdate() // We have to clear the widget when repainting a transparent image // By doing it like this we get a bit of flicker though. A better // way might be to merge it with the background in drawContents. - tqrepaint(d->transparent); + repaint(d->transparent); } void KAnimWidget::drawContents( TQPainter *p ) diff --git a/tdeui/karrowbutton.cpp b/tdeui/karrowbutton.cpp index d691b6cfa..4808bcd54 100644 --- a/tdeui/karrowbutton.cpp +++ b/tdeui/karrowbutton.cpp @@ -49,7 +49,7 @@ void KArrowButton::setArrowType(Qt::ArrowType a) { if (d->arrow != a) { d->arrow = a; - tqrepaint(); + repaint(); } } Qt::ArrowType KArrowButton::arrowType() const diff --git a/tdeui/karrowbutton.h b/tdeui/karrowbutton.h index 90f56d9bb..0719f8bc1 100644 --- a/tdeui/karrowbutton.h +++ b/tdeui/karrowbutton.h @@ -28,7 +28,7 @@ class KArrowButtonPrivate; * @short Draws a button with an arrow. * * Draws a button which shows an arrow pointing into a certain direction. The - * arrow's tqalignment on the button depends on the direction it's pointing to, + * arrow's alignment on the button depends on the direction it's pointing to, * e.g. a left arrow is aligned at the left border, a upwards arrow at the top * border. This class honors the currently configured KStyle when drawing * the arrow. @@ -72,7 +72,7 @@ class TDEUI_EXPORT KArrowButton : public TQPushButton void setArrowTp( int tp ) { setArrowType( (Qt::ArrowType) tp ); } public slots: /** - * Defines in what direction the arrow is pointing to. Will tqrepaint the + * Defines in what direction the arrow is pointing to. Will repaint the * button if necessary. * * @param a The direction this arrow should be pointing in diff --git a/tdeui/kcharselect.cpp b/tdeui/kcharselect.cpp index f20fdc004..e8ff5e6c3 100644 --- a/tdeui/kcharselect.cpp +++ b/tdeui/kcharselect.cpp @@ -493,7 +493,7 @@ void KCharSelect::fillFontCombo() fontDataBase = new TQFontDatabase(); qAddPostRoutine( cleanupFontDatabase ); } - fontList=fontDataBase->tqfamilies(); + fontList=fontDataBase->families(); fontCombo->insertStringList( fontList ); } diff --git a/tdeui/kcolorbutton.cpp b/tdeui/kcolorbutton.cpp index e697276d8..4d3db2983 100644 --- a/tdeui/kcolorbutton.cpp +++ b/tdeui/kcolorbutton.cpp @@ -85,7 +85,7 @@ void KColorButton::setColor( const TQColor &c ) { if ( col != c ) { col = c; - tqrepaint( false ); + repaint( false ); emit changed( col ); } } diff --git a/tdeui/kcolordialog.cpp b/tdeui/kcolordialog.cpp index efdad2385..ac0251107 100644 --- a/tdeui/kcolordialog.cpp +++ b/tdeui/kcolordialog.cpp @@ -1479,7 +1479,7 @@ void KColorDialog::showColor( const KColor &color, const TQString &name ) d->valuePal->setValue( v ); d->valuePal->updateContents(); d->valuePal->blockSignals(false); - d->valuePal->tqrepaint( false ); + d->valuePal->repaint( false ); d->bRecursion = false; } diff --git a/tdeui/kcompletionbox.cpp b/tdeui/kcompletionbox.cpp index 988c1f1cc..069a1733f 100644 --- a/tdeui/kcompletionbox.cpp +++ b/tdeui/kcompletionbox.cpp @@ -485,7 +485,7 @@ void KCompletionBox::setItems( const TQStringList& items ) } else { //Keep track of whether we need to change anything, - //so we can avoid a tqrepaint for identical updates, + //so we can avoid a repaint for identical updates, //to reduce flicker bool dirty = false; diff --git a/tdeui/kcursor.h b/tdeui/kcursor.h index 7be14601b..538cdcd72 100644 --- a/tdeui/kcursor.h +++ b/tdeui/kcursor.h @@ -33,7 +33,7 @@ class TQWidget; * * A wrapper around TQCursor that allows for "themed" cursors. * - * Currently, the only themed cursor is a hand tqshaped cursor. + * Currently, the only themed cursor is a hand shaped cursor. * * A typical usage would be * \code diff --git a/tdeui/kdatetbl.cpp b/tdeui/kdatetbl.cpp index 69fbc083b..9387a6322 100644 --- a/tdeui/kdatetbl.cpp +++ b/tdeui/kdatetbl.cpp @@ -815,7 +815,7 @@ KDateInternalMonthPicker::contentsMouseMoveEvent(TQMouseEvent *e) updateCell( row, col /*, false */ ); // mark the new active cell } } - if ( tmpRow > -1 ) // tqrepaint the former active cell + if ( tmpRow > -1 ) // repaint the former active cell updateCell( tmpRow, tmpCol /*, true */ ); } } @@ -1006,7 +1006,7 @@ int KPopupFrame::exec(TQPoint pos) { popup(pos); - tqrepaint(); + repaint(); d->exec = true; const TQGuardedPtr that = TQT_TQOBJECT(this); tqApp->enter_loop(); diff --git a/tdeui/kdialogbase.h b/tdeui/kdialogbase.h index d89b8c67e..f0da150b6 100644 --- a/tdeui/kdialogbase.h +++ b/tdeui/kdialogbase.h @@ -100,7 +100,7 @@ class KDialogBaseTile; * signals that are related to the standard action buttons will be used * when you don't use these buttons. * - * Dialog tqshapes:\n + * Dialog shapes:\n * * You can either use one of the prebuilt, easy to use, faces or * define your own main widget. The dialog provides ready to use @@ -733,7 +733,7 @@ class TDEUI_EXPORT KDialogBase : public KDialog * Sets the page with @p index to be displayed. * * This method will only - * work when the dialog is using the predefined tqshape of TreeList, + * work when the dialog is using the predefined shape of TreeList, * IconList or Tabbed. * * @param index Index of the page to be shown. @@ -745,7 +745,7 @@ class TDEUI_EXPORT KDialogBase : public KDialog * Returns the index of the active page. * * This method will only work when the dialog is using the - * predefined tqshape of Tabbed, TreeList or IconList. + * predefined shape of Tabbed, TreeList or IconList. * * @return The page index or -1 if there is no active page. */ @@ -1167,7 +1167,7 @@ class TDEUI_EXPORT KDialogBase : public KDialog * set it as a minimum size for the resulting dialog. * * You should not need to use this method and never if you use one of - * the predefined tqshapes. + * the predefined shapes. * * @param w The width of you special widget. * @param h The height of you special widget. diff --git a/tdeui/kdockwidget.cpp b/tdeui/kdockwidget.cpp index 219cfd0f6..88af16eb0 100644 --- a/tdeui/kdockwidget.cpp +++ b/tdeui/kdockwidget.cpp @@ -1497,7 +1497,7 @@ void KDockWidget::setDockTabName( KDockTabGroup* tab ) tab->parentWidget()->setName( listOfName.utf8() ); tab->parentWidget()->setCaption( listOfCaption ); - tab->parentWidget()->tqrepaint( false ); // KDockWidget->tqrepaint + tab->parentWidget()->repaint( false ); // KDockWidget->repaint if ( tab->parentWidget()->parent() ) if ( tab->parentWidget()->parent()->inherits("KDockSplitter") ) ((KDockSplitter*)(tab->parentWidget()->parent()))->updateName(); @@ -1570,7 +1570,7 @@ void KDockWidget::loseFormerBrotherDockWidget() TQObject::disconnect( formerBrotherDockWidget, TQT_SIGNAL(iMBeingClosed()), this, TQT_SLOT(loseFormerBrotherDockWidget()) ); formerBrotherDockWidget = 0L; - tqrepaint(); + repaint(); } void KDockWidget::dockBack() @@ -1910,7 +1910,7 @@ void KDockManager::findChildDockWidget( TQWidget*& ww, const TQWidget* p, const while ( it.current() ) { if ( it.current()->isWidgetType() ) { w = (TQWidget*)it.current(); - if ( w->isVisible() && w->tqgeometry().contains(pos) ) { + if ( w->isVisible() && w->geometry().contains(pos) ) { if ( w->inherits("KDockWidget") ) ww = w; findChildDockWidget( ww, w, w->mapFromParent(pos) ); return; @@ -2950,7 +2950,7 @@ void KDockManager::slotMenuPopup() void KDockManager::slotMenuActivated( int id ) { - MenuDockData* data = menuData->tqat( id ); + MenuDockData* data = menuData->at( id ); data->dock->changeHideShowState(); } @@ -3121,7 +3121,7 @@ void KDockArea::resizeEvent(TQResizeEvent *rsize) // for (unsigned int i=0;icount();i++) { // TQPtrList list(children()); -// TQObject *obj=((TQPtrList)children())->tqat(i); +// TQObject *obj=((TQPtrList)children())->at(i); TQObject *obj=children()->getFirst(); if (split = tqt_dynamic_cast(obj)) { @@ -3272,7 +3272,7 @@ void KDockContainer::prepareSave(TQStringList &names) names.remove(tmp->data); // for (uint i=0;itqrepaint(true); + divider->repaint(true); } } } else { @@ -529,7 +529,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e) if (tmp_xpos != xpos) { xpos = tmp_xpos; resizeEvent(0); - divider->tqrepaint(true); + divider->repaint(true); } } } @@ -546,7 +546,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e) } xpos = factor* checkValue( mapFromGlobal(mev->globalPos()).y() ) / height(); resizeEvent(0); - divider->tqrepaint(true); + divider->repaint(true); } else { if ((fixedWidth0!=-1) || (fixedWidth1!=-1)) { @@ -554,7 +554,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e) } xpos = factor* checkValue( mapFromGlobal(mev->globalPos()).x() ) / width(); resizeEvent(0); - divider->tqrepaint(true); + divider->repaint(true); } handled= true; break; @@ -587,7 +587,7 @@ void KDockSplitter::updateName() TQString new_name = TQString( child0->name() ) + "," + child1->name(); parentWidget()->setName( new_name.latin1() ); parentWidget()->setCaption( child0->caption() + "," + child1->caption() ); - parentWidget()->tqrepaint( false ); + parentWidget()->repaint( false ); ((KDockWidget*)parentWidget())->firstName = child0->name(); ((KDockWidget*)parentWidget())->lastName = child1->name(); @@ -661,13 +661,13 @@ void KDockButton_Private::drawButton( TQPainter* p ) void KDockButton_Private::enterEvent( TQEvent * ) { moveMouse = true; - tqrepaint(); + repaint(); } void KDockButton_Private::leaveEvent( TQEvent * ) { moveMouse = false; - tqrepaint(); + repaint(); } /*************************************************************************/ diff --git a/tdeui/kdualcolorbutton.cpp b/tdeui/kdualcolorbutton.cpp index 27cd28f43..f6d49a97e 100644 --- a/tdeui/kdualcolorbutton.cpp +++ b/tdeui/kdualcolorbutton.cpp @@ -112,7 +112,7 @@ TQSize KDualColorButton::sizeHint() const void KDualColorButton::setForeground(const TQColor &c) { fg = TQBrush(c, Qt::SolidPattern); - tqrepaint(false); + repaint(false); emit fgChanged(fg.color()); } @@ -120,7 +120,7 @@ void KDualColorButton::setForeground(const TQColor &c) void KDualColorButton::setBackground(const TQColor &c) { bg = TQBrush(c, Qt::SolidPattern); - tqrepaint(false); + repaint(false); emit bgChanged(bg.color()); } @@ -131,13 +131,13 @@ void KDualColorButton::setCurrentColor(const TQColor &c) bg = TQBrush(c, Qt::SolidPattern); else fg = TQBrush(c, Qt::SolidPattern); - tqrepaint(false); + repaint(false); } void KDualColorButton::setCurrent(DualColor s) { curColor = s; - tqrepaint(false); + repaint(false); } void KDualColorButton::metrics(TQRect &fgRect, TQRect &bgRect) @@ -181,7 +181,7 @@ void KDualColorButton::dropEvent(TQDropEvent *ev) bg.setColor(c); emit(bgChanged(c)); } - tqrepaint(false); + repaint(false); } } @@ -217,7 +217,7 @@ void KDualColorButton::mousePressEvent(TQMouseEvent *ev) emit bgChanged(bg.color()); miniCtlFlag = true; } - tqrepaint(false); + repaint(false); } @@ -270,7 +270,7 @@ void KDualColorButton::mouseReleaseEvent(TQMouseEvent *ev) } } } - tqrepaint(false); + repaint(false); dragFlag = false; } else diff --git a/tdeui/keditcl1.cpp b/tdeui/keditcl1.cpp index 3e03fc019..a8d9f5953 100644 --- a/tdeui/keditcl1.cpp +++ b/tdeui/keditcl1.cpp @@ -104,7 +104,7 @@ KEdit::insertText(TQTextStream *stream) // MS: read everything at once if file <= 1MB, // else read in 5000-line chunks to keep memory usage acceptable. - TQIODevice *dev=stream->tqdevice(); + TQIODevice *dev=stream->device(); if (dev && dev->size()>(1024*1024)) { while(1) { int i; @@ -128,7 +128,7 @@ KEdit::insertText(TQTextStream *stream) setCursorPosition(saveline, savecol); // setAutoUpdate(true); -// tqrepaint(); +// repaint(); setModified(true); setFocus(); @@ -200,7 +200,7 @@ KEdit::cleanWhiteSpace() { deselect(); d->autoUpdate = true; - tqrepaint(); + repaint(); return; } if (wordWrap() == NoWrap) @@ -225,7 +225,7 @@ KEdit::cleanWhiteSpace() insert(newText); d->autoUpdate = true; - tqrepaint(); + repaint(); setModified(true); setFocus(); diff --git a/tdeui/kfontdialog.cpp b/tdeui/kfontdialog.cpp index 147b63901..1fcb3a2f2 100644 --- a/tdeui/kfontdialog.cpp +++ b/tdeui/kfontdialog.cpp @@ -641,7 +641,7 @@ void KFontChooser::setupDisplay() void KFontChooser::getFontList( TQStringList &list, uint fontListCriteria) { TQFontDatabase dbase; - TQStringList lstSys(dbase.tqfamilies()); + TQStringList lstSys(dbase.families()); // if we have criteria; then check fonts before adding if (fontListCriteria) diff --git a/tdeui/kjanuswidget.cpp b/tdeui/kjanuswidget.cpp index 0bf5199ff..a11cbbaf2 100644 --- a/tdeui/kjanuswidget.cpp +++ b/tdeui/kjanuswidget.cpp @@ -518,7 +518,7 @@ bool KJanusWidget::setSwallowedWidget( TQWidget *widget ) TQObjectList l = mSwallowPage->childrenListObject(); // silence please for( uint i=0; i < l.count(); i++ ) { - TQObject *o = l.tqat(i); + TQObject *o = l.at(i); if( o->isWidgetType() ) { ((TQWidget*)o)->hide(); diff --git a/tdeui/kkeybutton.cpp b/tdeui/kkeybutton.cpp index 7a51d47f0..6626a9a46 100644 --- a/tdeui/kkeybutton.cpp +++ b/tdeui/kkeybutton.cpp @@ -106,7 +106,7 @@ void KKeyButton::captureShortcut() KShortcut cut; m_bEditing = true; - tqrepaint(); + repaint(); { KShortcutDialog dlg( m_cut, d->bQtShortcut, this ); @@ -117,7 +117,7 @@ void KKeyButton::captureShortcut() emit capturedShortcut( cut ); m_bEditing = false; - tqrepaint(); + repaint(); } void KKeyButton::drawButton( TQPainter *painter ) diff --git a/tdeui/kkeydialog.cpp b/tdeui/kkeydialog.cpp index 84d367a65..0518d870c 100644 --- a/tdeui/kkeydialog.cpp +++ b/tdeui/kkeydialog.cpp @@ -532,7 +532,7 @@ void KKeyChooser::updateButtons() d->pbtnShortcut->setShortcut( pItem->shortcut(), bQtShortcut ); //item->setText( 1, keyStrCfg ); - pItem->tqrepaint(); + pItem->repaint(); d->lInfo->setText( i18n("Default key:") + TQString(" %1").arg(keyStrDef.isEmpty() ? i18n("None") : keyStrDef) ); // Select the appropriate radio button. diff --git a/tdeui/klanguagebutton.cpp b/tdeui/klanguagebutton.cpp index 07cdc6db3..abbc4f5d3 100644 --- a/tdeui/klanguagebutton.cpp +++ b/tdeui/klanguagebutton.cpp @@ -191,7 +191,7 @@ void KLanguageButton::slotActivated( int index ) setCurrentItem( index ); // Forward event from popup menu as if it was emitted from this widget: - TQString id = *m_ids->tqat( index ); + TQString id = *m_ids->at( index ); emit activated( id ); } @@ -199,7 +199,7 @@ void KLanguageButton::slotHighlighted( int index ) { //kdDebug() << "slotHighlighted" << index << endl; - TQString id = *m_ids->tqat( index ); + TQString id = *m_ids->at( index ); emit ( highlighted(id) ); } @@ -237,7 +237,7 @@ bool KLanguageButton::contains( const TQString & id ) const TQString KLanguageButton::current() const { - return *m_ids->tqat( currentItem() ); + return *m_ids->at( currentItem() ); } @@ -248,7 +248,7 @@ TQString KLanguageButton::id( int i ) const kdDebug() << "KLanguageButton::tag(), unknown tag " << i << endl; return TQString::null; } - return *m_ids->tqat( i ); + return *m_ids->at( i ); } diff --git a/tdeui/kled.cpp b/tdeui/kled.cpp index 71b6e00c1..7dd45f107 100644 --- a/tdeui/kled.cpp +++ b/tdeui/kled.cpp @@ -51,7 +51,7 @@ KLed::KLed(TQWidget *parent, const char *name) : TQWidget( parent, name), led_state(On), led_look(Raised), - led_tqshape(Circular) + led_shape(Circular) { TQColor col(green); d = new KLed::KLedPrivate; @@ -68,7 +68,7 @@ KLed::KLed(const TQColor& col, TQWidget *parent, const char *name) : TQWidget( parent, name), led_state(On), led_look(Raised), - led_tqshape(Circular) + led_shape(Circular) { d = new KLed::KLedPrivate; d->dark_factor = 300; @@ -81,11 +81,11 @@ KLed::KLed(const TQColor& col, TQWidget *parent, const char *name) } KLed::KLed(const TQColor& col, KLed::State state, - KLed::Look look, KLed::Shape tqshape, TQWidget *parent, const char *name ) + KLed::Look look, KLed::Shape shape, TQWidget *parent, const char *name ) : TQWidget(parent, name), led_state(state), led_look(look), - led_tqshape(tqshape) + led_shape(shape) { d = new KLed::KLedPrivate; d->dark_factor = 300; @@ -93,7 +93,7 @@ KLed::KLed(const TQColor& col, KLed::State state, d->off_map = 0; d->on_map = 0; - //setShape(tqshape); + //setShape(shape); setColor(col); } @@ -114,7 +114,7 @@ KLed::paintEvent(TQPaintEvent *) t.start(); for (int i=0; isetSelected(true); - currentItem()->tqrepaint(); + currentItem()->repaint(); emit selectionChanged(); }; } @@ -736,7 +736,7 @@ void KListView::focusOutEvent( TQFocusEvent *fe ) && (!d->editor->isVisible())) { currentItem()->setSelected(false); - currentItem()->tqrepaint(); + currentItem()->repaint(); emit selectionChanged(); }; @@ -776,7 +776,7 @@ void KListView::contentsMousePressEvent( TQMouseEvent *e ) if (currentItem()) { currentItem()->setSelected(false); - currentItem()->tqrepaint(); + currentItem()->repaint(); // emit selectionChanged(); } } @@ -1008,7 +1008,7 @@ void KListView::contentsDragMoveEvent(TQDragMoveEvent *event) { cleanDropVisualizer(); d->mOldDropVisualizer=tmpRect; - viewport()->tqrepaint(tmpRect); + viewport()->repaint(tmpRect); } } if (dropHighlighter()) @@ -1018,7 +1018,7 @@ void KListView::contentsDragMoveEvent(TQDragMoveEvent *event) { cleanItemHighlighter(); d->mOldDropHighlighter=tmpRect; - viewport()->tqrepaint(tmpRect); + viewport()->repaint(tmpRect); } } } @@ -1045,7 +1045,7 @@ void KListView::cleanDropVisualizer() { TQRect rect=d->mOldDropVisualizer; d->mOldDropVisualizer = TQRect(); - viewport()->tqrepaint(rect, true); + viewport()->repaint(rect, true); } } @@ -1371,7 +1371,7 @@ void KListView::cleanItemHighlighter () { TQRect rect=d->mOldDropHighlighter; d->mOldDropHighlighter = TQRect(); - viewport()->tqrepaint(rect, true); + viewport()->repaint(rect, true); } } @@ -1482,7 +1482,7 @@ void KListView::activateAutomaticSelection() if (currentItem()) { currentItem()->setSelected(true); - currentItem()->tqrepaint(); + currentItem()->repaint(); emit selectionChanged(); }; } @@ -1816,12 +1816,12 @@ void KListView::fileManagerKeyPressEvent (TQKeyEvent* e) { // rectangle to be repainted if ( ir.x() < 0 ) ir.moveBy( -ir.x(), 0 ); - viewport()->tqrepaint( ir, false ); + viewport()->repaint( ir, false ); } /*if (repaintItem1) - repaintItem1->tqrepaint(); + repaintItem1->repaint(); if (repaintItem2) - repaintItem2->tqrepaint();*/ + repaintItem2->repaint();*/ update(); if (emitSelectionChanged) emit selectionChanged(); @@ -2001,13 +2001,13 @@ const TQColor &KListView::alternateBackground() const void KListView::setAlternateBackground(const TQColor &c) { d->alternateBackground = c; - tqrepaint(); + repaint(); } void KListView::setShadeSortColumn(bool shadeSortColumn) { d->shadeSortColumn = shadeSortColumn; - tqrepaint(); + repaint(); } bool KListView::shadeSortColumn() const @@ -2335,7 +2335,7 @@ bool KListViewItem::isAlternate() return false; } -void KListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment) +void KListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment) { TQColorGroup _cg = cg; TQListView* lv = listView(); @@ -2353,7 +2353,7 @@ void KListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, TQColorGroup::Background : TQColorGroup::Base, backgroundColor(column)); } - TQListViewItem::paintCell(p, _cg, column, width, tqalignment); + TQListViewItem::paintCell(p, _cg, column, width, alignment); } void KListView::virtual_hook( int, void* ) diff --git a/tdeui/klistview.h b/tdeui/klistview.h index 4795299ed..ed101927f 100644 --- a/tdeui/klistview.h +++ b/tdeui/klistview.h @@ -1070,7 +1070,7 @@ public: TQColor backgroundColor(int column); virtual void paintCell(TQPainter *p, const TQColorGroup &cg, - int column, int width, int tqalignment); + int column, int width, int alignment); private: void init(); diff --git a/tdeui/knuminput.cpp b/tdeui/knuminput.cpp index 19c3268af..27b86f98e 100644 --- a/tdeui/knuminput.cpp +++ b/tdeui/knuminput.cpp @@ -86,7 +86,7 @@ void KNumInput::init() m_label = 0; m_slider = 0; - m_tqalignment = 0; + m_alignment = 0; } KNumInput::~KNumInput() @@ -103,17 +103,17 @@ void KNumInput::setLabel(const TQString & label, int a) if(label.isEmpty()) { delete m_label; m_label = 0; - m_tqalignment = 0; + m_alignment = 0; } else { if (m_label) m_label->setText(label); else m_label = new TQLabel(label, this, "KNumInput::TQLabel"); m_label->setAlignment((a & (~(AlignTop|AlignBottom|AlignVCenter))) | AlignVCenter); - // if no vertical tqalignment set, use Top tqalignment + // if no vertical alignment set, use Top alignment if(!(a & (AlignTop|AlignBottom|AlignVCenter))) a |= AlignTop; - m_tqalignment = a; + m_alignment = a; } layout(true); @@ -133,7 +133,7 @@ void KNumInput::layout(bool deep) // label sizeHint m_sizeLabel = (m_label ? m_label->sizeHint() : TQSize(0,0)); - if(m_label && (m_tqalignment & AlignVCenter)) + if(m_label && (m_alignment & AlignVCenter)) m_colw1 = m_sizeLabel.width() + 4; else m_colw1 = 0; @@ -422,7 +422,7 @@ TQSize KIntNumInput::minimumSizeHint() const h = 2 + QMAX(m_sizeSpin.height(), m_sizeSlider.height()); // if in extra row, then count it here - if(m_label && (m_tqalignment & (AlignBottom|AlignTop))) + if(m_label && (m_alignment & (AlignBottom|AlignTop))) h += 4 + m_sizeLabel.height(); else // label is in the same row as the other widgets @@ -431,7 +431,7 @@ TQSize KIntNumInput::minimumSizeHint() const w = m_slider ? m_slider->sizeHint().width() + 8 : 0; w += m_colw1 + m_colw2; - if(m_tqalignment & (AlignTop|AlignBottom)) + if(m_alignment & (AlignTop|AlignBottom)) w = QMAX(w, m_sizeLabel.width() + 4); return TQSize(w, h); @@ -451,12 +451,12 @@ void KIntNumInput::resizeEvent(TQResizeEvent* e) int w = m_colw1; int h = 0; - if(m_label && (m_tqalignment & AlignTop)) { + if(m_label && (m_alignment & AlignTop)) { m_label->setGeometry(0, 0, e->size().width(), m_sizeLabel.height()); h += m_sizeLabel.height() + KDialog::spacingHint(); } - if(m_label && (m_tqalignment & AlignVCenter)) + if(m_label && (m_alignment & AlignVCenter)) m_label->setGeometry(0, 0, w, m_sizeSpin.height()); if (tqApp->reverseLayout()) @@ -477,7 +477,7 @@ void KIntNumInput::resizeEvent(TQResizeEvent* e) h += m_sizeSpin.height() + 2; - if(m_label && (m_tqalignment & AlignBottom)) + if(m_label && (m_alignment & AlignBottom)) m_label->setGeometry(0, h, m_sizeLabel.width(), m_sizeLabel.height()); } @@ -663,7 +663,7 @@ TQSize KDoubleNumInput::minimumSizeHint() const h = 2 + QMAX(m_sizeEdit.height(), m_sizeSlider.height()); // if in extra row, then count it here - if(m_label && (m_tqalignment & (AlignBottom|AlignTop))) + if(m_label && (m_alignment & (AlignBottom|AlignTop))) h += 4 + m_sizeLabel.height(); else // label is in the same row as the other widgets @@ -672,7 +672,7 @@ TQSize KDoubleNumInput::minimumSizeHint() const w = m_slider ? m_slider->sizeHint().width() + 8 : 0; w += m_colw1 + m_colw2; - if(m_tqalignment & (AlignTop|AlignBottom)) + if(m_alignment & (AlignTop|AlignBottom)) w = QMAX(w, m_sizeLabel.width() + 4); return TQSize(w, h); @@ -683,12 +683,12 @@ void KDoubleNumInput::resizeEvent(TQResizeEvent* e) int w = m_colw1; int h = 0; - if(m_label && (m_tqalignment & AlignTop)) { + if(m_label && (m_alignment & AlignTop)) { m_label->setGeometry(0, 0, e->size().width(), m_sizeLabel.height()); h += m_sizeLabel.height() + 4; } - if(m_label && (m_tqalignment & AlignVCenter)) + if(m_label && (m_alignment & AlignVCenter)) m_label->setGeometry(0, 0, w, m_sizeEdit.height()); if (tqApp->reverseLayout()) @@ -713,7 +713,7 @@ void KDoubleNumInput::resizeEvent(TQResizeEvent* e) h += m_sizeEdit.height() + 2; - if(m_label && (m_tqalignment & AlignBottom)) + if(m_label && (m_alignment & AlignBottom)) m_label->setGeometry(0, h, m_sizeLabel.width(), m_sizeLabel.height()); } diff --git a/tdeui/knuminput.h b/tdeui/knuminput.h index c0a6d1847..5f0127cda 100644 --- a/tdeui/knuminput.h +++ b/tdeui/knuminput.h @@ -68,7 +68,7 @@ public: ~KNumInput(); /** - * Sets the text and tqalignment of the main description label. + * Sets the text and alignment of the main description label. * * @param label The text of the label. * Use TQString::null to remove an existing one. @@ -77,7 +77,7 @@ public: * @p AlignTop, @p AlignVCenter, @p AlignBottom. * default is @p AlignLeft | @p AlignTop. * - * The vertical tqalignment flags have special meaning with this + * The vertical alignment flags have special meaning with this * widget: * * @li @p AlignTop The label is placed above the edit/slider @@ -144,7 +144,7 @@ protected: TQSlider* m_slider; TQSize m_sizeSlider, m_sizeLabel; - int m_tqalignment; + int m_alignment; private: void init(); @@ -314,7 +314,7 @@ public: /** * This method returns the minimum size necessary to display the * control. The minimum size is enough to show all the labels - * in the current font (font change may tqinvalidate the return value). + * in the current font (font change may invalidate the return value). * * @return the minimum size necessary to show the control */ diff --git a/tdeui/kpanelapplet.cpp b/tdeui/kpanelapplet.cpp index f04cd2177..7ca2999f1 100644 --- a/tdeui/kpanelapplet.cpp +++ b/tdeui/kpanelapplet.cpp @@ -47,7 +47,7 @@ KPanelApplet::KPanelApplet(const TQString& configFile, Type type, : TQFrame(parent, name, f) , _type(type) , _position( pBottom ) - , _tqalignment( LeftTop ) + , _alignment( LeftTop ) , _config(0) , _actions(actions) , d(new KPanelApplet::KPanelAppletPrivate()) @@ -80,8 +80,8 @@ void KPanelApplet::setPosition( Position p ) void KPanelApplet::setAlignment( Alignment a ) { - if( _tqalignment == a ) return; - _tqalignment = a; + if( _alignment == a ) return; + _alignment = a; alignmentChange( a ); } diff --git a/tdeui/kpanelapplet.h b/tdeui/kpanelapplet.h index a51f16fda..0d3ac430f 100644 --- a/tdeui/kpanelapplet.h +++ b/tdeui/kpanelapplet.h @@ -308,9 +308,9 @@ protected: **/ Position position() const { return _position; } /** - * @return the applet's tqalignment. (top/left, center, or bottom/right) + * @return the applet's alignment. (top/left, center, or bottom/right) **/ - Alignment tqalignment() const { return _tqalignment; } + Alignment alignment() const { return _alignment; } /** * The panel on which this applet resides has changed its position. @@ -320,7 +320,7 @@ protected: virtual void positionChange( Position p ); /** - * The panel on which this applet resides has changed its tqalignment. + * The panel on which this applet resides has changed its alignment. * Reimplement this change handler in order to adjust the look of your * applet. **/ @@ -383,7 +383,7 @@ protected: private: Type _type; Position _position; - Alignment _tqalignment; + Alignment _alignment; KConfig* _config; int _actions; protected: diff --git a/tdeui/kpanelextension.cpp b/tdeui/kpanelextension.cpp index e9cd564bd..47ddd7d95 100644 --- a/tdeui/kpanelextension.cpp +++ b/tdeui/kpanelextension.cpp @@ -49,7 +49,7 @@ KPanelExtension::KPanelExtension(const TQString& configFile, Type type, : TQFrame(parent, name) , _type(type) , _position( Top ) - , _tqalignment( LeftTop ) + , _alignment( LeftTop ) , _config(0) , _actions(actions) { @@ -73,8 +73,8 @@ void KPanelExtension::setPosition( Position p ) void KPanelExtension::setAlignment( Alignment a ) { - if( _tqalignment == a ) return; - _tqalignment = a; + if( _alignment == a ) return; + _alignment = a; alignmentChange( a ); } diff --git a/tdeui/kpanelextension.h b/tdeui/kpanelextension.h index 5045d5205..cdc97d14c 100644 --- a/tdeui/kpanelextension.h +++ b/tdeui/kpanelextension.h @@ -282,9 +282,9 @@ protected: Position position() const { return _position; } /** - * @return the extension's tqalignment. (left/top, center, or right/bottom) + * @return the extension's alignment. (left/top, center, or right/bottom) **/ - Alignment tqalignment() const { return _tqalignment; } + Alignment alignment() const { return _alignment; } /** * @return the extensions orientation. (horizontal or vertical) @@ -305,7 +305,7 @@ protected: virtual void positionChange( Position ) {} /** - * This extension has changed its tqalignment. + * This extension has changed its alignment. * Reimplement this change handler in order to adjust the look of your * applet. **/ @@ -333,7 +333,7 @@ protected: private: Type _type; Position _position; - Alignment _tqalignment; + Alignment _alignment; KConfig* _config; int _actions; protected: diff --git a/tdeui/krootpixmap.cpp b/tdeui/krootpixmap.cpp index 8bcd7827b..8b188c480 100644 --- a/tdeui/krootpixmap.cpp +++ b/tdeui/krootpixmap.cpp @@ -68,7 +68,7 @@ void KRootPixmap::init() m_bCustomPaint = false; connect(kapp, TQT_SIGNAL(backgroundChanged(int)), TQT_SLOT(slotBackgroundChanged(int))); - connect(m_pTimer, TQT_SIGNAL(timeout()), TQT_SLOT(tqrepaint())); + connect(m_pTimer, TQT_SIGNAL(timeout()), TQT_SLOT(repaint())); #ifdef Q_WS_X11 connect(m_pPixmap, TQT_SIGNAL(done(bool)), TQT_SLOT(slotDone(bool))); @@ -115,7 +115,7 @@ void KRootPixmap::start() return; } if (m_bInit) - tqrepaint(true); + repaint(true); } @@ -136,7 +136,7 @@ void KRootPixmap::setFadeEffect(double fade, const TQColor &color) m_Fade = fade; m_FadeColor = color; - if ( m_bActive && m_bInit ) tqrepaint(true); + if ( m_bActive && m_bInit ) repaint(true); } void KRootPixmap::setBlurEffect(double radius, double sigma) @@ -191,7 +191,7 @@ void KRootPixmap::desktopChanged(int desktop) if (KWin::windowInfo(m_pWidget->topLevelWidget()->winId()).desktop() == NET::OnAllDesktops && pixmapName(m_Desk) != pixmapName(desktop)) #endif - tqrepaint(true); + repaint(true); } void KRootPixmap::desktopChanged( WId window, unsigned int properties ) @@ -203,16 +203,16 @@ void KRootPixmap::desktopChanged( WId window, unsigned int properties ) #endif kdDebug() << k_funcinfo << endl; - tqrepaint(true); + repaint(true); } -void KRootPixmap::tqrepaint() +void KRootPixmap::repaint() { - tqrepaint(false); + repaint(false); } -void KRootPixmap::tqrepaint(bool force) +void KRootPixmap::repaint(bool force) { TQPoint p1 = m_pWidget->mapToGlobal(m_pWidget->rect().topLeft()); TQPoint p2 = m_pWidget->mapToGlobal(m_pWidget->rect().bottomRight()); @@ -341,7 +341,7 @@ void KRootPixmap::slotBackgroundChanged(int desk) return; if (desk == m_Desk) - tqrepaint(true); + repaint(true); } #include "krootpixmap.moc" diff --git a/tdeui/krootpixmap.h b/tdeui/krootpixmap.h index 8ca135e1f..776863c46 100644 --- a/tdeui/krootpixmap.h +++ b/tdeui/krootpixmap.h @@ -159,16 +159,16 @@ public slots: * Repaints the widget background. Normally, you shouldn't need this * as it is handled automatically. * - * @param force Force a tqrepaint, even if the contents did not change. + * @param force Force a repaint, even if the contents did not change. */ - void tqrepaint( bool force ); + void repaint( bool force ); /** * Repaints the widget background. Normally, you shouldn't need this * as it is handled automatically. This is equivalent to calling - * tqrepaint( false ). + * repaint( false ). */ - void tqrepaint(); + void repaint(); /** * Enables custom handling of the background painting. If custom diff --git a/tdeui/kruler.cpp b/tdeui/kruler.cpp index e9651424b..fed264981 100644 --- a/tdeui/kruler.cpp +++ b/tdeui/kruler.cpp @@ -550,16 +550,16 @@ KRuler::slotNewValue(int _value) return; } // get the rectangular of the old and the new ruler pointer - // and tqrepaint only him + // and repaint only him if (dir == Qt::Horizontal) { TQRect oldrec(-5+oldvalue,10, 11,6); TQRect newrec(-5+_value,10, 11,6); - tqrepaint( oldrec.unite(newrec) ); + repaint( oldrec.unite(newrec) ); } else { TQRect oldrec(10,-5+oldvalue, 6,11); TQRect newrec(10,-5+_value, 6,11); - tqrepaint( oldrec.unite(newrec) ); + repaint( oldrec.unite(newrec) ); } } @@ -569,7 +569,7 @@ KRuler::slotNewOffset(int _offset) if (offset_ != _offset) { //setOffset(_offset); offset_ = _offset; - tqrepaint(contentsRect()); + repaint(contentsRect()); } } @@ -586,7 +586,7 @@ KRuler::slotEndOffset(int offset) } if (d->endOffset_length != tmp) { d->endOffset_length = tmp; - tqrepaint(contentsRect()); + repaint(contentsRect()); } } diff --git a/tdeui/kruler.h b/tdeui/kruler.h index 1c48a36dc..ecfcd7b3d 100644 --- a/tdeui/kruler.h +++ b/tdeui/kruler.h @@ -55,12 +55,12 @@ * To receive mouse clicks or mouse moves, * the class has to be overloaded. * - * For performance reasons, the public methods don't call TQWidget::tqrepaint(). + * For performance reasons, the public methods don't call TQWidget::repaint(). * (Slots do, see documentation below.) * All the changed settings will be painted once after leaving * to the main event loop. * For performance painting the slot methods should be used, - * they do a fast TQWidget::tqrepaint() call after changing the values. + * they do a fast TQWidget::repaint() call after changing the values. * For setting multiple values like minValue(), maxValue(), offset() etc. * using the public methods is recommended * so the widget will be painted only once when entering the main event loop. @@ -428,7 +428,7 @@ public slots: * Sets the pointer to a new position. * * The offset is NOT updated. - * TQWidget::tqrepaint() is called afterwards. + * TQWidget::repaint() is called afterwards. **/ void slotNewValue(int); @@ -436,7 +436,7 @@ public slots: * Sets the ruler marks to a new position. * * The pointer is NOT updated. - * TQWidget::tqrepaint() is called afterwards. + * TQWidget::repaint() is called afterwards. **/ void slotNewOffset(int); diff --git a/tdeui/kselect.cpp b/tdeui/kselect.cpp index 367ebdb1b..cda0c2685 100644 --- a/tdeui/kselect.cpp +++ b/tdeui/kselect.cpp @@ -135,7 +135,7 @@ void KXYSelector::paintEvent( TQPaintEvent *ev ) } else if (paintRect.intersects(cursorRect)) { - tqrepaint( cursorRect, false); + repaint( cursorRect, false); } painter.end(); @@ -392,11 +392,11 @@ void KSelector::drawArrow( TQPainter *painter, bool show, const TQPoint &pos ) { if ( orientation() == Qt::Vertical ) { - tqrepaint(pos.x(), pos.y()-5, 6, 11, true); + repaint(pos.x(), pos.y()-5, 6, 11, true); } else { - tqrepaint(pos.x()-5, pos.y(), 11, 6, true); + repaint(pos.x()-5, pos.y(), 11, 6, true); } } } diff --git a/tdeui/ksharedpixmap.cpp b/tdeui/ksharedpixmap.cpp index d0a74f223..29c670265 100644 --- a/tdeui/ksharedpixmap.cpp +++ b/tdeui/ksharedpixmap.cpp @@ -102,7 +102,7 @@ bool KSharedPixmap::loadFromShared(const TQString & name, const TQRect & rect) // already active return false; - TQPixmap::resize(0, 0); // tqinvalidate + TQPixmap::resize(0, 0); // invalidate TQString str = TQString("KDESHPIXMAP:%1").arg(name); d->selection = XInternAtom(qt_xdisplay(), str.latin1(), true); diff --git a/tdeui/kspell.cpp b/tdeui/kspell.cpp index aa65dc484..7a17ad607 100644 --- a/tdeui/kspell.cpp +++ b/tdeui/kspell.cpp @@ -995,7 +995,7 @@ bool KSpell::check( const TQString &_buffer, bool _usedialog ) // origbuffer since I got errors otherwise if ( !origbuffer.endsWith("\n\n" ) ) { - if (origbuffer.tqat(origbuffer.length()-1)!='\n') + if (origbuffer.at(origbuffer.length()-1)!='\n') { origbuffer+='\n'; origbuffer+='\n'; //shouldn't these be removed at some point? diff --git a/tdeui/kspellui.ui b/tdeui/kspellui.ui index 18b755117..ac1deecd7 100644 --- a/tdeui/kspellui.ui +++ b/tdeui/kspellui.ui @@ -87,7 +87,7 @@ ... the <b>misspelled</b> word shown in context ... - + WordBreak|AlignCenter diff --git a/tdeui/ksqueezedtextlabel.cpp b/tdeui/ksqueezedtextlabel.cpp index 63d85ab8f..f44b38916 100644 --- a/tdeui/ksqueezedtextlabel.cpp +++ b/tdeui/ksqueezedtextlabel.cpp @@ -73,11 +73,11 @@ void KSqueezedTextLabel::squeezeTextToLabel() { } } -void KSqueezedTextLabel::setAlignment( int tqalignment ) +void KSqueezedTextLabel::setAlignment( int alignment ) { // save fullText and restore it TQString tmpFull(fullText); - TQLabel::setAlignment(tqalignment); + TQLabel::setAlignment(alignment); fullText = tmpFull; } diff --git a/tdeui/kstatusbar.h b/tdeui/kstatusbar.h index c481a551a..a1b89d0a7 100644 --- a/tdeui/kstatusbar.h +++ b/tdeui/kstatusbar.h @@ -167,7 +167,7 @@ public: void changeItem( const TQString& text, int id ); /** - * Sets the tqalignment of item @p id. By default all fields are aligned + * Sets the alignment of item @p id. By default all fields are aligned * @p AlignHCenter | @p AlignVCenter. See TQLabel::setAlignment for details. * */ diff --git a/tdeui/ksystemtray.cpp b/tdeui/ksystemtray.cpp index b35924375..100f86df8 100644 --- a/tdeui/ksystemtray.cpp +++ b/tdeui/ksystemtray.cpp @@ -96,7 +96,7 @@ KSystemTray::KSystemTray( TQWidget* parent, const char* name ) d->on_all_desktops = false; } setCaption( KGlobal::instance()->aboutData()->programName()); - setAlignment( tqalignment() | Qt::AlignVCenter | Qt::AlignHCenter ); + setAlignment( alignment() | Qt::AlignVCenter | Qt::AlignHCenter ); // Handle the possibility that the requested system tray size is something other than 22x22 pixels, per the Free Desktop specifications setScaledContents(true); diff --git a/tdeui/ktabbar.cpp b/tdeui/ktabbar.cpp index cfc6ce481..3b54aab99 100644 --- a/tdeui/ktabbar.cpp +++ b/tdeui/ktabbar.cpp @@ -67,7 +67,7 @@ void KTabBar::setTabEnabled( int id, bool enabled ) if ( !enabled && id == currentTab() && count()>1 ) { TQPtrList *tablist = tabList(); if ( mTabCloseActivatePrevious ) - t = tablist->tqat( count()-2 ); + t = tablist->at( count()-2 ); else { int index = indexOf( id ); index += ( index+1 == count() ) ? -1 : 1; @@ -80,7 +80,7 @@ void KTabBar::setTabEnabled( int id, bool enabled ) emit selected( t->identifier() ); } } - tqrepaint( r ); + repaint( r ); } } } @@ -253,7 +253,7 @@ void KTabBar::dragMoveEvent( TQDragMoveEvent *e ) TQTab *tab = selectTab( e->pos() ); if( tab ) { bool accept = false; - // The tqreceivers of the testCanDecode() signal has to adjust + // The receivers of the testCanDecode() signal has to adjust // 'accept' accordingly. emit testCanDecode( e, accept); if ( accept && tab != TQTabBar::tab( currentTab() ) ) { @@ -294,7 +294,7 @@ void KTabBar::setTabColor( int id, const TQColor& color ) TQTab *t = tab( id ); if ( t ) { mTabColors.insert( id, color ); - tqrepaint( t->rect(), false ); + repaint( t->rect(), false ); } } diff --git a/tdeui/ktabctl.cpp b/tdeui/ktabctl.cpp index dc31a5a0f..0ff9f64e4 100644 --- a/tdeui/ktabctl.cpp +++ b/tdeui/ktabctl.cpp @@ -56,8 +56,8 @@ void KTabCtl::resizeEvent(TQResizeEvent *) for (i=0; i<(int)pages.size(); i++) { pages[i]->setGeometry(r); } - if( ( tabs->tqshape() == TQTabBar::RoundedBelow ) || - ( tabs->tqshape() == TQTabBar::TriangularBelow ) ) { + if( ( tabs->shape() == TQTabBar::RoundedBelow ) || + ( tabs->shape() == TQTabBar::TriangularBelow ) ) { tabs->move( 0, height()-tabs->height()-4 ); } } @@ -184,9 +184,9 @@ void KTabCtl::setBorder( bool state ) blBorder = state; } -void KTabCtl::setShape( TQTabBar::Shape tqshape ) +void KTabCtl::setShape( TQTabBar::Shape shape ) { - tabs->setShape( tqshape ); + tabs->setShape( shape ); } TQSize @@ -273,8 +273,8 @@ void KTabCtl::paintEvent(TQPaintEvent *) TQRect KTabCtl::getChildRect() const { - if( ( tabs->tqshape() == TQTabBar::RoundedBelow ) || - ( tabs->tqshape() == TQTabBar::TriangularBelow ) ) { + if( ( tabs->shape() == TQTabBar::RoundedBelow ) || + ( tabs->shape() == TQTabBar::TriangularBelow ) ) { return TQRect(2, 1, width() - 4, height() - tabs->height() - 4); } else { diff --git a/tdeui/ktabctl.h b/tdeui/ktabctl.h index d18da9750..28de4805b 100644 --- a/tdeui/ktabctl.h +++ b/tdeui/ktabctl.h @@ -61,7 +61,7 @@ public: bool isTabEnabled(const TQString& ); void setTabEnabled(const TQString&, bool); void setBorder(bool); - void setShape( TQTabBar::Shape tqshape ); + void setShape( TQTabBar::Shape shape ); virtual TQSize sizeHint() const; protected: diff --git a/tdeui/ktabwidget.cpp b/tdeui/ktabwidget.cpp index 7423a126f..7570c6716 100644 --- a/tdeui/ktabwidget.cpp +++ b/tdeui/ktabwidget.cpp @@ -95,7 +95,7 @@ void KTabWidget::insertTab( TQWidget *child, TQTab *tab, int index ) resizeTabs( d->m_tabNames.count()-1 ); } else { - d->m_tabNames.insert( d->m_tabNames.tqat( index ), tab->text() ); + d->m_tabNames.insert( d->m_tabNames.at( index ), tab->text() ); resizeTabs( index ); } } @@ -301,7 +301,7 @@ void KTabWidget::dragMoveEvent( TQDragMoveEvent *e ) { if ( isEmptyTabbarSpace( e->pos() ) ) { bool accept = false; - // The tqreceivers of the testCanDecode() signal has to adjust + // The receivers of the testCanDecode() signal has to adjust // 'accept' accordingly. emit testCanDecode( e, accept); e->accept( accept ); @@ -422,7 +422,7 @@ void KTabWidget::moveTab( int from, int to ) if ( to < 0 || to >= count() ) d->m_tabNames.append( TQString::null ); else - d->m_tabNames.insert( d->m_tabNames.tqat( to ), TQString::null ); + d->m_tabNames.insert( d->m_tabNames.at( to ), TQString::null ); } w = page( to ); @@ -441,7 +441,7 @@ void KTabWidget::removePage( TQWidget * w ) { if ( d->m_automaticResizeTabs ) { int index = indexOf( w ); if ( index != -1 ) - d->m_tabNames.remove( d->m_tabNames.tqat( index ) ); + d->m_tabNames.remove( d->m_tabNames.at( index ) ); } TQTabWidget::removePage( w ); if ( d->m_automaticResizeTabs ) diff --git a/tdeui/ktoolbar.cpp b/tdeui/ktoolbar.cpp index 2a9a56ef3..d1cb8ba00 100644 --- a/tdeui/ktoolbar.cpp +++ b/tdeui/ktoolbar.cpp @@ -734,7 +734,7 @@ int KToolBar::itemIndex (int id) int KToolBar::idAt (int index) { - TQWidget *w = widgets.tqat(index); + TQWidget *w = widgets.at(index); return widget2id[w]; } @@ -1263,7 +1263,7 @@ void KToolBar::rebuildLayout() if ( stretchableWidget ) l->setStretchFactor( stretchableWidget, 10 ); } - l->tqinvalidate(); + l->invalidate(); TQApplication::postEvent( this, new TQEvent( TQEvent::LayoutHint ) ); } @@ -1740,7 +1740,7 @@ void KToolBar::slotRepaint() resizeEvent(&ev); TQApplication::sendPostedEvents( this, TQEvent::LayoutHint ); setUpdatesEnabled( true ); - tqrepaint( true ); + repaint( true ); } void KToolBar::toolBarPosChanged( TQToolBar *tb ) diff --git a/tdeui/ktoolbar.h b/tdeui/ktoolbar.h index bbf0bfc65..947fd3bab 100644 --- a/tdeui/ktoolbar.h +++ b/tdeui/ktoolbar.h @@ -91,7 +91,7 @@ private: * Once you have a KToolBar object, you can insert items into it with the * insert... methods, or remove them with the removeItem() method. This * can be done at any time; the toolbar will be automatically updated. - * There are also many methods to set per-child properties like tqalignment + * There are also many methods to set per-child properties like alignment * and toggle behavior. * * KToolBar uses a global config group to load toolbar settings on diff --git a/tdeui/ktoolbarbutton.cpp b/tdeui/ktoolbarbutton.cpp index 5e89c175a..76d87f06c 100644 --- a/tdeui/ktoolbarbutton.cpp +++ b/tdeui/ktoolbarbutton.cpp @@ -376,7 +376,7 @@ void KToolBarButton::leaveEvent(TQEvent *) { d->m_isRaised = false; d->m_isActive = false; - tqrepaint(false); + repaint(false); } emit highlighted(d->m_id, false); @@ -398,7 +398,7 @@ void KToolBarButton::enterEvent(TQEvent *) d->m_isActive = false; } - tqrepaint(false); + repaint(false); } emit highlighted(d->m_id, true); } @@ -634,7 +634,7 @@ void KToolBarButton::paletteChange(const TQPalette &) if(!d->m_isSeparator) { modeChange(); - tqrepaint(false); // no need to delete it first therefore only false + repaint(false); // no need to delete it first therefore only false } } @@ -698,7 +698,7 @@ void KToolBarButton::setNoStyle(bool no_style) modeChange(); d->m_iconText = KToolBar::IconTextRight; - tqrepaint(false); + repaint(false); } void KToolBarButton::setRadio (bool f) @@ -716,13 +716,13 @@ void KToolBarButton::on(bool flag) setDown(flag); leaveEvent((TQEvent *) 0); } - tqrepaint(); + repaint(); } void KToolBarButton::toggle() { setOn(!isOn()); - tqrepaint(); + repaint(); } void KToolBarButton::setToggle(bool flag) diff --git a/tdeui/kurllabel.cpp b/tdeui/kurllabel.cpp index 8a996fe5b..943cf393a 100644 --- a/tdeui/kurllabel.cpp +++ b/tdeui/kurllabel.cpp @@ -407,7 +407,7 @@ TQRect KURLLabel::activeRect() const TQRect r( contentsRect() ); if (text().isEmpty() || (!d->MarginAltered && sizePolicy() == TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed))) return r; //fixed size is sometimes used with pixmap - int hAlign = TQApplication::horizontalAlignment( tqalignment() ); + int hAlign = TQApplication::horizontalAlignment( alignment() ); int indentX = (hAlign && indent()>0) ? indent() : 0; TQFontMetrics fm(font()); r.setWidth( QMIN(fm.width(text()), r.width())); diff --git a/tdeui/kwordwrap.cpp b/tdeui/kwordwrap.cpp index b7eeaff7c..d104b421a 100644 --- a/tdeui/kwordwrap.cpp +++ b/tdeui/kwordwrap.cpp @@ -35,7 +35,7 @@ KWordWrap* KWordWrap::formatText( TQFontMetrics &fm, const TQRect & r, int /*fla { KWordWrap* kw = new KWordWrap( r ); // The wordwrap algorithm - // The variable names and the global tqshape of the algorithm are inspired + // The variable names and the global shape of the algorithm are inspired // from QTextFormatterBreakWords::format(). //kdDebug() << "KWordWrap::formatText " << str << " r=" << r.x() << "," << r.y() << " " << r.width() << "x" << r.height() << endl; int height = fm.height(); @@ -201,7 +201,7 @@ void KWordWrap::drawFadeoutText(TQPainter *p, int x, int y, int maxW, int n = TQMIN( tl, 3); for (int i = 0; i < n; i++) { p->setPen( mixColors( 0.70 - i * 0.25, textColor, bgColor ) ); - TQString s( t.tqat( tl - n + i ) ); + TQString s( t.at( tl - n + i ) ); p->drawText( x, y, s ); x += fm.width( s ); } diff --git a/tdeui/kwordwrap.h b/tdeui/kwordwrap.h index 50d90e1e7..3fb48acd9 100644 --- a/tdeui/kwordwrap.h +++ b/tdeui/kwordwrap.h @@ -91,12 +91,12 @@ public: /** * Draw the text that has been previously wrapped, at position x,y. - * Flags are for tqalignment, e.g. Qt::AlignHCenter. Default is + * Flags are for alignment, e.g. Qt::AlignHCenter. Default is * Qt::AlignAuto. * @param painter the TQPainter to use. * @param x the horizontal position of the text * @param y the vertical position of the text - * @param flags the ORed text tqalignment flags from the Qt namespace, + * @param flags the ORed text alignment flags from the Qt namespace, * ORed with FadeOut if you want the text to fade out if it * does not fit (the @p painter's background must be set * accordingly) diff --git a/tdeui/tests/kdesattest.cpp b/tdeui/tests/kdesattest.cpp index e75b320a7..28f7d4cf2 100644 --- a/tdeui/tests/kdesattest.cpp +++ b/tdeui/tests/kdesattest.cpp @@ -23,7 +23,7 @@ KDesatWidget::KDesatWidget(TQWidget *parent, const char *name) void KDesatWidget::change(double) { desat_value = slide->value(); - tqrepaint(false); + repaint(false); } void KDesatWidget::paintEvent(TQPaintEvent */*ev*/) diff --git a/tdeui/tests/kdockwidgetdemo.cpp b/tdeui/tests/kdockwidgetdemo.cpp index b4d1bd30b..15b83d14e 100644 --- a/tdeui/tests/kdockwidgetdemo.cpp +++ b/tdeui/tests/kdockwidgetdemo.cpp @@ -242,7 +242,7 @@ void PixmapView::setPixmap( const TQPixmap &pix ) { pixmap = pix; resizeContents( pixmap.size().width(), pixmap.size().height() ); - viewport()->tqrepaint( true ); + viewport()->repaint( true ); } void PixmapView::drawContents( TQPainter *p, int, int, int, int ) diff --git a/tdeui/tests/kledtest.cpp b/tdeui/tests/kledtest.cpp index f8d031530..d68f1e366 100644 --- a/tdeui/tests/kledtest.cpp +++ b/tdeui/tests/kledtest.cpp @@ -50,14 +50,14 @@ KLedTest::KLedTest(TQWidget* parent) } else { y=Grid; index=0; - for( int tqshape=0; (int)tqshape<2; tqshape=(KLed::Shape)(tqshape+1)) { + for( int shape=0; (int)shape<2; shape=(KLed::Shape)(shape+1)) { x=Grid; for( int look=0; (int)look<3; look=(KLed::Look)(look+1)) { for(state=KLed::Off; (int)state<2; state=(KLed::State)(state+1)) { leds[index]=new KLed(Qt::yellow, state, (KLed::Look)(look+1), - (KLed::Shape)(tqshape+1), this); + (KLed::Shape)(shape+1), this); leds[index]->setGeometry(x, y, LedWidth, LedHeight); ++index; x+=Grid+LedWidth; @@ -108,7 +108,7 @@ KLedTest::nextLook() { ledlook = static_cast(tmp); l->setLook(ledlook); //qDebug("painting look %i", ledlook); - //l->tqrepaint(); + //l->repaint(); } diff --git a/tdeui/tests/kledtest.h b/tdeui/tests/kledtest.h index 5d660f5a3..5652e306e 100644 --- a/tdeui/tests/kledtest.h +++ b/tdeui/tests/kledtest.h @@ -15,7 +15,7 @@ protected: const int LedWidth; const int LedHeight; const int Grid; - KLed::Shape tqshape; + KLed::Shape shape; KLed::Look look; KLed::State state; int x, y, index; diff --git a/tdeui/tests/ktabwidgettest.cpp b/tdeui/tests/ktabwidgettest.cpp index 5f9fb3dcc..32ed5c89f 100644 --- a/tdeui/tests/ktabwidgettest.cpp +++ b/tdeui/tests/ktabwidgettest.cpp @@ -73,9 +73,9 @@ Test::Test( TQWidget* parent, const char *name ) gridlayout->addWidget( mTabsBottom, 3, 0 ); connect( mTabsBottom, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleTabPosition(bool) ) ); - TQCheckBox * tabtqshape = new TQCheckBox( "Triangular tab tqshape", grid ); - gridlayout->addWidget( tabtqshape, 3, 1 ); - connect( tabtqshape, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleTabShape(bool) ) ); + TQCheckBox * tabshape = new TQCheckBox( "Triangular tab shape", grid ); + gridlayout->addWidget( tabshape, 3, 1 ); + connect( tabshape, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleTabShape(bool) ) ); TQCheckBox *tabClose = new TQCheckBox( "Close button on icon hover", grid ); gridlayout->addWidget( tabClose, 4, 0 ); diff --git a/tdeui/tests/kunbalancedgrdtest.cpp b/tdeui/tests/kunbalancedgrdtest.cpp index 9f616496d..7f5b2cc78 100644 --- a/tdeui/tests/kunbalancedgrdtest.cpp +++ b/tdeui/tests/kunbalancedgrdtest.cpp @@ -159,7 +159,7 @@ void myTopWidget::rebalance() if ((otime - itime )> 500) { - grds->tqrepaint(false); + grds->repaint(false); itime = time.elapsed(); } } diff --git a/win/qeventloopex.cpp b/win/qeventloopex.cpp index b4b32e838..da5eba60c 100644 --- a/win/qeventloopex.cpp +++ b/win/qeventloopex.cpp @@ -204,7 +204,7 @@ void QEventLoopEx::registerSocketNotifier( TQSocketNotifier *notifier ) while ( p && p->fd > sockfd ) p = list->next(); if ( p ) - list->insert( list->tqat(), sn ); + list->insert( list->at(), sn ); else list->append( sn ); }