summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-13 08:32:36 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-13 08:32:36 +0000
commitf7e71d47719ab6094cf4a9fafffa5ea351973522 (patch)
tree30834aa632d442019e14f88685001d94657d060b
parentb31cfd9a1ee986fe2ae9a693f3afd7f171dd897c (diff)
downloadtdelibs-f7e71d47719ab6094cf4a9fafffa5ea351973522.tar.gz
tdelibs-f7e71d47719ab6094cf4a9fafffa5ea351973522.zip
Initial conversion for TQt for Qt4 3.4.0 TP2
This will also compile with TQt for Qt3, and should not cause any problems with dependent modules such as kdebase. If it does then it needs to be fixed! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214149 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--KDE2PORTING.html10
-rw-r--r--KDE3PORTING.html10
-rw-r--r--arts/kde/kartsdispatcher.h2
-rw-r--r--arts/kde/kartsserver.cpp6
-rw-r--r--arts/kde/kartsserver.h2
-rw-r--r--arts/kde/kaudioconverter.h2
-rw-r--r--arts/kde/kaudiorecordstream.h2
-rw-r--r--arts/kde/kconverttest.h2
-rw-r--r--arts/kde/kioinputstream_impl.cpp4
-rw-r--r--arts/kde/kplayobject.cc8
-rw-r--r--arts/kde/kplayobject.h4
-rw-r--r--arts/kde/kplayobjectcreator.h2
-rw-r--r--arts/kde/kplayobjectfactory.cc4
-rw-r--r--arts/kde/kplayobjectfactory_p.h2
-rw-r--r--arts/kde/kvideowidget.cpp18
-rw-r--r--arts/kde/kvideowidget.h2
-rw-r--r--arts/knotify/knotify.cpp14
-rw-r--r--dcop/KDE-ICE/ICEmsg.h4
-rw-r--r--dcop/client/dcop.cpp32
-rw-r--r--dcop/client/dcopfind.cpp10
-rw-r--r--dcop/client/dcopstart.cpp2
-rw-r--r--dcop/client/marshall.cpp40
-rw-r--r--dcop/dcopclient.cpp124
-rw-r--r--dcop/dcopclient.h7
-rw-r--r--dcop/dcopidl/main.cpp2
-rw-r--r--dcop/dcopidl/scanner.cc4
-rw-r--r--dcop/dcopidl/scanner.ll1
-rw-r--r--dcop/dcopidl/yacc.cc2
-rw-r--r--dcop/dcopidl/yacc.yy2
-rw-r--r--dcop/dcopidl2cpp/main.cpp6
-rw-r--r--dcop/dcopidl2cpp/skel.cpp4
-rw-r--r--dcop/dcopidl2cpp/stub.cpp10
-rw-r--r--dcop/dcopidl2cpp/stubimpl.cpp2
-rw-r--r--dcop/dcopobject.cpp6
-rw-r--r--dcop/dcopref.cpp8
-rw-r--r--dcop/dcopref.h2
-rw-r--r--dcop/dcopserver.cpp56
-rw-r--r--dcop/dcopserver.h6
-rw-r--r--dcop/dcopsignals.cpp18
-rw-r--r--dcop/kdatastream.h12
-rw-r--r--dcop/testdcop.h4
-rw-r--r--dnssd/domainbrowser.cpp2
-rw-r--r--dnssd/domainbrowser.h2
-rw-r--r--dnssd/query.h2
-rw-r--r--dnssd/remoteservice.cpp4
-rw-r--r--dnssd/responder.cpp4
-rw-r--r--dnssd/responder.h2
-rw-r--r--dnssd/sdevent.h8
-rw-r--r--dnssd/servicebase.cpp8
-rw-r--r--dnssd/servicebrowser.cpp2
-rw-r--r--dnssd/servicebrowser.h2
-rw-r--r--interfaces/khexedit/byteseditinterface.h8
-rw-r--r--interfaces/khexedit/charcolumninterface.h2
-rw-r--r--interfaces/khexedit/clipboardinterface.h2
-rw-r--r--interfaces/khexedit/valuecolumninterface.h2
-rw-r--r--interfaces/khexedit/zoominterface.h2
-rw-r--r--interfaces/kimproxy/interface/kimiface.h2
-rw-r--r--interfaces/kimproxy/library/kimproxy.cpp10
-rw-r--r--interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp4
-rw-r--r--interfaces/kmediaplayer/player.h2
-rw-r--r--interfaces/kmediaplayer/view.h2
-rw-r--r--interfaces/kregexpeditor/kregexpeditorinterface.h4
-rw-r--r--interfaces/kscript/scriptinterface.h2
-rw-r--r--interfaces/ktexteditor/blockselectioninterface.cpp2
-rw-r--r--interfaces/ktexteditor/clipboardinterface.cpp2
-rw-r--r--interfaces/ktexteditor/codecompletioninterface.cpp2
-rw-r--r--interfaces/ktexteditor/configinterface.cpp4
-rw-r--r--interfaces/ktexteditor/configinterfaceextension.cpp4
-rw-r--r--interfaces/ktexteditor/configinterfaceextension.h2
-rw-r--r--interfaces/ktexteditor/cursorinterface.cpp2
-rw-r--r--interfaces/ktexteditor/dynwordwrapinterface.cpp2
-rw-r--r--interfaces/ktexteditor/editinterface.cpp2
-rw-r--r--interfaces/ktexteditor/editinterfaceext.cpp2
-rw-r--r--interfaces/ktexteditor/editinterfaceext.h2
-rw-r--r--interfaces/ktexteditor/editor.h2
-rw-r--r--interfaces/ktexteditor/editorchooser.cpp6
-rw-r--r--interfaces/ktexteditor/editorchooser.h4
-rw-r--r--interfaces/ktexteditor/editorchooser_ui.ui6
-rw-r--r--interfaces/ktexteditor/encodinginterface.cpp2
-rw-r--r--interfaces/ktexteditor/highlightinginterface.cpp2
-rw-r--r--interfaces/ktexteditor/ktexteditor.cpp6
-rw-r--r--interfaces/ktexteditor/markinterface.cpp2
-rw-r--r--interfaces/ktexteditor/markinterfaceextension.cpp2
-rw-r--r--interfaces/ktexteditor/plugin.h2
-rw-r--r--interfaces/ktexteditor/popupmenuinterface.cpp2
-rw-r--r--interfaces/ktexteditor/printinterface.cpp2
-rw-r--r--interfaces/ktexteditor/searchinterface.cpp2
-rw-r--r--interfaces/ktexteditor/selectioninterface.cpp4
-rw-r--r--interfaces/ktexteditor/selectioninterfaceext.cpp4
-rw-r--r--interfaces/ktexteditor/sessionconfiginterface.cpp6
-rw-r--r--interfaces/ktexteditor/templateinterface.cpp4
-rw-r--r--interfaces/ktexteditor/texthintinterface.cpp2
-rw-r--r--interfaces/ktexteditor/undointerface.cpp2
-rw-r--r--interfaces/ktexteditor/variableinterface.cpp2
-rw-r--r--interfaces/ktexteditor/viewcursorinterface.cpp2
-rw-r--r--interfaces/ktexteditor/viewstatusmsginterface.cpp2
-rw-r--r--interfaces/ktexteditor/wordwrapinterface.cpp2
-rw-r--r--interfaces/terminal/kde_terminal_interface.h2
-rw-r--r--interfaces/terminal/test/main.cc6
-rw-r--r--kab/addressbook.cc6
-rw-r--r--kab/addressbook.h6
-rw-r--r--kab/kabapi.cc4
-rw-r--r--kab/qconfigDB.cc16
-rw-r--r--kab/qconfigDB.h2
-rw-r--r--kabc/address.cpp20
-rw-r--r--kabc/addressbook.cpp2
-rw-r--r--kabc/addressbook.h2
-rw-r--r--kabc/addresseedialog.cpp4
-rw-r--r--kabc/addresseedialog.h2
-rw-r--r--kabc/addresseehelper.cpp8
-rw-r--r--kabc/addresseelist.cpp2
-rw-r--r--kabc/addresslineedit.cpp28
-rw-r--r--kabc/agent.cpp4
-rw-r--r--kabc/distributionlist.cpp6
-rw-r--r--kabc/distributionlist.h2
-rw-r--r--kabc/distributionlistdialog.h2
-rw-r--r--kabc/distributionlisteditor.h2
-rw-r--r--kabc/errorhandler.cpp2
-rw-r--r--kabc/formats/binaryformat.cpp12
-rw-r--r--kabc/kab2kabc.cpp4
-rw-r--r--kabc/ldapclient.cpp6
-rw-r--r--kabc/ldapclient.h4
-rw-r--r--kabc/ldapconfigwidget.cpp8
-rw-r--r--kabc/ldapconfigwidget.h2
-rw-r--r--kabc/ldapurl.cpp2
-rw-r--r--kabc/ldif.cpp2
-rw-r--r--kabc/ldifconverter.cpp120
-rw-r--r--kabc/ldifconverter.h2
-rw-r--r--kabc/lock.h2
-rw-r--r--kabc/plugins/ldapkio/resourceldapkio.cpp6
-rw-r--r--kabc/plugins/sql/resourcesql.cpp4
-rw-r--r--kabc/plugins/sql/resourcesqlconfig.cpp2
-rw-r--r--kabc/resource.cpp2
-rw-r--r--kabc/scripts/addressee.src.cpp16
-rw-r--r--kabc/tests/testldapclient.h2
-rw-r--r--kabc/tests/testlock.h2
-rw-r--r--kabc/vcard/AdrParam.cpp2
-rw-r--r--kabc/vcard/ContentLine.cpp8
-rw-r--r--kabc/vcard/DateValue.cpp4
-rw-r--r--kabc/vcard/GeoValue.cpp2
-rw-r--r--kabc/vcard/RToken.cpp2
-rw-r--r--kabc/vcard/SourceParam.cpp2
-rw-r--r--kabc/vcard/URIValue.cpp2
-rw-r--r--kabc/vcard/UTCValue.cpp2
-rw-r--r--kabc/vcard/VCard.cpp8
-rw-r--r--kabc/vcard/VCardEntity.cpp4
-rw-r--r--kabc/vcard/include/VCardRToken.h2
-rw-r--r--kabc/vcard21parser.cpp2
-rw-r--r--kabc/vcardformatimpl.cpp6
-rw-r--r--kabc/vcardparser/testwrite.cpp2
-rw-r--r--kabc/vcardparser/vcard.cpp6
-rw-r--r--kabc/vcardparser/vcardline.cpp4
-rw-r--r--kabc/vcardparser/vcardparser.cpp6
-rw-r--r--kabc/vcardtool.cpp20
-rw-r--r--kate/interfaces/interfaces.cpp6
-rw-r--r--kate/part/katearbitraryhighlight.h2
-rw-r--r--kate/part/kateautoindent.cpp72
-rw-r--r--kate/part/kateautoindent.h4
-rw-r--r--kate/part/katebookmarks.cpp2
-rw-r--r--kate/part/katebookmarks.h2
-rw-r--r--kate/part/katebuffer.cpp42
-rw-r--r--kate/part/katebuffer.h8
-rw-r--r--kate/part/katecmds.cpp10
-rw-r--r--kate/part/katecmds.h2
-rw-r--r--kate/part/katecodecompletion.cpp10
-rw-r--r--kate/part/katecodecompletion.h8
-rw-r--r--kate/part/katecodefoldinghelpers.h2
-rw-r--r--kate/part/kateconfig.cpp2
-rw-r--r--kate/part/katecursor.h4
-rw-r--r--kate/part/katedialogs.cpp6
-rw-r--r--kate/part/katedocument.cpp34
-rw-r--r--kate/part/katedocument.h4
-rw-r--r--kate/part/katefactory.cpp10
-rw-r--r--kate/part/katefactory.h4
-rw-r--r--kate/part/katefont.h2
-rw-r--r--kate/part/katehighlight.cpp16
-rw-r--r--kate/part/katehighlight.h8
-rw-r--r--kate/part/katejscript.cpp2
-rw-r--r--kate/part/kateprinter.cpp6
-rw-r--r--kate/part/katerenderer.cpp20
-rw-r--r--kate/part/kateschema.cpp44
-rw-r--r--kate/part/kateschema.h14
-rw-r--r--kate/part/katesearch.cpp6
-rw-r--r--kate/part/katesearch.h2
-rw-r--r--kate/part/katespell.h2
-rw-r--r--kate/part/katesyntaxdocument.h2
-rw-r--r--kate/part/katetextline.cpp44
-rw-r--r--kate/part/katetextline.h6
-rw-r--r--kate/part/kateview.cpp14
-rw-r--r--kate/part/kateview.h2
-rw-r--r--kate/part/kateviewhelpers.cpp10
-rw-r--r--kate/part/kateviewhelpers.h6
-rw-r--r--kate/part/kateviewinternal.cpp4
-rw-r--r--kate/part/kateviewinternal.h4
-rw-r--r--kate/part/test_regression.cpp18
-rw-r--r--kate/part/test_regression.h2
-rw-r--r--kate/plugins/autobookmarker/autobookmarker.cpp2
-rw-r--r--kate/plugins/kdatatool/kate_kdatatool.cpp2
-rw-r--r--kcert/kcertpart.cc14
-rw-r--r--kcert/kcertpart.h2
-rw-r--r--kconf_update/kconf_update.cpp38
-rw-r--r--kdecore/fixx11h.h16
-rw-r--r--kdecore/kaboutdata.cpp38
-rw-r--r--kdecore/kaccel.cpp24
-rw-r--r--kdecore/kaccelbase.cpp16
-rw-r--r--kdecore/kaccelmanager.cpp42
-rw-r--r--kdecore/kaccelmanager_private.h4
-rw-r--r--kdecore/kallocator.cpp6
-rw-r--r--kdecore/kapplication.cpp100
-rw-r--r--kdecore/kapplication.h12
-rw-r--r--kdecore/kasyncio.h12
-rw-r--r--kdecore/kbufferedio.h1
-rw-r--r--kdecore/kcalendarsystemfactory.h2
-rw-r--r--kdecore/kcalendarsystemgregorian.cpp10
-rw-r--r--kdecore/kcalendarsystemhebrew.cpp18
-rw-r--r--kdecore/kcalendarsystemhijri.cpp4
-rw-r--r--kdecore/kcalendarsystemjalali.cpp4
-rw-r--r--kdecore/kcatalogue.cpp2
-rw-r--r--kdecore/kcharsets.cpp38
-rw-r--r--kdecore/kcheckaccelerators.cpp8
-rw-r--r--kdecore/kcheckaccelerators.h2
-rw-r--r--kdecore/kclipboard.cpp38
-rw-r--r--kdecore/kclipboard.h2
-rw-r--r--kdecore/kcmdlineargs.cpp14
-rw-r--r--kdecore/kcompletion.cpp12
-rw-r--r--kdecore/kcompletion.h4
-rw-r--r--kdecore/kcompletion_private.h4
-rw-r--r--kdecore/kcompletionbase.cpp2
-rw-r--r--kdecore/kconfig.cpp10
-rw-r--r--kdecore/kconfig_compiler/kconfig_compiler.cpp66
-rw-r--r--kdecore/kconfig_compiler/tests/kconfigcompiler_test.cpp6
-rw-r--r--kdecore/kconfig_compiler/tests/test1.cpp.ref48
-rw-r--r--kdecore/kconfig_compiler/tests/test1.h.ref18
-rw-r--r--kdecore/kconfig_compiler/tests/test2.cpp.ref66
-rw-r--r--kdecore/kconfig_compiler/tests/test2.h.ref22
-rw-r--r--kdecore/kconfig_compiler/tests/test3.cpp.ref22
-rw-r--r--kdecore/kconfig_compiler/tests/test3.h.ref8
-rw-r--r--kdecore/kconfig_compiler/tests/test4.cpp.ref48
-rw-r--r--kdecore/kconfig_compiler/tests/test4.h.ref8
-rw-r--r--kdecore/kconfig_compiler/tests/test5.cpp.ref48
-rw-r--r--kdecore/kconfig_compiler/tests/test5.h.ref8
-rw-r--r--kdecore/kconfig_compiler/tests/test6.cpp.ref18
-rw-r--r--kdecore/kconfig_compiler/tests/test6.h.ref6
-rw-r--r--kdecore/kconfig_compiler/tests/test7.cpp.ref18
-rw-r--r--kdecore/kconfig_compiler/tests/test7.h.ref6
-rw-r--r--kdecore/kconfig_compiler/tests/test8a.cpp.ref10
-rw-r--r--kdecore/kconfig_compiler/tests/test8a.h.ref4
-rw-r--r--kdecore/kconfig_compiler/tests/test8b.cpp.ref16
-rw-r--r--kdecore/kconfig_compiler/tests/test8b.h.ref6
-rw-r--r--kdecore/kconfig_compiler/tests/test9.cpp.ref16
-rw-r--r--kdecore/kconfig_compiler/tests/test9.h.ref6
-rw-r--r--kdecore/kconfig_compiler/tests/test9main.cpp2
-rw-r--r--kdecore/kconfig_compiler/tests/test_dpointer.cpp.ref88
-rw-r--r--kdecore/kconfigbackend.cpp20
-rw-r--r--kdecore/kconfigbase.cpp68
-rw-r--r--kdecore/kconfigbase.h27
-rw-r--r--kdecore/kconfigdialogmanager.cpp18
-rw-r--r--kdecore/kconfigskeleton.cpp38
-rw-r--r--kdecore/kconfigskeleton.h50
-rw-r--r--kdecore/kdcoppropertyproxy.cpp18
-rw-r--r--kdecore/kde-config.cpp.in30
-rw-r--r--kdecore/kdebug.cpp28
-rw-r--r--kdecore/kdebug.h14
-rw-r--r--kdecore/kdelibs_export.h2
-rw-r--r--kdecore/kdemacros.h.in8
-rw-r--r--kdecore/kdesktopfile.cpp32
-rw-r--r--kdecore/kextsock.cpp8
-rw-r--r--kdecore/kextsock.h13
-rw-r--r--kdecore/kgenericfactory.h16
-rw-r--r--kdecore/kgenericfactory.tcc110
-rw-r--r--kdecore/kglobal.cpp6
-rw-r--r--kdecore/kglobalaccel.h2
-rw-r--r--kdecore/kglobalaccel_win.cpp6
-rw-r--r--kdecore/kglobalaccel_x11.cpp34
-rw-r--r--kdecore/kglobalsettings.cpp6
-rw-r--r--kdecore/kiconeffect.cpp106
-rw-r--r--kdecore/kiconloader.cpp40
-rw-r--r--kdecore/kiconloader_p.h2
-rw-r--r--kdecore/kicontheme.cpp12
-rw-r--r--kdecore/kidna.cpp4
-rw-r--r--kdecore/kkeyserver_x11.cpp20
-rw-r--r--kdecore/klibloader.cpp12
-rw-r--r--kdecore/klibloader.h6
-rw-r--r--kdecore/klocale.cpp116
-rw-r--r--kdecore/klocale.h4
-rw-r--r--kdecore/kmacroexpander.cpp34
-rw-r--r--kdecore/kmanagerselection.cpp4
-rw-r--r--kdecore/kmanagerselection.h8
-rw-r--r--kdecore/kmdcodec.cpp128
-rw-r--r--kdecore/kmdcodec.h68
-rw-r--r--kdecore/kmimesourcefactory.cpp2
-rw-r--r--kdecore/kmultipledrag.cpp6
-rw-r--r--kdecore/kmultipledrag.h4
-rw-r--r--kdecore/knotifyclient.cpp14
-rw-r--r--kdecore/kpalette.cpp6
-rw-r--r--kdecore/kprocctrl.cpp2
-rw-r--r--kdecore/kprocctrl.h2
-rw-r--r--kdecore/kprocess.h6
-rw-r--r--kdecore/kprocio.cpp2
-rw-r--r--kdecore/kprocio.h2
-rw-r--r--kdecore/kprotocolinfo_kdecore.cpp14
-rw-r--r--kdecore/kprotocolinfofactory.cpp2
-rw-r--r--kdecore/kqiodevicegzip_p.cpp12
-rw-r--r--kdecore/kqiodevicegzip_p.h10
-rw-r--r--kdecore/kregexp.h4
-rw-r--r--kdecore/krfcdate.cpp10
-rw-r--r--kdecore/krootprop.cpp20
-rw-r--r--kdecore/ksavefile.cpp6
-rw-r--r--kdecore/ksavefile.h2
-rw-r--r--kdecore/kshell.cpp50
-rw-r--r--kdecore/kshortcut.cpp8
-rw-r--r--kdecore/kshortcutmenu.cpp4
-rw-r--r--kdecore/ksimpleconfig.cpp2
-rw-r--r--kdecore/ksock.h8
-rw-r--r--kdecore/ksockaddr.cpp20
-rw-r--r--kdecore/ksockaddr.h6
-rw-r--r--kdecore/kstandarddirs.cpp98
-rw-r--r--kdecore/kstandarddirs.h2
-rw-r--r--kdecore/kstartupinfo.cpp120
-rw-r--r--kdecore/kstartupinfo.h7
-rw-r--r--kdecore/kstdaccel.cpp4
-rw-r--r--kdecore/kstringhandler.cpp30
-rw-r--r--kdecore/ksycoca.cpp51
-rw-r--r--kdecore/ksycoca.h6
-rw-r--r--kdecore/ksycocadict.cpp42
-rw-r--r--kdecore/ksycocadict.h8
-rw-r--r--kdecore/ksycocaentry.h4
-rw-r--r--kdecore/ksycocafactory.cpp36
-rw-r--r--kdecore/ktempdir.cpp4
-rw-r--r--kdecore/ktempfile.cpp2
-rw-r--r--kdecore/ktimezones.cpp40
-rw-r--r--kdecore/kurl.cpp72
-rw-r--r--kdecore/kurl.h10
-rw-r--r--kdecore/kurldrag.cpp10
-rw-r--r--kdecore/kurldrag.h4
-rw-r--r--kdecore/kuser.cpp4
-rw-r--r--kdecore/kvmallocator.cpp8
-rw-r--r--kdecore/kwin.cpp20
-rw-r--r--kdecore/kwinmodule.cpp12
-rw-r--r--kdecore/kwinmodule.h6
-rw-r--r--kdecore/kxmessages.cpp2
-rw-r--r--kdecore/kxmessages.h7
-rw-r--r--kdecore/libintl.cpp2
-rw-r--r--kdecore/malloc/malloc.c114
-rw-r--r--kdecore/netsupp.cpp18
-rw-r--r--kdecore/netsupp.h48
-rw-r--r--kdecore/netwm.cpp12
-rw-r--r--kdecore/network/kbufferedsocket.cpp24
-rw-r--r--kdecore/network/kbufferedsocket.h19
-rw-r--r--kdecore/network/kclientsocketbase.cpp44
-rw-r--r--kdecore/network/kclientsocketbase.h30
-rw-r--r--kdecore/network/kdatagramsocket.cpp6
-rw-r--r--kdecore/network/kdatagramsocket.h7
-rw-r--r--kdecore/network/khttpproxysocketdevice.cpp14
-rw-r--r--kdecore/network/kiobuffer.h10
-rw-r--r--kdecore/network/kresolver.cpp54
-rw-r--r--kdecore/network/kresolver.h11
-rw-r--r--kdecore/network/kresolver_p.h2
-rw-r--r--kdecore/network/kresolverstandardworkers.cpp30
-rw-r--r--kdecore/network/kresolverstandardworkers_p.h2
-rw-r--r--kdecore/network/kreverseresolver.cpp8
-rw-r--r--kdecore/network/kreverseresolver.h5
-rw-r--r--kdecore/network/kserversocket.cpp2
-rw-r--r--kdecore/network/kserversocket.h1
-rw-r--r--kdecore/network/ksocketaddress.cpp86
-rw-r--r--kdecore/network/ksocketaddress.h58
-rw-r--r--kdecore/network/ksocketbase.cpp2
-rw-r--r--kdecore/network/ksocketbase.h20
-rw-r--r--kdecore/network/ksocketbuffer.cpp32
-rw-r--r--kdecore/network/ksocketbuffer_p.h20
-rw-r--r--kdecore/network/ksocketdevice.cpp20
-rw-r--r--kdecore/network/ksocketdevice.h16
-rw-r--r--kdecore/network/ksockssocketdevice.cpp14
-rw-r--r--kdecore/network/ksockssocketdevice.h12
-rw-r--r--kdecore/network/ksrvresolverworker.cpp12
-rw-r--r--kdecore/network/ksrvresolverworker_p.h9
-rw-r--r--kdecore/network/kstreamsocket.cpp4
-rw-r--r--kdecore/network/kstreamsocket.h1
-rw-r--r--kdecore/svgicons/ksvgiconengine.cpp28
-rw-r--r--kdecore/svgicons/ksvgiconpainter.cpp92
-rw-r--r--kdecore/svgicons/ksvgiconpainter.h8
-rw-r--r--kdecore/tests/kcalendartest.cpp2
-rw-r--r--kdecore/tests/kconfigtestgui.cpp2
-rw-r--r--kdecore/tests/kconfigtestgui.h2
-rw-r--r--kdecore/tests/kipctest.h2
-rw-r--r--kdecore/tests/klocaletest.cpp28
-rw-r--r--kdecore/tests/klocaletest.h2
-rw-r--r--kdecore/tests/kmdcodectest.cpp6
-rw-r--r--kdecore/tests/kprocesstest.h2
-rw-r--r--kdecore/tests/kprociotest.h2
-rw-r--r--kdecore/tests/kresolvertest.cpp8
-rw-r--r--kdecore/tests/ktimezonestest.cpp2
-rw-r--r--kded/kbuildservicefactory.cpp40
-rw-r--r--kded/kbuildservicegroupfactory.cpp18
-rw-r--r--kded/kbuildservicetypefactory.cpp40
-rw-r--r--kded/kbuildsycoca.cpp74
-rw-r--r--kded/kbuildsycoca.h2
-rw-r--r--kded/kctimefactory.cpp26
-rw-r--r--kded/kctimefactory.h8
-rw-r--r--kded/kde-menu.cpp2
-rw-r--r--kded/kded.cpp18
-rw-r--r--kded/kded.h4
-rw-r--r--kded/kdedmodule.cpp4
-rw-r--r--kded/khostname.cpp14
-rw-r--r--kded/vfolder_menu.cpp78
-rw-r--r--kded/vfolder_menu.h2
-rw-r--r--kdefx/kdrawutil.cpp10
-rw-r--r--kdefx/kdrawutil.h2
-rw-r--r--kdefx/kimageeffect.cpp592
-rw-r--r--kdefx/kpixmap.cpp48
-rw-r--r--kdefx/kpixmap.h2
-rw-r--r--kdefx/kpixmapeffect.cpp4
-rw-r--r--kdefx/kstyle.cpp185
-rw-r--r--kdefx/kstyle.h51
-rw-r--r--kdeprint/cups/cupsaddsmb2.cpp8
-rw-r--r--kdeprint/cups/cupsdconf2/addressdialog.cpp2
-rw-r--r--kdeprint/cups/cupsdconf2/cupsdcomment.cpp4
-rw-r--r--kdeprint/cups/cupsdconf2/cupsdconf.cpp24
-rw-r--r--kdeprint/cups/cupsdconf2/cupsddialog.cpp2
-rw-r--r--kdeprint/cups/cupsdconf2/cupsdpage.h2
-rw-r--r--kdeprint/cups/cupsdconf2/cupsdsplash.cpp4
-rw-r--r--kdeprint/cups/cupsdconf2/editlist.h2
-rw-r--r--kdeprint/cups/cupsdconf2/portdialog.cpp4
-rw-r--r--kdeprint/cups/cupsdconf2/qdirlineedit.h2
-rw-r--r--kdeprint/cups/cupsdconf2/qdirmultilineedit.cpp2
-rw-r--r--kdeprint/cups/cupsdconf2/qdirmultilineedit.h2
-rw-r--r--kdeprint/cups/cupsdconf2/sizewidget.cpp2
-rw-r--r--kdeprint/cups/cupsdconf2/sizewidget.h2
-rw-r--r--kdeprint/cups/cupsinfos.cpp4
-rw-r--r--kdeprint/cups/image.cpp8
-rw-r--r--kdeprint/cups/imageposition.cpp6
-rw-r--r--kdeprint/cups/imageposition.h4
-rw-r--r--kdeprint/cups/imagepreview.cpp6
-rw-r--r--kdeprint/cups/imagepreview.h4
-rw-r--r--kdeprint/cups/ippreportdlg.cpp2
-rw-r--r--kdeprint/cups/ipprequest.cpp2
-rw-r--r--kdeprint/cups/kcupsprinterimpl.cpp10
-rw-r--r--kdeprint/cups/kmcupsconfigwidget.h2
-rw-r--r--kdeprint/cups/kmcupsjobmanager.cpp8
-rw-r--r--kdeprint/cups/kmcupsmanager.cpp42
-rw-r--r--kdeprint/cups/kmpropusers.cpp2
-rw-r--r--kdeprint/cups/kmwbanners.cpp4
-rw-r--r--kdeprint/cups/kmwfax.cpp4
-rw-r--r--kdeprint/cups/kmwipp.cpp2
-rw-r--r--kdeprint/cups/kmwippprinter.cpp6
-rw-r--r--kdeprint/cups/kmwippselect.cpp6
-rw-r--r--kdeprint/cups/kmwother.cpp4
-rw-r--r--kdeprint/cups/kpimagepage.cpp4
-rw-r--r--kdeprint/cups/kptagspage.cpp8
-rw-r--r--kdeprint/cups/kptagspage.h4
-rw-r--r--kdeprint/cups/kptextpage.cpp2
-rw-r--r--kdeprint/driver.cpp6
-rw-r--r--kdeprint/driver.h2
-rw-r--r--kdeprint/driveritem.cpp6
-rw-r--r--kdeprint/driveritem.h2
-rw-r--r--kdeprint/driverview.h2
-rw-r--r--kdeprint/droptionview.h4
-rw-r--r--kdeprint/foomatic/kfoomaticprinterimpl.cpp2
-rw-r--r--kdeprint/foomatic/kmfoomaticmanager.cpp6
-rw-r--r--kdeprint/foomatic2loader.cpp6
-rw-r--r--kdeprint/kdeprintcheck.cpp4
-rw-r--r--kdeprint/kdeprintd.cpp10
-rw-r--r--kdeprint/kfilelist.cpp2
-rw-r--r--kdeprint/kfilelist.h4
-rw-r--r--kdeprint/kmdbentry.cpp4
-rw-r--r--kdeprint/kmfactory.cpp6
-rw-r--r--kdeprint/kmjob.cpp2
-rw-r--r--kdeprint/kmjobmanager.cpp4
-rw-r--r--kdeprint/kmjobmanager.h2
-rw-r--r--kdeprint/kmmanager.cpp4
-rw-r--r--kdeprint/kmmanager.h2
-rw-r--r--kdeprint/kmprinter.cpp2
-rw-r--r--kdeprint/kmspecialmanager.cpp6
-rw-r--r--kdeprint/kmspecialmanager.h2
-rw-r--r--kdeprint/kmthreadjob.cpp6
-rw-r--r--kdeprint/kmthreadjob.h2
-rw-r--r--kdeprint/kmuimanager.h2
-rw-r--r--kdeprint/kpcopiespage.cpp4
-rw-r--r--kdeprint/kpfilterpage.cpp12
-rw-r--r--kdeprint/kpgeneralpage.cpp12
-rw-r--r--kdeprint/kpipeprocess.h2
-rw-r--r--kdeprint/kpposterpage.cpp4
-rw-r--r--kdeprint/kpqtpage.cpp12
-rw-r--r--kdeprint/kprintaction.cpp34
-rw-r--r--kdeprint/kprintaction.h14
-rw-r--r--kdeprint/kprintdialog.cpp8
-rw-r--r--kdeprint/kprintdialogpage.h2
-rw-r--r--kdeprint/kprinter.cpp12
-rw-r--r--kdeprint/kprinterimpl.cpp6
-rw-r--r--kdeprint/kprinterimpl.h2
-rw-r--r--kdeprint/kprintpreview.cpp2
-rw-r--r--kdeprint/kxmlcommand.cpp12
-rw-r--r--kdeprint/kxmlcommand.h4
-rw-r--r--kdeprint/lpd/gschecker.cpp4
-rw-r--r--kdeprint/lpd/gschecker.h2
-rw-r--r--kdeprint/lpd/klpdprinterimpl.cpp2
-rw-r--r--kdeprint/lpd/kmlpdmanager.cpp68
-rw-r--r--kdeprint/lpd/lpdtools.cpp24
-rw-r--r--kdeprint/lpdunix/klpdunixprinterimpl.cpp4
-rw-r--r--kdeprint/lpdunix/kmlpdunixmanager.cpp10
-rw-r--r--kdeprint/lpr/apshandler.cpp12
-rw-r--r--kdeprint/lpr/klprprinterimpl.cpp4
-rw-r--r--kdeprint/lpr/kmlprmanager.cpp18
-rw-r--r--kdeprint/lpr/lpchelper.cpp22
-rw-r--r--kdeprint/lpr/lpchelper.h2
-rw-r--r--kdeprint/lpr/lpqhelper.cpp6
-rw-r--r--kdeprint/lpr/lpqhelper.h2
-rw-r--r--kdeprint/lpr/lprhandler.cpp4
-rw-r--r--kdeprint/lpr/lprngtoolhandler.cpp24
-rw-r--r--kdeprint/lpr/matichandler.cpp22
-rw-r--r--kdeprint/lpr/printcapreader.cpp8
-rw-r--r--kdeprint/management/cjanuswidget.cpp2
-rw-r--r--kdeprint/management/cjanuswidget.h2
-rw-r--r--kdeprint/management/kmconfigfilter.cpp2
-rw-r--r--kdeprint/management/kmconfigpage.h2
-rw-r--r--kdeprint/management/kmdbcreator.cpp4
-rw-r--r--kdeprint/management/kmdbcreator.h2
-rw-r--r--kdeprint/management/kmdriverdb.cpp14
-rw-r--r--kdeprint/management/kmdriverdb.h2
-rw-r--r--kdeprint/management/kmdriverdbwidget.cpp2
-rw-r--r--kdeprint/management/kmdriverdbwidget.h2
-rw-r--r--kdeprint/management/kmiconview.cpp4
-rw-r--r--kdeprint/management/kminfopage.cpp18
-rw-r--r--kdeprint/management/kminstancepage.cpp4
-rw-r--r--kdeprint/management/kmjobviewer.cpp2
-rw-r--r--kdeprint/management/kmlistview.cpp2
-rw-r--r--kdeprint/management/kmlistview.h2
-rw-r--r--kdeprint/management/kmpages.h2
-rw-r--r--kdeprint/management/kmprinterview.cpp6
-rw-r--r--kdeprint/management/kmprinterview.h4
-rw-r--r--kdeprint/management/kmpropcontainer.h2
-rw-r--r--kdeprint/management/kmpropmembers.cpp2
-rw-r--r--kdeprint/management/kmpropwidget.h2
-rw-r--r--kdeprint/management/kmtimer.h2
-rw-r--r--kdeprint/management/kmwbackend.cpp2
-rw-r--r--kdeprint/management/kmwdriver.cpp2
-rw-r--r--kdeprint/management/kmwend.cpp12
-rw-r--r--kdeprint/management/kmwfile.cpp2
-rw-r--r--kdeprint/management/kmwizard.cpp4
-rw-r--r--kdeprint/management/kmwizard.h2
-rw-r--r--kdeprint/management/kmwizardpage.h2
-rw-r--r--kdeprint/management/kmwlocal.cpp2
-rw-r--r--kdeprint/management/kmwlpd.cpp4
-rw-r--r--kdeprint/management/kmwname.cpp2
-rw-r--r--kdeprint/management/kmwpassword.cpp2
-rw-r--r--kdeprint/management/kmwsocket.cpp2
-rw-r--r--kdeprint/management/kmwsocketutil.cpp4
-rw-r--r--kdeprint/management/kxmlcommanddlg.cpp14
-rw-r--r--kdeprint/management/kxmlcommanddlg.h2
-rw-r--r--kdeprint/management/kxmlcommandselector.cpp2
-rw-r--r--kdeprint/management/kxmlcommandselector.h2
-rw-r--r--kdeprint/management/networkscanner.cpp6
-rw-r--r--kdeprint/management/networkscanner.h2
-rw-r--r--kdeprint/management/sidepixmap.cpp4
-rw-r--r--kdeprint/management/sidepixmap.h4
-rw-r--r--kdeprint/management/smbview.cpp2
-rw-r--r--kdeprint/marginpreview.h2
-rw-r--r--kdeprint/marginwidget.h2
-rw-r--r--kdeprint/messagewindow.cpp12
-rw-r--r--kdeprint/messagewindow.h2
-rw-r--r--kdeprint/plugincombobox.cpp2
-rw-r--r--kdeprint/posterpreview.cpp10
-rw-r--r--kdeprint/posterpreview.h2
-rw-r--r--kdeprint/ppdloader.cpp6
-rw-r--r--kdeprint/printerfilter.cpp2
-rw-r--r--kdeprint/rlpr/kmproxywidget.h2
-rw-r--r--kdeprint/rlpr/kmrlprmanager.cpp2
-rw-r--r--kdeprint/rlpr/kmwrlpr.cpp8
-rw-r--r--kdeprint/rlpr/krlprprinterimpl.cpp2
-rw-r--r--kdeprint/tests/drawdemo.cpp4
-rw-r--r--kdeprint/tests/drawdemo.h2
-rw-r--r--kdeprint/tests/helpwindow.cpp4
-rw-r--r--kdeprint/tests/richpage.cpp2
-rw-r--r--kdeprint/tools/escputil/escpwidget.cpp14
-rw-r--r--kdeprint/tools/escputil/escpwidget.h2
-rw-r--r--kdeprint/treecombobox.cpp2
-rw-r--r--kdeprint/treecombobox.h6
-rw-r--r--kdeprint/util.cpp10
-rw-r--r--kdesu/client.cpp10
-rw-r--r--kdesu/kcookie.cpp2
-rw-r--r--kdesu/process.cpp8
-rw-r--r--kdesu/ssh.cpp4
-rw-r--r--kdesu/stub.cpp2
-rw-r--r--kdeui/kaboutdialog.cpp158
-rw-r--r--kdeui/kaboutdialog.h16
-rw-r--r--kdeui/kaboutdialog_private.h6
-rw-r--r--kdeui/kaboutkde.cpp8
-rw-r--r--kdeui/kaccelgen.h4
-rw-r--r--kdeui/kaction.cpp78
-rw-r--r--kdeui/kaction.h6
-rw-r--r--kdeui/kactionclasses.cpp126
-rw-r--r--kdeui/kactionclasses.h14
-rw-r--r--kdeui/kactioncollection.cpp16
-rw-r--r--kdeui/kactioncollection.h2
-rw-r--r--kdeui/kactionselector.cpp4
-rw-r--r--kdeui/kactivelabel.cpp12
-rw-r--r--kdeui/kactivelabel.h6
-rw-r--r--kdeui/kanimwidget.cpp8
-rw-r--r--kdeui/kanimwidget.h2
-rw-r--r--kdeui/karrowbutton.cpp14
-rw-r--r--kdeui/karrowbutton.h10
-rw-r--r--kdeui/kauthicon.cpp12
-rw-r--r--kdeui/kauthicon.h4
-rw-r--r--kdeui/kbugreport.cpp72
-rw-r--r--kdeui/kbuttonbox.cpp18
-rw-r--r--kdeui/kbuttonbox.h6
-rw-r--r--kdeui/kcharselect.cpp116
-rw-r--r--kdeui/kcharselect.h8
-rw-r--r--kdeui/kcmenumngr.cpp14
-rw-r--r--kdeui/kcmenumngr.h4
-rw-r--r--kdeui/kcmodule.h2
-rw-r--r--kdeui/kcolorbutton.cpp26
-rw-r--r--kdeui/kcolorbutton.h4
-rw-r--r--kdeui/kcolorcombo.cpp4
-rw-r--r--kdeui/kcolorcombo.h2
-rw-r--r--kdeui/kcolordialog.cpp78
-rw-r--r--kdeui/kcolordialog.h8
-rw-r--r--kdeui/kcolordrag.cpp12
-rw-r--r--kdeui/kcolordrag.h2
-rw-r--r--kdeui/kcombobox.cpp6
-rw-r--r--kdeui/kcommand.cpp18
-rw-r--r--kdeui/kcommand.h2
-rw-r--r--kdeui/kcompletionbox.cpp46
-rw-r--r--kdeui/kcompletionbox.h2
-rw-r--r--kdeui/kconfigdialog.cpp4
-rw-r--r--kdeui/kcursor.cpp34
-rw-r--r--kdeui/kcursor.h4
-rw-r--r--kdeui/kcursor_private.h4
-rw-r--r--kdeui/kdatepicker.cpp36
-rw-r--r--kdeui/kdatepicker.h8
-rw-r--r--kdeui/kdatetbl.cpp112
-rw-r--r--kdeui/kdatetbl.h18
-rw-r--r--kdeui/kdatetimewidget.cpp4
-rw-r--r--kdeui/kdatetimewidget.h2
-rw-r--r--kdeui/kdatewidget.cpp4
-rw-r--r--kdeui/kdatewidget.h2
-rw-r--r--kdeui/kdcopactionproxy.cpp2
-rw-r--r--kdeui/kdetrayproxy/kdetrayproxy.cpp16
-rw-r--r--kdeui/kdetrayproxy/kdetrayproxy.h2
-rw-r--r--kdeui/kdialog.cpp10
-rw-r--r--kdeui/kdialog.h4
-rw-r--r--kdeui/kdialogbase.cpp106
-rw-r--r--kdeui/kdialogbase.h16
-rw-r--r--kdeui/kdialogbase_priv.h2
-rw-r--r--kdeui/kdockwidget.cpp186
-rw-r--r--kdeui/kdockwidget.h20
-rw-r--r--kdeui/kdockwidget_private.cpp84
-rw-r--r--kdeui/kdockwidget_private.h10
-rw-r--r--kdeui/kdualcolorbutton.cpp48
-rw-r--r--kdeui/kdualcolorbutton.h4
-rw-r--r--kdeui/keditcl.h4
-rw-r--r--kdeui/keditcl1.cpp16
-rw-r--r--kdeui/keditcl2.cpp16
-rw-r--r--kdeui/keditlistbox.cpp6
-rw-r--r--kdeui/keditlistbox.h7
-rw-r--r--kdeui/kedittoolbar.cpp42
-rw-r--r--kdeui/kfontcombo.cpp8
-rw-r--r--kdeui/kfontdialog.cpp48
-rw-r--r--kdeui/kfontdialog.h4
-rw-r--r--kdeui/kfontrequester.cpp2
-rw-r--r--kdeui/kfontrequester.h2
-rw-r--r--kdeui/kguiitem.cpp2
-rw-r--r--kdeui/khelpmenu.cpp8
-rw-r--r--kdeui/khelpmenu.h2
-rw-r--r--kdeui/kiconview.cpp34
-rw-r--r--kdeui/kiconview.h4
-rw-r--r--kdeui/kiconviewsearchline.cpp2
-rw-r--r--kdeui/kinputdialog.cpp8
-rw-r--r--kdeui/kinputdialog.h2
-rw-r--r--kdeui/kjanuswidget.cpp70
-rw-r--r--kdeui/kjanuswidget.h14
-rw-r--r--kdeui/kkeybutton.cpp18
-rw-r--r--kdeui/kkeybutton.h2
-rw-r--r--kdeui/kkeydialog.cpp14
-rw-r--r--kdeui/kkeydialog.h2
-rw-r--r--kdeui/klanguagebutton.cpp14
-rw-r--r--kdeui/klanguagebutton.h2
-rw-r--r--kdeui/kled.cpp52
-rw-r--r--kdeui/kled.h24
-rw-r--r--kdeui/klineedit.cpp36
-rw-r--r--kdeui/klineeditdlg.cpp4
-rw-r--r--kdeui/klineeditdlg.h2
-rw-r--r--kdeui/klistbox.cpp4
-rw-r--r--kdeui/klistbox.h2
-rw-r--r--kdeui/klistview.cpp136
-rw-r--r--kdeui/klistview.h9
-rw-r--r--kdeui/klistviewsearchline.cpp10
-rw-r--r--kdeui/klistviewsearchline.h2
-rw-r--r--kdeui/kmainwindow.cpp74
-rw-r--r--kdeui/kmainwindow.h24
-rw-r--r--kdeui/kmainwindowiface.cpp2
-rw-r--r--kdeui/kmenubar.cpp72
-rw-r--r--kdeui/kmenubar.h4
-rw-r--r--kdeui/kmessagebox.cpp36
-rw-r--r--kdeui/knuminput.cpp74
-rw-r--r--kdeui/knuminput.h20
-rw-r--r--kdeui/knumvalidator.cpp28
-rw-r--r--kdeui/kpanelapplet.cpp24
-rw-r--r--kdeui/kpanelapplet.h14
-rw-r--r--kdeui/kpanelappmenu.cpp2
-rw-r--r--kdeui/kpanelextension.cpp14
-rw-r--r--kdeui/kpanelextension.h16
-rw-r--r--kdeui/kpassdlg.cpp58
-rw-r--r--kdeui/kpassdlg.h2
-rw-r--r--kdeui/kpassivepopup.cpp22
-rw-r--r--kdeui/kpassivepopup.h2
-rw-r--r--kdeui/kpixmapio.cpp152
-rw-r--r--kdeui/kpixmapregionselectorwidget.cpp18
-rw-r--r--kdeui/kpixmapregionselectorwidget.h2
-rw-r--r--kdeui/kpopupmenu.cpp45
-rw-r--r--kdeui/kpopupmenu.h6
-rw-r--r--kdeui/kprogress.cpp6
-rw-r--r--kdeui/kprogress.h2
-rw-r--r--kdeui/kpushbutton.cpp4
-rw-r--r--kdeui/kpushbutton.h2
-rw-r--r--kdeui/krootpixmap.cpp28
-rw-r--r--kdeui/krootpixmap.h10
-rw-r--r--kdeui/kruler.cpp46
-rw-r--r--kdeui/kruler.h10
-rw-r--r--kdeui/ksconfig.cpp20
-rw-r--r--kdeui/ksconfig.h2
-rw-r--r--kdeui/kscrollview.h2
-rw-r--r--kdeui/kselect.cpp56
-rw-r--r--kdeui/kselect.h8
-rw-r--r--kdeui/kseparator.cpp10
-rw-r--r--kdeui/kseparator.h4
-rw-r--r--kdeui/ksharedpixmap.cpp2
-rw-r--r--kdeui/ksharedpixmap.h4
-rw-r--r--kdeui/kshortcutdialog.cpp4
-rw-r--r--kdeui/kshortcutdialog_advanced.ui22
-rw-r--r--kdeui/kshortcutdialog_simple.ui10
-rw-r--r--kdeui/kspell.cpp50
-rw-r--r--kdeui/kspell.h2
-rw-r--r--kdeui/kspelldlg.cpp2
-rw-r--r--kdeui/kspellui.ui36
-rw-r--r--kdeui/ksplashscreen.h2
-rw-r--r--kdeui/ksqueezedtextlabel.cpp16
-rw-r--r--kdeui/ksqueezedtextlabel.h6
-rw-r--r--kdeui/kstatusbar.cpp8
-rw-r--r--kdeui/kstatusbar.h8
-rw-r--r--kdeui/kstdaction.cpp2
-rw-r--r--kdeui/kstdguiitem.cpp60
-rw-r--r--kdeui/kstdguiitem.h2
-rw-r--r--kdeui/kstringvalidator.cpp6
-rw-r--r--kdeui/kstringvalidator.h2
-rw-r--r--kdeui/kswitchlanguagedialog.cpp14
-rw-r--r--kdeui/ksyntaxhighlighter.cpp34
-rw-r--r--kdeui/ksyntaxhighlighter.h2
-rw-r--r--kdeui/ksystemtray.cpp38
-rw-r--r--kdeui/ksystemtray.h6
-rw-r--r--kdeui/ktabbar.cpp50
-rw-r--r--kdeui/ktabbar.h2
-rw-r--r--kdeui/ktabctl.cpp54
-rw-r--r--kdeui/ktabctl.h6
-rw-r--r--kdeui/ktabwidget.cpp20
-rw-r--r--kdeui/ktabwidget.h2
-rw-r--r--kdeui/ktextbrowser.cpp2
-rw-r--r--kdeui/ktextbrowser.h2
-rw-r--r--kdeui/ktextedit.cpp4
-rw-r--r--kdeui/ktextedit.h2
-rw-r--r--kdeui/ktimewidget.cpp4
-rw-r--r--kdeui/ktimewidget.h2
-rw-r--r--kdeui/ktip.cpp24
-rw-r--r--kdeui/ktoolbar.cpp128
-rw-r--r--kdeui/ktoolbar.h16
-rw-r--r--kdeui/ktoolbarbutton.cpp68
-rw-r--r--kdeui/ktoolbarbutton.h10
-rw-r--r--kdeui/ktoolbarhandler.cpp4
-rw-r--r--kdeui/ktoolbarlabelaction.cpp8
-rw-r--r--kdeui/ktoolbarradiogroup.cpp6
-rw-r--r--kdeui/ktoolbarradiogroup.h2
-rw-r--r--kdeui/kurllabel.cpp36
-rw-r--r--kdeui/kurllabel.h6
-rw-r--r--kdeui/kwhatsthismanager.cpp14
-rw-r--r--kdeui/kwhatsthismanager_p.h2
-rw-r--r--kdeui/kwindowinfo.h2
-rw-r--r--kdeui/kwindowlistmenu.cpp8
-rw-r--r--kdeui/kwindowlistmenu.h4
-rw-r--r--kdeui/kwizard.h2
-rw-r--r--kdeui/kwordwrap.cpp4
-rw-r--r--kdeui/kwordwrap.h6
-rw-r--r--kdeui/kxmlguibuilder.cpp80
-rw-r--r--kdeui/kxmlguiclient.cpp26
-rw-r--r--kdeui/kxmlguifactory.cpp10
-rw-r--r--kdeui/kxmlguifactory.h2
-rw-r--r--kdeui/kxmlguifactory_p.cpp14
-rw-r--r--kdeui/qxembed.cpp194
-rw-r--r--kdeui/qxembed.h11
-rw-r--r--kdeui/tests/itemcontainertest.h2
-rw-r--r--kdeui/tests/kalphaicontest.h2
-rw-r--r--kdeui/tests/kblendtest.cpp2
-rw-r--r--kdeui/tests/kblendtest.h2
-rw-r--r--kdeui/tests/kbuttonboxtest.cpp24
-rw-r--r--kdeui/tests/kcharselecttest.cpp2
-rw-r--r--kdeui/tests/kcolortest.cpp6
-rw-r--r--kdeui/tests/kcolortest.h2
-rw-r--r--kdeui/tests/kcomboboxtest.cpp10
-rw-r--r--kdeui/tests/kcomboboxtest.h2
-rw-r--r--kdeui/tests/kcompletiontest.cpp2
-rw-r--r--kdeui/tests/kcompletiontest.h2
-rw-r--r--kdeui/tests/kdesattest.cpp2
-rw-r--r--kdeui/tests/kdesattest.h2
-rw-r--r--kdeui/tests/kdialogbasetest.cpp2
-rw-r--r--kdeui/tests/kdockwidgetdemo.cpp12
-rw-r--r--kdeui/tests/kdockwidgetdemo.h12
-rw-r--r--kdeui/tests/kdockwidgettest.cpp4
-rw-r--r--kdeui/tests/kdualcolortest.cpp6
-rw-r--r--kdeui/tests/kdualcolortest.h2
-rw-r--r--kdeui/tests/keditlistboxtest.cpp12
-rw-r--r--kdeui/tests/kgradienttest.h2
-rw-r--r--kdeui/tests/khashtest.h2
-rw-r--r--kdeui/tests/kledtest.cpp6
-rw-r--r--kdeui/tests/kledtest.h4
-rw-r--r--kdeui/tests/klineedittest.h2
-rw-r--r--kdeui/tests/kmessageboxtest.cpp24
-rw-r--r--kdeui/tests/knuminputtest.h2
-rw-r--r--kdeui/tests/kpanelmenutest.cpp2
-rw-r--r--kdeui/tests/kpanelmenutest.h2
-rw-r--r--kdeui/tests/kpopuptest.cpp2
-rw-r--r--kdeui/tests/krulertest.cpp12
-rw-r--r--kdeui/tests/krulertest.h2
-rw-r--r--kdeui/tests/ktabctltest.h2
-rw-r--r--kdeui/tests/ktabwidgettest.cpp6
-rw-r--r--kdeui/tests/ktabwidgettest.h2
-rw-r--r--kdeui/tests/kunbalancedgrdtest.cpp2
-rw-r--r--kdeui/tests/kunbalancedgrdtest.h4
-rw-r--r--kdeui/tests/kwizardtest.cpp2
-rw-r--r--kdewidgets/makekdewidgets.cpp18
-rw-r--r--kdoctools/kio_help.cpp30
-rw-r--r--kdoctools/kio_help.h2
-rw-r--r--kdoctools/meinproc.cpp12
-rw-r--r--kdoctools/xslt.cpp12
-rw-r--r--khtml/DESIGN.html2
-rw-r--r--khtml/css/css_base.cpp2
-rw-r--r--khtml/css/css_renderstyledeclarationimpl.cpp2
-rw-r--r--khtml/css/css_stylesheetimpl.cpp4
-rw-r--r--khtml/css/css_stylesheetimpl.h6
-rw-r--r--khtml/css/css_valueimpl.cpp18
-rw-r--r--khtml/css/csshelper.cpp2
-rw-r--r--khtml/css/cssparser.cpp18
-rw-r--r--khtml/css/cssproperties.c4
-rw-r--r--khtml/css/cssstyleselector.cpp70
-rw-r--r--khtml/css/cssstyleselector.h2
-rw-r--r--khtml/css/html4.css12
-rw-r--r--khtml/dom/css_extensions.cpp6
-rw-r--r--khtml/dom/css_extensions.h8
-rw-r--r--khtml/dom/css_value.cpp8
-rw-r--r--khtml/dom/css_value.h2
-rw-r--r--khtml/dom/dom_doc.cpp4
-rw-r--r--khtml/dom/dom_node.h2
-rw-r--r--khtml/dom/dom_string.cpp18
-rw-r--r--khtml/dom/dom_string.h2
-rw-r--r--khtml/dom/html_block.h6
-rw-r--r--khtml/dom/html_element.cpp2
-rw-r--r--khtml/dom/html_form.h2
-rw-r--r--khtml/dom/html_image.cpp2
-rw-r--r--khtml/dom/html_image.h12
-rw-r--r--khtml/dom/html_inline.cpp2
-rw-r--r--khtml/dom/html_inline.h12
-rw-r--r--khtml/dom/html_table.h26
-rw-r--r--khtml/ecma/kjs_binding.cpp4
-rw-r--r--khtml/ecma/kjs_css.cpp2
-rw-r--r--khtml/ecma/kjs_debugwin.cpp12
-rw-r--r--khtml/ecma/kjs_dom.cpp4
-rw-r--r--khtml/ecma/kjs_events.cpp4
-rw-r--r--khtml/ecma/kjs_html.cpp8
-rw-r--r--khtml/ecma/kjs_navigator.cpp38
-rw-r--r--khtml/ecma/kjs_proxy.cpp10
-rw-r--r--khtml/ecma/kjs_window.cpp88
-rw-r--r--khtml/ecma/xmlhttprequest.cpp24
-rw-r--r--khtml/html/html_baseimpl.cpp4
-rw-r--r--khtml/html/html_documentimpl.cpp30
-rw-r--r--khtml/html/html_elementimpl.cpp34
-rw-r--r--khtml/html/html_elementimpl.h2
-rw-r--r--khtml/html/html_formimpl.cpp20
-rw-r--r--khtml/html/html_imageimpl.cpp22
-rw-r--r--khtml/html/html_imageimpl.h4
-rw-r--r--khtml/html/html_miscimpl.cpp2
-rw-r--r--khtml/html/html_objectimpl.cpp8
-rw-r--r--khtml/html/htmltokenizer.cpp34
-rw-r--r--khtml/html/htmltokenizer.h4
-rw-r--r--khtml/htmlpageinfo.ui4
-rw-r--r--khtml/java/kjavaapplet.h2
-rw-r--r--khtml/java/kjavaappletcontext.cpp16
-rw-r--r--khtml/java/kjavaappletcontext.h2
-rw-r--r--khtml/java/kjavaappletserver.cpp40
-rw-r--r--khtml/java/kjavaappletserver.h4
-rw-r--r--khtml/java/kjavaappletviewer.cpp32
-rw-r--r--khtml/java/kjavaappletwidget.cpp10
-rw-r--r--khtml/java/kjavaappletwidget.h4
-rw-r--r--khtml/java/kjavadownloader.h2
-rw-r--r--khtml/java/kjavaprocess.cpp2
-rw-r--r--khtml/khtml_caret.cpp12
-rw-r--r--khtml/khtml_caret_p.h4
-rw-r--r--khtml/khtml_ext.cpp8
-rw-r--r--khtml/khtml_factory.cpp4
-rw-r--r--khtml/khtml_factory.h2
-rw-r--r--khtml/khtml_pagecache.cpp12
-rw-r--r--khtml/khtml_pagecache.h4
-rw-r--r--khtml/khtml_part.cpp200
-rw-r--r--khtml/khtml_part.h6
-rw-r--r--khtml/khtml_run.cpp2
-rw-r--r--khtml/khtml_settings.cc44
-rw-r--r--khtml/khtmlimage.cpp14
-rw-r--r--khtml/khtmlimage.h4
-rw-r--r--khtml/khtmlpart_p.h4
-rw-r--r--khtml/khtmlview.cpp114
-rw-r--r--khtml/khtmlview.h10
-rw-r--r--khtml/kjserrordlg.ui2
-rw-r--r--khtml/kmultipart/kmultipart.cpp14
-rw-r--r--khtml/kmultipart/kmultipart.h2
-rw-r--r--khtml/misc/arena.cpp4
-rw-r--r--khtml/misc/decoder.cpp8
-rw-r--r--khtml/misc/helper.cpp4
-rw-r--r--khtml/misc/helper.h2
-rw-r--r--khtml/misc/htmlattrs.c4
-rw-r--r--khtml/misc/khtmllayout.h4
-rw-r--r--khtml/misc/knsplugininstaller.h2
-rw-r--r--khtml/misc/loader.cpp20
-rw-r--r--khtml/misc/loader.h2
-rw-r--r--khtml/misc/loader_jpeg.cpp4
-rw-r--r--khtml/misc/loader_jpeg.h2
-rw-r--r--khtml/misc/multimap.h8
-rw-r--r--khtml/misc/stringit.h6
-rw-r--r--khtml/rendering/bidi.cpp28
-rw-r--r--khtml/rendering/break_lines.h8
-rw-r--r--khtml/rendering/enumerate.cpp2
-rw-r--r--khtml/rendering/font.cpp2
-rw-r--r--khtml/rendering/render_applet.cpp18
-rw-r--r--khtml/rendering/render_arena.cpp4
-rw-r--r--khtml/rendering/render_block.cpp6
-rw-r--r--khtml/rendering/render_body.cpp4
-rw-r--r--khtml/rendering/render_body.h2
-rw-r--r--khtml/rendering/render_box.cpp16
-rw-r--r--khtml/rendering/render_box.h4
-rw-r--r--khtml/rendering/render_canvas.cpp26
-rw-r--r--khtml/rendering/render_canvas.h8
-rw-r--r--khtml/rendering/render_container.cpp6
-rw-r--r--khtml/rendering/render_flow.cpp10
-rw-r--r--khtml/rendering/render_flow.h2
-rw-r--r--khtml/rendering/render_form.cpp40
-rw-r--r--khtml/rendering/render_frames.cpp42
-rw-r--r--khtml/rendering/render_frames.h4
-rw-r--r--khtml/rendering/render_generated.cpp2
-rw-r--r--khtml/rendering/render_image.cpp6
-rw-r--r--khtml/rendering/render_layer.cpp26
-rw-r--r--khtml/rendering/render_layer.h8
-rw-r--r--khtml/rendering/render_list.cpp12
-rw-r--r--khtml/rendering/render_object.cpp46
-rw-r--r--khtml/rendering/render_object.h16
-rw-r--r--khtml/rendering/render_replaced.cpp22
-rw-r--r--khtml/rendering/render_style.cpp6
-rw-r--r--khtml/rendering/render_style.h16
-rw-r--r--khtml/rendering/render_table.cpp8
-rw-r--r--khtml/rendering/render_table.h2
-rw-r--r--khtml/rendering/render_text.cpp26
-rw-r--r--khtml/rendering/render_text.h4
-rw-r--r--khtml/test/align2.html10
-rw-r--r--khtml/test/image_map.html10
-rw-r--r--khtml/test_regression.cpp30
-rw-r--r--khtml/test_regression.h4
-rw-r--r--khtml/test_regression_fontoverload.cpp4
-rw-r--r--khtml/testkhtml.cpp12
-rw-r--r--khtml/testkhtml.h2
-rw-r--r--khtml/xml/dom2_eventsimpl.cpp32
-rw-r--r--khtml/xml/dom_docimpl.cpp30
-rw-r--r--khtml/xml/dom_docimpl.h4
-rw-r--r--khtml/xml/dom_elementimpl.cpp2
-rw-r--r--khtml/xml/dom_nodeimpl.cpp4
-rw-r--r--khtml/xml/dom_nodeimpl.h20
-rw-r--r--khtml/xml/dom_restyler.cpp6
-rw-r--r--khtml/xml/dom_stringimpl.cpp16
-rw-r--r--khtml/xml/dom_stringimpl.h2
-rw-r--r--khtml/xml/dom_xmlimpl.h2
-rw-r--r--khtml/xml/xml_tokenizer.cpp16
-rw-r--r--khtml/xml/xml_tokenizer.h8
-rw-r--r--kimgio/dds.cpp48
-rw-r--r--kimgio/eps.cpp10
-rw-r--r--kimgio/exr.cpp4
-rw-r--r--kimgio/hdr.cpp20
-rw-r--r--kimgio/ico.cpp52
-rw-r--r--kimgio/jp2.cpp16
-rw-r--r--kimgio/pcx.cpp68
-rw-r--r--kimgio/pcx.h62
-rw-r--r--kimgio/psd.cpp28
-rw-r--r--kimgio/rgb.cpp82
-rw-r--r--kimgio/rgb.h30
-rw-r--r--kimgio/tga.cpp50
-rw-r--r--kimgio/tiffr.cpp4
-rw-r--r--kimgio/xcf.cpp174
-rw-r--r--kimgio/xcf.h58
-rw-r--r--kimgio/xview.cpp20
-rw-r--r--kinit/kinit.cpp2
-rw-r--r--kinit/klauncher.cpp4
-rw-r--r--kinit/klauncher.h2
-rw-r--r--kinit/tests/klaunchertest.cpp4
-rw-r--r--kio/bookmarks/dptrtemplate.h4
-rw-r--r--kio/bookmarks/kbookmark.cc6
-rw-r--r--kio/bookmarks/kbookmark.h4
-rw-r--r--kio/bookmarks/kbookmarkbar.cc6
-rw-r--r--kio/bookmarks/kbookmarkbar.h7
-rw-r--r--kio/bookmarks/kbookmarkdrag.cc12
-rw-r--r--kio/bookmarks/kbookmarkdrag.h4
-rw-r--r--kio/bookmarks/kbookmarkimporter.h2
-rw-r--r--kio/bookmarks/kbookmarkimporter_crash.cc8
-rw-r--r--kio/bookmarks/kbookmarkimporter_crash.h2
-rw-r--r--kio/bookmarks/kbookmarkimporter_ie.cc6
-rw-r--r--kio/bookmarks/kbookmarkimporter_ie.h2
-rw-r--r--kio/bookmarks/kbookmarkimporter_kde1.cc2
-rw-r--r--kio/bookmarks/kbookmarkimporter_ns.cc14
-rw-r--r--kio/bookmarks/kbookmarkimporter_ns.h2
-rw-r--r--kio/bookmarks/kbookmarkimporter_opera.h2
-rw-r--r--kio/bookmarks/kbookmarkmanager.cc20
-rw-r--r--kio/bookmarks/kbookmarkmenu.cc10
-rw-r--r--kio/bookmarks/kbookmarkmenu.h8
-rw-r--r--kio/bookmarks/kbookmarkmenu_p.h2
-rw-r--r--kio/httpfilter/httpfilter.cc2
-rw-r--r--kio/httpfilter/httpfilter.h2
-rw-r--r--kio/kfile/config-kfile.h30
-rw-r--r--kio/kfile/images.h2
-rw-r--r--kio/kfile/kacleditwidget.cpp28
-rw-r--r--kio/kfile/kacleditwidget.h7
-rw-r--r--kio/kfile/kacleditwidget_p.h12
-rw-r--r--kio/kfile/kcombiview.cpp6
-rw-r--r--kio/kfile/kcustommenueditor.cpp12
-rw-r--r--kio/kfile/kdiroperator.cpp122
-rw-r--r--kio/kfile/kdiroperator.h4
-rw-r--r--kio/kfile/kdirselectdialog.cpp16
-rw-r--r--kio/kfile/kdirsize.cpp6
-rw-r--r--kio/kfile/kdiskfreesp.cpp24
-rw-r--r--kio/kfile/kdiskfreesp.h2
-rw-r--r--kio/kfile/kencodingfiledialog.cpp2
-rw-r--r--kio/kfile/kfiledetailview.cpp2
-rw-r--r--kio/kfile/kfiledetailview.h2
-rw-r--r--kio/kfile/kfiledialog.cpp86
-rw-r--r--kio/kfile/kfilefiltercombo.cpp12
-rw-r--r--kio/kfile/kfileiconview.cpp40
-rw-r--r--kio/kfile/kfilemetainfowidget.cpp6
-rw-r--r--kio/kfile/kfilemetainfowidget.h2
-rw-r--r--kio/kfile/kfilemetapreview.cpp18
-rw-r--r--kio/kfile/kfilepreview.cpp10
-rw-r--r--kio/kfile/kfilesharedlg.cpp4
-rw-r--r--kio/kfile/kfilespeedbar.cpp10
-rw-r--r--kio/kfile/kfilespeedbar.h2
-rw-r--r--kio/kfile/kfiletreebranch.cpp2
-rw-r--r--kio/kfile/kfiletreeview.cpp10
-rw-r--r--kio/kfile/kfiletreeview.h2
-rw-r--r--kio/kfile/kfileview.cpp2
-rw-r--r--kio/kfile/kfileview.h6
-rw-r--r--kio/kfile/kicondialog.cpp18
-rw-r--r--kio/kfile/kicondialog.h2
-rw-r--r--kio/kfile/kimagefilepreview.cpp6
-rw-r--r--kio/kfile/kimagefilepreview.h2
-rw-r--r--kio/kfile/kmetaprops.cpp14
-rw-r--r--kio/kfile/knotifydialog.cpp36
-rw-r--r--kio/kfile/knotifydialog.h2
-rw-r--r--kio/kfile/knotifywidgetbase.ui44
-rw-r--r--kio/kfile/kopenwith.cpp56
-rw-r--r--kio/kfile/kopenwith_p.h2
-rw-r--r--kio/kfile/kpreviewwidgetbase.h4
-rw-r--r--kio/kfile/kpropertiesdesktopadvbase.ui33
-rw-r--r--kio/kfile/kpropertiesdesktopbase.ui28
-rw-r--r--kio/kfile/kpropertiesdialog.cpp138
-rw-r--r--kio/kfile/kpropertiesdialog.h2
-rw-r--r--kio/kfile/kpropertiesmimetypebase.ui4
-rw-r--r--kio/kfile/krecentdirs.cpp4
-rw-r--r--kio/kfile/krecentdocument.cpp32
-rw-r--r--kio/kfile/kurlbar.cpp60
-rw-r--r--kio/kfile/kurlbar.h12
-rw-r--r--kio/kfile/kurlcombobox.cpp8
-rw-r--r--kio/kfile/kurlrequester.cpp16
-rw-r--r--kio/kfile/kurlrequester.h2
-rw-r--r--kio/kfile/kurlrequesterdlg.cpp2
-rw-r--r--kio/kfile/tests/kdirselectdialogtest.cpp2
-rw-r--r--kio/kfile/tests/kfdtest.cpp4
-rw-r--r--kio/kfile/tests/kfdtest.h2
-rw-r--r--kio/kfile/tests/kfiletreeviewtest.cpp2
-rw-r--r--kio/kfile/tests/kfstest.cpp38
-rw-r--r--kio/kfile/tests/kurlrequestertest.cpp2
-rw-r--r--kio/kio/authinfo.cpp28
-rw-r--r--kio/kio/chmodjob.cpp2
-rw-r--r--kio/kio/connection.h2
-rw-r--r--kio/kio/dataprotocol.cpp6
-rw-r--r--kio/kio/dataslave.cpp2
-rw-r--r--kio/kio/defaultprogress.cpp12
-rw-r--r--kio/kio/forwardingslavebase.cpp26
-rw-r--r--kio/kio/global.cpp30
-rw-r--r--kio/kio/global.h6
-rw-r--r--kio/kio/job.cpp100
-rw-r--r--kio/kio/jobclasses.h6
-rw-r--r--kio/kio/kacl.cpp16
-rw-r--r--kio/kio/kar.cpp6
-rw-r--r--kio/kio/karchive.cpp14
-rw-r--r--kio/kio/karchive.h8
-rw-r--r--kio/kio/kautomount.h8
-rw-r--r--kio/kio/kdatatool.cpp14
-rw-r--r--kio/kio/kdatatool.h4
-rw-r--r--kio/kio/kdirlister.cpp24
-rw-r--r--kio/kio/kdirlister.h2
-rw-r--r--kio/kio/kdirwatch.cpp26
-rw-r--r--kio/kio/kdirwatch.h2
-rw-r--r--kio/kio/kdirwatch_p.h4
-rw-r--r--kio/kio/kfileitem.cpp10
-rw-r--r--kio/kio/kfilemetainfo.cpp76
-rw-r--r--kio/kio/kfilemetainfo.h2
-rw-r--r--kio/kio/kfileshare.cpp10
-rw-r--r--kio/kio/kfileshare.h2
-rw-r--r--kio/kio/kfilterdev.cpp52
-rw-r--r--kio/kio/kfilterdev.h10
-rw-r--r--kio/kio/kimageio.cpp34
-rw-r--r--kio/kio/klimitediodevice.h14
-rw-r--r--kio/kio/kmimemagic.cpp8
-rw-r--r--kio/kio/kmimetype.cpp24
-rw-r--r--kio/kio/kmimetypechooser.cpp26
-rw-r--r--kio/kio/kmimetypechooser.h2
-rw-r--r--kio/kio/kmimetyperesolver.h2
-rw-r--r--kio/kio/knfsshare.cpp8
-rw-r--r--kio/kio/kprotocolmanager.cpp12
-rw-r--r--kio/kio/kremoteencoding.cpp4
-rw-r--r--kio/kio/krun.cpp26
-rw-r--r--kio/kio/krun.h4
-rw-r--r--kio/kio/ksambashare.cpp6
-rw-r--r--kio/kio/kscan.cpp8
-rw-r--r--kio/kio/kservice.cpp54
-rw-r--r--kio/kio/kservicefactory.cpp26
-rw-r--r--kio/kio/kservicegroup.cpp28
-rw-r--r--kio/kio/kservicegroupfactory.cpp8
-rw-r--r--kio/kio/kservicetype.cpp22
-rw-r--r--kio/kio/kservicetypefactory.cpp32
-rw-r--r--kio/kio/kservicetypefactory.h2
-rw-r--r--kio/kio/kshellcompletion.cpp8
-rw-r--r--kio/kio/ktar.cpp28
-rw-r--r--kio/kio/ktar.h4
-rw-r--r--kio/kio/ktrader.h2
-rw-r--r--kio/kio/ktraderparsetree.cpp10
-rw-r--r--kio/kio/kurifilter.cpp14
-rw-r--r--kio/kio/kurifilter.h3
-rw-r--r--kio/kio/kurlcompletion.cpp16
-rw-r--r--kio/kio/kuserprofile.cpp8
-rw-r--r--kio/kio/kzip.cpp34
-rw-r--r--kio/kio/kzip.h16
-rw-r--r--kio/kio/metainfojob.cpp2
-rw-r--r--kio/kio/netaccess.cpp20
-rw-r--r--kio/kio/netaccess.h4
-rw-r--r--kio/kio/passdlg.cpp34
-rw-r--r--kio/kio/paste.cpp22
-rw-r--r--kio/kio/previewjob.cpp26
-rw-r--r--kio/kio/renamedlg.cpp12
-rw-r--r--kio/kio/renamedlg.h2
-rw-r--r--kio/kio/renamedlgplugin.h2
-rw-r--r--kio/kio/scheduler.cpp36
-rw-r--r--kio/kio/sessiondata.cpp12
-rw-r--r--kio/kio/sessiondata.h2
-rw-r--r--kio/kio/skipdlg.cpp12
-rw-r--r--kio/kio/slave.cpp8
-rw-r--r--kio/kio/slavebase.cpp32
-rw-r--r--kio/kio/slavebase.h12
-rw-r--r--kio/kio/slaveconfig.cpp16
-rw-r--r--kio/kio/slaveconfig.h2
-rw-r--r--kio/kio/slaveinterface.cpp18
-rw-r--r--kio/kio/slaveinterface.h6
-rw-r--r--kio/kio/statusbarprogress.cpp6
-rw-r--r--kio/kio/tcpslavebase.cpp2
-rw-r--r--kio/kioexec/main.cpp2
-rw-r--r--kio/kioexec/main.h2
-rw-r--r--kio/kpasswdserver/kpasswdserver.cpp28
-rw-r--r--kio/kssl/keygenwizard.ui6
-rw-r--r--kio/kssl/keygenwizard2.ui14
-rw-r--r--kio/kssl/kopenssl.cc2
-rw-r--r--kio/kssl/kssl/caroot/ca-bundle.crt4
-rw-r--r--kio/kssl/ksslcertdlg.cc4
-rw-r--r--kio/kssl/ksslcertificate.cc6
-rw-r--r--kio/kssl/ksslcertificatecache.cc4
-rw-r--r--kio/kssl/ksslinfodlg.cc26
-rw-r--r--kio/kssl/ksslpeerinfo.cc2
-rw-r--r--kio/kssl/ksslsettings.cc2
-rw-r--r--kio/kssl/ksslx509map.cc10
-rw-r--r--kio/misc/kdesasl/kdesasl.cpp8
-rw-r--r--kio/misc/kfile/fileprops.cpp20
-rw-r--r--kio/misc/kntlm/des.cpp18
-rw-r--r--kio/misc/kntlm/des.h2
-rw-r--r--kio/misc/kntlm/kntlm.cpp70
-rw-r--r--kio/misc/kntlm/kntlm.h38
-rw-r--r--kio/misc/kntlm/kswap.h96
-rw-r--r--kio/misc/kpac/discovery.cpp2
-rw-r--r--kio/misc/kpac/downloader.h2
-rw-r--r--kio/misc/kpac/proxyscout.cpp4
-rw-r--r--kio/misc/kpac/script.cpp2
-rw-r--r--kio/misc/ksendbugmail/main.cpp8
-rw-r--r--kio/misc/ksendbugmail/smtp.cpp26
-rw-r--r--kio/misc/kssld/kssld.cpp48
-rw-r--r--kio/misc/kwalletd/kbetterthankdialogbase.ui22
-rw-r--r--kio/misc/kwalletd/ktimeout.cpp6
-rw-r--r--kio/misc/kwalletd/kwalletd.cpp64
-rw-r--r--kio/misc/kwalletd/kwalletd.h2
-rw-r--r--kio/misc/kwalletd/kwalletwizard.ui84
-rw-r--r--kio/misc/uiserver.cpp14
-rw-r--r--kio/tests/dataprotocoltest.cpp2
-rw-r--r--kio/tests/jobtest.cpp2
-rw-r--r--kio/tests/jobtest.h2
-rw-r--r--kio/tests/kacltest.cpp30
-rw-r--r--kio/tests/kdcopcheck.h2
-rw-r--r--kio/tests/kdefaultprogresstest.cpp4
-rw-r--r--kio/tests/kdirlistertest.cpp2
-rw-r--r--kio/tests/kdirlistertest.h4
-rw-r--r--kio/tests/kdirwatchunittest.cpp8
-rw-r--r--kio/tests/kioslavetest.cpp10
-rw-r--r--kio/tests/kruntest.h2
-rw-r--r--kio/tests/ksycocatest.cpp2
-rw-r--r--kio/tests/kurifiltertest.cpp4
-rw-r--r--kio/tests/kurlcompletiontest.cpp8
-rw-r--r--kio/tests/previewtest.h2
-rw-r--r--kioslave/file/file.cc38
-rw-r--r--kioslave/ftp/ftp.cc20
-rw-r--r--kioslave/http/http.cc144
-rw-r--r--kioslave/http/http.h2
-rw-r--r--kioslave/http/http_cache_cleaner.cpp10
-rw-r--r--kioslave/http/kcookiejar/kcookiejar.cpp56
-rw-r--r--kioslave/http/kcookiejar/kcookiejar.h2
-rw-r--r--kioslave/http/kcookiejar/kcookieserver.cpp14
-rw-r--r--kioslave/http/kcookiejar/kcookiewin.cpp16
-rw-r--r--kioslave/http/kcookiejar/kcookiewin.h2
-rw-r--r--kioslave/http/kcookiejar/tests/kcookiejartest.cpp14
-rw-r--r--kioslave/iso/iso.cpp16
-rw-r--r--kioslave/iso/kiso.cpp2
-rw-r--r--kioslave/iso/kisofile.cpp2
-rw-r--r--kjs/internal.cpp2
-rw-r--r--kjs/lexer.cpp2
-rw-r--r--kjs/lexer.h2
-rw-r--r--kjs/regexp.cpp10
-rw-r--r--kjs/regexp_object.cpp2
-rw-r--r--kjs/ustring.cpp6
-rw-r--r--kjs/ustring.h6
-rw-r--r--kmdi/kmdi/dockcontainer.cpp28
-rw-r--r--kmdi/kmdi/guiclient.cpp4
-rw-r--r--kmdi/kmdi/mainwindow.cpp36
-rw-r--r--kmdi/kmdi/mainwindow.h2
-rw-r--r--kmdi/kmdi/tabwidget.cpp6
-rw-r--r--kmdi/kmdi/toolviewaccessor.cpp4
-rw-r--r--kmdi/kmdi/toolviewaccessor.h2
-rw-r--r--kmdi/kmdichildarea.cpp6
-rw-r--r--kmdi/kmdichildarea.h2
-rw-r--r--kmdi/kmdichildfrm.cpp44
-rw-r--r--kmdi/kmdichildfrm.h14
-rw-r--r--kmdi/kmdichildfrmcaption.cpp6
-rw-r--r--kmdi/kmdichildfrmcaption.h2
-rw-r--r--kmdi/kmdichildview.cpp8
-rw-r--r--kmdi/kmdichildview.h10
-rw-r--r--kmdi/kmdidockcontainer.cpp26
-rw-r--r--kmdi/kmdidocumentviewtabwidget.cpp8
-rw-r--r--kmdi/kmdifocuslist.h2
-rw-r--r--kmdi/kmdiguiclient.cpp4
-rw-r--r--kmdi/kmdimainfrm.cpp90
-rw-r--r--kmdi/kmdimainfrm.h8
-rw-r--r--kmdi/kmditaskbar.cpp12
-rw-r--r--kmdi/kmditaskbar.h2
-rw-r--r--kmdi/kmditoolviewaccessor.cpp6
-rw-r--r--kmdi/kmditoolviewaccessor.h2
-rw-r--r--kmdi/test/hello.cpp6
-rw-r--r--kmdi/test/hello.h2
-rw-r--r--knewstuff/downloaddialog.cpp30
-rw-r--r--knewstuff/engine.cpp10
-rw-r--r--knewstuff/engine.h12
-rw-r--r--knewstuff/entry.cpp16
-rw-r--r--knewstuff/ghns.h2
-rw-r--r--knewstuff/knewstuff.cpp12
-rw-r--r--knewstuff/knewstuff.h10
-rw-r--r--knewstuff/knewstuffgeneric.cpp2
-rw-r--r--knewstuff/knewstuffsecure.cpp16
-rw-r--r--knewstuff/knewstuffsecure.h4
-rw-r--r--knewstuff/provider.cpp10
-rw-r--r--knewstuff/provider.h6
-rw-r--r--knewstuff/security.cpp16
-rw-r--r--knewstuff/security.h2
-rw-r--r--knewstuff/testnewstuff.h2
-rw-r--r--kparts/browserextension.cpp30
-rw-r--r--kparts/browserextension.h8
-rw-r--r--kparts/browserinterface.cpp16
-rw-r--r--kparts/browserinterface.h2
-rw-r--r--kparts/browserrun.cpp10
-rw-r--r--kparts/browserrun.h2
-rw-r--r--kparts/componentfactory.h34
-rw-r--r--kparts/dockmainwindow.cpp8
-rw-r--r--kparts/dockmainwindow.h2
-rw-r--r--kparts/event.h2
-rw-r--r--kparts/factory.cpp6
-rw-r--r--kparts/factory.h8
-rw-r--r--kparts/genericfactory.h10
-rw-r--r--kparts/historyprovider.cpp6
-rw-r--r--kparts/historyprovider.h2
-rw-r--r--kparts/mainwindow.cpp8
-rw-r--r--kparts/mainwindow.h6
-rw-r--r--kparts/part.cpp18
-rw-r--r--kparts/part.h2
-rw-r--r--kparts/partmanager.cpp42
-rw-r--r--kparts/partmanager.h2
-rw-r--r--kparts/plugin.cpp10
-rw-r--r--kparts/statusbarextension.cpp8
-rw-r--r--kparts/statusbarextension.h2
-rw-r--r--kparts/tests/notepad.cpp4
-rw-r--r--kparts/tests/parts.cpp8
-rw-r--r--kparts/tests/parts.h4
-rw-r--r--krandr/ktimerdialog.cpp2
-rw-r--r--krandr/libkrandr.cc6
-rw-r--r--krandr/randr.h2
-rw-r--r--kresources/configdialog.cpp2
-rw-r--r--kresources/configpage.cpp16
-rw-r--r--kresources/configwidget.h2
-rw-r--r--kresources/factory.cpp10
-rw-r--r--kresources/manager.h2
-rw-r--r--kresources/managerimpl.cpp12
-rw-r--r--kresources/resource.h2
-rw-r--r--kresources/selectdialog.cpp4
-rw-r--r--kspell2/backgroundchecker.h2
-rw-r--r--kspell2/backgroundengine.h2
-rw-r--r--kspell2/backgroundthread.h2
-rw-r--r--kspell2/broker.cpp4
-rw-r--r--kspell2/client.h2
-rw-r--r--kspell2/plugins/ispell/ispell_checker.h2
-rw-r--r--kspell2/plugins/ispell/makedent.cpp2
-rw-r--r--kspell2/settings.cpp2
-rw-r--r--kspell2/tests/backgroundtest.h2
-rw-r--r--kspell2/tests/test_dialog.cpp2
-rw-r--r--kspell2/tests/test_dialog.h2
-rw-r--r--kspell2/threadevents.h4
-rw-r--r--kspell2/ui/configwidget.h2
-rw-r--r--kspell2/ui/highlighter.cpp2
-rw-r--r--kspell2/ui/highlighter.h2
-rw-r--r--kspell2/ui/kspell2ui.ui10
-rw-r--r--kstyles/highcolor/bitmaps.h18
-rw-r--r--kstyles/highcolor/highcolor.cpp159
-rw-r--r--kstyles/highcolor/highcolor.h10
-rw-r--r--kstyles/highcontrast/config/highcontrastconfig.h2
-rw-r--r--kstyles/highcontrast/highcontrast.cpp103
-rw-r--r--kstyles/highcontrast/highcontrast.h10
-rw-r--r--kstyles/keramik/bitmaps.h20
-rw-r--r--kstyles/keramik/genembed.cpp20
-rw-r--r--kstyles/keramik/gradients.cpp2
-rw-r--r--kstyles/keramik/keramik.cpp325
-rw-r--r--kstyles/keramik/keramik.h10
-rw-r--r--kstyles/keramik/pixmaploader.cpp114
-rw-r--r--kstyles/klegacy/klegacystyle.cpp146
-rw-r--r--kstyles/kthemestyle/kthemebase.cpp212
-rw-r--r--kstyles/kthemestyle/kthemebase.h36
-rw-r--r--kstyles/kthemestyle/kthemestyle.cpp328
-rw-r--r--kstyles/kthemestyle/kthemestyle.h12
-rw-r--r--kstyles/light/light.cpp5
-rw-r--r--kstyles/light/lightstyle-v2.cpp192
-rw-r--r--kstyles/light/lightstyle-v2.h10
-rw-r--r--kstyles/light/lightstyle-v3.cpp230
-rw-r--r--kstyles/light/lightstyle-v3.h10
-rw-r--r--kstyles/plastik/config/plastikconf.h2
-rw-r--r--kstyles/plastik/misc.cpp6
-rw-r--r--kstyles/plastik/plastik.cpp258
-rw-r--r--kstyles/plastik/plastik.h12
-rw-r--r--kstyles/utils/installtheme/main.cpp2
-rw-r--r--kstyles/web/webstyle.cpp32
-rw-r--r--kunittest/module.h4
-rw-r--r--kunittest/runner.cpp4
-rw-r--r--kunittest/runner.h2
-rw-r--r--kunittest/tester.cpp8
-rw-r--r--kunittest/tester.h4
-rw-r--r--kutils/kcmoduleinfo.cpp4
-rw-r--r--kutils/kcmoduleloader.cpp4
-rw-r--r--kutils/kcmoduleproxy.cpp30
-rw-r--r--kutils/kcmoduleproxy.h2
-rw-r--r--kutils/kcmultidialog.cpp8
-rw-r--r--kutils/kcmultidialog.h2
-rw-r--r--kutils/kfind.cpp22
-rw-r--r--kutils/kfind.h5
-rw-r--r--kutils/kfinddialog.cpp4
-rw-r--r--kutils/kmultitabbar.cpp114
-rw-r--r--kutils/kmultitabbar.h6
-rw-r--r--kutils/kmultitabbar_p.h2
-rw-r--r--kutils/kpluginselector.cpp24
-rw-r--r--kutils/kpluginselector.h2
-rw-r--r--kutils/kpluginselector_p.h2
-rw-r--r--kutils/kreplace.cpp10
-rw-r--r--kutils/kreplace.h2
-rw-r--r--kutils/kreplacedialog.cpp2
-rw-r--r--kutils/ksettings/componentsdialog.cpp4
-rw-r--r--kutils/ksettings/dialog.cpp8
-rw-r--r--kutils/ksettings/dialog.h2
-rw-r--r--kutils/ksettings/dispatcher.cpp6
-rw-r--r--kutils/ksettings/dispatcher.h2
-rw-r--r--kutils/tests/kfindtest.h2
-rw-r--r--kutils/tests/kreplacetest.cpp4
-rw-r--r--kutils/tests/kreplacetest.h2
-rw-r--r--kwallet/backend/kwalletbackend.cc44
-rw-r--r--kwallet/backend/kwalletbackend.h2
-rw-r--r--kwallet/client/kwallet.cc2
-rw-r--r--kwallet/client/kwallet.h5
-rw-r--r--kwallet/tests/kwalletasync.cpp6
-rw-r--r--kwallet/tests/kwalletboth.cpp6
-rw-r--r--kwallet/tests/kwallettest.h2
-rw-r--r--libkmid/deviceman.cc2
-rw-r--r--libkscreensaver/kscreensaver.cpp4
-rw-r--r--libkscreensaver/kscreensaver.h4
-rw-r--r--libkscreensaver/main.cpp2
-rw-r--r--networkstatus/connectionmanager.cpp2
-rw-r--r--networkstatus/networkstatus.cpp2
-rw-r--r--win/qeventloopex.h2
-rw-r--r--win/win32_utils2.cpp6
1403 files changed, 11183 insertions, 10958 deletions
diff --git a/KDE2PORTING.html b/KDE2PORTING.html
index 1154682c..0cd2e8a8 100644
--- a/KDE2PORTING.html
+++ b/KDE2PORTING.html
@@ -18,7 +18,7 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
<UL>
<LI><A HREF="#gettingstarted">Getting Started</A></LI>
<LI><A HREF="#general">Global changes</A></LI>
-<LI><A HREF="#automoc">automoc/am_edit, Makefile.am tags</A></LI>
+<LI><A HREF="#autotqmoc">autotqmoc/am_edit, Makefile.am tags</A></LI>
<LI><A HREF="#KApplication">KApplication</A></LI>
<LI><A HREF="#KCmdLineArgs">KCmdLineArgs</A></LI>
<LI><A HREF="#KLocale">KLocale</A></LI>
@@ -95,12 +95,12 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
<H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
-<H3><A NAME="automoc">automoc/am_edit, Makefile.am tags</A></H3>
+<H3><A NAME="autotqmoc">autotqmoc/am_edit, Makefile.am tags</A></H3>
- On the subject of the compilation framework, automoc has been removed from
+ On the subject of the compilation framework, autotqmoc has been removed from
the admin directory. It has been replaced by am_edit which provides a lot of
additional features.<P>
- METASOURCES=AUTO still does the job of generating the appropriate moc files,
+ METASOURCES=AUTO still does the job of generating the appropriate tqmoc files,
but in addition, you should use KDE_ICON for the icons representing the application
(and naming those icons conforming to lo16-app-&lt;appname&gt;.png), and install
the application-specific icons under $(kde_datadir)/&lt;appname&gt;/pics.
@@ -189,7 +189,7 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
to klocale-&gt;translate with i18n.<P>
The return value of i18n is also no longer a const char*,
- but a unicode TQString.<P>
+ but a tqunicode TQString.<P>
<H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
diff --git a/KDE3PORTING.html b/KDE3PORTING.html
index e249020f..ab89d2d0 100644
--- a/KDE3PORTING.html
+++ b/KDE3PORTING.html
@@ -647,13 +647,13 @@ For more details please consult the HOWTO file in the kcontrol directory.
<p>The API for Kicker panel applets and extensions has changed. Panels can now be
left/top, center, or right/bottom aligned, and applets and extensions may receive
-notification about a change in alignment.
+notification about a change in tqalignment.
<H4>KPanelApplet</H4>
<p>The virtual methods orientationChange() and popupDirectionChange() are deprecated.
-Instead you should reimplement positionChange() and alignmentChange() to be
-notified of changes in the position and alignment of the panel on which your applet
+Instead you should reimplement positionChange() and tqalignmentChange() to be
+notified of changes in the position and tqalignment of the panel on which your applet
resides. In addition, the popupDirection() method and the Direction enum are
deprecated. Instead you should use the position() method and Position enum. Applets that use
the deprecated methods will still work with KDE 3, but may not compile or work with
@@ -661,8 +661,8 @@ a future version.
<H4>KPanelExtension</H4>
-<p>There is a new method alignmentChange() that your extension should reimplement if
-it needs to know about changes in alignment.
+<p>There is a new method tqalignmentChange() that your extension should reimplement if
+it needs to know about changes in tqalignment.
<H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
<p>
diff --git a/arts/kde/kartsdispatcher.h b/arts/kde/kartsdispatcher.h
index dcd09484..26eb115d 100644
--- a/arts/kde/kartsdispatcher.h
+++ b/arts/kde/kartsdispatcher.h
@@ -61,7 +61,7 @@ namespace Arts
* }
* \endcode
*/
-class KDE_EXPORT KArtsDispatcher : public QObject
+class KDE_EXPORT KArtsDispatcher : public TQObject
{
Q_OBJECT
public:
diff --git a/arts/kde/kartsserver.cpp b/arts/kde/kartsserver.cpp
index ee220be1..a1b75e2f 100644
--- a/arts/kde/kartsserver.cpp
+++ b/arts/kde/kartsserver.cpp
@@ -77,12 +77,12 @@ Arts::SoundServerV2 KArtsServer::server(void)
X11CommConfig.sync();
- proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("kdeinit_wrapper")));
+ proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("kdeinit_wrapper"))).data();
if(rt)
- proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("artswrapper")));
+ proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("artswrapper"))).data();
else
- proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("artsd")));
+ proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("artsd"))).data();
proc << TQStringList::split( " ", config.readEntry( "Arguments", "-F 10 -S 4096 -s 60 -m artsmessage -l 3 -f" ) );
diff --git a/arts/kde/kartsserver.h b/arts/kde/kartsserver.h
index c01829cf..0735e208 100644
--- a/arts/kde/kartsserver.h
+++ b/arts/kde/kartsserver.h
@@ -34,7 +34,7 @@
* artsd on KDE startup, but at the very least there will always be third
* party PlayObjects that will crash. So, this is necessary.
*/
-class KDE_ARTS_EXPORT KArtsServer : public QObject
+class KDE_ARTS_EXPORT KArtsServer : public TQObject
{
Q_OBJECT
diff --git a/arts/kde/kaudioconverter.h b/arts/kde/kaudioconverter.h
index 21876e03..0022d9bb 100644
--- a/arts/kde/kaudioconverter.h
+++ b/arts/kde/kaudioconverter.h
@@ -29,7 +29,7 @@
class KURL;
class TQString;
-class KAudioConverter : public QObject
+class KAudioConverter : public TQObject
{
Q_OBJECT
public:
diff --git a/arts/kde/kaudiorecordstream.h b/arts/kde/kaudiorecordstream.h
index fdd4353f..8caab832 100644
--- a/arts/kde/kaudiorecordstream.h
+++ b/arts/kde/kaudiorecordstream.h
@@ -38,7 +38,7 @@ namespace Arts { class StereoEffectStack; }
* @author Matthias Kretz <kretz@kde.org>
* @since 3.2
*/
-class KDE_ARTS_EXPORT KAudioRecordStream : public QObject
+class KDE_ARTS_EXPORT KAudioRecordStream : public TQObject
{
Q_OBJECT
diff --git a/arts/kde/kconverttest.h b/arts/kde/kconverttest.h
index 1d0b10f8..7e7cc6c5 100644
--- a/arts/kde/kconverttest.h
+++ b/arts/kde/kconverttest.h
@@ -24,7 +24,7 @@
#include <tqobject.h>
-class KConvertTest : public QObject
+class KConvertTest : public TQObject
{
Q_OBJECT
public:
diff --git a/arts/kde/kioinputstream_impl.cpp b/arts/kde/kioinputstream_impl.cpp
index f7df6347..15994625 100644
--- a/arts/kde/kioinputstream_impl.cpp
+++ b/arts/kde/kioinputstream_impl.cpp
@@ -78,7 +78,7 @@ void KIOInputStream_impl::streamStart()
m_job = KIO::get(m_url, false, false);
m_job->addMetaData("accept", "audio/x-mp3, video/mpeg, application/ogg");
- m_job->addMetaData("UserAgent", TQString::fromLatin1("aRts/") + TQString::fromLatin1(ARTS_VERSION));
+ m_job->addMetaData("UserAgent", TQString::tqfromLatin1("aRts/") + TQString::tqfromLatin1(ARTS_VERSION));
TQObject::connect(m_job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
this, TQT_SLOT(slotData(KIO::Job *, const TQByteArray &)));
@@ -213,7 +213,7 @@ void KIOInputStream_impl::processQueue()
void KIOInputStream_impl::request_outdata(DataPacket<mcopbyte> *packet)
{
processQueue();
- packet->size = std::min(m_packetSize, m_data.size());
+ packet->size = std::min(m_packetSize, (unsigned int)m_data.size());
kdDebug( 400 ) << "STREAMING: Filling one DataPacket with " << packet->size << " bytes of the stream!" << endl;
if (!m_finished) {
diff --git a/arts/kde/kplayobject.cc b/arts/kde/kplayobject.cc
index becb20a5..7c71be31 100644
--- a/arts/kde/kplayobject.cc
+++ b/arts/kde/kplayobject.cc
@@ -65,7 +65,7 @@ void KPlayObject::halt()
TQString KPlayObject::description()
{
- return TQString::fromLatin1(object().description().c_str());
+ return TQString::tqfromLatin1(object().description().c_str());
}
Arts::poTime KPlayObject::currentTime()
@@ -85,7 +85,7 @@ Arts::poCapabilities KPlayObject::capabilities()
TQString KPlayObject::mediaName()
{
- return TQString::fromLatin1(object().mediaName().c_str());
+ return TQString::tqfromLatin1(object().mediaName().c_str());
}
Arts::poState KPlayObject::state()
@@ -243,7 +243,7 @@ TQString KDE::PlayObject::description()
{
if ( object().isNull() )
return TQString();
- return TQString::fromLatin1(object().description().c_str());
+ return TQString::tqfromLatin1(object().description().c_str());
}
Arts::poTime KDE::PlayObject::currentTime()
@@ -271,7 +271,7 @@ TQString KDE::PlayObject::mediaName()
{
if ( object().isNull() )
return TQString();
- return TQString::fromLatin1(object().mediaName().c_str());
+ return TQString::tqfromLatin1(object().mediaName().c_str());
}
Arts::poState KDE::PlayObject::state()
diff --git a/arts/kde/kplayobject.h b/arts/kde/kplayobject.h
index 907723cf..4aafe0b5 100644
--- a/arts/kde/kplayobject.h
+++ b/arts/kde/kplayobject.h
@@ -27,7 +27,7 @@
#include <kurl.h>
#include <tqobject.h>
-class KDE_EXPORT KPlayObject : public QObject
+class KDE_EXPORT KPlayObject : public TQObject
{
Q_OBJECT
public:
@@ -185,7 +185,7 @@ class PlayObjectFactory;
* internal state until the real Arts::PlayObject got created, afterwards
* the state of the Arts::PlayObject will be returned.
*/
-class KDE_EXPORT PlayObject : public QObject
+class KDE_EXPORT PlayObject : public TQObject
{
Q_OBJECT
public:
diff --git a/arts/kde/kplayobjectcreator.h b/arts/kde/kplayobjectcreator.h
index f012de2c..d52e18a1 100644
--- a/arts/kde/kplayobjectcreator.h
+++ b/arts/kde/kplayobjectcreator.h
@@ -29,7 +29,7 @@
namespace KDE {
-class PlayObjectCreator : public QObject
+class PlayObjectCreator : public TQObject
{
Q_OBJECT
public:
diff --git a/arts/kde/kplayobjectfactory.cc b/arts/kde/kplayobjectfactory.cc
index 99a2e2ed..3e83d54d 100644
--- a/arts/kde/kplayobjectfactory.cc
+++ b/arts/kde/kplayobjectfactory.cc
@@ -155,7 +155,7 @@ KDE::PlayObject *KDE::PlayObjectFactory::createPlayObject(const KURL& _url, cons
}
// decide if it's a local file. mpeglib provides cdda reading and decoding, so we prefer that over kio_audiocd
- if ( url.isLocalFile() || !d->allowStreaming || (url.protocol() == "audiocd" && mimetype == "application/x-cda" && mimeTypes().contains( "application/x-cda" ) ) )
+ if ( url.isLocalFile() || !d->allowStreaming || (url.protocol() == "audiocd" && mimetype == "application/x-cda" && mimeTypes().tqcontains( "application/x-cda" ) ) )
{
// we rely on the delivered mimetype if it's a local file
d->playObj = new KDE::PlayObject( d->server.createPlayObjectForURL( string( TQFile::encodeName( url.path() ) ), string( mimetype.latin1() ), createBUS ), false );
@@ -202,7 +202,7 @@ TQStringList KDE::PlayObjectFactory::mimeTypes(void)
for(vector<string>::iterator mimetype = mimetypes->begin();
mimetype != mimetypes->end(); ++mimetype)
{
- TQString name = TQString::fromLocal8Bit((*mimetype).c_str()).stripWhiteSpace();
+ TQString name = TQString(TQString::fromLocal8Bit((*mimetype).c_str())).stripWhiteSpace();
if(KMimeType::mimeType(name))
results.append(name);
}
diff --git a/arts/kde/kplayobjectfactory_p.h b/arts/kde/kplayobjectfactory_p.h
index f8134925..6d4b1fa2 100644
--- a/arts/kde/kplayobjectfactory_p.h
+++ b/arts/kde/kplayobjectfactory_p.h
@@ -29,7 +29,7 @@ namespace KDE
/**
* @internal
*/
-class POFHelper : public QObject
+class POFHelper : public TQObject
{
friend class PlayObjectFactory;
Q_OBJECT
diff --git a/arts/kde/kvideowidget.cpp b/arts/kde/kvideowidget.cpp
index 6aeeb8e8..3f719316 100644
--- a/arts/kde/kvideowidget.cpp
+++ b/arts/kde/kvideowidget.cpp
@@ -92,8 +92,8 @@ KVideoWidget::KVideoWidget( TQWidget *parent, const char *name, WFlags f )
void KVideoWidget::init(void)
{
setMinimumSize(0, 0);
- setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
- setFocusPolicy( ClickFocus );
+ tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
+ setFocusPolicy( TQ_ClickFocus );
fullscreenWidget = 0;
poVideo = Arts::VideoPlayObject::null();
@@ -102,16 +102,16 @@ void KVideoWidget::init(void)
// Setup actions
new KToggleAction( i18n("Fullscreen &Mode"), "window_fullscreen",
- CTRL+SHIFT+Key_F, this, TQT_SLOT(fullscreenActivated()),
+ CTRL+SHIFT+Key_F, TQT_TQOBJECT(this), TQT_SLOT(fullscreenActivated()),
actionCollection(), "fullscreen_mode" );
new KRadioAction( i18n("&Half Size"), ALT+Key_0,
- this, TQT_SLOT(halfSizeActivated()),
+ TQT_TQOBJECT(this), TQT_SLOT(halfSizeActivated()),
actionCollection(), "half_size" );
new KRadioAction( i18n("&Normal Size"), ALT+Key_1,
- this, TQT_SLOT(normalSizeActivated()),
+ TQT_TQOBJECT(this), TQT_SLOT(normalSizeActivated()),
actionCollection(), "normal_size" );
new KRadioAction( i18n("&Double Size"), ALT+Key_2,
- this, TQT_SLOT(doubleSizeActivated()),
+ TQT_TQOBJECT(this), TQT_SLOT(doubleSizeActivated()),
actionCollection(), "double_size" );
((KToggleAction *)action( "half_size" ))->setExclusiveGroup( "KVideoWidget::zoom" );
@@ -147,7 +147,7 @@ void KVideoWidget::embed( Arts::VideoPlayObject vpo )
}
setBackgroundMode( PaletteBackground );
- repaint();
+ tqrepaint();
// Resize GUI
videoWidth = 0;
@@ -286,7 +286,7 @@ void KVideoWidget::setDoubleSize()
doubleSizeActivated();
}
-TQSize KVideoWidget::sizeHint() const
+TQSize KVideoWidget::tqsizeHint() const
{
return TQSize( videoWidth, videoHeight );
}
@@ -306,7 +306,7 @@ void KVideoWidget::mousePressEvent( TQMouseEvent *event )
emit mouseButtonPressed( event->button(), pos, event->state() );
// ### Remove in KDE4
- if ( event->button() == RightButton )
+ if ( event->button() == Qt::RightButton )
emit rightButtonPressed( pos );
}
diff --git a/arts/kde/kvideowidget.h b/arts/kde/kvideowidget.h
index 0e3881a9..734fe4b0 100644
--- a/arts/kde/kvideowidget.h
+++ b/arts/kde/kvideowidget.h
@@ -36,7 +36,7 @@ public:
bool isNormalSize();
bool isDoubleSize();
- TQSize sizeHint() const;
+ TQSize tqsizeHint() const;
virtual int heightForWidth ( int w ) const;
diff --git a/arts/knotify/knotify.cpp b/arts/knotify/knotify.cpp
index ea20608b..40d85d46 100644
--- a/arts/knotify/knotify.cpp
+++ b/arts/knotify/knotify.cpp
@@ -351,13 +351,13 @@ void KNotify::notify(const TQString &event, const TQString &fromApp,
if ( !event.isEmpty() ) {
// get config file
- if ( d->events.contains( fromApp ) ) {
+ if ( d->events.tqcontains( fromApp ) ) {
eventsFile = d->events[fromApp];
} else {
eventsFile=new KConfig(locate("data", fromApp+"/eventsrc"),true,false);
d->events.insert( fromApp, eventsFile );
}
- if ( d->configs.contains( fromApp) ) {
+ if ( d->configs.tqcontains( fromApp) ) {
configFile = d->configs[fromApp];
} else {
configFile=new KConfig(fromApp+".eventsrc",true,false);
@@ -550,7 +550,7 @@ bool KNotify::notifyBySound( const TQString &sound, const TQString &appname, int
return false; // Skip
}
proc->clearArguments();
- (*proc) << d->externalPlayer << TQFile::encodeName( soundFile );
+ (*proc) << d->externalPlayer << TQFile::encodeName( soundFile ).data();
d->externalPlayerEventId = eventId;
proc->start(KProcess::NotifyOnExit);
return true;
@@ -642,7 +642,7 @@ bool KNotify::notifyByLogfile(const TQString &text, const TQString &file)
// append msg
TQTextStream strm( &logFile );
- strm << "- KNotify " << TQDateTime::currentDateTime().toString() << ": ";
+ strm << "- KNotify " << TQDateTime::tqcurrentDateTime().toString() << ": ";
strm << text << endl;
// close file
@@ -660,7 +660,7 @@ bool KNotify::notifyByStderr(const TQString &text)
TQTextStream strm( stderr, IO_WriteOnly );
// output msg
- strm << "KNotify " << TQDateTime::currentDateTime().toString() << ": ";
+ strm << "KNotify " << TQDateTime::tqcurrentDateTime().toString() << ": ";
strm << text << endl;
return true;
@@ -695,7 +695,7 @@ void KNotify::playTimeout()
++it;
if ( (*current)->state() != Arts::posPlaying )
{
- TQMap<KDE::PlayObject*,int>::Iterator eit = d->playObjectEventMap.find( *current );
+ TQMap<KDE::PlayObject*,int>::Iterator eit = d->playObjectEventMap.tqfind( *current );
if ( eit != d->playObjectEventMap.end() )
{
soundFinished( *eit, PlayedOK );
@@ -730,7 +730,7 @@ void KNotify::slotPlayerProcessExited( KProcess *proc )
void KNotify::abortFirstPlayObject()
{
#ifndef WITHOUT_ARTS
- TQMap<KDE::PlayObject*,int>::Iterator it = d->playObjectEventMap.find( d->playObjects.getFirst() );
+ TQMap<KDE::PlayObject*,int>::Iterator it = d->playObjectEventMap.tqfind( d->playObjects.getFirst() );
if ( it != d->playObjectEventMap.end() )
{
soundFinished( it.data(), Aborted );
diff --git a/dcop/KDE-ICE/ICEmsg.h b/dcop/KDE-ICE/ICEmsg.h
index cf4d9897..666d776b 100644
--- a/dcop/KDE-ICE/ICEmsg.h
+++ b/dcop/KDE-ICE/ICEmsg.h
@@ -221,7 +221,7 @@ extern void _IceErrorBadValue (
/*
- * Write pad bytes. Used to force 32 or 64 bit alignment.
+ * Write pad bytes. Used to force 32 or 64 bit tqalignment.
* A maxium of 7 pad bytes can be specified.
*/
@@ -306,7 +306,7 @@ extern void _IceErrorBadValue (
/*
- * Read pad bytes (for 32 or 64 bit alignment).
+ * Read pad bytes (for 32 or 64 bit tqalignment).
* A maxium of 7 pad bytes can be specified.
*/
diff --git a/dcop/client/dcop.cpp b/dcop/client/dcop.cpp
index 1d167ce7..a7661050 100644
--- a/dcop/client/dcop.cpp
+++ b/dcop/client/dcop.cpp
@@ -158,9 +158,9 @@ void queryFunctions( const char* app, const char* obj )
int callFunction( const char* app, const char* obj, const char* func, const QCStringList args )
{
- TQString f = func; // Qt is better with unicode strings, so use one.
- int left = f.find( '(' );
- int right = f.find( ')' );
+ TQString f = func; // Qt is better with tqunicode strings, so use one.
+ int left = f.tqfind( '(' );
+ int right = f.tqfind( ')' );
if ( right < left )
{
@@ -181,12 +181,12 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt
return( 1 );
}
for ( QCStringList::Iterator it = funcs.begin(); it != funcs.end(); ++it ) {
- int l = (*it).find( '(' );
+ int l = (*it).tqfind( '(' );
int s;
if (l > 0)
- s = (*it).findRev( ' ', l);
+ s = (*it).tqfindRev( ' ', l);
else
- s = (*it).find( ' ' );
+ s = (*it).tqfind( ' ' );
if ( s < 0 )
s = 0;
@@ -195,8 +195,8 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt
if ( l > 0 && (*it).mid( s, l - s ) == func ) {
realfunc = (*it).mid( s );
- const TQString arguments = (*it).mid(l+1,(*it).find( ')' )-l-1);
- uint a = arguments.contains(',');
+ const TQString arguments = (*it).mid(l+1,(*it).tqfind( ')' )-l-1);
+ uint a = arguments.tqcontains(',');
if ( (a==0 && !arguments.isEmpty()) || a>0)
a++;
if ( a == args.count() )
@@ -209,8 +209,8 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt
return( 1 );
}
f = realfunc;
- left = f.find( '(' );
- right = f.find( ')' );
+ left = f.tqfind( '(' );
+ right = f.tqfind( ')' );
}
doit:
@@ -230,7 +230,7 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt
for ( TQStringList::Iterator it = types.begin(); it != types.end(); ++it ) {
TQString lt = (*it).simplifyWhiteSpace();
- int s = lt.find(' ');
+ int s = lt.tqfind(' ');
// If there are spaces in the name, there may be two
// reasons: the parameter name is still there, ie.
@@ -250,7 +250,7 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt
//
s=1;
- while (s < static_cast<int>(partl.count()) && intTypes.contains(partl[s]))
+ while (s < static_cast<int>(partl.count()) && intTypes.tqcontains(partl[s]))
{
s++;
}
@@ -464,9 +464,9 @@ int runDCOP( QCStringList args, UserList users, Session session,
QCStringList params;
DCOPClient *client = 0L;
int retval = 0;
- if ( !args.isEmpty() && args[ 0 ].find( "DCOPRef(" ) == 0 )
+ if ( !args.isEmpty() && args[ 0 ].tqfind( "DCOPRef(" ) == 0 )
{
- int delimPos = args[ 0 ].findRev( ',' );
+ int delimPos = args[ 0 ].tqfindRev( ',' );
if( delimPos == -1 )
{
cerr_ << "Error: '" << args[ 0 ]
@@ -569,7 +569,7 @@ int runDCOP( QCStringList args, UserList users, Session session,
}
else if( !sessionName.isEmpty() )
{
- if( sessions.contains( sessionName ) )
+ if( sessions.tqcontains( sessionName ) )
{
sessions.clear();
sessions.append( sessionName );
@@ -861,7 +861,7 @@ int main( int argc, char** argv )
if (prog[prog.length()-1] != '*')
{
// Strip a trailing -<PID> part.
- int i = prog.findRev('-');
+ int i = prog.tqfindRev('-');
if ((i >= 0) && prog.mid(i+1).toLong())
{
prog = prog.left(i);
diff --git a/dcop/client/dcopfind.cpp b/dcop/client/dcopfind.cpp
index cd3e4d51..0cc48c43 100644
--- a/dcop/client/dcopfind.cpp
+++ b/dcop/client/dcopfind.cpp
@@ -40,9 +40,9 @@ static bool bLaunchApp = 0;
bool findObject( const char* app, const char* obj, const char* func, QCStringList args )
{
- TQString f = func; // Qt is better with unicode strings, so use one.
- int left = f.find( '(' );
- int right = f.find( ')' );
+ TQString f = func; // Qt is better with tqunicode strings, so use one.
+ int left = f.tqfind( '(' );
+ int right = f.tqfind( ')' );
if ( right < left )
{
@@ -66,7 +66,7 @@ bool findObject( const char* app, const char* obj, const char* func, QCStringLis
for ( TQStringList::Iterator it = types.begin(); it != types.end(); ++it ) {
TQString lt = (*it).simplifyWhiteSpace();
- int s = lt.find(' ');
+ int s = lt.tqfind(' ');
// If there are spaces in the name, there may be two
// reasons: the parameter name is still there, ie.
@@ -86,7 +86,7 @@ bool findObject( const char* app, const char* obj, const char* func, QCStringLis
//
s=1;
- while (s < (int)partl.count() && intTypes.contains(partl[s]))
+ while (s < (int)partl.count() && intTypes.tqcontains(partl[s]))
{
s++;
}
diff --git a/dcop/client/dcopstart.cpp b/dcop/client/dcopstart.cpp
index 5741ef77..f4653173 100644
--- a/dcop/client/dcopstart.cpp
+++ b/dcop/client/dcopstart.cpp
@@ -33,7 +33,7 @@ static DCOPClient* dcop = 0;
void startApp(const char *_app, int argc, const char **args)
{
const char *function = 0;
- TQString app = TQString::fromLatin1(_app);
+ TQString app = TQString::tqfromLatin1(_app);
if (app.endsWith(".desktop"))
function = "start_service_by_desktop_path(TQString,TQStringList)";
else
diff --git a/dcop/client/marshall.cpp b/dcop/client/marshall.cpp
index f9b7955f..496880aa 100644
--- a/dcop/client/marshall.cpp
+++ b/dcop/client/marshall.cpp
@@ -102,12 +102,12 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
{
TQCString result;
- if ( type == "int" || type == "Q_INT32" )
+ if ( type == "int" || type == "TQ_INT32" )
{
int i;
stream >> i;
result.setNum( i );
- } else if ( type == "uint" || type == "Q_UINT32" || type == "unsigned int" )
+ } else if ( type == "uint" || type == "TQ_UINT32" || type == "unsigned int" )
{
uint i;
stream >> i;
@@ -132,12 +132,12 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
double d;
stream >> d;
result.setNum( d, 'f' );
- } else if ( type == "Q_INT64" ) {
- Q_INT64 i;
+ } else if ( type == "TQ_INT64" ) {
+ TQ_INT64 i;
stream >> i;
result.sprintf( "%lld", i );
- } else if ( type == "Q_UINT64" ) {
- Q_UINT64 i;
+ } else if ( type == "TQ_UINT64" ) {
+ TQ_UINT64 i;
stream >> i;
result.sprintf( "%llu", i );
} else if ( type == "bool" )
@@ -163,7 +163,7 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
{
TQColor c;
stream >> c;
- result = c.name().local8Bit();
+ result = TQString(c.name()).local8Bit();
} else if ( type == "TQSize" )
{
TQSize s;
@@ -190,7 +190,7 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
result.sprintf( "%dx%d+%d+%d", r.width(), r.height(), r.x(), r.y() );
} else if ( type == "TQVariant" )
{
- Q_INT32 type;
+ TQ_INT32 type;
stream >> type;
return demarshal( stream, TQVariant::typeToName( (TQVariant::Type)type ) );
} else if ( type == "DCOPRef" )
@@ -205,7 +205,7 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
result = r.url().local8Bit();
} else if ( type.left( 11 ) == "TQValueList<" )
{
- if ( (uint)type.find( '>', 11 ) != type.length() - 1 )
+ if ( (uint)type.tqfind( '>', 11 ) != type.length() - 1 )
return result;
TQString nestedType = type.mid( 11, type.length() - 12 );
@@ -213,10 +213,10 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
if ( nestedType.isEmpty() )
return result;
- Q_UINT32 count;
+ TQ_UINT32 count;
stream >> count;
- Q_UINT32 i = 0;
+ TQ_UINT32 i = 0;
for (; i < count; ++i )
{
TQCString arg = demarshal( stream, nestedType );
@@ -227,21 +227,21 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
}
} else if ( type.left( 5 ) == "TQMap<" )
{
- int commaPos = type.find( ',', 5 );
+ int commaPos = type.tqfind( ',', 5 );
if ( commaPos == -1 )
return result;
- if ( (uint)type.find( '>', commaPos ) != type.length() - 1 )
+ if ( (uint)type.tqfind( '>', commaPos ) != type.length() - 1 )
return result;
TQString keyType = type.mid( 5, commaPos - 5 );
TQString valueType = type.mid( commaPos + 1, type.length() - commaPos - 2 );
- Q_UINT32 count;
+ TQ_UINT32 count;
stream >> count;
- Q_UINT32 i = 0;
+ TQ_UINT32 i = 0;
for (; i < count; ++i )
{
TQCString key = demarshal( stream, keyType );
@@ -291,15 +291,15 @@ void marshall( TQDataStream &arg, QCStringList args, uint &i, TQString type )
arg << s.toUInt();
else if ( type == "unsigned int" )
arg << s.toUInt();
- else if ( type == "Q_INT32" )
+ else if ( type == "TQ_INT32" )
arg << s.toInt();
- else if ( type == "Q_INT64" ) {
+ else if ( type == "TQ_INT64" ) {
TQVariant qv = TQVariant( s );
arg << qv.toLongLong();
}
- else if ( type == "Q_UINT32" )
+ else if ( type == "TQ_UINT32" )
arg << s.toUInt();
- else if ( type == "Q_UINT64" ) {
+ else if ( type == "TQ_UINT64" ) {
TQVariant qv = TQVariant( s );
arg << qv.toULongLong();
}
@@ -376,7 +376,7 @@ void marshall( TQDataStream &arg, QCStringList args, uint &i, TQString type )
marshall( dummy_arg, args, j, type );
count++;
}
- arg << (Q_UINT32) count;
+ arg << (TQ_UINT32) count;
// Parse the list for real
while (true) {
if( i > args.count() )
diff --git a/dcop/dcopclient.cpp b/dcop/dcopclient.cpp
index 8006ecd5..8f4b7ce1 100644
--- a/dcop/dcopclient.cpp
+++ b/dcop/dcopclient.cpp
@@ -97,13 +97,13 @@ client_map_t *cliMap()
DCOPClient *DCOPClient::findLocalClient( const TQCString &_appId )
{
- return cliMap()->find(_appId.data());
+ return cliMap()->tqfind(_appId.data());
}
static
void registerLocalClient( const TQCString &_appId, DCOPClient *client )
{
- cliMap()->replace(_appId.data(), client);
+ cliMap()->tqreplace(_appId.data(), client);
}
static
@@ -141,7 +141,7 @@ public:
TQCString* replyType;
TQByteArray* replyData;
int replyId;
- Q_INT32 transactionId;
+ TQ_INT32 transactionId;
TQCString calledApp;
TQGuardedPtr<TQObject> replyObject;
TQCString replySlot;
@@ -173,7 +173,7 @@ public:
TQCString defaultObject;
TQPtrList<DCOPClientTransaction> *transactionList;
bool transaction;
- Q_INT32 transactionId;
+ TQ_INT32 transactionId;
int opcode;
// Special key values:
@@ -205,7 +205,7 @@ public:
class DCOPClientTransaction
{
public:
- Q_INT32 id;
+ TQ_INT32 id;
CARD32 key;
TQCString senderId;
};
@@ -263,12 +263,12 @@ static TQCString dcopServerFile(const TQCString &hostname, bool old)
disp = "NODISPLAY";
int i;
- if((i = disp.findRev('.')) > disp.findRev(KPATH_SEPARATOR) && i >= 0)
+ if((i = disp.tqfindRev('.')) > disp.tqfindRev(KPATH_SEPARATOR) && i >= 0)
disp.truncate(i);
if (!old)
{
- while( (i = disp.find(KPATH_SEPARATOR)) >= 0)
+ while( (i = disp.tqfind(KPATH_SEPARATOR)) >= 0)
disp[i] = '_';
}
@@ -382,7 +382,7 @@ static void DCOPProcessMessage(IceConn iceConn, IcePointer clientObject,
case DCOPReplyWait:
if ( replyStruct ) {
TQCString calledApp, app;
- Q_INT32 id;
+ TQ_INT32 id;
TQDataStream ds( dataReceived, IO_ReadOnly );
ds >> calledApp >> app >> id;
replyStruct->transactionId = id;
@@ -398,7 +398,7 @@ static void DCOPProcessMessage(IceConn iceConn, IcePointer clientObject,
{
TQDataStream ds( dataReceived, IO_ReadOnly );
TQCString calledApp, app;
- Q_INT32 id;
+ TQ_INT32 id;
ds >> calledApp >> app >> id;
if (replyStruct && (id == replyStruct->transactionId) && (calledApp == replyStruct->calledApp))
@@ -531,7 +531,7 @@ void DCOPProcessInternal( DCOPClientPrivate *d, int opcode, CARD32 key, const TQ
TQByteArray reply;
TQDataStream replyStream( reply, IO_WriteOnly );
- Q_INT32 id = c->transactionId();
+ TQ_INT32 id = c->transactionId();
if (id) {
// Call delayed. Send back the transaction ID.
replyStream << d->appId << fromApp << id;
@@ -672,9 +672,9 @@ bool DCOPClient::attach()
void DCOPClient::bindToApp()
{
- // check if we have a qApp instantiated. If we do,
+ // check if we have a tqApp instantiated. If we do,
// we can create a TQSocketNotifier and use it for receiving data.
- if (qApp) {
+ if (tqApp) {
if ( d->notifier )
delete d->notifier;
d->notifier = new TQSocketNotifier(socket(),
@@ -690,7 +690,7 @@ void DCOPClient::suspend()
if (!d->notifier)
return;
#endif
- assert(d->notifier); // Suspending makes no sense if we didn't had a qApp yet
+ assert(d->notifier); // Suspending makes no sense if we didn't had a tqApp yet
d->notifier->setEnabled(false);
}
@@ -764,7 +764,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
DCOPAuthCount,
const_cast<char **>(DCOPAuthNames),
DCOPClientAuthProcs, 0L)) < 0) {
- emit attachFailed(TQString::fromLatin1( "Communications could not be established." ));
+ emit attachFailed(TQString::tqfromLatin1( "Communications could not be established." ));
return false;
}
@@ -779,7 +779,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
TQCString fName = dcopServerFile();
TQFile f(TQFile::decodeName(fName));
if (!f.open(IO_ReadOnly)) {
- emit attachFailed(TQString::fromLatin1( "Could not read network connection list.\n" )+TQFile::decodeName(fName));
+ emit attachFailed(TQString::tqfromLatin1( "Could not read network connection list.\n" )+TQFile::decodeName(fName));
return false;
}
int size = QMIN( (qint64)1024, f.size() ); // protection against a huge file
@@ -790,7 +790,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
// Should we abort ?
}
contents[size] = '\0';
- int pos = contents.find('\n');
+ int pos = contents.tqfind('\n');
if ( pos == -1 ) // Shouldn't happen
{
qDebug("Only one line in dcopserver file !: %s", contents.data());
@@ -819,7 +819,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
delete [] d->serverAddr;
d->serverAddr = 0;
}
- emit attachFailed(TQString::fromLatin1( errBuf ));
+ emit attachFailed(TQString::tqfromLatin1( errBuf ));
return false;
}
fcntl(socket(), F_SETFL, FD_CLOEXEC);
@@ -845,7 +845,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
delete [] d->serverAddr;
d->serverAddr = 0;
}
- emit attachFailed(TQString::fromLatin1( errBuf ));
+ emit attachFailed(TQString::tqfromLatin1( errBuf ));
return false;
} else if (setupstat == IceProtocolAlreadyActive) {
if (bClearServerAddr) {
@@ -853,7 +853,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
d->serverAddr = 0;
}
/* should not happen because 3rd arg to IceOpenConnection was 0. */
- emit attachFailed(TQString::fromLatin1( "internal error in IceOpenConnection" ));
+ emit attachFailed(TQString::tqfromLatin1( "internal error in IceOpenConnection" ));
return false;
}
@@ -863,7 +863,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
delete [] d->serverAddr;
d->serverAddr = 0;
}
- emit attachFailed(TQString::fromLatin1( "DCOP server did not accept the connection." ));
+ emit attachFailed(TQString::tqfromLatin1( "DCOP server did not accept the connection." ));
return false;
}
@@ -1017,7 +1017,7 @@ TQCString DCOPClient::normalizeFunctionSignature( const TQCString& fun ) {
if ( fun.isEmpty() ) // nothing to do
return fun.copy();
TQCString result( fun.size() );
- char *from = fun.data();
+ char *from = const_cast<TQCString&>(fun).data();
char *to = result.data();
char *first = to;
char last = 0;
@@ -1056,7 +1056,7 @@ bool DCOPClient::send(const TQCString &remApp, const TQCString &remObjId,
if ( localClient ) {
bool saveTransaction = d->transaction;
- Q_INT32 saveTransactionId = d->transactionId;
+ TQ_INT32 saveTransactionId = d->transactionId;
TQCString saveSenderId = d->senderId;
d->senderId = 0; // Local call
@@ -1167,13 +1167,13 @@ bool DCOPClient::findObject(const TQCString &remApp, const TQCString &remObj,
if ( (phase == 1) && localClient ) {
// In phase 1 we do all local clients
bool saveTransaction = d->transaction;
- Q_INT32 saveTransactionId = d->transactionId;
+ TQ_INT32 saveTransactionId = d->transactionId;
TQCString saveSenderId = d->senderId;
d->senderId = 0; // Local call
result = localClient->find( remApp, remObj, remFun, data, replyType, replyData );
- Q_INT32 id = localClient->transactionId();
+ TQ_INT32 id = localClient->transactionId();
if (id) {
// Call delayed. We have to wait till it has been processed.
do {
@@ -1298,7 +1298,7 @@ void DCOPClient::setNotifications(bool enabled)
{
TQByteArray data;
TQDataStream ds(data, IO_WriteOnly);
- ds << static_cast<Q_INT8>(enabled);
+ ds << static_cast<TQ_INT8>(enabled);
TQCString replyType;
TQByteArray reply;
@@ -1310,7 +1310,7 @@ void DCOPClient::setDaemonMode( bool daemonMode )
{
TQByteArray data;
TQDataStream ds(data, IO_WriteOnly);
- ds << static_cast<Q_INT8>( daemonMode );
+ ds << static_cast<TQ_INT8>( daemonMode );
TQCString replyType;
TQByteArray reply;
@@ -1331,9 +1331,9 @@ static void fillQtObjects( QCStringList& l, TQObject* o, TQCString path )
path += '/';
int unnamed = 0;
- const TQObjectList *list = o ? o->tqchildren() : TQObject::objectTrees();
- if ( list ) {
- TQObjectListIt it( *list );
+ const TQObjectList list = o ? o->childrenListObject() : TQObject::objectTreesListObject();
+ if ( !list.isEmpty() ) {
+ TQObjectListIt it( list );
TQObject *obj;
while ( (obj=it.current()) ) {
++it;
@@ -1341,11 +1341,11 @@ static void fillQtObjects( QCStringList& l, TQObject* o, TQCString path )
if ( n == "unnamed" || n.isEmpty() )
{
n.sprintf("%p", (void *) obj);
- n = TQString("unnamed%1(%2, %3)").arg(++unnamed).arg(obj->className()).arg(TQString(n)).latin1();
+ n = TQString(TQString("unnamed%1(%2, %3)").arg(++unnamed).arg(obj->className()).arg(TQString(n))).latin1();
}
TQCString fn = path + n;
l.append( fn );
- if ( obj->tqchildren() )
+ if ( !obj->childrenListObject().isEmpty() )
fillQtObjects( l, obj, fn );
}
}
@@ -1368,9 +1368,9 @@ static void fillQtObjectsEx( TQValueList<O>& l, TQObject* o, TQCString path )
path += '/';
int unnamed = 0;
- const TQObjectList *list = o ? o->tqchildren() : TQObject::objectTrees();
- if ( list ) {
- TQObjectListIt it( *list );
+ const TQObjectList list = o ? o->childrenListObject() : TQObject::objectTreesListObject();
+ if ( !list.isEmpty() ) {
+ TQObjectListIt it( list );
TQObject *obj;
while ( (obj=it.current()) ) {
++it;
@@ -1378,11 +1378,11 @@ static void fillQtObjectsEx( TQValueList<O>& l, TQObject* o, TQCString path )
if ( n == "unnamed" || n.isEmpty() )
{
n.sprintf("%p", (void *) obj);
- n = TQString("unnamed%1(%2, %3)").arg(++unnamed).arg(obj->className()).arg(TQString(n)).latin1();
+ n = TQString(TQString("unnamed%1(%2, %3)").arg(++unnamed).arg(obj->className()).arg(TQString(n))).latin1();
}
TQCString fn = path + n;
l.append( O( fn, obj ) );
- if ( obj->tqchildren() )
+ if ( !obj->childrenListObject().isEmpty() )
fillQtObjectsEx( l, obj, fn );
}
}
@@ -1399,7 +1399,7 @@ static TQObject* findQtObject( TQCString id )
for ( TQValueList<O>::ConstIterator it = l.begin(); it != l.end(); ++it ) {
if ( (*it).s == id ) // exact match
return (*it).o;
- if ( !firstContains && (*it).s.contains( expr ) ) {
+ if ( !firstContains && (*it).s.tqcontains( expr ) ) {
firstContains = (*it).o;
}
}
@@ -1413,7 +1413,7 @@ static QCStringList findQtObjects( TQCString id )
fillQtObjectsEx( l, 0, "qt" );
QCStringList result;
for ( TQValueList<O>::ConstIterator it = l.begin(); it != l.end(); ++it ) {
- if ( (*it).s.contains( expr ) )
+ if ( (*it).s.tqcontains( expr ) )
result << (*it).s;
}
return result;
@@ -1470,10 +1470,10 @@ static bool receiveQtObject( const TQCString &objId, const TQCString &fun, const
l << "QCStringList properties()";
l << "bool setProperty(TQCString,TQVariant)";
l << "TQVariant property(TQCString)";
- TQStrList lst = o->metaObject()->slotNames( true );
+ TQStrList lst = o->tqmetaObject()->slotNames( true );
int i = 0;
for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) {
- if ( o->metaObject()->slot( i++, true )->tqaccess != QMetaData::Public )
+ if ( o->tqmetaObject()->slot( i++, true )->tqt_mo_access != TQMetaData::Public )
continue;
TQCString slot = it.current();
if ( slot.contains( "()" ) ) {
@@ -1487,10 +1487,10 @@ static bool receiveQtObject( const TQCString &objId, const TQCString &fun, const
replyType = "QCStringList";
TQDataStream reply( replyData, IO_WriteOnly );
QCStringList l;
- TQMetaObject *meta = o->metaObject();
+ TQMetaObject *meta = o->tqmetaObject();
while ( meta ) {
l.prepend( meta->className() );
- meta = meta->superClass();
+ meta = meta->tqsuperClass();
}
reply << l;
return true;
@@ -1498,10 +1498,10 @@ static bool receiveQtObject( const TQCString &objId, const TQCString &fun, const
replyType = "QCStringList";
TQDataStream reply( replyData, IO_WriteOnly );
QCStringList l;
- TQStrList lst = o->metaObject()->propertyNames( true );
+ TQStrList lst = o->tqmetaObject()->propertyNames( true );
for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) {
- TQMetaObject *mo = o->metaObject();
- const TQMetaProperty* p = mo->property( mo->findProperty( it.current(), true ), true );
+ TQMetaObject *mo = o->tqmetaObject();
+ const TQMetaProperty* p = mo->property( mo->tqfindProperty( it.current(), true ), true );
if ( !p )
continue;
TQCString prop = p->type();
@@ -1529,13 +1529,13 @@ static bool receiveQtObject( const TQCString &objId, const TQCString &fun, const
ds >> name >> value;
replyType = "bool";
TQDataStream reply( replyData, IO_WriteOnly );
- reply << (Q_INT8) o->setProperty( name, value );
+ reply << (TQ_INT8) o->setProperty( name, value );
return true;
} else {
- int slot = o->metaObject()->findSlot( fun, true );
+ int slot = o->tqmetaObject()->tqfindSlot( fun, true );
if ( slot != -1 ) {
replyType = "void";
- QUObject uo[ 1 ];
+ TQUObject uo[ 1 ];
o->qt_invoke( slot, uo );
return true;
}
@@ -1656,7 +1656,7 @@ bool DCOPClient::receive(const TQCString &/*app*/, const TQCString &objId,
// return true. Return false otherwise.
static bool findResultOk(TQCString &replyType, TQByteArray &replyData)
{
- Q_INT8 success; // Tsk.. why is there no operator>>(bool)?
+ TQ_INT8 success; // Tsk.. why is there no operator>>(bool)?
if (replyType != "bool") return false;
TQDataStream reply( replyData, IO_ReadOnly );
@@ -1746,13 +1746,13 @@ bool DCOPClient::call(const TQCString &remApp, const TQCString &remObjId,
if ( localClient ) {
bool saveTransaction = d->transaction;
- Q_INT32 saveTransactionId = d->transactionId;
+ TQ_INT32 saveTransactionId = d->transactionId;
TQCString saveSenderId = d->senderId;
d->senderId = 0; // Local call
bool b = localClient->receive( remApp, remObjId, remFun, data, replyType, replyData );
- Q_INT32 id = localClient->transactionId();
+ TQ_INT32 id = localClient->transactionId();
if (id) {
// Call delayed. We have to wait till it has been processed.
do {
@@ -1882,7 +1882,7 @@ bool DCOPClient::callInternal(const TQCString &remApp, const TQCString &remObjId
for(;;) {
bool checkMessages = true;
if ( useEventLoop
- ? d->notifier != NULL // useEventLoop needs a socket notifier and a qApp
+ ? d->notifier != NULL // useEventLoop needs a socket notifier and a tqApp
: timeout >= 0 ) { // !useEventLoop doesn't block only for timeout >= 0
const int guiTimeout = 100;
checkMessages = false;
@@ -1907,7 +1907,7 @@ bool DCOPClient::callInternal(const TQCString &remApp, const TQCString &remObjId
}
if( timeout >= 0 )
d->eventLoopTimer.start(time_left - guiTimeout, true);
- qApp->enter_loop();
+ tqApp->enter_loop();
d->eventLoopTimer.stop();
if ( !old_lock ) {
d->non_blocking_call_lock = false;
@@ -1974,7 +1974,7 @@ bool DCOPClient::callInternal(const TQCString &remApp, const TQCString &remObjId
// Wake up parent call, maybe it's reply is available already.
if ( d->non_blocking_call_lock ) {
- qApp->exit_loop();
+ tqApp->exit_loop();
}
d->currentKey = oldCurrentKey;
@@ -1983,7 +1983,7 @@ bool DCOPClient::callInternal(const TQCString &remApp, const TQCString &remObjId
void DCOPClient::eventLoopTimeout()
{
- qApp->exit_loop();
+ tqApp->exit_loop();
}
void DCOPClient::processSocketData(int fd)
@@ -2000,8 +2000,8 @@ void DCOPClient::processSocketData(int fd)
return;
if ( d->non_blocking_call_lock ) {
- if( qApp )
- qApp->exit_loop();
+ if( tqApp )
+ tqApp->exit_loop();
return;
}
@@ -2034,7 +2034,7 @@ TQCString DCOPClient::defaultObject() const
}
bool
-DCOPClient::isLocalTransactionFinished(Q_INT32 id, TQCString &replyType, TQByteArray &replyData)
+DCOPClient::isLocalTransactionFinished(TQ_INT32 id, TQCString &replyType, TQByteArray &replyData)
{
DCOPClientPrivate::LocalTransactionResult *result = d->localTransActionList.take(id);
if (!result)
@@ -2068,7 +2068,7 @@ DCOPClient::beginTransaction()
return trans;
}
-Q_INT32
+TQ_INT32
DCOPClient::transactionId() const
{
if (d->transaction)
@@ -2147,7 +2147,7 @@ DCOPClient::connectDCOPSignal( const TQCString &sender, const TQCString &senderO
{
TQCString replyType;
TQByteArray data, replyData;
- Q_INT8 iVolatile = Volatile ? 1 : 0;
+ TQ_INT8 iVolatile = Volatile ? 1 : 0;
TQDataStream args(data, IO_WriteOnly );
args << sender << senderObj << normalizeFunctionSignature(signal) << receiverObj << normalizeFunctionSignature(slot) << iVolatile;
@@ -2163,7 +2163,7 @@ DCOPClient::connectDCOPSignal( const TQCString &sender, const TQCString &senderO
return false;
TQDataStream reply(replyData, IO_ReadOnly );
- Q_INT8 result;
+ TQ_INT8 result;
reply >> result;
return (result != 0);
}
@@ -2197,7 +2197,7 @@ DCOPClient::disconnectDCOPSignal( const TQCString &sender, const TQCString &send
return false;
TQDataStream reply(replyData, IO_ReadOnly );
- Q_INT8 result;
+ TQ_INT8 result;
reply >> result;
return (result != 0);
}
diff --git a/dcop/dcopclient.h b/dcop/dcopclient.h
index 41266c18..0575cd1e 100644
--- a/dcop/dcopclient.h
+++ b/dcop/dcopclient.h
@@ -65,9 +65,10 @@ typedef TQValueList<TQCString> QCStringList;
* @see KApplication::dcopClient()
* @author Preston Brown <pbrown@kde.org>, Matthias Ettrich <ettrich@kde.org>
*/
-class DCOP_EXPORT DCOPClient : public QObject
+class DCOP_EXPORT DCOPClient : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
@@ -511,7 +512,7 @@ class DCOP_EXPORT DCOPClient : public QObject
* @see process()
* @see beginTransaction()
*/
- Q_INT32 transactionId() const;
+ TQ_INT32 transactionId() const;
/**
* Checks whether @p remApp is registered with the DCOP server.
@@ -816,7 +817,7 @@ public:
private:
- bool isLocalTransactionFinished(Q_INT32 id, TQCString &replyType, TQByteArray &replyData);
+ bool isLocalTransactionFinished(TQ_INT32 id, TQCString &replyType, TQByteArray &replyData);
bool attachInternal( bool registerAsAnonymous = true );
diff --git a/dcop/dcopidl/main.cpp b/dcop/dcopidl/main.cpp
index aa60e2c4..0cbb32a1 100644
--- a/dcop/dcopidl/main.cpp
+++ b/dcop/dcopidl/main.cpp
@@ -47,7 +47,7 @@ int main( int argc, char** argv )
return -1;
}
- TQByteArray arr = file.readAll();
+ TQByteArray arr = TQByteArray(file.readAll());
uint len = arr.size();
uint j = 1;
for (uint i = 1; i<len; i++, j++) {
diff --git a/dcop/dcopidl/scanner.cc b/dcop/dcopidl/scanner.cc
index e91b21d6..f118a67e 100644
--- a/dcop/dcopidl/scanner.cc
+++ b/dcop/dcopidl/scanner.cc
@@ -1226,8 +1226,8 @@ YY_RULE_SETUP
#line 170 "scanner.ll"
{
TQString s( yytext );
- int i = s.find(TQRegExp("[\"<]"))+1;
- int j = s.find(TQRegExp("[\">]"), i);
+ int i = s.tqfind(TQRegExp("[\"<]"))+1;
+ int j = s.tqfind(TQRegExp("[\">]"), i);
yylval._str = new TQString( s.mid( i, j - i ) );
idl_line_no++;
return T_INCLUDE;
diff --git a/dcop/dcopidl/scanner.ll b/dcop/dcopidl/scanner.ll
index 63e8ca59..d9f87051 100644
--- a/dcop/dcopidl/scanner.ll
+++ b/dcop/dcopidl/scanner.ll
@@ -236,6 +236,7 @@ FALSE return T_FALSE;
typedef return T_TYPEDEF;
K_DCOP return T_DCOP;
Q_OBJECT ;
+TQ_OBJECT ;
("0"|"0L") return T_NULL;
"extern "[A-Za-z0-9_ \t*]+ return T_EXTERN;
"extern \"C\"" return T_EXTERN_C;
diff --git a/dcop/dcopidl/yacc.cc b/dcop/dcopidl/yacc.cc
index d41fa6db..1fbc4c0b 100644
--- a/dcop/dcopidl/yacc.cc
+++ b/dcop/dcopidl/yacc.cc
@@ -1643,7 +1643,7 @@ yyreduce:
case 15:
#line 221 "yacc.yy"
{
- int pos = in_namespace.findRev( "::", -3 );
+ int pos = in_namespace.tqfindRev( "::", -3 );
if( pos >= 0 )
in_namespace = in_namespace.left( pos + 2 );
else
diff --git a/dcop/dcopidl/yacc.yy b/dcop/dcopidl/yacc.yy
index ca22c65e..7870eb6e 100644
--- a/dcop/dcopidl/yacc.yy
+++ b/dcop/dcopidl/yacc.yy
@@ -219,7 +219,7 @@ declaration
}
main T_RIGHT_CURLY_BRACKET opt_semicolon
{
- int pos = in_namespace.findRev( "::", -3 );
+ int pos = in_namespace.tqfindRev( "::", -3 );
if( pos >= 0 )
in_namespace = in_namespace.left( pos + 2 );
else
diff --git a/dcop/dcopidl2cpp/main.cpp b/dcop/dcopidl2cpp/main.cpp
index 5e0f2752..c0fb786c 100644
--- a/dcop/dcopidl2cpp/main.cpp
+++ b/dcop/dcopidl2cpp/main.cpp
@@ -104,11 +104,11 @@ int main( int argc, char** argv )
TQString base( argv[argpos] );
TQString idl = base;
- int pos = base.findRev( '.' );
+ int pos = base.tqfindRev( '.' );
if ( pos != -1 )
base = base.left( pos );
- pos = idl.findRev('/');
+ pos = idl.tqfindRev('/');
if ( pos != -1 )
idl = idl.mid( pos+1 );
@@ -118,7 +118,7 @@ int main( int argc, char** argv )
if ( generate_stub ) {
TQString header = base;
generateStub( idl, header + "_stub.h", de );
- pos = header.findRev('/');
+ pos = header.tqfindRev('/');
if ( pos != -1 )
header = header.mid( pos+1 );
generateStubImpl( idl, header + "_stub.h", base+".h", base + "_stub." + suffix, de);
diff --git a/dcop/dcopidl2cpp/skel.cpp b/dcop/dcopidl2cpp/skel.cpp
index 5cc30de3..7c26e564 100644
--- a/dcop/dcopidl2cpp/skel.cpp
+++ b/dcop/dcopidl2cpp/skel.cpp
@@ -177,7 +177,7 @@ void generateSkel( const TQString& idl, const TQString& filename, TQDomElement d
TQString namespace_tmp = className;
str << endl;
for(;;) {
- int pos = namespace_tmp.find( "::" );
+ int pos = namespace_tmp.tqfind( "::" );
if( pos < 0 ) {
className = namespace_tmp;
break;
@@ -223,7 +223,7 @@ void generateSkel( const TQString& idl, const TQString& filename, TQDomElement d
str << "\t fdict->insert( " << className << "_ftable[i][1], new int( i ) );" << endl;
str << " }" << endl;
- str << " int* fp = fdict->find( fun );" << endl;
+ str << " int* fp = fdict->tqfind( fun );" << endl;
str << " switch ( fp?*fp:-1) {" << endl;
}
s = n.nextSibling().toElement();
diff --git a/dcop/dcopidl2cpp/stub.cpp b/dcop/dcopidl2cpp/stub.cpp
index 88794526..5191abde 100644
--- a/dcop/dcopidl2cpp/stub.cpp
+++ b/dcop/dcopidl2cpp/stub.cpp
@@ -54,7 +54,7 @@ void generateStub( const TQString& idl, const TQString& filename, TQDomElement d
str << endl;
TQString ifdefstring = idl.upper();
- int pos = idl.findRev( '.' );
+ int pos = idl.tqfindRev( '.' );
if ( pos != -1 )
ifdefstring = ifdefstring.left( pos );
@@ -107,13 +107,13 @@ void generateStub( const TQString& idl, const TQString& filename, TQDomElement d
}
if( DCOPParent != "DCOPObject" ) { // we need to include the .h file for the base stub
- if( all_includes.contains( DCOPParent + ".h" ))
+ if( all_includes.tqcontains( DCOPParent + ".h" ))
str << "#include <" << DCOPParent << "_stub.h>" << endl;
- else if( all_includes.contains( DCOPParent.lower() + ".h" ))
+ else if( all_includes.tqcontains( DCOPParent.lower() + ".h" ))
str << "#include <" << DCOPParent.lower() << "_stub.h>" << endl;
else {// damn ... let's assume it's the last include
TQString stub_h = all_includes.last();
- unsigned int pos = stub_h.find( ".h" );
+ unsigned int pos = stub_h.tqfind( ".h" );
if( pos > 0 ) {
stub_h = stub_h.remove( pos, 100000 );
str << "#include <" << stub_h << "_stub.h>" << endl;
@@ -128,7 +128,7 @@ void generateStub( const TQString& idl, const TQString& filename, TQDomElement d
int namespace_count = 0;
TQString namespace_tmp = className;
for(;;) {
- int pos = namespace_tmp.find( "::" );
+ int pos = namespace_tmp.tqfind( "::" );
if( pos < 0 ) {
className = namespace_tmp;
break;
diff --git a/dcop/dcopidl2cpp/stubimpl.cpp b/dcop/dcopidl2cpp/stubimpl.cpp
index 5cdd2a00..7e9990e6 100644
--- a/dcop/dcopidl2cpp/stubimpl.cpp
+++ b/dcop/dcopidl2cpp/stubimpl.cpp
@@ -98,7 +98,7 @@ void generateStubImpl( const TQString& idl, const TQString& header, const TQStri
TQString namespace_tmp = className_stub;
str << endl;
for(;;) {
- int pos = namespace_tmp.find( "::" );
+ int pos = namespace_tmp.tqfind( "::" );
if( pos < 0 ) {
className_stub = namespace_tmp;
break;
diff --git a/dcop/dcopobject.cpp b/dcop/dcopobject.cpp
index fd39fb34..348f13d4 100644
--- a/dcop/dcopobject.cpp
+++ b/dcop/dcopobject.cpp
@@ -58,7 +58,7 @@ DCOPObject::DCOPObject(TQObject *obj)
while (currentObj != 0L) {
ident.prepend( currentObj->name() );
ident.prepend("/");
- currentObj = currentObj->parent();
+ currentObj = TQT_TQOBJECT(currentObj->parent());
}
if ( ident[0] == '/' )
ident = ident.mid(1);
@@ -116,7 +116,7 @@ TQCString DCOPObject::objId() const
bool DCOPObject::hasObject(const TQCString &_objId)
{
- if (objMap()->contains(_objId))
+ if (objMap()->tqcontains(_objId))
return true;
else
return false;
@@ -155,7 +155,7 @@ TQCString DCOPObject::objectName( TQObject* obj )
{
identity.prepend( currentObj->name() );
identity.prepend("/");
- currentObj = currentObj->parent();
+ currentObj = TQT_TQOBJECT(currentObj->parent());
}
if ( identity[0] == '/' )
identity = identity.mid(1);
diff --git a/dcop/dcopref.cpp b/dcop/dcopref.cpp
index bb39c109..c446eb0e 100644
--- a/dcop/dcopref.cpp
+++ b/dcop/dcopref.cpp
@@ -62,9 +62,9 @@ DCOPReply DCOPRef::callInternal( const TQCString& fun, const TQCString& args, co
return reply;
}
TQCString sig = fun;
- if ( fun.find('(') == -1 ) {
+ if ( fun.tqfind('(') == -1 ) {
sig += args;
- if( args.find( "<unknown" ) != -1 )
+ if( args.tqfind( "<unknown" ) != -1 )
qWarning("DCOPRef: unknown type error "
"<\"%s\",\"%s\">::call(\"%s\",%s",
STR(m_app), STR(m_obj), STR(fun), args.data()+1 );
@@ -87,9 +87,9 @@ bool DCOPRef::sendInternal( const TQCString& fun, const TQCString& args, const T
}
Q_UNUSED( data );
TQCString sig = fun;
- if ( fun.find('(') == -1 ) {
+ if ( fun.tqfind('(') == -1 ) {
sig += args;
- if( args.find( "<unknown" ) != -1 )
+ if( args.tqfind( "<unknown" ) != -1 )
qWarning("DCOPRef: unknown type error "
"<\"%s\",\"%s\">::send(\"%s\",%s",
STR(m_app), STR(m_obj), STR(fun), args.data()+1 );
diff --git a/dcop/dcopref.h b/dcop/dcopref.h
index 92cb921b..c7fa6982 100644
--- a/dcop/dcopref.h
+++ b/dcop/dcopref.h
@@ -396,7 +396,7 @@ public:
* Flag for allowing entering the event loop if the call blocks too long.
* @p NoEventLoop disables entering the event loop.
* @p UseEventLoop allows entering the event loop while waiting for long
- * blocking DCOP call, thus making the GUI repaint if needed, and possibly
+ * blocking DCOP call, thus making the GUI tqrepaint if needed, and possibly
* allowing also other code in the application to be executed.
* @see DCOPClient::call()
*/
diff --git a/dcop/dcopserver.cpp b/dcop/dcopserver.cpp
index 41a639b2..b8994f69 100644
--- a/dcop/dcopserver.cpp
+++ b/dcop/dcopserver.cpp
@@ -124,9 +124,9 @@ void DCOPIceWriteChar(register IceConn iceConn, unsigned long nbytes, char *ptr)
static TQCString readQCString(TQDataStream &ds)
{
TQCString result;
- Q_UINT32 len;
+ TQ_UINT32 len;
ds >> len;
- TQIODevice *device = ds.device();
+ TQIODevice *device = ds.tqdevice();
int bytesLeft = device->size()-device->at();
if ((bytesLeft < 0 ) || (len > (uint) bytesLeft))
{
@@ -142,9 +142,9 @@ static TQCString readQCString(TQDataStream &ds)
static TQByteArray readQByteArray(TQDataStream &ds)
{
TQByteArray result;
- Q_UINT32 len;
+ TQ_UINT32 len;
ds >> len;
- TQIODevice *device = ds.device();
+ TQIODevice *device = ds.tqdevice();
int bytesLeft = device->size()-device->at();
if ((bytesLeft < 0 ) || (len > (uint) bytesLeft))
{
@@ -287,7 +287,7 @@ qWarning("DCOPServer: DCOPIceWrite() outputBlocked. Queuing %d bytes.", _data.si
// assert(conn->outputBuffer.isEmpty());
}
- unsigned long nleft = writeIceData(iceConn, _data.size(), _data.data());
+ unsigned long nleft = writeIceData(iceConn, _data.size(), const_cast<TQByteArray&>(_data).data());
if ((nleft > 0) && conn)
{
conn->waitForOutputReady(_data, _data.size() - nleft);
@@ -319,7 +319,7 @@ void DCOPServer::slotOutputReady(int socket)
qWarning("DCOPServer: slotOutputReady fd = %d", socket);
#endif
// Find out connection.
- DCOPConnection *conn = fd_clients.find(socket);
+ DCOPConnection *conn = fd_clients.tqfind(socket);
//assert(conn);
//assert(conn->outputBlocked);
//assert(conn->socket() == socket);
@@ -396,7 +396,7 @@ qWarning("DCOPServer: Flushing data, fd = %d", IceConnectionNumber(_iceConn));
DCOPIceWrite(_iceConn, _data);
}
-class DCOPListener : public QSocketNotifier
+class DCOPListener : public TQSocketNotifier
{
public:
DCOPListener( IceListenObj obj )
@@ -710,7 +710,7 @@ void DCOPProcessMessage( IceConn iceConn, IcePointer /*clientData*/,
void DCOPServer::processMessage( IceConn iceConn, int opcode,
unsigned long length, Bool /*swap*/)
{
- DCOPConnection* conn = clients.find( iceConn );
+ DCOPConnection* conn = clients.tqfind( iceConn );
if ( !conn ) {
qWarning("DCOPServer::processMessage message from unknown connection. [opcode = %d]", opcode);
return;
@@ -1109,7 +1109,7 @@ DCOPConnection* DCOPServer::findApp( const TQCString& appId )
{
if ( appId.isNull() )
return 0;
- DCOPConnection* conn = appIds.find( appId );
+ DCOPConnection* conn = appIds.tqfind( appId );
return conn;
}
@@ -1204,7 +1204,7 @@ void DCOPServer::removeConnection( void* data )
while (!conn->waitingForReply.isEmpty()) {
IceConn iceConn = conn->waitingForReply.take(0);
if (iceConn) {
- DCOPConnection* target = clients.find( iceConn );
+ DCOPConnection* target = clients.tqfind( iceConn );
qWarning("DCOP aborting call from '%s' to '%s'", target ? target->appId.data() : "<unknown>" , conn->appId.data() );
TQByteArray reply;
DCOPMsg *pMsg;
@@ -1226,7 +1226,7 @@ void DCOPServer::removeConnection( void* data )
while (!conn->waitingForDelayedReply.isEmpty()) {
IceConn iceConn = conn->waitingForDelayedReply.take(0);
if (iceConn) {
- DCOPConnection* target = clients.find( iceConn );
+ DCOPConnection* target = clients.tqfind( iceConn );
qWarning("DCOP aborting (delayed) call from '%s' to '%s'", target ? target->appId.data() : "<unknown>", conn->appId.data() );
TQByteArray reply;
DCOPMsg *pMsg;
@@ -1247,7 +1247,7 @@ void DCOPServer::removeConnection( void* data )
{
IceConn iceConn = conn->waitingOnReply.take(0);
if (iceConn) {
- DCOPConnection* target = clients.find( iceConn );
+ DCOPConnection* target = clients.tqfind( iceConn );
if (!target)
{
qWarning("DCOP Error: still waiting for answer from non-existing client.");
@@ -1359,7 +1359,7 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj,
if ( obj == "emit")
{
- DCOPConnection* conn = clients.find( iceConn );
+ DCOPConnection* conn = clients.tqfind( iceConn );
if (conn) {
//qDebug("DCOPServer: %s emits %s", conn->appId.data(), fun.data());
dcopSignals->emitSignal(conn, fun, data, false);
@@ -1370,13 +1370,13 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj,
if ( fun == "setDaemonMode(bool)" ) {
TQDataStream args( data, IO_ReadOnly );
if ( !args.atEnd() ) {
- Q_INT8 iDaemon;
+ TQ_INT8 iDaemon;
bool daemon;
args >> iDaemon;
daemon = static_cast<bool>( iDaemon );
- DCOPConnection* conn = clients.find( iceConn );
+ DCOPConnection* conn = clients.tqfind( iceConn );
if ( conn && !conn->appId.isNull() ) {
if ( daemon ) {
if ( !conn->daemon )
@@ -1414,10 +1414,10 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj,
if (!args.atEnd()) {
TQCString app2 = readQCString(args);
TQDataStream reply( replyData, IO_WriteOnly );
- DCOPConnection* conn = clients.find( iceConn );
+ DCOPConnection* conn = clients.tqfind( iceConn );
if ( conn && !app2.isEmpty() ) {
if ( !conn->appId.isNull() &&
- appIds.find( conn->appId ) == conn ) {
+ appIds.tqfind( conn->appId ) == conn ) {
appIds.remove( conn->appId );
}
@@ -1440,7 +1440,7 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj,
#endif
conn->appId = app2;
- if ( appIds.find( app2 ) != 0 ) {
+ if ( appIds.tqfind( app2 ) != 0 ) {
// we already have this application, unify
int n = 1;
TQCString tmp;
@@ -1449,12 +1449,12 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj,
tmp.setNum( n );
tmp.prepend("-");
tmp.prepend( app2 );
- } while ( appIds.find( tmp ) != 0 );
+ } while ( appIds.tqfind( tmp ) != 0 );
conn->appId = tmp;
}
appIds.insert( conn->appId, conn );
- int c = conn->appId.find( '-' );
+ int c = conn->appId.tqfind( '-' );
if ( c > 0 )
conn->plainAppId = conn->appId.left( c );
else
@@ -1494,9 +1494,9 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj,
} else if ( fun == "setNotifications(bool)" ) {
TQDataStream args( data, IO_ReadOnly );
if (!args.atEnd()) {
- Q_INT8 notifyActive;
+ TQ_INT8 notifyActive;
args >> notifyActive;
- DCOPConnection* conn = clients.find( iceConn );
+ DCOPConnection* conn = clients.tqfind( iceConn );
if ( conn ) {
if ( notifyActive )
conn->notifyRegister++;
@@ -1507,7 +1507,7 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj,
return true;
}
} else if ( fun == "connectSignal(TQCString,TQCString,TQCString,TQCString,TQCString,bool)") {
- DCOPConnection* conn = clients.find( iceConn );
+ DCOPConnection* conn = clients.tqfind( iceConn );
if (!conn) return false;
TQDataStream args(data, IO_ReadOnly );
if (args.atEnd()) return false;
@@ -1516,16 +1516,16 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj,
TQCString signal = readQCString(args);
TQCString receiverObj = readQCString(args);
TQCString slot = readQCString(args);
- Q_INT8 Volatile;
+ TQ_INT8 Volatile;
args >> Volatile;
//qDebug("DCOPServer: connectSignal(sender = %s senderObj = %s signal = %s recvObj = %s slot = %s)", sender.data(), senderObj.data(), signal.data(), receiverObj.data(), slot.data());
bool b = dcopSignals->connectSignal(sender, senderObj, signal, conn, receiverObj, slot, (Volatile != 0));
replyType = "bool";
TQDataStream reply( replyData, IO_WriteOnly );
- reply << (Q_INT8) (b?1:0);
+ reply << (TQ_INT8) (b?1:0);
return true;
} else if ( fun == "disconnectSignal(TQCString,TQCString,TQCString,TQCString,TQCString)") {
- DCOPConnection* conn = clients.find( iceConn );
+ DCOPConnection* conn = clients.tqfind( iceConn );
if (!conn) return false;
TQDataStream args(data, IO_ReadOnly );
if (args.atEnd()) return false;
@@ -1538,7 +1538,7 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj,
bool b = dcopSignals->disconnectSignal(sender, senderObj, signal, conn, receiverObj, slot);
replyType = "bool";
TQDataStream reply( replyData, IO_WriteOnly );
- reply << (Q_INT8) (b?1:0);
+ reply << (TQ_INT8) (b?1:0);
return true;
}
@@ -1618,7 +1618,7 @@ static bool isRunning(const TQCString &fName, bool printNetworkId = false)
TQCString contents( size+1 );
bool ok = f.readBlock( contents.data(), size ) == size;
contents[size] = '\0';
- int pos = contents.find('\n');
+ int pos = contents.tqfind('\n');
ok = ok && ( pos != -1 );
pid_t pid = ok ? contents.mid(pos+1).toUInt(&ok) : 0;
f.close();
diff --git a/dcop/dcopserver.h b/dcop/dcopserver.h
index 7b649ccf..7abc6497 100644
--- a/dcop/dcopserver.h
+++ b/dcop/dcopserver.h
@@ -66,7 +66,7 @@ typedef TQValueList<TQCString> QCStringList;
/**
* @internal
*/
-class DCOPConnection : public QSocketNotifier
+class DCOPConnection : public TQSocketNotifier
{
public:
DCOPConnection( IceConn conn );
@@ -112,7 +112,7 @@ public:
/**
* @internal
*/
-class DCOPServer : public QObject
+class DCOPServer : public TQObject
{
Q_OBJECT
public:
@@ -130,7 +130,7 @@ public:
DCOPConnection *findApp(const TQCString &appId);
DCOPConnection *findConn(IceConn iceConn)
- { return clients.find(iceConn); }
+ { return clients.tqfind(iceConn); }
void sendMessage(DCOPConnection *conn, const TQCString &sApp,
const TQCString &rApp, const TQCString &rObj,
diff --git a/dcop/dcopsignals.cpp b/dcop/dcopsignals.cpp
index 437051a5..1e0eee35 100644
--- a/dcop/dcopsignals.cpp
+++ b/dcop/dcopsignals.cpp
@@ -39,14 +39,14 @@ DCOPSignals::emitSignal( DCOPConnection *conn, const TQCString &_fun, const TQBy
{
TQCString senderObj;
TQCString fun = _fun;
- int i = fun.find('#');
+ int i = fun.tqfind('#');
if (i > -1)
{
senderObj = fun.left(i);
fun = fun.mid(i+1);
}
- DCOPSignalConnectionList *list = connections.find(fun);
+ DCOPSignalConnectionList *list = connections.tqfind(fun);
if (!list) return;
for(DCOPSignalConnection *current = list->first(); current; current = list->next())
{
@@ -102,16 +102,16 @@ DCOPSignals::connectSignal( const TQCString &sender, const TQCString &senderObj,
// TODO: Check if signal and slot match
TQCString signalArgs, slotArgs;
int i,j;
- i = signal.find('(');
+ i = signal.tqfind('(');
if (i < 0) return false;
signalArgs = signal.mid(i+1);
- j = signalArgs.find(')');
+ j = signalArgs.tqfind(')');
if (j < 0) return false;
signalArgs.truncate(j);
- i = slot.find('(');
+ i = slot.tqfind('(');
if (i < 0) return false;
slotArgs = slot.mid(i+1);
- j = slotArgs.find(')');
+ j = slotArgs.tqfind(')');
if (j < 0) return false;
slotArgs.truncate(j);
@@ -142,7 +142,7 @@ DCOPSignals::connectSignal( const TQCString &sender, const TQCString &senderObj,
current->recvObj = receiverObj;
current->slot = slot;
- DCOPSignalConnectionList *list = connections.find(signal);
+ DCOPSignalConnectionList *list = connections.tqfind(signal);
if (!list)
{
list = new DCOPSignalConnectionList;
@@ -177,7 +177,7 @@ DCOPSignals::disconnectSignal( const TQCString &sender, const TQCString &senderO
return true;
}
- DCOPSignalConnectionList *list = connections.find(signal);
+ DCOPSignalConnectionList *list = connections.tqfind(signal);
if (!list)
return false; // Not found...
@@ -255,7 +255,7 @@ DCOPSignals::removeConnections(DCOPConnection *conn, const TQCString &obj)
if (current->recvConn != conn)
current->recvConn->signalConnectionList()->removeRef(current);
- DCOPSignalConnectionList *signalList = connections.find(current->signal);
+ DCOPSignalConnectionList *signalList = connections.tqfind(current->signal);
if (signalList)
{
signalList->removeRef(current);
diff --git a/dcop/kdatastream.h b/dcop/kdatastream.h
index de85ebb4..6551295f 100644
--- a/dcop/kdatastream.h
+++ b/dcop/kdatastream.h
@@ -6,13 +6,13 @@
#ifdef USE_QT3
inline TQDataStream & operator << (TQDataStream & str, bool b)
{
- str << Q_INT8(b);
+ str << TQ_INT8(b);
return str;
}
inline TQDataStream & operator >> (TQDataStream & str, bool & b)
{
- Q_INT8 l;
+ TQ_INT8 l;
str >> l;
b = bool(l);
return str;
@@ -22,7 +22,7 @@ inline TQDataStream & operator >> (TQDataStream & str, bool & b)
#if QT_VERSION < 0x030200 && !defined(Q_WS_WIN) && !defined(Q_WS_MAC)
inline TQDataStream & operator << (TQDataStream & str, long long int ll)
{
- Q_UINT32 l1,l2;
+ TQ_UINT32 l1,l2;
l1 = ll & 0xffffffffLL;
l2 = ll >> 32;
str << l1 << l2;
@@ -31,7 +31,7 @@ inline TQDataStream & operator << (TQDataStream & str, long long int ll)
inline TQDataStream & operator >> (TQDataStream & str, long long int&ll)
{
- Q_UINT32 l1,l2;
+ TQ_UINT32 l1,l2;
str >> l1 >> l2;
ll = ((unsigned long long int)(l2) << 32) + (long long int) l1;
return str;
@@ -39,7 +39,7 @@ inline TQDataStream & operator >> (TQDataStream & str, long long int&ll)
inline TQDataStream & operator << (TQDataStream & str, unsigned long long int ll)
{
- Q_UINT32 l1,l2;
+ TQ_UINT32 l1,l2;
l1 = ll & 0xffffffffLL;
l2 = ll >> 32;
str << l1 << l2;
@@ -48,7 +48,7 @@ inline TQDataStream & operator << (TQDataStream & str, unsigned long long int ll
inline TQDataStream & operator >> (TQDataStream & str, unsigned long long int &ll)
{
- Q_UINT32 l1,l2;
+ TQ_UINT32 l1,l2;
str >> l1 >> l2;
ll = ((unsigned long long int)(l2) << 32) + (unsigned long long int) l1;
return str;
diff --git a/dcop/testdcop.h b/dcop/testdcop.h
index 135812e3..936632b5 100644
--- a/dcop/testdcop.h
+++ b/dcop/testdcop.h
@@ -35,13 +35,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <stdio.h>
/**
- $QTDIR/bin/moc testdcop.cpp -o testdcop.moc
+ $QTDIR/bin/tqmoc testdcop.cpp -o testdcop.moc
g++ -o testdcop testdcop.cpp -I$QTDIR/include -L$QTDIR/lib
@internal
**/
-class TestObject : public QObject
+class TestObject : public TQObject
{
Q_OBJECT
public:
diff --git a/dnssd/domainbrowser.cpp b/dnssd/domainbrowser.cpp
index 8a24f11b..6cab652a 100644
--- a/dnssd/domainbrowser.cpp
+++ b/dnssd/domainbrowser.cpp
@@ -125,7 +125,7 @@ void DomainBrowser::startBrowse()
void DomainBrowser::gotNewDomain(const TQString& domain)
{
- if (d->m_domains.contains(domain)) return;
+ if (d->m_domains.tqcontains(domain)) return;
d->m_domains.append(domain);
emit domainAdded(domain);
}
diff --git a/dnssd/domainbrowser.h b/dnssd/domainbrowser.h
index a7784924..199163cb 100644
--- a/dnssd/domainbrowser.h
+++ b/dnssd/domainbrowser.h
@@ -38,7 +38,7 @@ class DomainBrowserPrivate;
@short Class used to provide current list of domains for browsing.
@author Jakub Stachowski
*/
-class KDNSSD_EXPORT DomainBrowser : public QObject
+class KDNSSD_EXPORT DomainBrowser : public TQObject
{
Q_OBJECT
public:
diff --git a/dnssd/query.h b/dnssd/query.h
index 90e9fe19..42dae32e 100644
--- a/dnssd/query.h
+++ b/dnssd/query.h
@@ -36,7 +36,7 @@ name, either multicast or unicast DNS will be used.
@short Class that represents service query in one domain.
@author Jakub Stachowski
*/
-class KDNSSD_EXPORT Query : public QObject
+class KDNSSD_EXPORT Query : public TQObject
{
Q_OBJECT
public:
diff --git a/dnssd/remoteservice.cpp b/dnssd/remoteservice.cpp
index 62ec01eb..2f5bc592 100644
--- a/dnssd/remoteservice.cpp
+++ b/dnssd/remoteservice.cpp
@@ -166,7 +166,7 @@ void RemoteService::virtual_hook(int, void*)
TQDataStream & operator<< (TQDataStream & s, const RemoteService & a)
{
s << (static_cast<ServiceBase>(a));
- Q_INT8 resolved = a.d->m_resolved ? 1:0;
+ TQ_INT8 resolved = a.d->m_resolved ? 1:0;
s << resolved;
return s;
}
@@ -177,7 +177,7 @@ TQDataStream & operator>> (TQDataStream & s, RemoteService & a)
#ifdef HAVE_DNSSD
a.d->stop();
#endif
- Q_INT8 resolved;
+ TQ_INT8 resolved;
operator>>(s,(static_cast<ServiceBase&>(a)));
s >> resolved;
a.d->m_resolved = (resolved == 1);
diff --git a/dnssd/responder.cpp b/dnssd/responder.cpp
index d8535842..31f37598 100644
--- a/dnssd/responder.cpp
+++ b/dnssd/responder.cpp
@@ -72,7 +72,7 @@ Responder& Responder::self()
void Responder::process()
{
- qApp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput);
+ tqApp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput);
}
#ifdef HAVE_DNSSD
@@ -88,7 +88,7 @@ AvahiClientState Responder::state() const
bool domainIsLocal(const TQString& domain)
{
- return domain.section('.',-1,-1).lower()=="local";
+ return TQString(domain.section('.',-1,-1)).lower()=="local";
}
TQCString domainToDNS(const TQString &domain)
diff --git a/dnssd/responder.h b/dnssd/responder.h
index ae909b59..187683c7 100644
--- a/dnssd/responder.h
+++ b/dnssd/responder.h
@@ -41,7 +41,7 @@ This class should not be used directly.
@author Jakub Stachowski
@short Internal class wrapping avahi client
*/
-class Responder : public QObject
+class Responder : public TQObject
{
Q_OBJECT
diff --git a/dnssd/sdevent.h b/dnssd/sdevent.h
index 90f4a64d..e609a490 100644
--- a/dnssd/sdevent.h
+++ b/dnssd/sdevent.h
@@ -30,13 +30,13 @@ namespace DNSSD
enum Operation { SD_ERROR = 101,SD_ADDREMOVE, SD_PUBLISH, SD_RESOLVE};
-class ErrorEvent : public QCustomEvent
+class ErrorEvent : public TQCustomEvent
{
public:
ErrorEvent() : TQCustomEvent(TQEvent::User+SD_ERROR)
{}
};
-class AddRemoveEvent : public QCustomEvent
+class AddRemoveEvent : public TQCustomEvent
{
public:
enum Operation { Add, Remove };
@@ -51,7 +51,7 @@ public:
const TQString m_domain;
};
-class PublishEvent : public QCustomEvent
+class PublishEvent : public TQCustomEvent
{
public:
PublishEvent(bool ok) : TQCustomEvent(TQEvent::User+SD_PUBLISH), m_ok(ok)
@@ -60,7 +60,7 @@ public:
bool m_ok;
};
-class ResolveEvent : public QCustomEvent
+class ResolveEvent : public TQCustomEvent
{
public:
ResolveEvent(const TQString& hostname, unsigned short port,
diff --git a/dnssd/servicebase.cpp b/dnssd/servicebase.cpp
index 52d18cca..544b56fb 100644
--- a/dnssd/servicebase.cpp
+++ b/dnssd/servicebase.cpp
@@ -51,14 +51,14 @@ void ServiceBase::decode(const TQString& name)
} else { // normal service or domain
TQString decoded_name=name;
decoded_name=decoded_name.replace("\\\\","\\");
- int i = decoded_name.find(TQRegExp("[^\\\\]\\."));
+ int i = decoded_name.tqfind(TQRegExp("[^\\\\]\\."));
if (i==-1) return; // first find service name
rest = decoded_name.mid(i+2);
m_serviceName=decoded_name.left(i+1).replace("\\.",".");
}
m_type = rest.section('.',0,1);
// does it really have a type?
- if (m_type[0]=='_' && m_type[m_type.find('.')+1]=='_')
+ if (m_type[0]=='_' && m_type[m_type.tqfind('.')+1]=='_')
m_domain = rest.section('.',2,-1,TQString::SectionIncludeTrailingSep);
else {
m_type="";
@@ -100,13 +100,13 @@ void ServiceBase::virtual_hook(int, void*)
TQDataStream & operator<< (TQDataStream & s, const ServiceBase & a)
{
- s << a.m_serviceName << a.m_type << a.m_domain << a.m_hostName << Q_INT16(a.m_port) << a.m_textData;
+ s << a.m_serviceName << a.m_type << a.m_domain << a.m_hostName << TQ_INT16(a.m_port) << a.m_textData;
return s;
}
TQDataStream & operator>> (TQDataStream & s, ServiceBase & a)
{
- Q_INT16 port;
+ TQ_INT16 port;
s >> a.m_serviceName >> a.m_type >> a.m_domain >> a.m_hostName >> port >> a.m_textData;
a.m_port = port;
return s;
diff --git a/dnssd/servicebrowser.cpp b/dnssd/servicebrowser.cpp
index 3c64ffe6..2ca87ef8 100644
--- a/dnssd/servicebrowser.cpp
+++ b/dnssd/servicebrowser.cpp
@@ -108,7 +108,7 @@ const DomainBrowser* ServiceBrowser::browsedDomains() const
void ServiceBrowser::serviceResolved(bool success)
{
- TQObject* sender_obj = const_cast<TQObject*>(sender());
+ TQObject* sender_obj = const_cast<TQObject*>(TQT_TQOBJECT_CONST(sender()));
RemoteService* svr = static_cast<RemoteService*>(sender_obj);
disconnect(svr,TQT_SIGNAL(resolved(bool)),this,TQT_SLOT(serviceResolved(bool)));
TQValueList<RemoteService::Ptr>::Iterator it = d->m_duringResolve.begin();
diff --git a/dnssd/servicebrowser.h b/dnssd/servicebrowser.h
index fac4d407..cb270dea 100644
--- a/dnssd/servicebrowser.h
+++ b/dnssd/servicebrowser.h
@@ -51,7 +51,7 @@ to constructor, domains configured by user will be searched.
@author Jakub Stachowski
@short Browsing for specific type of services or all available service types
*/
-class KDNSSD_EXPORT ServiceBrowser : public QObject
+class KDNSSD_EXPORT ServiceBrowser : public TQObject
{
Q_OBJECT
public:
diff --git a/interfaces/khexedit/byteseditinterface.h b/interfaces/khexedit/byteseditinterface.h
index dc0a9dca..5acb9a25 100644
--- a/interfaces/khexedit/byteseditinterface.h
+++ b/interfaces/khexedit/byteseditinterface.h
@@ -143,8 +143,8 @@ class BytesEditInterface
virtual bool isModified() const = 0;
public: // call for action
- /** repaint the indizes from i1 to i2 */
- virtual void repaintRange( int i1, int i2 ) = 0;
+ /** tqrepaint the indizes from i1 to i2 */
+ virtual void tqrepaintRange( int i1, int i2 ) = 0;
};
@@ -159,7 +159,7 @@ inline BytesEditInterface *bytesEditInterface( T *t )
if( !t )
return 0;
- return static_cast<BytesEditInterface*>( t->qt_cast("KHE::BytesEditInterface") );
+ return static_cast<BytesEditInterface*>( t->tqqt_cast("KHE::BytesEditInterface") );
}
/** tries to create an instance of a hexedit widget for arrays of chars (char[])
@@ -221,7 +221,7 @@ inline BytesEditInterface *bytesEditInterface( T *t )
inline TQWidget *createBytesEditWidget( TQWidget *Parent = 0, const char *Name = 0 )
{
return KParts::ComponentFactory::createInstanceFromQuery<TQWidget>
- ( TQString::fromLatin1("KHexEdit/KBytesEdit"), TQString::null, Parent, Name );
+ ( TQString::tqfromLatin1("KHexEdit/KBytesEdit"), TQString::null, Parent, Name );
}
}
diff --git a/interfaces/khexedit/charcolumninterface.h b/interfaces/khexedit/charcolumninterface.h
index 4221de0c..753ff7ab 100644
--- a/interfaces/khexedit/charcolumninterface.h
+++ b/interfaces/khexedit/charcolumninterface.h
@@ -97,7 +97,7 @@ CharColumnInterface *charColumnInterface( T *t )
if( !t )
return 0;
- return static_cast<CharColumnInterface*>( t->qt_cast("KHE::CharColumnInterface") );
+ return static_cast<CharColumnInterface*>( t->tqqt_cast("KHE::CharColumnInterface") );
}
}
diff --git a/interfaces/khexedit/clipboardinterface.h b/interfaces/khexedit/clipboardinterface.h
index eeaf9d39..0e106aa3 100644
--- a/interfaces/khexedit/clipboardinterface.h
+++ b/interfaces/khexedit/clipboardinterface.h
@@ -78,7 +78,7 @@ ClipboardInterface *clipboardInterface( T *t )
if( !t )
return 0;
- return static_cast<ClipboardInterface*>( t->qt_cast("KHE::ClipboardInterface") );
+ return static_cast<ClipboardInterface*>( t->tqqt_cast("KHE::ClipboardInterface") );
}
}
diff --git a/interfaces/khexedit/valuecolumninterface.h b/interfaces/khexedit/valuecolumninterface.h
index 7dafa7d4..e23c9176 100644
--- a/interfaces/khexedit/valuecolumninterface.h
+++ b/interfaces/khexedit/valuecolumninterface.h
@@ -162,7 +162,7 @@ ValueColumnInterface *valueColumnInterface( T *t )
if( !t )
return 0;
- return static_cast<ValueColumnInterface*>( t->qt_cast("KHE::ValueColumnInterface") );
+ return static_cast<ValueColumnInterface*>( t->tqqt_cast("KHE::ValueColumnInterface") );
}
}
diff --git a/interfaces/khexedit/zoominterface.h b/interfaces/khexedit/zoominterface.h
index 494fbfd8..5fdaa8c2 100644
--- a/interfaces/khexedit/zoominterface.h
+++ b/interfaces/khexedit/zoominterface.h
@@ -71,7 +71,7 @@ ZoomInterface *zoomInterface( T *t )
if( !t )
return 0;
- return static_cast<ZoomInterface*>( t->qt_cast("KHE::ZoomInterface") );
+ return static_cast<ZoomInterface*>( t->tqqt_cast("KHE::ZoomInterface") );
}
}
diff --git a/interfaces/kimproxy/interface/kimiface.h b/interfaces/kimproxy/interface/kimiface.h
index f3212df6..a41172fd 100644
--- a/interfaces/kimproxy/interface/kimiface.h
+++ b/interfaces/kimproxy/interface/kimiface.h
@@ -467,7 +467,7 @@ k_dcop_signals:
/**
* @brief Indicates that a contact's presence has changed
*
- * Notifies connected DCOP receivers about a change in a contact's
+ * Notifies connected DCOP tqreceivers about a change in a contact's
* presence.
*
* Implementations just have to call this method with the appropriate
diff --git a/interfaces/kimproxy/library/kimproxy.cpp b/interfaces/kimproxy/library/kimproxy.cpp
index 44f828a0..38462a15 100644
--- a/interfaces/kimproxy/library/kimproxy.cpp
+++ b/interfaces/kimproxy/library/kimproxy.cpp
@@ -248,7 +248,7 @@ bool KIMProxy::initialize()
{
m_apps_available = true;
//kdDebug( 790 ) << " app name: " << (*offer)->name() << ", has instance " << *app << ", dcopService: " << dcopService << endl;
- if ( !m_im_client_stubs.find( dcopService ) )
+ if ( !m_im_client_stubs.tqfind( dcopService ) )
{
kdDebug( 790 ) << "App " << *app << ", dcopObjectId " << dcopObjectId << " found, using it for presence info." << endl;
m_im_client_stubs.insert( *app, new KIMIface_stub( d->dc, *app, dcopObjectId ) );
@@ -284,7 +284,7 @@ void KIMProxy::registeredToDCOP( const TQCString& appId )
if ( appId.left( dcopService.length() ) == dcopService )
{
// if it's not already known, insert it
- if ( !m_im_client_stubs.find( appId ) )
+ if ( !m_im_client_stubs.tqfind( appId ) )
{
newApp = true;
kdDebug( 790 ) << "App: " << appId << ", dcopService: " << dcopService << " started, using it for presence info."<< endl;
@@ -301,7 +301,7 @@ void KIMProxy::registeredToDCOP( const TQCString& appId )
void KIMProxy::unregisteredFromDCOP( const TQCString& appId )
{
//kdDebug( 790 ) << k_funcinfo << appId << endl;
- if ( m_im_client_stubs.find( appId ) )
+ if ( m_im_client_stubs.tqfind( appId ) )
{
kdDebug( 790 ) << appId << " quit, removing its presence info." << endl;
@@ -618,7 +618,7 @@ KIMIface_stub * KIMProxy::stubForUid( const TQString &uid )
// get best appPresence
AppPresenceCurrent ap = d->presence_map[ uid ].best();
// look up the presence string from that app
- return m_im_client_stubs.find( ap.appId );
+ return m_im_client_stubs.tqfind( ap.appId );
}
KIMIface_stub * KIMProxy::stubForProtocol( const TQString &protocol)
@@ -626,7 +626,7 @@ KIMIface_stub * KIMProxy::stubForProtocol( const TQString &protocol)
KIMIface_stub * app;
// see if the preferred client supports this protocol
TQString preferred = preferredApp();
- if ( ( app = m_im_client_stubs.find( preferred ) ) )
+ if ( ( app = m_im_client_stubs.tqfind( preferred ) ) )
{
if ( app->protocols().grep( protocol ).count() > 0 )
return app;
diff --git a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp b/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
index 11fa58f2..0ce32c6c 100644
--- a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
+++ b/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
@@ -83,7 +83,7 @@ KFileAudioPreview::KFileAudioPreview( TQWidget *parent, const char *name )
{
TQHBox *frame = new TQHBox( box );
frame->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
- frame->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
+ frame->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
view->videoWidget()->reparent( frame, TQPoint(0,0) );
}
@@ -110,7 +110,7 @@ void KFileAudioPreview::showPreview( const KURL &url )
return;
KMimeType::Ptr mt = KMimeType::findByURL( url );
- bool supported = m_supportedFormats.find( mt->name() );
+ bool supported = m_supportedFormats.tqfind( mt->name() );
d->player->view()->setEnabled( supported );
if ( !supported )
return;
diff --git a/interfaces/kmediaplayer/player.h b/interfaces/kmediaplayer/player.h
index 10e9f4a7..32990840 100644
--- a/interfaces/kmediaplayer/player.h
+++ b/interfaces/kmediaplayer/player.h
@@ -56,7 +56,7 @@ public:
/** This constructor is what to use when a GUI is required, as in the
* case of a KMediaPlayer/Player.
*/
- Player(TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name);
+ Player(TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name);
virtual ~Player(void);
diff --git a/interfaces/kmediaplayer/view.h b/interfaces/kmediaplayer/view.h
index 54f46a8c..ae6ee2ea 100644
--- a/interfaces/kmediaplayer/view.h
+++ b/interfaces/kmediaplayer/view.h
@@ -31,7 +31,7 @@ namespace KMediaPlayer
{
/** View is part of the user interface of a Player. */
-class KDE_EXPORT View : public QWidget
+class KDE_EXPORT View : public TQWidget
{
Q_OBJECT
diff --git a/interfaces/kregexpeditor/kregexpeditorinterface.h b/interfaces/kregexpeditor/kregexpeditorinterface.h
index 01fab0fd..c10b86ea 100644
--- a/interfaces/kregexpeditor/kregexpeditorinterface.h
+++ b/interfaces/kregexpeditor/kregexpeditorinterface.h
@@ -25,7 +25,7 @@
* TQDialog *editorDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor" );
* if ( editorDialog ) {
* // kdeutils was installed, so the dialog was found fetch the editor interface
- * KRegExpEditorInterface *editor = static_cast<KRegExpEditorInterface *>( editorDialog->qt_cast( "KRegExpEditorInterface" ) );
+ * KRegExpEditorInterface *editor = static_cast<KRegExpEditorInterface *>( editorDialog->tqqt_cast( "KRegExpEditorInterface" ) );
* Q_ASSERT( editor ); // This should not fail!
*
* // now use the editor.
@@ -53,7 +53,7 @@
* "KRegExpEditor/KRegExpEditor", TQString::null, parent );
* if ( editorWidget ) {
* // kdeutils was installed, so the widget was found fetch the editor interface
- * KRegExpEditorInterface *editor = static_cast<KRegExpEditorInterface *>( editorWidget->qt_cast( "KRegExpEditorInterface" ) );
+ * KRegExpEditorInterface *editor = static_cast<KRegExpEditorInterface *>( editorWidget->tqqt_cast( "KRegExpEditorInterface" ) );
* Q_ASSERT( editor ); // This should not fail!
*
* // now use the editor.
diff --git a/interfaces/kscript/scriptinterface.h b/interfaces/kscript/scriptinterface.h
index e711e82c..1c37b7f7 100644
--- a/interfaces/kscript/scriptinterface.h
+++ b/interfaces/kscript/scriptinterface.h
@@ -44,7 +44,7 @@ class KScriptClientInterface;
* @author Ian Reinhart Geiser <geiseri@kde.org>
*
**/
- class KDE_EXPORT KScriptInterface : public QObject
+ class KDE_EXPORT KScriptInterface : public TQObject
{
Q_OBJECT
public:
diff --git a/interfaces/ktexteditor/blockselectioninterface.cpp b/interfaces/ktexteditor/blockselectioninterface.cpp
index c1af4a6e..af337282 100644
--- a/interfaces/ktexteditor/blockselectioninterface.cpp
+++ b/interfaces/ktexteditor/blockselectioninterface.cpp
@@ -70,5 +70,5 @@ BlockSelectionInterface *KTextEditor::blockSelectionInterface (Document *doc)
if (!doc)
return 0;
- return static_cast<BlockSelectionInterface*>(doc->qt_cast("KTextEditor::BlockSelectionInterface"));
+ return static_cast<BlockSelectionInterface*>(doc->tqqt_cast("KTextEditor::BlockSelectionInterface"));
}
diff --git a/interfaces/ktexteditor/clipboardinterface.cpp b/interfaces/ktexteditor/clipboardinterface.cpp
index 4401b29d..c1bc2803 100644
--- a/interfaces/ktexteditor/clipboardinterface.cpp
+++ b/interfaces/ktexteditor/clipboardinterface.cpp
@@ -52,5 +52,5 @@ ClipboardInterface *KTextEditor::clipboardInterface (View *view)
if (!view)
return 0;
- return static_cast<ClipboardInterface*>(view->qt_cast("KTextEditor::ClipboardInterface"));
+ return static_cast<ClipboardInterface*>(view->tqqt_cast("KTextEditor::ClipboardInterface"));
}
diff --git a/interfaces/ktexteditor/codecompletioninterface.cpp b/interfaces/ktexteditor/codecompletioninterface.cpp
index ae60b216..1d185a62 100644
--- a/interfaces/ktexteditor/codecompletioninterface.cpp
+++ b/interfaces/ktexteditor/codecompletioninterface.cpp
@@ -45,7 +45,7 @@ CodeCompletionInterface *KTextEditor::codeCompletionInterface (View *view)
if (!view)
return 0;
- return static_cast<CodeCompletionInterface*>(view->qt_cast("KTextEditor::CodeCompletionInterface"));
+ return static_cast<CodeCompletionInterface*>(view->tqqt_cast("KTextEditor::CodeCompletionInterface"));
}
diff --git a/interfaces/ktexteditor/configinterface.cpp b/interfaces/ktexteditor/configinterface.cpp
index 2ca2e4b1..7a88261c 100644
--- a/interfaces/ktexteditor/configinterface.cpp
+++ b/interfaces/ktexteditor/configinterface.cpp
@@ -67,7 +67,7 @@ ConfigInterface *KTextEditor::configInterface (Document *doc)
if (!doc)
return 0;
- return static_cast<ConfigInterface*>(doc->qt_cast("KTextEditor::ConfigInterface"));
+ return static_cast<ConfigInterface*>(doc->tqqt_cast("KTextEditor::ConfigInterface"));
}
ConfigInterface *KTextEditor::configInterface (Plugin *plugin)
@@ -75,5 +75,5 @@ ConfigInterface *KTextEditor::configInterface (Plugin *plugin)
if (!plugin)
return 0;
- return static_cast<ConfigInterface*>(plugin->qt_cast("KTextEditor::ConfigInterface"));
+ return static_cast<ConfigInterface*>(plugin->tqqt_cast("KTextEditor::ConfigInterface"));
}
diff --git a/interfaces/ktexteditor/configinterfaceextension.cpp b/interfaces/ktexteditor/configinterfaceextension.cpp
index 8557c422..fe4704d4 100644
--- a/interfaces/ktexteditor/configinterfaceextension.cpp
+++ b/interfaces/ktexteditor/configinterfaceextension.cpp
@@ -72,7 +72,7 @@ ConfigInterfaceExtension *KTextEditor::configInterfaceExtension (Document *doc)
if (!doc)
return 0;
- return static_cast<ConfigInterfaceExtension*>(doc->qt_cast("KTextEditor::ConfigInterfaceExtension"));
+ return static_cast<ConfigInterfaceExtension*>(doc->tqqt_cast("KTextEditor::ConfigInterfaceExtension"));
}
ConfigInterfaceExtension *KTextEditor::configInterfaceExtension (Plugin *plugin)
@@ -80,5 +80,5 @@ ConfigInterfaceExtension *KTextEditor::configInterfaceExtension (Plugin *plugin)
if (!plugin)
return 0;
- return static_cast<ConfigInterfaceExtension*>(plugin->qt_cast("KTextEditor::ConfigInterfaceExtension"));
+ return static_cast<ConfigInterfaceExtension*>(plugin->tqqt_cast("KTextEditor::ConfigInterfaceExtension"));
}
diff --git a/interfaces/ktexteditor/configinterfaceextension.h b/interfaces/ktexteditor/configinterfaceextension.h
index 6ebfd889..e324e2ba 100644
--- a/interfaces/ktexteditor/configinterfaceextension.h
+++ b/interfaces/ktexteditor/configinterfaceextension.h
@@ -26,7 +26,7 @@
namespace KTextEditor
{
-class KTEXTEDITOR_EXPORT ConfigPage : public QWidget
+class KTEXTEDITOR_EXPORT ConfigPage : public TQWidget
{
Q_OBJECT
diff --git a/interfaces/ktexteditor/cursorinterface.cpp b/interfaces/ktexteditor/cursorinterface.cpp
index 91a14b06..3b7857bb 100644
--- a/interfaces/ktexteditor/cursorinterface.cpp
+++ b/interfaces/ktexteditor/cursorinterface.cpp
@@ -65,5 +65,5 @@ CursorInterface *KTextEditor::cursorInterface (Document *doc)
if (!doc)
return 0;
- return static_cast<CursorInterface*>(doc->qt_cast("KTextEditor::CursorInterface"));
+ return static_cast<CursorInterface*>(doc->tqqt_cast("KTextEditor::CursorInterface"));
}
diff --git a/interfaces/ktexteditor/dynwordwrapinterface.cpp b/interfaces/ktexteditor/dynwordwrapinterface.cpp
index 49d4060c..a60f1129 100644
--- a/interfaces/ktexteditor/dynwordwrapinterface.cpp
+++ b/interfaces/ktexteditor/dynwordwrapinterface.cpp
@@ -65,5 +65,5 @@ DynWordWrapInterface *KTextEditor::dynWordWrapInterface (View *view)
if (!view)
return 0;
- return static_cast<DynWordWrapInterface*>(view->qt_cast("KTextEditor::DynWordWrapInterface"));
+ return static_cast<DynWordWrapInterface*>(view->tqqt_cast("KTextEditor::DynWordWrapInterface"));
}
diff --git a/interfaces/ktexteditor/editinterface.cpp b/interfaces/ktexteditor/editinterface.cpp
index 6722fc55..3a03002b 100644
--- a/interfaces/ktexteditor/editinterface.cpp
+++ b/interfaces/ktexteditor/editinterface.cpp
@@ -52,6 +52,6 @@ EditInterface *KTextEditor::editInterface (Document *doc)
if (!doc)
return 0;
- return static_cast<EditInterface*>(doc->qt_cast("KTextEditor::EditInterface"));
+ return static_cast<EditInterface*>(doc->tqqt_cast("KTextEditor::EditInterface"));
}
diff --git a/interfaces/ktexteditor/editinterfaceext.cpp b/interfaces/ktexteditor/editinterfaceext.cpp
index 7d4acf55..944b662d 100644
--- a/interfaces/ktexteditor/editinterfaceext.cpp
+++ b/interfaces/ktexteditor/editinterfaceext.cpp
@@ -45,6 +45,6 @@ EditInterfaceExt *KTextEditor::editInterfaceExt (Document *doc)
if (!doc)
return 0;
- return static_cast<EditInterfaceExt*>(doc->qt_cast("KTextEditor::EditInterfaceExt"));
+ return static_cast<EditInterfaceExt*>(doc->tqqt_cast("KTextEditor::EditInterfaceExt"));
}
diff --git a/interfaces/ktexteditor/editinterfaceext.h b/interfaces/ktexteditor/editinterfaceext.h
index 650bb9ec..e5f2d910 100644
--- a/interfaces/ktexteditor/editinterfaceext.h
+++ b/interfaces/ktexteditor/editinterfaceext.h
@@ -44,7 +44,7 @@ class KTEXTEDITOR_EXPORT EditInterfaceExt
/**
* Begin an editing sequence. Edit commands during this sequence will be
* bunched together such that they represent a single undo command in the
- * editor, and so that repaint events do not occur inbetween.
+ * editor, and so that tqrepaint events do not occur inbetween.
*
* Your application should not return control to the event loop while it
* has an unterminated (no matching editEnd() call) editing sequence
diff --git a/interfaces/ktexteditor/editor.h b/interfaces/ktexteditor/editor.h
index 11f9a8c1..fa476143 100644
--- a/interfaces/ktexteditor/editor.h
+++ b/interfaces/ktexteditor/editor.h
@@ -57,7 +57,7 @@ class KTEXTEDITOR_EXPORT Editor : public KParts::ReadWritePart
unsigned int myEditorNumber;
};
-KTEXTEDITOR_EXPORT Editor *createEditor ( const char* libname, TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0 );
+KTEXTEDITOR_EXPORT Editor *createEditor ( const char* libname, TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0 );
}
diff --git a/interfaces/ktexteditor/editorchooser.cpp b/interfaces/ktexteditor/editorchooser.cpp
index 96cf3649..60aef8d1 100644
--- a/interfaces/ktexteditor/editorchooser.cpp
+++ b/interfaces/ktexteditor/editorchooser.cpp
@@ -130,7 +130,7 @@ KTextEditor::Document *EditorChooser::createDocument(TQObject *parent,const char
return 0;
}
-KTextEditor::Editor *EditorChooser::createEditor(TQWidget *parentWidget,TQObject *parent,const char* widgetName,
+KTextEditor::Editor *EditorChooser::createEditor(TQWidget *tqparentWidget,TQObject *parent,const char* widgetName,
const char* name,const TQString& postfix,bool fallBackToKatePart){
KTextEditor::Editor *tmpEd=0;
@@ -151,11 +151,11 @@ KTextEditor::Editor *EditorChooser::createEditor(TQWidget *parentWidget,TQObject
KService::Ptr serv=KService::serviceByDesktopName(editor);
if (serv)
{
- tmpEd=KTextEditor::createEditor(serv->library().latin1(),parentWidget,widgetName,parent,name);
+ tmpEd=KTextEditor::createEditor(serv->library().latin1(),tqparentWidget,widgetName,parent,name);
if (tmpEd) return tmpEd;
}
if (fallBackToKatePart)
- return KTextEditor::createEditor("libkatepart",parentWidget,widgetName,parent,name);
+ return KTextEditor::createEditor("libkatepart",tqparentWidget,widgetName,parent,name);
return 0;
}
diff --git a/interfaces/ktexteditor/editorchooser.h b/interfaces/ktexteditor/editorchooser.h
index 20fba94e..a5118c3d 100644
--- a/interfaces/ktexteditor/editorchooser.h
+++ b/interfaces/ktexteditor/editorchooser.h
@@ -12,7 +12,7 @@ class TQString;
namespace KTextEditor
{
-class KTEXTEDITOR_EXPORT EditorChooser: public QWidget
+class KTEXTEDITOR_EXPORT EditorChooser: public TQWidget
{
friend class PrivateEditorChooser;
@@ -28,7 +28,7 @@ class KTEXTEDITOR_EXPORT EditorChooser: public QWidget
void writeAppSetting(const TQString& postfix=TQString::null);
static KTextEditor::Document *createDocument(TQObject* parent=0,const char *name=0,const TQString& postfix=TQString::null, bool fallBackToKatePart=true);
- static KTextEditor::Editor *createEditor(TQWidget *parentWidget,TQObject *parent,const char* widgetName=0,const char* name=0,const TQString& postfix=TQString::null,bool fallBackToKatePart=true);
+ static KTextEditor::Editor *createEditor(TQWidget *tqparentWidget,TQObject *parent,const char* widgetName=0,const char* name=0,const TQString& postfix=TQString::null,bool fallBackToKatePart=true);
private:
class PrivateEditorChooser *d;
};
diff --git a/interfaces/ktexteditor/editorchooser_ui.ui b/interfaces/ktexteditor/editorchooser_ui.ui
index fa1d9918..831d8d37 100644
--- a/interfaces/ktexteditor/editorchooser_ui.ui
+++ b/interfaces/ktexteditor/editorchooser_ui.ui
@@ -19,7 +19,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLayoutWidget">
+ <widget class="TQLayoutWidget">
<property name="name">
<cstring>layout4</cstring>
</property>
@@ -31,7 +31,7 @@
<property name="name">
<cstring>TextLabel1</cstring>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>460</width>
<height>0</height>
@@ -40,7 +40,7 @@
<property name="text">
<string>Please choose the default text editing component that you wish to use in this application. If you choose &lt;B&gt;System Default&lt;/B&gt;, the application will honor your changes in the Control Center. All other choices will override that setting.</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignVCenter|AlignLeft</set>
</property>
</widget>
diff --git a/interfaces/ktexteditor/encodinginterface.cpp b/interfaces/ktexteditor/encodinginterface.cpp
index 341847fb..e864525e 100644
--- a/interfaces/ktexteditor/encodinginterface.cpp
+++ b/interfaces/ktexteditor/encodinginterface.cpp
@@ -72,5 +72,5 @@ EncodingInterface *KTextEditor::encodingInterface (Document *doc)
if (!doc)
return 0;
- return static_cast<EncodingInterface*>(doc->qt_cast("KTextEditor::EncodingInterface"));
+ return static_cast<EncodingInterface*>(doc->tqqt_cast("KTextEditor::EncodingInterface"));
}
diff --git a/interfaces/ktexteditor/highlightinginterface.cpp b/interfaces/ktexteditor/highlightinginterface.cpp
index f606ab5c..18854507 100644
--- a/interfaces/ktexteditor/highlightinginterface.cpp
+++ b/interfaces/ktexteditor/highlightinginterface.cpp
@@ -65,5 +65,5 @@ HighlightingInterface *KTextEditor::highlightingInterface (Document *doc)
if (!doc)
return 0;
- return static_cast<HighlightingInterface*>(doc->qt_cast("KTextEditor::HighlightingInterface"));
+ return static_cast<HighlightingInterface*>(doc->tqqt_cast("KTextEditor::HighlightingInterface"));
}
diff --git a/interfaces/ktexteditor/ktexteditor.cpp b/interfaces/ktexteditor/ktexteditor.cpp
index 0b50fdae..09bd63ea 100644
--- a/interfaces/ktexteditor/ktexteditor.cpp
+++ b/interfaces/ktexteditor/ktexteditor.cpp
@@ -206,9 +206,9 @@ unsigned int Editor::editorNumber () const
return myEditorNumber;
}
-Editor *KTextEditor::createEditor ( const char* libname, TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name )
+Editor *KTextEditor::createEditor ( const char* libname, TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name )
{
- return KParts::ComponentFactory::createPartInstanceFromLibrary<Editor>( libname, parentWidget, widgetName, parent, name );
+ return KParts::ComponentFactory::createPartInstanceFromLibrary<Editor>( libname, tqparentWidget, widgetName, parent, name );
}
Document *KTextEditor::createDocument ( const char* libname, TQObject *parent, const char *name )
@@ -226,6 +226,6 @@ PluginViewInterface *KTextEditor::pluginViewInterface (Plugin *plugin)
if (!plugin)
return 0;
- return static_cast<PluginViewInterface*>(plugin->qt_cast("KTextEditor::PluginViewInterface"));
+ return static_cast<PluginViewInterface*>(plugin->tqqt_cast("KTextEditor::PluginViewInterface"));
}
diff --git a/interfaces/ktexteditor/markinterface.cpp b/interfaces/ktexteditor/markinterface.cpp
index d711b524..97c23f1e 100644
--- a/interfaces/ktexteditor/markinterface.cpp
+++ b/interfaces/ktexteditor/markinterface.cpp
@@ -65,7 +65,7 @@ MarkInterface *KTextEditor::markInterface (Document *doc)
if (!doc)
return 0;
- return static_cast<MarkInterface*>(doc->qt_cast("KTextEditor::MarkInterface"));
+ return static_cast<MarkInterface*>(doc->tqqt_cast("KTextEditor::MarkInterface"));
}
int MarkInterface::reservedMarkersCount()
diff --git a/interfaces/ktexteditor/markinterfaceextension.cpp b/interfaces/ktexteditor/markinterfaceextension.cpp
index 57c98142..19b327e9 100644
--- a/interfaces/ktexteditor/markinterfaceextension.cpp
+++ b/interfaces/ktexteditor/markinterfaceextension.cpp
@@ -65,5 +65,5 @@ MarkInterfaceExtension *KTextEditor::markInterfaceExtension (Document *doc)
if (!doc)
return 0;
- return static_cast<MarkInterfaceExtension*>(doc->qt_cast("KTextEditor::MarkInterfaceExtension"));
+ return static_cast<MarkInterfaceExtension*>(doc->tqqt_cast("KTextEditor::MarkInterfaceExtension"));
}
diff --git a/interfaces/ktexteditor/plugin.h b/interfaces/ktexteditor/plugin.h
index dc7978f9..71266d3e 100644
--- a/interfaces/ktexteditor/plugin.h
+++ b/interfaces/ktexteditor/plugin.h
@@ -33,7 +33,7 @@ class View;
* Basic KTextEditor plugin class.
* This plugin will be bound to a Document.
*/
-class KTEXTEDITOR_EXPORT Plugin : public QObject
+class KTEXTEDITOR_EXPORT Plugin : public TQObject
{
friend class PrivatePlugin;
diff --git a/interfaces/ktexteditor/popupmenuinterface.cpp b/interfaces/ktexteditor/popupmenuinterface.cpp
index d2d51e4a..6de6f201 100644
--- a/interfaces/ktexteditor/popupmenuinterface.cpp
+++ b/interfaces/ktexteditor/popupmenuinterface.cpp
@@ -65,5 +65,5 @@ PopupMenuInterface *KTextEditor::popupMenuInterface (View *view)
if (!view)
return 0;
- return static_cast<PopupMenuInterface*>(view->qt_cast("KTextEditor::PopupMenuInterface"));
+ return static_cast<PopupMenuInterface*>(view->tqqt_cast("KTextEditor::PopupMenuInterface"));
}
diff --git a/interfaces/ktexteditor/printinterface.cpp b/interfaces/ktexteditor/printinterface.cpp
index 936e803e..0f6c6afd 100644
--- a/interfaces/ktexteditor/printinterface.cpp
+++ b/interfaces/ktexteditor/printinterface.cpp
@@ -70,5 +70,5 @@ PrintInterface *KTextEditor::printInterface (Document *doc)
if (!doc)
return 0;
- return static_cast<PrintInterface*>(doc->qt_cast("KTextEditor::PrintInterface"));
+ return static_cast<PrintInterface*>(doc->tqqt_cast("KTextEditor::PrintInterface"));
}
diff --git a/interfaces/ktexteditor/searchinterface.cpp b/interfaces/ktexteditor/searchinterface.cpp
index d23a25e3..e1a58ed6 100644
--- a/interfaces/ktexteditor/searchinterface.cpp
+++ b/interfaces/ktexteditor/searchinterface.cpp
@@ -51,5 +51,5 @@ SearchInterface *KTextEditor::searchInterface (Document *doc)
if (!doc)
return 0;
- return static_cast<SearchInterface*>(doc->qt_cast("KTextEditor::SearchInterface"));
+ return static_cast<SearchInterface*>(doc->tqqt_cast("KTextEditor::SearchInterface"));
}
diff --git a/interfaces/ktexteditor/selectioninterface.cpp b/interfaces/ktexteditor/selectioninterface.cpp
index 2e9ae520..61bc7a99 100644
--- a/interfaces/ktexteditor/selectioninterface.cpp
+++ b/interfaces/ktexteditor/selectioninterface.cpp
@@ -52,7 +52,7 @@ SelectionInterface *KTextEditor::selectionInterface (Document *doc)
if (!doc)
return 0;
- return static_cast<SelectionInterface*>(doc->qt_cast("KTextEditor::SelectionInterface"));
+ return static_cast<SelectionInterface*>(doc->tqqt_cast("KTextEditor::SelectionInterface"));
}
SelectionInterface *KTextEditor::selectionInterface (View *view)
@@ -60,6 +60,6 @@ SelectionInterface *KTextEditor::selectionInterface (View *view)
if (!view)
return 0;
- return static_cast<SelectionInterface*>(view->qt_cast("KTextEditor::SelectionInterface"));
+ return static_cast<SelectionInterface*>(view->tqqt_cast("KTextEditor::SelectionInterface"));
}
diff --git a/interfaces/ktexteditor/selectioninterfaceext.cpp b/interfaces/ktexteditor/selectioninterfaceext.cpp
index f59468c1..c8404a9b 100644
--- a/interfaces/ktexteditor/selectioninterfaceext.cpp
+++ b/interfaces/ktexteditor/selectioninterfaceext.cpp
@@ -68,7 +68,7 @@ SelectionInterfaceExt *KTextEditor::selectionInterfaceExt (Document *doc)
if (!doc)
return 0;
- return static_cast<SelectionInterfaceExt*>(doc->qt_cast("KTextEditor::SelectionInterfaceExt"));
+ return static_cast<SelectionInterfaceExt*>(doc->tqqt_cast("KTextEditor::SelectionInterfaceExt"));
}
SelectionInterfaceExt *KTextEditor::selectionInterfaceExt (View *view)
@@ -76,7 +76,7 @@ SelectionInterfaceExt *KTextEditor::selectionInterfaceExt (View *view)
if (!view)
return 0;
- return static_cast<SelectionInterfaceExt*>(view->qt_cast("KTextEditor::SelectionInterfaceExt"));
+ return static_cast<SelectionInterfaceExt*>(view->tqqt_cast("KTextEditor::SelectionInterfaceExt"));
}
//END KTextEditor::SelectionInterfaceExt
diff --git a/interfaces/ktexteditor/sessionconfiginterface.cpp b/interfaces/ktexteditor/sessionconfiginterface.cpp
index 7180aae3..1720584c 100644
--- a/interfaces/ktexteditor/sessionconfiginterface.cpp
+++ b/interfaces/ktexteditor/sessionconfiginterface.cpp
@@ -68,7 +68,7 @@ SessionConfigInterface *KTextEditor::sessionConfigInterface (Document *doc)
if (!doc)
return 0;
- return static_cast<SessionConfigInterface*>(doc->qt_cast("KTextEditor::SessionConfigInterface"));
+ return static_cast<SessionConfigInterface*>(doc->tqqt_cast("KTextEditor::SessionConfigInterface"));
}
SessionConfigInterface *KTextEditor::sessionConfigInterface (View *view)
@@ -76,7 +76,7 @@ SessionConfigInterface *KTextEditor::sessionConfigInterface (View *view)
if (!view)
return 0;
- return static_cast<SessionConfigInterface*>(view->qt_cast("KTextEditor::SessionConfigInterface"));
+ return static_cast<SessionConfigInterface*>(view->tqqt_cast("KTextEditor::SessionConfigInterface"));
}
SessionConfigInterface *KTextEditor::sessionConfigInterface (Plugin *plugin)
@@ -84,5 +84,5 @@ SessionConfigInterface *KTextEditor::sessionConfigInterface (Plugin *plugin)
if (!plugin)
return 0;
- return static_cast<SessionConfigInterface*>(plugin->qt_cast("KTextEditor::SessionConfigInterface"));
+ return static_cast<SessionConfigInterface*>(plugin->tqqt_cast("KTextEditor::SessionConfigInterface"));
}
diff --git a/interfaces/ktexteditor/templateinterface.cpp b/interfaces/ktexteditor/templateinterface.cpp
index 4f9f8370..b19b1d10 100644
--- a/interfaces/ktexteditor/templateinterface.cpp
+++ b/interfaces/ktexteditor/templateinterface.cpp
@@ -74,7 +74,7 @@ bool TemplateInterface::expandMacros( TQMap<TQString, TQString> &map, TQWidget *
{
KABC::StdAddressBook *addrBook = 0;
KABC::Addressee userAddress;
- TQDateTime datetime = TQDateTime::currentDateTime();
+ TQDateTime datetime = TQDateTime::tqcurrentDateTime();
TQDate date = datetime.date();
TQTime time = datetime.time();
@@ -192,6 +192,6 @@ TemplateInterface *KTextEditor::templateInterface ( KTextEditor::Document *doc )
if ( !doc )
return 0;
- return static_cast<TemplateInterface*>( doc->qt_cast( "KTextEditor::TemplateInterface" ) );
+ return static_cast<TemplateInterface*>( doc->tqqt_cast( "KTextEditor::TemplateInterface" ) );
}
diff --git a/interfaces/ktexteditor/texthintinterface.cpp b/interfaces/ktexteditor/texthintinterface.cpp
index 079a1edd..3a6c3a75 100644
--- a/interfaces/ktexteditor/texthintinterface.cpp
+++ b/interfaces/ktexteditor/texthintinterface.cpp
@@ -58,7 +58,7 @@ TextHintInterface *textHintInterface (View *view)
if (!view)
return 0;
- return static_cast<TextHintInterface*>(view->qt_cast("KTextEditor::TextHintInterface"));
+ return static_cast<TextHintInterface*>(view->tqqt_cast("KTextEditor::TextHintInterface"));
}
diff --git a/interfaces/ktexteditor/undointerface.cpp b/interfaces/ktexteditor/undointerface.cpp
index d19a56de..c86a3ecf 100644
--- a/interfaces/ktexteditor/undointerface.cpp
+++ b/interfaces/ktexteditor/undointerface.cpp
@@ -70,5 +70,5 @@ UndoInterface *KTextEditor::undoInterface (Document *doc)
if (!doc)
return 0;
- return static_cast<UndoInterface*>(doc->qt_cast("KTextEditor::UndoInterface"));
+ return static_cast<UndoInterface*>(doc->tqqt_cast("KTextEditor::UndoInterface"));
}
diff --git a/interfaces/ktexteditor/variableinterface.cpp b/interfaces/ktexteditor/variableinterface.cpp
index 0ac55167..f8bfcfe9 100644
--- a/interfaces/ktexteditor/variableinterface.cpp
+++ b/interfaces/ktexteditor/variableinterface.cpp
@@ -44,5 +44,5 @@ VariableInterface *KTextEditor::variableInterface( Document *doc )
if ( ! doc )
return 0;
- return static_cast<VariableInterface*>(doc->qt_cast("KTextEditor::VariableInterface"));
+ return static_cast<VariableInterface*>(doc->tqqt_cast("KTextEditor::VariableInterface"));
}
diff --git a/interfaces/ktexteditor/viewcursorinterface.cpp b/interfaces/ktexteditor/viewcursorinterface.cpp
index 0c834be4..dd718a7d 100644
--- a/interfaces/ktexteditor/viewcursorinterface.cpp
+++ b/interfaces/ktexteditor/viewcursorinterface.cpp
@@ -70,5 +70,5 @@ ViewCursorInterface *KTextEditor::viewCursorInterface (View *view)
if (!view)
return 0;
- return static_cast<ViewCursorInterface*>(view->qt_cast("KTextEditor::ViewCursorInterface"));
+ return static_cast<ViewCursorInterface*>(view->tqqt_cast("KTextEditor::ViewCursorInterface"));
}
diff --git a/interfaces/ktexteditor/viewstatusmsginterface.cpp b/interfaces/ktexteditor/viewstatusmsginterface.cpp
index ff0815c8..643e2e79 100644
--- a/interfaces/ktexteditor/viewstatusmsginterface.cpp
+++ b/interfaces/ktexteditor/viewstatusmsginterface.cpp
@@ -72,5 +72,5 @@ ViewStatusMsgInterface *KTextEditor::viewStatusMsgInterface (View *view)
if (!view)
return 0;
- return static_cast<ViewStatusMsgInterface*>(view->qt_cast("KTextEditor::ViewStatusMsgInterface"));
+ return static_cast<ViewStatusMsgInterface*>(view->tqqt_cast("KTextEditor::ViewStatusMsgInterface"));
}
diff --git a/interfaces/ktexteditor/wordwrapinterface.cpp b/interfaces/ktexteditor/wordwrapinterface.cpp
index 3afe5c23..ff6d1736 100644
--- a/interfaces/ktexteditor/wordwrapinterface.cpp
+++ b/interfaces/ktexteditor/wordwrapinterface.cpp
@@ -66,5 +66,5 @@ WordWrapInterface *KTextEditor::wordWrapInterface (Document *doc)
if (!doc)
return 0;
- return static_cast<WordWrapInterface*>(doc->qt_cast("KTextEditor::WordWrapInterface"));
+ return static_cast<WordWrapInterface*>(doc->tqqt_cast("KTextEditor::WordWrapInterface"));
}
diff --git a/interfaces/terminal/kde_terminal_interface.h b/interfaces/terminal/kde_terminal_interface.h
index 450d1e27..0e3acb22 100644
--- a/interfaces/terminal/kde_terminal_interface.h
+++ b/interfaces/terminal/kde_terminal_interface.h
@@ -60,7 +60,7 @@ class TQStrList;
* setCentralWidget( p->widget() );
*
* // cast the part to the TerminalInterface..
- * TerminalInterface* t = static_cast<TerminalInterface*>( p->qt_cast( "TerminalInterface" ) );
+ * TerminalInterface* t = static_cast<TerminalInterface*>( p->tqqt_cast( "TerminalInterface" ) );
* if( ! t )
* {
* // This probably happens because the konsole that is installed
diff --git a/interfaces/terminal/test/main.cc b/interfaces/terminal/test/main.cc
index be3f4165..905eedbb 100644
--- a/interfaces/terminal/test/main.cc
+++ b/interfaces/terminal/test/main.cc
@@ -20,7 +20,7 @@ Win::Win()
KParts::Part* p = static_cast<KParts::Part*>( factory->create( this, "tralala", "TQObject", "KParts::ReadOnlyPart" ) );
setCentralWidget( p->widget() );
- TerminalInterface* t = static_cast<TerminalInterface*>( p->qt_cast( "TerminalInterface" ) );
+ TerminalInterface* t = static_cast<TerminalInterface*>( p->tqqt_cast( "TerminalInterface" ) );
t->showShellInDir( TQDir::home().path() );
// TQStrList l;
// l.append( "python" );
@@ -46,11 +46,11 @@ int main( int argc, char** argv )
void Win::pythonExited()
{
std::cerr << "hee, " << p << std::endl;
- std::cerr << ( p->qt_cast( "TerminalInterface" ) ) << std::endl;
+ std::cerr << ( p->tqqt_cast( "TerminalInterface" ) ) << std::endl;
// KMessageBox::sorry( this, TQString::fromUtf8( "Exited, status was %1" ).arg( status ) );
disconnect(p, TQT_SIGNAL( processExited() ),
this, TQT_SLOT( pythonExited() ));
- TerminalInterface* t = static_cast<TerminalInterface*>( p->qt_cast( "TerminalInterface" ) );
+ TerminalInterface* t = static_cast<TerminalInterface*>( p->tqqt_cast( "TerminalInterface" ) );
TQStrList l;
l.append( "echo" );
l.append( "hello world" );
diff --git a/kab/addressbook.cc b/kab/addressbook.cc
index d5813237..9795c42a 100644
--- a/kab/addressbook.cc
+++ b/kab/addressbook.cc
@@ -139,7 +139,7 @@ KabKey::setKey(const TQCString& text)
// ###########################################################################
}
-QCString
+TQCString
KabKey::getKey() const
{
// ###########################################################################
@@ -1729,7 +1729,7 @@ AddressBook::makeEntryFromVCard(const TQString&, Entry&)
// ###########################################################################
}
-QString
+TQString
AddressBook::getStandardFileName()
{
// ###########################################################################
@@ -1814,7 +1814,7 @@ AddressBook::ErrorCode AddressBook::Entry::get(const char* fieldname, TQVariant&
}
if(fieldname==Fields[dummy++])
{ // the birthday
- field=birthday.toString();
+ field=TQString(birthday.toString());
return NoError;
}
if(fieldname==Fields[dummy++])
diff --git a/kab/addressbook.h b/kab/addressbook.h
index 5057c990..2e6656be 100644
--- a/kab/addressbook.h
+++ b/kab/addressbook.h
@@ -127,7 +127,7 @@ class CategoriesMap : public TQMap<int, TQString>
* keys). Of course, in different files a key might be used twice. <BR>
* The keys are objects of the type KabKey and define the section in the
* addressbook database where the entry is stored (see QConfigDB
- * reference). Keys invalidate on file changes, so keep track of the
+ * reference). Keys tqinvalidate on file changes, so keep track of the
* signal ::changed. <BR>
* kab watches file changes. If the opened file changes on disk, it is
* automatically reloaded and ::changed() is emitted.
@@ -180,7 +180,7 @@ class CategoriesMap : public TQMap<int, TQString>
* displayed as transparent KURLLabels that react when the user clicks on it.
* These interactive parts have to be enabled by calling setInteractiveMode().
*/
-class AddressBook : public QFrame
+class AddressBook : public TQFrame
{
// ############################################################################
Q_OBJECT
@@ -572,7 +572,7 @@ public:
ErrorCode createConfigFile();
ErrorCode loadConfigFile(); /**< Load the local configuration file. */
// ErrorCode configureKab(); /**< Open the configuration dialog for the KabAPI. */
- // TQSize sizeHint(); /**< The preferred (minimal) size of the view. */ // ni
+ // TQSize tqsizeHint(); /**< The preferred (minimal) size of the view. */ // ni
/**
* This method parses a vCard and creates an Entry object from it.
*/
diff --git a/kab/kabapi.cc b/kab/kabapi.cc
index 0cf97905..0910df18 100644
--- a/kab/kabapi.cc
+++ b/kab/kabapi.cc
@@ -72,9 +72,9 @@ int KabAPI::exec()
{
listbox->setCurrentItem(0);
}
- listbox->setMinimumSize(listbox->sizeHint());
+ listbox->setMinimumSize(listbox->tqsizeHint());
adjustSize();
- resize(minimumSize());
+ resize(tqminimumSize());
return KDialogBase::exec();
} else {
kdDebug(KAB_KDEBUG_AREA) << "KabAPI::exec: error creating interface."
diff --git a/kab/qconfigDB.cc b/kab/qconfigDB.cc
index a49388ff..a682a1ed 100644
--- a/kab/qconfigDB.cc
+++ b/kab/qconfigDB.cc
@@ -73,7 +73,7 @@ static void tokenize(list<TQCString>& res, const TQCString& text, char tr, bool
while(zwei!=-1)
{
teil="";
- zwei=text.find(tr, eins);
+ zwei=text.tqfind(tr, eins);
if(zwei!=-1)
{
teil=text.mid(eins, zwei-eins);
@@ -412,7 +412,7 @@ KeyValueMap::parseComplexString
return true;
}
-QCString
+TQCString
KeyValueMap::makeComplexString(const TQCString& orig)
{
register bool GUARD; GUARD=false;
@@ -573,7 +573,7 @@ KeyValueMap::insertLine(TQCString line, bool force, bool relax, bool encode)
return false;
}
// -----
- index=line.find('=');
+ index=line.tqfind('=');
if(index==-1) // not found
{
kdDebug() << "KeyValueMap::insertLine: no \"=\" found in \""<<line<<"\".\n";
@@ -1015,7 +1015,7 @@ KeyValueMap::get(const TQCString& key, list<TQCString>& values) const
second=first;
for(;;)
{
- second=raw.find('\\', second);
+ second=raw.tqfind('\\', second);
// ----- this may never be the last and also not the second last
// character in a complex string:
if(second!=-1)
@@ -1124,7 +1124,7 @@ KeyValueMap::get(const TQCString& key, TQStrList& values) const
second=first;
for(;;)
{
- second=raw.find('\\', second);
+ second=raw.tqfind('\\', second);
// ----- this may never be the last and also not the second last
// character in a complex string:
if(second!=-1)
@@ -1725,7 +1725,7 @@ Section::isEndOfSection(TQCString line)
// ###########################################################################
}
-QCString
+TQCString
Section::nameOfSection(const TQCString& line)
{
register bool GUARD; GUARD=false;
@@ -1975,7 +1975,7 @@ QConfigDB::stringToKeylist(const TQCString& desc)
}
for(;;)
{
- second=desc.find('/', first);
+ second=desc.tqfind('/', first);
if(second==-1)
{
if((unsigned)first<desc.length()+1)
@@ -2432,7 +2432,7 @@ QConfigDB::setFileName(const TQString& filename_, bool mustexist, bool readonly_
// ############################################################################
}
-QString
+TQString
QConfigDB::fileName()
{
// ############################################################################
diff --git a/kab/qconfigDB.h b/kab/qconfigDB.h
index bea32988..1da42292 100644
--- a/kab/qconfigDB.h
+++ b/kab/qconfigDB.h
@@ -548,7 +548,7 @@ public:
* See the code examples provided with the library for details.
*/
-class QConfigDB : public QWidget
+class QConfigDB : public TQWidget
{
// ############################################################################
Q_OBJECT
diff --git a/kabc/address.cpp b/kabc/address.cpp
index 0787bcc4..b653d168 100644
--- a/kabc/address.cpp
+++ b/kabc/address.cpp
@@ -399,7 +399,7 @@ bool Address::parseAddressTemplateSection( const TQString &tsection,
bool ret = false;
// first check for brackets that have to be evaluated first
- int fpos = result.find( KABC_FMTTAG_purgeempty, stpos );
+ int fpos = result.tqfind( KABC_FMTTAG_purgeempty, stpos );
while ( -1 != fpos ) {
int bpos1 = fpos + KABC_FMTTAG_purgeempty.length();
int bpos2;
@@ -430,7 +430,7 @@ bool Address::parseAddressTemplateSection( const TQString &tsection,
stpos = bpos1;
}
}
- fpos = result.find( KABC_FMTTAG_purgeempty, stpos );
+ fpos = result.tqfind( KABC_FMTTAG_purgeempty, stpos );
}
// after sorting out all purge tags, we just search'n'replace the rest,
@@ -438,7 +438,7 @@ bool Address::parseAddressTemplateSection( const TQString &tsection,
// The following macro needs TQString for R_FIELD
// It substitutes !_P_! for empty fields so conditional tags work later
#define REPLTAG(R_TAG,R_FIELD) \
- if ( result.find(R_TAG, false) != -1 ) { \
+ if ( result.tqfind(R_TAG, false) != -1 ) { \
TQString rpl = R_FIELD.isEmpty() ? TQString("!_P_!") : R_FIELD; \
result.replace( R_TAG, rpl ); \
if ( !R_FIELD.isEmpty() ) { \
@@ -461,7 +461,7 @@ bool Address::parseAddressTemplateSection( const TQString &tsection,
#undef REPLTAG
// conditional comma
- fpos = result.find( KABC_FMTTAG_condcomma, 0 );
+ fpos = result.tqfind( KABC_FMTTAG_condcomma, 0 );
while ( -1 != fpos ) {
TQString str1 = result.mid( fpos - 5, 5 );
TQString str2 = result.mid( fpos + 2, 5 );
@@ -470,10 +470,10 @@ bool Address::parseAddressTemplateSection( const TQString &tsection,
} else {
result.remove( fpos, 2 );
}
- fpos = result.find( KABC_FMTTAG_condcomma, fpos );
+ fpos = result.tqfind( KABC_FMTTAG_condcomma, fpos );
}
// conditional whitespace
- fpos = result.find( KABC_FMTTAG_condwhite, 0 );
+ fpos = result.tqfind( KABC_FMTTAG_condwhite, 0 );
while ( -1 != fpos ) {
TQString str1 = result.mid( fpos - 5, 5 );
TQString str2 = result.mid( fpos + 2, 5 );
@@ -482,7 +482,7 @@ bool Address::parseAddressTemplateSection( const TQString &tsection,
} else {
result.remove( fpos, 2 );
}
- fpos = result.find( KABC_FMTTAG_condwhite, fpos );
+ fpos = result.tqfind( KABC_FMTTAG_condwhite, fpos );
}
// remove purged:
@@ -521,7 +521,7 @@ TQString Address::countryToISO( const TQString &cname )
return it.data();
TQString mapfile = KGlobal::dirs()->findResource( "data",
- TQString::fromLatin1( "kabc/countrytransl.map" ) );
+ TQString::tqfromLatin1( "kabc/countrytransl.map" ) );
TQFile file( mapfile );
if ( file.open( IO_ReadOnly ) ) {
@@ -551,7 +551,7 @@ TQString Address::ISOtoCountry( const TQString &ISOname )
return TQString::null;
TQString mapfile = KGlobal::dirs()->findResource( "data",
- TQString::fromLatin1( "kabc/countrytransl.map" ) );
+ TQString::tqfromLatin1( "kabc/countrytransl.map" ) );
TQFile file( mapfile );
if ( file.open( IO_ReadOnly ) ) {
@@ -560,7 +560,7 @@ TQString Address::ISOtoCountry( const TQString &ISOname )
TQString strbuf = s.readLine();
int pos;
while ( !strbuf.isEmpty() ) {
- if ( (pos = strbuf.find( searchStr )) != -1 ) {
+ if ( (pos = strbuf.tqfind( searchStr )) != -1 ) {
file.close();
return i18n( strbuf.left( pos ).utf8() );
}
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index bf6d0d17..29bbd0f1 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -527,7 +527,7 @@ void AddressBook::insertAddressee( const Addressee &a )
Addressee addr( a );
if ( !fAddr.isEmpty() ) {
if ( fAddr != a )
- addr.setRevision( TQDateTime::currentDateTime() );
+ addr.setRevision( TQDateTime::tqcurrentDateTime() );
else {
if ( fAddr.resource() == 0 ) {
fAddr.setResource( resource );
diff --git a/kabc/addressbook.h b/kabc/addressbook.h
index 0da25b30..7b973be2 100644
--- a/kabc/addressbook.h
+++ b/kabc/addressbook.h
@@ -40,7 +40,7 @@ class Ticket;
This class provides access to a collection of address book entries.
*/
-class KABC_EXPORT AddressBook : public QObject
+class KABC_EXPORT AddressBook : public TQObject
{
Q_OBJECT
diff --git a/kabc/addresseedialog.cpp b/kabc/addresseedialog.cpp
index 82966417..fa15f431 100644
--- a/kabc/addresseedialog.cpp
+++ b/kabc/addresseedialog.cpp
@@ -152,7 +152,7 @@ void AddresseeDialog::selectItem( const TQString &str )
{
if ( str.isEmpty() ) return;
- TQListViewItem *item = mItemDict.find( str );
+ TQListViewItem *item = mItemDict.tqfind( str );
if ( item ) {
mAddresseeList->blockSignals( true );
mAddresseeList->setSelected( item, true );
@@ -174,7 +174,7 @@ void AddresseeDialog::addSelected( TQListViewItem *item )
Addressee a = addrItem->addressee();
- TQListViewItem *selectedItem = mSelectedDict.find( a.uid() );
+ TQListViewItem *selectedItem = mSelectedDict.tqfind( a.uid() );
if ( !selectedItem ) {
selectedItem = new AddresseeItem( mSelectedList, a );
mSelectedDict.insert( a.uid(), selectedItem );
diff --git a/kabc/addresseedialog.h b/kabc/addresseedialog.h
index 51dbc98b..ebb4bbfc 100644
--- a/kabc/addresseedialog.h
+++ b/kabc/addresseedialog.h
@@ -34,7 +34,7 @@ namespace KABC {
/**
@short Special ListViewItem, that is used by the AddresseeDialog.
*/
-class KABC_EXPORT AddresseeItem : public QListViewItem
+class KABC_EXPORT AddresseeItem : public TQListViewItem
{
public:
diff --git a/kabc/addresseehelper.cpp b/kabc/addresseehelper.cpp
index df4085a0..2ca4a1b1 100644
--- a/kabc/addresseehelper.cpp
+++ b/kabc/addresseehelper.cpp
@@ -38,7 +38,7 @@ AddresseeHelper *AddresseeHelper::self()
}
AddresseeHelper::AddresseeHelper()
- : TQObject( qApp ),
+ : TQObject( tqApp ),
DCOPObject( "KABC::AddresseeHelper" )
{
initSettings();
@@ -92,17 +92,17 @@ void AddresseeHelper::initSettings()
bool AddresseeHelper::containsTitle( const TQString& title ) const
{
- return mTitles.find( title ) != mTitles.end();
+ return mTitles.tqfind( title ) != mTitles.end();
}
bool AddresseeHelper::containsPrefix( const TQString& prefix ) const
{
- return mPrefixes.find( prefix ) != mPrefixes.end();
+ return mPrefixes.tqfind( prefix ) != mPrefixes.end();
}
bool AddresseeHelper::containsSuffix( const TQString& suffix ) const
{
- return mSuffixes.find( suffix ) != mSuffixes.end();
+ return mSuffixes.tqfind( suffix ) != mSuffixes.end();
}
bool AddresseeHelper::tradeAsFamilyName() const
diff --git a/kabc/addresseelist.cpp b/kabc/addresseelist.cpp
index cb944692..47324001 100644
--- a/kabc/addresseelist.cpp
+++ b/kabc/addresseelist.cpp
@@ -208,7 +208,7 @@ void AddresseeList::sortByTrait()
while( j1 != i2 ) {
if ( !mReverseSorting && Trait::lt( *j2, *j1 )
|| mReverseSorting && Trait::lt( *j1, *j2 ) ) {
- qSwap( *j1, *j2 );
+ tqSwap( *j1, *j2 );
}
++j1;
++j2;
diff --git a/kabc/addresslineedit.cpp b/kabc/addresslineedit.cpp
index b048d9f9..9fb2e423 100644
--- a/kabc/addresslineedit.cpp
+++ b/kabc/addresslineedit.cpp
@@ -219,13 +219,13 @@ void AddressLineEdit::insert(const TQString &t)
KURL u(newText);
newText = u.path();
}
- else if (newText.find(" at ") != -1)
+ else if (newText.tqfind(" at ") != -1)
{
// Anti-spam stuff
newText.replace( " at ", "@" );
newText.replace( " dot ", "." );
}
- else if (newText.find("(at)") != -1)
+ else if (newText.tqfind("(at)") != -1)
{
newText.replace( TQRegExp("\\s*\\(at\\)\\s*"), "@" );
}
@@ -343,7 +343,7 @@ void AddressLineEdit::doCompletion(bool ctrlT)
items += s_completion->substringCompletion( '<' + s );
uint beforeDollarCompletionCount = items.count();
- if( s.find( ' ' ) == -1 ) // one word, possibly given name
+ if( s.tqfind( ' ' ) == -1 ) // one word, possibly given name
items += s_completion->allMatches( "$$" + s );
if ( !items.isEmpty() )
@@ -355,7 +355,7 @@ void AddressLineEdit::doCompletion(bool ctrlT)
it != items.end();
++it )
{
- int pos = (*it).find( '$', 2 );
+ int pos = (*it).tqfind( '$', 2 );
if( pos < 0 ) // ???
continue;
(*it)=(*it).mid( pos + 1 );
@@ -373,7 +373,7 @@ void AddressLineEdit::doCompletion(bool ctrlT)
if (!autoSuggest)
{
- int index = items.first().find( s );
+ int index = items.first().tqfind( s );
TQString newText = prevAddr + items.first().mid( index );
//kdDebug() << "OLD TEXT: " << text() << endl;
//kdDebug() << "NEW TEXT: " << newText << endl;
@@ -437,11 +437,11 @@ void AddressLineEdit::loadAddresses()
void AddressLineEdit::addAddress( const TQString& adr )
{
s_completion->addItem( adr );
- int pos = adr.find( '<' );
+ int pos = adr.tqfind( '<' );
if( pos >= 0 )
{
++pos;
- int pos2 = adr.find( pos, '>' );
+ int pos2 = adr.tqfind( pos, '>' );
if( pos2 >= 0 )
s_completion->addItem( adr.mid( pos, pos2 - pos ));
}
@@ -484,8 +484,8 @@ void AddressLineEdit::slotLDAPSearchData( const TQStringList& adrs )
return;
for( TQStringList::ConstIterator it = adrs.begin(); it != adrs.end(); ++it ) {
TQString name(*it);
- int pos = name.find( " <" );
- int pos_comma = name.find( ',' );
+ int pos = name.tqfind( " <" );
+ int pos_comma = name.tqfind( ',' );
// put name in quotes, if we have a comma in the name
if (pos>0 && pos_comma>0 && pos_comma<pos) {
name.insert(pos, '\"');
@@ -577,18 +577,18 @@ TQStringList AddressLineEdit::addresses()
for ( mit = emails.begin(); mit != emails.end(); ++mit ) {
email = *mit;
if (!email.isEmpty()) {
- if (n.isEmpty() || (email.find( '<' ) != -1))
+ if (n.isEmpty() || (email.tqfind( '<' ) != -1))
addr = TQString::null;
else { /* do we really need quotes around this name ? */
- if (n.find(needQuotes) != -1)
+ if (n.tqfind(needQuotes) != -1)
addr = '"' + n + endQuote;
else
addr = n + space;
}
- if (!addr.isEmpty() && (email.find( '<' ) == -1)
- && (email.find( '>' ) == -1)
- && (email.find( ',' ) == -1))
+ if (!addr.isEmpty() && (email.tqfind( '<' ) == -1)
+ && (email.tqfind( '>' ) == -1)
+ && (email.tqfind( ',' ) == -1))
addr += '<' + email + '>';
else
addr += email;
diff --git a/kabc/agent.cpp b/kabc/agent.cpp
index d21fa299..571b7803 100644
--- a/kabc/agent.cpp
+++ b/kabc/agent.cpp
@@ -124,7 +124,7 @@ TQString Agent::asString() const
TQDataStream &KABC::operator<<( TQDataStream &s, const Agent &agent )
{
- Q_UINT32 hasAddressee = ( agent.mAddressee != 0 );
+ TQ_UINT32 hasAddressee = ( agent.mAddressee != 0 );
s << agent.mIntern << agent.mUrl << hasAddressee;
if ( hasAddressee )
@@ -135,7 +135,7 @@ TQDataStream &KABC::operator<<( TQDataStream &s, const Agent &agent )
TQDataStream &KABC::operator>>( TQDataStream &s, Agent &agent )
{
- Q_UINT32 hasAddressee;
+ TQ_UINT32 hasAddressee;
s >> agent.mIntern >> agent.mUrl >> hasAddressee;
diff --git a/kabc/distributionlist.cpp b/kabc/distributionlist.cpp
index ee2f2e30..1802cb0a 100644
--- a/kabc/distributionlist.cpp
+++ b/kabc/distributionlist.cpp
@@ -250,7 +250,7 @@ bool DistributionListManager::save()
value.append( (*it).email );
}
- if ( d->mMissingEntries.find( list->name() ) != d->mMissingEntries.end() ) {
+ if ( d->mMissingEntries.tqfind( list->name() ) != d->mMissingEntries.end() ) {
const MissingEntryList missList = d->mMissingEntries[ list->name() ];
MissingEntryList::ConstIterator missIt;
for ( missIt = missList.begin(); missIt != missList.end(); ++missIt ) {
@@ -270,7 +270,7 @@ bool DistributionListManager::save()
DistributionListWatcher* DistributionListWatcher::mSelf = 0;
DistributionListWatcher::DistributionListWatcher()
- : TQObject( qApp, "DistributionListWatcher" )
+ : TQObject( tqApp, "DistributionListWatcher" )
{
mDirWatch = new KDirWatch;
mDirWatch->addFile( locateLocal( "data", "kabc/distlists" ) );
@@ -287,7 +287,7 @@ DistributionListWatcher::~DistributionListWatcher()
DistributionListWatcher *DistributionListWatcher::self()
{
- kdWarning( !qApp ) << "No TQApplication object available, you'll get a memleak!" << endl;
+ kdWarning( !tqApp ) << "No TQApplication object available, you'll get a memleak!" << endl;
if ( !mSelf )
mSelf = new DistributionListWatcher();
diff --git a/kabc/distributionlist.h b/kabc/distributionlist.h
index 7ad8dff8..78d18246 100644
--- a/kabc/distributionlist.h
+++ b/kabc/distributionlist.h
@@ -186,7 +186,7 @@ class KABC_EXPORT DistributionListManager
\endcode
*/
-class KABC_EXPORT DistributionListWatcher : public QObject
+class KABC_EXPORT DistributionListWatcher : public TQObject
{
Q_OBJECT
diff --git a/kabc/distributionlistdialog.h b/kabc/distributionlistdialog.h
index f4cc143b..1bd6fc78 100644
--- a/kabc/distributionlistdialog.h
+++ b/kabc/distributionlistdialog.h
@@ -98,7 +98,7 @@ class KABC_EXPORT EmailSelector : public KDialogBase
/**
@short Helper class
*/
-class KABC_EXPORT DistributionListEditorWidget : public QWidget
+class KABC_EXPORT DistributionListEditorWidget : public TQWidget
{
Q_OBJECT
diff --git a/kabc/distributionlisteditor.h b/kabc/distributionlisteditor.h
index 310d8374..faec280e 100644
--- a/kabc/distributionlisteditor.h
+++ b/kabc/distributionlisteditor.h
@@ -51,7 +51,7 @@ class KABC_EXPORT EmailSelectDialog : public KDialogBase
/**
@obsolete
*/
-class DistributionListEditor : public QWidget
+class DistributionListEditor : public TQWidget
{
Q_OBJECT
public:
diff --git a/kabc/errorhandler.cpp b/kabc/errorhandler.cpp
index 55b0f459..d8ab650c 100644
--- a/kabc/errorhandler.cpp
+++ b/kabc/errorhandler.cpp
@@ -50,6 +50,6 @@ GuiErrorHandler::GuiErrorHandler( TQWidget *parent )
void GuiErrorHandler::error( const TQString &msg )
{
- if (qApp)
+ if (tqApp)
KMessageBox::error( mParent, msg );
}
diff --git a/kabc/formats/binaryformat.cpp b/kabc/formats/binaryformat.cpp
index d5e3cf49..d09be306 100644
--- a/kabc/formats/binaryformat.cpp
+++ b/kabc/formats/binaryformat.cpp
@@ -66,7 +66,7 @@ bool BinaryFormat::loadAll( AddressBook*, Resource *resource, TQFile *file )
if ( !checkHeader( stream ) )
return false;
- Q_UINT32 entries;
+ TQ_UINT32 entries;
stream >> entries;
@@ -89,7 +89,7 @@ void BinaryFormat::save( const Addressee &addressee, TQFile *file )
writeHeader( stream );
- Q_UINT32 entries = 1;
+ TQ_UINT32 entries = 1;
stream << entries;
saveAddressee( addressee, stream );
}
@@ -98,7 +98,7 @@ void BinaryFormat::saveAll( AddressBook*, Resource *resource, TQFile *file )
{
kdDebug(5700) << "BinaryFormat::saveAll()" << endl;
- Q_UINT32 counter = 0;
+ TQ_UINT32 counter = 0;
TQDataStream stream( file );
writeHeader( stream );
@@ -113,7 +113,7 @@ void BinaryFormat::saveAll( AddressBook*, Resource *resource, TQFile *file )
}
// set real number of entries
- stream.device()->at( 2 * sizeof( Q_UINT32 ) );
+ stream.device()->at( 2 * sizeof( TQ_UINT32 ) );
stream << counter;
}
@@ -128,7 +128,7 @@ bool BinaryFormat::checkFormat( TQFile *file ) const
bool BinaryFormat::checkHeader( TQDataStream &stream ) const
{
- Q_UINT32 magic, version;
+ TQ_UINT32 magic, version;
stream >> magic >> version;
@@ -154,7 +154,7 @@ bool BinaryFormat::checkHeader( TQDataStream &stream ) const
void BinaryFormat::writeHeader( TQDataStream &stream )
{
- Q_UINT32 magic, version;
+ TQ_UINT32 magic, version;
magic = 0x2e93e;
version = BINARY_FORMAT_VERSION;
diff --git a/kabc/kab2kabc.cpp b/kabc/kab2kabc.cpp
index 9d8ea75e..c83c29c3 100644
--- a/kabc/kab2kabc.cpp
+++ b/kabc/kab2kabc.cpp
@@ -180,7 +180,7 @@ void readKAddressBookEntries( const TQString &dataString, Addressee &a )
TQStringList::ConstIterator it;
for ( it = entries.begin(); it != entries.end(); ++it ) {
- int pos = (*it).find( "\n" );
+ int pos = (*it).tqfind( "\n" );
TQString fieldName = (*it).left( pos );
TQString fieldValue = (*it).mid( pos + 2 );
@@ -325,7 +325,7 @@ void importKab( KABC::AddressBook *ab, bool override, bool quiet )
TQStringList::ConstIterator customIt;
for ( customIt = entry.custom.begin(); customIt != entry.custom.end(); ++customIt ) {
if ( (*customIt).startsWith( "X-KABC-UID:" ) ) {
- a.setUid( (*customIt).mid( (*customIt).find( ":" ) + 1 ) );
+ a.setUid( (*customIt).mid( (*customIt).tqfind( ":" ) + 1 ) );
idFound = true;
} else if ( (*customIt).startsWith( "KMail:1.0\n" ) ) {
readKAddressBookEntries( *customIt, a );
diff --git a/kabc/ldapclient.cpp b/kabc/ldapclient.cpp
index 724f039e..4f60dfa7 100644
--- a/kabc/ldapclient.cpp
+++ b/kabc/ldapclient.cpp
@@ -50,7 +50,7 @@ public:
TQString LdapObject::toString() const
{
- TQString result = TQString::fromLatin1( "\ndn: %1\n" ).arg( dn );
+ TQString result = TQString::tqfromLatin1( "\ndn: %1\n" ).arg( dn );
for ( LdapAttrMap::ConstIterator it = attrs.begin(); it != attrs.end(); ++it ) {
TQString attr = it.key();
for ( LdapAttrValue::ConstIterator it2 = (*it).begin(); it2 != (*it).end(); ++it2 ) {
@@ -306,11 +306,11 @@ void LdapSearch::startSearch( const TQString& txt )
cancelSearch();
- int pos = txt.find( '\"' );
+ int pos = txt.tqfind( '\"' );
if( pos >= 0 )
{
++pos;
- int pos2 = txt.find( '\"', pos );
+ int pos2 = txt.tqfind( '\"', pos );
if( pos2 >= 0 )
mSearchText = txt.mid( pos , pos2 - pos );
else
diff --git a/kabc/ldapclient.h b/kabc/ldapclient.h
index b4ee9d74..2054b130 100644
--- a/kabc/ldapclient.h
+++ b/kabc/ldapclient.h
@@ -82,7 +82,7 @@ class KABC_EXPORT LdapObject
* We mean it!
*
*/
-class KABC_EXPORT LdapClient : public QObject
+class KABC_EXPORT LdapClient : public TQObject
{
Q_OBJECT
@@ -204,7 +204,7 @@ typedef TQValueList<LdapResult> LdapResultList;
* We mean it!
*
*/
-class KABC_EXPORT LdapSearch : public QObject
+class KABC_EXPORT LdapSearch : public TQObject
{
Q_OBJECT
diff --git a/kabc/ldapconfigwidget.cpp b/kabc/ldapconfigwidget.cpp
index a4b7fc57..671cac98 100644
--- a/kabc/ldapconfigwidget.cpp
+++ b/kabc/ldapconfigwidget.cpp
@@ -129,7 +129,7 @@ void LdapConfigWidget::initWidget()
if ( mFlags & W_PORT ) {
label = new TQLabel( i18n( "Port:" ), this );
mPort = new TQSpinBox( 0, 65535, 1, this, "kcfg_ldapport" );
- mPort->setSizePolicy( TQSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ) );
+ mPort->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ) );
mPort->setValue( 389 );
mainLayout->addWidget( label, row, col );
@@ -140,7 +140,7 @@ void LdapConfigWidget::initWidget()
if ( mFlags & W_VER ) {
label = new TQLabel( i18n( "LDAP version:" ), this );
mVer = new TQSpinBox( 2, 3, 1, this, "kcfg_ldapver" );
- mVer->setSizePolicy( TQSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ) );
+ mVer->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ) );
mVer->setValue( 3 );
mainLayout->addWidget( label, row, col );
mainLayout->addWidget( mVer, row, col+1 );
@@ -151,7 +151,7 @@ void LdapConfigWidget::initWidget()
if ( mFlags & W_SIZELIMIT ) {
label = new TQLabel( i18n( "Size limit:" ), this );
mSizeLimit = new TQSpinBox( 0, 9999999, 1, this, "kcfg_ldapsizelimit" );
- mSizeLimit->setSizePolicy( TQSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ) );
+ mSizeLimit->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ) );
mSizeLimit->setValue( 0 );
mSizeLimit->setSpecialValueText( i18n("Default") );
mainLayout->addWidget( label, row, col );
@@ -162,7 +162,7 @@ void LdapConfigWidget::initWidget()
if ( mFlags & W_TIMELIMIT ) {
label = new TQLabel( i18n( "Time limit:" ), this );
mTimeLimit = new TQSpinBox( 0, 9999999, 1, this, "kcfg_ldaptimelimit" );
- mTimeLimit->setSizePolicy( TQSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ) );
+ mTimeLimit->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ) );
mTimeLimit->setValue( 0 );
mTimeLimit->setSuffix( i18n(" sec") );
mTimeLimit->setSpecialValueText( i18n("Default") );
diff --git a/kabc/ldapconfigwidget.h b/kabc/ldapconfigwidget.h
index 9f383b40..aeba6572 100644
--- a/kabc/ldapconfigwidget.h
+++ b/kabc/ldapconfigwidget.h
@@ -47,7 +47,7 @@ namespace KABC {
It's KConfigXT compatible, using widget names starting with kcfg_
*/
- class KABC_EXPORT LdapConfigWidget : public QWidget
+ class KABC_EXPORT LdapConfigWidget : public TQWidget
{
Q_OBJECT
Q_PROPERTY( LCW_Flags flags READ flags WRITE setFlags )
diff --git a/kabc/ldapurl.cpp b/kabc/ldapurl.cpp
index 9032c16d..8315b1cf 100644
--- a/kabc/ldapurl.cpp
+++ b/kabc/ldapurl.cpp
@@ -65,7 +65,7 @@ LDAPUrl::Extension LDAPUrl::extension( const TQString &key ) const
{
TQMap<TQString, Extension>::const_iterator it;
- it = m_extensions.find( key );
+ it = m_extensions.tqfind( key );
if ( it != m_extensions.constEnd() )
return (*it);
else {
diff --git a/kabc/ldif.cpp b/kabc/ldif.cpp
index 19895fce..27cf16cf 100644
--- a/kabc/ldif.cpp
+++ b/kabc/ldif.cpp
@@ -112,7 +112,7 @@ bool LDIF::splitLine( const TQCString &line, TQString &fieldname, TQByteArray &v
// kdDebug(5700) << "splitLine line: " << TQString::fromUtf8(line) << endl;
- position = line.find( ":" );
+ position = line.tqfind( ":" );
if ( position == -1 ) {
// strange: we did not find a fieldname
fieldname = "";
diff --git a/kabc/ldifconverter.cpp b/kabc/ldifconverter.cpp
index 6f875cff..a05076db 100644
--- a/kabc/ldifconverter.cpp
+++ b/kabc/ldifconverter.cpp
@@ -175,7 +175,7 @@ bool LDIFConverter::LDIFToAddressee( const TQString &str, AddresseeList &addrLis
LDIF ldif;
LDIF::ParseVal ret;
const char *latinstr = str.latin1();
- int latinstrlen = qstrlen( latinstr );
+ int latinstrlen = tqstrlen( latinstr );
TQByteArray data;
Addressee a;
Address homeAddr, workAddr;
@@ -183,7 +183,7 @@ bool LDIFConverter::LDIFToAddressee( const TQString &str, AddresseeList &addrLis
data.setRawData( latinstr, latinstrlen );
ldif.setLDIF( data );
if (!dt.isValid())
- dt = TQDateTime::currentDateTime();
+ dt = TQDateTime::tqcurrentDateTime();
a.setRevision(dt);
homeAddr = Address( Address::Home );
workAddr = Address( Address::Work );
@@ -235,7 +235,7 @@ bool LDIFConverter::evaluatePair( Addressee &a, Address &homeAddr,
Address &workAddr,
TQString &fieldname, TQString &value )
{
- if ( fieldname == TQString::fromLatin1( "dn" ) ) // ignore & return false!
+ if ( fieldname == TQString::tqfromLatin1( "dn" ) ) // ignore & return false!
return false;
if ( fieldname.startsWith("#") ) {
@@ -249,56 +249,56 @@ bool LDIFConverter::evaluatePair( Addressee &a, Address &homeAddr,
return true;
}
- if ( fieldname == TQString::fromLatin1( "givenname" ) ) {
+ if ( fieldname == TQString::tqfromLatin1( "givenname" ) ) {
a.setGivenName( value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "xmozillanickname") ||
- fieldname == TQString::fromLatin1( "nickname") ) {
+ if ( fieldname == TQString::tqfromLatin1( "xmozillanickname") ||
+ fieldname == TQString::tqfromLatin1( "nickname") ) {
a.setNickName( value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "sn" ) ) {
+ if ( fieldname == TQString::tqfromLatin1( "sn" ) ) {
a.setFamilyName( value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "uid" ) ) {
+ if ( fieldname == TQString::tqfromLatin1( "uid" ) ) {
a.setUid( value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "mail" ) ||
- fieldname == TQString::fromLatin1( "mozillasecondemail" ) ) { // mozilla
+ if ( fieldname == TQString::tqfromLatin1( "mail" ) ||
+ fieldname == TQString::tqfromLatin1( "mozillasecondemail" ) ) { // mozilla
if ( a.emails().findIndex( value ) == -1 )
a.insertEmail( value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "title" ) ) {
+ if ( fieldname == TQString::tqfromLatin1( "title" ) ) {
a.setTitle( value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "vocation" ) ) {
+ if ( fieldname == TQString::tqfromLatin1( "vocation" ) ) {
a.setPrefix( value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "cn" ) ) {
+ if ( fieldname == TQString::tqfromLatin1( "cn" ) ) {
a.setFormattedName( value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "o" ) ||
- fieldname == TQString::fromLatin1( "organization" ) || // Exchange
- fieldname == TQString::fromLatin1( "organizationname" ) ) { // Exchange
+ if ( fieldname == TQString::tqfromLatin1( "o" ) ||
+ fieldname == TQString::tqfromLatin1( "organization" ) || // Exchange
+ fieldname == TQString::tqfromLatin1( "organizationname" ) ) { // Exchange
a.setOrganization( value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "description" ) ) {
+ if ( fieldname == TQString::tqfromLatin1( "description" ) ) {
addComment:
if ( !a.note().isEmpty() )
a.setNote( a.note() + "\n" );
@@ -306,15 +306,15 @@ addComment:
return true;
}
- if ( fieldname == TQString::fromLatin1( "custom1" ) ||
- fieldname == TQString::fromLatin1( "custom2" ) ||
- fieldname == TQString::fromLatin1( "custom3" ) ||
- fieldname == TQString::fromLatin1( "custom4" ) ) {
+ if ( fieldname == TQString::tqfromLatin1( "custom1" ) ||
+ fieldname == TQString::tqfromLatin1( "custom2" ) ||
+ fieldname == TQString::tqfromLatin1( "custom3" ) ||
+ fieldname == TQString::tqfromLatin1( "custom4" ) ) {
goto addComment;
}
- if ( fieldname == TQString::fromLatin1( "homeurl" ) ||
- fieldname == TQString::fromLatin1( "workurl" ) ) {
+ if ( fieldname == TQString::tqfromLatin1( "homeurl" ) ||
+ fieldname == TQString::tqfromLatin1( "workurl" ) ) {
if (a.url().isEmpty()) {
a.setUrl( KURL( value ) );
return true;
@@ -325,139 +325,139 @@ addComment:
// TODO: change this with KDE 4
}
- if ( fieldname == TQString::fromLatin1( "homephone" ) ) {
+ if ( fieldname == TQString::tqfromLatin1( "homephone" ) ) {
a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Home ) );
return true;
}
- if ( fieldname == TQString::fromLatin1( "telephonenumber" ) ) {
+ if ( fieldname == TQString::tqfromLatin1( "telephonenumber" ) ) {
a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Work ) );
return true;
}
- if ( fieldname == TQString::fromLatin1( "mobile" ) ) { // mozilla/Netscape 7
+ if ( fieldname == TQString::tqfromLatin1( "mobile" ) ) { // mozilla/Netscape 7
a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Cell ) );
return true;
}
- if ( fieldname == TQString::fromLatin1( "cellphone" ) ) {
+ if ( fieldname == TQString::tqfromLatin1( "cellphone" ) ) {
a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Cell ) );
return true;
}
- if ( fieldname == TQString::fromLatin1( "pager" ) || // mozilla
- fieldname == TQString::fromLatin1( "pagerphone" ) ) { // mozilla
+ if ( fieldname == TQString::tqfromLatin1( "pager" ) || // mozilla
+ fieldname == TQString::tqfromLatin1( "pagerphone" ) ) { // mozilla
a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Pager ) );
return true;
}
- if ( fieldname == TQString::fromLatin1( "facsimiletelephonenumber" ) ) {
+ if ( fieldname == TQString::tqfromLatin1( "facsimiletelephonenumber" ) ) {
a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Fax ) );
return true;
}
- if ( fieldname == TQString::fromLatin1( "xmozillaanyphone" ) ) { // mozilla
+ if ( fieldname == TQString::tqfromLatin1( "xmozillaanyphone" ) ) { // mozilla
a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Work ) );
return true;
}
- if ( fieldname == TQString::fromLatin1( "street" ) ||
- fieldname == TQString::fromLatin1( "streethomeaddress" ) ) {
+ if ( fieldname == TQString::tqfromLatin1( "street" ) ||
+ fieldname == TQString::tqfromLatin1( "streethomeaddress" ) ) {
homeAddr.setStreet( value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "postaladdress" ) ) { // mozilla
+ if ( fieldname == TQString::tqfromLatin1( "postaladdress" ) ) { // mozilla
workAddr.setStreet( value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "mozillapostaladdress2" ) ) { // mozilla
- workAddr.setStreet( workAddr.street() + TQString::fromLatin1( "\n" ) + value );
+ if ( fieldname == TQString::tqfromLatin1( "mozillapostaladdress2" ) ) { // mozilla
+ workAddr.setStreet( workAddr.street() + TQString::tqfromLatin1( "\n" ) + value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "postalcode" ) ) {
+ if ( fieldname == TQString::tqfromLatin1( "postalcode" ) ) {
workAddr.setPostalCode( value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "postofficebox" ) ) {
+ if ( fieldname == TQString::tqfromLatin1( "postofficebox" ) ) {
workAddr.setPostOfficeBox( value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "homepostaladdress" ) ) { // Netscape 7
+ if ( fieldname == TQString::tqfromLatin1( "homepostaladdress" ) ) { // Netscape 7
homeAddr.setStreet( value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "mozillahomepostaladdress2" ) ) { // mozilla
- homeAddr.setStreet( homeAddr.street() + TQString::fromLatin1( "\n" ) + value );
+ if ( fieldname == TQString::tqfromLatin1( "mozillahomepostaladdress2" ) ) { // mozilla
+ homeAddr.setStreet( homeAddr.street() + TQString::tqfromLatin1( "\n" ) + value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "mozillahomelocalityname" ) ) { // mozilla
+ if ( fieldname == TQString::tqfromLatin1( "mozillahomelocalityname" ) ) { // mozilla
homeAddr.setLocality( value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "mozillahomestate" ) ) { // mozilla
+ if ( fieldname == TQString::tqfromLatin1( "mozillahomestate" ) ) { // mozilla
homeAddr.setRegion( value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "mozillahomepostalcode" ) ) { // mozilla
+ if ( fieldname == TQString::tqfromLatin1( "mozillahomepostalcode" ) ) { // mozilla
homeAddr.setPostalCode( value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "mozillahomecountryname" ) ) { // mozilla
+ if ( fieldname == TQString::tqfromLatin1( "mozillahomecountryname" ) ) { // mozilla
if ( value.length() <= 2 )
value = Address::ISOtoCountry(value);
homeAddr.setCountry( value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "locality" ) ) {
+ if ( fieldname == TQString::tqfromLatin1( "locality" ) ) {
workAddr.setLocality( value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "streetaddress" ) ) { // Netscape 4.x
+ if ( fieldname == TQString::tqfromLatin1( "streetaddress" ) ) { // Netscape 4.x
workAddr.setStreet( value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "countryname" ) ||
- fieldname == TQString::fromLatin1( "c" ) ) { // mozilla
+ if ( fieldname == TQString::tqfromLatin1( "countryname" ) ||
+ fieldname == TQString::tqfromLatin1( "c" ) ) { // mozilla
if ( value.length() <= 2 )
value = Address::ISOtoCountry(value);
workAddr.setCountry( value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "l" ) ) { // mozilla
+ if ( fieldname == TQString::tqfromLatin1( "l" ) ) { // mozilla
workAddr.setLocality( value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "st" ) ) {
+ if ( fieldname == TQString::tqfromLatin1( "st" ) ) {
workAddr.setRegion( value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "ou" ) ) {
+ if ( fieldname == TQString::tqfromLatin1( "ou" ) ) {
a.setRole( value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "department" ) ) {
+ if ( fieldname == TQString::tqfromLatin1( "department" ) ) {
a.setDepartment( value );
return true;
}
- if ( fieldname == TQString::fromLatin1( "member" ) ) {
+ if ( fieldname == TQString::tqfromLatin1( "member" ) ) {
// this is a mozilla list member (cn=xxx, mail=yyy)
TQStringList list( TQStringList::split( ',', value ) );
TQString name, email;
@@ -476,8 +476,8 @@ addComment:
return true;
}
- if ( fieldname == TQString::fromLatin1( "modifytimestamp" ) ) {
- if (value == TQString::fromLatin1("0Z")) // ignore
+ if ( fieldname == TQString::tqfromLatin1( "modifytimestamp" ) ) {
+ if (value == TQString::tqfromLatin1("0Z")) // ignore
return true;
TQDateTime dt = VCardStringToDate( value );
if ( dt.isValid() ) {
@@ -486,7 +486,7 @@ addComment:
}
}
- if ( fieldname == TQString::fromLatin1( "objectclass" ) ) // ignore
+ if ( fieldname == TQString::tqfromLatin1( "objectclass" ) ) // ignore
return true;
kdWarning() << TQString("LDIFConverter: Unknown field for '%1': '%2=%3'\n")
@@ -528,7 +528,7 @@ TQString LDIFConverter::makeLDIFfieldString( TQString formatStr, TQString value,
return TQString();
// append format if not given
- if (formatStr.find(':') == -1)
+ if (formatStr.tqfind(':') == -1)
formatStr.append(": %1\n");
// check if base64-encoding is needed
@@ -543,12 +543,12 @@ TQString LDIFConverter::makeLDIFfieldString( TQString formatStr, TQString value,
}
if (printable) // always encode if we find special chars...
- printable = (value.find('\n') == -1);
+ printable = (value.tqfind('\n') == -1);
if (!printable && allowEncode) {
// encode to base64
value = KCodecs::base64Encode( value.utf8() );
- int p = formatStr.find(':');
+ int p = formatStr.tqfind(':');
if (p>=0)
formatStr.insert(p, ':');
}
diff --git a/kabc/ldifconverter.h b/kabc/ldifconverter.h
index a8052a65..a2225ad2 100644
--- a/kabc/ldifconverter.h
+++ b/kabc/ldifconverter.h
@@ -44,7 +44,7 @@ namespace KABC {
* @param dt The date & time value of the last modification (e.g. file modification time).
* @since 3.2
*/
- KABC_EXPORT bool LDIFToAddressee( const TQString &str, AddresseeList &addrList, TQDateTime dt = TQDateTime::currentDateTime() );
+ KABC_EXPORT bool LDIFToAddressee( const TQString &str, AddresseeList &addrList, TQDateTime dt = TQDateTime::tqcurrentDateTime() );
/**
* Converts a list of addressees to a LDIF string.
diff --git a/kabc/lock.h b/kabc/lock.h
index 95f5c87a..b682ea9e 100644
--- a/kabc/lock.h
+++ b/kabc/lock.h
@@ -32,7 +32,7 @@ namespace KABC {
This class provides locking functionality for a file, directory or an
arbitrary string-represented resource.
*/
-class KABC_EXPORT Lock : public QObject
+class KABC_EXPORT Lock : public TQObject
{
Q_OBJECT
public:
diff --git a/kabc/plugins/ldapkio/resourceldapkio.cpp b/kabc/plugins/ldapkio/resourceldapkio.cpp
index df0baf45..0a12ea34 100644
--- a/kabc/plugins/ldapkio/resourceldapkio.cpp
+++ b/kabc/plugins/ldapkio/resourceldapkio.cpp
@@ -125,7 +125,7 @@ void ResourceLDAPKIO::enter_loop()
TQWidget dummy(0,0,WType_Dialog | WShowModal);
dummy.setFocusPolicy( TQWidget::NoFocus );
qt_enter_modal(&dummy);
- qApp->enter_loop();
+ tqApp->enter_loop();
qt_leave_modal(&dummy);
}
@@ -154,7 +154,7 @@ void ResourceLDAPKIO::listResult( KIO::Job *job)
mErrorMsg = job->errorString();
else
mErrorMsg = "";
- qApp->exit_loop();
+ tqApp->exit_loop();
}
TQString ResourceLDAPKIO::findUid( const TQString &uid )
@@ -766,7 +766,7 @@ void ResourceLDAPKIO::syncLoadSaveResult( KIO::Job *job )
mErrorMsg = "";
activateCache();
- qApp->exit_loop();
+ tqApp->exit_loop();
}
void ResourceLDAPKIO::saveResult( KIO::Job *job )
diff --git a/kabc/plugins/sql/resourcesql.cpp b/kabc/plugins/sql/resourcesql.cpp
index 55f02bae..7dae03d2 100644
--- a/kabc/plugins/sql/resourcesql.cpp
+++ b/kabc/plugins/sql/resourcesql.cpp
@@ -317,8 +317,8 @@ bool ResourceSql::save( Ticket * )
TQStringList list = (*it).customs();
TQStringList::ConstIterator it;
for( it = list.begin(); it != list.end(); ++it ) {
- int dashPos = (*it).find( '-' );
- int colonPos = (*it).find( ':' );
+ int dashPos = (*it).tqfind( '-' );
+ int colonPos = (*it).tqfind( ':' );
TQString app = (*it).left( dashPos );
TQString name = (*it).mid( dashPos + 1, colonPos - dashPos - 1 );
TQString value = (*it).right( (*it).length() - colonPos - 1 );
diff --git a/kabc/plugins/sql/resourcesqlconfig.cpp b/kabc/plugins/sql/resourcesqlconfig.cpp
index ef1651cd..403f8a6d 100644
--- a/kabc/plugins/sql/resourcesqlconfig.cpp
+++ b/kabc/plugins/sql/resourcesqlconfig.cpp
@@ -60,7 +60,7 @@ ResourceSqlConfig::ResourceSqlConfig( TQWidget* parent, const char* name )
label = new TQLabel( i18n( "Port:" ), this );
TQVBox *box = new TQVBox(this);
mPort = new TQSpinBox(0, 65535, 1, box );
- mPort->setSizePolicy(TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred));
+ mPort->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred));
mPort->setValue(389);
new TQWidget(box, "dummy");
diff --git a/kabc/resource.cpp b/kabc/resource.cpp
index d43c6832..9807d53a 100644
--- a/kabc/resource.cpp
+++ b/kabc/resource.cpp
@@ -268,7 +268,7 @@ void Resource::removeAddressee( const Addressee &addr )
Addressee Resource::findByUid( const TQString &uid )
{
- Addressee::Map::ConstIterator it = mAddrMap.find( uid );
+ Addressee::Map::ConstIterator it = mAddrMap.tqfind( uid );
if ( it != mAddrMap.end() )
return it.data();
diff --git a/kabc/scripts/addressee.src.cpp b/kabc/scripts/addressee.src.cpp
index 36c449f1..11384e45 100644
--- a/kabc/scripts/addressee.src.cpp
+++ b/kabc/scripts/addressee.src.cpp
@@ -225,7 +225,7 @@ void Addressee::setNameFromString( const TQString &s )
TQString emptyStr = "";
AddresseeHelper *helper = AddresseeHelper::self();
- int i = str.find( ',' );
+ int i = str.tqfind( ',' );
if( i < 0 ) {
TQStringList parts = TQStringList::split( spaceStr, str );
int leftOffset = 0;
@@ -398,7 +398,7 @@ TQString Addressee::fullEmail( const TQString &email ) const
text = e;
else {
TQRegExp needQuotes( "[^ 0-9A-Za-z\\x0080-\\xFFFF]" );
- if ( realName().find( needQuotes ) != -1 ) {
+ if ( realName().tqfind( needQuotes ) != -1 ) {
TQString name = realName();
name.replace( "\"", "\\\"" );
text = "\"" + name + "\" <" + e + ">";
@@ -417,7 +417,7 @@ void Addressee::insertEmail( const TQString &email, bool preferred )
detach();
mData->empty = false;
- TQStringList::Iterator it = mData->emails.find( email );
+ TQStringList::Iterator it = mData->emails.tqfind( email );
if ( it != mData->emails.end() ) {
if ( !preferred || it == mData->emails.begin() ) return;
@@ -436,7 +436,7 @@ void Addressee::removeEmail( const TQString &email )
{
detach();
- TQStringList::Iterator it = mData->emails.find( email );
+ TQStringList::Iterator it = mData->emails.tqfind( email );
if ( it == mData->emails.end() ) return;
mData->emails.remove( it );
@@ -764,7 +764,7 @@ void Addressee::removeCategory( const TQString &c )
{
detach();
- TQStringList::Iterator it = mData->categories.find( c );
+ TQStringList::Iterator it = mData->categories.tqfind( c );
if ( it == mData->categories.end() ) return;
mData->categories.remove( it );
@@ -832,7 +832,7 @@ TQString Addressee::custom( const TQString &app, const TQString &name ) const
TQStringList::ConstIterator it;
for( it = mData->custom.constBegin(); it != mData->custom.constEnd(); ++it ) {
if ( (*it).startsWith( qualifiedName ) ) {
- value = (*it).mid( (*it).find( ":" ) + 1 );
+ value = (*it).mid( (*it).tqfind( ":" ) + 1 );
break;
}
}
@@ -1104,7 +1104,7 @@ bool listEquals( const TQValueList<L> &list, const TQValueList<L> &pattern )
return false;
for ( uint i = 0; i < list.count(); ++i )
- if ( pattern.find( list[ i ] ) == pattern.end() )
+ if ( pattern.tqfind( list[ i ] ) == pattern.end() )
return false;
return true;
@@ -1120,7 +1120,7 @@ bool emailsEquals( const TQStringList &list, const TQStringList &pattern )
TQStringList::ConstIterator it;
for ( it = list.begin(); it != list.end(); ++it )
- if ( pattern.find( *it ) == pattern.end() )
+ if ( pattern.tqfind( *it ) == pattern.end() )
return false;
return true;
diff --git a/kabc/tests/testldapclient.h b/kabc/tests/testldapclient.h
index ea1293b5..1995914c 100644
--- a/kabc/tests/testldapclient.h
+++ b/kabc/tests/testldapclient.h
@@ -24,7 +24,7 @@
#include "../ldapclient.h"
typedef KABC::LdapClient LdapClient;
-class TestLDAPClient : public QObject
+class TestLDAPClient : public TQObject
{
Q_OBJECT
diff --git a/kabc/tests/testlock.h b/kabc/tests/testlock.h
index 92244cd3..a94d4e8c 100644
--- a/kabc/tests/testlock.h
+++ b/kabc/tests/testlock.h
@@ -28,7 +28,7 @@
class TQLabel;
class TQListView;
-class KABC_EXPORT LockWidget : public QWidget
+class KABC_EXPORT LockWidget : public TQWidget
{
Q_OBJECT
public:
diff --git a/kabc/vcard/AdrParam.cpp b/kabc/vcard/AdrParam.cpp
index 5ad56f4f..89991255 100644
--- a/kabc/vcard/AdrParam.cpp
+++ b/kabc/vcard/AdrParam.cpp
@@ -80,7 +80,7 @@ AdrParam::operator == (AdrParam & x)
TQStrListIterator it(x.adrTypeList_);
for (; it.current(); ++it)
- if (!adrTypeList_.find(it.current()))
+ if (!adrTypeList_.tqfind(it.current()))
return false;
return true;
diff --git a/kabc/vcard/ContentLine.cpp b/kabc/vcard/ContentLine.cpp
index 52bcdf4f..31151be9 100644
--- a/kabc/vcard/ContentLine.cpp
+++ b/kabc/vcard/ContentLine.cpp
@@ -122,7 +122,7 @@ ContentLine::operator == (ContentLine & x)
TQPtrListIterator<Param> it(x.paramList());
- if (!paramList_.find(it.current()))
+ if (!paramList_.tqfind(it.current()))
return false;
return true;
@@ -142,7 +142,7 @@ ContentLine::_parse()
// Unqote newlines
strRep_ = strRep_.replace( TQRegExp( "\\\\n" ), "\n" );
- int split = strRep_.find(':');
+ int split = strRep_.tqfind(':');
if (split == -1) { // invalid content line
vDebug("No ':'");
@@ -152,7 +152,7 @@ ContentLine::_parse()
TQCString firstPart(strRep_.left(split));
TQCString valuePart(strRep_.mid(split + 1));
- split = firstPart.find('.');
+ split = firstPart.tqfind('.');
if (split != -1) {
group_ = firstPart.left(split);
@@ -193,7 +193,7 @@ ContentLine::_parse()
TQCString str = *it;
- split = str.find("=");
+ split = str.tqfind("=");
if (split < 0 ) {
vDebug("No '=' in parameter.");
continue;
diff --git a/kabc/vcard/DateValue.cpp b/kabc/vcard/DateValue.cpp
index aedfe5eb..0311ac2e 100644
--- a/kabc/vcard/DateValue.cpp
+++ b/kabc/vcard/DateValue.cpp
@@ -152,7 +152,7 @@ DateValue::_parse()
// time = time-hour [":"] time-minute [":"] time-second [":"]
// [time-secfrac] [time-zone]
- int timeSep = strRep_.find('T');
+ int timeSep = strRep_.tqfind('T');
TQCString dateStr;
TQCString timeStr;
@@ -192,7 +192,7 @@ DateValue::_parse()
/////////////////////////////////////////////////////////////// ZONE
- int zoneSep = timeStr.find('Z');
+ int zoneSep = timeStr.tqfind('Z');
if (zoneSep != -1 && timeStr.length() - zoneSep > 3) {
diff --git a/kabc/vcard/GeoValue.cpp b/kabc/vcard/GeoValue.cpp
index 2bac28c1..3021bbdb 100644
--- a/kabc/vcard/GeoValue.cpp
+++ b/kabc/vcard/GeoValue.cpp
@@ -84,7 +84,7 @@ GeoValue::clone()
void
GeoValue::_parse()
{
- int semiColon = strRep_.find( ";" );
+ int semiColon = strRep_.tqfind( ";" );
if ( semiColon == -1 ) // invalid
return;
diff --git a/kabc/vcard/RToken.cpp b/kabc/vcard/RToken.cpp
index b0e251a8..582a9e1c 100644
--- a/kabc/vcard/RToken.cpp
+++ b/kabc/vcard/RToken.cpp
@@ -30,7 +30,7 @@
namespace VCARD
{
- Q_UINT32
+ TQ_UINT32
RTokenise(const char * str, const char * delim, TQStrList & l)
{
// FIXME no stderr !
diff --git a/kabc/vcard/SourceParam.cpp b/kabc/vcard/SourceParam.cpp
index d66d8749..7041acd9 100644
--- a/kabc/vcard/SourceParam.cpp
+++ b/kabc/vcard/SourceParam.cpp
@@ -80,7 +80,7 @@ SourceParam::~SourceParam()
void
SourceParam::_parse()
{
- int i = strRep_.find('=');
+ int i = strRep_.tqfind('=');
if (i == -1) // Invalid
return;
diff --git a/kabc/vcard/URIValue.cpp b/kabc/vcard/URIValue.cpp
index 98f75cb8..ea598c5f 100644
--- a/kabc/vcard/URIValue.cpp
+++ b/kabc/vcard/URIValue.cpp
@@ -89,7 +89,7 @@ URIValue::~URIValue()
void
URIValue::_parse()
{
- int split = strRep_.find(':');
+ int split = strRep_.tqfind(':');
if (split == -1)
return;
diff --git a/kabc/vcard/UTCValue.cpp b/kabc/vcard/UTCValue.cpp
index 30473661..445af4fd 100644
--- a/kabc/vcard/UTCValue.cpp
+++ b/kabc/vcard/UTCValue.cpp
@@ -93,7 +93,7 @@ UTCValue::_parse()
positive_ = ( strRep_[0] == '+' );
- int colon = strRep_.find( ':' );
+ int colon = strRep_.tqfind( ':' );
if ( colon == -1 ) // Not valid.
return;
diff --git a/kabc/vcard/VCard.cpp b/kabc/vcard/VCard.cpp
index 50c25da5..c63e978d 100644
--- a/kabc/vcard/VCard.cpp
+++ b/kabc/vcard/VCard.cpp
@@ -113,7 +113,7 @@ VCard::_parse()
///////////////////////////////////////////////////////////////
// FIRST LINE
- int split = beginLine.find(':');
+ int split = beginLine.tqfind(':');
if (split == -1) { // invalid, no BEGIN
vDebug("No split");
@@ -123,7 +123,7 @@ VCard::_parse()
TQCString firstPart(beginLine.left(split));
TQCString valuePart(beginLine.mid(split + 1));
- split = firstPart.find('.');
+ split = firstPart.tqfind('.');
if (split != -1) {
group_ = firstPart.left(split);
@@ -188,7 +188,7 @@ VCard::_parse()
///////////////////////////////////////////////////////////////
// LAST LINE
- split = endLine.find(':');
+ split = endLine.tqfind(':');
if (split == -1) // invalid, no END
return;
@@ -196,7 +196,7 @@ VCard::_parse()
firstPart = endLine.left(split);
valuePart = endLine.right(firstPart.length() - split - 1);
- split = firstPart.find('.');
+ split = firstPart.tqfind('.');
if (split != -1) {
group_ = firstPart.left(split);
diff --git a/kabc/vcard/VCardEntity.cpp b/kabc/vcard/VCardEntity.cpp
index 1f8cea5b..4c987bff 100644
--- a/kabc/vcard/VCardEntity.cpp
+++ b/kabc/vcard/VCardEntity.cpp
@@ -76,11 +76,11 @@ VCardEntity::_parse()
vDebug("parse");
TQCString s(strRep_);
- int i = s.find(TQRegExp("BEGIN:VCARD", false));
+ int i = s.tqfind(TQRegExp("BEGIN:VCARD", false));
while (i != -1) {
- i = s.find(TQRegExp("BEGIN:VCARD", false), 11);
+ i = s.tqfind(TQRegExp("BEGIN:VCARD", false), 11);
TQCString cardStr(s.left(i));
diff --git a/kabc/vcard/include/VCardRToken.h b/kabc/vcard/include/VCardRToken.h
index 0ea38026..5122ef55 100644
--- a/kabc/vcard/include/VCardRToken.h
+++ b/kabc/vcard/include/VCardRToken.h
@@ -32,7 +32,7 @@
namespace VCARD
{
-KVCARD_EXPORT Q_UINT32 RTokenise(const char * str, const char * delim, TQStrList & l);
+KVCARD_EXPORT TQ_UINT32 RTokenise(const char * str, const char * delim, TQStrList & l);
}
diff --git a/kabc/vcard21parser.cpp b/kabc/vcard21parser.cpp
index d7354539..94ad3b72 100644
--- a/kabc/vcard21parser.cpp
+++ b/kabc/vcard21parser.cpp
@@ -430,7 +430,7 @@ VCard21ParserImpl *VCard21ParserImpl::parseVCard( const TQString& vc, int *err )
}
// split into two tokens
- int colon = (*j).find( ':' );
+ int colon = (*j).tqfind( ':' );
if ( colon < 0 ) {
_err = VC_ERR_INVALID_LINE;
break;
diff --git a/kabc/vcardformatimpl.cpp b/kabc/vcardformatimpl.cpp
index 38d95294..ae70c434 100644
--- a/kabc/vcardformatimpl.cpp
+++ b/kabc/vcardformatimpl.cpp
@@ -123,7 +123,7 @@ bool VCardFormatImpl::loadAddressee( Addressee& addressee, VCARD::VCard &v )
TQCString n = cl->name();
if ( n.left( 2 ) == "X-" ) {
n = n.mid( 2 );
- int posDash = n.find( "-" );
+ int posDash = n.tqfind( "-" );
addressee.insertCustom( TQString::fromUtf8( n.left( posDash ) ),
TQString::fromUtf8( n.mid( posDash + 1 ) ),
TQString::fromUtf8( cl->value()->asString() ) );
@@ -351,8 +351,8 @@ void VCardFormatImpl::addCustomValue( VCARD::VCard *v, const TQString &txt )
if ( txt.isEmpty() ) return;
ContentLine cl;
- cl.setName( "X-" + txt.left( txt.find( ":" ) ).utf8() );
- TQString value = txt.mid( txt.find( ":" ) + 1 );
+ cl.setName( "X-" + txt.left( txt.tqfind( ":" ) ).utf8() );
+ TQString value = txt.mid( txt.tqfind( ":" ) + 1 );
if ( value.isEmpty() )
return;
cl.setValue( new TextValue( value.utf8() ) );
diff --git a/kabc/vcardparser/testwrite.cpp b/kabc/vcardparser/testwrite.cpp
index f6e894f4..f24f1ad2 100644
--- a/kabc/vcardparser/testwrite.cpp
+++ b/kabc/vcardparser/testwrite.cpp
@@ -60,7 +60,7 @@ int main( int argc, char **argv )
addressee.setOrganization( "KDE" );
addressee.setNote( "nerver\ntouch a running system" );
addressee.setProductId( "testId" );
- addressee.setRevision( TQDateTime::currentDateTime() );
+ addressee.setRevision( TQDateTime::tqcurrentDateTime() );
addressee.setSortString( "koenig" );
addressee.setUrl( KURL( "http://wgess16.dyndns.org") );
addressee.setSecrecy( KABC::Secrecy( KABC::Secrecy::Confidential ) );
diff --git a/kabc/vcardparser/vcard.cpp b/kabc/vcardparser/vcard.cpp
index 30a8e1c4..8b6c9570 100644
--- a/kabc/vcardparser/vcard.cpp
+++ b/kabc/vcardparser/vcard.cpp
@@ -62,7 +62,7 @@ void VCard::addLine( const VCardLine& line )
VCardLine::List VCard::lines( const TQString& identifier ) const
{
- LineMap::ConstIterator it = mLineMap.find( identifier );
+ LineMap::ConstIterator it = mLineMap.tqfind( identifier );
if ( it == mLineMap.end() )
return VCardLine::List();
@@ -71,7 +71,7 @@ VCardLine::List VCard::lines( const TQString& identifier ) const
VCardLine VCard::line( const TQString& identifier ) const
{
- LineMap::ConstIterator it = mLineMap.find( identifier );
+ LineMap::ConstIterator it = mLineMap.tqfind( identifier );
if ( it == mLineMap.end() )
return VCardLine();
@@ -97,7 +97,7 @@ void VCard::setVersion( Version version )
VCard::Version VCard::version() const
{
- LineMap::ConstIterator versionEntry = mLineMap.find( "VERSION" );
+ LineMap::ConstIterator versionEntry = mLineMap.tqfind( "VERSION" );
if ( versionEntry == mLineMap.end() )
return v3_0;
diff --git a/kabc/vcardparser/vcardline.cpp b/kabc/vcardparser/vcardline.cpp
index 6680cf7d..dc43056c 100644
--- a/kabc/vcardparser/vcardline.cpp
+++ b/kabc/vcardparser/vcardline.cpp
@@ -130,7 +130,7 @@ void VCardLine::addParameter( const TQString& param, const TQString& value )
TQStringList VCardLine::parameters( const TQString& param ) const
{
- ParamMap::ConstIterator it = mParamMap.find( param );
+ ParamMap::ConstIterator it = mParamMap.tqfind( param );
if ( it == mParamMap.end() )
return TQStringList();
else
@@ -139,7 +139,7 @@ TQStringList VCardLine::parameters( const TQString& param ) const
TQString VCardLine::parameter( const TQString& param ) const
{
- ParamMap::ConstIterator it = mParamMap.find( param );
+ ParamMap::ConstIterator it = mParamMap.tqfind( param );
if ( it == mParamMap.end() )
return TQString::null;
else {
diff --git a/kabc/vcardparser/vcardparser.cpp b/kabc/vcardparser/vcardparser.cpp
index 67b1bc30..5fe6b315 100644
--- a/kabc/vcardparser/vcardparser.cpp
+++ b/kabc/vcardparser/vcardparser.cpp
@@ -81,7 +81,7 @@ VCard::List VCardParser::parseVCards( const TQString& text )
continue;
} else {
if ( inVCard && !currentLine.isEmpty() ) { // now parse the line
- int colon = currentLine.find( ':' );
+ int colon = currentLine.tqfind( ':' );
if ( colon == -1 ) { // invalid line
currentLine = (*it);
continue;
@@ -94,7 +94,7 @@ VCard::List VCardParser::parseVCards( const TQString& text )
TQStringList params = TQStringList::split( ';', key );
// check for group
- if ( params[0].find( '.' ) != -1 ) {
+ if ( params[0].tqfind( '.' ) != -1 ) {
const TQStringList groupList = TQStringList::split( '.', params[0] );
vCardLine.setGroup( groupList[0] );
vCardLine.setIdentifier( groupList[1] );
@@ -118,7 +118,7 @@ VCard::List VCardParser::parseVCards( const TQString& text )
}
}
// This is pretty much a faster pair[1].contains( ',' )...
- if ( pair[1].find( ',' ) != -1 ) { // parameter in type=x,y,z format
+ if ( pair[1].tqfind( ',' ) != -1 ) { // parameter in type=x,y,z format
const TQStringList args = TQStringList::split( ',', pair[ 1 ] );
TQStringList::ConstIterator argIt;
for ( argIt = args.begin(); argIt != args.end(); ++argIt )
diff --git a/kabc/vcardtool.cpp b/kabc/vcardtool.cpp
index 6e8dc9ac..4e08915d 100644
--- a/kabc/vcardtool.cpp
+++ b/kabc/vcardtool.cpp
@@ -335,8 +335,8 @@ TQString VCardTool::createVCards( Addressee::List list, VCard::Version version )
// X-
const TQStringList customs = (*addrIt).customs();
for ( strIt = customs.begin(); strIt != customs.end(); ++strIt ) {
- TQString identifier = "X-" + (*strIt).left( (*strIt).find( ":" ) );
- TQString value = (*strIt).mid( (*strIt).find( ":" ) + 1 );
+ TQString identifier = "X-" + (*strIt).left( (*strIt).tqfind( ":" ) );
+ TQString value = (*strIt).mid( (*strIt).tqfind( ":" ) + 1 );
if ( value.isEmpty() )
continue;
@@ -594,7 +594,7 @@ Addressee::List VCardTool::parseVCards( const TQString& vcard )
// X-
else if ( identifier.startsWith( "x-" ) ) {
const TQString key = (*lineIt).identifier().mid( 2 );
- int dash = key.find( "-" );
+ int dash = key.tqfind( "-" );
addr.insertCustom( key.left( dash ), key.mid( dash + 1 ), (*lineIt).value().asString() );
}
}
@@ -610,11 +610,11 @@ TQDateTime VCardTool::parseDateTime( const TQString &str )
{
TQDateTime dateTime;
- if ( str.find( '-' ) == -1 ) { // is base format (yyyymmdd)
+ if ( str.tqfind( '-' ) == -1 ) { // is base format (yyyymmdd)
dateTime.setDate( TQDate( str.left( 4 ).toInt(), str.mid( 4, 2 ).toInt(),
str.mid( 6, 2 ).toInt() ) );
- if ( str.find( 'T' ) ) // has time information yyyymmddThh:mm:ss
+ if ( str.tqfind( 'T' ) ) // has time information yyyymmddThh:mm:ss
dateTime.setTime( TQTime( str.mid( 11, 2 ).toInt(), str.mid( 14, 2 ).toInt(),
str.mid( 17, 2 ).toInt() ) );
@@ -622,7 +622,7 @@ TQDateTime VCardTool::parseDateTime( const TQString &str )
dateTime.setDate( TQDate( str.left( 4 ).toInt(), str.mid( 5, 2 ).toInt(),
str.mid( 8, 2 ).toInt() ) );
- if ( str.find( 'T' ) ) // has time information yyyy-mm-ddThh:mm:ss
+ if ( str.tqfind( 'T' ) ) // has time information yyyy-mm-ddThh:mm:ss
dateTime.setTime( TQTime( str.mid( 11, 2 ).toInt(), str.mid( 14, 2 ).toInt(),
str.mid( 17, 2 ).toInt() ) );
}
@@ -866,7 +866,7 @@ TQStringList VCardTool::splitString( const TQChar &sep, const TQString &str )
TQString value( str );
int start = 0;
- int pos = value.find( sep, start );
+ int pos = value.tqfind( sep, start );
while ( pos != -1 ) {
if ( value[ pos - 1 ] != '\\' ) {
@@ -876,13 +876,13 @@ TQStringList VCardTool::splitString( const TQChar &sep, const TQString &str )
list << TQString::null;
start = pos + 1;
- pos = value.find( sep, start );
+ pos = value.tqfind( sep, start );
} else {
if ( pos != 0 ) {
value.replace( pos - 1, 2, sep );
- pos = value.find( sep, pos );
+ pos = value.tqfind( sep, pos );
} else
- pos = value.find( sep, pos + 1 );
+ pos = value.tqfind( sep, pos + 1 );
}
}
diff --git a/kate/interfaces/interfaces.cpp b/kate/interfaces/interfaces.cpp
index ad20959b..59abc37c 100644
--- a/kate/interfaces/interfaces.cpp
+++ b/kate/interfaces/interfaces.cpp
@@ -100,7 +100,7 @@ Document *document (KTextEditor::Document *doc)
if (!doc)
return 0;
- return static_cast<Document*>(doc->qt_cast("Kate::Document"));
+ return static_cast<Document*>(doc->tqqt_cast("Kate::Document"));
}
DocumentExt *documentExt (KTextEditor::Document *doc)
@@ -108,7 +108,7 @@ DocumentExt *documentExt (KTextEditor::Document *doc)
if (!doc)
return 0;
- return static_cast<DocumentExt*>(doc->qt_cast("Kate::DocumentExt"));
+ return static_cast<DocumentExt*>(doc->tqqt_cast("Kate::DocumentExt"));
}
Document *createDocument ( TQObject *parent, const char *name )
@@ -121,7 +121,7 @@ View *view (KTextEditor::View *view)
if (!view)
return 0;
- return static_cast<View*>(view->qt_cast("Kate::View"));
+ return static_cast<View*>(view->tqqt_cast("Kate::View"));
}
}
diff --git a/kate/part/katearbitraryhighlight.h b/kate/part/katearbitraryhighlight.h
index 4dd5a362..10086ec7 100644
--- a/kate/part/katearbitraryhighlight.h
+++ b/kate/part/katearbitraryhighlight.h
@@ -57,7 +57,7 @@ public:
* - identical highlight for whole list
* - signals for view movement
*/
-class KateArbitraryHighlight : public QObject
+class KateArbitraryHighlight : public TQObject
{
Q_OBJECT
diff --git a/kate/part/kateautoindent.cpp b/kate/part/kateautoindent.cpp
index ed9a6169..aed42bba 100644
--- a/kate/part/kateautoindent.cpp
+++ b/kate/part/kateautoindent.cpp
@@ -224,55 +224,55 @@ void KateNormalIndent::updateConfig ()
for (uint i=0; i<items.count(); i++)
{
TQString name = items.at(i)->name;
- if (name.find("Comment") != -1 && commentAttrib == 255)
+ if (name.tqfind("Comment") != -1 && commentAttrib == 255)
{
commentAttrib = i;
}
- else if (name.find("Region Marker") != -1 && regionAttrib == 255)
+ else if (name.tqfind("Region Marker") != -1 && regionAttrib == 255)
{
regionAttrib = i;
}
- else if (name.find("Symbol") != -1 && symbolAttrib == 255)
+ else if (name.tqfind("Symbol") != -1 && symbolAttrib == 255)
{
symbolAttrib = i;
}
- else if (name.find("Alert") != -1)
+ else if (name.tqfind("Alert") != -1)
{
alertAttrib = i;
}
- else if (name.find("Comment") != -1 && commentAttrib != 255 && doxyCommentAttrib == 255)
+ else if (name.tqfind("Comment") != -1 && commentAttrib != 255 && doxyCommentAttrib == 255)
{
doxyCommentAttrib = i;
}
- else if (name.find("Tags") != -1 && tagAttrib == 255)
+ else if (name.tqfind("Tags") != -1 && tagAttrib == 255)
{
tagAttrib = i;
}
- else if (name.find("Word") != -1 && wordAttrib == 255)
+ else if (name.tqfind("Word") != -1 && wordAttrib == 255)
{
wordAttrib = i;
}
- else if (name.find("Keyword") != -1 && keywordAttrib == 255)
+ else if (name.tqfind("Keyword") != -1 && keywordAttrib == 255)
{
keywordAttrib = i;
}
- else if (name.find("Normal") != -1 && normalAttrib == 255)
+ else if (name.tqfind("Normal") != -1 && normalAttrib == 255)
{
normalAttrib = i;
}
- else if (name.find("Extensions") != -1 && extensionAttrib == 255)
+ else if (name.tqfind("Extensions") != -1 && extensionAttrib == 255)
{
extensionAttrib = i;
}
- else if (name.find("Preprocessor") != -1 && preprocessorAttrib == 255)
+ else if (name.tqfind("Preprocessor") != -1 && preprocessorAttrib == 255)
{
preprocessorAttrib = i;
}
- else if (name.find("String") != -1 && stringAttrib == 255)
+ else if (name.tqfind("String") != -1 && stringAttrib == 255)
{
stringAttrib = i;
}
- else if (name.find("Char") != -1 && charAttrib == 255)
+ else if (name.tqfind("Char") != -1 && charAttrib == 255)
{
charAttrib = i;
}
@@ -583,7 +583,7 @@ bool KateCSmartIndent::handleDoxygen (KateDocCursor &begin)
if (last <= 0 || !(justAfterDoxygen = textLine->stringAtPos(last-1, "*/")))
insideDoxygen = true;
if (justAfterDoxygen)
- justAfterDoxygen &= textLine->string().find("/**") < 0;
+ justAfterDoxygen &= textLine->string().tqfind("/**") < 0;
while (textLine->attribute(first) != doxyCommentAttrib && first <= textLine->lastChar())
first++;
if (textLine->stringAtPos(first, "//"))
@@ -700,7 +700,7 @@ static inline bool colonPermitsReindent(const KateNormalIndent &indenter,
{
const TQString txt = line->string(0,curCol);
// do we have any significant preceding colon?
- for (int pos = 0; (pos = txt.find(':', pos)) >= 0; pos++) {
+ for (int pos = 0; (pos = txt.tqfind(':', pos)) >= 0; pos++) {
if (line->attribute(pos) == indenter.symbolAttrib)
// yes, it has already contributed to this line's indentation, don't
// indent again
@@ -722,7 +722,7 @@ void KateCSmartIndent::processChar(TQChar c)
static const TQString triggers("}{)/:#n");
static const TQString firstTriggers("}{)/:#");
static const TQString lastTriggers(":n");
- if (triggers.find(c) < 0)
+ if (triggers.tqfind(c) < 0)
return;
KateView *view = doc->activeView();
@@ -748,7 +748,7 @@ void KateCSmartIndent::processChar(TQChar c)
if (c == 'n')
{
- if (firstChar != '#' || textLine->string(curCol-5, 5) != TQString::fromLatin1("regio"))
+ if (firstChar != '#' || textLine->string(curCol-5, 5) != TQString::tqfromLatin1("regio"))
return;
}
@@ -775,8 +775,8 @@ void KateCSmartIndent::processChar(TQChar c)
// of the line
const TQChar lastChar = textLine->getChar(textLine->lastChar());
int pos;
- if (((c == firstChar && firstTriggers.find(firstChar) >= 0)
- || (c == lastChar && lastTriggers.find(lastChar) >= 0))
+ if (((c == firstChar && firstTriggers.tqfind(firstChar) >= 0)
+ || (c == lastChar && lastTriggers.tqfind(lastChar) >= 0))
&& (c != ':' || colonPermitsReindent(*this, textLine, curCol)))
processLine(begin);
}
@@ -1176,7 +1176,7 @@ uint KateCSmartIndent::findOpeningComment(KateDocCursor &start)
{
KateTextLine::Ptr textLine = doc->plainKateTextLine(cur.line());
- int pos = textLine->string().find("/*", false);
+ int pos = textLine->string().tqfind("/*", false);
if (pos >= 0)
{
KateDocCursor temp(cur.line(), pos, doc);
@@ -1359,7 +1359,7 @@ void KateXmlIndent::processChar (TQChar c)
// only alter lines that start with a close element
KateView *view = doc->activeView();
TQString text = doc->plainKateTextLine(view->cursorLine())->string();
- if(text.find(startsWithCloseTag) == -1) return;
+ if(text.tqfind(startsWithCloseTag) == -1) return;
// process it
processLine(view->cursorLine());
@@ -1404,14 +1404,14 @@ void KateXmlIndent::getLineInfo (uint line, uint &prevIndent, int &numTags,
// <a>
// </a> <!-- indentation *already* decreased -->
// requires that we discount the </a> from the number of closed tags
- if(text.find(startsWithCloseTag) != -1) ++numTags;
+ if(text.tqfind(startsWithCloseTag) != -1) ++numTags;
// count the number of open and close tags
int lastCh = 0;
uint pos, len = text.length();
bool seenOpen = false;
for(pos = 0; pos < len; ++pos) {
- int ch = text.at(pos).unicode();
+ int ch = text.at(pos).tqunicode();
switch(ch) {
case '<':
seenOpen = true;
@@ -1445,10 +1445,10 @@ void KateXmlIndent::getLineInfo (uint line, uint &prevIndent, int &numTags,
for(uint backLine = line; backLine; ) {
// find first line with an open tag
KateTextLine::Ptr x = doc->plainKateTextLine(--backLine);
- if(x->string().find('<') == -1) continue;
+ if(x->string().tqfind('<') == -1) continue;
// recalculate the indent
- if(x->string().find(unclosedDoctype) != -1) --numTags;
+ if(x->string().tqfind(unclosedDoctype) != -1) --numTags;
getLineInfo(backLine, prevIndent, numTags, attrCol, unclosedTag);
break;
}
@@ -1467,11 +1467,11 @@ void KateXmlIndent::getLineInfo (uint line, uint &prevIndent, int &numTags,
if(unclosedTag) {
// find the start of the next attribute, so we can align with it
do {
- lastCh = text.at(++attrCol).unicode();
+ lastCh = text.at(++attrCol).tqunicode();
}while(lastCh && lastCh != ' ' && lastCh != '\t');
while(lastCh == ' ' || lastCh == '\t') {
- lastCh = text.at(++attrCol).unicode();
+ lastCh = text.at(++attrCol).tqunicode();
}
attrCol = prevLine->cursorX(attrCol, tabWidth);
@@ -1499,7 +1499,7 @@ uint KateXmlIndent::processLine (uint line)
if(indent < 0) indent = 0;
// unindent lines that start with a close tag
- if(kateLine->string().find(startsWithCloseTag) != -1) {
+ if(kateLine->string().tqfind(startsWithCloseTag) != -1) {
indent -= indentWidth;
}
if(indent < 0) indent = 0;
@@ -1760,7 +1760,7 @@ int KateCSAndSIndent::lastNonCommentChar( const KateDocCursor &line )
// find a possible start-of-comment
int p = -2; // so the first find starts at position 0
- do p = str.find( "//", p + 2 );
+ do p = str.tqfind( "//", p + 2 );
while ( p >= 0 && textLine->attribute(p) != commentAttrib && textLine->attribute(p) != doxyCommentAttrib );
// no // found? use whole string
@@ -1917,8 +1917,8 @@ TQString KateCSAndSIndent::calcIndent (const KateDocCursor &begin)
// if the line starts with # (but isn't a c# region thingy), no indentation at all.
if( currLineFirst >= 0 && currLine->getChar(currLineFirst) == '#' )
{
- if( !currLine->stringAtPos( currLineFirst+1, TQString::fromLatin1("region") ) &&
- !currLine->stringAtPos( currLineFirst+1, TQString::fromLatin1("endregion") ) )
+ if( !currLine->stringAtPos( currLineFirst+1, TQString::tqfromLatin1("region") ) &&
+ !currLine->stringAtPos( currLineFirst+1, TQString::tqfromLatin1("endregion") ) )
return TQString::null;
}
@@ -1974,10 +1974,10 @@ TQString KateCSAndSIndent::calcIndent (const KateDocCursor &begin)
{
#define ARRLEN( array ) ( sizeof(array)/sizeof(array[0]) )
for( uint n = 0; n < ARRLEN(scopeKeywords); ++n )
- if( textLine->stringAtPos(pos, TQString::fromLatin1(scopeKeywords[n]) ) )
+ if( textLine->stringAtPos(pos, TQString::tqfromLatin1(scopeKeywords[n]) ) )
return calcIndentAfterKeyword( begin, cur, pos, false );
for( uint n = 0; n < ARRLEN(blockScopeKeywords); ++n )
- if( textLine->stringAtPos(pos, TQString::fromLatin1(blockScopeKeywords[n]) ) )
+ if( textLine->stringAtPos(pos, TQString::tqfromLatin1(blockScopeKeywords[n]) ) )
return calcIndentAfterKeyword( begin, cur, pos, true );
#undef ARRLEN
}
@@ -2070,7 +2070,7 @@ TQString KateCSAndSIndent::calcIndentInBrace(const KateDocCursor &indentCursor,
// beginning 'namespace'. that's 99% of usage, I'd guess.
{
if( braceFirst >= 0 && braceLine->attribute(braceFirst) == keywordAttrib &&
- braceLine->stringAtPos( braceFirst, TQString::fromLatin1( "namespace" ) ) )
+ braceLine->stringAtPos( braceFirst, TQString::tqfromLatin1( "namespace" ) ) )
return continuationIndent(indentCursor) + whitespaceToOpenBrace;
if( braceCursor.line() > 0 )
@@ -2078,7 +2078,7 @@ TQString KateCSAndSIndent::calcIndentInBrace(const KateDocCursor &indentCursor,
KateTextLine::Ptr prevLine = doc->plainKateTextLine(braceCursor.line() - 1);
int firstPrev = prevLine->firstChar();
if( firstPrev >= 0 && prevLine->attribute(firstPrev) == keywordAttrib &&
- prevLine->stringAtPos( firstPrev, TQString::fromLatin1( "namespace" ) ) )
+ prevLine->stringAtPos( firstPrev, TQString::tqfromLatin1( "namespace" ) ) )
return continuationIndent(indentCursor) + whitespaceToOpenBrace;
}
}
@@ -2112,7 +2112,7 @@ void KateCSAndSIndent::processChar(TQChar c)
{
// 'n' trigger is for c# regions.
static const TQString triggers("}{)]/:;#n");
- if (triggers.find(c) == -1)
+ if (triggers.tqfind(c) == -1)
return;
// for historic reasons, processChar doesn't get a cursor
diff --git a/kate/part/kateautoindent.h b/kate/part/kateautoindent.h
index 7ff1a93d..6c0d15d4 100644
--- a/kate/part/kateautoindent.h
+++ b/kate/part/kateautoindent.h
@@ -41,7 +41,7 @@ class KateDocument;
* - Return @p true in @p KateAutoIndent::hasConfigPage() for the
* corresponding indenter id.
*/
-class IndenterConfigPage : public QWidget
+class IndenterConfigPage : public TQWidget
{
Q_OBJECT
@@ -67,7 +67,7 @@ class IndenterConfigPage : public QWidget
* This baseclass is a real dummy, does nothing beside remembering the document it belongs too,
* only to have the object around
*/
-class KateAutoIndent : public QObject
+class KateAutoIndent : public TQObject
{
Q_OBJECT
diff --git a/kate/part/katebookmarks.cpp b/kate/part/katebookmarks.cpp
index ac1ee73d..a6de7784 100644
--- a/kate/part/katebookmarks.cpp
+++ b/kate/part/katebookmarks.cpp
@@ -176,7 +176,7 @@ void KateBookmarks::insertBookmarks( TQPopupMenu& menu )
{
sortArray[i] = (*it)->line;
ssort( sortArray, i );
- idx = sortArray.find( (*it)->line ) + 3;
+ idx = sortArray.tqfind( (*it)->line ) + 3;
}
menu.insertItem(
diff --git a/kate/part/katebookmarks.h b/kate/part/katebookmarks.h
index 88e90ae4..63928800 100644
--- a/kate/part/katebookmarks.h
+++ b/kate/part/katebookmarks.h
@@ -35,7 +35,7 @@ class KActionCollection;
class TQPopupMenu;
class TQMenuData;
-class KateBookmarks : public QObject
+class KateBookmarks : public TQObject
{
Q_OBJECT
diff --git a/kate/part/katebuffer.cpp b/kate/part/katebuffer.cpp
index 74a9ba59..e62efcf3 100644
--- a/kate/part/katebuffer.cpp
+++ b/kate/part/katebuffer.cpp
@@ -46,7 +46,7 @@
* loader block size, load 256 kb at once per default
* if file size is smaller, fall back to file size
*/
-static const Q_ULONG KATE_FILE_LOADER_BS = 256 * 1024;
+static const TQ_ULONG KATE_FILE_LOADER_BS = 256 * 1024;
/**
* KATE_AVG_BLOCK_SIZE is in characters !
@@ -54,8 +54,8 @@ static const Q_ULONG KATE_FILE_LOADER_BS = 256 * 1024;
* block will max contain around BLOCK_SIZE chars or
* BLOCK_LINES lines (after load, later that won't be tracked)
*/
-static const Q_ULONG KATE_AVG_BLOCK_SIZE = 2048 * 80;
-static const Q_ULONG KATE_MAX_BLOCK_LINES = 2048;
+static const TQ_ULONG KATE_AVG_BLOCK_SIZE = 2048 * 80;
+static const TQ_ULONG KATE_MAX_BLOCK_LINES = 2048;
/**
* hl will look at the next KATE_HL_LOOKAHEAD lines
@@ -172,10 +172,10 @@ class KateFileLoader
// should spaces be ignored at end of line?
inline bool removeTrailingSpaces () const { return m_removeTrailingSpaces; }
- // internal unicode data array
- inline const TQChar *unicode () const { return m_text.unicode(); }
+ // internal tqunicode data array
+ inline const TQChar *tqunicode () const { return m_text.tqunicode(); }
- // read a line, return length + offset in unicode data
+ // read a line, return length + offset in tqunicode data
void readLine (uint &offset, uint &length)
{
length = 0;
@@ -543,7 +543,7 @@ bool KateBuffer::canEncode ()
kdDebug(13020) << "ENC NAME: " << codec->name() << endl;
- // hardcode some unicode encodings which can encode all chars
+ // hardcode some tqunicode encodings which can encode all chars
if ((TQString(codec->name()) == "UTF-8") || (TQString(codec->name()) == "ISO-10646-UCS-2"))
return true;
@@ -849,7 +849,7 @@ void KateBuffer::setTabWidth (uint w)
m_tabWidth = w;
if (m_highlight && m_highlight->foldingIndentationSensitive())
- invalidateHighlighting();
+ tqinvalidateHighlighting();
}
}
@@ -860,12 +860,12 @@ void KateBuffer::setHighlight(uint hlMode)
// aha, hl will change
if (h != m_highlight)
{
- bool invalidate = !h->noHighlighting();
+ bool tqinvalidate = !h->noHighlighting();
if (m_highlight)
{
m_highlight->release();
- invalidate = true;
+ tqinvalidate = true;
}
h->use();
@@ -880,8 +880,8 @@ void KateBuffer::setHighlight(uint hlMode)
m_highlight = h;
- if (invalidate)
- invalidateHighlighting();
+ if (tqinvalidate)
+ tqinvalidateHighlighting();
// inform the document that the hl was really changed
// needed to update attributes and more ;)
@@ -889,7 +889,7 @@ void KateBuffer::setHighlight(uint hlMode)
}
}
-void KateBuffer::invalidateHighlighting()
+void KateBuffer::tqinvalidateHighlighting()
{
m_lineHighlightedMax = 0;
m_lineHighlighted = 0;
@@ -949,7 +949,7 @@ void KateBuffer::addIndentBasedFoldingInformation(TQMemArray<uint> &foldingList,
}
}
-bool KateBuffer::doHighlight (KateBufBlock *buf, uint startLine, uint endLine, bool invalidate)
+bool KateBuffer::doHighlight (KateBufBlock *buf, uint startLine, uint endLine, bool tqinvalidate)
{
// no hl around, no stuff to do
if (!m_highlight)
@@ -971,13 +971,13 @@ bool KateBuffer::doHighlight (KateBufBlock *buf, uint startLine, uint endLine, b
//kdDebug (13020) << "HL UNTIL LINE: " << m_lineHighlighted << " MAX: " << m_lineHighlightedMax << endl;
//kdDebug (13020) << "HL DYN COUNT: " << KateHlManager::self()->countDynamicCtxs() << " MAX: " << m_maxDynamicContexts << endl;
- // see if there are too many dynamic contexts; if yes, invalidate HL of all documents
+ // see if there are too many dynamic contexts; if yes, tqinvalidate HL of all documents
if (KateHlManager::self()->countDynamicCtxs() >= m_maxDynamicContexts)
{
{
if (KateHlManager::self()->resetDynamicCtxs())
{
- kdDebug (13020) << "HL invalidated - too many dynamic contexts ( >= " << m_maxDynamicContexts << ")" << endl;
+ kdDebug (13020) << "HL tqinvalidated - too many dynamic contexts ( >= " << m_maxDynamicContexts << ")" << endl;
// avoid recursive invalidation
KateHlManager::self()->setForceNoDCReset(true);
@@ -1240,7 +1240,7 @@ bool KateBuffer::doHighlight (KateBufBlock *buf, uint startLine, uint endLine, b
buf->markDirty ();
// tag the changed lines !
- if (invalidate)
+ if (tqinvalidate)
emit tagLines (startLine, current_line + buf->startLine());
// emit that we have changed the folding
@@ -1353,14 +1353,14 @@ void KateBufBlock::fillBlock (KateFileLoader *stream)
{
uint offset = 0, length = 0;
stream->readLine(offset, length);
- const TQChar *unicodeData = stream->unicode () + offset;
+ const TQChar *tqunicodeData = stream->tqunicode () + offset;
// strip spaces at end of line
if ( stream->removeTrailingSpaces() )
{
while (length > 0)
{
- if (unicodeData[length-1].isSpace())
+ if (tqunicodeData[length-1].isSpace())
--length;
else
break;
@@ -1391,13 +1391,13 @@ void KateBufBlock::fillBlock (KateFileLoader *stream)
memcpy(buf+pos, (char *) &length, sizeof(uint));
pos += sizeof(uint);
- memcpy(buf+pos, (char *) unicodeData, sizeof(TQChar)*length);
+ memcpy(buf+pos, (char *) tqunicodeData, sizeof(TQChar)*length);
pos += sizeof(TQChar)*length;
}
else
{
KateTextLine::Ptr textLine = new KateTextLine ();
- textLine->insertText (0, length, unicodeData);
+ textLine->insertText (0, length, tqunicodeData);
m_stringList.push_back (textLine);
}
diff --git a/kate/part/katebuffer.h b/kate/part/katebuffer.h
index 602571c5..43430ec2 100644
--- a/kate/part/katebuffer.h
+++ b/kate/part/katebuffer.h
@@ -116,7 +116,7 @@ class KateBufBlock
void removeLine(uint i);
/**
- * mark this block as dirty, will invalidate the swap data
+ * mark this block as dirty, will tqinvalidate the swap data
* insert/removeLine will mark the block dirty itself
*/
void markDirty ();
@@ -338,7 +338,7 @@ class KateBufBlockList
* @author Waldo Bastian <bastian@kde.org>
* @author Christoph Cullmann <cullmann@kde.org>
*/
-class KateBuffer : public QObject
+class KateBuffer : public TQObject
{
Q_OBJECT
@@ -591,7 +591,7 @@ class KateBuffer : public QObject
/**
* Invalidate highlighting of whole buffer.
*/
- void invalidateHighlighting();
+ void tqinvalidateHighlighting();
KateCodeFoldingTree *foldingTree () { return &m_regionTree; };
@@ -611,7 +611,7 @@ class KateBuffer : public QObject
* @returns true when the highlighting in the next block needs to be updated,
* false otherwise.
*/
- bool doHighlight (KateBufBlock *buf, uint from, uint to, bool invalidate);
+ bool doHighlight (KateBufBlock *buf, uint from, uint to, bool tqinvalidate);
signals:
/**
diff --git a/kate/part/katecmds.cpp b/kate/part/katecmds.cpp
index b64b5414..27dd22a8 100644
--- a/kate/part/katecmds.cpp
+++ b/kate/part/katecmds.cpp
@@ -303,7 +303,7 @@ static void replace(TQString &s, const TQString &needle, const TQString &with)
int pos=0;
while (1)
{
- pos=s.find(needle, pos);
+ pos=s.tqfind(needle, pos);
if (pos==-1) break;
s.replace(pos, needle.length(), with);
pos+=with.length();
@@ -578,7 +578,7 @@ bool KateCommands::Character::exec (Kate::View *view, const TQString &_cmd, TQSt
view->insertText(TQString(buf));
}
else
- { // do the unicode thing
+ { // do the tqunicode thing
TQChar c(number);
view->insertText(TQString(&c, 1));
}
@@ -593,10 +593,10 @@ bool KateCommands::Date::exec (Kate::View *view, const TQString &cmd, TQString &
if (cmd.left(4) != "date")
return false;
- if (TQDateTime::currentDateTime().toString(cmd.mid(5, cmd.length()-5)).length() > 0)
- view->insertText(TQDateTime::currentDateTime().toString(cmd.mid(5, cmd.length()-5)));
+ if (TQDateTime::tqcurrentDateTime().toString(cmd.mid(5, cmd.length()-5)).length() > 0)
+ view->insertText(TQDateTime::tqcurrentDateTime().toString(cmd.mid(5, cmd.length()-5)));
else
- view->insertText(TQDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss"));
+ view->insertText(TQDateTime::tqcurrentDateTime().toString("yyyy-MM-dd hh:mm:ss"));
return true;
}
diff --git a/kate/part/katecmds.h b/kate/part/katecmds.h
index 55c8d807..e55e2ac8 100644
--- a/kate/part/katecmds.h
+++ b/kate/part/katecmds.h
@@ -119,7 +119,7 @@ class SedReplace : public Kate::Command
};
/**
- * insert a unicode or ascii character
+ * insert a tqunicode or ascii character
* base 9+1: 1234
* hex: 0x1234 or x1234
* octal: 01231
diff --git a/kate/part/katecodecompletion.cpp b/kate/part/katecodecompletion.cpp
index cee99f9d..e7f11b99 100644
--- a/kate/part/katecodecompletion.cpp
+++ b/kate/part/katecodecompletion.cpp
@@ -47,7 +47,7 @@
/**
* This class is used as the codecompletion listbox. It can be resized according to its contents,
- * therfor the needed size is provided by sizeHint();
+ * therfor the needed size is provided by tqsizeHint();
*@short Listbox showing codecompletion
*@author Jonas B. Jacobi <j.jacobi@gmx.de>
*/
@@ -61,7 +61,7 @@ class KateCCListBox : public QListBox
{
}
- TQSize sizeHint() const
+ TQSize tqsizeHint() const
{
int count = this->count();
int height = 20;
@@ -124,7 +124,7 @@ KateCodeCompletion::KateCodeCompletion( KateView* view )
m_completionListBox->installEventFilter( this );
- m_completionPopup->resize(m_completionListBox->sizeHint() + TQSize(2,2));
+ m_completionPopup->resize(m_completionListBox->tqsizeHint() + TQSize(2,2));
m_completionPopup->installEventFilter( this );
m_completionPopup->setFocusProxy( m_view->m_viewInternal );
@@ -305,7 +305,7 @@ void KateCodeCompletion::updateBox( bool )
}
kdDebug(13035)<<"KateCodeCompletion::updateBox: Resizing widget"<<endl;
- m_completionPopup->resize(m_completionListBox->sizeHint() + TQSize(2,2));
+ m_completionPopup->resize(m_completionListBox->tqsizeHint() + TQSize(2,2));
TQPoint p = m_view->mapToGlobal( m_view->cursorCoordinates() );
int x = p.x();
int y = p.y() ;
@@ -384,7 +384,7 @@ void KateCodeCompletion::showComment()
m_completionListBox->ensureCurrentVisible();
finalPoint.setY(
- m_completionListBox->viewport()->mapToGlobal(m_completionListBox->itemRect(
+ m_completionListBox->viewport()->mapToGlobal(m_completionListBox->tqitemRect(
m_completionListBox->item(m_completionListBox->currentItem())).topLeft()).y());
m_commentLabel->move(finalPoint);
diff --git a/kate/part/katecodecompletion.h b/kate/part/katecodecompletion.h
index 34d62059..a8c4e5af 100644
--- a/kate/part/katecodecompletion.h
+++ b/kate/part/katecodecompletion.h
@@ -44,7 +44,7 @@ class KateCCListBox;
class TQLayout;
class TQVBox;
-class KateCodeCompletionCommentLabel : public QLabel
+class KateCodeCompletionCommentLabel : public TQLabel
{
Q_OBJECT
@@ -57,14 +57,14 @@ class KateCodeCompletionCommentLabel : public QLabel
setAutoMask( false );
setFrameStyle( TQFrame::Plain | TQFrame::Box );
setLineWidth( 1 );
- setAlignment( AlignAuto | AlignTop );
+ tqsetAlignment( AlignAuto | AlignTop );
polish();
setText(text);
adjustSize();
}
};
-class KateCodeCompletion : public QObject
+class KateCodeCompletion : public TQObject
{
Q_OBJECT
@@ -114,7 +114,7 @@ class KateCodeCompletion : public QObject
KateCodeCompletionCommentLabel* m_commentLabel;
};
-class KateArgHint: public QFrame
+class KateArgHint: public TQFrame
{
Q_OBJECT
diff --git a/kate/part/katecodefoldinghelpers.h b/kate/part/katecodefoldinghelpers.h
index bea6a096..7feee384 100644
--- a/kate/part/katecodefoldinghelpers.h
+++ b/kate/part/katecodefoldinghelpers.h
@@ -113,7 +113,7 @@ class KateCodeFoldingNode
TQMemArray<KateCodeFoldingNode*> m_children;
};
-class KateCodeFoldingTree : public QObject
+class KateCodeFoldingTree : public TQObject
{
friend class KateCodeFoldingNode;
diff --git a/kate/part/kateconfig.cpp b/kate/part/kateconfig.cpp
index 4b3c2f52..3158f32d 100644
--- a/kate/part/kateconfig.cpp
+++ b/kate/part/kateconfig.cpp
@@ -422,7 +422,7 @@ TQTextCodec *KateDocumentConfig::codec ()
if (m_encodingSet || isGlobal())
{
if (m_encoding.isEmpty() && isGlobal())
- return KGlobal::charsets()->codecForName (TQString::fromLatin1(KGlobal::locale()->encoding()));
+ return KGlobal::charsets()->codecForName (TQString::tqfromLatin1(KGlobal::locale()->encoding()));
else if (m_encoding.isEmpty())
return s_global->codec ();
else
diff --git a/kate/part/katecursor.h b/kate/part/katecursor.h
index c155abba..1b1a5322 100644
--- a/kate/part/katecursor.h
+++ b/kate/part/katecursor.h
@@ -61,7 +61,7 @@ class KateTextCursor
}
#ifndef Q_WS_WIN //not needed
- friend void qSwap(KateTextCursor & c1, KateTextCursor & c2) {
+ friend void tqSwap(KateTextCursor & c1, KateTextCursor & c2) {
KateTextCursor tmp = c1;
c1 = c2;
c2 = tmp;
@@ -200,7 +200,7 @@ class KateTextRange : public KateRange
inline void normalize() {
if( m_start > m_end )
- qSwap(m_start, m_end);
+ tqSwap(m_start, m_end);
}
protected:
diff --git a/kate/part/katedialogs.cpp b/kate/part/katedialogs.cpp
index d3a48185..366085c8 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 alignment applied to "
+ "the width of the screen will not have vertical tqalignment applied to "
"subsequent wrapped lines.</p>"));
TQWhatsThis::add(m_line,i18n(
"If this option is checked, every new view will display line numbers "
@@ -1388,10 +1388,10 @@ void KateHlConfigPage::hlChanged(int z)
return;
}
- if ( !hlDataDict.find( z ) )
+ if ( !hlDataDict.tqfind( z ) )
hlDataDict.insert( z, hl->getData() );
- hlData = hlDataDict.find( z );
+ hlData = hlDataDict.tqfind( z );
wildcards->setText(hlData->wildcards);
mimetypes->setText(hlData->mimetypes);
priority->setValue(hlData->priority);
diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp
index fe5e22b1..e32636cb 100644
--- a/kate/part/katedocument.cpp
+++ b/kate/part/katedocument.cpp
@@ -91,7 +91,7 @@ class KatePartPluginItem
// KateDocument Constructor
//
KateDocument::KateDocument ( bool bSingleViewMode, bool bBrowserView,
- bool bReadOnly, TQWidget *parentWidget,
+ bool bReadOnly, TQWidget *tqparentWidget,
const char *widgetName, TQObject *parent, const char *name)
: Kate::Document(parent, name),
m_plugins (KateFactory::self()->plugins().count()),
@@ -214,7 +214,7 @@ KateDocument::KateDocument ( bool bSingleViewMode, bool bBrowserView,
// if single view mode, like in the konqui embedding, create a default view ;)
if ( m_bSingleViewMode )
{
- KTextEditor::View *view = createView( parentWidget, widgetName );
+ KTextEditor::View *view = createView( tqparentWidget, widgetName );
insertChildClient( view );
view->show();
setWidget( view );
@@ -1176,7 +1176,7 @@ bool KateDocument::editInsertText ( uint line, uint col, const TQString &str )
uint tw = config()->tabWidth();
int pos = 0;
uint l = 0;
- while ( (pos = s.find('\t')) > -1 )
+ while ( (pos = s.tqfind('\t')) > -1 )
{
l = tw - ( (col + pos)%tw );
s.replace( pos, 1, TQString().fill( ' ', l ) );
@@ -1187,7 +1187,7 @@ bool KateDocument::editInsertText ( uint line, uint col, const TQString &str )
editAddUndo (KateUndoGroup::editInsertText, line, col, s.length(), s);
- l->insertText (col, s.length(), s.unicode());
+ l->insertText (col, s.length(), s.tqunicode());
// removeTrailingSpace(line); // ### nessecary?
m_buffer->changeLine(line);
@@ -1410,7 +1410,7 @@ bool KateDocument::editInsertLine ( uint line, const TQString &s )
removeTrailingSpace( line ); // old line
KateTextLine::Ptr tl = new KateTextLine();
- tl->insertText (0, s.length(), s.unicode(), 0);
+ tl->insertText (0, s.length(), s.tqunicode(), 0);
m_buffer->insertLine(line, tl);
m_buffer->changeLine(line);
@@ -2050,7 +2050,7 @@ void KateDocument::clearMark( uint line )
emit marksChanged();
delete mark;
tagLines( line, line );
- repaintViews(true);
+ tqrepaintViews(true);
}
void KateDocument::addMark( uint line, uint markType )
@@ -2087,7 +2087,7 @@ void KateDocument::addMark( uint line, uint markType )
emit marksChanged();
tagLines( line, line );
- repaintViews(true);
+ tqrepaintViews(true);
}
void KateDocument::removeMark( uint line, uint markType )
@@ -2119,7 +2119,7 @@ void KateDocument::removeMark( uint line, uint markType )
emit marksChanged();
tagLines( line, line );
- repaintViews(true);
+ tqrepaintViews(true);
}
TQPtrList<KTextEditor::Mark> KateDocument::marks()
@@ -2146,7 +2146,7 @@ void KateDocument::clearMarks()
m_marks.clear();
emit marksChanged();
- repaintViews(true);
+ tqrepaintViews(true);
}
void KateDocument::setPixmap( MarkInterface::MarkTypes type, const TQPixmap& pixmap )
@@ -2316,7 +2316,7 @@ bool KateDocument::openURL( const KURL &url )
w = m_views.first();
if (w)
- m_job->setWindow (w->topLevelWidget());
+ m_job->setWindow (w->tqtopLevelWidget());
emit started( m_job );
@@ -2395,7 +2395,7 @@ bool KateDocument::openFile(KIO::Job * job)
// service type magic to get encoding right
//
TQString serviceType = m_extension->urlArgs().serviceType.simplifyWhiteSpace();
- int pos = serviceType.find(';');
+ int pos = serviceType.tqfind(';');
if (pos != -1)
setEncoding (serviceType.mid(pos+1));
@@ -2589,7 +2589,7 @@ bool KateDocument::saveFile()
//
if (!m_buffer->canEncode ()
&& (KMessageBox::warningContinueCancel(0,
- i18n("The selected encoding cannot encode every unicode character in this document. Do you really want to save it? There could be some data lost."),i18n("Possible Data Loss"),i18n("Save Nevertheless")) != KMessageBox::Continue))
+ i18n("The selected encoding cannot encode every tqunicode character in this document. Do you really want to save it? There could be some data lost."),i18n("Possible Data Loss"),i18n("Save Nevertheless")) != KMessageBox::Continue))
{
return false;
}
@@ -2872,7 +2872,7 @@ void KateDocument::makeAttribs(bool needInvalidate)
m_views.at(z)->renderer()->updateAttributes ();
if (needInvalidate)
- m_buffer->invalidateHighlighting();
+ m_buffer->tqinvalidateHighlighting();
tagAll ();
}
@@ -3195,7 +3195,7 @@ void KateDocument::backspace( KateView *view, const KateTextCursor& c )
if (!textLine)
return;
- if (config()->wordWrap() && textLine->endingWith(TQString::fromLatin1(" ")))
+ if (config()->wordWrap() && textLine->endingWith(TQString::tqfromLatin1(" ")))
{
// gg: in hard wordwrap mode, backspace must also eat the trailing space
removeText (line-1, textLine->length()-1, line, 0);
@@ -4112,10 +4112,10 @@ void KateDocument::tagLines(KateTextCursor start, KateTextCursor end)
m_views.at(z)->tagLines(start, end, true);
}
-void KateDocument::repaintViews(bool paintOnlyDirty)
+void KateDocument::tqrepaintViews(bool paintOnlyDirty)
{
for (uint z = 0; z < m_views.count(); z++)
- m_views.at(z)->repaintText(paintOnlyDirty);
+ m_views.at(z)->tqrepaintText(paintOnlyDirty);
}
void KateDocument::tagAll()
@@ -4634,7 +4634,7 @@ void KateDocument::readVariableLine( TQString t, bool onlyViewAndRenderer )
{
// simple check first, no regex
// no kate inside, no vars, simple...
- if (t.find("kate") < 0)
+ if (t.tqfind("kate") < 0)
return;
// found vars, if any
diff --git a/kate/part/katedocument.h b/kate/part/katedocument.h
index 46e9e87f..37d9b24e 100644
--- a/kate/part/katedocument.h
+++ b/kate/part/katedocument.h
@@ -91,7 +91,7 @@ class KateDocument : public Kate::Document,
public:
KateDocument (bool bSingleViewMode=false, bool bBrowserView=false, bool bReadOnly=false,
- TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject * = 0, const char * = 0);
+ TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject * = 0, const char * = 0);
~KateDocument ();
bool closeURL();
@@ -608,7 +608,7 @@ class KateDocument : public Kate::Document,
void setConfigFlags (uint flags);
// Repaint all of all of the views
- void repaintViews(bool paintOnlyDirty = true);
+ void tqrepaintViews(bool paintOnlyDirty = true);
inline KateHighlighting *highlight () { return m_buffer->highlight(); }
diff --git a/kate/part/katefactory.cpp b/kate/part/katefactory.cpp
index 64bde871..9bd00bfb 100644
--- a/kate/part/katefactory.cpp
+++ b/kate/part/katefactory.cpp
@@ -48,7 +48,7 @@ class KateFactoryPublic : public KParts::Factory
public:
/**
* reimplemented create object method
- * @param parentWidget parent widget
+ * @param tqparentWidget parent widget
* @param widgetName widget name
* @param parent TQObject parent
* @param name object name
@@ -56,9 +56,9 @@ class KateFactoryPublic : public KParts::Factory
* @param args additional arguments
* @return constructed part object
*/
- KParts::Part *createPartObject ( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname, const TQStringList &args )
+ KParts::Part *createPartObject ( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname, const TQStringList &args )
{
- return KateFactory::self()->createPartObject (parentWidget, widgetName, parent, name, classname, args);
+ return KateFactory::self()->createPartObject (tqparentWidget, widgetName, parent, name, classname, args);
}
};
@@ -206,14 +206,14 @@ KateFactory *KateFactory::self ()
return s_self;
}
-KParts::Part *KateFactory::createPartObject ( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *_classname, const TQStringList & )
+KParts::Part *KateFactory::createPartObject ( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *_classname, const TQStringList & )
{
TQCString classname( _classname );
bool bWantSingleView = ( classname != "KTextEditor::Document" && classname != "Kate::Document" );
bool bWantBrowserView = ( classname == "Browser/View" );
bool bWantReadOnly = (bWantBrowserView || ( classname == "KParts::ReadOnlyPart" ));
- KParts::ReadWritePart *part = new KateDocument (bWantSingleView, bWantBrowserView, bWantReadOnly, parentWidget, widgetName, parent, name);
+ KParts::ReadWritePart *part = new KateDocument (bWantSingleView, bWantBrowserView, bWantReadOnly, tqparentWidget, widgetName, parent, name);
part->setReadWrite( !bWantReadOnly );
return part;
diff --git a/kate/part/katefactory.h b/kate/part/katefactory.h
index 0fd939ce..4c1ce070 100644
--- a/kate/part/katefactory.h
+++ b/kate/part/katefactory.h
@@ -71,7 +71,7 @@ class KateFactory
/**
* reimplemented create object method
- * @param parentWidget parent widget
+ * @param tqparentWidget parent widget
* @param widgetName widget name
* @param parent TQObject parent
* @param name object name
@@ -79,7 +79,7 @@ class KateFactory
* @param args additional arguments
* @return constructed part object
*/
- KParts::Part *createPartObject ( TQWidget *parentWidget, const char *widgetName,
+ KParts::Part *createPartObject ( TQWidget *tqparentWidget, const char *widgetName,
TQObject *parent, const char *name, const char *classname,
const TQStringList &args );
diff --git a/kate/part/katefont.h b/kate/part/katefont.h
index 1ab3b346..f9e0c1d8 100644
--- a/kate/part/katefont.h
+++ b/kate/part/katefont.h
@@ -29,7 +29,7 @@
// KateFontMetrics implementation
//
-class KateFontMetrics : public QFontMetrics
+class KateFontMetrics : public TQFontMetrics
{
public:
KateFontMetrics(const TQFont& f);
diff --git a/kate/part/katehighlight.cpp b/kate/part/katehighlight.cpp
index 50c941c1..a18267f3 100644
--- a/kate/part/katehighlight.cpp
+++ b/kate/part/katehighlight.cpp
@@ -65,10 +65,10 @@ static const int KATE_DYNAMIC_CONTEXTS_RESET_DELAY = 30 * 1000;
inline bool kateInsideString (const TQString &str, TQChar ch)
{
- const TQChar *unicode = str.unicode();
+ const TQChar *tqunicode = str.tqunicode();
const uint len = str.length();
for (uint i=0; i < len; i++)
- if (unicode[i] == ch)
+ if (tqunicode[i] == ch)
return true;
return false;
@@ -661,7 +661,7 @@ int KateHlKeyword::checkHgl(const TQString& text, int offset, int len)
if (wordLen < minLen) return 0;
- if ( dict[wordLen] && dict[wordLen]->find(TQConstString(text.unicode() + offset, wordLen).string()) )
+ if ( dict[wordLen] && dict[wordLen]->find(TQConstString(text.tqunicode() + offset, wordLen).string()) )
return offset2;
return 0;
@@ -2088,14 +2088,14 @@ TQString KateHighlighting::hlKeyForAttrib( int i ) const
bool KateHighlighting::isInWord( TQChar c, int attrib ) const
{
- return m_additionalData[ hlKeyForAttrib( attrib ) ]->deliminator.find(c) < 0
+ return m_additionalData[ hlKeyForAttrib( attrib ) ]->deliminator.tqfind(c) < 0
&& !c.isSpace() && c != '"' && c != '\'';
}
bool KateHighlighting::canBreakAt( TQChar c, int attrib ) const
{
static const TQString& sq = KGlobal::staticQString("\"'");
- return (m_additionalData[ hlKeyForAttrib( attrib ) ]->wordWrapDeliminator.find(c) != -1) && (sq.find(c) == -1);
+ return (m_additionalData[ hlKeyForAttrib( attrib ) ]->wordWrapDeliminator.tqfind(c) != -1) && (sq.tqfind(c) == -1);
}
signed char KateHighlighting::commentRegion(int attr) const {
@@ -2367,7 +2367,7 @@ int KateHighlighting::getIdFromString(TQStringList *ContextNameList, TQString tm
else if ( tmpLineEndContext.contains("##"))
{
- int o = tmpLineEndContext.find("##");
+ int o = tmpLineEndContext.tqfind("##");
// FIXME at least with 'foo##bar'-style contexts the rules are picked up
// but the default attribute is not
TQString tmp=tmpLineEndContext.mid(o+2);
@@ -2477,7 +2477,7 @@ void KateHighlighting::makeContextList()
kdDebug(13010)<<"Looking up context0 for ruleset "<<incCtx<<endl;
incCtx = incCtx.left(incCtx.length()-1);
//try to find the context0 id for a given unresolvedReference
- KateEmbeddedHlInfos::const_iterator hlIt=embeddedHls.find(incCtx);
+ KateEmbeddedHlInfos::const_iterator hlIt=embeddedHls.tqfind(incCtx);
if (hlIt!=embeddedHls.end())
*(unresIt.key())=hlIt.data().context0;
}
@@ -2765,7 +2765,7 @@ int KateHighlighting::addToContextList(const TQString &ident, int ctx0)
// only context refernces of type Name, ##Name, and Subname##Name are allowed
if (incCtx.startsWith("##") || (!incCtx.startsWith("#")))
{
- int incCtxi = incCtx.find("##");
+ int incCtxi = incCtx.tqfind("##");
//#stay, #pop is not interesting here
if (incCtxi >= 0)
{
diff --git a/kate/part/katehighlight.h b/kate/part/katehighlight.h
index b42fccb6..8bdc73b3 100644
--- a/kate/part/katehighlight.h
+++ b/kate/part/katehighlight.h
@@ -213,7 +213,7 @@ class KateHighlighting
inline bool noHighlighting () const { return noHl; };
- // be carefull: all documents hl should be invalidated after calling this method!
+ // be carefull: all documents hl should be tqinvalidated after calling this method!
void dropDynamicContexts();
TQString indentation () { return m_indentation; }
@@ -338,7 +338,7 @@ class KateHighlighting
inline bool allowsFolding(){return folding;}
};
-class KateHlManager : public QObject
+class KateHlManager : public TQObject
{
Q_OBJECT
@@ -357,7 +357,7 @@ class KateHlManager : public QObject
int detectHighlighting (class KateDocument *doc);
- int findHl(KateHighlighting *h) {return hlList.find(h);}
+ int findHl(KateHighlighting *h) {return hlList.tqfind(h);}
TQString identifierForName(const TQString&);
// methodes to get the default style count + names
@@ -377,7 +377,7 @@ class KateHlManager : public QObject
uint countDynamicCtxs() { return dynamicCtxsCount; };
void setForceNoDCReset(bool b) { forceNoDCReset = b; };
- // be carefull: all documents hl should be invalidated after having successfully called this method!
+ // be carefull: all documents hl should be tqinvalidated after having successfully called this method!
bool resetDynamicCtxs();
signals:
diff --git a/kate/part/katejscript.cpp b/kate/part/katejscript.cpp
index 75f5fc51..a9efac0e 100644
--- a/kate/part/katejscript.cpp
+++ b/kate/part/katejscript.cpp
@@ -62,7 +62,7 @@ UString::UString(const TQString &d)
{
unsigned int len = d.length();
UChar *dat = new UChar[len];
- memcpy(dat, d.unicode(), len * sizeof(UChar));
+ memcpy(dat, d.tqunicode(), len * sizeof(UChar));
rep = UString::Rep::create(dat, len);
}
diff --git a/kate/part/kateprinter.cpp b/kate/part/kateprinter.cpp
index e0dbdc72..f0f73aad 100644
--- a/kate/part/kateprinter.cpp
+++ b/kate/part/kateprinter.cpp
@@ -184,7 +184,7 @@ bool KatePrinter::print (KateDocument *doc)
// This retrieves all tags, ued or not, but
// none of theese operations should be expensive,
// and searcing each tag in the format strings is avoided.
- TQDateTime dt = TQDateTime::currentDateTime();
+ TQDateTime dt = TQDateTime::tqcurrentDateTime();
TQMap<TQString,TQString> tags;
KUser u (KUser::UseRealUserID);
@@ -425,7 +425,7 @@ bool KatePrinter::print (KateDocument *doc)
for (int i=0; i<3; i++)
{
s = headerTagList[i];
- if (s.find("%p") != -1) s.replace("%p", TQString::number(currentPage));
+ if (s.tqfind("%p") != -1) s.replace("%p", TQString::number(currentPage));
paint.drawText(marg, 0, headerWidth-(marg*2), headerHeight, align, s);
align = valign|(i == 0 ? Qt::AlignHCenter : Qt::AlignRight);
}
@@ -453,7 +453,7 @@ bool KatePrinter::print (KateDocument *doc)
for (int i=0; i<3; i++)
{
s = footerTagList[i];
- if (s.find("%p") != -1) s.replace("%p", TQString::number(currentPage));
+ if (s.tqfind("%p") != -1) s.replace("%p", TQString::number(currentPage));
paint.drawText(marg, maxHeight+innerMargin, headerWidth-(marg*2), footerHeight, align, s);
align = Qt::AlignVCenter|(i == 0 ? Qt::AlignHCenter : Qt::AlignRight);
}
diff --git a/kate/part/katerenderer.cpp b/kate/part/katerenderer.cpp
index 265a9828..59b237f5 100644
--- a/kate/part/katerenderer.cpp
+++ b/kate/part/katerenderer.cpp
@@ -537,13 +537,13 @@ void KateRenderer::paintTextLine(TQPainter& paint, const KateLineRange* range, i
if (isIMSel && !isTab)
{
// input method selection
- fillColor = m_view->colorGroup().color(TQColorGroup::Foreground);
+ fillColor = m_view->tqcolorGroup().color(TQColorGroup::Foreground);
}
else if (isIMEdit && !isTab)
{
// XIM support
// input method edit area
- const TQColorGroup& cg = m_view->colorGroup();
+ const TQColorGroup& cg = m_view->tqcolorGroup();
int h1, s1, v1, h2, s2, v2;
cg.color( TQColorGroup::Base ).hsv( &h1, &s1, &v1 );
cg.color( TQColorGroup::Background ).hsv( &h2, &s2, &v2 );
@@ -576,7 +576,7 @@ void KateRenderer::paintTextLine(TQPainter& paint, const KateLineRange* range, i
if (isIMSel && paintBackground && !isTab)
{
paint.save();
- paint.setPen( m_view->colorGroup().color( TQColorGroup::BrightText ) );
+ paint.setPen( m_view->tqcolorGroup().color( TQColorGroup::BrightText ) );
}
// Draw indentation markers.
@@ -745,7 +745,7 @@ uint KateRenderer::textWidth(const KateTextLine::Ptr &textLine, int cursorCol)
KateFontStruct *fs = config()->fontStruct();
- const TQChar *unicode = textLine->text();
+ const TQChar *tqunicode = textLine->text();
const TQString &textString = textLine->string();
int x = 0;
@@ -763,7 +763,7 @@ uint KateRenderer::textWidth(const KateTextLine::Ptr &textLine, int cursorCol)
x += width;
- if (z < len && unicode[z] == TQChar('\t'))
+ if (z < len && tqunicode[z] == TQChar('\t'))
x -= x % width;
}
@@ -787,7 +787,7 @@ uint KateRenderer::textWidth(const KateTextLine::Ptr &textLine, uint startcol, u
*needWrap = false;
const uint len = textLine->length();
- const TQChar *unicode = textLine->text();
+ const TQChar *tqunicode = textLine->text();
const TQString &textString = textLine->string();
uint z = startcol;
@@ -800,10 +800,10 @@ uint KateRenderer::textWidth(const KateTextLine::Ptr &textLine, uint startcol, u
// How should tabs be treated when they word-wrap on a print-out?
// if startcol != 0, this messes up (then again, word wrapping messes up anyway)
- if (unicode[z] == TQChar('\t'))
+ if (tqunicode[z] == TQChar('\t'))
x -= x % width;
- if (unicode[z].isSpace())
+ if (tqunicode[z].isSpace())
{
lastWhiteSpace = z+1;
lastWhiteSpaceX = x;
@@ -887,7 +887,7 @@ uint KateRenderer::textWidth( KateTextCursor &cursor, int xPos, uint startCol)
if (!textLine) return 0;
const uint len = textLine->length();
- const TQChar *unicode = textLine->text();
+ const TQChar *tqunicode = textLine->text();
const TQString &textString = textLine->string();
x = oldX = 0;
@@ -906,7 +906,7 @@ uint KateRenderer::textWidth( KateTextCursor &cursor, int xPos, uint startCol)
x += width;
- if (z < len && unicode[z] == TQChar('\t'))
+ if (z < len && tqunicode[z] == TQChar('\t'))
x -= x % width;
z++;
diff --git a/kate/part/kateschema.cpp b/kate/part/kateschema.cpp
index 6e73a9f7..76e187c8 100644
--- a/kate/part/kateschema.cpp
+++ b/kate/part/kateschema.cpp
@@ -281,19 +281,19 @@ KateSchemaConfigColorTab::KateSchemaConfigColorTab( TQWidget *parent, const char
b = new TQHBox (gbTextArea);
b->setSpacing(KDialog::spacingHint());
label = new TQLabel( i18n("Normal text:"), b);
- label->setAlignment( AlignLeft|AlignVCenter);
+ label->tqsetAlignment( AlignLeft|AlignVCenter);
m_back = new KColorButton(b);
b = new TQHBox (gbTextArea);
b->setSpacing(KDialog::spacingHint());
label = new TQLabel( i18n("Selected text:"), b);
- label->setAlignment( AlignLeft|AlignVCenter);
+ label->tqsetAlignment( AlignLeft|AlignVCenter);
m_selected = new KColorButton(b);
b = new TQHBox (gbTextArea);
b->setSpacing(KDialog::spacingHint());
label = new TQLabel( i18n("Current line:"), b);
- label->setAlignment( AlignLeft|AlignVCenter);
+ label->tqsetAlignment( AlignLeft|AlignVCenter);
m_current = new KColorButton(b);
// Markers from kdelibs/interfaces/ktextinterface/markinterface.h
@@ -319,31 +319,31 @@ KateSchemaConfigColorTab::KateSchemaConfigColorTab( TQWidget *parent, const char
b = new TQHBox (gbBorder);
b->setSpacing(KDialog::spacingHint());
label = new TQLabel( i18n("Left border background:"), b);
- label->setAlignment( AlignLeft|AlignVCenter);
+ label->tqsetAlignment( AlignLeft|AlignVCenter);
m_iconborder = new KColorButton(b);
b = new TQHBox (gbBorder);
b->setSpacing(KDialog::spacingHint());
label = new TQLabel( i18n("Line numbers:"), b);
- label->setAlignment( AlignLeft|AlignVCenter);
+ label->tqsetAlignment( AlignLeft|AlignVCenter);
m_linenumber = new KColorButton(b);
b = new TQHBox (gbBorder);
b->setSpacing(KDialog::spacingHint());
label = new TQLabel( i18n("Bracket highlight:"), b);
- label->setAlignment( AlignLeft|AlignVCenter);
+ label->tqsetAlignment( AlignLeft|AlignVCenter);
m_bracket = new KColorButton(b);
b = new TQHBox (gbBorder);
b->setSpacing(KDialog::spacingHint());
label = new TQLabel( i18n("Word wrap markers:"), b);
- label->setAlignment( AlignLeft|AlignVCenter);
+ label->tqsetAlignment( AlignLeft|AlignVCenter);
m_wwmarker = new KColorButton(b);
b = new TQHBox (gbBorder);
b->setSpacing(KDialog::spacingHint());
label = new TQLabel( i18n("Tab markers:"), b);
- label->setAlignment( AlignLeft|AlignVCenter);
+ label->tqsetAlignment( AlignLeft|AlignVCenter);
m_tmarker = new KColorButton(b);
blay->addWidget(gbBorder);
@@ -351,7 +351,7 @@ KateSchemaConfigColorTab::KateSchemaConfigColorTab( TQWidget *parent, const char
blay->addStretch();
// connect signal changed(); changed is emitted by a ColorButton change!
- connect( this, TQT_SIGNAL( changed() ), parent->parentWidget(), TQT_SLOT( slotChanged() ) );
+ connect( this, TQT_SIGNAL( changed() ), parent->tqparentWidget(), TQT_SLOT( slotChanged() ) );
// TQWhatsThis help
TQWhatsThis::add(m_back, i18n("<p>Sets the background color of the editing area.</p>"));
@@ -545,7 +545,7 @@ KateSchemaConfigFontTab::KateSchemaConfigFontTab( TQWidget *parent, const char *
m_fontchooser->enableColumn(KFontChooser::StyleList, false);
grid->addWidget( m_fontchooser, 0, 0);
- connect (this, TQT_SIGNAL( changed()), parent->parentWidget(), TQT_SLOT (slotChanged()));
+ connect (this, TQT_SIGNAL( changed()), parent->tqparentWidget(), TQT_SLOT (slotChanged()));
m_schema = -1;
}
@@ -599,7 +599,7 @@ KateSchemaConfigFontColorTab::KateSchemaConfigFontColorTab( TQWidget *parent, co
m_defaultStyles = new KateStyleListView( this, false );
grid->addWidget( m_defaultStyles, 0, 0);
- connect (m_defaultStyles, TQT_SIGNAL (changed()), parent->parentWidget(), TQT_SLOT (slotChanged()));
+ connect (m_defaultStyles, TQT_SIGNAL (changed()), parent->tqparentWidget(), TQT_SLOT (slotChanged()));
TQWhatsThis::add( m_defaultStyles, i18n(
"This list displays the default styles for the current schema and "
@@ -716,7 +716,7 @@ KateSchemaConfigHighlightTab::KateSchemaConfigHighlightTab( TQWidget *parent, co
"to edit from the popup menu.<p>You can unset the Background and Selected "
"Background colors from the context menu when appropriate.") );
- connect (m_styles, TQT_SIGNAL (changed()), parent->parentWidget(), TQT_SLOT (slotChanged()));
+ connect (m_styles, TQT_SIGNAL (changed()), parent->tqparentWidget(), TQT_SLOT (slotChanged()));
}
KateSchemaConfigHighlightTab::~KateSchemaConfigHighlightTab()
@@ -783,12 +783,12 @@ void KateSchemaConfigHighlightTab::schemaChanged (uint schema)
// All stylenames have their language mode prefixed, e.g. HTML:Comment
// split them and put them into nice substructures.
- int c = itemData->name.find(':');
+ int c = itemData->name.tqfind(':');
if ( c > 0 ) {
TQString prefix = itemData->name.left(c);
TQString name = itemData->name.mid(c+1);
- KateStyleListCaption *parent = prefixes.find( prefix );
+ KateStyleListCaption *parent = prefixes.tqfind( prefix );
if ( ! parent )
{
parent = new KateStyleListCaption( m_styles, prefix );
@@ -1088,9 +1088,9 @@ void KateStyleListView::showPopupMenu( KateStyleListItem *i, const TQPoint &glob
TQPixmap scl(16,16);
scl.fill( i->style()->selectedTextColor() );
TQPixmap bgcl(16,16);
- bgcl.fill( i->style()->itemSet(KateAttribute::BGColor) ? i->style()->bgColor() : viewport()->colorGroup().base() );
+ bgcl.fill( i->style()->itemSet(KateAttribute::BGColor) ? i->style()->bgColor() : viewport()->tqcolorGroup().base() );
TQPixmap sbgcl(16,16);
- sbgcl.fill( i->style()->itemSet(KateAttribute::SelectedBGColor) ? i->style()->selectedBGColor() : viewport()->colorGroup().base() );
+ sbgcl.fill( i->style()->itemSet(KateAttribute::SelectedBGColor) ? i->style()->selectedBGColor() : viewport()->tqcolorGroup().base() );
if ( showtitle )
m.insertTitle( i->contextName(), KateStyleListItem::ContextName );
@@ -1156,7 +1156,7 @@ void KateStyleListView::slotMousePressed(int btn, TQListViewItem* i, const TQPoi
if ( dynamic_cast<KateStyleListItem*>(i) ) {
if ( btn == Qt::LeftButton && c > 0 ) {
// map pos to item/column and call KateStyleListItem::activate(col, pos)
- ((KateStyleListItem*)i)->activate( c, viewport()->mapFromGlobal( pos ) - TQPoint( 0, itemRect(i).top() ) );
+ ((KateStyleListItem*)i)->activate( c, viewport()->mapFromGlobal( pos ) - TQPoint( 0, tqitemRect(i).top() ) );
}
}
}
@@ -1357,7 +1357,7 @@ void KateStyleListItem::toggleDefStyle()
delete is;
is = new KateAttribute( *ds );
updateStyle();
- repaint();
+ tqrepaint();
}
}
@@ -1441,7 +1441,7 @@ void KateStyleListItem::setColor( int column )
break;
}
- repaint();
+ tqrepaint();
}
void KateStyleListItem::unsetColor( int c )
@@ -1465,7 +1465,7 @@ void KateStyleListItem::paintCell( TQPainter *p, const TQColorGroup& /*cg*/, int
Q_ASSERT( lv ); //###
// use a private color group and set the text/highlighted text colors
- TQColorGroup mcg = lv->viewport()->colorGroup();
+ TQColorGroup mcg = lv->viewport()->tqcolorGroup();
if ( col ) // col 0 is drawn by the superclass method
p->fillRect( 0, 0, width, height(), TQBrush( mcg.base() ) );
@@ -1492,7 +1492,7 @@ void KateStyleListItem::paintCell( TQPainter *p, const TQColorGroup& /*cg*/, int
}
TQFont f ( ((KateStyleListView*)lv)->docfont );
p->setFont( is->font(f) );
- // FIXME - repainting when text is cropped, and the column is enlarged is buggy.
+ // FIXME - tqrepainting when text is cropped, and the column is enlarged is buggy.
// Maybe I need painting the string myself :(
// (wilbert) it depends on the font used
TQListViewItem::paintCell( p, mcg, col, width, align );
@@ -1602,7 +1602,7 @@ void KateStyleListCaption::paintCell( TQPainter *p, const TQColorGroup& /*cg*/,
Q_ASSERT( lv ); //###
// use the same colorgroup as the other items in the viewport
- TQColorGroup mcg = lv->viewport()->colorGroup();
+ TQColorGroup mcg = lv->viewport()->tqcolorGroup();
TQListViewItem::paintCell( p, mcg, col, width, align );
}
diff --git a/kate/part/kateschema.h b/kate/part/kateschema.h
index 38b15a05..4afd2625 100644
--- a/kate/part/kateschema.h
+++ b/kate/part/kateschema.h
@@ -125,7 +125,7 @@ class KateViewSchemaAction : public KActionMenu
popup menu and a slot to edit a style using the keyboard.
Added by anders, jan 23 2002.
*/
-class KateStyleListView : public QListView
+class KateStyleListView : public TQListView
{
Q_OBJECT
@@ -160,7 +160,7 @@ class KateStyleListView : public QListView
TQFont docfont;
};
-class KateSchemaConfigColorTab : public QWidget
+class KateSchemaConfigColorTab : public TQWidget
{
Q_OBJECT
@@ -198,7 +198,7 @@ class KateSchemaConfigColorTab : public QWidget
void schemaChanged( int newSchema );
signals:
- void changed(); // connected to parentWidget()->parentWidget() TQT_SLOT(slotChanged)
+ void changed(); // connected to tqparentWidget()->tqparentWidget() TQT_SLOT(slotChanged)
protected slots:
void slotMarkerColorChanged(const TQColor&);
@@ -207,7 +207,7 @@ class KateSchemaConfigColorTab : public QWidget
typedef TQMap<int,TQFont> FontMap; // ### remove it
-class KateSchemaConfigFontTab : public QWidget
+class KateSchemaConfigFontTab : public TQWidget
{
Q_OBJECT
@@ -223,7 +223,7 @@ class KateSchemaConfigFontTab : public QWidget
void schemaChanged( int newSchema );
signals:
- void changed(); // connected to parentWidget()->parentWidget() TQT_SLOT(slotChanged)
+ void changed(); // connected to tqparentWidget()->tqparentWidget() TQT_SLOT(slotChanged)
private:
class KFontChooser *m_fontchooser;
@@ -234,7 +234,7 @@ class KateSchemaConfigFontTab : public QWidget
void slotFontSelected( const TQFont &font );
};
-class KateSchemaConfigFontColorTab : public QWidget
+class KateSchemaConfigFontColorTab : public TQWidget
{
Q_OBJECT
@@ -254,7 +254,7 @@ class KateSchemaConfigFontColorTab : public QWidget
TQIntDict<KateAttributeList> m_defaultStyleLists;
};
-class KateSchemaConfigHighlightTab : public QWidget
+class KateSchemaConfigHighlightTab : public TQWidget
{
Q_OBJECT
diff --git a/kate/part/katesearch.cpp b/kate/part/katesearch.cpp
index 742b57a3..4a64af97 100644
--- a/kate/part/katesearch.cpp
+++ b/kate/part/katesearch.cpp
@@ -81,7 +81,7 @@ void KateSearch::createActions( KActionCollection* ac )
void KateSearch::addToList( TQStringList& list, const TQString& s )
{
if( list.count() > 0 ) {
- TQStringList::Iterator it = list.find( s );
+ TQStringList::Iterator it = list.tqfind( s );
if( *it != 0L )
list.remove( it );
if( list.count() >= 16 )
@@ -110,7 +110,7 @@ void KateSearch::find()
}
delete findDialog;
- m_view->repaintText ();
+ m_view->tqrepaintText ();
}
void KateSearch::find( const TQString &pattern, long flags, bool add, bool shownotfound )
@@ -851,7 +851,7 @@ bool SearchCommand::exec(class Kate::View *view, const TQString &cmd, TQString &
// Else, it's just one or two (space separated) words
TQRegExp re_rep2("replace(?::([bceprsw]*))?\\s+(\\S+)(.*)");
#define unbackslash(s) p=0;\
-while ( (p = pattern.find( '\\' + delim, p )) > -1 )\
+while ( (p = pattern.tqfind( '\\' + delim, p )) > -1 )\
{\
if ( !p || pattern[p-1] != '\\' )\
pattern.remove( p, 1 );\
diff --git a/kate/part/katesearch.h b/kate/part/katesearch.h
index ebf228dc..bec9eb51 100644
--- a/kate/part/katesearch.h
+++ b/kate/part/katesearch.h
@@ -39,7 +39,7 @@ class KateSuperRangeList;
class KActionCollection;
-class KateSearch : public QObject
+class KateSearch : public TQObject
{
Q_OBJECT
diff --git a/kate/part/katespell.h b/kate/part/katespell.h
index f376ece4..870a8819 100644
--- a/kate/part/katespell.h
+++ b/kate/part/katespell.h
@@ -30,7 +30,7 @@ class KateView;
class KAction;
class KSpell;
-class KateSpell : public QObject
+class KateSpell : public TQObject
{
Q_OBJECT
diff --git a/kate/part/katesyntaxdocument.h b/kate/part/katesyntaxdocument.h
index 93deb731..6599c05c 100644
--- a/kate/part/katesyntaxdocument.h
+++ b/kate/part/katesyntaxdocument.h
@@ -61,7 +61,7 @@ class KateSyntaxContextData
/**
* Store and manage the information about Syntax Highlighting.
*/
-class KateSyntaxDocument : public QDomDocument
+class KateSyntaxDocument : public TQDomDocument
{
public:
/**
diff --git a/kate/part/katetextline.cpp b/kate/part/katetextline.cpp
index e64b928c..1d6fcf45 100644
--- a/kate/part/katetextline.cpp
+++ b/kate/part/katetextline.cpp
@@ -110,11 +110,11 @@ void KateTextLine::truncate(uint newLen)
int KateTextLine::nextNonSpaceChar(uint pos) const
{
const uint len = m_text.length();
- const TQChar *unicode = m_text.unicode();
+ const TQChar *tqunicode = m_text.tqunicode();
for(uint i = pos; i < len; i++)
{
- if(!unicode[i].isSpace())
+ if(!tqunicode[i].isSpace())
return i;
}
@@ -128,11 +128,11 @@ int KateTextLine::previousNonSpaceChar(uint pos) const
if (pos >= (uint)len)
pos = len - 1;
- const TQChar *unicode = m_text.unicode();
+ const TQChar *tqunicode = m_text.tqunicode();
for(int i = pos; i >= 0; i--)
{
- if(!unicode[i].isSpace())
+ if(!tqunicode[i].isSpace())
return i;
}
@@ -152,20 +152,20 @@ int KateTextLine::lastChar() const
const TQChar *KateTextLine::firstNonSpace() const
{
int first = firstChar();
- return (first > -1) ? ((TQChar*)m_text.unicode())+first : m_text.unicode();
+ return (first > -1) ? ((TQChar*)m_text.tqunicode())+first : m_text.tqunicode();
}
uint KateTextLine::indentDepth (uint tabwidth) const
{
uint d = 0;
const uint len = m_text.length();
- const TQChar *unicode = m_text.unicode();
+ const TQChar *tqunicode = m_text.tqunicode();
for(uint i = 0; i < len; i++)
{
- if(unicode[i].isSpace())
+ if(tqunicode[i].isSpace())
{
- if (unicode[i] == TQChar('\t'))
+ if (tqunicode[i] == TQChar('\t'))
d += tabwidth - (d % tabwidth);
else
d++;
@@ -189,11 +189,11 @@ bool KateTextLine::stringAtPos(uint pos, const TQString& match) const
// overflow again which (pos+matchlen > len) does not catch; see bugs #129263 and #129580
Q_ASSERT(pos < len);
- const TQChar *unicode = m_text.unicode();
- const TQChar *matchUnicode = match.unicode();
+ const TQChar *tqunicode = m_text.tqunicode();
+ const TQChar *matchUnicode = match.tqunicode();
for (uint i=0; i < matchlen; i++)
- if (unicode[i+pos] != matchUnicode[i])
+ if (tqunicode[i+pos] != matchUnicode[i])
return false;
return true;
@@ -206,11 +206,11 @@ bool KateTextLine::startingWith(const TQString& match) const
if (matchlen > m_text.length())
return false;
- const TQChar *unicode = m_text.unicode();
- const TQChar *matchUnicode = match.unicode();
+ const TQChar *tqunicode = m_text.tqunicode();
+ const TQChar *matchUnicode = match.tqunicode();
for (uint i=0; i < matchlen; i++)
- if (unicode[i] != matchUnicode[i])
+ if (tqunicode[i] != matchUnicode[i])
return false;
return true;
@@ -223,12 +223,12 @@ bool KateTextLine::endingWith(const TQString& match) const
if (matchlen > m_text.length())
return false;
- const TQChar *unicode = m_text.unicode();
- const TQChar *matchUnicode = match.unicode();
+ const TQChar *tqunicode = m_text.tqunicode();
+ const TQChar *matchUnicode = match.tqunicode();
uint start = m_text.length() - matchlen;
for (uint i=0; i < matchlen; i++)
- if (unicode[start+i] != matchUnicode[i])
+ if (tqunicode[start+i] != matchUnicode[i])
return false;
return true;
@@ -239,11 +239,11 @@ int KateTextLine::cursorX(uint pos, uint tabChars) const
uint x = 0;
const uint n = kMin (pos, m_text.length());
- const TQChar *unicode = m_text.unicode();
+ const TQChar *tqunicode = m_text.tqunicode();
for ( uint z = 0; z < n; z++)
{
- if (unicode[z] == TQChar('\t'))
+ if (tqunicode[z] == TQChar('\t'))
x += tabChars - (x % tabChars);
else
x++;
@@ -257,11 +257,11 @@ uint KateTextLine::lengthWithTabs (uint tabChars) const
{
uint x = 0;
const uint len = m_text.length();
- const TQChar *unicode = m_text.unicode();
+ const TQChar *tqunicode = m_text.tqunicode();
for ( uint z = 0; z < len; z++)
{
- if (unicode[z] == TQChar('\t'))
+ if (tqunicode[z] == TQChar('\t'))
x += tabChars - (x % tabChars);
else
x++;
@@ -346,7 +346,7 @@ char *KateTextLine::dump (char *buf, bool withHighlighting) const
memcpy(buf, &l, sizeof(uint));
buf += sizeof(uint);
- memcpy(buf, (char *) m_text.unicode(), sizeof(TQChar)*l);
+ memcpy(buf, (char *) m_text.tqunicode(), sizeof(TQChar)*l);
buf += sizeof(TQChar) * l;
if (!withHighlighting)
diff --git a/kate/part/katetextline.h b/kate/part/katetextline.h
index 3922d04d..84df8290 100644
--- a/kate/part/katetextline.h
+++ b/kate/part/katetextline.h
@@ -145,10 +145,10 @@ class KateTextLine : public KShared
inline TQChar getChar (uint pos) const { return m_text[pos]; }
/**
- * Gets the text as a unicode representation
+ * Gets the text as a tqunicode representation
* @return text of this line as TQChar array
*/
- inline const TQChar *text() const { return m_text.unicode(); }
+ inline const TQChar *text() const { return m_text.tqunicode(); }
/**
* Highlighting array
@@ -419,7 +419,7 @@ class KateTextLine : public KShared
*/
private:
/**
- * text of line as unicode
+ * text of line as tqunicode
*/
TQString m_text;
diff --git a/kate/part/kateview.cpp b/kate/part/kateview.cpp
index 7840e79d..c486a6d8 100644
--- a/kate/part/kateview.cpp
+++ b/kate/part/kateview.cpp
@@ -793,7 +793,7 @@ void KateView::contextMenuEvent( TQContextMenuEvent *ev )
if ( !m_doc || !m_doc->browserExtension() )
return;
emit m_doc->browserExtension()->popupMenu( /*this, */ev->globalPos(), m_doc->url(),
- TQString::fromLatin1( "text/plain" ) );
+ TQString::tqfromLatin1( "text/plain" ) );
ev->accept();
}
@@ -1233,11 +1233,11 @@ void KateView::updateRendererConfig()
// update the text area
m_viewInternal->updateView (true);
- m_viewInternal->repaint ();
+ m_viewInternal->tqrepaint ();
// update the left border right, for example linenumbers
m_viewInternal->leftBorder->updateFont();
- m_viewInternal->leftBorder->repaint ();
+ m_viewInternal->leftBorder->tqrepaint ();
// @@ showIndentLines is not cached anymore.
// m_renderer->setShowIndentLines (m_renderer->config()->showIndentationLines());
@@ -1305,7 +1305,7 @@ void KateView::clear ()
m_viewInternal->clear ();
}
-void KateView::repaintText (bool paintOnlyDirty)
+void KateView::tqrepaintText (bool paintOnlyDirty)
{
m_viewInternal->paintText(0,0,m_viewInternal->width(),m_viewInternal->height(), paintOnlyDirty);
}
@@ -1360,7 +1360,7 @@ bool KateView::setSelection( const KateTextCursor& start, const KateTextCursor&
tagSelection(oldSelectStart, oldSelectEnd);
- repaintText(true);
+ tqrepaintText(true);
emit selectionChanged ();
emit m_doc->selectionChanged ();
@@ -1405,7 +1405,7 @@ bool KateView::clearSelection(bool redraw, bool finishedChangingSelection)
oldSelectEnd = selectEnd;
if (redraw)
- repaintText(true);
+ tqrepaintText(true);
if (finishedChangingSelection)
{
@@ -1596,7 +1596,7 @@ void KateView::paste()
{
m_doc->paste( this );
emit selectionChanged();
- m_viewInternal->repaint();
+ m_viewInternal->tqrepaint();
}
void KateView::cut()
diff --git a/kate/part/kateview.h b/kate/part/kateview.h
index aa428096..0f62fe44 100644
--- a/kate/part/kateview.h
+++ b/kate/part/kateview.h
@@ -270,7 +270,7 @@ class KateView : public Kate::View,
void clear ();
- void repaintText (bool paintOnlyDirty = false);
+ void tqrepaintText (bool paintOnlyDirty = false);
void updateView (bool changed = false);
//END
diff --git a/kate/part/kateviewhelpers.cpp b/kate/part/kateviewhelpers.cpp
index da88676b..b379773b 100644
--- a/kate/part/kateviewhelpers.cpp
+++ b/kate/part/kateviewhelpers.cpp
@@ -244,7 +244,7 @@ class KateCmdLnWhatsThis : public QWhatsThis
Kate::Command *cmd = KateCmd::self()->queryCommand( name );
if ( cmd )
{
- if ( cmd->help( (Kate::View*)m_parent->parentWidget(), name, s ) )
+ if ( cmd->help( (Kate::View*)m_parent->tqparentWidget(), name, s ) )
return beg + name + mid + s + end;
else
return beg + name + mid + i18n("No help for '%1'").arg( name ) + end;
@@ -380,7 +380,7 @@ void KateCmdLine::slotReturnPressed ( const TQString& text )
void KateCmdLine::hideMe () // unless i have focus ;)
{
- if ( isVisibleTo(parentWidget()) && ! hasFocus() ) {
+ if ( isVisibleTo(tqparentWidget()) && ! hasFocus() ) {
m_view->toggleCmdLine ();
}
}
@@ -697,7 +697,7 @@ KateIconBorder::KateIconBorder ( KateViewInternal* internalView, TQWidget *paren
, m_cachedLNWidth( 0 )
, m_maxCharWidth( 0 )
{
- setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) );
+ tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) );
setBackgroundMode( NoBackground );
@@ -757,7 +757,7 @@ void KateIconBorder::setFoldingMarkersOn( bool enable )
TQTimer::singleShot( 0, this, TQT_SLOT(update()) );
}
-TQSize KateIconBorder::sizeHint() const
+TQSize KateIconBorder::tqsizeHint() const
{
int w = 0;
@@ -866,7 +866,7 @@ void KateIconBorder::paintBorder (int /*x*/, int y, int /*width*/, int height)
{
// we went from n0 ->n9 lines or vice verca
// this causes an extra updateGeometry() first time the line numbers
- // are displayed, but sizeHint() is supposed to be const so we can't set
+ // are displayed, but tqsizeHint() is supposed to be const so we can't set
// the cached value there.
m_cachedLNWidth = lnWidth;
m_oldBackgroundColor = m_view->renderer()->config()->iconBarColor();
diff --git a/kate/part/kateviewhelpers.h b/kate/part/kateviewhelpers.h
index 8e3fa94b..b17db996 100644
--- a/kate/part/kateviewhelpers.h
+++ b/kate/part/kateviewhelpers.h
@@ -45,7 +45,7 @@ namespace Kate {
*
* Also, it adds some usefull indicators on the scrollbar.
*/
-class KateScrollBar : public QScrollBar
+class KateScrollBar : public TQScrollBar
{
Q_OBJECT
@@ -119,7 +119,7 @@ class KateCmdLine : public KLineEdit
class KateCmdLnWhatsThis *m_help;
};
-class KateIconBorder : public QWidget
+class KateIconBorder : public TQWidget
{
Q_OBJECT
@@ -127,7 +127,7 @@ class KateIconBorder : public QWidget
KateIconBorder( KateViewInternal* internalView, TQWidget *parent );
// VERY IMPORTANT ;)
- virtual TQSize sizeHint() const;
+ virtual TQSize tqsizeHint() const;
void updateFont();
int lineNumberWidth() const;
diff --git a/kate/part/kateviewinternal.cpp b/kate/part/kateviewinternal.cpp
index 77f98643..569397f0 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);
- // invalidate selStartCached, or keyb selection is screwed initially
+ // tqinvalidate 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 ); // invalidate
+ selStartCached.setLine( -1 ); // tqinvalidate
}
if( !( e->state() & Qt::ShiftButton ) && isTargetSelected( e->pos() ) )
diff --git a/kate/part/kateviewinternal.h b/kate/part/kateviewinternal.h
index 9b0a940b..8e7b3a89 100644
--- a/kate/part/kateviewinternal.h
+++ b/kate/part/kateviewinternal.h
@@ -49,7 +49,7 @@ enum Bias
right = 1
};
-class KateViewInternal : public QWidget
+class KateViewInternal : public TQWidget
{
Q_OBJECT
@@ -221,7 +221,7 @@ class KateViewInternal : public QWidget
int scrollX;
int scrollY;
- Qt::CursorShape m_mouseCursor;
+ Qt::tqCursorShape m_mouseCursor;
KateSuperCursor cursor;
KateTextCursor displayCursor;
diff --git a/kate/part/test_regression.cpp b/kate/part/test_regression.cpp
index e3f9f52e..9fee1654 100644
--- a/kate/part/test_regression.cpp
+++ b/kate/part/test_regression.cpp
@@ -515,7 +515,7 @@ int main(int argc, char *argv[])
KateDocument *part = new KateDocument(/*bSingleViewMode*/true,
/*bBrowserView*/false,
/*bReadOnly*/false,
- /*parentWidget*/toplevel,
+ /*tqparentWidget*/toplevel,
/*widgetName*/"testkate");
part->readConfig(&cfg);
@@ -869,10 +869,10 @@ static TQString makeRelativePath(const TQString &base, const TQString &path)
int pos = 0;
do {
pos++;
- int newpos = absBase.find('/', pos);
+ int newpos = absBase.tqfind('/', pos);
if (newpos == -1) newpos = absBase.length();
- TQConstString cmpPathComp(absPath.unicode() + pos, newpos - pos);
- TQConstString cmpBaseComp(absBase.unicode() + pos, newpos - pos);
+ TQConstString cmpPathComp(absPath.tqunicode() + pos, newpos - pos);
+ TQConstString cmpBaseComp(absBase.tqunicode() + pos, newpos - pos);
// kdDebug() << "cmpPathComp: \"" << cmpPathComp.string() << "\"" << endl;
// kdDebug() << "cmpBaseComp: \"" << cmpBaseComp.string() << "\"" << endl;
// kdDebug() << "pos: " << pos << " newpos: " << newpos << endl;
@@ -886,8 +886,8 @@ static TQString makeRelativePath(const TQString &base, const TQString &path)
TQString rel;
{
- TQConstString relBase(absBase.unicode() + basepos, absBase.length() - basepos);
- TQConstString relPath(absPath.unicode() + pathpos, absPath.length() - pathpos);
+ TQConstString relBase(absBase.tqunicode() + basepos, absBase.length() - basepos);
+ TQConstString relPath(absPath.tqunicode() + pathpos, absPath.length() - pathpos);
// generate as many .. as there are path elements in relBase
if (relBase.string().length() > 0) {
for (int i = relBase.string().contains('/'); i > 0; --i)
@@ -935,7 +935,7 @@ void RegressionTest::doFailureReport( const TQString& test, int failures )
if ( failures & ResultFailure ) {
domDiff += "<pre>";
- FILE *pipe = popen( TQString::fromLatin1( "diff -u baseline/%1-result %3/%2-result" )
+ FILE *pipe = popen( TQString::tqfromLatin1( "diff -u baseline/%1-result %3/%2-result" )
.arg ( test, test, relOutputDir ).latin1(), "r" );
TQTextIStream *is = new TQTextIStream( pipe );
for ( int line = 0; line < 100 && !is->eof(); ++line ) {
@@ -1026,7 +1026,7 @@ void RegressionTest::doFailureReport( const TQString& test, int failures )
void RegressionTest::testStaticFile(const TQString & filename, const TQStringList &commands)
{
- qApp->mainWidget()->resize( 800, 600); // restore size
+ tqApp->mainWidget()->resize( 800, 600); // restore size
// Set arguments
KParts::URLArgs args;
@@ -1334,7 +1334,7 @@ bool RegressionTest::svnIgnored( const TQString &filename )
void RegressionTest::resizeTopLevelWidget( int w, int h )
{
- qApp->mainWidget()->resize( w, h );
+ tqApp->mainWidget()->resize( w, h );
// Since we're not visible, this doesn't have an immediate effect, TQWidget posts the event
TQApplication::sendPostedEvents( 0, TQEvent::Resize );
}
diff --git a/kate/part/test_regression.h b/kate/part/test_regression.h
index ee4f8fdf..0bc71771 100644
--- a/kate/part/test_regression.h
+++ b/kate/part/test_regression.h
@@ -160,7 +160,7 @@ class OutputFunction : public KJS::ObjectImp
/**
* @internal
*/
-class RegressionTest : public QObject
+class RegressionTest : public TQObject
{
Q_OBJECT
public:
diff --git a/kate/plugins/autobookmarker/autobookmarker.cpp b/kate/plugins/autobookmarker/autobookmarker.cpp
index c03fcefe..92fe6086 100644
--- a/kate/plugins/autobookmarker/autobookmarker.cpp
+++ b/kate/plugins/autobookmarker/autobookmarker.cpp
@@ -114,7 +114,7 @@ void AutoBookmarker::slotCompleted()
// get the document info
KTextEditor::DocumentInfoInterface *di =
static_cast<KTextEditor::DocumentInfoInterface*>(document()->
- qt_cast("KTextEditor::DocumentInfoInterface"));
+ tqqt_cast("KTextEditor::DocumentInfoInterface"));
TQString mt;
if ( di ) // we can still try match the URL otherwise
mt = di->mimeType();
diff --git a/kate/plugins/kdatatool/kate_kdatatool.cpp b/kate/plugins/kdatatool/kate_kdatatool.cpp
index 11cd645b..41c19b9e 100644
--- a/kate/plugins/kdatatool/kate_kdatatool.cpp
+++ b/kate/plugins/kdatatool/kate_kdatatool.cpp
@@ -108,7 +108,7 @@ void KDataToolPluginView::aboutToShow()
if ( selectionInterface(m_view->document())->hasSelection() )
{
word = selectionInterface(m_view->document())->selection();
- if ( word.find(' ') == -1 && word.find('\t') == -1 && word.find('\n') == -1 )
+ if ( word.tqfind(' ') == -1 && word.tqfind('\t') == -1 && word.tqfind('\n') == -1 )
m_singleWord = true;
else
m_singleWord = false;
diff --git a/kcert/kcertpart.cc b/kcert/kcertpart.cc
index e704ad33..9e4bf14d 100644
--- a/kcert/kcertpart.cc
+++ b/kcert/kcertpart.cc
@@ -127,7 +127,7 @@ class KCertPartPrivate {
};
-KCertPart::KCertPart(TQWidget *parentWidget, const char *widgetName,
+KCertPart::KCertPart(TQWidget *tqparentWidget, const char *widgetName,
TQObject *parent, const char *name,
const TQStringList & /*args*/ )
: KParts::ReadWritePart(parent, name) {
@@ -149,7 +149,7 @@ _silentImport = false;
d = new KCertPartPrivate;
d->browserExtension = new KParts::BrowserExtension(this);
-_frame = new TQFrame(parentWidget, widgetName);
+_frame = new TQFrame(tqparentWidget, widgetName);
setWidget(_frame);
_baseGrid = new TQGridLayout(_frame, 15, 9, KDialog::marginHint(),
@@ -524,7 +524,7 @@ if (whatType == "application/x-pkcs12") {
const char *signature = "-----BEGIN CERTIFICATE-----";
theFile[(uint)(qf.size()-1)] = 0;
- isPEM = (TQCString(theFile.data()).find(signature) >= 0);
+ isPEM = (TQCString(theFile.data()).tqfind(signature) >= 0);
}
fp = fopen(m_file.local8Bit(), "r");
@@ -636,7 +636,7 @@ void KCertPart::displayCACert(KSSLCertificate *c) {
// Set the valid period
TQPalette cspl = _ca_validFrom->palette();
- if (TQDateTime::currentDateTime() < c->getQDTNotBefore()) {
+ if (TQDateTime::tqcurrentDateTime() < c->getQDTNotBefore()) {
cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
} else {
cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@@ -645,7 +645,7 @@ void KCertPart::displayCACert(KSSLCertificate *c) {
_ca_validFrom->setText(c->getNotBefore());
cspl = _ca_validUntil->palette();
- if (TQDateTime::currentDateTime() > c->getQDTNotAfter()) {
+ if (TQDateTime::tqcurrentDateTime() > c->getQDTNotAfter()) {
cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
} else {
cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@@ -677,7 +677,7 @@ void KCertPart::displayPKCS12Cert(KSSLCertificate *c) {
// Set the valid period
TQPalette cspl = _p12_validFrom->palette();
- if (TQDateTime::currentDateTime() < c->getQDTNotBefore()) {
+ if (TQDateTime::tqcurrentDateTime() < c->getQDTNotBefore()) {
cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
} else {
cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@@ -686,7 +686,7 @@ void KCertPart::displayPKCS12Cert(KSSLCertificate *c) {
_p12_validFrom->setText(c->getNotBefore());
cspl = _p12_validUntil->palette();
- if (TQDateTime::currentDateTime() > c->getQDTNotAfter()) {
+ if (TQDateTime::tqcurrentDateTime() > c->getQDTNotAfter()) {
cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
} else {
cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
diff --git a/kcert/kcertpart.h b/kcert/kcertpart.h
index ec011c08..9b5520f3 100644
--- a/kcert/kcertpart.h
+++ b/kcert/kcertpart.h
@@ -68,7 +68,7 @@ class KPKCS12Item : public KListViewItem {
class KCertPart : public KParts::ReadWritePart {
Q_OBJECT
public:
- KCertPart(TQWidget *parentWidget, const char *widgetName,
+ KCertPart(TQWidget *tqparentWidget, const char *widgetName,
TQObject *parent = 0L, const char *name = 0L,
const TQStringList &args = TQStringList() );
virtual ~KCertPart();
diff --git a/kconf_update/kconf_update.cpp b/kconf_update/kconf_update.cpp
index a3a165ab..ec4447ab 100644
--- a/kconf_update/kconf_update.cpp
+++ b/kconf_update/kconf_update.cpp
@@ -201,7 +201,7 @@ KonfUpdate::log()
}
}
- (*m_textStream) << TQDateTime::currentDateTime().toString( Qt::ISODate ) << " ";
+ (*m_textStream) << TQDateTime::tqcurrentDateTime().toString( Qt::ISODate ) << " ";
return *m_textStream;
}
@@ -218,7 +218,7 @@ TQStringList KonfUpdate::findUpdateFiles(bool dirtyOnly)
struct stat buff;
if (stat( TQFile::encodeName(file), &buff) == 0)
{
- int i = file.findRev('/');
+ int i = file.tqfindRev('/');
if (i != -1)
file = file.mid(i+1);
config->setGroup(file);
@@ -237,7 +237,7 @@ TQStringList KonfUpdate::findUpdateFiles(bool dirtyOnly)
bool KonfUpdate::checkFile(const TQString &filename)
{
currentFilename = filename;
- int i = currentFilename.findRev('/');
+ int i = currentFilename.tqfindRev('/');
if (i != -1)
currentFilename = currentFilename.mid(i+1);
skip = true;
@@ -268,7 +268,7 @@ bool KonfUpdate::checkFile(const TQString &filename)
void KonfUpdate::checkGotFile(const TQString &_file, const TQString &id)
{
TQString file;
- int i = _file.find(',');
+ int i = _file.tqfind(',');
if (i == -1)
{
file = _file.stripWhiteSpace();
@@ -283,7 +283,7 @@ void KonfUpdate::checkGotFile(const TQString &_file, const TQString &id)
KSimpleConfig cfg(file);
cfg.setGroup("$Version");
TQStringList ids = cfg.readListEntry("update_info");
- if (ids.contains(id))
+ if (ids.tqcontains(id))
return;
ids.append(id);
cfg.writeEntry("update_info", ids);
@@ -311,7 +311,7 @@ void KonfUpdate::checkGotFile(const TQString &_file, const TQString &id)
bool KonfUpdate::updateFile(const TQString &filename)
{
currentFilename = filename;
- int i = currentFilename.findRev('/');
+ int i = currentFilename.tqfindRev('/');
if (i != -1)
currentFilename = currentFilename.mid(i+1);
skip = true;
@@ -398,7 +398,7 @@ void KonfUpdate::gotId(const TQString &_id)
{
config->setGroup(currentFilename);
TQStringList ids = config->readListEntry("done");
- if (!ids.contains(id))
+ if (!ids.tqcontains(id))
{
ids.append(id);
config->writeEntry("done", ids);
@@ -413,7 +413,7 @@ void KonfUpdate::gotId(const TQString &_id)
TQStringList ids = config->readListEntry("done");
if (!_id.isEmpty())
{
- if (ids.contains(_id))
+ if (ids.tqcontains(_id))
{
//qDebug("Id '%s' was already in done-list", _id.latin1());
if (!m_bUseConfigInfo)
@@ -445,7 +445,7 @@ void KonfUpdate::gotFile(const TQString &_file)
oldConfig2->setGroup("$Version");
TQStringList ids = oldConfig2->readListEntry("update_info");
TQString cfg_id = currentFilename + ":" + id;
- if (!ids.contains(cfg_id) && !skip)
+ if (!ids.tqcontains(cfg_id) && !skip)
{
ids.append(cfg_id);
oldConfig2->writeEntry("update_info", ids);
@@ -473,7 +473,7 @@ void KonfUpdate::gotFile(const TQString &_file)
newConfig->setGroup("$Version");
TQStringList ids = newConfig->readListEntry("update_info");
TQString cfg_id = currentFilename + ":" + id;
- if (!ids.contains(cfg_id) && !skip)
+ if (!ids.tqcontains(cfg_id) && !skip)
{
ids.append(cfg_id);
newConfig->writeEntry("update_info", ids);
@@ -486,7 +486,7 @@ void KonfUpdate::gotFile(const TQString &_file)
}
newConfig = 0;
- int i = _file.find(',');
+ int i = _file.tqfind(',');
if (i == -1)
{
oldFile = _file.stripWhiteSpace();
@@ -505,7 +505,7 @@ void KonfUpdate::gotFile(const TQString &_file)
TQString cfg_id = currentFilename + ":" + id;
oldConfig2->setGroup("$Version");
TQStringList ids = oldConfig2->readListEntry("update_info");
- if (ids.contains(cfg_id))
+ if (ids.tqcontains(cfg_id))
{
skip = true;
newFile = TQString::null;
@@ -517,7 +517,7 @@ void KonfUpdate::gotFile(const TQString &_file)
newConfig = new KConfig(newFile, false, false);
newConfig->setGroup("$Version");
ids = newConfig->readListEntry("update_info");
- if (ids.contains(cfg_id))
+ if (ids.tqcontains(cfg_id))
{
skip = true;
log() << currentFilename << ": Skipping update '" &l