From 6c79d50fa9fbdff7f69ca57a8ab5fcc942375593 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 22:19:39 +0000 Subject: rename the following methods: tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kfilereplace/kaddstringdlg.cpp | 2 +- kfilereplace/kaddstringdlg.h | 2 +- kfilereplace/kfilereplacepart.cpp | 2 +- kfilereplace/kfilereplacepart.h | 2 +- kfilereplace/kfilereplaceview.cpp | 8 +- kfilereplace/kfilereplaceview.h | 2 +- kfilereplace/knewprojectdlg.cpp | 2 +- kfilereplace/knewprojectdlg.h | 2 +- kfilereplace/koptionsdlg.cpp | 2 +- kfilereplace/koptionsdlg.h | 2 +- kimagemapeditor/arealistview.cpp | 4 +- kimagemapeditor/arealistview.h | 2 +- kimagemapeditor/drawzone.cpp | 6 +- kimagemapeditor/drawzone.h | 2 +- kimagemapeditor/imagemap.cpp | 6 +- kimagemapeditor/imagemap.h | 2 +- kimagemapeditor/imageslistview.cpp | 8 +- kimagemapeditor/imageslistview.h | 2 +- kimagemapeditor/kimagemapeditor.cpp | 8 +- kimagemapeditor/kimagemapeditor.h | 2 +- kimagemapeditor/kimearea.cpp | 52 ++-- kimagemapeditor/kimedialogs.cpp | 74 +++--- kimagemapeditor/kimedialogs.h | 20 +- kimagemapeditor/mapslistview.cpp | 4 +- kimagemapeditor/mapslistview.h | 2 +- kimagemapeditor/qextfileinfo.cpp | 12 +- kimagemapeditor/qextfileinfo.h | 6 +- klinkstatus/FEATURES | 2 +- klinkstatus/src/actionmanager.cpp | 4 +- klinkstatus/src/actionmanager.h | 2 +- klinkstatus/src/engine/linkchecker.cpp | 10 +- klinkstatus/src/engine/linkchecker.h | 2 +- klinkstatus/src/engine/linkstatus.cpp | 2 +- klinkstatus/src/engine/linkstatus.h | 8 +- klinkstatus/src/engine/linkstatus_impl.h | 20 +- klinkstatus/src/engine/searchmanager.cpp | 4 +- klinkstatus/src/engine/searchmanager.h | 2 +- klinkstatus/src/global.cpp | 4 +- klinkstatus/src/global.h | 2 +- klinkstatus/src/klinkstatus_part.cpp | 4 +- klinkstatus/src/klinkstatus_part.h | 2 +- klinkstatus/src/parser/url.cpp | 2 +- klinkstatus/src/ui/documentrootdialog.cpp | 4 +- klinkstatus/src/ui/documentrootdialog.h | 2 +- klinkstatus/src/ui/klshistorycombo.cpp | 4 +- klinkstatus/src/ui/klshistorycombo.h | 2 +- klinkstatus/src/ui/resultssearchbar.cpp | 4 +- klinkstatus/src/ui/resultssearchbar.h | 2 +- klinkstatus/src/ui/sessionwidget.cpp | 6 +- klinkstatus/src/ui/sessionwidget.h | 2 +- klinkstatus/src/ui/sessionwidgetbase.ui | 2 +- .../src/ui/settings/configidentificationdialog.cpp | 4 +- .../src/ui/settings/configidentificationdialog.h | 2 +- klinkstatus/src/ui/settings/configsearchdialog.ui | 2 +- klinkstatus/src/ui/tablelinkstatus.cpp | 8 +- klinkstatus/src/ui/tablelinkstatus.h | 2 +- klinkstatus/src/ui/tabwidgetsession.cpp | 4 +- klinkstatus/src/ui/tabwidgetsession.h | 2 +- klinkstatus/src/ui/treeview.cpp | 32 +-- klinkstatus/src/ui/treeview.h | 4 +- klinkstatus/src/utils/xsl.cpp | 4 +- klinkstatus/src/utils/xsl.h | 2 +- kommander/Kommander-TODO.kno | 2 +- kommander/editor/actiondnd.cpp | 18 +- kommander/editor/actiondnd.h | 16 +- kommander/editor/actioneditorimpl.cpp | 10 +- kommander/editor/actioneditorimpl.h | 2 +- kommander/editor/actionlistview.cpp | 4 +- kommander/editor/actionlistview.h | 10 +- kommander/editor/asciivalidator.cpp | 12 +- kommander/editor/asciivalidator.h | 6 +- kommander/editor/assistproc.cpp | 4 +- kommander/editor/assistproc.h | 2 +- kommander/editor/command.cpp | 28 +- kommander/editor/command.h | 10 +- kommander/editor/connectioneditorimpl.cpp | 4 +- kommander/editor/connectioneditorimpl.h | 2 +- kommander/editor/filechooser.cpp | 4 +- kommander/editor/filechooser.h | 2 +- kommander/editor/formsettingsimpl.cpp | 4 +- kommander/editor/formsettingsimpl.h | 2 +- kommander/editor/formwindow.cpp | 32 +-- kommander/editor/formwindow.h | 6 +- kommander/editor/hierarchyview.cpp | 76 +++--- kommander/editor/hierarchyview.h | 10 +- kommander/editor/iconvieweditorimpl.cpp | 4 +- kommander/editor/iconvieweditorimpl.h | 2 +- kommander/editor/layout.cpp | 60 ++--- kommander/editor/layout.h | 8 +- kommander/editor/listboxeditorimpl.cpp | 4 +- kommander/editor/listboxeditorimpl.h | 2 +- kommander/editor/listvieweditorimpl.cpp | 36 +-- kommander/editor/listvieweditorimpl.h | 2 +- kommander/editor/mainwindow.cpp | 24 +- kommander/editor/mainwindow.h | 4 +- kommander/editor/mainwindowactions.cpp | 2 +- kommander/editor/messagelog.cpp | 2 +- kommander/editor/messagelog.h | 2 +- kommander/editor/multilineeditorimpl.cpp | 12 +- kommander/editor/multilineeditorimpl.h | 6 +- kommander/editor/newformimpl.cpp | 4 +- kommander/editor/newformimpl.h | 2 +- kommander/editor/paletteeditoradvancedimpl.cpp | 8 +- kommander/editor/paletteeditoradvancedimpl.h | 4 +- kommander/editor/paletteeditorimpl.cpp | 8 +- kommander/editor/paletteeditorimpl.h | 4 +- kommander/editor/pixmapchooser.cpp | 22 +- kommander/editor/pixmapchooser.h | 8 +- kommander/editor/previewframe.cpp | 4 +- kommander/editor/previewframe.h | 6 +- kommander/editor/previewwidgetimpl.cpp | 4 +- kommander/editor/previewwidgetimpl.h | 2 +- kommander/editor/propertyeditor.cpp | 40 +-- kommander/editor/propertyeditor.h | 2 +- kommander/editor/qcompletionedit.cpp | 4 +- kommander/editor/qcompletionedit.h | 2 +- kommander/editor/resource.cpp | 56 ++-- kommander/editor/resource.h | 8 +- kommander/editor/sizehandle.cpp | 10 +- kommander/editor/sizehandle.h | 4 +- kommander/editor/styledbutton.cpp | 8 +- kommander/editor/styledbutton.h | 4 +- kommander/editor/tableeditorimpl.cpp | 4 +- kommander/editor/tableeditorimpl.h | 2 +- kommander/editor/timestamp.cpp | 4 +- kommander/editor/timestamp.h | 2 +- kommander/editor/widgetfactory.cpp | 284 ++++++++++----------- kommander/editor/widgetfactory.h | 58 ++--- kommander/editor/wizardeditorimpl.cpp | 4 +- kommander/editor/wizardeditorimpl.h | 2 +- kommander/editor/workspace.cpp | 28 +- kommander/editor/workspace.h | 12 +- kommander/examples/current/kpartmwframe.kmdr | 2 +- kommander/examples/current/kpartpart.kmdr | 10 +- kommander/executor/dcopkommanderif.h | 2 +- kommander/executor/instance.cpp | 6 +- kommander/executor/instance.h | 6 +- kommander/factory/kommanderfactory.cpp | 130 +++++----- kommander/factory/kommanderfactory.h | 10 +- kommander/kmdrtools/dcoptool-oldparser.kmdr | 6 +- kommander/part/kommander_part.cpp | 6 +- kommander/part/kommander_part.h | 2 +- kommander/plugin/kommanderplugin.h | 2 +- kommander/plugin/specialinformation.cpp | 8 +- kommander/pluginmanager/mainwindow.cpp | 4 +- kommander/pluginmanager/mainwindow.h | 2 +- kommander/widget/functionlib.cpp | 4 +- kommander/widget/invokeclass.cpp | 2 +- kommander/widget/invokeclass.h | 2 +- kommander/widget/kmdrmainwindow.cpp | 4 +- kommander/widget/kmdrmainwindow.h | 2 +- kommander/widget/kommanderwidget.cpp | 4 +- kommander/widget/kommanderwidget.h | 2 +- kommander/widgets/aboutdialog.cpp | 4 +- kommander/widgets/aboutdialog.h | 2 +- kommander/widgets/closebutton.cpp | 10 +- kommander/widgets/fontdialog.cpp | 4 +- kommander/widgets/fontdialog.h | 2 +- kommander/widgets/plugin.cpp | 70 ++--- kommander/widgets/popupmenu.cpp | 4 +- kommander/widgets/popupmenu.h | 2 +- kommander/widgets/toolbox.cpp | 4 +- kommander/widgets/toolbox.h | 2 +- kommander/widgets/treewidget.cpp | 22 +- kommander/widgets/treewidget.h | 2 +- kommander/working/plugintemplate/plugin.cpp | 6 +- kommander/working/plugintemplate/widget.cpp | 4 +- kommander/working/plugintemplate/widget.h | 2 +- kxsldbg/kxsldbgpart/kxsldbg_part.cpp | 4 +- kxsldbg/kxsldbgpart/kxsldbg_part.h | 2 +- kxsldbg/kxsldbgpart/libqtnotfier/xsldbgevent.cpp | 8 +- kxsldbg/kxsldbgpart/libxsldbg/files.cpp | 4 +- kxsldbg/kxsldbgpart/libxsldbg/files.h | 8 +- kxsldbg/kxsldbgpart/libxsldbg/search.cpp | 12 +- kxsldbg/kxsldbgpart/qxsldbgdoc.cpp | 4 +- kxsldbg/kxsldbgpart/qxsldbgdoc.h | 2 +- kxsldbg/kxsldbgpart/xsldbgbreakpointlistitem.cpp | 4 +- kxsldbg/kxsldbgpart/xsldbgbreakpointlistitem.h | 2 +- kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.cpp | 4 +- kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.h | 2 +- kxsldbg/kxsldbgpart/xsldbgcallstackimpl.cpp | 4 +- kxsldbg/kxsldbgpart/xsldbgcallstackimpl.h | 2 +- kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp | 4 +- kxsldbg/kxsldbgpart/xsldbgconfigimpl.h | 2 +- kxsldbg/kxsldbgpart/xsldbgentitiesimpl.cpp | 4 +- kxsldbg/kxsldbgpart/xsldbgentitiesimpl.h | 2 +- kxsldbg/kxsldbgpart/xsldbggloballistitem.cpp | 4 +- kxsldbg/kxsldbgpart/xsldbggloballistitem.h | 2 +- kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.cpp | 4 +- kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.h | 2 +- kxsldbg/kxsldbgpart/xsldbginspector.cpp | 6 +- kxsldbg/kxsldbgpart/xsldbginspector.h | 2 +- kxsldbg/kxsldbgpart/xsldbglistitem.cpp | 4 +- kxsldbg/kxsldbgpart/xsldbglistitem.h | 2 +- kxsldbg/kxsldbgpart/xsldbglocallistitem.cpp | 4 +- kxsldbg/kxsldbgpart/xsldbglocallistitem.h | 2 +- kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.cpp | 4 +- kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.h | 2 +- kxsldbg/kxsldbgpart/xsldbgmsgdialogimpl.h | 2 +- kxsldbg/kxsldbgpart/xsldbgoutputview.cpp | 8 +- kxsldbg/kxsldbgpart/xsldbgoutputview.h | 2 +- kxsldbg/kxsldbgpart/xsldbgsourcesimpl.cpp | 4 +- kxsldbg/kxsldbgpart/xsldbgsourcesimpl.h | 2 +- kxsldbg/kxsldbgpart/xsldbgtemplatelistitem.cpp | 4 +- kxsldbg/kxsldbgpart/xsldbgtemplatelistitem.h | 2 +- kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.cpp | 4 +- kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.h | 2 +- kxsldbg/kxsldbgpart/xsldbgwalkspeedimpl.cpp | 4 +- kxsldbg/kxsldbgpart/xsldbgwalkspeedimpl.h | 2 +- lib/compatibility/kmdi/qextmdi/kdockwidget.cpp | 204 +++++++-------- lib/compatibility/kmdi/qextmdi/kdockwidget.h | 66 ++--- .../kmdi/qextmdi/kdockwidget_private.cpp | 8 +- .../kmdi/qextmdi/kdockwidget_private.h | 8 +- lib/compatibility/kmdi/qextmdi/kmdichildarea.cpp | 4 +- lib/compatibility/kmdi/qextmdi/kmdichildarea.h | 2 +- lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp | 20 +- lib/compatibility/kmdi/qextmdi/kmdichildfrm.h | 6 +- .../kmdi/qextmdi/kmdichildfrmcaption.cpp | 6 +- .../kmdi/qextmdi/kmdichildfrmcaption.h | 8 +- lib/compatibility/kmdi/qextmdi/kmdichildview.cpp | 4 +- lib/compatibility/kmdi/qextmdi/kmdichildview.h | 16 +- .../kmdi/qextmdi/kmdidockcontainer.cpp | 34 +-- lib/compatibility/kmdi/qextmdi/kmdidockcontainer.h | 12 +- .../kmdi/qextmdi/kmdidocumentviewtabwidget.cpp | 2 +- .../kmdi/qextmdi/kmdidocumentviewtabwidget.h | 2 +- lib/compatibility/kmdi/qextmdi/kmdifocuslist.cpp | 2 +- lib/compatibility/kmdi/qextmdi/kmdifocuslist.h | 2 +- lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp | 6 +- lib/compatibility/kmdi/qextmdi/kmdiguiclient.h | 2 +- lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp | 22 +- lib/compatibility/kmdi/qextmdi/kmdimainfrm.h | 4 +- lib/compatibility/kmdi/qextmdi/kmditaskbar.cpp | 8 +- lib/compatibility/kmdi/qextmdi/kmditaskbar.h | 4 +- .../kmdi/qextmdi/kmditoolviewaccessor.cpp | 16 +- .../kmdi/qextmdi/kmditoolviewaccessor.h | 4 +- lib/compatibility/kmdi/qextmdi/kmultitabbar.cpp | 16 +- lib/compatibility/kmdi/qextmdi/kmultitabbar.h | 8 +- lib/compatibility/kmdi/qextmdi/kmultitabbar_p.h | 4 +- lib/compatibility/kmdi/qextmdi/ktabbar.cpp | 4 +- lib/compatibility/kmdi/qextmdi/ktabbar.h | 2 +- lib/compatibility/kmdi/qextmdi/ktabwidget.cpp | 4 +- lib/compatibility/kmdi/qextmdi/ktabwidget.h | 2 +- lib/compatibility/knewstuff/downloaddialog.cpp | 4 +- lib/compatibility/knewstuff/downloaddialog.h | 22 +- lib/compatibility/knewstuff/engine.h | 8 +- lib/compatibility/knewstuff/entry.cpp | 8 +- lib/compatibility/knewstuff/entry.h | 4 +- lib/compatibility/knewstuff/knewstuff.cpp | 4 +- lib/compatibility/knewstuff/knewstuff.h | 8 +- lib/compatibility/knewstuff/knewstuffgeneric.cpp | 4 +- lib/compatibility/knewstuff/knewstuffgeneric.h | 4 +- lib/compatibility/knewstuff/knewstuffsecure.h | 4 +- lib/compatibility/knewstuff/provider.cpp | 4 +- lib/compatibility/knewstuff/provider.h | 4 +- lib/compatibility/knewstuff/providerdialog.cpp | 8 +- lib/compatibility/knewstuff/providerdialog.h | 4 +- lib/compatibility/knewstuff/uploaddialog.cpp | 4 +- lib/compatibility/knewstuff/uploaddialog.h | 4 +- lib/ksavealldialog.cpp | 8 +- lib/ksavealldialog.h | 4 +- lib/qextfileinfo.cpp | 28 +- lib/qextfileinfo.h | 20 +- quanta/components/csseditor/colorrequester.cpp | 2 +- quanta/components/csseditor/colorrequester.h | 2 +- quanta/components/csseditor/colorslider.cpp | 6 +- quanta/components/csseditor/colorslider.h | 6 +- quanta/components/csseditor/csseditor.cpp | 22 +- quanta/components/csseditor/csseditor.h | 8 +- quanta/components/csseditor/csseditor_globals.cpp | 4 +- quanta/components/csseditor/csseditor_globals.h | 4 +- quanta/components/csseditor/cssselector.cpp | 2 +- quanta/components/csseditor/cssselector.h | 2 +- quanta/components/csseditor/doubleeditors.cpp | 8 +- quanta/components/csseditor/doubleeditors.h | 8 +- quanta/components/csseditor/encodingselector.cpp | 2 +- quanta/components/csseditor/encodingselector.h | 2 +- quanta/components/csseditor/fontfamilychooser.cpp | 2 +- quanta/components/csseditor/fontfamilychooser.h | 2 +- quanta/components/csseditor/minieditor.h | 2 +- quanta/components/csseditor/percentageeditor.cpp | 2 +- quanta/components/csseditor/percentageeditor.h | 2 +- quanta/components/csseditor/propertysetter.cpp | 2 +- quanta/components/csseditor/propertysetter.h | 2 +- quanta/components/csseditor/specialsb.cpp | 10 +- quanta/components/csseditor/specialsb.h | 10 +- quanta/components/csseditor/styleeditor.cpp | 2 +- quanta/components/csseditor/styleeditor.h | 2 +- quanta/components/csseditor/tlpeditors.cpp | 6 +- quanta/components/csseditor/tlpeditors.h | 6 +- quanta/components/debugger/backtracelistview.cpp | 4 +- quanta/components/debugger/backtracelistview.h | 2 +- .../debugger/dbgp/quantadebuggerdbgp.cpp | 34 +-- .../components/debugger/dbgp/quantadebuggerdbgp.h | 4 +- .../components/debugger/debuggerbreakpointview.cpp | 4 +- .../components/debugger/debuggerbreakpointview.h | 2 +- quanta/components/debugger/debuggermanager.cpp | 4 +- quanta/components/debugger/debuggermanager.h | 2 +- quanta/components/debugger/debuggerui.cpp | 8 +- quanta/components/debugger/debuggerui.h | 2 +- .../debugger/gubed/quantadebuggergubed.cpp | 38 +-- .../debugger/gubed/quantadebuggergubed.h | 4 +- .../debugger/interfaces/debuggerclient.cpp | 6 +- .../debugger/interfaces/debuggerclient.h | 2 +- .../debugger/interfaces/debuggerinterface.cpp | 4 +- .../debugger/interfaces/debuggerinterface.h | 2 +- quanta/components/debugger/pathmapper.cpp | 4 +- quanta/components/debugger/pathmapper.h | 2 +- .../debugger/quantadebuggerinterface.cpp | 6 +- .../components/debugger/quantadebuggerinterface.h | 2 +- quanta/components/debugger/variableslistview.cpp | 4 +- quanta/components/debugger/variableslistview.h | 2 +- quanta/components/framewizard/framewizard.cpp | 2 +- quanta/components/framewizard/framewizard.h | 2 +- quanta/components/framewizard/selectablearea.cpp | 2 +- quanta/components/framewizard/selectablearea.h | 2 +- quanta/components/framewizard/treenode.cpp | 8 +- quanta/components/framewizard/treenode.h | 2 +- .../components/framewizard/visualframeeditor.cpp | 34 +-- quanta/components/framewizard/visualframeeditor.h | 6 +- quanta/components/tableeditor/tableeditor.cpp | 4 +- quanta/components/tableeditor/tableeditor.h | 2 +- quanta/dialogs/actionconfigdialog.cpp | 26 +- quanta/dialogs/actionconfigdialog.h | 2 +- quanta/dialogs/dirtydlg.cpp | 2 +- quanta/dialogs/dirtydlg.h | 2 +- quanta/dialogs/dtepeditdlg.cpp | 4 +- quanta/dialogs/dtepeditdlg.h | 2 +- quanta/dialogs/dtepeditdlgs.ui | 4 +- quanta/dialogs/dtepstructureeditdlgs.ui | 8 +- quanta/dialogs/filecombo.cpp | 8 +- quanta/dialogs/filecombo.h | 4 +- quanta/dialogs/settings/abbreviation.cpp | 4 +- quanta/dialogs/settings/abbreviation.h | 2 +- quanta/dialogs/settings/filemasks.cpp | 6 +- quanta/dialogs/settings/filemasks.h | 4 +- quanta/dialogs/settings/parseroptions.cpp | 6 +- quanta/dialogs/settings/parseroptions.h | 2 +- quanta/dialogs/settings/previewoptions.cpp | 4 +- quanta/dialogs/settings/previewoptions.h | 2 +- quanta/dialogs/specialchardialog.cpp | 4 +- quanta/dialogs/specialchardialog.h | 2 +- quanta/dialogs/tagdialogs/colorcombo.cpp | 6 +- quanta/dialogs/tagdialogs/colorcombo.h | 2 +- quanta/dialogs/tagdialogs/corewidgetdlg.cpp | 4 +- quanta/dialogs/tagdialogs/listdlg.cpp | 4 +- quanta/dialogs/tagdialogs/listdlg.h | 2 +- quanta/dialogs/tagdialogs/pictureview.cpp | 2 +- quanta/dialogs/tagdialogs/pictureview.h | 2 +- quanta/dialogs/tagdialogs/tagattr.cpp | 4 +- quanta/dialogs/tagdialogs/tagattr.h | 2 +- quanta/dialogs/tagdialogs/tagimgdlg.cpp | 4 +- quanta/dialogs/tagdialogs/tagimgdlg.h | 2 +- quanta/dialogs/tagdialogs/tagmaildlg.cpp | 4 +- quanta/dialogs/tagdialogs/tagmaildlg.h | 2 +- quanta/dialogs/tagdialogs/tagmiscdlg.cpp | 4 +- quanta/dialogs/tagdialogs/tagmiscdlg.h | 2 +- quanta/dialogs/tagdialogs/tagquicklistdlg.cpp | 4 +- quanta/dialogs/tagdialogs/tagquicklistdlg.h | 2 +- quanta/dialogs/tagdialogs/tagwidget.cpp | 4 +- quanta/dialogs/tagdialogs/tagwidget.h | 2 +- quanta/dialogs/tagdialogs/tagxml.cpp | 8 +- quanta/dialogs/tagdialogs/tagxml.h | 4 +- quanta/messages/annotationoutput.cpp | 8 +- quanta/messages/annotationoutput.h | 2 +- quanta/messages/messageoutput.cpp | 4 +- quanta/messages/messageoutput.h | 2 +- quanta/parsers/dtd/dtdparser.cpp | 8 +- quanta/parsers/node.cpp | 44 ++-- quanta/parsers/node.h | 22 +- quanta/parsers/parser.cpp | 142 +++++------ quanta/parsers/parsercommon.cpp | 8 +- quanta/parsers/parsercommon.h | 6 +- quanta/parsers/qtag.h | 4 +- quanta/parsers/sagroupparser.cpp | 10 +- quanta/parsers/sagroupparser.h | 2 +- quanta/parsers/saparser.cpp | 12 +- quanta/parts/kafka/domtreeview.cpp | 6 +- quanta/parts/kafka/domtreeview.h | 4 +- quanta/parts/kafka/htmldocumentproperties.cpp | 12 +- quanta/parts/kafka/htmldocumentproperties.h | 2 +- quanta/parts/kafka/htmlenhancer.cpp | 2 +- quanta/parts/kafka/htmlenhancer.h | 2 +- quanta/parts/kafka/kafkacommon.cpp | 276 ++++++++++---------- quanta/parts/kafka/kafkacommon.h | 116 ++++----- quanta/parts/kafka/kafkahtmlpart.cpp | 30 +-- quanta/parts/kafka/kafkahtmlpart.h | 10 +- quanta/parts/kafka/kafkasyncoptions.cpp | 4 +- quanta/parts/kafka/kafkasyncoptions.h | 2 +- quanta/parts/kafka/nodeenhancer.h | 2 +- quanta/parts/kafka/undoredo.cpp | 26 +- quanta/parts/kafka/wkafkapart.cpp | 112 ++++---- quanta/parts/kafka/wkafkapart.h | 18 +- quanta/parts/preview/whtmlpart.cpp | 12 +- quanta/parts/preview/whtmlpart.h | 4 +- quanta/plugins/quantaplugin.h | 2 +- quanta/plugins/quantaplugininterface.cpp | 6 +- quanta/plugins/quantaplugininterface.h | 6 +- quanta/project/eventconfigurationdlg.cpp | 4 +- quanta/project/eventconfigurationdlg.h | 2 +- quanta/project/eventeditordlg.cpp | 4 +- quanta/project/eventeditordlg.h | 2 +- quanta/project/membereditdlg.cpp | 4 +- quanta/project/membereditdlg.h | 2 +- quanta/project/project.cpp | 6 +- quanta/project/project.h | 6 +- quanta/project/projectnewfinal.cpp | 4 +- quanta/project/projectnewfinal.h | 2 +- quanta/project/projectnewgeneral.cpp | 4 +- quanta/project/projectnewgeneral.h | 2 +- quanta/project/projectnewlocal.cpp | 16 +- quanta/project/projectnewlocal.h | 2 +- quanta/project/projectnewlocals.ui | 8 +- quanta/project/projectnewweb.cpp | 14 +- quanta/project/projectnewweb.h | 2 +- quanta/project/projectprivate.cpp | 104 ++++---- quanta/project/projectprivate.h | 4 +- quanta/project/projectupload.cpp | 6 +- quanta/project/rescanprj.cpp | 4 +- quanta/project/rescanprj.h | 2 +- quanta/project/teammembersdlg.cpp | 4 +- quanta/project/teammembersdlg.h | 2 +- quanta/quanta_uml.xmi | 98 +++---- quanta/src/document.cpp | 24 +- quanta/src/document.h | 2 +- quanta/src/dtds.cpp | 14 +- quanta/src/dtds.h | 6 +- quanta/src/quanta.cpp | 22 +- quanta/src/quanta.h | 4 +- quanta/src/quantadoc.cpp | 2 +- quanta/src/quantadoc.h | 2 +- quanta/src/quantaview.cpp | 14 +- quanta/src/quantaview.h | 2 +- quanta/src/viewmanager.cpp | 2 +- quanta/src/viewmanager.h | 6 +- quanta/treeviews/basetreeview.cpp | 40 +-- quanta/treeviews/basetreeview.h | 12 +- quanta/treeviews/docfolder.cpp | 8 +- quanta/treeviews/docfolder.h | 4 +- quanta/treeviews/docitem.cpp | 8 +- quanta/treeviews/docitem.h | 4 +- quanta/treeviews/doctreeview.cpp | 4 +- quanta/treeviews/doctreeview.h | 2 +- quanta/treeviews/filestreeview.cpp | 4 +- quanta/treeviews/filestreeview.h | 2 +- quanta/treeviews/newtemplatedirdlg.cpp | 2 +- quanta/treeviews/newtemplatedirdlg.h | 2 +- quanta/treeviews/projecttreeview.cpp | 20 +- quanta/treeviews/projecttreeview.h | 12 +- quanta/treeviews/quantapropertiespage.ui | 2 +- quanta/treeviews/scripttreeview.cpp | 4 +- quanta/treeviews/scripttreeview.h | 2 +- quanta/treeviews/servertreeview.cpp | 20 +- quanta/treeviews/servertreeview.h | 8 +- quanta/treeviews/structtreetag.cpp | 24 +- quanta/treeviews/structtreetag.h | 6 +- quanta/treeviews/structtreeview.cpp | 34 +-- quanta/treeviews/structtreeview.h | 12 +- quanta/treeviews/tagattributeitems.cpp | 42 +-- quanta/treeviews/tagattributeitems.h | 24 +- quanta/treeviews/tagattributetree.cpp | 36 +-- quanta/treeviews/tagattributetree.h | 8 +- quanta/treeviews/templatedirform.ui | 2 +- quanta/treeviews/templatestreeview.cpp | 32 +-- quanta/treeviews/templatestreeview.h | 10 +- quanta/treeviews/uploadtreefile.cpp | 10 +- quanta/treeviews/uploadtreefile.h | 4 +- quanta/treeviews/uploadtreefolder.cpp | 10 +- quanta/treeviews/uploadtreefolder.h | 4 +- quanta/treeviews/uploadtreeview.cpp | 4 +- quanta/treeviews/uploadtreeview.h | 2 +- quanta/utility/qpevents.cpp | 4 +- quanta/utility/qpevents.h | 6 +- quanta/utility/quantabookmarks.cpp | 6 +- quanta/utility/quantabookmarks.h | 2 +- quanta/utility/quantacommon.cpp | 2 +- quanta/utility/tagaction.cpp | 12 +- quanta/utility/tagactionmanager.cpp | 10 +- quanta/utility/tagactionmanager.h | 2 +- quanta/utility/tagactionset.cpp | 24 +- quanta/utility/tagactionset.h | 12 +- quanta/utility/toolbartabwidget.cpp | 32 +-- quanta/utility/toolbartabwidget.h | 8 +- 482 files changed, 2504 insertions(+), 2504 deletions(-) diff --git a/kfilereplace/kaddstringdlg.cpp b/kfilereplace/kaddstringdlg.cpp index 87750a9b..9c555ee6 100644 --- a/kfilereplace/kaddstringdlg.cpp +++ b/kfilereplace/kaddstringdlg.cpp @@ -37,7 +37,7 @@ using namespace whatthisNameSpace; -KAddStringDlg::KAddStringDlg(RCOptions* info, bool wantEdit, TQWidget *tqparent, const char *name) : KAddStringDlgS(tqparent,name,true) +KAddStringDlg::KAddStringDlg(RCOptions* info, bool wantEdit, TQWidget *parent, const char *name) : KAddStringDlgS(parent,name,true) { m_option = info; m_wantEdit = wantEdit; diff --git a/kfilereplace/kaddstringdlg.h b/kfilereplace/kaddstringdlg.h index 0a3ee320..2f20c56c 100644 --- a/kfilereplace/kaddstringdlg.h +++ b/kfilereplace/kaddstringdlg.h @@ -36,7 +36,7 @@ class KAddStringDlg : public KAddStringDlgS bool m_wantEdit; public: //Constructors - KAddStringDlg(RCOptions* info, bool wantEdit, TQWidget *tqparent=0, const char *name=0); + KAddStringDlg(RCOptions* info, bool wantEdit, TQWidget *parent=0, const char *name=0); private slots: void slotOK(); diff --git a/kfilereplace/kfilereplacepart.cpp b/kfilereplace/kfilereplacepart.cpp index d6a5aa6d..e805d3ea 100644 --- a/kfilereplace/kfilereplacepart.cpp +++ b/kfilereplace/kfilereplacepart.cpp @@ -60,7 +60,7 @@ typedef KParts::GenericFactory FileReplaceFactory; K_EXPORT_COMPONENT_FACTORY( libkfilereplacepart, FileReplaceFactory ) -KFileReplacePart::KFileReplacePart(TQWidget* parentWidget, const char* , TQObject* tqparent, const char* name, const TQStringList & ) : KParts::ReadOnlyPart(tqparent,name) +KFileReplacePart::KFileReplacePart(TQWidget* parentWidget, const char* , TQObject* parent, const char* name, const TQStringList & ) : KParts::ReadOnlyPart(parent,name) { setInstance(FileReplaceFactory::instance()); KGlobal::locale()->insertCatalogue("kfilereplace"); diff --git a/kfilereplace/kfilereplacepart.h b/kfilereplace/kfilereplacepart.h index d0cdb443..920d45c9 100644 --- a/kfilereplace/kfilereplacepart.h +++ b/kfilereplace/kfilereplacepart.h @@ -49,7 +49,7 @@ class KFileReplacePart: public KParts::ReadOnlyPart public://Constructors KFileReplacePart(TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, + TQObject *parent, const char *name, const TQStringList &args); ~KFileReplacePart(); diff --git a/kfilereplace/kfilereplaceview.cpp b/kfilereplace/kfilereplaceview.cpp index 10867844..9800f119 100644 --- a/kfilereplace/kfilereplaceview.cpp +++ b/kfilereplace/kfilereplaceview.cpp @@ -43,7 +43,7 @@ using namespace whatthisNameSpace; -KFileReplaceView::KFileReplaceView(RCOptions* info, TQWidget *tqparent,const char *name):KFileReplaceViewWdg(tqparent,name) +KFileReplaceView::KFileReplaceView(RCOptions* info, TQWidget *parent,const char *name):KFileReplaceViewWdg(parent,name) { m_option = info; @@ -65,8 +65,8 @@ TQString KFileReplaceView::currentPath() if(! m_lviCurrent) lvi = m_rv->currentItem(); else lvi = (TQListViewItem*) m_lviCurrent; - while (lvi->tqparent()) - lvi = lvi->tqparent(); + while (lvi->parent()) + lvi = lvi->parent(); return TQString(lvi->text(1)+"/"+lvi->text(0)); } @@ -562,7 +562,7 @@ coord KFileReplaceView::extractWordCoordinates(TQListViewItem* lvi) c.column = 0; TQString s = lvi->text(0); //qWarning("WWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWW=%s",s.latin1()); - /* if(lvi->tqparent()) s = lvi->text(0); + /* if(lvi->parent()) s = lvi->text(0); else return c;*/ TQString temp; diff --git a/kfilereplace/kfilereplaceview.h b/kfilereplace/kfilereplaceview.h index 1402c0a7..07a346e6 100644 --- a/kfilereplace/kfilereplaceview.h +++ b/kfilereplace/kfilereplaceview.h @@ -66,7 +66,7 @@ class KFileReplaceView : public KFileReplaceViewWdg * m_sv; public://Constructors - KFileReplaceView(RCOptions* info, TQWidget *tqparent,const char *name); + KFileReplaceView(RCOptions* info, TQWidget *parent,const char *name); public: TQString currentPath(); diff --git a/kfilereplace/knewprojectdlg.cpp b/kfilereplace/knewprojectdlg.cpp index 5aa5abc8..e7587f01 100644 --- a/kfilereplace/knewprojectdlg.cpp +++ b/kfilereplace/knewprojectdlg.cpp @@ -51,7 +51,7 @@ using namespace whatthisNameSpace; -KNewProjectDlg::KNewProjectDlg(RCOptions* info, TQWidget *tqparent, const char *name) : KNewProjectDlgS(tqparent, name) +KNewProjectDlg::KNewProjectDlg(RCOptions* info, TQWidget *parent, const char *name) : KNewProjectDlgS(parent, name) { m_searchNowFlag = ""; m_option = info; diff --git a/kfilereplace/knewprojectdlg.h b/kfilereplace/knewprojectdlg.h index b0af6ff2..cd428266 100644 --- a/kfilereplace/knewprojectdlg.h +++ b/kfilereplace/knewprojectdlg.h @@ -36,7 +36,7 @@ class KNewProjectDlg : public KNewProjectDlgS RCOptions* m_option; public: - KNewProjectDlg(RCOptions* info, TQWidget *tqparent=0, const char *name=0); + KNewProjectDlg(RCOptions* info, TQWidget *parent=0, const char *name=0); ~KNewProjectDlg(); public: diff --git a/kfilereplace/koptionsdlg.cpp b/kfilereplace/koptionsdlg.cpp index 84492238..35f0a3da 100644 --- a/kfilereplace/koptionsdlg.cpp +++ b/kfilereplace/koptionsdlg.cpp @@ -41,7 +41,7 @@ using namespace whatthisNameSpace; -KOptionsDlg::KOptionsDlg(RCOptions* info, TQWidget *tqparent, const char *name) : KOptionsDlgS(tqparent,name,true) +KOptionsDlg::KOptionsDlg(RCOptions* info, TQWidget *parent, const char *name) : KOptionsDlgS(parent,name,true) { m_config = new KConfig("kfilereplacerc"); m_option = info; diff --git a/kfilereplace/koptionsdlg.h b/kfilereplace/koptionsdlg.h index 4faec9f0..ec120ea1 100644 --- a/kfilereplace/koptionsdlg.h +++ b/kfilereplace/koptionsdlg.h @@ -35,7 +35,7 @@ class KOptionsDlg : public KOptionsDlgS Q_OBJECT TQ_OBJECT public: - KOptionsDlg(RCOptions* info, TQWidget *tqparent, const char *name); + KOptionsDlg(RCOptions* info, TQWidget *parent, const char *name); ~KOptionsDlg(); private: diff --git a/kimagemapeditor/arealistview.cpp b/kimagemapeditor/arealistview.cpp index a92eb567..203a741f 100644 --- a/kimagemapeditor/arealistview.cpp +++ b/kimagemapeditor/arealistview.cpp @@ -31,8 +31,8 @@ #include "arealistview.h" -AreaListView::AreaListView(TQWidget *tqparent, const char *name) - : TQVBox(tqparent, name) +AreaListView::AreaListView(TQWidget *parent, const char *name) + : TQVBox(parent, name) { listView = new KListView(this); listView->addColumn(i18n("Areas")); diff --git a/kimagemapeditor/arealistview.h b/kimagemapeditor/arealistview.h index 8b640828..4010f51d 100644 --- a/kimagemapeditor/arealistview.h +++ b/kimagemapeditor/arealistview.h @@ -36,7 +36,7 @@ class AreaListView : public TQVBox TQ_OBJECT public: - AreaListView(TQWidget *tqparent, const char *name); + AreaListView(TQWidget *parent, const char *name); ~AreaListView(); KListView* listView; diff --git a/kimagemapeditor/drawzone.cpp b/kimagemapeditor/drawzone.cpp index 275fb86f..ba1ea48d 100644 --- a/kimagemapeditor/drawzone.cpp +++ b/kimagemapeditor/drawzone.cpp @@ -37,8 +37,8 @@ #include "kimecommon.h" -DrawZone::DrawZone(TQWidget *tqparent,KImageMapEditor* _imageMapEditor) - : TQScrollView(tqparent) +DrawZone::DrawZone(TQWidget *parent,KImageMapEditor* _imageMapEditor) + : TQScrollView(parent) { imageMapEditor=_imageMapEditor; // setPicture(TQImage()); @@ -175,7 +175,7 @@ void DrawZone::setZoom(double z) pix.convertFromImage(image); // if the picture has transparent areas, // fill them with Gimp like background - if (pix.tqmask()) { + if (pix.mask()) { TQPixmap backPix(32,32); TQPainter p2(&backPix); p2.fillRect(0,0,32,32,TQColor(156,149,156)); diff --git a/kimagemapeditor/drawzone.h b/kimagemapeditor/drawzone.h index 35838619..0bd03dc6 100644 --- a/kimagemapeditor/drawzone.h +++ b/kimagemapeditor/drawzone.h @@ -38,7 +38,7 @@ class Area; class DrawZone : public TQScrollView { public: - DrawZone(TQWidget *tqparent,KImageMapEditor* _imageMapEditor); + DrawZone(TQWidget *parent,KImageMapEditor* _imageMapEditor); ~DrawZone(); TQImage picture() const; diff --git a/kimagemapeditor/imagemap.cpp b/kimagemapeditor/imagemap.cpp index c332ea26..04c1908e 100644 --- a/kimagemapeditor/imagemap.cpp +++ b/kimagemapeditor/imagemap.cpp @@ -28,8 +28,8 @@ int round(double d) { return ((int) d)+1; } -ImageMap::ImageMap(TQWidget *tqparent,KImageMapEditor* _imageMapEditor) - : TQScrollView(tqparent) +ImageMap::ImageMap(TQWidget *parent,KImageMapEditor* _imageMapEditor) + : TQScrollView(parent) { imageMapEditor=_imageMapEditor; // setPicture(TQImage()); @@ -63,7 +63,7 @@ void ImageMap::setZoom(double z) { pix.convertFromImage(image); // if the picture has transparent areas, // fill them with Gimp like background - if (pix.tqmask()) { + if (pix.mask()) { TQPixmap backPix(32,32); TQPainter p2(&backPix); p2.fillRect(0,0,32,32,TQColor(156,149,156)); diff --git a/kimagemapeditor/imagemap.h b/kimagemapeditor/imagemap.h index eb31cc1c..fe14c9d4 100644 --- a/kimagemapeditor/imagemap.h +++ b/kimagemapeditor/imagemap.h @@ -51,7 +51,7 @@ private: KImageMapEditor *imageMapEditor; double _zoom; public: - ImageMap(TQWidget *tqparent,KImageMapEditor* _imageMapEditor); + ImageMap(TQWidget *parent,KImageMapEditor* _imageMapEditor); ~ImageMap(); void setZoom(double z); void setPicture(const TQImage &_image); diff --git a/kimagemapeditor/imageslistview.cpp b/kimagemapeditor/imageslistview.cpp index c62dffdd..7db15e1e 100644 --- a/kimagemapeditor/imageslistview.cpp +++ b/kimagemapeditor/imageslistview.cpp @@ -26,8 +26,8 @@ // locale #include "imageslistview.h" -ImagesListViewItem::ImagesListViewItem(ImagesListView* tqparent, ImageTag* tag) - : TQListViewItem(tqparent) +ImagesListViewItem::ImagesListViewItem(ImagesListView* parent, ImageTag* tag) + : TQListViewItem(parent) { _imageTag = tag; update(); @@ -51,8 +51,8 @@ ImageTag* ImagesListViewItem::imageTag() { } -ImagesListView::ImagesListView(TQWidget *tqparent, const char *name) - : KListView(tqparent, name) +ImagesListView::ImagesListView(TQWidget *parent, const char *name) + : KListView(parent, name) { addColumn(i18n("Images")); addColumn(i18n("Usemap")); diff --git a/kimagemapeditor/imageslistview.h b/kimagemapeditor/imageslistview.h index 5155bfc4..5b4aa4d8 100644 --- a/kimagemapeditor/imageslistview.h +++ b/kimagemapeditor/imageslistview.h @@ -50,7 +50,7 @@ class ImagesListView : public KListView TQ_OBJECT public: - ImagesListView(TQWidget *tqparent, const char *name); + ImagesListView(TQWidget *parent, const char *name); virtual ~ImagesListView(); /** diff --git a/kimagemapeditor/kimagemapeditor.cpp b/kimagemapeditor/kimagemapeditor.cpp index 5a08d551..5a57b250 100644 --- a/kimagemapeditor/kimagemapeditor.cpp +++ b/kimagemapeditor/kimagemapeditor.cpp @@ -85,8 +85,8 @@ typedef KParts::GenericFactory KimeFactory; K_EXPORT_COMPONENT_FACTORY( libkimagemapeditor , KimeFactory ) KImageMapEditor::KImageMapEditor(TQWidget *parentWidget, const char *, - TQObject *tqparent, const char *name, const TQStringList & ) - : KParts::ReadWritePart(tqparent,name) + TQObject *parent, const char *name, const TQStringList & ) + : KParts::ReadWritePart(parent,name) { setInstance( KimeFactory::instance() ); @@ -94,7 +94,7 @@ KImageMapEditor::KImageMapEditor(TQWidget *parentWidget, const char *, // Test if the MainWindow can handle DockWindows, if so create DockWidgets // instead of a Splitter - mainDock = dynamic_cast(tqparent) ; + mainDock = dynamic_cast(parent) ; TQSplitter * splitter = 0L; tabWidget = 0L; @@ -333,7 +333,7 @@ void KImageMapEditor::setModified(bool modified) else save->setEnabled(false); - // in any event, we want our tqparent to do it's thing + // in any event, we want our parent to do it's thing ReadWritePart::setModified(modified); } diff --git a/kimagemapeditor/kimagemapeditor.h b/kimagemapeditor/kimagemapeditor.h index f2dd74c1..e3a3655a 100644 --- a/kimagemapeditor/kimagemapeditor.h +++ b/kimagemapeditor/kimagemapeditor.h @@ -135,7 +135,7 @@ public : enum ToolType { Selection, Rectangle, Circle, Polygon, Freehand, AddPoint, RemovePoint }; KImageMapEditor(TQWidget *parentWidget, const char *, - TQObject *tqparent, const char *name, const TQStringList & args = TQStringList()); + TQObject *parent, const char *name, const TQStringList & args = TQStringList()); virtual ~KImageMapEditor(); static KAboutData *createAboutData(); diff --git a/kimagemapeditor/kimearea.cpp b/kimagemapeditor/kimearea.cpp index e3cb169f..52cccf9f 100644 --- a/kimagemapeditor/kimearea.cpp +++ b/kimagemapeditor/kimearea.cpp @@ -477,12 +477,12 @@ TQPixmap Area::cutOut(const TQImage & image) return dummyPix; } - // Get the tqmask from the subclasses - TQBitmap tqmask=getMask(); + // Get the mask from the subclasses + TQBitmap mask=getMask(); // The rectangle which is part of the image TQRect partOfImage=rect(); - TQRect partOfMask(0,0,tqmask.width(),tqmask.height()); + TQRect partOfMask(0,0,mask.width(),mask.height()); // If the area is outside of the image make the @@ -507,8 +507,8 @@ TQPixmap Area::cutOut(const TQImage & image) partOfMask.setY(myabs(rect().y())); } - TQImage tempImage=tqmask.convertToImage().copy(partOfMask); - tqmask.convertFromImage(tempImage); + TQImage tempImage=mask.convertToImage().copy(partOfMask); + mask.convertFromImage(tempImage); // partOfImage = partOfImage.normalize(); TQImage cut=image.copy(partOfImage); @@ -521,23 +521,23 @@ TQPixmap Area::cutOut(const TQImage & image) << partOfMask.width() << "," << partOfMask.height() << "," << endl; /* - TQBitmap tqmask2(partOfMask.width(), partOfMask.height()); - TQPainter p4(&tqmask2); - p4.drawPixmap( TQPoint(0,0) ,tqmask,partOfMask); + TQBitmap mask2(partOfMask.width(), partOfMask.height()); + TQPainter p4(&mask2); + p4.drawPixmap( TQPoint(0,0) ,mask,partOfMask); p4.flush(); p4.end(); */ pix.convertFromImage(cut); - setHighlightedPixmap(cut, tqmask); + setHighlightedPixmap(cut, mask); TQPixmap retPix(pix.width(),pix.height()); TQPainter p3(&retPix); // if transparent image fill the background // with gimp-like rectangles - if (pix.tqmask()) { + if (pix.mask()) { TQPixmap backPix(32,32); // Gimp like transparent rectangle @@ -555,7 +555,7 @@ TQPixmap Area::cutOut(const TQImage & image) p3.drawPixmap(TQPoint(0,0),pix); p3.flush(); p3.end(); - retPix.setMask(tqmask); + retPix.setMask(mask); return retPix; } @@ -566,7 +566,7 @@ TQBitmap Area::getMask() const return b; } -void Area::setHighlightedPixmap( TQImage & im, TQBitmap & tqmask ) +void Area::setHighlightedPixmap( TQImage & im, TQBitmap & mask ) { if (!Area::highlightArea) return; @@ -598,7 +598,7 @@ void Area::setHighlightedPixmap( TQImage & im, TQBitmap & tqmask ) _highlightedPixmap = new TQPixmap(); _highlightedPixmap->convertFromImage( image ); - _highlightedPixmap->setMask( tqmask ); + _highlightedPixmap->setMask( mask ); if (_highlightedPixmap->isNull()) kdDebug() << "HighlightedPixmap is null" << endl; @@ -659,17 +659,17 @@ void RectArea::draw(TQPainter & p) TQBitmap RectArea::getMask() const { - TQBitmap tqmask(rect().width(),rect().height()); + TQBitmap mask(rect().width(),rect().height()); - tqmask.fill(TQt::color0); - TQPainter p(&tqmask); + mask.fill(TQt::color0); + TQPainter p(&mask); p.setBackgroundColor(TQt::color0); p.setPen(TQt::color1); p.setBrush(TQt::color1); - tqmask.fill(TQt::color1); + mask.fill(TQt::color1); p.end(); - return tqmask; + return mask; } TQString RectArea::coordsToString() const @@ -815,10 +815,10 @@ void CircleArea::draw(TQPainter & p) TQBitmap CircleArea::getMask() const { - TQBitmap tqmask(_rect.width(),_rect.height()); + TQBitmap mask(_rect.width(),_rect.height()); - tqmask.fill(TQt::color0); - TQPainter p(&tqmask); + mask.fill(TQt::color0); + TQPainter p(&mask); p.setBackgroundColor(TQt::color0); p.setPen(TQt::color1); p.setBrush(TQt::color1); @@ -827,7 +827,7 @@ TQBitmap CircleArea::getMask() const p.end(); - return tqmask; + return mask; } @@ -1009,10 +1009,10 @@ void PolyArea::draw(TQPainter & p) TQBitmap PolyArea::getMask() const { - TQBitmap tqmask(_rect.width(),_rect.height()); + TQBitmap mask(_rect.width(),_rect.height()); - tqmask.fill(TQt::color0); - TQPainter p(&tqmask); + mask.fill(TQt::color0); + TQPainter p(&mask); p.setBackgroundColor(TQt::color0); p.setPen(TQt::color1); p.setBrush(TQt::color1); @@ -1024,7 +1024,7 @@ TQBitmap PolyArea::getMask() const p.flush(); p.end(); - return tqmask; + return mask; } TQString PolyArea::coordsToString() const diff --git a/kimagemapeditor/kimedialogs.cpp b/kimagemapeditor/kimedialogs.cpp index cd7999f0..c2e50c7c 100644 --- a/kimagemapeditor/kimedialogs.cpp +++ b/kimagemapeditor/kimedialogs.cpp @@ -47,8 +47,8 @@ // LOCAL #include "kimedialogs.h" -CoordsEdit::CoordsEdit(TQWidget *tqparent, Area* a) - : TQWidget(tqparent) +CoordsEdit::CoordsEdit(TQWidget *parent, Area* a) + : TQWidget(parent) { area=a; } @@ -66,8 +66,8 @@ CoordsEdit::~CoordsEdit() { } -RectCoordsEdit::RectCoordsEdit(TQWidget *tqparent, Area* a) - : CoordsEdit(tqparent,a) +RectCoordsEdit::RectCoordsEdit(TQWidget *parent, Area* a) + : CoordsEdit(parent,a) { TQGridLayout *tqlayout= new TQGridLayout(this,5,2,5,5); @@ -127,8 +127,8 @@ void RectCoordsEdit::applyChanges() { area->setRect(r); } -CircleCoordsEdit::CircleCoordsEdit(TQWidget *tqparent, Area* a) - : CoordsEdit(tqparent,a) +CircleCoordsEdit::CircleCoordsEdit(TQWidget *parent, Area* a) + : CoordsEdit(parent,a) { TQGridLayout *tqlayout= new TQGridLayout(this,4,2,5,5); @@ -180,8 +180,8 @@ void CircleCoordsEdit::applyChanges() { area->setRect(r); } -PolyCoordsEdit::PolyCoordsEdit(TQWidget *tqparent, Area* a) - : CoordsEdit(tqparent,a) +PolyCoordsEdit::PolyCoordsEdit(TQWidget *parent, Area* a) + : CoordsEdit(parent,a) { if (!a) return; TQVBoxLayout *tqlayout= new TQVBoxLayout(this); @@ -274,8 +274,8 @@ void PolyCoordsEdit::applyChanges() { } } -SelectionCoordsEdit::SelectionCoordsEdit(TQWidget *tqparent, Area* a) - : CoordsEdit(tqparent,a) +SelectionCoordsEdit::SelectionCoordsEdit(TQWidget *parent, Area* a) + : CoordsEdit(parent,a) { TQGridLayout *tqlayout= new TQGridLayout(this,2,2); @@ -308,11 +308,11 @@ void SelectionCoordsEdit::applyChanges() { -TQLineEdit* AreaDialog::createLineEdit(TQWidget* tqparent, TQGridLayout *tqlayout, int y, const TQString & value, const TQString & name) +TQLineEdit* AreaDialog::createLineEdit(TQWidget* parent, TQGridLayout *tqlayout, int y, const TQString & value, const TQString & name) { - TQLineEdit* edit=new TQLineEdit(value,tqparent); + TQLineEdit* edit=new TQLineEdit(value,parent); tqlayout->addWidget(edit,y,2); - TQLabel* lbl=new TQLabel(name,tqparent); + TQLabel* lbl=new TQLabel(name,parent); lbl->setBuddy(edit); tqlayout->addWidget(lbl,y,1); @@ -408,17 +408,17 @@ TQWidget* AreaDialog::createButtonBar() } -AreaDialog::AreaDialog(KImageMapEditor* tqparent,Area * a) - : KDialog(tqparent->widget(),"",true) -// : KDialogBase(Tabbed,i18n("Area Tag Editor"),Ok|Apply|Cancel,Ok,tqparent,"") -// : KDialogBase(tqparent,"",true,"Area Tag Editor",Ok|Apply|Cancel,Ok,true) +AreaDialog::AreaDialog(KImageMapEditor* parent,Area * a) + : KDialog(parent->widget(),"",true) +// : KDialogBase(Tabbed,i18n("Area Tag Editor"),Ok|Apply|Cancel,Ok,parent,"") +// : KDialogBase(parent,"",true,"Area Tag Editor",Ok|Apply|Cancel,Ok,true) { if (!a) { slotCancel(); return; } - _document=tqparent; + _document=parent; setCaption(i18n("Area Tag Editor")); @@ -485,23 +485,23 @@ AreaDialog::~AreaDialog() { delete oldArea; } -CoordsEdit* AreaDialog::createCoordsEdit(TQWidget *tqparent, Area *a) { +CoordsEdit* AreaDialog::createCoordsEdit(TQWidget *parent, Area *a) { if (!a) return 0; switch (a->type()) { case Area::Rectangle : - return new RectCoordsEdit(tqparent,a); + return new RectCoordsEdit(parent,a); break; case Area::Circle : - return new CircleCoordsEdit(tqparent,a); + return new CircleCoordsEdit(parent,a); break; case Area::Polygon : - return new PolyCoordsEdit(tqparent,a); + return new PolyCoordsEdit(parent,a); break; case Area::Selection : - return new SelectionCoordsEdit(tqparent,a); + return new SelectionCoordsEdit(parent,a); break; - case Area::Default : return new CoordsEdit(tqparent,a); break; - default : return new CoordsEdit(tqparent,a);break; + case Area::Default : return new CoordsEdit(parent,a); break; + default : return new CoordsEdit(parent,a);break; } } @@ -570,8 +570,8 @@ void AreaDialog::slotUpdateArea() { oldArea->setRect(area->rect()); } -ImageMapChooseDialog::ImageMapChooseDialog(TQWidget* tqparent,TQPtrList *_maps,TQPtrList *_images,const KURL & _baseUrl) - : KDialogBase(tqparent,"",true,i18n( "Choose Map & Image to Edit" ),Ok,Ok,true) +ImageMapChooseDialog::ImageMapChooseDialog(TQWidget* parent,TQPtrList *_maps,TQPtrList *_images,const KURL & _baseUrl) + : KDialogBase(parent,"",true,i18n( "Choose Map & Image to Edit" ),Ok,Ok,true) { baseUrl=_baseUrl; maps=_maps; @@ -648,29 +648,29 @@ ImageMapChooseDialog::ImageMapChooseDialog(TQWidget* tqparent,TQPtrList resize(510,460); } -void ImageMapChooseDialog::initImageListTable(TQWidget* tqparent) { +void ImageMapChooseDialog::initImageListTable(TQWidget* parent) { if (images->isEmpty()) { - imageListTable= new TQTable(1,1,tqparent); + imageListTable= new TQTable(1,1,parent); imageListTable->setText(0,0,i18n("No images found")); imageListTable->setEnabled(false); imageListTable->horizontalHeader()->hide(); imageListTable->setTopMargin(0); imageListTable->setColumnStretchable(0,true); } else { - imageListTable= new TQTable(images->count(),2,tqparent); + imageListTable= new TQTable(images->count(),2,parent); imageListTable->setColumnStretchable(0,true); } imageListTable->verticalHeader()->hide(); imageListTable->setLeftMargin(0); - TQLabel *lbl= new TQLabel(i18n("&Images"),tqparent); + TQLabel *lbl= new TQLabel(i18n("&Images"),parent); lbl->setBuddy(imageListTable); - tqparent->tqlayout()->add(lbl); - tqparent->tqlayout()->add(imageListTable); + parent->tqlayout()->add(lbl); + parent->tqlayout()->add(imageListTable); if (images->isEmpty()) return; @@ -749,8 +749,8 @@ void ImageMapChooseDialog::slotMapChanged(int i) { selectImageWithUsemap(currentMap->name); } -PreferencesDialog::PreferencesDialog(TQWidget *tqparent, KConfig* conf) - : KDialogBase(tqparent,"",true,i18n("Preferences"),Ok|Apply|Cancel,Ok,true) +PreferencesDialog::PreferencesDialog(TQWidget *parent, KConfig* conf) + : KDialogBase(parent,"",true,i18n("Preferences"),Ok|Apply|Cancel,Ok,true) { config = conf; TQVBox *page=new TQVBox(this); @@ -836,8 +836,8 @@ void PreferencesDialog::slotApply( void ) { emit applyClicked(); } -HTMLPreviewDialog::HTMLPreviewDialog(TQWidget* tqparent, KURL url, const TQString & htmlCode) - : KDialogBase(tqparent, "", true, i18n("Preview"), KDialogBase::Ok) +HTMLPreviewDialog::HTMLPreviewDialog(TQWidget* parent, KURL url, const TQString & htmlCode) + : KDialogBase(parent, "", true, i18n("Preview"), KDialogBase::Ok) { tempFile = new KTempFile(url.directory(false), ".html"); tempFile->setAutoDelete(true); diff --git a/kimagemapeditor/kimedialogs.h b/kimagemapeditor/kimedialogs.h index 90b445a2..d829193c 100644 --- a/kimagemapeditor/kimedialogs.h +++ b/kimagemapeditor/kimedialogs.h @@ -35,7 +35,7 @@ class CoordsEdit : public TQWidget { Q_OBJECT TQ_OBJECT public : - CoordsEdit(TQWidget *tqparent, Area* a); + CoordsEdit(TQWidget *parent, Area* a); virtual ~CoordsEdit(); virtual void applyChanges(); protected: @@ -48,7 +48,7 @@ Q_OBJECT class RectCoordsEdit : public CoordsEdit { public: - RectCoordsEdit(TQWidget *tqparent, Area* a); + RectCoordsEdit(TQWidget *parent, Area* a); virtual void applyChanges(); private: TQSpinBox *topXSpin; @@ -59,7 +59,7 @@ class RectCoordsEdit : public CoordsEdit { class CircleCoordsEdit : public CoordsEdit { public: - CircleCoordsEdit(TQWidget *tqparent, Area* a); + CircleCoordsEdit(TQWidget *parent, Area* a); virtual void applyChanges(); private: TQSpinBox *centerXSpin; @@ -73,7 +73,7 @@ class PolyCoordsEdit : public CoordsEdit { Q_OBJECT TQ_OBJECT public: - PolyCoordsEdit(TQWidget *tqparent, Area* a); + PolyCoordsEdit(TQWidget *parent, Area* a); ~PolyCoordsEdit(); virtual void applyChanges(); private: @@ -89,7 +89,7 @@ class SelectionCoordsEdit : public CoordsEdit { Q_OBJECT TQ_OBJECT public: - SelectionCoordsEdit(TQWidget *tqparent, Area* a); + SelectionCoordsEdit(TQWidget *parent, Area* a); virtual void applyChanges(); private: TQSpinBox *topXSpin; @@ -122,13 +122,13 @@ class AreaDialog : public KDialog { TQLineEdit *onMouseOutEdit; CoordsEdit *coordsEdit; - CoordsEdit* createCoordsEdit(TQWidget *tqparent, Area *a); + CoordsEdit* createCoordsEdit(TQWidget *parent, Area *a); TQCheckBox *defaultAreaChk; KImageMapEditor *_document; public: - AreaDialog(KImageMapEditor* tqparent,Area * a); + AreaDialog(KImageMapEditor* parent,Area * a); ~AreaDialog(); protected slots: virtual void slotOk(); @@ -137,7 +137,7 @@ class AreaDialog : public KDialog { void slotChooseHref(); void slotUpdateArea(); - TQLineEdit* createLineEdit(TQWidget* tqparent, TQGridLayout *tqlayout, int y, const TQString & value, const TQString & name); + TQLineEdit* createLineEdit(TQWidget* parent, TQGridLayout *tqlayout, int y, const TQString & value, const TQString & name); TQWidget* createGeneralPage(); TQWidget* createCoordsPage(); TQWidget* createJavascriptPage(); @@ -164,7 +164,7 @@ class ImageMapChooseDialog : public KDialogBase { KURL baseUrl; void initImageListTable(TQWidget*); public: - ImageMapChooseDialog(TQWidget* tqparent,TQPtrList *_maps,TQPtrList *_images, const KURL & _baseUrl); + ImageMapChooseDialog(TQWidget* parent,TQPtrList *_maps,TQPtrList *_images, const KURL & _baseUrl); ~ImageMapChooseDialog(); KURL pixUrl; MapTag* currentMap; @@ -181,7 +181,7 @@ class PreferencesDialog : public KDialogBase { Q_OBJECT TQ_OBJECT public: - PreferencesDialog(TQWidget *tqparent,KConfig*); + PreferencesDialog(TQWidget *parent,KConfig*); ~PreferencesDialog(); protected slots: virtual void slotDefault( void ); diff --git a/kimagemapeditor/mapslistview.cpp b/kimagemapeditor/mapslistview.cpp index b3a2758d..252afdb8 100644 --- a/kimagemapeditor/mapslistview.cpp +++ b/kimagemapeditor/mapslistview.cpp @@ -23,8 +23,8 @@ #include "mapslistview.h" -MapsListView::MapsListView(TQWidget *tqparent, const char *name) -: TQVBox(tqparent, name) { +MapsListView::MapsListView(TQWidget *parent, const char *name) +: TQVBox(parent, name) { _listView = new KListView(this); _listView->addColumn(i18n("Maps")); _listView->setFullWidth(true); diff --git a/kimagemapeditor/mapslistview.h b/kimagemapeditor/mapslistview.h index ca1707af..af4d3653 100644 --- a/kimagemapeditor/mapslistview.h +++ b/kimagemapeditor/mapslistview.h @@ -33,7 +33,7 @@ class MapsListView : public TQVBox Q_OBJECT TQ_OBJECT public: - MapsListView(TQWidget *tqparent, const char *name); + MapsListView(TQWidget *parent, const char *name); ~MapsListView(); /** diff --git a/kimagemapeditor/qextfileinfo.cpp b/kimagemapeditor/qextfileinfo.cpp index c3aad2a7..f1aac09e 100644 --- a/kimagemapeditor/qextfileinfo.cpp +++ b/kimagemapeditor/qextfileinfo.cpp @@ -105,16 +105,16 @@ KURL QExtFileInfo::toAbsolute(const KURL& urlToConvert,const KURL& baseURL) This is needed for empty directory adding/handling. (Andras) Currently works only for local directories */ -KURL::List QExtFileInfo::allFiles( const KURL& path, const TQString& tqmask) +KURL::List QExtFileInfo::allFiles( const KURL& path, const TQString& mask) { QExtFileInfo internalFileInfo; - return internalFileInfo.allFilesInternal(path, tqmask); + return internalFileInfo.allFilesInternal(path, mask); } -KURL::List QExtFileInfo::allFilesRelative( const KURL& path, const TQString& tqmask) +KURL::List QExtFileInfo::allFilesRelative( const KURL& path, const TQString& mask) { QExtFileInfo internalFileInfo; - KURL::List r = internalFileInfo.allFilesInternal( path, tqmask); + KURL::List r = internalFileInfo.allFilesInternal( path, mask); KURL::List::Iterator it; for ( it = r.begin(); it != r.end(); ++it ) @@ -206,7 +206,7 @@ bool QExtFileInfo::copy( const KURL& src, const KURL& target, int permissions, } /** No descriptions */ -KURL::List QExtFileInfo::allFilesInternal(const KURL& startURL, const TQString& tqmask) +KURL::List QExtFileInfo::allFilesInternal(const KURL& startURL, const TQString& mask) { dirListItems.clear(); if (internalExists(startURL)) @@ -214,7 +214,7 @@ KURL::List QExtFileInfo::allFilesInternal(const KURL& startURL, const TQString& lstFilters.setAutoDelete(true); lstFilters.clear(); // Split on white space - TQStringList list = TQStringList::split( ' ', tqmask ); + TQStringList list = TQStringList::split( ' ', mask ); for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) lstFilters.append( new TQRegExp(*it, false, true ) ); diff --git a/kimagemapeditor/qextfileinfo.h b/kimagemapeditor/qextfileinfo.h index 00643915..59cabb14 100644 --- a/kimagemapeditor/qextfileinfo.h +++ b/kimagemapeditor/qextfileinfo.h @@ -34,8 +34,8 @@ public: /** convert relative filename to absolute */ static KURL toAbsolute(const KURL& urlToConvert,const KURL& baseURL); /** recurse function for all files in dir */ - static KURL::List allFiles( const KURL& path, const TQString &tqmask); - static KURL::List allFilesRelative( const KURL& path, const TQString &tqmask); + static KURL::List allFiles( const KURL& path, const TQString &mask); + static KURL::List allFilesRelative( const KURL& path, const TQString &mask); /** create dir if don't exists */ static bool createDir(const KURL & path ); static KURL cdUp(const KURL &dir); @@ -60,7 +60,7 @@ private: TQPtrList lstFilters; /** No descriptions */ - KURL::List allFilesInternal(const KURL& startURL, const TQString& tqmask); + KURL::List allFilesInternal(const KURL& startURL, const TQString& mask); // friend class I_like_this_class; diff --git a/klinkstatus/FEATURES b/klinkstatus/FEATURES index 11ed0bf0..33a328e4 100644 --- a/klinkstatus/FEATURES +++ b/klinkstatus/FEATURES @@ -14,5 +14,5 @@ - Tabbed checking (allow multiple sessions at the same time) - Filter checked links (good, broken, malformed and undetermined) - Configurable number of simultaneous connections (performance tunning) -- Other configurable options like "check external links", "check tqparent folders", "timeout" +- Other configurable options like "check external links", "check parent folders", "timeout" - Good integration with Quanta+ \ No newline at end of file diff --git a/klinkstatus/src/actionmanager.cpp b/klinkstatus/src/actionmanager.cpp index 94506ea3..2f74369d 100644 --- a/klinkstatus/src/actionmanager.cpp +++ b/klinkstatus/src/actionmanager.cpp @@ -63,8 +63,8 @@ public: SessionWidget* sessionWidget; }; -ActionManager::ActionManager(TQObject *tqparent, const char *name) - : TQObject(tqparent, name), d(new ActionManagerPrivate) +ActionManager::ActionManager(TQObject *parent, const char *name) + : TQObject(parent, name), d(new ActionManagerPrivate) {} ActionManager::~ActionManager() diff --git a/klinkstatus/src/actionmanager.h b/klinkstatus/src/actionmanager.h index b2426d8d..bd9fdd7f 100644 --- a/klinkstatus/src/actionmanager.h +++ b/klinkstatus/src/actionmanager.h @@ -39,7 +39,7 @@ class ActionManager : public TQObject Q_OBJECT TQ_OBJECT public: - ActionManager(TQObject* tqparent=0, const char* name=0); + ActionManager(TQObject* parent=0, const char* name=0); virtual ~ActionManager(); static ActionManager* getInstance(); diff --git a/klinkstatus/src/engine/linkchecker.cpp b/klinkstatus/src/engine/linkchecker.cpp index 7efe5a45..bf54a59b 100644 --- a/klinkstatus/src/engine/linkchecker.cpp +++ b/klinkstatus/src/engine/linkchecker.cpp @@ -44,8 +44,8 @@ int LinkChecker::count_ = 0; LinkChecker::LinkChecker(LinktqStatus* linkstatus, int time_out, - TQObject *tqparent, const char *name) - : TQObject(tqparent, name), search_manager_(0), + TQObject *parent, const char *name) + : TQObject(parent, name), search_manager_(0), linkstatus_(linkstatus), t_job_(0), time_out_(time_out), checker_(0), document_charset_(), redirection_(false), header_checked_(false), finnished_(false), parsing_(false), is_charset_checked_(false), has_defined_charset_(false) @@ -84,8 +84,8 @@ void LinkChecker::check() t_job_->addMetaData("PropagateHttpHeader", "true"); // to have the http header - if (linkstatus_->tqparent()) { - t_job_->addMetaData("referrer", linkstatus_->tqparent()->absoluteUrl().prettyURL()); + if (linkstatus_->parent()) { + t_job_->addMetaData("referrer", linkstatus_->parent()->absoluteUrl().prettyURL()); } if(search_manager_->sendIdentification()) @@ -550,7 +550,7 @@ void LinkChecker::checkRef() int i_ref = -1; if(linktqStatus()->originalUrl().startsWith("#")) - ls_parent = linktqStatus()->tqparent(); + ls_parent = linktqStatus()->parent(); else { diff --git a/klinkstatus/src/engine/linkchecker.h b/klinkstatus/src/engine/linkchecker.h index 74cf9eb9..9b13d210 100644 --- a/klinkstatus/src/engine/linkchecker.h +++ b/klinkstatus/src/engine/linkchecker.h @@ -43,7 +43,7 @@ class LinkChecker : public TQObject TQ_OBJECT public: LinkChecker(LinktqStatus* linkstatus, int time_out = 50, - TQObject *tqparent = 0, const char *name = 0); + TQObject *parent = 0, const char *name = 0); ~LinkChecker(); //virtual void run(); diff --git a/klinkstatus/src/engine/linkstatus.cpp b/klinkstatus/src/engine/linkstatus.cpp index d95c7860..ac70b73e 100644 --- a/klinkstatus/src/engine/linkstatus.cpp +++ b/klinkstatus/src/engine/linkstatus.cpp @@ -101,7 +101,7 @@ TQString const LinktqStatus::toString() const if(!is_root_) { Q_ASSERT(parent_); - aux += i18n( "Parent: %1" ).tqarg( tqparent()->absoluteUrl().prettyURL() ) + "\n"; + aux += i18n( "Parent: %1" ).tqarg( parent()->absoluteUrl().prettyURL() ) + "\n"; } Q_ASSERT(!original_url_.isNull()); diff --git a/klinkstatus/src/engine/linkstatus.h b/klinkstatus/src/engine/linkstatus.h index a74282f8..dddf320e 100644 --- a/klinkstatus/src/engine/linkstatus.h +++ b/klinkstatus/src/engine/linkstatus.h @@ -61,7 +61,7 @@ public: LinktqStatus(); LinktqStatus(KURL const& absolute_url); - LinktqStatus(Node* node, LinktqStatus* tqparent); + LinktqStatus(Node* node, LinktqStatus* parent); ~LinktqStatus(); void save(TQDomElement& element) const; @@ -70,7 +70,7 @@ public: void setRootUrl(KURL const& url); void settqStatus(tqStatus status); void setDepth(uint depth); - void setParent(LinktqStatus* tqparent); + void setParent(LinktqStatus* parent); void setOriginalUrl(TQString const& url_original); void setLabel(TQString const& label); void setAbsoluteUrl(KURL const& url_absoluto); @@ -106,7 +106,7 @@ public: uint depth() const; bool local() const; // linkstatus.paradigma.co.pt == paradigma.co.pt bool isLocalRestrict() const; // linkstatus.paradigma.co.pt != paradigma.co.pt - LinktqStatus const* tqparent() const; + LinktqStatus const* parent() const; TQString const& originalUrl() const; TQString const& label() const; KURL const& absoluteUrl() const; @@ -142,7 +142,7 @@ public: private: /** - Load some atributes in function of his tqparent node. + Load some atributes in function of his parent node. */ void loadNode(); diff --git a/klinkstatus/src/engine/linkstatus_impl.h b/klinkstatus/src/engine/linkstatus_impl.h index a29bcdcc..3b1b3062 100644 --- a/klinkstatus/src/engine/linkstatus_impl.h +++ b/klinkstatus/src/engine/linkstatus_impl.h @@ -36,7 +36,7 @@ inline LinktqStatus::LinktqStatus(KURL const& absolute_url) setAbsoluteUrl(absolute_url); } -inline LinktqStatus::LinktqStatus(Node* node, LinktqStatus* tqparent) +inline LinktqStatus::LinktqStatus(Node* node, LinktqStatus* parent) : status_(LinktqStatus::UNDETERMINED), depth_(-1), external_domain_depth_(-1), is_root_(false), error_occurred_(false), is_redirection_(false), parent_(0), redirection_(0), checked_(false), only_check_header_(true), malformed_(false), @@ -45,9 +45,9 @@ inline LinktqStatus::LinktqStatus(Node* node, LinktqStatus* tqparent) { loadNode(); - setDepth(tqparent->depth() + 1); - setParent(tqparent); - setRootUrl(tqparent->rootUrl()); + setDepth(parent->depth() + 1); + setParent(parent); + setRootUrl(parent->rootUrl()); } inline void LinktqStatus::setRootUrl(KURL const& url) @@ -65,12 +65,12 @@ inline void LinktqStatus::setDepth(uint depth) depth_ = depth; } -inline void LinktqStatus::setParent(LinktqStatus* tqparent) +inline void LinktqStatus::setParent(LinktqStatus* parent) { - Q_ASSERT(tqparent); + Q_ASSERT(parent); - parent_ = tqparent; - addReferrer(tqparent->absoluteUrl()); + parent_ = parent; + addReferrer(parent->absoluteUrl()); } inline void LinktqStatus::setAbsoluteUrl(KURL const& url_absoluto) @@ -176,7 +176,7 @@ inline void LinktqStatus::setBaseURI(KURL const& base_url) if(!base_url.isValid()) { kdWarning(23100) << "base url not valid: " << endl - << "tqparent: " << tqparent()->absoluteUrl().prettyURL() << endl + << "parent: " << parent()->absoluteUrl().prettyURL() << endl << "url: " << absoluteUrl().prettyURL() << endl << "base url resolved: " << base_url.prettyURL() << endl; } @@ -261,7 +261,7 @@ inline bool LinktqStatus::isLocalRestrict() const return is_local_restrict_; } -inline LinktqStatus const* LinktqStatus::tqparent() const +inline LinktqStatus const* LinktqStatus::parent() const { return parent_; } diff --git a/klinkstatus/src/engine/searchmanager.cpp b/klinkstatus/src/engine/searchmanager.cpp index 82c7350a..6ba9a1ba 100644 --- a/klinkstatus/src/engine/searchmanager.cpp +++ b/klinkstatus/src/engine/searchmanager.cpp @@ -37,8 +37,8 @@ SearchManager::SearchManager(int max_simultaneous_connections, int time_out, - TQObject *tqparent, const char *name) - : TQObject(tqparent, name), + TQObject *parent, const char *name) + : TQObject(parent, name), max_simultaneous_connections_(max_simultaneous_connections), has_document_root_(false), depth_(-1), current_depth_(0), external_domain_depth_(0), current_node_(0), current_index_(0), links_being_checked_(0), diff --git a/klinkstatus/src/engine/searchmanager.h b/klinkstatus/src/engine/searchmanager.h index e977eae4..bee819da 100644 --- a/klinkstatus/src/engine/searchmanager.h +++ b/klinkstatus/src/engine/searchmanager.h @@ -55,7 +55,7 @@ public: }; SearchManager(int max_simultaneous_connections = 3, int time_out = 50, - TQObject *tqparent = 0, const char *name = 0); + TQObject *parent = 0, const char *name = 0); ~SearchManager(); TQString toXML() const; diff --git a/klinkstatus/src/global.cpp b/klinkstatus/src/global.cpp index 9fe9d96d..89a852a7 100644 --- a/klinkstatus/src/global.cpp +++ b/klinkstatus/src/global.cpp @@ -40,8 +40,8 @@ Global* Global::self() return m_self_; } -Global::Global(TQObject *tqparent, const char *name) - : TQObject(tqparent, name), loop_started_(false) +Global::Global(TQObject *parent, const char *name) + : TQObject(parent, name), loop_started_(false) { m_self_ = this; dcop_client_ = kapp->dcopClient(); diff --git a/klinkstatus/src/global.h b/klinkstatus/src/global.h index 1e465404..27832ab1 100644 --- a/klinkstatus/src/global.h +++ b/klinkstatus/src/global.h @@ -40,7 +40,7 @@ public: static void openQuanta(TQStringList const& args); private: - Global(TQObject *tqparent = 0, const char *name = 0); + Global(TQObject *parent = 0, const char *name = 0); static void execCommand(TQString const& command); private slots: diff --git a/klinkstatus/src/klinkstatus_part.cpp b/klinkstatus/src/klinkstatus_part.cpp index 54b08f0b..6d8df6a8 100644 --- a/klinkstatus/src/klinkstatus_part.cpp +++ b/klinkstatus/src/klinkstatus_part.cpp @@ -56,9 +56,9 @@ typedef KParts::GenericFactory KLinkStatusFactory; K_EXPORT_COMPONENT_FACTORY( libklinkstatuspart, KLinkStatusFactory ) KLinkStatusPart::KLinkStatusPart(TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name, + TQObject *parent, const char *name, const TQStringList & /*string_list*/) - : KParts::ReadOnlyPart(tqparent, name), m_dlgAbout(0) + : KParts::ReadOnlyPart(parent, name), m_dlgAbout(0) { setInstance(KLinkStatusFactory::instance()); diff --git a/klinkstatus/src/klinkstatus_part.h b/klinkstatus/src/klinkstatus_part.h index 8d9eaf2e..60988054 100644 --- a/klinkstatus/src/klinkstatus_part.h +++ b/klinkstatus/src/klinkstatus_part.h @@ -40,7 +40,7 @@ class KLinkStatusPart: public KParts::ReadOnlyPart TQ_OBJECT public: KLinkStatusPart(TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name, + TQObject *parent, const char *name, const TQStringList& args); virtual ~KLinkStatusPart(); diff --git a/klinkstatus/src/parser/url.cpp b/klinkstatus/src/parser/url.cpp index 90a6e4e6..8ba29138 100644 --- a/klinkstatus/src/parser/url.cpp +++ b/klinkstatus/src/parser/url.cpp @@ -294,7 +294,7 @@ bool Url::localDomain(KURL const& url1, KURL const& url2, bool restrict) } /** - Returns true if url2 is a tqparent of url1. + Returns true if url2 is a parent of url1. */ bool Url::parentDir(KURL const& url1, KURL const& url2) { diff --git a/klinkstatus/src/ui/documentrootdialog.cpp b/klinkstatus/src/ui/documentrootdialog.cpp index 622faedf..8c55519e 100644 --- a/klinkstatus/src/ui/documentrootdialog.cpp +++ b/klinkstatus/src/ui/documentrootdialog.cpp @@ -28,8 +28,8 @@ #include -DocumentRootDialog::DocumentRootDialog(TQWidget *tqparent, TQString const& url) - : KDialogBase(tqparent, "DocumentRootDialog", true, "Choose a Document Root", +DocumentRootDialog::DocumentRootDialog(TQWidget *parent, TQString const& url) + : KDialogBase(parent, "DocumentRootDialog", true, "Choose a Document Root", KDialogBase::Ok, KDialogBase::Ok, true), m_url(url) { diff --git a/klinkstatus/src/ui/documentrootdialog.h b/klinkstatus/src/ui/documentrootdialog.h index cf531e51..a78d7009 100644 --- a/klinkstatus/src/ui/documentrootdialog.h +++ b/klinkstatus/src/ui/documentrootdialog.h @@ -32,7 +32,7 @@ class DocumentRootDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - DocumentRootDialog(TQWidget *tqparent, TQString const& url); + DocumentRootDialog(TQWidget *parent, TQString const& url); ~DocumentRootDialog(); void setUrl(const TQString& theValue) { m_url = theValue; } diff --git a/klinkstatus/src/ui/klshistorycombo.cpp b/klinkstatus/src/ui/klshistorycombo.cpp index f342faa7..7ca1e533 100644 --- a/klinkstatus/src/ui/klshistorycombo.cpp +++ b/klinkstatus/src/ui/klshistorycombo.cpp @@ -24,8 +24,8 @@ bool KLSHistoryCombo::items_saved_ = false; -KLSHistoryCombo::KLSHistoryCombo(TQWidget *tqparent, const char *name) - : KHistoryCombo(tqparent, name) +KLSHistoryCombo::KLSHistoryCombo(TQWidget *parent, const char *name) + : KHistoryCombo(parent, name) { setMaxCount(KLSConfig::maxCountComboUrl()); diff --git a/klinkstatus/src/ui/klshistorycombo.h b/klinkstatus/src/ui/klshistorycombo.h index 4627f55a..26c0e652 100644 --- a/klinkstatus/src/ui/klshistorycombo.h +++ b/klinkstatus/src/ui/klshistorycombo.h @@ -25,7 +25,7 @@ class KLSHistoryCombo : public KHistoryCombo TQ_OBJECT public: - KLSHistoryCombo(TQWidget* tqparent, const char* name); + KLSHistoryCombo(TQWidget* parent, const char* name); ~KLSHistoryCombo(); void init(); diff --git a/klinkstatus/src/ui/resultssearchbar.cpp b/klinkstatus/src/ui/resultssearchbar.cpp index 8d039558..10d47fda 100644 --- a/klinkstatus/src/ui/resultssearchbar.cpp +++ b/klinkstatus/src/ui/resultssearchbar.cpp @@ -54,8 +54,8 @@ public: int m_lastComboIndex; }; -ResultsSearchBar::ResultsSearchBar(TQWidget* tqparent, const char* name) - : TQWidget(tqparent, name), d(new ResultsSearchBar::ResultsSearchBarPrivate) +ResultsSearchBar::ResultsSearchBar(TQWidget* parent, const char* name) + : TQWidget(parent, name), d(new ResultsSearchBar::ResultsSearchBarPrivate) { tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed)); diff --git a/klinkstatus/src/ui/resultssearchbar.h b/klinkstatus/src/ui/resultssearchbar.h index a51c3f72..c177c5aa 100644 --- a/klinkstatus/src/ui/resultssearchbar.h +++ b/klinkstatus/src/ui/resultssearchbar.h @@ -35,7 +35,7 @@ class ResultsSearchBar : public TQWidget Q_OBJECT TQ_OBJECT public: - ResultsSearchBar(TQWidget *tqparent = 0, const char *name = 0); + ResultsSearchBar(TQWidget *parent = 0, const char *name = 0); ~ResultsSearchBar(); TQString const& text() const; diff --git a/klinkstatus/src/ui/sessionwidget.cpp b/klinkstatus/src/ui/sessionwidget.cpp index 26123b6b..970ec7c6 100644 --- a/klinkstatus/src/ui/sessionwidget.cpp +++ b/klinkstatus/src/ui/sessionwidget.cpp @@ -66,8 +66,8 @@ SessionWidget::SessionWidget(int max_simultaneous_connections, int time_out, - TQWidget* tqparent, const char* name, WFlags f) - : SessionWidgetBase(tqparent, name, f), search_manager_(0), + TQWidget* parent, const char* name, WFlags f) + : SessionWidgetBase(parent, name, f), search_manager_(0), action_manager_(ActionManager::getInstance()), ready_(true), to_start_(false), to_pause_(false), to_stop_(false), in_progress_(false), paused_(false), stopped_(true), @@ -392,7 +392,7 @@ void SessionWidget::slotLinkChecked(LinktqStatus const* linkstatus, LinkChecker if(linkstatus->checked()) { TreeViewItem* tree_view_item = 0; - TreeViewItem* parent_item = linkstatus->tqparent()->treeViewItem(); + TreeViewItem* parent_item = linkstatus->parent()->treeViewItem(); bool match = resultsSearchBar->currentLinkMatcher().matches(*linkstatus); if(tree_display_) diff --git a/klinkstatus/src/ui/sessionwidget.h b/klinkstatus/src/ui/sessionwidget.h index a10df805..93fdca70 100644 --- a/klinkstatus/src/ui/sessionwidget.h +++ b/klinkstatus/src/ui/sessionwidget.h @@ -50,7 +50,7 @@ class SessionWidget: public SessionWidgetBase public: SessionWidget(int max_simultaneous_connections = 3, int time_out = 50, - TQWidget* tqparent = 0, const char* name = 0, WFlags f = 0); + TQWidget* parent = 0, const char* name = 0, WFlags f = 0); ~SessionWidget(); diff --git a/klinkstatus/src/ui/sessionwidgetbase.ui b/klinkstatus/src/ui/sessionwidgetbase.ui index 7cf9819a..43d6029e 100644 --- a/klinkstatus/src/ui/sessionwidgetbase.ui +++ b/klinkstatus/src/ui/sessionwidgetbase.ui @@ -212,7 +212,7 @@ true - Do &not check tqparent folders + Do &not check parent folders diff --git a/klinkstatus/src/ui/settings/configidentificationdialog.cpp b/klinkstatus/src/ui/settings/configidentificationdialog.cpp index 28f00d81..f2675d81 100644 --- a/klinkstatus/src/ui/settings/configidentificationdialog.cpp +++ b/klinkstatus/src/ui/settings/configidentificationdialog.cpp @@ -29,8 +29,8 @@ #include "../cfg/klsconfig.h" -ConfigIdentificationDialog::ConfigIdentificationDialog(TQWidget *tqparent, const char *name) - : ConfigIdentificationDialogUi(tqparent, name) +ConfigIdentificationDialog::ConfigIdentificationDialog(TQWidget *parent, const char *name) + : ConfigIdentificationDialogUi(parent, name) { if(KLSConfig::userAgent().isEmpty()) { diff --git a/klinkstatus/src/ui/settings/configidentificationdialog.h b/klinkstatus/src/ui/settings/configidentificationdialog.h index 033a74c5..da260180 100644 --- a/klinkstatus/src/ui/settings/configidentificationdialog.h +++ b/klinkstatus/src/ui/settings/configidentificationdialog.h @@ -31,7 +31,7 @@ class ConfigIdentificationDialog : public ConfigIdentificationDialogUi Q_OBJECT TQ_OBJECT public: - ConfigIdentificationDialog(TQWidget *tqparent = 0, const char *name = 0); + ConfigIdentificationDialog(TQWidget *parent = 0, const char *name = 0); ~ConfigIdentificationDialog(); private slots: diff --git a/klinkstatus/src/ui/settings/configsearchdialog.ui b/klinkstatus/src/ui/settings/configsearchdialog.ui index 4c63274b..62553ffb 100644 --- a/klinkstatus/src/ui/settings/configsearchdialog.ui +++ b/klinkstatus/src/ui/settings/configsearchdialog.ui @@ -149,7 +149,7 @@ kcfg_CheckParentFolders - Check tqparent folders + Check parent folders true diff --git a/klinkstatus/src/ui/tablelinkstatus.cpp b/klinkstatus/src/ui/tablelinkstatus.cpp index 9fbd3b31..7f35d1f2 100644 --- a/klinkstatus/src/ui/tablelinkstatus.cpp +++ b/klinkstatus/src/ui/tablelinkstatus.cpp @@ -46,11 +46,11 @@ */ -TableLinkstatus::TableLinkstatus(TQWidget * tqparent, const char * name, +TableLinkstatus::TableLinkstatus(TQWidget * parent, const char * name, int column_index_status, int column_index_label, int column_index_URL) - : TQTable(tqparent, name), + : TQTable(parent, name), ResultView(column_index_status, column_index_label, column_index_URL) //context_table_menu_(this, "context_table_menu") { @@ -321,7 +321,7 @@ void TableLinkstatus::slotCopyUrlToClipboard() const void TableLinkstatus::slotCopyParentUrlToClipboard() const { TableItem* _item = myItem(currentRow(), currentColumn()); - TQString content(_item->linktqStatus()->tqparent()->absoluteUrl().prettyURL()); + TQString content(_item->linktqStatus()->parent()->absoluteUrl().prettyURL()); TQClipboard* cb = kapp->clipboard(); cb->setText(content); } @@ -420,7 +420,7 @@ void TableLinkstatus::slotViewParentUrlInBrowser() } else { - LinktqStatus const* ls_parent = _item->linktqStatus()->tqparent(); + LinktqStatus const* ls_parent = _item->linktqStatus()->parent(); Q_ASSERT(ls_parent); KURL url = ls_parent->absoluteUrl(); diff --git a/klinkstatus/src/ui/tablelinkstatus.h b/klinkstatus/src/ui/tablelinkstatus.h index 70f6fd41..a8aebf8d 100644 --- a/klinkstatus/src/ui/tablelinkstatus.h +++ b/klinkstatus/src/ui/tablelinkstatus.h @@ -49,7 +49,7 @@ class TableLinkstatus: public TQTable, public ResultView TQ_OBJECT public: - TableLinkstatus(TQWidget * tqparent = 0, const char * name = 0, + TableLinkstatus(TQWidget * parent = 0, const char * name = 0, int column_index_status = 1, int column_index_label = 2, int column_index_URL = 3); diff --git a/klinkstatus/src/ui/tabwidgetsession.cpp b/klinkstatus/src/ui/tabwidgetsession.cpp index 24c89d0f..fedbe573 100644 --- a/klinkstatus/src/ui/tabwidgetsession.cpp +++ b/klinkstatus/src/ui/tabwidgetsession.cpp @@ -42,8 +42,8 @@ #include -TabWidgetSession::TabWidgetSession(TQWidget* tqparent, const char* name, WFlags f) - : KTabWidget(tqparent, name, f) // tabs_ is initialized with size 17 +TabWidgetSession::TabWidgetSession(TQWidget* parent, const char* name, WFlags f) + : KTabWidget(parent, name, f) // tabs_ is initialized with size 17 { setFocusPolicy(TQ_NoFocus); setMargin(0); diff --git a/klinkstatus/src/ui/tabwidgetsession.h b/klinkstatus/src/ui/tabwidgetsession.h index 4b315a85..1632fc9a 100644 --- a/klinkstatus/src/ui/tabwidgetsession.h +++ b/klinkstatus/src/ui/tabwidgetsession.h @@ -41,7 +41,7 @@ class TabWidgetSession : public KTabWidget TQ_OBJECT public: - TabWidgetSession(TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0); + TabWidgetSession(TQWidget * parent = 0, const char * name = 0, WFlags f = 0); ~TabWidgetSession(); /** Set the URL in the current session widget */ diff --git a/klinkstatus/src/ui/treeview.cpp b/klinkstatus/src/ui/treeview.cpp index b5d42143..1d8f546e 100644 --- a/klinkstatus/src/ui/treeview.cpp +++ b/klinkstatus/src/ui/treeview.cpp @@ -39,8 +39,8 @@ #include "../cfg/klsconfig.h" -TreeView::TreeView(TQWidget *tqparent, const char *name) - : KListView(tqparent, name), +TreeView::TreeView(TQWidget *parent, const char *name) + : KListView(parent, name), ResultView(), current_column_(0) { @@ -130,20 +130,20 @@ void TreeView::show(ResultView::tqStatus const& status) item->setVisible(true); //item->setEnabled(true); /* - if(KLSConfig::displayTreeView() && status != ResultView::good && item->tqparent()) + if(KLSConfig::displayTreeView() && status != ResultView::good && item->parent()) { - TreeViewItem* tqparent = myItem(item->tqparent()); - while(tqparent) + TreeViewItem* parent = myItem(item->parent()); + while(parent) { - kdDebug(23100) << "Show: " << tqparent->linktqStatus()->absoluteUrl().url() << endl; + kdDebug(23100) << "Show: " << parent->linktqStatus()->absoluteUrl().url() << endl; - tqparent->setVisible(true); - //tqparent->setEnabled(false); + parent->setVisible(true); + //parent->setEnabled(false); - if(tqparent->tqparent()) - tqparent = myItem(tqparent->tqparent()); + if(parent->parent()) + parent = myItem(parent->parent()); else - tqparent = 0; + parent = 0; } } */ @@ -226,7 +226,7 @@ void TreeView::slotCopyUrlToClipboard() const void TreeView::slotCopyParentUrlToClipboard() const { TreeViewItem* _item = myItem(currentItem()); - TQString content(_item->linktqStatus()->tqparent()->absoluteUrl().prettyURL()); + TQString content(_item->linktqStatus()->parent()->absoluteUrl().prettyURL()); TQClipboard* cb = kapp->tqclipboard(); cb->setText(content); } @@ -326,7 +326,7 @@ void TreeView::slotViewParentUrlInBrowser() } else { - LinktqStatus const* ls_parent = _item->linktqStatus()->tqparent(); + LinktqStatus const* ls_parent = _item->linktqStatus()->parent(); Q_ASSERT(ls_parent); KURL url = ls_parent->absoluteUrl(); @@ -392,10 +392,10 @@ TreeViewItem* TreeView::myItem(TQListViewItem* item) const /* ******************************* TreeViewItem ******************************* */ -TreeViewItem::TreeViewItem(TreeView* tqparent, TQListViewItem* after, +TreeViewItem::TreeViewItem(TreeView* parent, TQListViewItem* after, LinktqStatus const* linkstatus) - : KListViewItem(tqparent, after), - last_child_(0), root_(tqparent) + : KListViewItem(parent, after), + last_child_(0), root_(parent) { init(linkstatus); } diff --git a/klinkstatus/src/ui/treeview.h b/klinkstatus/src/ui/treeview.h index dc3e62e8..05862bd4 100644 --- a/klinkstatus/src/ui/treeview.h +++ b/klinkstatus/src/ui/treeview.h @@ -32,7 +32,7 @@ class TreeView : public KListView, public ResultView TQ_OBJECT public: - TreeView(TQWidget *tqparent = 0, const char *name = 0); + TreeView(TQWidget *parent = 0, const char *name = 0); ~TreeView(); virtual void setColumns(TQStringList const& columns); @@ -91,7 +91,7 @@ class TreeViewItem: public KListViewItem { public: - TreeViewItem(TreeView* tqparent, TQListViewItem* after, + TreeViewItem(TreeView* parent, TQListViewItem* after, LinktqStatus const* linkstatus); TreeViewItem(TreeView* root, TQListViewItem* parent_item, TQListViewItem* after, LinktqStatus const* linkstatus); diff --git a/klinkstatus/src/utils/xsl.cpp b/klinkstatus/src/utils/xsl.cpp index 541c0498..fc3c8f31 100644 --- a/klinkstatus/src/utils/xsl.cpp +++ b/klinkstatus/src/utils/xsl.cpp @@ -196,8 +196,8 @@ public: unsigned int flags; }; -XSLT::XSLT( const TQString &document, TQObject *tqparent ) - : TQObject( tqparent ), d(new XSLTPrivate) +XSLT::XSLT( const TQString &document, TQObject *parent ) + : TQObject( parent ), d(new XSLTPrivate) { d->flags = 0; d->xslDoc = 0; diff --git a/klinkstatus/src/utils/xsl.h b/klinkstatus/src/utils/xsl.h index 93d6a74b..0760ae1b 100644 --- a/klinkstatus/src/utils/xsl.h +++ b/klinkstatus/src/utils/xsl.h @@ -57,7 +57,7 @@ public: * * Constructs a new XSLT parser using the provided XSLT document */ - XSLT( const TQString &xsltDocument, TQObject *tqparent = 0L ); + XSLT( const TQString &xsltDocument, TQObject *parent = 0L ); virtual ~XSLT(); diff --git a/kommander/Kommander-TODO.kno b/kommander/Kommander-TODO.kno index 824c9063..52ab92a5 100644 --- a/kommander/Kommander-TODO.kno +++ b/kommander/Kommander-TODO.kno @@ -284,7 +284,7 @@
  • ChangeLog of Kommander
  • See ChangeLog file for details and dates
    • -