summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
commit22253cd8fbc0bd2e70f32aaf1f95ea3a3e819a60 (patch)
treebabc4a761925023e16fa94633959f35d1c251887
parent0813b39aed2cf4c84157a22c4c9594336d93d412 (diff)
downloadtdesdk-22253cd8fbc0bd2e70f32aaf1f95ea3a3e819a60.tar.gz
tdesdk-22253cd8fbc0bd2e70f32aaf1f95ea3a3e819a60.zip
rename the following methods:
tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--cervisia/addremovedlg.cpp4
-rw-r--r--cervisia/addremovedlg.h2
-rw-r--r--cervisia/addrepositorydlg.cpp4
-rw-r--r--cervisia/addrepositorydlg.h2
-rw-r--r--cervisia/annotatedlg.cpp4
-rw-r--r--cervisia/annotatedlg.h2
-rw-r--r--cervisia/annotateview.cpp10
-rw-r--r--cervisia/annotateview.h2
-rw-r--r--cervisia/cervisiapart.cpp6
-rw-r--r--cervisia/cervisiapart.h2
-rw-r--r--cervisia/changelogdlg.cpp4
-rw-r--r--cervisia/changelogdlg.h2
-rw-r--r--cervisia/checkoutdlg.cpp4
-rw-r--r--cervisia/checkoutdlg.h2
-rw-r--r--cervisia/commitdlg.cpp8
-rw-r--r--cervisia/commitdlg.h2
-rw-r--r--cervisia/cvsinitdlg.cpp4
-rw-r--r--cervisia/cvsinitdlg.h2
-rw-r--r--cervisia/cvsservice/sshagent.cpp4
-rw-r--r--cervisia/cvsservice/sshagent.h2
-rw-r--r--cervisia/diffdlg.cpp6
-rw-r--r--cervisia/diffdlg.h2
-rw-r--r--cervisia/diffview.cpp8
-rw-r--r--cervisia/diffview.h4
-rw-r--r--cervisia/editwithmenu.cpp4
-rw-r--r--cervisia/editwithmenu.h2
-rw-r--r--cervisia/historydlg.cpp8
-rw-r--r--cervisia/historydlg.h2
-rw-r--r--cervisia/logdlg.cpp4
-rw-r--r--cervisia/logdlg.h2
-rw-r--r--cervisia/loglist.cpp4
-rw-r--r--cervisia/loglist.h2
-rw-r--r--cervisia/logmessageedit.cpp4
-rw-r--r--cervisia/logmessageedit.h2
-rw-r--r--cervisia/logplainview.cpp4
-rw-r--r--cervisia/logplainview.h2
-rw-r--r--cervisia/logtree.cpp4
-rw-r--r--cervisia/logtree.h2
-rw-r--r--cervisia/mergedlg.cpp4
-rw-r--r--cervisia/mergedlg.h2
-rw-r--r--cervisia/misc.cpp16
-rw-r--r--cervisia/misc.h6
-rw-r--r--cervisia/patchoptiondlg.cpp4
-rw-r--r--cervisia/patchoptiondlg.h2
-rw-r--r--cervisia/progressdlg.cpp4
-rw-r--r--cervisia/progressdlg.h2
-rw-r--r--cervisia/protocolview.cpp4
-rw-r--r--cervisia/protocolview.h2
-rw-r--r--cervisia/qttableview.cpp10
-rw-r--r--cervisia/qttableview.h2
-rw-r--r--cervisia/repositorydlg.cpp10
-rw-r--r--cervisia/repositorydlg.h2
-rw-r--r--cervisia/resolvedlg.cpp4
-rw-r--r--cervisia/resolvedlg.h2
-rw-r--r--cervisia/resolvedlg_p.cpp4
-rw-r--r--cervisia/resolvedlg_p.h2
-rw-r--r--cervisia/settingsdlg.cpp8
-rw-r--r--cervisia/settingsdlg.h4
-rw-r--r--cervisia/tagdlg.cpp4
-rw-r--r--cervisia/tagdlg.h2
-rw-r--r--cervisia/tooltip.h6
-rw-r--r--cervisia/updatedlg.cpp4
-rw-r--r--cervisia/updatedlg.h2
-rw-r--r--cervisia/updateview.cpp8
-rw-r--r--cervisia/updateview.h2
-rw-r--r--cervisia/updateview_items.cpp18
-rw-r--r--cervisia/updateview_items.h14
-rw-r--r--cervisia/updateview_visitors.cpp6
-rw-r--r--cervisia/watchdlg.cpp4
-rw-r--r--cervisia/watchdlg.h2
-rw-r--r--cervisia/watchersdlg.cpp4
-rw-r--r--cervisia/watchersdlg.h2
-rw-r--r--kapptemplate/kapp/apppref.cpp8
-rw-r--r--kapptemplate/kapp/apppref.h4
-rw-r--r--kapptemplate/kapp/appview.cpp4
-rw-r--r--kapptemplate/kapp/appview.h2
-rw-r--r--kapptemplate/kpartapp/app_part.cpp6
-rw-r--r--kapptemplate/kpartapp/app_part.h2
-rw-r--r--kapptemplate/kpartplugin/plugin_app.cpp10
-rw-r--r--kapptemplate/kpartplugin/plugin_app.h2
-rw-r--r--kbabel/addons/kfile-plugins/kfile_po.cpp4
-rw-r--r--kbabel/addons/kfile-plugins/kfile_po.h2
-rw-r--r--kbabel/catalogmanager/catalogmanagerview.cpp26
-rw-r--r--kbabel/catalogmanager/catalogmanagerview.h6
-rw-r--r--kbabel/catalogmanager/catmanlistitem.cpp30
-rw-r--r--kbabel/catalogmanager/catmanlistitem.h8
-rw-r--r--kbabel/catalogmanager/findinfilesdialog.cpp4
-rw-r--r--kbabel/catalogmanager/findinfilesdialog.h2
-rw-r--r--kbabel/catalogmanager/libcvs/cvsdialog.cpp4
-rw-r--r--kbabel/catalogmanager/libcvs/cvsdialog.h2
-rw-r--r--kbabel/catalogmanager/libcvs/cvshandler.cpp20
-rw-r--r--kbabel/catalogmanager/libcvs/cvshandler.h6
-rw-r--r--kbabel/catalogmanager/libsvn/svndialog.cpp4
-rw-r--r--kbabel/catalogmanager/libsvn/svndialog.h2
-rw-r--r--kbabel/catalogmanager/libsvn/svnhandler.cpp16
-rw-r--r--kbabel/catalogmanager/libsvn/svnhandler.h6
-rw-r--r--kbabel/catalogmanager/markpatterndialog.cpp4
-rw-r--r--kbabel/catalogmanager/markpatterndialog.h2
-rw-r--r--kbabel/catalogmanager/multiroughtransdlg.cpp6
-rw-r--r--kbabel/catalogmanager/multiroughtransdlg.h2
-rw-r--r--kbabel/catalogmanager/validateprogress.cpp4
-rw-r--r--kbabel/catalogmanager/validateprogress.h2
-rw-r--r--kbabel/common/catalog.cpp6
-rw-r--r--kbabel/common/catalog.h4
-rw-r--r--kbabel/common/catalogfileplugin.h4
-rw-r--r--kbabel/common/exportplugin.cpp2
-rw-r--r--kbabel/common/importplugin.cpp2
-rw-r--r--kbabel/common/kbabeldatatool.h2
-rw-r--r--kbabel/common/kbmailer.cpp4
-rw-r--r--kbabel/common/kbmailer.h8
-rw-r--r--kbabel/common/msgfmt.cpp4
-rw-r--r--kbabel/common/msgfmt.h2
-rw-r--r--kbabel/common/stringdistance.h2
-rw-r--r--kbabel/commonui/cmdedit.cpp4
-rw-r--r--kbabel/commonui/cmdedit.h2
-rw-r--r--kbabel/commonui/context.cpp4
-rw-r--r--kbabel/commonui/context.h2
-rw-r--r--kbabel/commonui/finddialog.cpp8
-rw-r--r--kbabel/commonui/finddialog.h4
-rw-r--r--kbabel/commonui/kactionselector.cpp4
-rw-r--r--kbabel/commonui/kactionselector.h2
-rw-r--r--kbabel/commonui/projectprefwidgets.cpp34
-rw-r--r--kbabel/commonui/projectprefwidgets.h18
-rw-r--r--kbabel/commonui/projectwizard.cpp4
-rw-r--r--kbabel/commonui/projectwizard.h2
-rw-r--r--kbabel/commonui/roughtransdlg.cpp4
-rw-r--r--kbabel/commonui/roughtransdlg.h2
-rw-r--r--kbabel/commonui/toolaction.cpp8
-rw-r--r--kbabel/commonui/toolaction.h4
-rw-r--r--kbabel/commonui/toolselectionwidget.cpp4
-rw-r--r--kbabel/commonui/toolselectionwidget.h2
-rw-r--r--kbabel/datatools/accelerators/main.cc4
-rw-r--r--kbabel/datatools/accelerators/main.h2
-rw-r--r--kbabel/datatools/arguments/main.cc4
-rw-r--r--kbabel/datatools/arguments/main.h2
-rw-r--r--kbabel/datatools/context/main.cc4
-rw-r--r--kbabel/datatools/context/main.h2
-rw-r--r--kbabel/datatools/equations/main.cc4
-rw-r--r--kbabel/datatools/equations/main.h2
-rw-r--r--kbabel/datatools/length/main.cc4
-rw-r--r--kbabel/datatools/length/main.h2
-rw-r--r--kbabel/datatools/not-translated/main.cc4
-rw-r--r--kbabel/datatools/not-translated/main.h2
-rw-r--r--kbabel/datatools/pluralforms/main.cc4
-rw-r--r--kbabel/datatools/pluralforms/main.h2
-rw-r--r--kbabel/datatools/punctuation/main.cc4
-rw-r--r--kbabel/datatools/punctuation/main.h2
-rw-r--r--kbabel/datatools/regexp/main.cc6
-rw-r--r--kbabel/datatools/regexp/main.h2
-rw-r--r--kbabel/datatools/setfuzzy/main.cc4
-rw-r--r--kbabel/datatools/setfuzzy/main.h2
-rw-r--r--kbabel/datatools/whitespace/main.cc4
-rw-r--r--kbabel/datatools/whitespace/main.h2
-rw-r--r--kbabel/datatools/xml/main.cc4
-rw-r--r--kbabel/datatools/xml/main.h2
-rw-r--r--kbabel/filters/gettext/gettextexport.cpp4
-rw-r--r--kbabel/filters/gettext/gettextexport.h2
-rw-r--r--kbabel/filters/gettext/gettextimport.cpp2
-rw-r--r--kbabel/filters/gettext/gettextimport.h2
-rw-r--r--kbabel/filters/linguist/linguistexport.cpp4
-rw-r--r--kbabel/filters/linguist/linguistexport.h2
-rw-r--r--kbabel/filters/linguist/linguistimport.cpp4
-rw-r--r--kbabel/filters/linguist/linguistimport.h2
-rw-r--r--kbabel/filters/xliff/xliffexport.cpp4
-rw-r--r--kbabel/filters/xliff/xliffexport.h2
-rw-r--r--kbabel/filters/xliff/xliffimport.cpp4
-rw-r--r--kbabel/filters/xliff/xliffimport.h2
-rw-r--r--kbabel/kbabel/charselectview.cpp4
-rw-r--r--kbabel/kbabel/charselectview.h2
-rw-r--r--kbabel/kbabel/commentview.cpp4
-rw-r--r--kbabel/kbabel/commentview.h2
-rw-r--r--kbabel/kbabel/contextview.cpp4
-rw-r--r--kbabel/kbabel/contextview.h2
-rw-r--r--kbabel/kbabel/errorlistview.cpp4
-rw-r--r--kbabel/kbabel/errorlistview.h2
-rw-r--r--kbabel/kbabel/gotodialog.cpp4
-rw-r--r--kbabel/kbabel/gotodialog.h2
-rw-r--r--kbabel/kbabel/hidingmsgedit.cpp4
-rw-r--r--kbabel/kbabel/hidingmsgedit.h2
-rw-r--r--kbabel/kbabel/kbabel.cpp10
-rw-r--r--kbabel/kbabel/kbabelsplash.cpp4
-rw-r--r--kbabel/kbabel/kbabelsplash.h2
-rw-r--r--kbabel/kbabel/kbabelview.cpp6
-rw-r--r--kbabel/kbabel/kbabelview.h2
-rw-r--r--kbabel/kbabel/kbbookmarkhandler.cpp2
-rw-r--r--kbabel/kbabel/kbcatalog.cpp4
-rw-r--r--kbabel/kbabel/kbcatalog.h2
-rw-r--r--kbabel/kbabel/kbcataloglistview.cpp4
-rw-r--r--kbabel/kbabel/kbcataloglistview.h2
-rw-r--r--kbabel/kbabel/kbcataloglistviewitem.cpp4
-rw-r--r--kbabel/kbabel/kbcataloglistviewitem.h2
-rw-r--r--kbabel/kbabel/kbcatalogview.cpp4
-rw-r--r--kbabel/kbabel/kbcatalogview.h2
-rw-r--r--kbabel/kbabel/kbcharselect.cpp4
-rw-r--r--kbabel/kbabel/kbcharselect.h2
-rw-r--r--kbabel/kbabel/mymultilineedit.cpp10
-rw-r--r--kbabel/kbabel/mymultilineedit.h6
-rw-r--r--kbabel/kbabel/sourceview.cpp4
-rw-r--r--kbabel/kbabel/sourceview.h2
-rw-r--r--kbabel/kbabel/spelldlg.cpp4
-rw-r--r--kbabel/kbabel/spelldlg.h2
-rw-r--r--kbabel/kbabel/taglistview.cpp4
-rw-r--r--kbabel/kbabel/taglistview.h2
-rw-r--r--kbabel/kbabeldict/aboutmoduledlg.cpp4
-rw-r--r--kbabel/kbabeldict/aboutmoduledlg.h2
-rw-r--r--kbabel/kbabeldict/dictchooser.cpp4
-rw-r--r--kbabel/kbabeldict/dictchooser.h2
-rw-r--r--kbabel/kbabeldict/dictionarymenu.cpp4
-rw-r--r--kbabel/kbabeldict/dictionarymenu.h2
-rw-r--r--kbabel/kbabeldict/kbabeldictbox.cpp16
-rw-r--r--kbabel/kbabeldict/kbabeldictbox.h4
-rw-r--r--kbabel/kbabeldict/kbabeldictview.cpp6
-rw-r--r--kbabel/kbabeldict/kbabeldictview.h2
-rw-r--r--kbabel/kbabeldict/kbabelsplash.cpp4
-rw-r--r--kbabel/kbabeldict/kbabelsplash.h2
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp8
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.h4
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine/database.cpp4
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine/database.h2
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp2
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine/dbscan.h2
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.cpp8
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.h4
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp4
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.h2
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp8
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.h6
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp2
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine2/dbscan.h2
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp8
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.h4
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp4
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.h2
-rw-r--r--kbabel/kbabeldict/modules/poauxiliary/pa_factory.cpp8
-rw-r--r--kbabel/kbabeldict/modules/poauxiliary/pa_factory.h4
-rw-r--r--kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp8
-rw-r--r--kbabel/kbabeldict/modules/poauxiliary/poauxiliary.h4
-rw-r--r--kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp4
-rw-r--r--kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.h2
-rw-r--r--kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp4
-rw-r--r--kbabel/kbabeldict/modules/pocompendium/compendiumdata.h2
-rw-r--r--kbabel/kbabeldict/modules/pocompendium/pc_factory.cpp8
-rw-r--r--kbabel/kbabeldict/modules/pocompendium/pc_factory.h4
-rw-r--r--kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp8
-rw-r--r--kbabel/kbabeldict/modules/pocompendium/pocompendium.h4
-rw-r--r--kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp4
-rw-r--r--kbabel/kbabeldict/modules/pocompendium/preferenceswidget.h2
-rw-r--r--kbabel/kbabeldict/modules/tmx/pc_factory.cpp8
-rw-r--r--kbabel/kbabeldict/modules/tmx/pc_factory.h4
-rw-r--r--kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp4
-rw-r--r--kbabel/kbabeldict/modules/tmx/preferenceswidget.h2
-rw-r--r--kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp8
-rw-r--r--kbabel/kbabeldict/modules/tmx/tmxcompendium.h4
-rw-r--r--kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp4
-rw-r--r--kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.h2
-rw-r--r--kbabel/kbabeldict/searchengine.cpp8
-rw-r--r--kbabel/kbabeldict/searchengine.h8
-rw-r--r--kbugbuster/backend/mailsender.cpp8
-rw-r--r--kbugbuster/gui/buglvi.cpp4
-rw-r--r--kbugbuster/gui/buglvi.h2
-rw-r--r--kbugbuster/gui/centralwidget.cpp4
-rw-r--r--kbugbuster/gui/centralwidget.h2
-rw-r--r--kbugbuster/gui/cwbugdetails.cpp4
-rw-r--r--kbugbuster/gui/cwbugdetails.h2
-rw-r--r--kbugbuster/gui/cwbugdetailscontainer.cpp4
-rw-r--r--kbugbuster/gui/cwbugdetailscontainer.h2
-rw-r--r--kbugbuster/gui/cwbuglistcontainer.cpp4
-rw-r--r--kbugbuster/gui/cwbuglistcontainer.h2
-rw-r--r--kbugbuster/gui/cwloadingwidget.cpp8
-rw-r--r--kbugbuster/gui/cwloadingwidget.h4
-rw-r--r--kbugbuster/gui/cwsearchwidget.cpp4
-rw-r--r--kbugbuster/gui/cwsearchwidget.h2
-rw-r--r--kbugbuster/gui/kbbmainwindow.cpp4
-rw-r--r--kbugbuster/gui/kbbmainwindow.h2
-rw-r--r--kbugbuster/gui/messageeditor.cpp4
-rw-r--r--kbugbuster/gui/messageeditor.h2
-rw-r--r--kbugbuster/gui/msginputdialog.cpp4
-rw-r--r--kbugbuster/gui/msginputdialog.h2
-rw-r--r--kbugbuster/gui/packagelvi.cpp8
-rw-r--r--kbugbuster/gui/packagelvi.h4
-rw-r--r--kbugbuster/gui/packageselectdialog.cpp8
-rw-r--r--kbugbuster/gui/packageselectdialog.h4
-rw-r--r--kbugbuster/gui/preferencesdialog.cpp26
-rw-r--r--kbugbuster/gui/preferencesdialog.h4
-rw-r--r--kbugbuster/gui/serverconfigdialog.cpp4
-rw-r--r--kbugbuster/gui/serverconfigdialog.h2
-rw-r--r--kbugbuster/gui/severityselectdialog.cpp4
-rw-r--r--kbugbuster/gui/severityselectdialog.h2
-rw-r--r--kbugbuster/kresources/kcalresourceconfig.cpp4
-rw-r--r--kbugbuster/kresources/kcalresourceconfig.h2
-rw-r--r--kcachegrind/kcachegrind/callgraphview.cpp8
-rw-r--r--kcachegrind/kcachegrind/callgraphview.h4
-rw-r--r--kcachegrind/kcachegrind/callitem.cpp4
-rw-r--r--kcachegrind/kcachegrind/callmapview.cpp16
-rw-r--r--kcachegrind/kcachegrind/callmapview.h2
-rw-r--r--kcachegrind/kcachegrind/callview.cpp4
-rw-r--r--kcachegrind/kcachegrind/callview.h2
-rw-r--r--kcachegrind/kcachegrind/configdlg.cpp6
-rw-r--r--kcachegrind/kcachegrind/configdlg.h2
-rw-r--r--kcachegrind/kcachegrind/costlistitem.cpp8
-rw-r--r--kcachegrind/kcachegrind/costlistitem.h4
-rw-r--r--kcachegrind/kcachegrind/costtypeitem.cpp4
-rw-r--r--kcachegrind/kcachegrind/costtypeitem.h2
-rw-r--r--kcachegrind/kcachegrind/costtypeview.cpp4
-rw-r--r--kcachegrind/kcachegrind/costtypeview.h2
-rw-r--r--kcachegrind/kcachegrind/coverageitem.cpp16
-rw-r--r--kcachegrind/kcachegrind/coverageitem.h8
-rw-r--r--kcachegrind/kcachegrind/coverageview.cpp4
-rw-r--r--kcachegrind/kcachegrind/coverageview.h2
-rw-r--r--kcachegrind/kcachegrind/dumpselection.cpp4
-rw-r--r--kcachegrind/kcachegrind/dumpselection.h2
-rw-r--r--kcachegrind/kcachegrind/functionitem.cpp8
-rw-r--r--kcachegrind/kcachegrind/functionitem.h4
-rw-r--r--kcachegrind/kcachegrind/functionselection.cpp4
-rw-r--r--kcachegrind/kcachegrind/functionselection.h2
-rw-r--r--kcachegrind/kcachegrind/instritem.cpp16
-rw-r--r--kcachegrind/kcachegrind/instritem.h8
-rw-r--r--kcachegrind/kcachegrind/instrview.cpp4
-rw-r--r--kcachegrind/kcachegrind/instrview.h2
-rw-r--r--kcachegrind/kcachegrind/multiview.cpp4
-rw-r--r--kcachegrind/kcachegrind/multiview.h2
-rw-r--r--kcachegrind/kcachegrind/partgraph.cpp8
-rw-r--r--kcachegrind/kcachegrind/partgraph.h2
-rw-r--r--kcachegrind/kcachegrind/partlistitem.cpp4
-rw-r--r--kcachegrind/kcachegrind/partlistitem.h2
-rw-r--r--kcachegrind/kcachegrind/partselection.cpp10
-rw-r--r--kcachegrind/kcachegrind/partselection.h2
-rw-r--r--kcachegrind/kcachegrind/partview.cpp4
-rw-r--r--kcachegrind/kcachegrind/partview.h2
-rw-r--r--kcachegrind/kcachegrind/sourceitem.cpp12
-rw-r--r--kcachegrind/kcachegrind/sourceitem.h6
-rw-r--r--kcachegrind/kcachegrind/sourceview.cpp4
-rw-r--r--kcachegrind/kcachegrind/sourceview.h2
-rw-r--r--kcachegrind/kcachegrind/stackitem.cpp8
-rw-r--r--kcachegrind/kcachegrind/stackitem.h4
-rw-r--r--kcachegrind/kcachegrind/stackselection.cpp4
-rw-r--r--kcachegrind/kcachegrind/stackselection.h2
-rw-r--r--kcachegrind/kcachegrind/tabview.cpp20
-rw-r--r--kcachegrind/kcachegrind/tabview.h8
-rw-r--r--kcachegrind/kcachegrind/toplevel.cpp6
-rw-r--r--kcachegrind/kcachegrind/tracedata.cpp16
-rw-r--r--kcachegrind/kcachegrind/tracedata.h8
-rw-r--r--kcachegrind/kcachegrind/traceitemview.h6
-rw-r--r--kcachegrind/kcachegrind/treemap.cpp70
-rw-r--r--kcachegrind/kcachegrind/treemap.h24
-rw-r--r--kfile-plugins/c++/kfile_cpp.cpp4
-rw-r--r--kfile-plugins/c++/kfile_cpp.h2
-rw-r--r--kfile-plugins/diff/kfile_diff.cpp4
-rw-r--r--kfile-plugins/diff/kfile_diff.h2
-rw-r--r--kfile-plugins/ts/kfile_ts.cpp4
-rw-r--r--kfile-plugins/ts/kfile_ts.h2
-rw-r--r--kmtrace/ktrace.c8
-rw-r--r--kompare/komparenavtreepart/komparenavtreepart.cpp16
-rw-r--r--kompare/komparenavtreepart/komparenavtreepart.h14
-rw-r--r--kompare/komparepart/kompare_part.cpp4
-rw-r--r--kompare/komparepart/kompare_part.h2
-rw-r--r--kompare/komparepart/kompareconnectwidget.cpp10
-rw-r--r--kompare/komparepart/kompareconnectwidget.h6
-rw-r--r--kompare/komparepart/komparelistview.cpp70
-rw-r--r--kompare/komparepart/komparelistview.h26
-rw-r--r--kompare/komparepart/komparesaveoptionswidget.cpp4
-rw-r--r--kompare/komparepart/komparesaveoptionswidget.h2
-rw-r--r--kompare/komparepart/komparesplitter.cpp6
-rw-r--r--kompare/komparepart/komparesplitter.h2
-rw-r--r--kompare/kompareurldialog.cpp4
-rw-r--r--kompare/kompareurldialog.h2
-rw-r--r--kompare/libdialogpages/diffpage.cpp2
-rw-r--r--kompare/libdialogpages/diffsettings.cpp4
-rw-r--r--kompare/libdialogpages/diffsettings.h2
-rw-r--r--kompare/libdialogpages/filespage.cpp2
-rw-r--r--kompare/libdialogpages/filespage.h2
-rw-r--r--kompare/libdialogpages/filessettings.cpp4
-rw-r--r--kompare/libdialogpages/filessettings.h2
-rw-r--r--kompare/libdialogpages/pagebase.cpp2
-rw-r--r--kompare/libdialogpages/settingsbase.cpp2
-rw-r--r--kompare/libdialogpages/settingsbase.h2
-rw-r--r--kompare/libdialogpages/viewpage.cpp2
-rw-r--r--kompare/libdialogpages/viewsettings.cpp4
-rw-r--r--kompare/libdialogpages/viewsettings.h2
-rw-r--r--kompare/libdiff2/komparemodellist.cpp34
-rw-r--r--kompare/libdiff2/komparemodellist.h2
-rw-r--r--kspy/classinfoview.cpp2
-rw-r--r--kspy/classinfoview.h2
-rw-r--r--kspy/navview.cpp8
-rw-r--r--kspy/navview.h2
-rw-r--r--kspy/navviewitem.cpp8
-rw-r--r--kspy/navviewitem.h4
-rw-r--r--kspy/propsview.cpp6
-rw-r--r--kspy/propsview.h2
-rw-r--r--kspy/receiversview.cpp2
-rw-r--r--kspy/receiversview.h2
-rw-r--r--kspy/sigslotview.cpp2
-rw-r--r--kspy/sigslotview.h2
-rw-r--r--kspy/spy.cpp4
-rw-r--r--kspy/spy.h2
-rw-r--r--kuiviewer/kuiviewer_part.cpp4
-rw-r--r--kuiviewer/kuiviewer_part.h2
-rw-r--r--kunittest/runnergui.cpp14
-rw-r--r--kunittest/runnergui.h2
-rw-r--r--poxml/antlr/antlr/TokenStreamBasicFilter.hpp2
-rw-r--r--poxml/antlr/antlr/TokenStreamHiddenTokenFilter.hpp2
-rw-r--r--poxml/antlr/src/TokenStreamBasicFilter.cpp4
-rw-r--r--poxml/antlr/src/TokenStreamHiddenTokenFilter.cpp4
-rw-r--r--scheck/scheck.cpp26
-rwxr-xr-xscripts/fixuifiles2
-rw-r--r--scripts/kde-devel-gdb4
-rw-r--r--scripts/kde-emacs/dirvars.el12
-rw-r--r--scripts/kde-emacs/kde-emacs-compat.el2
-rw-r--r--scripts/kde-emacs/kde-emacs-semantic.el16
-rw-r--r--scripts/kde-emacs/kde-emacs-utils.el6
-rw-r--r--scripts/kde-emacs/kde-emacs-vars.el2
-rwxr-xr-xscripts/kdesvn-build2
-rw-r--r--umbrello/THANKS2
-rw-r--r--umbrello/umbrello/activitywidget.h2
-rw-r--r--umbrello/umbrello/actorwidget.h4
-rw-r--r--umbrello/umbrello/aligntoolbar.h2
-rw-r--r--umbrello/umbrello/artifactwidget.h4
-rw-r--r--umbrello/umbrello/association.cpp8
-rw-r--r--umbrello/umbrello/association.h2
-rw-r--r--umbrello/umbrello/associationwidget.cpp16
-rw-r--r--umbrello/umbrello/associationwidget.h4
-rw-r--r--umbrello/umbrello/attribute.cpp30
-rw-r--r--umbrello/umbrello/attribute.h10
-rw-r--r--umbrello/umbrello/autolayout/autolayoutdlg.cpp4
-rw-r--r--umbrello/umbrello/autolayout/autolayoutdlg.h2
-rw-r--r--umbrello/umbrello/boxwidget.h4
-rw-r--r--umbrello/umbrello/classifier.cpp10
-rw-r--r--umbrello/umbrello/classifier.h4
-rw-r--r--umbrello/umbrello/classifiercodedocument.cpp24
-rw-r--r--umbrello/umbrello/classifiercodedocument.h18
-rw-r--r--umbrello/umbrello/classifierlistitem.cpp14
-rw-r--r--umbrello/umbrello/classifierlistitem.h20
-rw-r--r--umbrello/umbrello/classifierwidget.h2
-rw-r--r--umbrello/umbrello/clipboard/umlclipboard.cpp32
-rw-r--r--umbrello/umbrello/clipboard/umlclipboard.h2
-rw-r--r--umbrello/umbrello/clipboard/umldrag.cpp12
-rw-r--r--umbrello/umbrello/codeaccessormethod.cpp12
-rw-r--r--umbrello/umbrello/codeaccessormethod.h4
-rw-r--r--umbrello/umbrello/codeblock.h4
-rw-r--r--umbrello/umbrello/codeblockwithcomments.cpp10
-rw-r--r--umbrello/umbrello/codeblockwithcomments.h2
-rw-r--r--umbrello/umbrello/codeclassfield.cpp14
-rw-r--r--umbrello/umbrello/codeclassfield.h6
-rw-r--r--umbrello/umbrello/codeclassfielddeclarationblock.cpp8
-rw-r--r--umbrello/umbrello/codeclassfielddeclarationblock.h12
-rw-r--r--umbrello/umbrello/codecomment.cpp2
-rw-r--r--umbrello/umbrello/codedocument.cpp2
-rw-r--r--umbrello/umbrello/codegenerationpolicy.h2
-rw-r--r--umbrello/umbrello/codegenerator.cpp8
-rw-r--r--umbrello/umbrello/codegenerator.h6
-rw-r--r--umbrello/umbrello/codegenerators/adawriter.cpp8
-rw-r--r--umbrello/umbrello/codegenerators/codegenfactory.h20
-rw-r--r--umbrello/umbrello/codegenerators/codegenpolicyext.h2
-rw-r--r--umbrello/umbrello/codegenerators/cppcodeclassfield.cpp2
-rw-r--r--umbrello/umbrello/codegenerators/cppcodecomment.cpp2
-rw-r--r--umbrello/umbrello/codegenerators/cppcodedocumentation.cpp2
-rw-r--r--umbrello/umbrello/codegenerators/cppcodegenerationform.cpp4
-rw-r--r--umbrello/umbrello/codegenerators/cppcodegenerationform.h2
-rw-r--r--umbrello/umbrello/codegenerators/cppcodegenerationpolicy.cpp4
-rw-r--r--umbrello/umbrello/codegenerators/cppcodegenerationpolicy.h2
-rw-r--r--umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.cpp34
-rw-r--r--umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.h2
-rw-r--r--umbrello/umbrello/codegenerators/cppcodegenerator.cpp14
-rw-r--r--umbrello/umbrello/codegenerators/cppcodegenerator.h4
-rw-r--r--umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.h2
-rw-r--r--umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.cpp12
-rw-r--r--umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.h4
-rw-r--r--umbrello/umbrello/codegenerators/cppheadercodedocument.cpp8
-rw-r--r--umbrello/umbrello/codegenerators/cppheadercodeoperation.cpp4
-rw-r--r--umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.cpp4
-rw-r--r--umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.h4
-rw-r--r--umbrello/umbrello/codegenerators/cppsourcecodedocument.cpp4
-rw-r--r--umbrello/umbrello/codegenerators/cppsourcecodeoperation.cpp4
-rw-r--r--umbrello/umbrello/codegenerators/csharpwriter.cpp6
-rw-r--r--umbrello/umbrello/codegenerators/csharpwriter.h2
-rw-r--r--umbrello/umbrello/codegenerators/idlwriter.cpp6
-rw-r--r--umbrello/umbrello/codegenerators/javaclassdeclarationblock.h2
-rw-r--r--umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp4
-rw-r--r--umbrello/umbrello/codegenerators/javacodeaccessormethod.cpp2
-rw-r--r--umbrello/umbrello/codegenerators/javacodeclassfield.cpp2
-rw-r--r--umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.cpp8
-rw-r--r--umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.h4
-rw-r--r--umbrello/umbrello/codegenerators/javacodedocumentation.cpp2
-rw-r--r--umbrello/umbrello/codegenerators/javacodegenerationpolicy.cpp4
-rw-r--r--umbrello/umbrello/codegenerators/javacodegenerationpolicy.h2
-rw-r--r--umbrello/umbrello/codegenerators/javacodegenerationpolicypage.cpp10
-rw-r--r--umbrello/umbrello/codegenerators/javacodegenerationpolicypage.h2
-rw-r--r--umbrello/umbrello/codegenerators/javacodegenerator.cpp6
-rw-r--r--umbrello/umbrello/codegenerators/javacodegenerator.h2
-rw-r--r--umbrello/umbrello/codegenerators/javacodeoperation.cpp6
-rw-r--r--umbrello/umbrello/codegenerators/pascalwriter.cpp4
-rw-r--r--umbrello/umbrello/codegenerators/php5writer.cpp2
-rw-r--r--umbrello/umbrello/codegenerators/phpwriter.cpp2
-rw-r--r--umbrello/umbrello/codegenerators/rubyclassdeclarationblock.h2
-rw-r--r--umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp4
-rw-r--r--umbrello/umbrello/codegenerators/rubycodeaccessormethod.cpp2
-rw-r--r--umbrello/umbrello/codegenerators/rubycodeclassfield.cpp2
-rw-r--r--umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.cpp8
-rw-r--r--umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.h4
-rw-r--r--umbrello/umbrello/codegenerators/rubycodedocumentation.cpp2
-rw-r--r--umbrello/umbrello/codegenerators/rubycodegenerationpolicy.cpp4
-rw-r--r--umbrello/umbrello/codegenerators/rubycodegenerationpolicy.h2
-rw-r--r--umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.cpp14
-rw-r--r--umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.h2
-rw-r--r--umbrello/umbrello/codegenerators/rubycodegenerator.cpp6
-rw-r--r--umbrello/umbrello/codegenerators/rubycodegenerator.h2
-rw-r--r--umbrello/umbrello/codegenerators/rubycodeoperation.cpp4
-rw-r--r--umbrello/umbrello/codegenerators/simplecodegenerator.cpp4
-rw-r--r--umbrello/umbrello/codegenerators/simplecodegenerator.h4
-rw-r--r--umbrello/umbrello/codegenerators/xmlelementcodeblock.h2
-rw-r--r--umbrello/umbrello/codegenerators/xmlschemawriter.cpp4
-rw-r--r--umbrello/umbrello/codegenobjectwithtextblocks.cpp12
-rw-r--r--umbrello/umbrello/codegenobjectwithtextblocks.h6
-rw-r--r--umbrello/umbrello/codeimport/adaimport.cpp12
-rw-r--r--umbrello/umbrello/codeimport/import_utils.cpp22
-rw-r--r--umbrello/umbrello/codeimport/import_utils.h8
-rw-r--r--umbrello/umbrello/codeimport/javaimport.cpp12
-rw-r--r--umbrello/umbrello/codeimport/kdevcppparser/ast.cpp4
-rw-r--r--umbrello/umbrello/codeimport/kdevcppparser/ast.h4
-rw-r--r--umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp4
-rw-r--r--umbrello/umbrello/codeimport/kdevcppparser/cpptree2uml.h14
-rw-r--r--umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp12
-rw-r--r--umbrello/umbrello/codeimport/kdevcppparser/urlutil.h8
-rw-r--r--umbrello/umbrello/codeimport/pascalimport.cpp4
-rw-r--r--umbrello/umbrello/codemethodblock.h6
-rw-r--r--umbrello/umbrello/codeoperation.cpp10
-rw-r--r--umbrello/umbrello/codeoperation.h4
-rw-r--r--umbrello/umbrello/codeparameter.cpp20
-rw-r--r--umbrello/umbrello/codeparameter.h10
-rw-r--r--umbrello/umbrello/componentwidget.h2
-rw-r--r--umbrello/umbrello/datatypewidget.h2
-rw-r--r--umbrello/umbrello/dialogs/assocgenpage.cpp4
-rw-r--r--umbrello/umbrello/dialogs/assocgenpage.h4
-rw-r--r--umbrello/umbrello/dialogs/assocpage.cpp2
-rw-r--r--umbrello/umbrello/dialogs/assocpage.h4
-rw-r--r--umbrello/umbrello/dialogs/assocpropdlg.cpp6
-rw-r--r--umbrello/umbrello/dialogs/assocpropdlg.h4
-rw-r--r--umbrello/umbrello/dialogs/assocrolepage.cpp4
-rw-r--r--umbrello/umbrello/dialogs/assocrolepage.h4
-rw-r--r--umbrello/umbrello/dialogs/classgenpage.cpp6
-rw-r--r--umbrello/umbrello/dialogs/classgenpage.h12
-rw-r--r--umbrello/umbrello/dialogs/classifierlistpage.cpp4
-rw-r--r--umbrello/umbrello/dialogs/classifierlistpage.h4
-rw-r--r--umbrello/umbrello/dialogs/classpropdlg.cpp14
-rw-r--r--umbrello/umbrello/dialogs/classpropdlg.h12
-rw-r--r--umbrello/umbrello/dialogs/classwizard.cpp2
-rw-r--r--umbrello/umbrello/dialogs/codeeditor.cpp52
-rw-r--r--umbrello/umbrello/dialogs/codeeditor.h10
-rw-r--r--umbrello/umbrello/dialogs/codegenerationoptionspage.cpp6
-rw-r--r--umbrello/umbrello/dialogs/codegenerationoptionspage.h2
-rw-r--r--umbrello/umbrello/dialogs/codegenerationpolicypage.cpp4
-rw-r--r--umbrello/umbrello/dialogs/codegenerationpolicypage.h2
-rw-r--r--umbrello/umbrello/dialogs/codegenerationwizard.cpp2
-rw-r--r--umbrello/umbrello/dialogs/codeviewerdialog.cpp4
-rw-r--r--umbrello/umbrello/dialogs/codeviewerdialog.h2
-rw-r--r--umbrello/umbrello/dialogs/codevieweroptionspage.cpp4
-rw-r--r--umbrello/umbrello/dialogs/codevieweroptionspage.h2
-rw-r--r--umbrello/umbrello/dialogs/defaultcodegenpolicypage.cpp6
-rw-r--r--umbrello/umbrello/dialogs/defaultcodegenpolicypage.h2
-rw-r--r--umbrello/umbrello/dialogs/diagramprintpage.cpp2
-rw-r--r--umbrello/umbrello/dialogs/diagramprintpage.h4
-rw-r--r--umbrello/umbrello/dialogs/exportallviewsdialog.cpp4
-rw-r--r--umbrello/umbrello/dialogs/exportallviewsdialog.h4
-rw-r--r--umbrello/umbrello/dialogs/notedialog.cpp2
-rw-r--r--umbrello/umbrello/dialogs/notedialog.h2
-rw-r--r--umbrello/umbrello/dialogs/overwritedialogue.cpp4
-rw-r--r--umbrello/umbrello/dialogs/overwritedialogue.h2
-rw-r--r--umbrello/umbrello/dialogs/parmpropdlg.cpp12
-rw-r--r--umbrello/umbrello/dialogs/parmpropdlg.h6
-rw-r--r--umbrello/umbrello/dialogs/pkgcontentspage.cpp4
-rw-r--r--umbrello/umbrello/dialogs/pkgcontentspage.h4
-rw-r--r--umbrello/umbrello/dialogs/selectopdlg.cpp6
-rw-r--r--umbrello/umbrello/dialogs/selectopdlg.h4
-rw-r--r--umbrello/umbrello/dialogs/settingsdlg.cpp4
-rw-r--r--umbrello/umbrello/dialogs/settingsdlg.h2
-rw-r--r--umbrello/umbrello/dialogs/umlattributedialog.cpp2
-rw-r--r--umbrello/umbrello/dialogs/umlentityattributedialog.cpp2
-rw-r--r--umbrello/umbrello/dialogs/umloperationdialog.cpp8
-rw-r--r--umbrello/umbrello/dialogs/umloperationdialog.h2
-rw-r--r--umbrello/umbrello/dialogs/umlroledialog.cpp4
-rw-r--r--umbrello/umbrello/dialogs/umlroledialog.h2
-rw-r--r--umbrello/umbrello/dialogs/umlroleproperties.cpp4
-rw-r--r--umbrello/umbrello/dialogs/umlroleproperties.h6
-rw-r--r--umbrello/umbrello/dialogs/umltemplatedialog.cpp2
-rw-r--r--umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp4
-rw-r--r--umbrello/umbrello/docgenerators/xmi2docbook.xsl4
-rw-r--r--umbrello/umbrello/docwindow.cpp2
-rw-r--r--umbrello/umbrello/docwindow.h2
-rw-r--r--umbrello/umbrello/entity.cpp4
-rw-r--r--umbrello/umbrello/entity.h2
-rw-r--r--umbrello/umbrello/entityattribute.cpp14
-rw-r--r--umbrello/umbrello/entityattribute.h10
-rw-r--r--umbrello/umbrello/entitywidget.h2
-rw-r--r--umbrello/umbrello/enum.cpp4
-rw-r--r--umbrello/umbrello/enumliteral.cpp12
-rw-r--r--umbrello/umbrello/enumliteral.h10
-rw-r--r--umbrello/umbrello/enumwidget.h2
-rw-r--r--umbrello/umbrello/floatingtextwidget.h2
-rw-r--r--umbrello/umbrello/floatingtextwidgetcontroller.h2
-rw-r--r--umbrello/umbrello/folder.cpp6
-rw-r--r--umbrello/umbrello/forkjoinwidget.h2
-rw-r--r--umbrello/umbrello/hierarchicalcodeblock.cpp4
-rw-r--r--umbrello/umbrello/kplayerslideraction.cpp18
-rw-r--r--umbrello/umbrello/kplayerslideraction.h10
-rw-r--r--umbrello/umbrello/kstartuplogo.cpp4
-rw-r--r--umbrello/umbrello/kstartuplogo.h2
-rw-r--r--umbrello/umbrello/linepath.cpp4
-rw-r--r--umbrello/umbrello/linepath.h2
-rw-r--r--umbrello/umbrello/linkwidget.cpp2
-rw-r--r--umbrello/umbrello/listpopupmenu.cpp14
-rw-r--r--umbrello/umbrello/listpopupmenu.h14
-rw-r--r--umbrello/umbrello/messagewidget.h4
-rw-r--r--umbrello/umbrello/messagewidgetcontroller.h2
-rw-r--r--umbrello/umbrello/model_utils.cpp2
-rw-r--r--umbrello/umbrello/nodewidget.h2
-rw-r--r--umbrello/umbrello/notewidget.h2
-rw-r--r--umbrello/umbrello/object_factory.cpp18
-rw-r--r--umbrello/umbrello/object_factory.h12
-rw-r--r--umbrello/umbrello/objectwidget.h2
-rw-r--r--umbrello/umbrello/operation.cpp26
-rw-r--r--umbrello/umbrello/operation.h10
-rw-r--r--umbrello/umbrello/ownedcodeblock.cpp18
-rw-r--r--umbrello/umbrello/ownedcodeblock.h8
-rw-r--r--umbrello/umbrello/ownedhierarchicalcodeblock.cpp4
-rw-r--r--umbrello/umbrello/ownedhierarchicalcodeblock.h4
-rw-r--r--umbrello/umbrello/packagewidget.h2
-rw-r--r--umbrello/umbrello/petaltree2uml.cpp30
-rw-r--r--umbrello/umbrello/plugin.cpp4
-rw-r--r--umbrello/umbrello/plugin.h4
-rw-r--r--umbrello/umbrello/refactoring/refactoringassistant.cpp28
-rw-r--r--umbrello/umbrello/refactoring/refactoringassistant.h6
-rw-r--r--umbrello/umbrello/statewidget.h2
-rw-r--r--umbrello/umbrello/stereotype.cpp4
-rw-r--r--umbrello/umbrello/stereotype.h2
-rw-r--r--umbrello/umbrello/template.cpp14
-rw-r--r--umbrello/umbrello/template.h10
-rw-r--r--umbrello/umbrello/textblock.cpp14
-rw-r--r--umbrello/umbrello/textblock.h6
-rw-r--r--umbrello/umbrello/toolbarstate.h2
-rw-r--r--umbrello/umbrello/uml.h8
-rw-r--r--umbrello/umbrello/umldoc.cpp44
-rw-r--r--umbrello/umbrello/umldoc.h2
-rw-r--r--umbrello/umbrello/umllistview.cpp202
-rw-r--r--umbrello/umbrello/umllistview.h56
-rw-r--r--umbrello/umbrello/umllistviewitem.cpp58
-rw-r--r--umbrello/umbrello/umllistviewitem.h26
-rw-r--r--umbrello/umbrello/umlobject.cpp16
-rw-r--r--umbrello/umbrello/umlobject.h8
-rw-r--r--umbrello/umbrello/umlrole.cpp24
-rw-r--r--umbrello/umbrello/umlrole.h8
-rw-r--r--umbrello/umbrello/umlview.cpp14
-rw-r--r--umbrello/umbrello/umlviewimageexportermodel.cpp6
-rw-r--r--umbrello/umbrello/umlviewimageexportermodel.h6
-rw-r--r--umbrello/umbrello/umlwidgetcontroller.h2
-rw-r--r--umbrello/umbrello/usecasewidget.h2
-rw-r--r--umbrello/umbrello/worktoolbar.h2
656 files changed, 2032 insertions, 2032 deletions
diff --git a/cervisia/addremovedlg.cpp b/cervisia/addremovedlg.cpp
index 8af207a5..73c41d12 100644
--- a/cervisia/addremovedlg.cpp
+++ b/cervisia/addremovedlg.cpp
@@ -30,8 +30,8 @@
#include <klocale.h>
-AddRemoveDialog::AddRemoveDialog(ActionType action, TQWidget* tqparent, const char* name)
- : KDialogBase(tqparent, name, true, TQString(),
+AddRemoveDialog::AddRemoveDialog(ActionType action, TQWidget* parent, const char* name)
+ : KDialogBase(parent, name, true, TQString(),
Ok | Cancel | Help, Ok, true)
{
setCaption( (action==Add)? i18n("CVS Add") :
diff --git a/cervisia/addremovedlg.h b/cervisia/addremovedlg.h
index b40452e6..e18547f2 100644
--- a/cervisia/addremovedlg.h
+++ b/cervisia/addremovedlg.h
@@ -35,7 +35,7 @@ class AddRemoveDialog : public KDialogBase
public:
enum ActionType { Add, AddBinary, Remove };
- explicit AddRemoveDialog(ActionType action, TQWidget* tqparent=0, const char* name=0);
+ explicit AddRemoveDialog(ActionType action, TQWidget* parent=0, const char* name=0);
void setFileList(const TQStringList& files);
diff --git a/cervisia/addrepositorydlg.cpp b/cervisia/addrepositorydlg.cpp
index 0da05021..e451fca0 100644
--- a/cervisia/addrepositorydlg.cpp
+++ b/cervisia/addrepositorydlg.cpp
@@ -33,8 +33,8 @@
AddRepositoryDialog::AddRepositoryDialog(KConfig& cfg, const TQString& repo,
- TQWidget* tqparent, const char* name)
- : KDialogBase(tqparent, name, true, i18n("Add Repository"),
+ TQWidget* parent, const char* name)
+ : KDialogBase(parent, name, true, i18n("Add Repository"),
Ok | Cancel, Ok, true)
, partConfig(cfg)
{
diff --git a/cervisia/addrepositorydlg.h b/cervisia/addrepositorydlg.h
index 3e18c6d6..6704f517 100644
--- a/cervisia/addrepositorydlg.h
+++ b/cervisia/addrepositorydlg.h
@@ -36,7 +36,7 @@ class AddRepositoryDialog : public KDialogBase
TQ_OBJECT
public:
- AddRepositoryDialog(KConfig& cfg, const TQString& repo, TQWidget* tqparent = 0,
+ AddRepositoryDialog(KConfig& cfg, const TQString& repo, TQWidget* parent = 0,
const char* name = 0);
virtual ~AddRepositoryDialog();
diff --git a/cervisia/annotatedlg.cpp b/cervisia/annotatedlg.cpp
index e40a26bd..b1a0977c 100644
--- a/cervisia/annotatedlg.cpp
+++ b/cervisia/annotatedlg.cpp
@@ -23,8 +23,8 @@
#include "annotateview.h"
-AnnotateDialog::AnnotateDialog(KConfig& cfg, TQWidget *tqparent, const char *name)
- : KDialogBase(tqparent, name, false, TQString(),
+AnnotateDialog::AnnotateDialog(KConfig& cfg, TQWidget *parent, const char *name)
+ : KDialogBase(parent, name, false, TQString(),
Close | Help, Close, true)
, partConfig(cfg)
{
diff --git a/cervisia/annotatedlg.h b/cervisia/annotatedlg.h
index f0360e73..d9ba0317 100644
--- a/cervisia/annotatedlg.h
+++ b/cervisia/annotatedlg.h
@@ -39,7 +39,7 @@ class AnnotateDialog : public KDialogBase
{
public:
- explicit AnnotateDialog( KConfig& cfg, TQWidget *tqparent=0, const char *name=0 );
+ explicit AnnotateDialog( KConfig& cfg, TQWidget *parent=0, const char *name=0 );
virtual ~AnnotateDialog();
diff --git a/cervisia/annotateview.cpp b/cervisia/annotateview.cpp
index c3b4634a..f3d80605 100644
--- a/cervisia/annotateview.cpp
+++ b/cervisia/annotateview.cpp
@@ -36,7 +36,7 @@ class AnnotateViewItem : public TQListViewItem
public:
enum { LineNumberColumn, AuthorColumn, ContentColumn };
- AnnotateViewItem(AnnotateView *tqparent, const LogInfo& logInfo,
+ AnnotateViewItem(AnnotateView *parent, const LogInfo& logInfo,
const TQString &content, bool odd, int linenumber);
virtual int compare(TQListViewItem *item, int col, bool ascending) const;
@@ -58,9 +58,9 @@ private:
const int AnnotateViewItem::BORDER = 4;
-AnnotateViewItem::AnnotateViewItem(AnnotateView *tqparent, const LogInfo& logInfo,
+AnnotateViewItem::AnnotateViewItem(AnnotateView *parent, const LogInfo& logInfo,
const TQString &content, bool odd, int linenumber)
- : TQListViewItem(tqparent)
+ : TQListViewItem(parent)
, m_logInfo(logInfo)
, m_content(content)
, m_odd(odd)
@@ -140,8 +140,8 @@ int AnnotateViewItem::width(const TQFontMetrics &fm, const TQListView *, int col
caused by a bug in TQHeader::adjustHeaderSize() in TQt <= 3.0.4.
*/
-AnnotateView::AnnotateView(KConfig &cfg, TQWidget *tqparent, const char *name)
- : TQListView(tqparent, name, WRepaintNoErase | WResizeNoErase)
+AnnotateView::AnnotateView(KConfig &cfg, TQWidget *parent, const char *name)
+ : TQListView(parent, name, WRepaintNoErase | WResizeNoErase)
{
setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken);
setAllColumnsShowFocus(true);
diff --git a/cervisia/annotateview.h b/cervisia/annotateview.h
index acaafe24..e4c78b58 100644
--- a/cervisia/annotateview.h
+++ b/cervisia/annotateview.h
@@ -41,7 +41,7 @@ class AnnotateView : public TQListView
public:
- explicit AnnotateView( KConfig &cfg, TQWidget *tqparent=0, const char *name=0 );
+ explicit AnnotateView( KConfig &cfg, TQWidget *parent=0, const char *name=0 );
void addLine(const Cervisia::LogInfo& logInfo, const TQString& content,
bool odd);
diff --git a/cervisia/cervisiapart.cpp b/cervisia/cervisiapart.cpp
index 108a4fda..dea2bab8 100644
--- a/cervisia/cervisiapart.cpp
+++ b/cervisia/cervisiapart.cpp
@@ -81,8 +81,8 @@ using Cervisia::TagDialog;
K_EXPORT_COMPONENT_FACTORY( libcervisiapart, CervisiaFactory )
CervisiaPart::CervisiaPart( TQWidget *parentWidget, const char *widgetName,
- TQObject *tqparent, const char *name, const TQStringList& /*args*/ )
- : KParts::ReadOnlyPart( tqparent, name )
+ TQObject *parent, const char *name, const TQStringList& /*args*/ )
+ : KParts::ReadOnlyPart( parent, name )
, hasRunningJob( false )
, opt_hideFiles( false )
, opt_hideUpToDate( false )
@@ -1931,7 +1931,7 @@ void CervisiaBrowserExtension::setPropertiesActionEnabled(bool enabled)
void CervisiaBrowserExtension::properties()
{
- static_cast<CervisiaPart*>(tqparent())->slotFileProperties();
+ static_cast<CervisiaPart*>(parent())->slotFileProperties();
}
// Local Variables:
diff --git a/cervisia/cervisiapart.h b/cervisia/cervisiapart.h
index 337529e0..b802e8ad 100644
--- a/cervisia/cervisiapart.h
+++ b/cervisia/cervisiapart.h
@@ -57,7 +57,7 @@ class CervisiaPart : public KParts::ReadOnlyPart
public:
CervisiaPart( TQWidget *parentWidget, const char *widgetName,
- TQObject *tqparent, const char *name=0, const TQStringList& args = TQStringList());
+ TQObject *parent, const char *name=0, const TQStringList& args = TQStringList());
virtual ~CervisiaPart();
/**
diff --git a/cervisia/changelogdlg.cpp b/cervisia/changelogdlg.cpp
index edaa3b6f..9d00a8e8 100644
--- a/cervisia/changelogdlg.cpp
+++ b/cervisia/changelogdlg.cpp
@@ -40,8 +40,8 @@ static inline TQString DateStringISO8601()
ChangeLogDialog::Options *ChangeLogDialog::options = 0;
-ChangeLogDialog::ChangeLogDialog(KConfig& cfg, TQWidget *tqparent, const char *name)
- : KDialogBase(tqparent, name, true, i18n("Edit ChangeLog"),
+ChangeLogDialog::ChangeLogDialog(KConfig& cfg, TQWidget *parent, const char *name)
+ : KDialogBase(parent, name, true, i18n("Edit ChangeLog"),
Ok | Cancel, Ok, true)
, partConfig(cfg)
{
diff --git a/cervisia/changelogdlg.h b/cervisia/changelogdlg.h
index 54e36e87..ee7b8fc4 100644
--- a/cervisia/changelogdlg.h
+++ b/cervisia/changelogdlg.h
@@ -31,7 +31,7 @@ class KConfig;
class ChangeLogDialog : public KDialogBase
{
public:
- explicit ChangeLogDialog( KConfig& cfg, TQWidget *tqparent=0, const char *name=0 );
+ explicit ChangeLogDialog( KConfig& cfg, TQWidget *parent=0, const char *name=0 );
virtual ~ChangeLogDialog();
diff --git a/cervisia/checkoutdlg.cpp b/cervisia/checkoutdlg.cpp
index f6ed66e8..9be04dd4 100644
--- a/cervisia/checkoutdlg.cpp
+++ b/cervisia/checkoutdlg.cpp
@@ -43,9 +43,9 @@ using Cervisia::IsValidTag;
CheckoutDialog::CheckoutDialog(KConfig& cfg, CvsService_stub* service,
- ActionType action, TQWidget* tqparent,
+ ActionType action, TQWidget* parent,
const char* name)
- : KDialogBase(tqparent, name, true, TQString(),
+ : KDialogBase(parent, name, true, TQString(),
Ok | Cancel | Help, Ok, true)
, act(action)
, partConfig(cfg)
diff --git a/cervisia/checkoutdlg.h b/cervisia/checkoutdlg.h
index 4e6d3b73..a6a8d70e 100644
--- a/cervisia/checkoutdlg.h
+++ b/cervisia/checkoutdlg.h
@@ -41,7 +41,7 @@ public:
enum ActionType { Checkout, Import };
CheckoutDialog( KConfig& cfg, CvsService_stub* service, ActionType action,
- TQWidget *tqparent=0, const char *name=0 );
+ TQWidget *parent=0, const char *name=0 );
TQString workingDirectory() const;
TQString repository() const;
diff --git a/cervisia/commitdlg.cpp b/cervisia/commitdlg.cpp
index ff9fb144..a2e587f3 100644
--- a/cervisia/commitdlg.cpp
+++ b/cervisia/commitdlg.cpp
@@ -39,8 +39,8 @@
class CommitListItem : public TQCheckListItem
{
public:
- CommitListItem(TQListView* tqparent, const TQString& text, const TQString fileName)
- : TQCheckListItem(tqparent, text, TQCheckListItem::CheckBox)
+ CommitListItem(TQListView* parent, const TQString& text, const TQString fileName)
+ : TQCheckListItem(parent, text, TQCheckListItem::CheckBox)
, m_fileName(fileName)
{
}
@@ -53,8 +53,8 @@ private:
CommitDialog::CommitDialog(KConfig& cfg, CvsService_stub* service,
- TQWidget *tqparent, const char *name)
- : KDialogBase(tqparent, name, true, i18n("CVS Commit"),
+ TQWidget *parent, const char *name)
+ : KDialogBase(parent, name, true, i18n("CVS Commit"),
Ok | Cancel | Help | User1, Ok, true)
, partConfig(cfg)
, cvsService(service)
diff --git a/cervisia/commitdlg.h b/cervisia/commitdlg.h
index 7ee5ee1b..2cc32846 100644
--- a/cervisia/commitdlg.h
+++ b/cervisia/commitdlg.h
@@ -40,7 +40,7 @@ class CommitDialog : public KDialogBase
TQ_OBJECT
public:
- CommitDialog( KConfig& cfg, CvsService_stub* service, TQWidget *tqparent=0,
+ CommitDialog( KConfig& cfg, CvsService_stub* service, TQWidget *parent=0,
const char *name=0 );
virtual ~CommitDialog();
diff --git a/cervisia/cvsinitdlg.cpp b/cervisia/cvsinitdlg.cpp
index f6be89d6..cf0b4641 100644
--- a/cervisia/cvsinitdlg.cpp
+++ b/cervisia/cvsinitdlg.cpp
@@ -32,8 +32,8 @@
using Cervisia::CvsInitDialog;
-CvsInitDialog::CvsInitDialog(TQWidget* tqparent, const char* name)
- : KDialogBase(tqparent, name, true, i18n("Create New Repository (cvs init)"),
+CvsInitDialog::CvsInitDialog(TQWidget* parent, const char* name)
+ : KDialogBase(parent, name, true, i18n("Create New Repository (cvs init)"),
Ok | Cancel, Ok, true)
{
TQFrame* mainWidget = makeMainWidget();
diff --git a/cervisia/cvsinitdlg.h b/cervisia/cvsinitdlg.h
index f36d8742..e2d057cc 100644
--- a/cervisia/cvsinitdlg.h
+++ b/cervisia/cvsinitdlg.h
@@ -35,7 +35,7 @@ class CvsInitDialog : public KDialogBase
TQ_OBJECT
public:
- CvsInitDialog(TQWidget* tqparent = 0, const char* name = 0);
+ CvsInitDialog(TQWidget* parent = 0, const char* name = 0);
TQString directory() const;
diff --git a/cervisia/cvsservice/sshagent.cpp b/cervisia/cvsservice/sshagent.cpp
index 6c6845f6..e263219b 100644
--- a/cervisia/cvsservice/sshagent.cpp
+++ b/cervisia/cvsservice/sshagent.cpp
@@ -36,8 +36,8 @@ TQString SshAgent::m_authSock = TQString();
TQString SshAgent::m_pid = TQString();
-SshAgent::SshAgent(TQObject* tqparent, const char* name)
- : TQObject(tqparent, name)
+SshAgent::SshAgent(TQObject* parent, const char* name)
+ : TQObject(parent, name)
{
}
diff --git a/cervisia/cvsservice/sshagent.h b/cervisia/cvsservice/sshagent.h
index e14bc0ae..65daaba6 100644
--- a/cervisia/cvsservice/sshagent.h
+++ b/cervisia/cvsservice/sshagent.h
@@ -34,7 +34,7 @@ class SshAgent : public TQObject
TQ_OBJECT
public:
- SshAgent(TQObject* tqparent = 0, const char* name = 0);
+ SshAgent(TQObject* parent = 0, const char* name = 0);
~SshAgent();
bool querySshAgent();
diff --git a/cervisia/diffdlg.cpp b/cervisia/diffdlg.cpp
index 1de5e48f..8d7ed8c8 100644
--- a/cervisia/diffdlg.cpp
+++ b/cervisia/diffdlg.cpp
@@ -41,8 +41,8 @@
#include "diffview.h"
-DiffDialog::DiffDialog(KConfig& cfg, TQWidget *tqparent, const char *name, bool modal)
- : KDialogBase(tqparent, name, modal, TQString(),
+DiffDialog::DiffDialog(KConfig& cfg, TQWidget *parent, const char *name, bool modal)
+ : KDialogBase(parent, name, modal, TQString(),
Close | Help | User1, Close, true, KStdGuiItem::saveAs())
, partConfig(cfg)
{
@@ -236,7 +236,7 @@ bool DiffDialog::parseCvsDiff(CvsService_stub* service, const TQString& fileName
// front end, it is executed from here. Of course, in that
// case this dialog wouldn't have to be created in the first
// place, but this design at least makes the handling trans-
- // tqparent for the calling routines
+ // parent for the calling routines
TQString extdiff = partConfig.readPathEntry("ExternalDiff");
if (!extdiff.isEmpty())
diff --git a/cervisia/diffdlg.h b/cervisia/diffdlg.h
index eec4bee4..4539a915 100644
--- a/cervisia/diffdlg.h
+++ b/cervisia/diffdlg.h
@@ -41,7 +41,7 @@ class DiffDialog : public KDialogBase
public:
- explicit DiffDialog( KConfig& config, TQWidget *tqparent=0, const char *name=0,
+ explicit DiffDialog( KConfig& config, TQWidget *parent=0, const char *name=0,
bool modal=false );
virtual ~DiffDialog();
diff --git a/cervisia/diffview.cpp b/cervisia/diffview.cpp
index 7c77ec6e..554e6d3f 100644
--- a/cervisia/diffview.cpp
+++ b/cervisia/diffview.cpp
@@ -54,8 +54,8 @@ const int DiffView::BORDER = 7;
DiffView::DiffView( KConfig& cfg, bool withlinenos, bool withmarker,
- TQWidget *tqparent, const char *name )
- : QtTableView(tqparent, name, WRepaintNoErase)
+ TQWidget *parent, const char *name )
+ : QtTableView(parent, name, WRepaintNoErase)
, partConfig(cfg)
{
setNumRows(0);
@@ -388,8 +388,8 @@ void DiffView::wheelEvent(TQWheelEvent *e)
}
-DiffZoomWidget::DiffZoomWidget(KConfig& cfg, TQWidget *tqparent, const char *name)
- : TQFrame(tqparent, name)
+DiffZoomWidget::DiffZoomWidget(KConfig& cfg, TQWidget *parent, const char *name)
+ : TQFrame(parent, name)
{
tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) );
diff --git a/cervisia/diffview.h b/cervisia/diffview.h
index a0bee44a..2a2b998b 100644
--- a/cervisia/diffview.h
+++ b/cervisia/diffview.h
@@ -48,7 +48,7 @@ public:
enum DiffType { Change, Insert, Delete, Neutral, Unchanged, Separator };
DiffView( KConfig& cfg, bool withlinenos, bool withmarker,
- TQWidget *tqparent=0, const char *name=0 );
+ TQWidget *parent=0, const char *name=0 );
void setPartner(DiffView *other);
@@ -108,7 +108,7 @@ class DiffZoomWidget : public TQFrame
TQ_OBJECT
public:
- DiffZoomWidget(KConfig& cfg, TQWidget *tqparent=0, const char *name=0);
+ DiffZoomWidget(KConfig& cfg, TQWidget *parent=0, const char *name=0);
~DiffZoomWidget();
void setDiffView(DiffView *view);
diff --git a/cervisia/editwithmenu.cpp b/cervisia/editwithmenu.cpp
index b91283e8..d7d1044a 100644
--- a/cervisia/editwithmenu.cpp
+++ b/cervisia/editwithmenu.cpp
@@ -27,8 +27,8 @@ using namespace Cervisia;
#include <kurl.h>
-EditWithMenu::EditWithMenu(const KURL& url, TQWidget* tqparent)
- : TQObject(tqparent)
+EditWithMenu::EditWithMenu(const KURL& url, TQWidget* parent)
+ : TQObject(parent)
, m_menu(0)
, m_url(url)
{
diff --git a/cervisia/editwithmenu.h b/cervisia/editwithmenu.h
index 88872621..199170be 100644
--- a/cervisia/editwithmenu.h
+++ b/cervisia/editwithmenu.h
@@ -36,7 +36,7 @@ class EditWithMenu : public TQObject
TQ_OBJECT
public:
- EditWithMenu(const KURL& url, TQWidget* tqparent);
+ EditWithMenu(const KURL& url, TQWidget* parent);
TQPopupMenu* menu();
private slots:
diff --git a/cervisia/historydlg.cpp b/cervisia/historydlg.cpp
index b200002d..1eb3b6ee 100644
--- a/cervisia/historydlg.cpp
+++ b/cervisia/historydlg.cpp
@@ -56,8 +56,8 @@ public:
enum { Date, Event, Author, Revision, File, Path };
- HistoryItem(TQListView *tqparent, const TQDateTime& date)
- : TQListViewItem(tqparent), m_date(date)
+ HistoryItem(TQListView *parent, const TQDateTime& date)
+ : TQListViewItem(parent), m_date(date)
{}
virtual int compare(TQListViewItem* i, int col, bool) const;
@@ -138,8 +138,8 @@ bool HistoryItem::isOther()
}
-HistoryDialog::HistoryDialog(KConfig& cfg, TQWidget *tqparent, const char *name)
- : KDialogBase(tqparent, name, false, TQString(),
+HistoryDialog::HistoryDialog(KConfig& cfg, TQWidget *parent, const char *name)
+ : KDialogBase(parent, name, false, TQString(),
Close | Help, ButtonCode(0), true)
, partConfig(cfg)
{
diff --git a/cervisia/historydlg.h b/cervisia/historydlg.h
index 7c0e4feb..d1a8fc3d 100644
--- a/cervisia/historydlg.h
+++ b/cervisia/historydlg.h
@@ -38,7 +38,7 @@ class HistoryDialog : public KDialogBase
TQ_OBJECT
public:
- explicit HistoryDialog( KConfig& cfg, TQWidget *tqparent=0, const char *name=0 );
+ explicit HistoryDialog( KConfig& cfg, TQWidget *parent=0, const char *name=0 );
virtual ~HistoryDialog();
bool parseHistory(CvsService_stub* cvsService);
diff --git a/cervisia/logdlg.cpp b/cervisia/logdlg.cpp
index b357493b..84954778 100644
--- a/cervisia/logdlg.cpp
+++ b/cervisia/logdlg.cpp
@@ -57,8 +57,8 @@
#include "patchoptiondlg.h"
-LogDialog::LogDialog(KConfig& cfg, TQWidget *tqparent, const char *name)
- : KDialogBase(tqparent, name, false, TQString(),
+LogDialog::LogDialog(KConfig& cfg, TQWidget *parent, const char *name)
+ : KDialogBase(parent, name, false, TQString(),
Ok | Apply | Close | Help | User1 | User2 | User3, Close, true,
KGuiItem(i18n("&Annotate")),
KGuiItem(i18n("&Diff"), "vcs_diff"),
diff --git a/cervisia/logdlg.h b/cervisia/logdlg.h
index 2214b227..3e6d3b66 100644
--- a/cervisia/logdlg.h
+++ b/cervisia/logdlg.h
@@ -55,7 +55,7 @@ class LogDialog : public KDialogBase
TQ_OBJECT
public:
- explicit LogDialog( KConfig& cfg, TQWidget *tqparent=0, const char *name=0 );
+ explicit LogDialog( KConfig& cfg, TQWidget *parent=0, const char *name=0 );
virtual ~LogDialog();
diff --git a/cervisia/loglist.cpp b/cervisia/loglist.cpp
index 39254ebc..439ba36f 100644
--- a/cervisia/loglist.cpp
+++ b/cervisia/loglist.cpp
@@ -106,8 +106,8 @@ int LogListViewItem::compare(TQListViewItem* i, int col, bool ascending) const
}
-LogListView::LogListView(KConfig& cfg, TQWidget *tqparent, const char *name)
- : KListView(tqparent, name)
+LogListView::LogListView(KConfig& cfg, TQWidget *parent, const char *name)
+ : KListView(parent, name)
, partConfig(cfg)
{
setAllColumnsShowFocus(true);
diff --git a/cervisia/loglist.h b/cervisia/loglist.h
index 1ec26bbc..87aa245b 100644
--- a/cervisia/loglist.h
+++ b/cervisia/loglist.h
@@ -42,7 +42,7 @@ class LogListView : public KListView
TQ_OBJECT
public:
- explicit LogListView( KConfig& cfg, TQWidget *tqparent=0, const char *name=0 );
+ explicit LogListView( KConfig& cfg, TQWidget *parent=0, const char *name=0 );
virtual ~LogListView();
void addRevision(const Cervisia::LogInfo& logInfo);
diff --git a/cervisia/logmessageedit.cpp b/cervisia/logmessageedit.cpp
index 633981d6..90b0d405 100644
--- a/cervisia/logmessageedit.cpp
+++ b/cervisia/logmessageedit.cpp
@@ -26,8 +26,8 @@ using Cervisia::LogMessageEdit;
#include <kaccel.h>
-LogMessageEdit::LogMessageEdit(TQWidget* tqparent)
- : KTextEdit(tqparent)
+LogMessageEdit::LogMessageEdit(TQWidget* parent)
+ : KTextEdit(parent)
, KCompletionBase()
, m_completing(false)
, m_completionStartPos(0)
diff --git a/cervisia/logmessageedit.h b/cervisia/logmessageedit.h
index 4d5321ed..04d90ad9 100644
--- a/cervisia/logmessageedit.h
+++ b/cervisia/logmessageedit.h
@@ -36,7 +36,7 @@ class LogMessageEdit : public KTextEdit, public KCompletionBase
TQ_OBJECT
public:
- explicit LogMessageEdit(TQWidget* tqparent);
+ explicit LogMessageEdit(TQWidget* parent);
virtual void setCompletedText(const TQString& match);
virtual void setCompletedItems(const TQStringList& items);
diff --git a/cervisia/logplainview.cpp b/cervisia/logplainview.cpp
index ad541f90..44754cd4 100644
--- a/cervisia/logplainview.cpp
+++ b/cervisia/logplainview.cpp
@@ -31,8 +31,8 @@
using namespace Cervisia;
-LogPlainView::LogPlainView(TQWidget* tqparent, const char* name)
- : KTextBrowser(tqparent, name)
+LogPlainView::LogPlainView(TQWidget* parent, const char* name)
+ : KTextBrowser(parent, name)
, m_find(0)
, m_findPos(0)
{
diff --git a/cervisia/logplainview.h b/cervisia/logplainview.h
index 606ccf08..4b9cbaf6 100644
--- a/cervisia/logplainview.h
+++ b/cervisia/logplainview.h
@@ -37,7 +37,7 @@ class LogPlainView : public KTextBrowser
TQ_OBJECT
public:
- explicit LogPlainView(TQWidget* tqparent = 0, const char* name = 0);
+ explicit LogPlainView(TQWidget* parent = 0, const char* name = 0);
~LogPlainView();
void addRevision(const Cervisia::LogInfo& logInfo);
diff --git a/cervisia/logtree.cpp b/cervisia/logtree.cpp
index bda58b89..88684312 100644
--- a/cervisia/logtree.cpp
+++ b/cervisia/logtree.cpp
@@ -59,8 +59,8 @@ public:
};
-LogTreeView::LogTreeView(TQWidget *tqparent, const char *name)
- : TQTable(tqparent, name)
+LogTreeView::LogTreeView(TQWidget *parent, const char *name)
+ : TQTable(parent, name)
{
if (!static_initialized)
{
diff --git a/cervisia/logtree.h b/cervisia/logtree.h
index 0180491d..f1af28b9 100644
--- a/cervisia/logtree.h
+++ b/cervisia/logtree.h
@@ -47,7 +47,7 @@ class LogTreeView : public TQTable
TQ_OBJECT
public:
- explicit LogTreeView( TQWidget *tqparent=0, const char *name=0 );
+ explicit LogTreeView( TQWidget *parent=0, const char *name=0 );
void addRevision(const Cervisia::LogInfo& logInfo);
void setSelectedPair(TQString selectionA, TQString selectionB);
diff --git a/cervisia/mergedlg.cpp b/cervisia/mergedlg.cpp
index d0f015ed..be371c62 100644
--- a/cervisia/mergedlg.cpp
+++ b/cervisia/mergedlg.cpp
@@ -34,8 +34,8 @@
MergeDialog::MergeDialog(CvsService_stub* service,
- TQWidget *tqparent, const char *name)
- : KDialogBase(tqparent, name, true, i18n("CVS Merge"),
+ TQWidget *parent, const char *name)
+ : KDialogBase(parent, name, true, i18n("CVS Merge"),
Ok | Cancel, Ok, true),
cvsService(service)
{
diff --git a/cervisia/mergedlg.h b/cervisia/mergedlg.h
index 58327b74..25289224 100644
--- a/cervisia/mergedlg.h
+++ b/cervisia/mergedlg.h
@@ -38,7 +38,7 @@ class MergeDialog : public KDialogBase
public:
MergeDialog( CvsService_stub* service,
- TQWidget *tqparent=0, const char *name=0 );
+ TQWidget *parent=0, const char *name=0 );
bool byBranch() const;
TQString branch() const;
diff --git a/cervisia/misc.cpp b/cervisia/misc.cpp
index 779fbe98..9adda71a 100644
--- a/cervisia/misc.cpp
+++ b/cervisia/misc.cpp
@@ -74,7 +74,7 @@ static int FindWhiteSpace(const TQString& str, int index)
static const TQStringList FetchBranchesAndTags(const TQString& searchedType,
CvsService_stub* cvsService,
- TQWidget* tqparent)
+ TQWidget* parent)
{
TQStringList branchOrTagList;
@@ -82,7 +82,7 @@ static const TQStringList FetchBranchesAndTags(const TQString& searchedType,
if( !cvsService->ok() )
return branchOrTagList;
- ProgressDialog dlg(tqparent, "tqStatus", job, TQString(), i18n("CVS tqStatus"));
+ ProgressDialog dlg(parent, "tqStatus", job, TQString(), i18n("CVS tqStatus"));
if( dlg.execute() )
{
@@ -205,7 +205,7 @@ TQString Cervisia::NormalizeRepository(const TQString& repository)
}
-bool Cervisia::CheckOverwrite(const TQString& fileName, TQWidget* tqparent)
+bool Cervisia::CheckOverwrite(const TQString& fileName, TQWidget* parent)
{
bool result = true;
@@ -214,7 +214,7 @@ bool Cervisia::CheckOverwrite(const TQString& fileName, TQWidget* tqparent)
// does the file already exist?
if( fi.exists() )
{
- result = (KMessageBox::warningContinueCancel(tqparent,
+ result = (KMessageBox::warningContinueCancel(parent,
i18n("A file named \"%1\" already exists. Are you sure you want to overwrite it?").tqarg(fileName),
i18n("Overwrite File?"),
KGuiItem(i18n("&Overwrite"), "filesave", i18n("Overwrite the file"))) == KMessageBox::Continue);
@@ -259,17 +259,17 @@ TQStringList splitLine(TQString line, char delim)
}
-const TQStringList fetchBranches(CvsService_stub* cvsService, TQWidget* tqparent)
+const TQStringList fetchBranches(CvsService_stub* cvsService, TQWidget* parent)
{
return FetchBranchesAndTags(TQString::tqfromLatin1("branch"), cvsService,
- tqparent);
+ parent);
}
-const TQStringList fetchTags(CvsService_stub* cvsService, TQWidget* tqparent)
+const TQStringList fetchTags(CvsService_stub* cvsService, TQWidget* parent)
{
return FetchBranchesAndTags(TQString::tqfromLatin1("revision"), cvsService,
- tqparent);
+ parent);
}
diff --git a/cervisia/misc.h b/cervisia/misc.h
index c3715cee..803c8131 100644
--- a/cervisia/misc.h
+++ b/cervisia/misc.h
@@ -50,7 +50,7 @@ TQString UserName();
*/
TQString NormalizeRepository(const TQString& repository);
-bool CheckOverwrite(const TQString& fileName, TQWidget* tqparent=0);
+bool CheckOverwrite(const TQString& fileName, TQWidget* parent=0);
}
@@ -61,8 +61,8 @@ TQStringList splitLine(TQString, char delim=' ');
TQString tempFileName(const TQString& suffix);
void cleanupTempFiles();
-const TQStringList fetchBranches(CvsService_stub* cvsService, TQWidget* tqparent);
-const TQStringList fetchTags(CvsService_stub* cvsService, TQWidget* tqparent);
+const TQStringList fetchBranches(CvsService_stub* cvsService, TQWidget* parent);
+const TQStringList fetchTags(CvsService_stub* cvsService, TQWidget* parent);
/**
* Compares two revision numbers.
diff --git a/cervisia/patchoptiondlg.cpp b/cervisia/patchoptiondlg.cpp
index a65aea6c..6516528f 100644
--- a/cervisia/patchoptiondlg.cpp
+++ b/cervisia/patchoptiondlg.cpp
@@ -28,8 +28,8 @@ using Cervisia::PatchOptionDialog;
#include <klocale.h>
-PatchOptionDialog::PatchOptionDialog(TQWidget* tqparent, const char* name)
- : KDialogBase(tqparent, name, true/*modal*/, TQString(),
+PatchOptionDialog::PatchOptionDialog(TQWidget* parent, const char* name)
+ : KDialogBase(parent, name, true/*modal*/, TQString(),
Ok | Cancel | Help, Ok, true/*separator*/)
{
TQFrame* mainWidget = makeMainWidget();
diff --git a/cervisia/patchoptiondlg.h b/cervisia/patchoptiondlg.h
index 20afb4b7..583664a3 100644
--- a/cervisia/patchoptiondlg.h
+++ b/cervisia/patchoptiondlg.h
@@ -37,7 +37,7 @@ class PatchOptionDialog : public KDialogBase
TQ_OBJECT
public:
- explicit PatchOptionDialog(TQWidget* tqparent = 0, const char* name = 0);
+ explicit PatchOptionDialog(TQWidget* parent = 0, const char* name = 0);
virtual ~PatchOptionDialog();
TQString diffOptions() const;
diff --git a/cervisia/progressdlg.cpp b/cervisia/progressdlg.cpp
index ca3c975c..abf23d1a 100644
--- a/cervisia/progressdlg.cpp
+++ b/cervisia/progressdlg.cpp
@@ -52,10 +52,10 @@ struct ProgressDialog::Private
};
-ProgressDialog::ProgressDialog(TQWidget* tqparent, const TQString& heading,
+ProgressDialog::ProgressDialog(TQWidget* parent, const TQString& heading,
const DCOPRef& job, const TQString& errorIndicator,
const TQString& caption)
- : KDialogBase(tqparent, 0, true, caption, Cancel, Cancel, true)
+ : KDialogBase(parent, 0, true, caption, Cancel, Cancel, true)
, DCOPObject()
, d(new Private)
{
diff --git a/cervisia/progressdlg.h b/cervisia/progressdlg.h
index 6eb71d88..5d20d2a7 100644
--- a/cervisia/progressdlg.h
+++ b/cervisia/progressdlg.h
@@ -35,7 +35,7 @@ class ProgressDialog : public KDialogBase, public DCOPObject
// TQ_OBJECT
public:
- ProgressDialog(TQWidget* tqparent, const TQString& heading, const DCOPRef& job,
+ ProgressDialog(TQWidget* parent, const TQString& heading, const DCOPRef& job,
const TQString& errorIndicator, const TQString& caption = "");
~ProgressDialog();
diff --git a/cervisia/protocolview.cpp b/cervisia/protocolview.cpp
index f091ba80..eb248cc1 100644
--- a/cervisia/protocolview.cpp
+++ b/cervisia/protocolview.cpp
@@ -32,8 +32,8 @@
#include "cvsjob_stub.h"
-ProtocolView::ProtocolView(const TQCString& appId, TQWidget *tqparent, const char *name)
- : TQTextEdit(tqparent, name)
+ProtocolView::ProtocolView(const TQCString& appId, TQWidget *parent, const char *name)
+ : TQTextEdit(parent, name)
, job(0)
, m_isUpdateJob(false)
{
diff --git a/cervisia/protocolview.h b/cervisia/protocolview.h
index aaf1e797..42995d85 100644
--- a/cervisia/protocolview.h
+++ b/cervisia/protocolview.h
@@ -37,7 +37,7 @@ class ProtocolView : public TQTextEdit, public DCOPObject
// TQ_OBJECT
public:
- explicit ProtocolView(const TQCString& appId, TQWidget *tqparent=0, const char *name=0);
+ explicit ProtocolView(const TQCString& appId, TQWidget *parent=0, const char *name=0);
~ProtocolView();
bool startJob(bool isUpdateJob = false);
diff --git a/cervisia/qttableview.cpp b/cervisia/qttableview.cpp
index f50005df..a9e8a9fd 100644
--- a/cervisia/qttableview.cpp
+++ b/cervisia/qttableview.cpp
@@ -44,8 +44,8 @@ public:
void paintEvent( TQPaintEvent * );
};
-TQCornerSquare::TQCornerSquare( TQWidget *tqparent, const char *name )
- : TQWidget( tqparent, name )
+TQCornerSquare::TQCornerSquare( TQWidget *parent, const char *name )
+ : TQWidget( parent, name )
{
}
@@ -124,7 +124,7 @@ void TQCornerSquare::paintEvent( TQPaintEvent * )
/*!
- Constructs a table view. The \a tqparent, \a name and \f arguments
+ Constructs a table view. The \a parent, \a name and \f arguments
are passed to the TQFrame constructor.
The \link setTableFlags() table flags\endlink are all cleared (set to 0).
@@ -143,8 +143,8 @@ void TQCornerSquare::paintEvent( TQPaintEvent * )
*/
-QtTableView::QtTableView( TQWidget *tqparent, const char *name, WFlags f )
- : TQFrame( tqparent, name, f )
+QtTableView::QtTableView( TQWidget *parent, const char *name, WFlags f )
+ : TQFrame( parent, name, f )
{
nRows = nCols = 0; // zero rows/cols
xCellOffs = yCellOffs = 0; // zero offset
diff --git a/cervisia/qttableview.h b/cervisia/qttableview.h
index 2c306ed8..49e4b139 100644
--- a/cervisia/qttableview.h
+++ b/cervisia/qttableview.h
@@ -39,7 +39,7 @@ public:
void tqrepaint( const TQRect &, bool erase=TRUE );
protected:
- QtTableView( TQWidget *tqparent=0, const char *name=0, WFlags f=0 );
+ QtTableView( TQWidget *parent=0, const char *name=0, WFlags f=0 );
~QtTableView();
int numRows() const;
diff --git a/cervisia/repositorydlg.cpp b/cervisia/repositorydlg.cpp
index b5d50e1b..1ebce85f 100644
--- a/cervisia/repositorydlg.cpp
+++ b/cervisia/repositorydlg.cpp
@@ -40,7 +40,7 @@
class RepositoryListItem : public KListViewItem
{
public:
- RepositoryListItem(KListView* tqparent, const TQString& repo, bool loggedin);
+ RepositoryListItem(KListView* parent, const TQString& repo, bool loggedin);
void setRsh(const TQString& rsh);
void setServer(const TQString& server) { m_server = server; }
@@ -85,9 +85,9 @@ static bool LoginNeeded(const TQString& repository)
}
-RepositoryListItem::RepositoryListItem(KListView* tqparent, const TQString& repo,
+RepositoryListItem::RepositoryListItem(KListView* parent, const TQString& repo,
bool loggedin)
- : KListViewItem(tqparent)
+ : KListViewItem(parent)
, m_isLoggedIn(loggedin)
{
setText(0, repo);
@@ -153,8 +153,8 @@ void RepositoryListItem::changeLoginStatusColumn()
RepositoryDialog::RepositoryDialog(KConfig& cfg, CvsService_stub* cvsService,
- TQWidget* tqparent, const char* name)
- : KDialogBase(tqparent, name, true, i18n("Configure Access to Repositories"),
+ TQWidget* parent, const char* name)
+ : KDialogBase(parent, name, true, i18n("Configure Access to Repositories"),
Ok | Cancel | Help, Ok, true)
, m_partConfig(cfg)
, m_cvsService(cvsService)
diff --git a/cervisia/repositorydlg.h b/cervisia/repositorydlg.h
index dde4fee6..bd567e5b 100644
--- a/cervisia/repositorydlg.h
+++ b/cervisia/repositorydlg.h
@@ -40,7 +40,7 @@ class RepositoryDialog : public KDialogBase
public:
RepositoryDialog(KConfig& cfg, CvsService_stub* cvsService,
- TQWidget* tqparent = 0, const char* name = 0);
+ TQWidget* parent = 0, const char* name = 0);
virtual ~RepositoryDialog();
void readConfigFile();
diff --git a/cervisia/resolvedlg.cpp b/cervisia/resolvedlg.cpp
index 3665c9ba..fd3e7d9a 100644
--- a/cervisia/resolvedlg.cpp
+++ b/cervisia/resolvedlg.cpp
@@ -95,8 +95,8 @@ private:
}
-ResolveDialog::ResolveDialog(KConfig& cfg, TQWidget *tqparent, const char *name)
- : KDialogBase(tqparent, name, false, TQString(),
+ResolveDialog::ResolveDialog(KConfig& cfg, TQWidget *parent, const char *name)
+ : KDialogBase(parent, name, false, TQString(),
Close | Help | User1 | User2, Close, true,
KStdGuiItem::saveAs(), KStdGuiItem::save())
, markeditem(-1)
diff --git a/cervisia/resolvedlg.h b/cervisia/resolvedlg.h
index 4f169847..7d25b741 100644
--- a/cervisia/resolvedlg.h
+++ b/cervisia/resolvedlg.h
@@ -43,7 +43,7 @@ class ResolveDialog : public KDialogBase
public:
enum ChooseType { ChA, ChB, ChAB, ChBA, ChEdit };
- explicit ResolveDialog( KConfig& cfg, TQWidget *tqparent=0, const char *name=0 );
+ explicit ResolveDialog( KConfig& cfg, TQWidget *parent=0, const char *name=0 );
virtual ~ResolveDialog();
bool parseFile(const TQString &name);
diff --git a/cervisia/resolvedlg_p.cpp b/cervisia/resolvedlg_p.cpp
index f5bbdf2f..b353c9f4 100644
--- a/cervisia/resolvedlg_p.cpp
+++ b/cervisia/resolvedlg_p.cpp
@@ -22,8 +22,8 @@ using namespace Cervisia;
#include <ktextedit.h>
-ResolveEditorDialog::ResolveEditorDialog(KConfig& cfg, TQWidget *tqparent, const char *name)
- : KDialogBase(tqparent, name, true, TQString(),
+ResolveEditorDialog::ResolveEditorDialog(KConfig& cfg, TQWidget *parent, const char *name)
+ : KDialogBase(parent, name, true, TQString(),
Ok | Cancel, Ok, true)
, m_partConfig(cfg)
{
diff --git a/cervisia/resolvedlg_p.h b/cervisia/resolvedlg_p.h
index 463561c2..680da0a6 100644
--- a/cervisia/resolvedlg_p.h
+++ b/cervisia/resolvedlg_p.h
@@ -33,7 +33,7 @@ namespace Cervisia
class ResolveEditorDialog : public KDialogBase
{
public:
- explicit ResolveEditorDialog(KConfig& cfg, TQWidget* tqparent=0, const char* name=0);
+ explicit ResolveEditorDialog(KConfig& cfg, TQWidget* parent=0, const char* name=0);
virtual ~ResolveEditorDialog();
void setContent(const TQString& text);
diff --git a/cervisia/settingsdlg.cpp b/cervisia/settingsdlg.cpp
index ba08273a..8551a7e9 100644
--- a/cervisia/settingsdlg.cpp
+++ b/cervisia/settingsdlg.cpp
@@ -58,8 +58,8 @@ namespace
}
-FontButton::FontButton( const TQString &text, TQWidget *tqparent, const char *name )
- : TQPushButton(text, tqparent, name)
+FontButton::FontButton( const TQString &text, TQWidget *parent, const char *name )
+ : TQPushButton(text, parent, name)
{
connect( this, TQT_SIGNAL(clicked()), this, TQT_SLOT(chooseFont()) );
}
@@ -77,11 +77,11 @@ void FontButton::chooseFont()
}
-SettingsDialog::SettingsDialog( KConfig *conf, TQWidget *tqparent, const char *name )
+SettingsDialog::SettingsDialog( KConfig *conf, TQWidget *parent, const char *name )
: KDialogBase(KDialogBase::IconList, i18n("Configure Cervisia"),
KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Help,
KDialogBase::Ok,
- tqparent, name, true)
+ parent, name, true)
{
config = conf;
diff --git a/cervisia/settingsdlg.h b/cervisia/settingsdlg.h
index ad189bde..9f36a46b 100644
--- a/cervisia/settingsdlg.h
+++ b/cervisia/settingsdlg.h
@@ -41,7 +41,7 @@ class FontButton : public TQPushButton
TQ_OBJECT
public:
- FontButton( const TQString &text, TQWidget *tqparent=0, const char *name=0 );
+ FontButton( const TQString &text, TQWidget *parent=0, const char *name=0 );
private slots:
void chooseFont();
@@ -54,7 +54,7 @@ class SettingsDialog : public KDialogBase
TQ_OBJECT
public:
- SettingsDialog( KConfig *conf, TQWidget *tqparent=0, const char *name=0 );
+ SettingsDialog( KConfig *conf, TQWidget *parent=0, const char *name=0 );
virtual ~SettingsDialog();
protected slots:
diff --git a/cervisia/tagdlg.cpp b/cervisia/tagdlg.cpp
index 3563c381..3d8b9516 100644
--- a/cervisia/tagdlg.cpp
+++ b/cervisia/tagdlg.cpp
@@ -35,8 +35,8 @@
using Cervisia::TagDialog;
TagDialog::TagDialog(ActionType action, CvsService_stub* service,
- TQWidget *tqparent, const char *name)
- : KDialogBase(tqparent, name, true, TQString(),
+ TQWidget *parent, const char *name)
+ : KDialogBase(parent, name, true, TQString(),
Ok | Cancel | Help, Ok, true),
act(action),
cvsService(service),
diff --git a/cervisia/tagdlg.h b/cervisia/tagdlg.h
index 57d720bf..8e0ff1b5 100644
--- a/cervisia/tagdlg.h
+++ b/cervisia/tagdlg.h
@@ -42,7 +42,7 @@ public:
enum ActionType { Create, Delete };
TagDialog( ActionType action, CvsService_stub* service,
- TQWidget *tqparent=0, const char *name=0 );
+ TQWidget *parent=0, const char *name=0 );
bool branchTag() const;
bool forceTag() const;
diff --git a/cervisia/tooltip.h b/cervisia/tooltip.h
index 1036af5b..26e617bf 100644
--- a/cervisia/tooltip.h
+++ b/cervisia/tooltip.h
@@ -43,7 +43,7 @@ public:
/**
* @param widget The widget you want to add tooltips to. It's also used as
- * tqparent for the TQObject. So you don't have to free an instance of this
+ * parent for the TQObject. So you don't have to free an instance of this
* class yourself.
*/
explicit ToolTip(TQWidget* widget);
@@ -55,9 +55,9 @@ signals:
* wants to display anythink it must set a valid tooltip rectangle and a
* non empty text.
*
- * @param pos The position of the tooltip in the tqparent widget's coordinate system.
+ * @param pos The position of the tooltip in the parent widget's coordinate system.
*
- * @param rect The rectangle in the tqparent widget's coordinate system where the
+ * @param rect The rectangle in the parent widget's coordinate system where the
* tooltip is valid.
*
* @param text The tooltip text.
diff --git a/cervisia/updatedlg.cpp b/cervisia/updatedlg.cpp
index 71e88ebe..55243796 100644
--- a/cervisia/updatedlg.cpp
+++ b/cervisia/updatedlg.cpp
@@ -34,8 +34,8 @@
UpdateDialog::UpdateDialog(CvsService_stub* service,
- TQWidget *tqparent, const char *name)
- : KDialogBase(tqparent, name, true, i18n("CVS Update"),
+ TQWidget *parent, const char *name)
+ : KDialogBase(parent, name, true, i18n("CVS Update"),
Ok | Cancel, Ok, true),
cvsService(service)
{
diff --git a/cervisia/updatedlg.h b/cervisia/updatedlg.h
index 883342b4..59582974 100644
--- a/cervisia/updatedlg.h
+++ b/cervisia/updatedlg.h
@@ -39,7 +39,7 @@ class UpdateDialog : public KDialogBase
public:
UpdateDialog( CvsService_stub* service,
- TQWidget *tqparent=0, const char *name=0 );
+ TQWidget *parent=0, const char *name=0 );
bool byTag() const;
TQString tag() const;
diff --git a/cervisia/updateview.cpp b/cervisia/updateview.cpp
index 50f7825a..ae2ae61b 100644
--- a/cervisia/updateview.cpp
+++ b/cervisia/updateview.cpp
@@ -38,8 +38,8 @@ using Cervisia::Entry;
using Cervisia::EntrytqStatus;
-UpdateView::UpdateView(KConfig& partConfig, TQWidget *tqparent, const char *name)
- : KListView(tqparent, name),
+UpdateView::UpdateView(KConfig& partConfig, TQWidget *parent, const char *name)
+ : KListView(parent, name),
m_partConfig(partConfig),
m_unfoldingTree(false)
{
@@ -333,7 +333,7 @@ void UpdateView::foldTree()
while (TQListViewItem* item = it.current())
{
// don't close the top level directory
- if (isDirItem(item) && item->tqparent())
+ if (isDirItem(item) && item->parent())
item->setOpen(false);
++it;
@@ -500,7 +500,7 @@ void UpdateView::syncSelection()
UpdateDirItem* dirItem(0);
if (isDirItem(item))
dirItem = static_cast<UpdateDirItem*>(item);
- else if (TQListViewItem* parentItem = item->tqparent())
+ else if (TQListViewItem* parentItem = item->parent())
dirItem = static_cast<UpdateDirItem*>(parentItem);
if (dirItem)
diff --git a/cervisia/updateview.h b/cervisia/updateview.h
index ecf5fcf4..181cf739 100644
--- a/cervisia/updateview.h
+++ b/cervisia/updateview.h
@@ -43,7 +43,7 @@ public:
NoRemoved=4, NoNotInCVS=8 , NoEmptyDirectories = 16 };
enum Action { Add, Remove, Update, UpdateNoAct, Commit };
- explicit UpdateView(KConfig& partConfig, TQWidget *tqparent=0, const char *name=0);
+ explicit UpdateView(KConfig& partConfig, TQWidget *parent=0, const char *name=0);
virtual ~UpdateView();
diff --git a/cervisia/updateview_items.cpp b/cervisia/updateview_items.cpp
index a29ca153..4e07c1ab 100644
--- a/cervisia/updateview_items.cpp
+++ b/cervisia/updateview_items.cpp
@@ -51,10 +51,10 @@ TQString UpdateItem::dirPath() const
{
TQString path;
- const UpdateItem* item = static_cast<UpdateItem*>(tqparent());
+ const UpdateItem* item = static_cast<UpdateItem*>(parent());
while (item)
{
- const UpdateItem* parentItem = static_cast<UpdateItem*>(item->tqparent());
+ const UpdateItem* parentItem = static_cast<UpdateItem*>(item->parent());
if (parentItem)
{
path.prepend(item->m_entry.m_name + TQDir::separator());
@@ -70,7 +70,7 @@ TQString UpdateItem::dirPath() const
TQString UpdateItem::filePath() const
{
// the filePath of the root item is '.'
- return tqparent() ? dirPath() + m_entry.m_name : TQChar('.');
+ return parent() ? dirPath() + m_entry.m_name : TQChar('.');
}
@@ -79,9 +79,9 @@ TQString UpdateItem::filePath() const
// ------------------------------------------------------------------------------
-UpdateDirItem::UpdateDirItem(UpdateDirItem* tqparent,
+UpdateDirItem::UpdateDirItem(UpdateDirItem* parent,
const Entry& entry)
- : UpdateItem(tqparent, entry),
+ : UpdateItem(parent, entry),
m_opened(false)
{
setExpandable(true);
@@ -89,9 +89,9 @@ UpdateDirItem::UpdateDirItem(UpdateDirItem* tqparent,
}
-UpdateDirItem::UpdateDirItem(UpdateView* tqparent,
+UpdateDirItem::UpdateDirItem(UpdateView* parent,
const Entry& entry)
- : UpdateItem(tqparent, entry),
+ : UpdateItem(parent, entry),
m_opened(false)
{
setExpandable(true);
@@ -494,8 +494,8 @@ TQString UpdateDirItem::text(int column) const
// ------------------------------------------------------------------------------
-UpdateFileItem::UpdateFileItem(UpdateDirItem* tqparent, const Entry& entry)
- : UpdateItem(tqparent, entry),
+UpdateFileItem::UpdateFileItem(UpdateDirItem* parent, const Entry& entry)
+ : UpdateItem(parent, entry),
m_undefined(false)
{
}
diff --git a/cervisia/updateview_items.h b/cervisia/updateview_items.h
index 83bd0efc..ca26930f 100644
--- a/cervisia/updateview_items.h
+++ b/cervisia/updateview_items.h
@@ -42,10 +42,10 @@ class UpdateItem : public TQListViewItem
{
public:
- UpdateItem(UpdateView* tqparent, const Cervisia::Entry& entry)
- : TQListViewItem(tqparent), m_entry(entry) {}
- UpdateItem(UpdateItem* tqparent, const Cervisia::Entry& entry)
- : TQListViewItem(tqparent), m_entry(entry) {}
+ UpdateItem(UpdateView* parent, const Cervisia::Entry& entry)
+ : TQListViewItem(parent), m_entry(entry) {}
+ UpdateItem(UpdateItem* parent, const Cervisia::Entry& entry)
+ : TQListViewItem(parent), m_entry(entry) {}
const Cervisia::Entry& entry() const { return m_entry; }
@@ -73,8 +73,8 @@ public:
enum { Name };
- UpdateDirItem(UpdateView* tqparent, const Cervisia::Entry& entry);
- UpdateDirItem(UpdateDirItem* tqparent, const Cervisia::Entry& entry);
+ UpdateDirItem(UpdateView* parent, const Cervisia::Entry& entry);
+ UpdateDirItem(UpdateDirItem* parent, const Cervisia::Entry& entry);
void syncWithDirectory();
void syncWithEntries();
@@ -121,7 +121,7 @@ public:
enum { Name, MimeType, tqStatus, Revision, TagOrDate, Timestamp };
- UpdateFileItem(UpdateDirItem* tqparent, const Cervisia::Entry& entry);
+ UpdateFileItem(UpdateDirItem* parent, const Cervisia::Entry& entry);
bool undefinedState() const
{ return m_undefined; }
diff --git a/cervisia/updateview_visitors.cpp b/cervisia/updateview_visitors.cpp
index 0da6940b..8232d98c 100644
--- a/cervisia/updateview_visitors.cpp
+++ b/cervisia/updateview_visitors.cpp
@@ -50,11 +50,11 @@ void ApplyFilterVisitor::postVisit(UpdateDirItem* item)
// - it has visible tqchildren
// - it is not opened
// - empty directories are not hidden
- // - it has no tqparent (top level item)
+ // - it has no parent (top level item)
const bool visible(!m_invisibleDirItems.count(item)
|| !item->wasScanned()
|| !(m_filter & UpdateView::NoEmptyDirectories)
- || !item->tqparent());
+ || !item->parent());
// only set invisible as TQListViewItem::setVisible() is recursive
// and so maybe overrides the state applied by the filter
@@ -81,7 +81,7 @@ void ApplyFilterVisitor::visit(UpdateFileItem* item)
void ApplyFilterVisitor::markAllParentsAsVisible(UpdateItem* item)
{
- while ((item = static_cast<UpdateDirItem*>(item->tqparent())))
+ while ((item = static_cast<UpdateDirItem*>(item->parent())))
{
TItemSet::iterator it = m_invisibleDirItems.find(item);
if (it != m_invisibleDirItems.end())
diff --git a/cervisia/watchdlg.cpp b/cervisia/watchdlg.cpp
index 2e1fc74e..607dbd46 100644
--- a/cervisia/watchdlg.cpp
+++ b/cervisia/watchdlg.cpp
@@ -28,8 +28,8 @@
#include <klocale.h>
-WatchDialog::WatchDialog(ActionType action, TQWidget *tqparent, const char *name)
- : KDialogBase(tqparent, name, true, TQString(),
+WatchDialog::WatchDialog(ActionType action, TQWidget *parent, const char *name)
+ : KDialogBase(parent, name, true, TQString(),
Ok | Cancel | Help, Ok, true)
{
setCaption( (action==Add)? i18n("CVS Watch Add") : i18n("CVS Watch Remove") );
diff --git a/cervisia/watchdlg.h b/cervisia/watchdlg.h
index 3189d676..ea7e9b39 100644
--- a/cervisia/watchdlg.h
+++ b/cervisia/watchdlg.h
@@ -35,7 +35,7 @@ public:
enum ActionType { Add, Remove };
enum Events { None=0, All=1, Commits=2, Edits=4, Unedits=8 };
- explicit WatchDialog( ActionType action, TQWidget *tqparent=0, const char *name=0 );
+ explicit WatchDialog( ActionType action, TQWidget *parent=0, const char *name=0 );
Events events() const;
diff --git a/cervisia/watchersdlg.cpp b/cervisia/watchersdlg.cpp
index 73165762..afe9e7a3 100644
--- a/cervisia/watchersdlg.cpp
+++ b/cervisia/watchersdlg.cpp
@@ -30,8 +30,8 @@
#include "progressdlg.h"
-WatchersDialog::WatchersDialog(KConfig& cfg, TQWidget* tqparent, const char* name)
- : KDialogBase(tqparent, name, false, TQString(),
+WatchersDialog::WatchersDialog(KConfig& cfg, TQWidget* parent, const char* name)
+ : KDialogBase(parent, name, false, TQString(),
Close, ButtonCode(0), true)
, partConfig(cfg)
{
diff --git a/cervisia/watchersdlg.h b/cervisia/watchersdlg.h
index 9cfb023a..fff50d88 100644
--- a/cervisia/watchersdlg.h
+++ b/cervisia/watchersdlg.h
@@ -31,7 +31,7 @@ class CvsService_stub;
class WatchersDialog : public KDialogBase
{
public:
- explicit WatchersDialog(KConfig& cfg, TQWidget* tqparent = 0,
+ explicit WatchersDialog(KConfig& cfg, TQWidget* parent = 0,
const char* name = 0);
virtual ~WatchersDialog();
diff --git a/kapptemplate/kapp/apppref.cpp b/kapptemplate/kapp/apppref.cpp
index 5ab7d8a6..8716b3e0 100644
--- a/kapptemplate/kapp/apppref.cpp
+++ b/kapptemplate/kapp/apppref.cpp
@@ -22,8 +22,8 @@ ${APP_NAME}Preferences::${APP_NAME}Preferences()
m_pageTwo = new ${APP_NAME}PrefPageTwo(frame);
}
-${APP_NAME}PrefPageOne::${APP_NAME}PrefPageOne(TQWidget *tqparent)
- : TQFrame(tqparent)
+${APP_NAME}PrefPageOne::${APP_NAME}PrefPageOne(TQWidget *parent)
+ : TQFrame(parent)
{
TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
tqlayout->setAutoAdd(true);
@@ -31,8 +31,8 @@ ${APP_NAME}PrefPageOne::${APP_NAME}PrefPageOne(TQWidget *tqparent)
new TQLabel("Add something here", this);
}
-${APP_NAME}PrefPageTwo::${APP_NAME}PrefPageTwo(TQWidget *tqparent)
- : TQFrame(tqparent)
+${APP_NAME}PrefPageTwo::${APP_NAME}PrefPageTwo(TQWidget *parent)
+ : TQFrame(parent)
{
TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
tqlayout->setAutoAdd(true);
diff --git a/kapptemplate/kapp/apppref.h b/kapptemplate/kapp/apppref.h
index c20c8af3..5424df0e 100644
--- a/kapptemplate/kapp/apppref.h
+++ b/kapptemplate/kapp/apppref.h
@@ -26,7 +26,7 @@ class ${APP_NAME}PrefPageOne : public TQFrame
Q_OBJECT
TQ_OBJECT
public:
- ${APP_NAME}PrefPageOne(TQWidget *tqparent = 0);
+ ${APP_NAME}PrefPageOne(TQWidget *parent = 0);
};
class ${APP_NAME}PrefPageTwo : public TQFrame
@@ -34,7 +34,7 @@ class ${APP_NAME}PrefPageTwo : public TQFrame
Q_OBJECT
TQ_OBJECT
public:
- ${APP_NAME}PrefPageTwo(TQWidget *tqparent = 0);
+ ${APP_NAME}PrefPageTwo(TQWidget *parent = 0);
};
#endif // ${APP_NAME_UC}PREF_H
diff --git a/kapptemplate/kapp/appview.cpp b/kapptemplate/kapp/appview.cpp
index 48365348..bc923619 100644
--- a/kapptemplate/kapp/appview.cpp
+++ b/kapptemplate/kapp/appview.cpp
@@ -12,8 +12,8 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}view.cpp
#include <kmessagebox.h>
#include <krun.h>
-${APP_NAME}View::${APP_NAME}View(TQWidget *tqparent)
- : TQWidget(tqparent),
+${APP_NAME}View::${APP_NAME}View(TQWidget *parent)
+ : TQWidget(parent),
DCOPObject("${APP_NAME}Iface")
{
// setup our tqlayout manager to automatically add our widgets
diff --git a/kapptemplate/kapp/appview.h b/kapptemplate/kapp/appview.h
index 25dddfd1..1240b280 100644
--- a/kapptemplate/kapp/appview.h
+++ b/kapptemplate/kapp/appview.h
@@ -29,7 +29,7 @@ public:
/**
* Default constructor
*/
- ${APP_NAME}View(TQWidget *tqparent);
+ ${APP_NAME}View(TQWidget *parent);
/**
* Destructor
diff --git a/kapptemplate/kpartapp/app_part.cpp b/kapptemplate/kpartapp/app_part.cpp
index 831e5f95..adbda9db 100644
--- a/kapptemplate/kpartapp/app_part.cpp
+++ b/kapptemplate/kpartapp/app_part.cpp
@@ -18,9 +18,9 @@ typedef KParts::GenericFactory<${APP_NAME}Part> ${APP_NAME}PartFactory;
K_EXPORT_COMPONENT_FACTORY( lib${APP_NAME_LC}part, ${APP_NAME}PartFactory )
${APP_NAME}Part::${APP_NAME}Part( TQWidget *parentWidget, const char *widgetName,
- TQObject *tqparent, const char *name,
+ TQObject *parent, const char *name,
const TQStringList & /*args*/ )
- : KParts::ReadWritePart(tqparent, name)
+ : KParts::ReadWritePart(parent, name)
{
// we need an instance
setInstance( ${APP_NAME}PartFactory::instance() );
@@ -79,7 +79,7 @@ void ${APP_NAME}Part::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/kapptemplate/kpartapp/app_part.h b/kapptemplate/kpartapp/app_part.h
index 72687a6d..89fe4974 100644
--- a/kapptemplate/kpartapp/app_part.h
+++ b/kapptemplate/kpartapp/app_part.h
@@ -28,7 +28,7 @@ public:
* Default constructor
*/
${APP_NAME}Part(TQWidget *parentWidget, const char *widgetName,
- TQObject *tqparent, const char *name, const TQStringList &args);
+ TQObject *parent, const char *name, const TQStringList &args);
/**
* Destructor
diff --git a/kapptemplate/kpartplugin/plugin_app.cpp b/kapptemplate/kpartplugin/plugin_app.cpp
index c6a27fb8..0ec7a273 100644
--- a/kapptemplate/kpartplugin/plugin_app.cpp
+++ b/kapptemplate/kpartplugin/plugin_app.cpp
@@ -13,9 +13,9 @@ typedef KGenericFactory<Plugin${APP_NAME}> ${APP_NAME}Factory;
K_EXPORT_COMPONENT_FACTORY( lib${APP_NAME_LC}plugin,
${APP_NAME}Factory( "${APP_NAME_LC}" ) );
-Plugin${APP_NAME}::Plugin${APP_NAME}( TQObject* tqparent, const char* name,
+Plugin${APP_NAME}::Plugin${APP_NAME}( TQObject* parent, const char* name,
const TQStringList & /*args*/ )
- : Plugin( tqparent, name )
+ : Plugin( parent, name )
{
// Instantiate all of your actions here. These will appear in
// Konqueror's menu and toolbars.
@@ -33,7 +33,7 @@ void Plugin${APP_NAME}::slotAction()
// This plugin assumes KHTMLPart. If your plugin can handle more
// than this or a different Part than this, simply delete or
// change the following block.
- if ( !tqparent()->inherits("KHTMLPart") )
+ if ( !parent()->inherits("KHTMLPart") )
{
TQString title( i18n( "Cannot Translate Source" ) );
TQString text( i18n( "You cannot translate anything except web pages "
@@ -43,9 +43,9 @@ void Plugin${APP_NAME}::slotAction()
return;
}
- // Get a handle on our tqparent so we may get the necessary data for
+ // Get a handle on our parent so we may get the necessary data for
// processing
- KHTMLPart *part = dynamic_cast<KHTMLPart *>(tqparent());
+ KHTMLPart *part = dynamic_cast<KHTMLPart *>(parent());
// This plugin only uses the URL. You may use whatever data you
// need.
diff --git a/kapptemplate/kpartplugin/plugin_app.h b/kapptemplate/kpartplugin/plugin_app.h
index 2d1745f5..2ff1c439 100644
--- a/kapptemplate/kpartplugin/plugin_app.h
+++ b/kapptemplate/kpartplugin/plugin_app.h
@@ -10,7 +10,7 @@ class Plugin${APP_NAME} : public KParts::Plugin
Q_OBJECT
TQ_OBJECT
public:
- Plugin${APP_NAME}( TQObject* tqparent = 0, const char* name = 0,
+ Plugin${APP_NAME}( TQObject* parent = 0, const char* name = 0,
const TQStringList &args = TQStringList() );
virtual ~Plugin${APP_NAME}();
diff --git a/kbabel/addons/kfile-plugins/kfile_po.cpp b/kbabel/addons/kfile-plugins/kfile_po.cpp
index 5ad0ebaa..cb2b6390 100644
--- a/kbabel/addons/kfile-plugins/kfile_po.cpp
+++ b/kbabel/addons/kfile-plugins/kfile_po.cpp
@@ -40,9 +40,9 @@ using namespace KBabel;
typedef KGenericFactory<KPoPlugin> POFactory;
K_EXPORT_COMPONENT_FACTORY(kfile_po, POFactory("kfile_po"))
-KPoPlugin::KPoPlugin(TQObject *tqparent, const char *name,
+KPoPlugin::KPoPlugin(TQObject *parent, const char *name,
const TQStringList& args)
- : KFilePlugin(tqparent, name, args)
+ : KFilePlugin(parent, name, args)
{
KFileMimeTypeInfo* info = addMimeTypeInfo("application/x-gettext");
diff --git a/kbabel/addons/kfile-plugins/kfile_po.h b/kbabel/addons/kfile-plugins/kfile_po.h
index d5e46c34..e78ee873 100644
--- a/kbabel/addons/kfile-plugins/kfile_po.h
+++ b/kbabel/addons/kfile-plugins/kfile_po.h
@@ -43,7 +43,7 @@ class KPoPlugin : public KFilePlugin
TQ_OBJECT
public:
- KPoPlugin(TQObject *tqparent, const char *name, const TQStringList& args);
+ KPoPlugin(TQObject *parent, const char *name, const TQStringList& args);
virtual bool readInfo(KFileMetaInfo& info, uint);
};
diff --git a/kbabel/catalogmanager/catalogmanagerview.cpp b/kbabel/catalogmanager/catalogmanagerview.cpp
index 63f2a077..3501f17b 100644
--- a/kbabel/catalogmanager/catalogmanagerview.cpp
+++ b/kbabel/catalogmanager/catalogmanagerview.cpp
@@ -98,8 +98,8 @@ const char* columnNames[] = {
#define COLTEXT(a) (i18n(columnNames[a]))
-CatalogManagerView::CatalogManagerView(KBabel::Project::Ptr project, TQWidget* tqparent,const char* name)
- : TQListView(tqparent,name)
+CatalogManagerView::CatalogManagerView(KBabel::Project::Ptr project, TQWidget* parent,const char* name)
+ : TQListView(parent,name)
, _dirWatch(0)
, _readInfoCount(0)
, _active(false)
@@ -1638,14 +1638,14 @@ void CatalogManagerView::slotFileCommand(int index)
if(index>=0 && item && item->isFile())
{
- CatManListItem* tqparent = (CatManListItem*)item->tqparent();
+ CatManListItem* parent = (CatManListItem*)item->parent();
TQString cmd=*(_settings.fileCommands).at(index);
cmd.replace("@PACKAGE@",item->name());
cmd.replace("@POFILE@",item->poFile());
cmd.replace("@POTFILE@",item->potFile());
- cmd.replace("@PODIR@",tqparent->poFile());
- cmd.replace("@POTDIR@",tqparent->potFile());
+ cmd.replace("@PODIR@",parent->poFile());
+ cmd.replace("@POTDIR@",parent->potFile());
cmd.replace("@POEMAIL@",item->text(COL_TRANSLATOR));
kdDebug(KBABEL_CATMAN) << cmd << endl;
@@ -1660,7 +1660,7 @@ void CatalogManagerView::slotFileCommand(int index)
connect( proc,TQT_SIGNAL( receivedStderr(KProcess*,char*,int) ), this
,TQT_SLOT( showOutput(KProcess*,char*,int) ) );
- *proc << "cd" << tqparent->poFile() << ";" << cmd;
+ *proc << "cd" << parent->poFile() << ";" << cmd;
proc->start(KProcess::NotifyOnExit,KProcess::AllOutput);
}
@@ -2206,7 +2206,7 @@ void CatalogManagerView::updateDir(TQString relDir)
deleteDirItem(relDir);
// if this directory has to be removed, check, if
- // the tqparent directory has to be removed too
+ // the parent directory has to be removed too
const int index=relDir.findRev("/",relDir.length()-2);
if(index<0)
{
@@ -2266,7 +2266,7 @@ void CatalogManagerView::directoryChanged(const TQString& dir)
CatManListItem* thisItem=_dirList[relDir];
if(!thisItem)
{
- // if this item is not in the list search for next existing tqparent item
+ // if this item is not in the list search for next existing parent item
TQString prevRelDir;
do
{
@@ -2289,7 +2289,7 @@ void CatalogManagerView::directoryChanged(const TQString& dir)
}
else
{
- // if a tqparent item dir is found, create the needed item in this dir
+ // if a parent item dir is found, create the needed item in this dir
// and build the tree from this item on
kdDebug(KBABEL_CATMAN) << "building dir: " << prevRelDir << endl;
CatManListItem* item = new CatManListItem(this, thisItem,_settings.poBaseDir+prevRelDir
@@ -2624,7 +2624,7 @@ CatManListItem *CatalogManagerView::itemBelow( CatManListItem *item )
{
while( !static_cast<CatManListItem *>( item->nextSibling() ) )
{
- item = static_cast<CatManListItem *>( item->tqparent() );
+ item = static_cast<CatManListItem *>( item->parent() );
if( !item ) return item;
}
return static_cast<CatManListItem *>( item->nextSibling() );
@@ -2634,7 +2634,7 @@ CatManListItem *CatalogManagerView::itemBelow( CatManListItem *item )
{
while( !static_cast<CatManListItem *>( item->nextSibling() ) )
{
- item = static_cast<CatManListItem *>( item->tqparent());
+ item = static_cast<CatManListItem *>( item->parent());
if( !item ) return item;
}
return static_cast<CatManListItem *>( item->nextSibling() );
@@ -2651,7 +2651,7 @@ CatManListItem *CatalogManagerView::itemAbove( CatManListItem *item )
{
while( !static_cast<CatManListItem *>( item->previousSibling() ) )
{
- item = static_cast<CatManListItem *>( item->tqparent() );
+ item = static_cast<CatManListItem *>( item->parent() );
if( !item ) return item;
}
return static_cast<CatManListItem *>( item->previousSibling() );
@@ -2661,7 +2661,7 @@ CatManListItem *CatalogManagerView::itemAbove( CatManListItem *item )
{
while( !static_cast<CatManListItem *>( item->previousSibling() ) )
{
- item = static_cast<CatManListItem *>( item->tqparent());
+ item = static_cast<CatManListItem *>( item->parent());
if( !item ) return item;
}
return static_cast<CatManListItem *>( item->previousSibling() );
diff --git a/kbabel/catalogmanager/catalogmanagerview.h b/kbabel/catalogmanager/catalogmanagerview.h
index 8a405430..d923a3bb 100644
--- a/kbabel/catalogmanager/catalogmanagerview.h
+++ b/kbabel/catalogmanager/catalogmanagerview.h
@@ -79,7 +79,7 @@ class CatalogManagerView : public TQListView
Q_OBJECT
TQ_OBJECT
public:
- CatalogManagerView(KBabel::Project::Ptr project, TQWidget* tqparent=0, const char* name=0);
+ CatalogManagerView(KBabel::Project::Ptr project, TQWidget* parent=0, const char* name=0);
virtual ~CatalogManagerView();
KBabel::CatManSettings settings() const;
@@ -126,14 +126,14 @@ public slots:
* traverses all childs in the directory of the current item
* (including all subdirectories) and displays some statistics
* about the translations. If the item is a file, its
- * tqparent directory is used instead.
+ * parent directory is used instead.
*/
void statistics();
/**
* traverses all marked childs in the directory of the current item
* (including all subdirectories) and displays some statistics
* about the translations. If the item is a file, its
- * tqparent directory is used instead.
+ * parent directory is used instead.
*/
void markedStatistics();
/**
diff --git a/kbabel/catalogmanager/catmanlistitem.cpp b/kbabel/catalogmanager/catmanlistitem.cpp
index aa52237f..d5997dd5 100644
--- a/kbabel/catalogmanager/catmanlistitem.cpp
+++ b/kbabel/catalogmanager/catmanlistitem.cpp
@@ -53,15 +53,15 @@
using namespace KBabel;
-CatManListItem::CatManListItem(CatalogManagerView *view, TQListViewItem* tqparent,TQString fullPath,TQString fullPotPath,TQString package)
- : TQListViewItem(tqparent)
+CatManListItem::CatManListItem(CatalogManagerView *view, TQListViewItem* parent,TQString fullPath,TQString fullPotPath,TQString package)
+ : TQListViewItem(parent)
{
_view = view;
init(fullPath,fullPotPath,package);
}
-CatManListItem::CatManListItem(CatalogManagerView *view, TQListView* tqparent,TQString fullPath,TQString fullPotPath)
- : TQListViewItem(tqparent)
+CatManListItem::CatManListItem(CatalogManagerView *view, TQListView* parent,TQString fullPath,TQString fullPotPath)
+ : TQListViewItem(parent)
{
_primary=TQFileInfo(fullPath);
_template=TQFileInfo(fullPotPath);
@@ -102,7 +102,7 @@ void CatManListItem::init(const TQString& fullPath, const TQString& fullPotPath,
_wordList.clear();
_wordListUpdated = false;
- update(tqparent()->isOpen(),false,true);
+ update(parent()->isOpen(),false,true);
if( !isDir() ) setPixmap(COL_MARKER,ICON_NOFLAG);
}
@@ -332,11 +332,11 @@ TQString CatManListItem::key(int col, bool) const
void CatManListItem::update(bool showPoInfo,bool includeChildren
, bool noParents)
{
- if( _view->isStopped() ) return; // if tqparent view is stopped, we should stop as well
+ if( _view->isStopped() ) return; // if parent view is stopped, we should stop as well
bool updateWordList = _view->settings().indexWords;
- // flag, if something has changed and tqparent has to be updated
+ // flag, if something has changed and parent has to be updated
bool updateParent=false;
// update flags for files...
@@ -596,7 +596,7 @@ void CatManListItem::update(bool showPoInfo,bool includeChildren
// however, is can be saved template or translation!!! - only translation is handled???
void CatManListItem::updateAfterSave( PoInfo &poInfo )
{
- // flag, if something has changed and tqparent has to be updated
+ // flag, if something has changed and parent has to be updated
bool updateParent=false;
// update flags for files...
@@ -661,7 +661,7 @@ void CatManListItem::updateAfterSave( PoInfo &poInfo )
setPixmap(COL_NAME,icon);
- // if the status changed, update the tqparent item
+ // if the status changed, update the parent item
if(needWork != neededWork)
{
updateParent=true;
@@ -677,11 +677,11 @@ void CatManListItem::updateAfterSave( PoInfo &poInfo )
void CatManListItem::updateParents()
{
- CatManListItem *item = (CatManListItem*)tqparent();
+ CatManListItem *item = (CatManListItem*)parent();
while( item && !_view->isStopped())
{
item->update(false,false);
- item = (CatManListItem*)item->tqparent();
+ item = (CatManListItem*)item->parent();
}
}
@@ -827,9 +827,9 @@ TQPixmap CatManListItem::paintExclamation(TQPixmap* pixmap)
int diameter=TQMIN(width,height);
- TQBitmap tqmask=pixmap->createHeuristicMask();
+ TQBitmap mask=pixmap->createHeuristicMask();
- TQPainter mp(&tqmask);
+ TQPainter mp(&mask);
mp.setPen(TQPen(TQt::color1,1));
mp.drawEllipse(width-diameter,height-diameter,diameter,diameter);
@@ -840,14 +840,14 @@ TQPixmap CatManListItem::paintExclamation(TQPixmap* pixmap)
p.setPen( TQPen(red,1) );
p.drawEllipse(width-diameter,height-diameter,diameter,diameter);
- result.setMask(tqmask);
+ result.setMask(mask);
return result;
}
TQListViewItem *CatManListItem::previousSibling()
{
- TQListViewItem * i = tqparent();
+ TQListViewItem * i = parent();
if( !i ) return i;
i = i->firstChild();
if( !i ) return i;
diff --git a/kbabel/catalogmanager/catmanlistitem.h b/kbabel/catalogmanager/catmanlistitem.h
index e31a5d4d..ac22e2e8 100644
--- a/kbabel/catalogmanager/catmanlistitem.h
+++ b/kbabel/catalogmanager/catmanlistitem.h
@@ -60,11 +60,11 @@ public:
/** the type of this item */
enum Type{File,Dir};
- CatManListItem(CatalogManagerView *view, TQListViewItem* tqparent,TQString fullPath
+ CatManListItem(CatalogManagerView *view, TQListViewItem* parent,TQString fullPath
,TQString fullPotPath,TQString package);
/** creates the toplevel root item with package name "/" */
- CatManListItem(CatalogManagerView *view, TQListView* tqparent,TQString fullPath, TQString fullPotPath);
+ CatManListItem(CatalogManagerView *view, TQListView* parent,TQString fullPath, TQString fullPotPath);
/**
* returns the package names (including relative path) of the
@@ -94,7 +94,7 @@ public:
/**
* checks if the file on the disc has changed,
* reads information about the file and displays it
- * @param noParents flag, if the update has to include the tqparent
+ * @param noParents flag, if the update has to include the parent
* of the item, if the status has changed. Since at the first build of
* the tree, the status of every item changes, this is not useful then.
*/
@@ -227,7 +227,7 @@ private:
/** a list of errors found by validation tool*/
TQValueList<IgnoreItem> _errors;
- /** tqparent view for this item, used for stopping the activity */
+ /** parent view for this item, used for stopping the activity */
CatalogManagerView *_view;
/** index of words, but it does not contain any useful information as values */
diff --git a/kbabel/catalogmanager/findinfilesdialog.cpp b/kbabel/catalogmanager/findinfilesdialog.cpp
index 5f10678b..25c37594 100644
--- a/kbabel/catalogmanager/findinfilesdialog.cpp
+++ b/kbabel/catalogmanager/findinfilesdialog.cpp
@@ -44,8 +44,8 @@
using namespace KBabel;
-FindInFilesDialog::FindInFilesDialog(bool forReplace, TQWidget* tqparent)
- :FindDialog(forReplace, tqparent)
+FindInFilesDialog::FindInFilesDialog(bool forReplace, TQWidget* parent)
+ :FindDialog(forReplace, parent)
{
TQGroupBox* box = new TQGroupBox(2, Qt::Horizontal, i18n("File Options"), mainWidget());
mainWidget()->tqlayout()->add(box);
diff --git a/kbabel/catalogmanager/findinfilesdialog.h b/kbabel/catalogmanager/findinfilesdialog.h
index afabcb58..5f27795c 100644
--- a/kbabel/catalogmanager/findinfilesdialog.h
+++ b/kbabel/catalogmanager/findinfilesdialog.h
@@ -47,7 +47,7 @@ public:
* Constructor
* @param replaceDlg flag, if this is a replace dialog
*/
- FindInFilesDialog(bool replaceDlg, TQWidget* tqparent);
+ FindInFilesDialog(bool replaceDlg, TQWidget* parent);
~FindInFilesDialog();
/**
diff --git a/kbabel/catalogmanager/libcvs/cvsdialog.cpp b/kbabel/catalogmanager/libcvs/cvsdialog.cpp
index afc299b9..7043c8f3 100644
--- a/kbabel/catalogmanager/libcvs/cvsdialog.cpp
+++ b/kbabel/catalogmanager/libcvs/cvsdialog.cpp
@@ -60,8 +60,8 @@
#include "cvsdialog.h"
-CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * tqparent, KSharedConfig* config )
- : KDialog( tqparent, "CVSDIALOG", true ), m_config( config )
+CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config )
+ : KDialog( parent, "CVSDIALOG", true ), m_config( config )
{
_cmd = cmd;
p=0L;
diff --git a/kbabel/catalogmanager/libcvs/cvsdialog.h b/kbabel/catalogmanager/libcvs/cvsdialog.h
index 3c492704..dc726f59 100644
--- a/kbabel/catalogmanager/libcvs/cvsdialog.h
+++ b/kbabel/catalogmanager/libcvs/cvsdialog.h
@@ -73,7 +73,7 @@ class CVSDialog : public KDialog
* Constructor for creating the dialog.
* @param cmd The type of command to be executed.
*/
- CVSDialog( CVS::Command cmd, TQWidget * tqparent, KSharedConfig* config );
+ CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config );
~CVSDialog();
/**
* Set the list of files which will be used for the CVS command.
diff --git a/kbabel/catalogmanager/libcvs/cvshandler.cpp b/kbabel/catalogmanager/libcvs/cvshandler.cpp
index 6ab70423..b0764af8 100644
--- a/kbabel/catalogmanager/libcvs/cvshandler.cpp
+++ b/kbabel/catalogmanager/libcvs/cvshandler.cpp
@@ -182,18 +182,18 @@ TQString CVSHandler::cvstqStatus( const TQString& filename ) const
return map[filename];
}
-void CVSHandler::execCVSCommand( TQWidget* tqparent, CVS::Command cmd, const TQString& filename, bool templates, KSharedConfig* config )
+void CVSHandler::execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQString& filename, bool templates, KSharedConfig* config )
{
if ( !_isPORepository ) {
// This message box should never be visible but who knows... ;-)
- KMessageBox::sorry( tqparent, i18n( "This is not a valid CVS repository. "
+ KMessageBox::sorry( parent, i18n( "This is not a valid CVS repository. "
"The CVS commands cannot be executed." ) );
return;
}
TQFileInfo info( filename );
if ( !info.isDir( ) ) {
- execCVSCommand( tqparent, cmd, TQStringList( filename ), templates, config );
+ execCVSCommand( parent, cmd, TQStringList( filename ), templates, config );
return;
}
@@ -218,14 +218,14 @@ void CVSHandler::execCVSCommand( TQWidget* tqparent, CVS::Command cmd, const TQS
break;
}
- showDialog( tqparent, cmd, TQStringList( filename ), command, config );
+ showDialog( parent, cmd, TQStringList( filename ), command, config );
}
-void CVSHandler::execCVSCommand( TQWidget* tqparent, CVS::Command cmd, const TQStringList& files, bool templates, KSharedConfig* config )
+void CVSHandler::execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQStringList& files, bool templates, KSharedConfig* config )
{
if ( !_isPORepository ) {
// This message box should never be visible but who knows... ;-)
- KMessageBox::sorry( tqparent, i18n( "This is not a valid CVS repository. "
+ KMessageBox::sorry( parent, i18n( "This is not a valid CVS repository. "
"The CVS commands cannot be executed." ) );
return;
}
@@ -262,7 +262,7 @@ void CVSHandler::execCVSCommand( TQWidget* tqparent, CVS::Command cmd, const TQS
command += " \'" + temp + "\'";
}
- showDialog( tqparent, cmd, files, command, config );
+ showDialog( parent, cmd, files, command, config );
}
void CVSHandler::setAutoUpdateTemplates( bool update )
@@ -270,9 +270,9 @@ void CVSHandler::setAutoUpdateTemplates( bool update )
_autoUpdateTemplates = update;
}
-void CVSHandler::showDialog( TQWidget* tqparent, CVS::Command cmd, const TQStringList& files, const TQString& commandLine, KSharedConfig* config )
+void CVSHandler::showDialog( TQWidget* parent, CVS::Command cmd, const TQStringList& files, const TQString& commandLine, KSharedConfig* config )
{
- CVSDialog * dia = new CVSDialog( cmd, tqparent, config );
+ CVSDialog * dia = new CVSDialog( cmd, parent, config );
dia->setFiles( files );
dia->setCommandLine( commandLine );
if ( cmd == CVS::Commit ) {
@@ -313,7 +313,7 @@ void CVSHandler::checkToAdd( const TQStringList& files )
toBeAdded << *it;
temp = TQFileInfo( *it ).dirPath( true );
}
- // check recursivlely if tqparent dirs have to be added as well
+ // check recursivlely if parent dirs have to be added as well
while ( fstatus( temp ) == NOT_IN_CVS && toBeAdded.findIndex( temp ) == -1 ) {
toBeAdded << temp;
temp = TQFileInfo( temp ).dirPath( true );
diff --git a/kbabel/catalogmanager/libcvs/cvshandler.h b/kbabel/catalogmanager/libcvs/cvshandler.h
index 78e248da..1c08af92 100644
--- a/kbabel/catalogmanager/libcvs/cvshandler.h
+++ b/kbabel/catalogmanager/libcvs/cvshandler.h
@@ -79,8 +79,8 @@ class CVSHandler : public TQObject
TQString filetqStatus( const FiletqStatus status ) const;
TQString cvstqStatus( const TQString& filename ) const;
- void execCVSCommand( TQWidget* tqparent, CVS::Command cmd, const TQString& filename, bool templates, KSharedConfig* config );
- void execCVSCommand( TQWidget* tqparent, CVS::Command cmd, const TQStringList& files, bool templates, KSharedConfig* config );
+ void execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQString& filename, bool templates, KSharedConfig* config );
+ void execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQStringList& files, bool templates, KSharedConfig* config );
void setAutoUpdateTemplates( bool update );
@@ -95,7 +95,7 @@ class CVSHandler : public TQObject
void signalFilesCommitted( const TQStringList& );
private:
- void showDialog( TQWidget* tqparent, CVS::Command cmd, const TQStringList& files, const TQString& commandLine, KSharedConfig* config );
+ void showDialog( TQWidget* parent, CVS::Command cmd, const TQStringList& files, const TQString& commandLine, KSharedConfig* config );
void checkToAdd( const TQStringList& files );
void processStatusOutput( const TQString& status );
void processDiff( TQString output );
diff --git a/kbabel/catalogmanager/libsvn/svndialog.cpp b/kbabel/catalogmanager/libsvn/svndialog.cpp
index 01a4bccd..b54b25eb 100644
--- a/kbabel/catalogmanager/libsvn/svndialog.cpp
+++ b/kbabel/catalogmanager/libsvn/svndialog.cpp
@@ -57,8 +57,8 @@
#include "svndialog.h"
-SVNDialog::SVNDialog( SVN::Command cmd, TQWidget * tqparent, KSharedConfig* config )
- : KDialog( tqparent, "SVN DIALOG", true ), m_tempFile( 0 ), m_config( config )
+SVNDialog::SVNDialog( SVN::Command cmd, TQWidget * parent, KSharedConfig* config )
+ : KDialog( parent, "SVN DIALOG", true ), m_tempFile( 0 ), m_config( config )
{
_cmd = cmd;
p=0L;
diff --git a/kbabel/catalogmanager/libsvn/svndialog.h b/kbabel/catalogmanager/libsvn/svndialog.h
index 55c57f27..a8083216 100644
--- a/kbabel/catalogmanager/libsvn/svndialog.h
+++ b/kbabel/catalogmanager/libsvn/svndialog.h
@@ -72,7 +72,7 @@ class SVNDialog : public KDialog
* Constructor for creating the dialog.
* @param cmd The type of command to be executed.
*/
- SVNDialog( SVN::Command cmd, TQWidget * tqparent, KSharedConfig* config );
+ SVNDialog( SVN::Command cmd, TQWidget * parent, KSharedConfig* config );
~SVNDialog();
/**
* Set the list of files which will be used for the SVN command.
diff --git a/kbabel/catalogmanager/libsvn/svnhandler.cpp b/kbabel/catalogmanager/libsvn/svnhandler.cpp
index 71907fb8..5f91e1e8 100644
--- a/kbabel/catalogmanager/libsvn/svnhandler.cpp
+++ b/kbabel/catalogmanager/libsvn/svnhandler.cpp
@@ -274,18 +274,18 @@ TQString SVNHandler::svntqStatus( const TQString& filename ) const
return map[filename];
}
-void SVNHandler::execSVNCommand( TQWidget* tqparent, SVN::Command cmd, const TQString& filename, bool templates, KSharedConfig* config)
+void SVNHandler::execSVNCommand( TQWidget* parent, SVN::Command cmd, const TQString& filename, bool templates, KSharedConfig* config)
{
// Unlike cvs, svn works also from outside the repository(as long as the path is in a repository of course!)
// ### FIXME: wrong, svn commit cannot work if the current directory is not a SVN one
- execSVNCommand( tqparent, cmd, TQStringList( filename ), templates, config );
+ execSVNCommand( parent, cmd, TQStringList( filename ), templates, config );
}
-void SVNHandler::execSVNCommand( TQWidget* tqparent, SVN::Command cmd, const TQStringList& files, bool templates, KSharedConfig* config )
+void SVNHandler::execSVNCommand( TQWidget* parent, SVN::Command cmd, const TQStringList& files, bool templates, KSharedConfig* config )
{
if ( !_isPORepository ) {
// This message box should never be visible but who knows... ;-)
- KMessageBox::sorry( tqparent, i18n( "This is not a valid SVN repository. "
+ KMessageBox::sorry( parent, i18n( "This is not a valid SVN repository. "
"The SVN commands cannot be executed." ) );
return;
}
@@ -328,7 +328,7 @@ void SVNHandler::execSVNCommand( TQWidget* tqparent, SVN::Command cmd, const TQS
command += " \'" + temp + "\'";
}
- showDialog( tqparent, cmd, files, command, config );
+ showDialog( parent, cmd, files, command, config );
}
void SVNHandler::setAutoUpdateTemplates( bool update )
@@ -336,9 +336,9 @@ void SVNHandler::setAutoUpdateTemplates( bool update )
_autoUpdateTemplates = update;
}
-void SVNHandler::showDialog( TQWidget* tqparent, SVN::Command cmd, const TQStringList& files, const TQString& commandLine, KSharedConfig* config )
+void SVNHandler::showDialog( TQWidget* parent, SVN::Command cmd, const TQStringList& files, const TQString& commandLine, KSharedConfig* config )
{
- SVNDialog * dia = new SVNDialog( cmd, tqparent, config );
+ SVNDialog * dia = new SVNDialog( cmd, parent, config );
dia->setFiles( files );
dia->setCommandLine( commandLine );
if ( cmd == SVN::Commit ) {
@@ -415,7 +415,7 @@ void SVNHandler::checkToAdd( const TQStringList& files )
}
// ### TODO: does SVN really needs this or does it do it automatically?
- // check recursivlely if tqparent dirs have to be added as well
+ // check recursivlely if parent dirs have to be added as well
while ( ! isInSvn( temp ) && toBeAdded.findIndex( temp ) == -1 ) {
toBeAdded << temp;
temp = TQFileInfo( temp ).dirPath( true );
diff --git a/kbabel/catalogmanager/libsvn/svnhandler.h b/kbabel/catalogmanager/libsvn/svnhandler.h
index cad3e93f..57ce13b4 100644
--- a/kbabel/catalogmanager/libsvn/svnhandler.h
+++ b/kbabel/catalogmanager/libsvn/svnhandler.h
@@ -78,8 +78,8 @@ class SVNHandler : public TQObject
TQString filetqStatus( const FiletqStatus status ) const;
TQString svntqStatus( const TQString& filename ) const;
- void execSVNCommand( TQWidget* tqparent, SVN::Command cmd, const TQString& filename, bool templates, KSharedConfig* config );
- void execSVNCommand( TQWidget* tqparent, SVN::Command cmd, const TQStringList& files, bool templates, KSharedConfig* config );
+ void execSVNCommand( TQWidget* parent, SVN::Command cmd, const TQString& filename, bool templates, KSharedConfig* config );
+ void execSVNCommand( TQWidget* parent, SVN::Command cmd, const TQStringList& files, bool templates, KSharedConfig* config );
void setAutoUpdateTemplates( bool update );
@@ -94,7 +94,7 @@ class SVNHandler : public TQObject
void signalFilesCommitted( const TQStringList& );
private:
- void showDialog( TQWidget* tqparent, SVN::Command cmd, const TQStringList& files, const TQString& commandLine, KSharedConfig* config );
+ void showDialog( TQWidget* parent, SVN::Command cmd, const TQStringList& files, const TQString& commandLine, KSharedConfig* config );
/// Check quickly if the file is part of a SVN repository
bool isInSvn( const TQString& path );
void checkToAdd( const TQStringList& files );
diff --git a/kbabel/catalogmanager/markpatterndialog.cpp b/kbabel/catalogmanager/markpatterndialog.cpp
index 063069e6..c53b008f 100644
--- a/kbabel/catalogmanager/markpatterndialog.cpp
+++ b/kbabel/catalogmanager/markpatterndialog.cpp
@@ -47,8 +47,8 @@
#include "markpatterndialog.h"
#include "markpatternwidget.h"
-MarkPatternDialog::MarkPatternDialog(TQWidget * tqparent, const char * name)
- : KDialogBase(tqparent, name, true, 0, Ok|Cancel, Ok)
+MarkPatternDialog::MarkPatternDialog(TQWidget * parent, const char * name)
+ : KDialogBase(parent, name, true, 0, Ok|Cancel, Ok)
{
actionButton(Ok)->setEnabled(false);
diff --git a/kbabel/catalogmanager/markpatterndialog.h b/kbabel/catalogmanager/markpatterndialog.h
index 46a39c32..3ca2d232 100644
--- a/kbabel/catalogmanager/markpatterndialog.h
+++ b/kbabel/catalogmanager/markpatterndialog.h
@@ -46,7 +46,7 @@ class MarkPatternDialog : public KDialogBase
TQ_OBJECT
public:
- MarkPatternDialog(TQWidget * tqparent, const char * name = 0);
+ MarkPatternDialog(TQWidget * parent, const char * name = 0);
TQString pattern( );
bool isCaseSensitive( );
diff --git a/kbabel/catalogmanager/multiroughtransdlg.cpp b/kbabel/catalogmanager/multiroughtransdlg.cpp
index e5b272f1..16373a0b 100644
--- a/kbabel/catalogmanager/multiroughtransdlg.cpp
+++ b/kbabel/catalogmanager/multiroughtransdlg.cpp
@@ -48,11 +48,11 @@
using namespace KBabel;
MultiRoughTransDlg::MultiRoughTransDlg(KBabelDictBox *dict, TQPtrList<CatManListItem> files
- , TQWidget *tqparent,const char *name)
- : RoughTransDlg(dict, new Catalog(), tqparent, name )
+ , TQWidget *parent,const char *name)
+ : RoughTransDlg(dict, new Catalog(), parent, name )
,_fileList(files)
{
- TQWidget* bars = TQT_TQWIDGET(progressbar->tqparent());
+ TQWidget* bars = TQT_TQWIDGET(progressbar->parent());
TQLabel* label = new TQLabel( i18n("Files:"), bars );
filesProgressbar = new KProgress(bars,"files progressbar");
filesProgressbar->setTextEnabled(true);
diff --git a/kbabel/catalogmanager/multiroughtransdlg.h b/kbabel/catalogmanager/multiroughtransdlg.h
index 560ae1d8..4c5b8fc3 100644
--- a/kbabel/catalogmanager/multiroughtransdlg.h
+++ b/kbabel/catalogmanager/multiroughtransdlg.h
@@ -43,7 +43,7 @@ class MultiRoughTransDlg : public RoughTransDlg
TQ_OBJECT
public:
- MultiRoughTransDlg(KBabelDictBox* dictBox, TQPtrList<CatManListItem> list, TQWidget *tqparent
+ MultiRoughTransDlg(KBabelDictBox* dictBox, TQPtrList<CatManListItem> list, TQWidget *parent
, const char *name=0);
protected slots:
diff --git a/kbabel/catalogmanager/validateprogress.cpp b/kbabel/catalogmanager/validateprogress.cpp
index a5440a6f..42fd3f39 100644
--- a/kbabel/catalogmanager/validateprogress.cpp
+++ b/kbabel/catalogmanager/validateprogress.cpp
@@ -52,8 +52,8 @@
// version identification for validation ignores
#define IGNOREFILE_VERSION 0x00
-ValidateProgressDialog::ValidateProgressDialog(const TQString& ignoreURL, TQWidget *tqparent,const char *name)
- : KDialogBase(tqparent,name,true,i18n("Caption of dialog","Validation")
+ValidateProgressDialog::ValidateProgressDialog(const TQString& ignoreURL, TQWidget *parent,const char *name)
+ : KDialogBase(parent,name,true,i18n("Caption of dialog","Validation")
, Close, Close)
, _ignoreURL(ignoreURL), _tool(0), _stopped(false)
, _ignoreFuzzy(false), _setAsFuzzy(false)
diff --git a/kbabel/catalogmanager/validateprogress.h b/kbabel/catalogmanager/validateprogress.h
index f0ae950f..feb0088d 100644
--- a/kbabel/catalogmanager/validateprogress.h
+++ b/kbabel/catalogmanager/validateprogress.h
@@ -62,7 +62,7 @@ class ValidateProgressDialog : public KDialogBase
TQ_OBJECT
public:
- ValidateProgressDialog(const TQString& ignoreURL, TQWidget* tqparent, const char *name=0);
+ ValidateProgressDialog(const TQString& ignoreURL, TQWidget* parent, const char *name=0);
virtual ~ValidateProgressDialog();
void setIgnoreFuzzy(bool enable) { _ignoreFuzzy = enable; }
diff --git a/kbabel/common/catalog.cpp b/kbabel/common/catalog.cpp
index 3d9de8b2..182cf3b0 100644
--- a/kbabel/common/catalog.cpp
+++ b/kbabel/common/catalog.cpp
@@ -70,8 +70,8 @@
#include <kmessagebox.h>
using namespace KBabel;
-Catalog::Catalog(TQObject* tqparent, const char* name, TQString projectFile)
- : TQObject(tqparent,name)
+Catalog::Catalog(TQObject* parent, const char* name, TQString projectFile)
+ : TQObject(parent,name)
{
if ( projectFile.isEmpty() )
projectFile = KBabel::ProjectManager::defaultProjectName();
@@ -79,7 +79,7 @@ Catalog::Catalog(TQObject* tqparent, const char* name, TQString projectFile)
readPreferences();
}
-Catalog::Catalog(const Catalog& c): TQObject(c.tqparent(),c.name()
+Catalog::Catalog(const Catalog& c): TQObject(c.parent(),c.name()
)
{
kdFatal() << "Copy constructor of Catalog, please report how to reproduce to the authors" << endl;
diff --git a/kbabel/common/catalog.h b/kbabel/common/catalog.h
index 74fbcdd7..dd8c3a30 100644
--- a/kbabel/common/catalog.h
+++ b/kbabel/common/catalog.h
@@ -128,11 +128,11 @@ public:
/**
* A constructor for an empty message catalog.
- * @param tqparent tqparent @ref TQObject for this catalog
+ * @param parent parent @ref TQObject for this catalog
* @param name unique name for this object
* @param configFile configuration file to read config from
*/
- Catalog(TQObject* tqparent=0, const char* name=0, TQString projectFile = TQString() );
+ Catalog(TQObject* parent=0, const char* name=0, TQString projectFile = TQString() );
/**
* Deprecated. A copy constructor. Do not use since each Catalog registers
diff --git a/kbabel/common/catalogfileplugin.h b/kbabel/common/catalogfileplugin.h
index ea7cc245..d4e72a76 100644
--- a/kbabel/common/catalogfileplugin.h
+++ b/kbabel/common/catalogfileplugin.h
@@ -85,7 +85,7 @@ class KDE_EXPORT CatalogImportPlugin: public TQObject
TQ_OBJECT
public:
- CatalogImportPlugin(TQObject* tqparent, const char* name);
+ CatalogImportPlugin(TQObject* parent, const char* name);
virtual ~CatalogImportPlugin();
/**
@@ -181,7 +181,7 @@ class KDE_EXPORT CatalogExportPlugin: public TQObject
TQ_OBJECT
public:
- CatalogExportPlugin(TQObject* tqparent, const char* name);
+ CatalogExportPlugin(TQObject* parent, const char* name);
virtual ~CatalogExportPlugin();
virtual ConversiontqStatus save(const TQString& file, const TQString& mimetype, const Catalog* catalog) = 0;
diff --git a/kbabel/common/exportplugin.cpp b/kbabel/common/exportplugin.cpp
index 3aa5af48..25fbef50 100644
--- a/kbabel/common/exportplugin.cpp
+++ b/kbabel/common/exportplugin.cpp
@@ -45,7 +45,7 @@ struct KBabel::CatalogExportPluginPrivate
bool _stop;
};
-CatalogExportPlugin::CatalogExportPlugin(TQObject* tqparent, const char* name) : TQObject(tqparent,name)
+CatalogExportPlugin::CatalogExportPlugin(TQObject* parent, const char* name) : TQObject(parent,name)
{
d = new CatalogExportPluginPrivate;
d->_stop=false;
diff --git a/kbabel/common/importplugin.cpp b/kbabel/common/importplugin.cpp
index 4ef1562c..ed6d15ef 100644
--- a/kbabel/common/importplugin.cpp
+++ b/kbabel/common/importplugin.cpp
@@ -43,7 +43,7 @@
using namespace KBabel;
-CatalogImportPlugin::CatalogImportPlugin(TQObject* tqparent, const char* name) : TQObject(tqparent,name)
+CatalogImportPlugin::CatalogImportPlugin(TQObject* parent, const char* name) : TQObject(parent,name)
{
d = new CatalogImportPluginPrivate;
d->_catalog = 0;
diff --git a/kbabel/common/kbabeldatatool.h b/kbabel/common/kbabeldatatool.h
index ae1406c6..ee3bfb11 100644
--- a/kbabel/common/kbabeldatatool.h
+++ b/kbabel/common/kbabeldatatool.h
@@ -50,7 +50,7 @@ class KBabelDataTool: public KDataTool
TQ_OBJECT
protected:
- KBabelDataTool( TQObject* tqparent, const char* name ) : KDataTool( tqparent, name ) {}
+ KBabelDataTool( TQObject* parent, const char* name ) : KDataTool( parent, name ) {}
public slots:
/** The only method to be redefined in inherited classes.
* This method is called everytime the settings are changed.
diff --git a/kbabel/common/kbmailer.cpp b/kbabel/common/kbmailer.cpp
index d63940af..90f61256 100644
--- a/kbabel/common/kbmailer.cpp
+++ b/kbabel/common/kbmailer.cpp
@@ -53,8 +53,8 @@
using namespace KBabel;
-KBabelMailer::KBabelMailer( TQWidget* tqparent, Project::Ptr project)
- : _project( project ), m_parent( tqparent )
+KBabelMailer::KBabelMailer( TQWidget* parent, Project::Ptr project)
+ : _project( project ), m_parent( parent )
{
m_tempDir.setAutoDelete( true );
readConfig();
diff --git a/kbabel/common/kbmailer.h b/kbabel/common/kbmailer.h
index 1f35d6e2..fe1cfe89 100644
--- a/kbabel/common/kbmailer.h
+++ b/kbabel/common/kbmailer.h
@@ -62,11 +62,11 @@ class KDE_EXPORT KBabelMailer
/**
* Constructor.
*
- * @param tqparent The tqparent widget.
+ * @param parent The parent widget.
* @param project The project to be used.
- * @since 1.11.2 (KDE 3.5.2): @p tqparent parameter
+ * @since 1.11.2 (KDE 3.5.2): @p parent parameter
*/
- KBabelMailer( TQWidget* tqparent, Project::Ptr project);
+ KBabelMailer( TQWidget* parent, Project::Ptr project);
virtual ~KBabelMailer();
/**
@@ -157,7 +157,7 @@ class KDE_EXPORT KBabelMailer
*/
TQString _poBaseDir;
- /// The tqparent widget
+ /// The parent widget
TQWidget* m_parent;
};
diff --git a/kbabel/common/msgfmt.cpp b/kbabel/common/msgfmt.cpp
index 36af8551..f91f25f9 100644
--- a/kbabel/common/msgfmt.cpp
+++ b/kbabel/common/msgfmt.cpp
@@ -46,8 +46,8 @@
using namespace KBabel;
-Msgfmt::Msgfmt(TQObject* tqparent,const char* name)
- : TQObject(tqparent , name)
+Msgfmt::Msgfmt(TQObject* parent,const char* name)
+ : TQObject(parent , name)
{
}
diff --git a/kbabel/common/msgfmt.h b/kbabel/common/msgfmt.h
index 9831a43f..025a2fdd 100644
--- a/kbabel/common/msgfmt.h
+++ b/kbabel/common/msgfmt.h
@@ -48,7 +48,7 @@ class KDE_EXPORT Msgfmt : private TQObject
TQ_OBJECT
public:
enum tqStatus{NoExecutable,Ok,SyntaxError,HeaderError,Error,Unsupported};
- Msgfmt(TQObject* tqparent=0,const char* name=0);
+ Msgfmt(TQObject* parent=0,const char* name=0);
tqStatus checkSyntax(TQString file,TQString& output, bool gnu = false);
tqStatus checkSyntaxInDir(TQString dir,TQString regexp,TQString& output);
diff --git a/kbabel/common/stringdistance.h b/kbabel/common/stringdistance.h
index 022b7fa5..13265b95 100644
--- a/kbabel/common/stringdistance.h
+++ b/kbabel/common/stringdistance.h
@@ -63,7 +63,7 @@ private: // emphasize the following members are private
*
* The class Distance calculates the distance
* between two Entities (left & right).
- * It is the tqparent for other distance-classes.
+ * It is the parent for other distance-classes.
*/
class Distance : public NonCopyable
{
diff --git a/kbabel/commonui/cmdedit.cpp b/kbabel/commonui/cmdedit.cpp
index f0da9701..df8ce38a 100644
--- a/kbabel/commonui/cmdedit.cpp
+++ b/kbabel/commonui/cmdedit.cpp
@@ -42,8 +42,8 @@
#include <kdialog.h>
-CmdEdit::CmdEdit(TQWidget* tqparent, const char* name)
- : TQWidget(tqparent,name)
+CmdEdit::CmdEdit(TQWidget* parent, const char* name)
+ : TQWidget(parent,name)
{
TQGridLayout* tqlayout = new TQGridLayout( this , 1 , 1 );
tqlayout->setSpacing( KDialog::spacingHint() );
diff --git a/kbabel/commonui/cmdedit.h b/kbabel/commonui/cmdedit.h
index bd091166..57c96a3f 100644
--- a/kbabel/commonui/cmdedit.h
+++ b/kbabel/commonui/cmdedit.h
@@ -50,7 +50,7 @@ class CmdEdit : public TQWidget
Q_OBJECT
TQ_OBJECT
public:
- CmdEdit(TQWidget* tqparent=0,const char* name=0);
+ CmdEdit(TQWidget* parent=0,const char* name=0);
void setCommands(const TQStringList& commands,const TQStringList& commandNames);
void commands(TQStringList& commands, TQStringList& commandNames);
diff --git a/kbabel/commonui/context.cpp b/kbabel/commonui/context.cpp
index 0700b895..f9e5be2f 100644
--- a/kbabel/commonui/context.cpp
+++ b/kbabel/commonui/context.cpp
@@ -62,8 +62,8 @@
#include <ktexteditor/selectioninterface.h>
#include <ktexteditor/viewcursorinterface.h>
-SourceContext::SourceContext(TQWidget *tqparent, KBabel::Project::Ptr project): TQWidget(tqparent)
- , m_parent( tqparent )
+SourceContext::SourceContext(TQWidget *parent, KBabel::Project::Ptr project): TQWidget(parent)
+ , m_parent( parent )
, _part(0)
, _view(0)
, _referenceCombo(0)
diff --git a/kbabel/commonui/context.h b/kbabel/commonui/context.h
index dd7218b4..3b019f67 100644
--- a/kbabel/commonui/context.h
+++ b/kbabel/commonui/context.h
@@ -79,7 +79,7 @@ class KDE_EXPORT SourceContext : public TQWidget
Q_OBJECT
TQ_OBJECT
public:
- SourceContext(TQWidget* tqparent, KBabel::Project::Ptr project);
+ SourceContext(TQWidget* parent, KBabel::Project::Ptr project);
void setProject(KBabel::Project::Ptr project);
diff --git a/kbabel/commonui/finddialog.cpp b/kbabel/commonui/finddialog.cpp
index cd752396..980f9802 100644
--- a/kbabel/commonui/finddialog.cpp
+++ b/kbabel/commonui/finddialog.cpp
@@ -52,8 +52,8 @@
using namespace KBabel;
-FindDialog::FindDialog(bool forReplace, TQWidget* tqparent)
- :KDialogBase(tqparent, "finddialog",true, "", Ok|Cancel, Ok)
+FindDialog::FindDialog(bool forReplace, TQWidget* parent)
+ :KDialogBase(parent, "finddialog",true, "", Ok|Cancel, Ok)
, _regExpEditDialog(0), _replaceDlg(forReplace)
{
TQWidget* page = new TQWidget(this);
@@ -531,8 +531,8 @@ void FindDialog::regExpButtonClicked()
}
}
-ReplaceDialog::ReplaceDialog(TQWidget* tqparent)
- :KDialogBase(Plain, "", Close|User1|User2|User3, User1, tqparent,"finddialog"
+ReplaceDialog::ReplaceDialog(TQWidget* parent)
+ :KDialogBase(Plain, "", Close|User1|User2|User3, User1, parent,"finddialog"
, true,false,i18n("&Replace"),i18n("&Goto Next"),i18n("R&eplace All"))
{
TQWidget* page = plainPage();
diff --git a/kbabel/commonui/finddialog.h b/kbabel/commonui/finddialog.h
index 83badefa..29f346ff 100644
--- a/kbabel/commonui/finddialog.h
+++ b/kbabel/commonui/finddialog.h
@@ -53,7 +53,7 @@ public:
* Constructor
* @param replaceDlg flag, if this is a replace dialog
*/
- FindDialog(bool replaceDlg, TQWidget* tqparent);
+ FindDialog(bool replaceDlg, TQWidget* parent);
~FindDialog();
/**
@@ -125,7 +125,7 @@ class KDE_EXPORT ReplaceDialog : public KDialogBase
Q_OBJECT
TQ_OBJECT
public:
- ReplaceDialog(TQWidget* tqparent);
+ ReplaceDialog(TQWidget* parent);
~ReplaceDialog();
signals:
diff --git a/kbabel/commonui/kactionselector.cpp b/kbabel/commonui/kactionselector.cpp
index 52a60bbf..9e5d3e79 100644
--- a/kbabel/commonui/kactionselector.cpp
+++ b/kbabel/commonui/kactionselector.cpp
@@ -57,8 +57,8 @@ class KActionSelectorPrivate {
//BEGIN Constructor/destructor
-KActionSelector::KActionSelector( TQWidget *tqparent, const char *name )
- : TQWidget( tqparent, name )
+KActionSelector::KActionSelector( TQWidget *parent, const char *name )
+ : TQWidget( parent, name )
{
d = new KActionSelectorPrivate();
d->moveOnDoubleClick = true;
diff --git a/kbabel/commonui/kactionselector.h b/kbabel/commonui/kactionselector.h
index 421597ba..f6090934 100644
--- a/kbabel/commonui/kactionselector.h
+++ b/kbabel/commonui/kactionselector.h
@@ -98,7 +98,7 @@ class KActionSelector : public TQWidget {
TQ_PROPERTY( bool showUpDownButtons READ showUpDownButtons WRITE setShowUpDownButtons )
public:
- KActionSelector( TQWidget *tqparent=0, const char *name=0 );
+ KActionSelector( TQWidget *parent=0, const char *name=0 );
~KActionSelector();
/**
diff --git a/kbabel/commonui/projectprefwidgets.cpp b/kbabel/commonui/projectprefwidgets.cpp
index 2fe24188..02c20196 100644
--- a/kbabel/commonui/projectprefwidgets.cpp
+++ b/kbabel/commonui/projectprefwidgets.cpp
@@ -123,8 +123,8 @@ static TQSize sizeHintForWidget(const TQWidget* widget)
-SavePreferences::SavePreferences(TQWidget *tqparent)
- : KTabCtl(tqparent)
+SavePreferences::SavePreferences(TQWidget *parent)
+ : KTabCtl(parent)
{
TQWidget* page = new TQWidget(this);
TQVBoxLayout* tqlayout=new TQVBoxLayout(page);
@@ -398,8 +398,8 @@ void SavePreferences::setAutoSaveVisible( const bool on )
-IdentityPreferences::IdentityPreferences(TQWidget* tqparent, const TQString& project)
- : TQWidget(tqparent)
+IdentityPreferences::IdentityPreferences(TQWidget* parent, const TQString& project)
+ : TQWidget(parent)
{
TQWidget* page = this;
TQVBoxLayout* tqlayout=new TQVBoxLayout(page);
@@ -658,8 +658,8 @@ void IdentityPreferences::lookupGnuPluralFormHeader()
}
-MiscPreferences::MiscPreferences(TQWidget *tqparent)
- : TQWidget(tqparent), _regExpEditDialog(0)
+MiscPreferences::MiscPreferences(TQWidget *parent)
+ : TQWidget(parent), _regExpEditDialog(0)
{
TQWidget* page = this;
@@ -790,8 +790,8 @@ void MiscPreferences::regExpButtonClicked()
}
-SpellPreferences::SpellPreferences(TQWidget* tqparent)
- : TQWidget(tqparent)
+SpellPreferences::SpellPreferences(TQWidget* parent)
+ : TQWidget(parent)
{
TQWidget* page = this;
TQVBoxLayout* tqlayout=new TQVBoxLayout(page);
@@ -874,8 +874,8 @@ void SpellPreferences::defaults(const SpellcheckSettings& settings)
*spellConfig = spCfg;
}
-CatmanPreferences::CatmanPreferences(TQWidget* tqparent)
- : TQWidget(tqparent)
+CatmanPreferences::CatmanPreferences(TQWidget* parent)
+ : TQWidget(parent)
{
TQWidget* page = this;
@@ -976,8 +976,8 @@ void CatmanPreferences::defaults(const CatManSettings& settings)
m_msgfmtButton->setChecked( settings.msgfmt );
}
-DirCommandsPreferences::DirCommandsPreferences(TQWidget* tqparent)
- : TQWidget(tqparent)
+DirCommandsPreferences::DirCommandsPreferences(TQWidget* parent)
+ : TQWidget(parent)
{
TQWidget* page = this;
@@ -1039,8 +1039,8 @@ void DirCommandsPreferences::defaults(const CatManSettings& settings)
}
-FileCommandsPreferences::FileCommandsPreferences(TQWidget* tqparent)
- : TQWidget(tqparent)
+FileCommandsPreferences::FileCommandsPreferences(TQWidget* parent)
+ : TQWidget(parent)
{
TQWidget* page = this;
@@ -1102,8 +1102,8 @@ void FileCommandsPreferences::defaults(const CatManSettings& settings)
_fileCmdEdit->setCommands( settings.fileCommands, settings.fileCommandNames );
}
-ViewPreferences::ViewPreferences(TQWidget* tqparent)
- : TQWidget(tqparent)
+ViewPreferences::ViewPreferences(TQWidget* parent)
+ : TQWidget(parent)
{
TQWidget* page = this;
@@ -1145,7 +1145,7 @@ void ViewPreferences::defaults(const CatManSettings& _settings)
_translatorColumnCheckbox->setChecked(_settings.translatorColumn);
}
-SourceContextPreferences::SourceContextPreferences(TQWidget* tqparent): TQWidget(tqparent)
+SourceContextPreferences::SourceContextPreferences(TQWidget* parent): TQWidget(parent)
{
TQWidget* page = this;
TQVBoxLayout* tqlayout=new TQVBoxLayout(page);
diff --git a/kbabel/commonui/projectprefwidgets.h b/kbabel/commonui/projectprefwidgets.h
index f5fef9e2..d41be3ac 100644
--- a/kbabel/commonui/projectprefwidgets.h
+++ b/kbabel/commonui/projectprefwidgets.h
@@ -67,7 +67,7 @@ class KDE_EXPORT SavePreferences : public KTabCtl
Q_OBJECT
TQ_OBJECT
public:
- SavePreferences(TQWidget* tqparent=0);
+ SavePreferences(TQWidget* parent=0);
void defaults(const KBabel::SaveSettings& settings);
void setAutoSaveVisible(const bool on);
@@ -114,7 +114,7 @@ class IdentityPreferences : public TQWidget
Q_OBJECT
TQ_OBJECT
public:
- IdentityPreferences(TQWidget *tqparent = 0, const TQString& project = "");
+ IdentityPreferences(TQWidget *parent = 0, const TQString& project = "");
virtual bool eventFilter(TQObject *, TQEvent*);
void defaults(const KBabel::IdentitySettings& settings);
@@ -145,7 +145,7 @@ class MiscPreferences : public TQWidget
Q_OBJECT
TQ_OBJECT
public:
- MiscPreferences(TQWidget *tqparent=0);
+ MiscPreferences(TQWidget *parent=0);
void defaults(const KBabel::MiscSettings& settings);
private slots:
@@ -171,7 +171,7 @@ class SpellPreferences : public TQWidget
Q_OBJECT
TQ_OBJECT
public:
- SpellPreferences(TQWidget *tqparent=0);
+ SpellPreferences(TQWidget *parent=0);
void mergeSettings(KBabel::SpellcheckSettings& set) const;
void updateWidgets(const KBabel::SpellcheckSettings& settings);
@@ -193,7 +193,7 @@ class CatmanPreferences : public TQWidget
Q_OBJECT
TQ_OBJECT
public:
- CatmanPreferences(TQWidget *tqparent = 0);
+ CatmanPreferences(TQWidget *parent = 0);
void defaults(const KBabel::CatManSettings& settings);
private:
@@ -212,7 +212,7 @@ class DirCommandsPreferences : public TQWidget
Q_OBJECT
TQ_OBJECT
public:
- DirCommandsPreferences(TQWidget *tqparent = 0);
+ DirCommandsPreferences(TQWidget *parent = 0);
virtual ~DirCommandsPreferences();
void mergeSettings(KBabel::CatManSettings& settings) const;
@@ -231,7 +231,7 @@ class FileCommandsPreferences : public TQWidget
Q_OBJECT
TQ_OBJECT
public:
- FileCommandsPreferences(TQWidget *tqparent = 0);
+ FileCommandsPreferences(TQWidget *parent = 0);
virtual ~FileCommandsPreferences();
void mergeSettings(KBabel::CatManSettings& settings) const;
@@ -250,7 +250,7 @@ class ViewPreferences : public TQWidget
Q_OBJECT
TQ_OBJECT
public:
- ViewPreferences(TQWidget *tqparent = 0);
+ ViewPreferences(TQWidget *parent = 0);
void defaults(const KBabel::CatManSettings& settings);
private:
@@ -274,7 +274,7 @@ class SourceContextPreferences : public TQWidget
Q_OBJECT
TQ_OBJECT
public:
- SourceContextPreferences(TQWidget* tqparent=0);
+ SourceContextPreferences(TQWidget* parent=0);
virtual ~SourceContextPreferences();
void mergeSettings(KBabel::SourceContextSettings& settings) const;
diff --git a/kbabel/commonui/projectwizard.cpp b/kbabel/commonui/projectwizard.cpp
index dc147c32..00a88631 100644
--- a/kbabel/commonui/projectwizard.cpp
+++ b/kbabel/commonui/projectwizard.cpp
@@ -47,8 +47,8 @@
using namespace KBabel;
-ProjectWizard::ProjectWizard(TQWidget *tqparent,const char *name)
- : KWizard(tqparent,name,true)
+ProjectWizard::ProjectWizard(TQWidget *parent,const char *name)
+ : KWizard(parent,name,true)
{
_wizard = new ProjectStep1(this,"project wizard widget");
diff --git a/kbabel/commonui/projectwizard.h b/kbabel/commonui/projectwizard.h
index 487a16e7..fc48d456 100644
--- a/kbabel/commonui/projectwizard.h
+++ b/kbabel/commonui/projectwizard.h
@@ -50,7 +50,7 @@ class KDE_EXPORT ProjectWizard : public KWizard
Q_OBJECT
TQ_OBJECT
public:
- ProjectWizard(TQWidget* tqparent = 0, const char * name = 0);
+ ProjectWizard(TQWidget* parent = 0, const char * name = 0);
Project::Ptr project();
diff --git a/kbabel/commonui/roughtransdlg.cpp b/kbabel/commonui/roughtransdlg.cpp
index 135b2794..57fb21d0 100644
--- a/kbabel/commonui/roughtransdlg.cpp
+++ b/kbabel/commonui/roughtransdlg.cpp
@@ -64,8 +64,8 @@
using namespace KBabel;
RoughTransDlg::RoughTransDlg(KBabelDictBox *dict, Catalog *cat
- , TQWidget *tqparent,const char *name)
- : KDialogBase(tqparent,name,true
+ , TQWidget *parent,const char *name)
+ : KDialogBase(parent,name,true
,i18n("Caption of dialog","Rough Translation")
, User1|User2|User3|Close)
,catalog(cat)
diff --git a/kbabel/commonui/roughtransdlg.h b/kbabel/commonui/roughtransdlg.h
index ec7dc609..56c1f253 100644
--- a/kbabel/commonui/roughtransdlg.h
+++ b/kbabel/commonui/roughtransdlg.h
@@ -56,7 +56,7 @@ class KDE_EXPORT RoughTransDlg : public KDialogBase
TQ_OBJECT
public:
- RoughTransDlg(KBabelDictBox* dictBox, KBabel::Catalog* catalog, TQWidget *tqparent
+ RoughTransDlg(KBabelDictBox* dictBox, KBabel::Catalog* catalog, TQWidget *parent
, const char *name=0);
~RoughTransDlg();
diff --git a/kbabel/commonui/toolaction.cpp b/kbabel/commonui/toolaction.cpp
index 9be27a69..37f9f671 100644
--- a/kbabel/commonui/toolaction.cpp
+++ b/kbabel/commonui/toolaction.cpp
@@ -34,8 +34,8 @@
#include <kdebug.h>
ToolAction::ToolAction( const TQString & text, const KShortcut& cut, const KDataToolInfo & info, const TQString & command,
- TQObject * tqparent, const char * name )
- : KAction( text, info.iconName() == "unknown" ? TQString() : info.iconName(), cut, tqparent, name ),
+ TQObject * parent, const char * name )
+ : KAction( text, info.iconName() == "unknown" ? TQString() : info.iconName(), cut, parent, name ),
m_command( command ),
m_info( info )
{
@@ -46,7 +46,7 @@ void ToolAction::slotActivated()
emit toolActivated( m_info, m_command );
}
-TQPtrList<KAction> ToolAction::dataToolActionList( const TQValueList<KDataToolInfo> & tools, const TQObject *receiver, const char* slot, const TQStringList& command, bool excludeCommand, KActionCollection* tqparent, const TQString& namePrefix )
+TQPtrList<KAction> ToolAction::dataToolActionList( const TQValueList<KDataToolInfo> & tools, const TQObject *receiver, const char* slot, const TQStringList& command, bool excludeCommand, KActionCollection* parent, const TQString& namePrefix )
{
TQPtrList<KAction> actionList;
if ( tools.isEmpty() )
@@ -74,7 +74,7 @@ TQPtrList<KAction> ToolAction::dataToolActionList( const TQValueList<KDataToolIn
TQString sc=*sit;
ToolAction * action = new ToolAction( *uit, (sc.isEmpty()?TQString():sc), *entry, *cit
- , tqparent
+ , parent
, TQString(namePrefix+(*entry).service()->library()+"_"+(*cit)).utf8() );
connect( action, TQT_SIGNAL( toolActivated( const KDataToolInfo &, const TQString & ) ),
receiver, slot );
diff --git a/kbabel/commonui/toolaction.h b/kbabel/commonui/toolaction.h
index 064b8981..09f7af18 100644
--- a/kbabel/commonui/toolaction.h
+++ b/kbabel/commonui/toolaction.h
@@ -44,14 +44,14 @@ class KDE_EXPORT ToolAction : public KAction
Q_OBJECT
TQ_OBJECT
public:
- ToolAction( const TQString & text, const KShortcut& cut, const KDataToolInfo & info, const TQString & command, TQObject * tqparent = 0, const char * name = 0);
+ ToolAction( const TQString & text, const KShortcut& cut, const KDataToolInfo & info, const TQString & command, TQObject * parent = 0, const char * name = 0);
/**
* return the list of KActions created for a list of tools. @ref command
* allows to specify rescriction of commands, for which the list should
* or shouldn't be created according to the @ref excludeCommand flag.
*/
- static TQPtrList<KAction> dataToolActionList( const TQValueList<KDataToolInfo> & tools, const TQObject *receiver, const char* slot, const TQStringList& command, bool excludeCommand, KActionCollection* tqparent=0, const TQString& namePrefix=TQString() );
+ static TQPtrList<KAction> dataToolActionList( const TQValueList<KDataToolInfo> & tools, const TQObject *receiver, const char* slot, const TQStringList& command, bool excludeCommand, KActionCollection* parent=0, const TQString& namePrefix=TQString() );
/**
* returns information about all available validation tools (KDataTools with support for CatalogItem
diff --git a/kbabel/commonui/toolselectionwidget.cpp b/kbabel/commonui/toolselectionwidget.cpp
index 3b10f09d..55a46f93 100644
--- a/kbabel/commonui/toolselectionwidget.cpp
+++ b/kbabel/commonui/toolselectionwidget.cpp
@@ -36,8 +36,8 @@
#include <tqlistbox.h>
-ToolSelectionWidget::ToolSelectionWidget( TQWidget * tqparent, const char * name )
- : KActionSelector( tqparent, name )
+ToolSelectionWidget::ToolSelectionWidget( TQWidget * parent, const char * name )
+ : KActionSelector( parent, name )
{
}
diff --git a/kbabel/commonui/toolselectionwidget.h b/kbabel/commonui/toolselectionwidget.h
index a019b823..9b07aefe 100644
--- a/kbabel/commonui/toolselectionwidget.h
+++ b/kbabel/commonui/toolselectionwidget.h
@@ -42,7 +42,7 @@ class KDE_EXPORT ToolSelectionWidget : public KActionSelector
Q_OBJECT
TQ_OBJECT
public:
- ToolSelectionWidget(TQWidget* tqparent=0, const char* name=0 );
+ ToolSelectionWidget(TQWidget* parent=0, const char* name=0 );
TQStringList selectedTools();
diff --git a/kbabel/datatools/accelerators/main.cc b/kbabel/datatools/accelerators/main.cc
index 3b13b2bf..75ca871d 100644
--- a/kbabel/datatools/accelerators/main.cc
+++ b/kbabel/datatools/accelerators/main.cc
@@ -51,8 +51,8 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_accelstool, KGenericFactory<AcceleratorTool>
using namespace KBabel;
-AcceleratorTool::AcceleratorTool( TQObject* tqparent, const char* name, const TQStringList & )
- : KDataTool( tqparent, name ), _cache_origin( 0 )
+AcceleratorTool::AcceleratorTool( TQObject* parent, const char* name, const TQStringList & )
+ : KDataTool( parent, name ), _cache_origin( 0 )
{
// bogus translation just for allowing the translation
i18n("what check found errors","accelerator");
diff --git a/kbabel/datatools/accelerators/main.h b/kbabel/datatools/accelerators/main.h
index df1617cf..2660ac8e 100644
--- a/kbabel/datatools/accelerators/main.h
+++ b/kbabel/datatools/accelerators/main.h
@@ -45,7 +45,7 @@ class AcceleratorTool : public KDataTool
TQ_OBJECT
public:
- AcceleratorTool( TQObject* tqparent, const char* name, const TQStringList & );
+ AcceleratorTool( TQObject* parent, const char* name, const TQStringList & );
virtual bool run( const TQString& command, void* data, const TQString& datatype, const TQString& mimetype);
private:
diff --git a/kbabel/datatools/arguments/main.cc b/kbabel/datatools/arguments/main.cc
index 43ae38b4..f12bfac8 100644
--- a/kbabel/datatools/arguments/main.cc
+++ b/kbabel/datatools/arguments/main.cc
@@ -51,8 +51,8 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_argstool, KGenericFactory<ArgumentTool> ( "kb
using namespace KBabel;
-ArgumentTool::ArgumentTool( TQObject* tqparent, const char* name, const TQStringList & )
- : KDataTool( tqparent, name ), _cache_origin( 0 )
+ArgumentTool::ArgumentTool( TQObject* parent, const char* name, const TQStringList & )
+ : KDataTool( parent, name ), _cache_origin( 0 )
{
i18n( "what check found errors","arguments");
}
diff --git a/kbabel/datatools/arguments/main.h b/kbabel/datatools/arguments/main.h
index 1831ea33..ae2d7fd5 100644
--- a/kbabel/datatools/arguments/main.h
+++ b/kbabel/datatools/arguments/main.h
@@ -45,7 +45,7 @@ class ArgumentTool : public KDataTool
TQ_OBJECT
public:
- ArgumentTool( TQObject* tqparent, const char* name, const TQStringList & );
+ ArgumentTool( TQObject* parent, const char* name, const TQStringList & );
virtual bool run( const TQString& command, void* data, const TQString& datatype, const TQString& mimetype);
private:
KBabel::Project::Ptr _cache_origin;
diff --git a/kbabel/datatools/context/main.cc b/kbabel/datatools/context/main.cc
index 5a17e8c3..95736dbd 100644
--- a/kbabel/datatools/context/main.cc
+++ b/kbabel/datatools/context/main.cc
@@ -52,8 +52,8 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_contexttool, KGenericFactory<ContextTool> ( "
using namespace KBabel;
-ContextTool::ContextTool( TQObject* tqparent, const char* name, const TQStringList & )
- : KDataTool( tqparent, name ), _cache_origin( 0 )
+ContextTool::ContextTool( TQObject* parent, const char* name, const TQStringList & )
+ : KDataTool( parent, name ), _cache_origin( 0 )
{
i18n("what check found errors","context info");
}
diff --git a/kbabel/datatools/context/main.h b/kbabel/datatools/context/main.h
index c85d8d83..e71975e5 100644
--- a/kbabel/datatools/context/main.h
+++ b/kbabel/datatools/context/main.h
@@ -43,7 +43,7 @@ class ContextTool : public KDataTool
TQ_OBJECT
public:
- ContextTool( TQObject* tqparent, const char* name, const TQStringList & );
+ ContextTool( TQObject* parent, const char* name, const TQStringList & );
virtual bool run( const TQString& command, void* data, const TQString& datatype, const TQString& mimetype);
private:
KBabel::Project::Ptr _cache_origin;
diff --git a/kbabel/datatools/equations/main.cc b/kbabel/datatools/equations/main.cc
index cb1e1f7b..5abd7fed 100644
--- a/kbabel/datatools/equations/main.cc
+++ b/kbabel/datatools/equations/main.cc
@@ -52,8 +52,8 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_equationstool, KGenericFactory<EquationsTool>
using namespace KBabel;
-EquationsTool::EquationsTool( TQObject* tqparent, const char* name, const TQStringList & )
- : KDataTool( tqparent, name ), _equation("^[a-zA-Z0-9]+=.+")
+EquationsTool::EquationsTool( TQObject* parent, const char* name, const TQStringList & )
+ : KDataTool( parent, name ), _equation("^[a-zA-Z0-9]+=.+")
{
i18n("what check found errors","equations");
}
diff --git a/kbabel/datatools/equations/main.h b/kbabel/datatools/equations/main.h
index 11adddaf..16eff40d 100644
--- a/kbabel/datatools/equations/main.h
+++ b/kbabel/datatools/equations/main.h
@@ -42,7 +42,7 @@ class EquationsTool : public KDataTool
TQ_OBJECT
public:
- EquationsTool( TQObject* tqparent, const char* name, const TQStringList & );
+ EquationsTool( TQObject* parent, const char* name, const TQStringList & );
virtual bool run( const TQString& command, void* data, const TQString& datatype, const TQString& mimetype);
private:
TQRegExp _equation;
diff --git a/kbabel/datatools/length/main.cc b/kbabel/datatools/length/main.cc
index 706cf10c..be809ffb 100644
--- a/kbabel/datatools/length/main.cc
+++ b/kbabel/datatools/length/main.cc
@@ -55,8 +55,8 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_lengthtool, KGenericFactory<LengthTool> ( "kb
using namespace KBabel;
-LengthTool::LengthTool( TQObject* tqparent, const char* name, const TQStringList & )
- : KDataTool( tqparent, name ), _cache_origin( 0 )
+LengthTool::LengthTool( TQObject* parent, const char* name, const TQStringList & )
+ : KDataTool( parent, name ), _cache_origin( 0 )
{
i18n("which check found errors","translation has inconsistent length");
}
diff --git a/kbabel/datatools/length/main.h b/kbabel/datatools/length/main.h
index cff49df8..7b3bc8cc 100644
--- a/kbabel/datatools/length/main.h
+++ b/kbabel/datatools/length/main.h
@@ -44,7 +44,7 @@ class LengthTool : public KDataTool
TQ_OBJECT
public:
- LengthTool( TQObject* tqparent, const char* name, const TQStringList & );
+ LengthTool( TQObject* parent, const char* name, const TQStringList & );
virtual bool run( const TQString& command, void* data, const TQString& datatype, const TQString& mimetype);
private:
KBabel::Project::Ptr _cache_origin;
diff --git a/kbabel/datatools/not-translated/main.cc b/kbabel/datatools/not-translated/main.cc
index 9159c011..d14530b6 100644
--- a/kbabel/datatools/not-translated/main.cc
+++ b/kbabel/datatools/not-translated/main.cc
@@ -54,8 +54,8 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_nottranslatedtool, KGenericFactory<NotTransla
using namespace KBabel;
-NotTranslatedTool::NotTranslatedTool( TQObject* tqparent, const char* name, const TQStringList & )
- : KDataTool( tqparent, name ) , _cache_origin( 0 )
+NotTranslatedTool::NotTranslatedTool( TQObject* parent, const char* name, const TQStringList & )
+ : KDataTool( parent, name ) , _cache_origin( 0 )
{
i18n("which check found errors","English text in translation");
}
diff --git a/kbabel/datatools/not-translated/main.h b/kbabel/datatools/not-translated/main.h
index a9cba848..a2867df1 100644
--- a/kbabel/datatools/not-translated/main.h
+++ b/kbabel/datatools/not-translated/main.h
@@ -44,7 +44,7 @@ class NotTranslatedTool : public KDataTool
TQ_OBJECT
public:
- NotTranslatedTool( TQObject* tqparent, const char* name, const TQStringList & );
+ NotTranslatedTool( TQObject* parent, const char* name, const TQStringList & );
virtual bool run( const TQString& command, void* data, const TQString& datatype, const TQString& mimetype);
private:
diff --git a/kbabel/datatools/pluralforms/main.cc b/kbabel/datatools/pluralforms/main.cc
index 5bc9e904..34782cfe 100644
--- a/kbabel/datatools/pluralforms/main.cc
+++ b/kbabel/datatools/pluralforms/main.cc
@@ -53,8 +53,8 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_pluraltool, KGenericFactory<PluralsTool> ( "k
using namespace KBabel;
-PluralsTool::PluralsTool( TQObject* tqparent, const char* name, const TQStringList & )
- : KDataTool( tqparent, name ), _cache_origin( 0 ), _neededForms(-1)
+PluralsTool::PluralsTool( TQObject* parent, const char* name, const TQStringList & )
+ : KDataTool( parent, name ), _cache_origin( 0 ), _neededForms(-1)
{
i18n("what check found errors", "plural forms");
}
diff --git a/kbabel/datatools/pluralforms/main.h b/kbabel/datatools/pluralforms/main.h
index ee6617dd..88cfe7b5 100644
--- a/kbabel/datatools/pluralforms/main.h
+++ b/kbabel/datatools/pluralforms/main.h
@@ -43,7 +43,7 @@ class PluralsTool : public KDataTool
TQ_OBJECT
public:
- PluralsTool( TQObject* tqparent, const char* name, const TQStringList & );
+ PluralsTool( TQObject* parent, const char* name, const TQStringList & );
virtual bool run( const TQString& command, void* data, const TQString& datatype, const TQString& mimetype);
private:
KBabel::Project::Ptr _cache_origin;
diff --git a/kbabel/datatools/punctuation/main.cc b/kbabel/datatools/punctuation/main.cc
index 3b2bc35e..80f14c53 100644
--- a/kbabel/datatools/punctuation/main.cc
+++ b/kbabel/datatools/punctuation/main.cc
@@ -51,8 +51,8 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_punctuationtool, KGenericFactory<PunctuationT
using namespace KBabel;
-PunctuationTool::PunctuationTool( TQObject* tqparent, const char* name, const TQStringList & )
- : KDataTool( tqparent, name )
+PunctuationTool::PunctuationTool( TQObject* parent, const char* name, const TQStringList & )
+ : KDataTool( parent, name )
{
// bogus translation just for allowing the translation
i18n("what check found errors","punctuation");
diff --git a/kbabel/datatools/punctuation/main.h b/kbabel/datatools/punctuation/main.h
index 6d58783e..6ccbdf1f 100644
--- a/kbabel/datatools/punctuation/main.h
+++ b/kbabel/datatools/punctuation/main.h
@@ -41,7 +41,7 @@ class PunctuationTool : public KDataTool
TQ_OBJECT
public:
- PunctuationTool( TQObject* tqparent, const char* name, const TQStringList & );
+ PunctuationTool( TQObject* parent, const char* name, const TQStringList & );
virtual bool run( const TQString& command, void* data, const TQString& datatype, const TQString& mimetype);
};
diff --git a/kbabel/datatools/regexp/main.cc b/kbabel/datatools/regexp/main.cc
index 132a8c21..3a40eac1 100644
--- a/kbabel/datatools/regexp/main.cc
+++ b/kbabel/datatools/regexp/main.cc
@@ -49,13 +49,13 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_regexptool, KGenericFactory<RegExpTool> ( "kb
using namespace KBabel;
-RegExpTool::RegExpTool( TQObject* tqparent, const char* name, const TQStringList & )
- : KDataTool( tqparent, name )
+RegExpTool::RegExpTool( TQObject* parent, const char* name, const TQStringList & )
+ : KDataTool( parent, name )
{
i18n("which check found errors","translation has inconsistent length");
loadExpressions();
if ( ! _error.isNull() )
- KMessageBox::error( (TQWidget*)tqparent, i18n( "Error loading data (%1)" ).tqarg( _error ) );
+ KMessageBox::error( (TQWidget*)parent, i18n( "Error loading data (%1)" ).tqarg( _error ) );
}
bool RegExpTool::run( const TQString& command, void* data, const TQString& datatype, const TQString& mimetype )
diff --git a/kbabel/datatools/regexp/main.h b/kbabel/datatools/regexp/main.h
index c28c37d0..06c1945b 100644
--- a/kbabel/datatools/regexp/main.h
+++ b/kbabel/datatools/regexp/main.h
@@ -60,7 +60,7 @@ class RegExpTool : public KDataTool
TQ_OBJECT
public:
- RegExpTool( TQObject* tqparent, const char* name, const TQStringList & );
+ RegExpTool( TQObject* parent, const char* name, const TQStringList & );
virtual bool run( const TQString& command, void* data, const TQString& datatype, const TQString& mimetype);
private:
diff --git a/kbabel/datatools/setfuzzy/main.cc b/kbabel/datatools/setfuzzy/main.cc
index 192dc4f6..86dc332d 100644
--- a/kbabel/datatools/setfuzzy/main.cc
+++ b/kbabel/datatools/setfuzzy/main.cc
@@ -49,8 +49,8 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_setfuzzytool, KGenericFactory<SetFuzzyTool> (
using namespace KBabel;
-SetFuzzyTool::SetFuzzyTool( TQObject* tqparent, const char* name, const TQStringList & )
- : KDataTool( tqparent, name )
+SetFuzzyTool::SetFuzzyTool( TQObject* parent, const char* name, const TQStringList & )
+ : KDataTool( parent, name )
{
}
diff --git a/kbabel/datatools/setfuzzy/main.h b/kbabel/datatools/setfuzzy/main.h
index 729abd1a..966eadc8 100644
--- a/kbabel/datatools/setfuzzy/main.h
+++ b/kbabel/datatools/setfuzzy/main.h
@@ -41,7 +41,7 @@ class SetFuzzyTool : public KDataTool
TQ_OBJECT
public:
- SetFuzzyTool( TQObject* tqparent, const char* name, const TQStringList & );
+ SetFuzzyTool( TQObject* parent, const char* name, const TQStringList & );
virtual bool run( const TQString& command, void* data, const TQString& datatype, const TQString& mimetype);
};
diff --git a/kbabel/datatools/whitespace/main.cc b/kbabel/datatools/whitespace/main.cc
index 68548501..1b4eacf8 100644
--- a/kbabel/datatools/whitespace/main.cc
+++ b/kbabel/datatools/whitespace/main.cc
@@ -54,8 +54,8 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_whitespacetool, KGenericFactory<WhitespaceToo
using namespace KBabel;
-WhitespaceTool::WhitespaceTool( TQObject* tqparent, const char* name, const TQStringList & )
- : KDataTool( tqparent, name ), _cache_origin( 0 ), _equation("^[a-zA-Z0-9]+=")
+WhitespaceTool::WhitespaceTool( TQObject* parent, const char* name, const TQStringList & )
+ : KDataTool( parent, name ), _cache_origin( 0 ), _equation("^[a-zA-Z0-9]+=")
{
i18n("which check found errors","whitespace only translation");
}
diff --git a/kbabel/datatools/whitespace/main.h b/kbabel/datatools/whitespace/main.h
index 9c6c4f24..f9d2697a 100644
--- a/kbabel/datatools/whitespace/main.h
+++ b/kbabel/datatools/whitespace/main.h
@@ -45,7 +45,7 @@ class WhitespaceTool : public KDataTool
TQ_OBJECT
public:
- WhitespaceTool( TQObject* tqparent, const char* name, const TQStringList & );
+ WhitespaceTool( TQObject* parent, const char* name, const TQStringList & );
virtual bool run( const TQString& command, void* data, const TQString& datatype, const TQString& mimetype);
private:
KBabel::Project::Ptr _cache_origin;
diff --git a/kbabel/datatools/xml/main.cc b/kbabel/datatools/xml/main.cc
index 229ce734..da80d7d1 100644
--- a/kbabel/datatools/xml/main.cc
+++ b/kbabel/datatools/xml/main.cc
@@ -54,8 +54,8 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_xmltool, KGenericFactory<XMLTool> ( "kbabelda
using namespace KBabel;
-XMLTool::XMLTool( TQObject* tqparent, const char* name, const TQStringList & )
- : KDataTool( tqparent, name ), _cache_origin( 0 )
+XMLTool::XMLTool( TQObject* parent, const char* name, const TQStringList & )
+ : KDataTool( parent, name ), _cache_origin( 0 )
{
i18n( "what check found errors", "XML tags" );
}
diff --git a/kbabel/datatools/xml/main.h b/kbabel/datatools/xml/main.h
index 1b983475..783105fd 100644
--- a/kbabel/datatools/xml/main.h
+++ b/kbabel/datatools/xml/main.h
@@ -44,7 +44,7 @@ class XMLTool : public KDataTool
TQ_OBJECT
public:
- XMLTool( TQObject* tqparent, const char* name, const TQStringList & );
+ XMLTool( TQObject* parent, const char* name, const TQStringList & );
virtual bool run( const TQString& command, void* data, const TQString& datatype, const TQString& mimetype);
private:
bool isFullyCompliant( const TQString& text);
diff --git a/kbabel/filters/gettext/gettextexport.cpp b/kbabel/filters/gettext/gettextexport.cpp
index cb7a3b24..31cca29f 100644
--- a/kbabel/filters/gettext/gettextexport.cpp
+++ b/kbabel/filters/gettext/gettextexport.cpp
@@ -51,8 +51,8 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_gettextexport, KGenericFactory<GettextExportP
using namespace KBabel;
-GettextExportPlugin::GettextExportPlugin(TQObject* tqparent, const char* name, const TQStringList &) :
- CatalogExportPlugin(tqparent,name), m_wrapWidth( -1 )
+GettextExportPlugin::GettextExportPlugin(TQObject* parent, const char* name, const TQStringList &) :
+ CatalogExportPlugin(parent,name), m_wrapWidth( -1 )
{
}
diff --git a/kbabel/filters/gettext/gettextexport.h b/kbabel/filters/gettext/gettextexport.h
index cfe46ed0..695105d2 100644
--- a/kbabel/filters/gettext/gettextexport.h
+++ b/kbabel/filters/gettext/gettextexport.h
@@ -53,7 +53,7 @@ class TQTextCodec;
class GettextExportPlugin: public KBabel::CatalogExportPlugin
{
public:
- GettextExportPlugin(TQObject* tqparent, const char* name, const TQStringList &);
+ GettextExportPlugin(TQObject* parent, const char* name, const TQStringList &);
virtual KBabel::ConversiontqStatus save(const TQString& file, const TQString& mimetype, const KBabel::Catalog* catalog);
private:
diff --git a/kbabel/filters/gettext/gettextimport.cpp b/kbabel/filters/gettext/gettextimport.cpp
index f66516cc..a48e327b 100644
--- a/kbabel/filters/gettext/gettextimport.cpp
+++ b/kbabel/filters/gettext/gettextimport.cpp
@@ -53,7 +53,7 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_gettextimport, KGenericFactory<GettextImportP
using namespace KBabel;
-GettextImportPlugin::GettextImportPlugin(TQObject* tqparent, const char* name, const TQStringList &) : CatalogImportPlugin(tqparent,name)
+GettextImportPlugin::GettextImportPlugin(TQObject* parent, const char* name, const TQStringList &) : CatalogImportPlugin(parent,name)
{
}
diff --git a/kbabel/filters/gettext/gettextimport.h b/kbabel/filters/gettext/gettextimport.h
index 5549168b..fa20aa62 100644
--- a/kbabel/filters/gettext/gettextimport.h
+++ b/kbabel/filters/gettext/gettextimport.h
@@ -49,7 +49,7 @@ class TQTextCodec;
class GettextImportPlugin: public KBabel::CatalogImportPlugin
{
public:
- GettextImportPlugin(TQObject* tqparent, const char* name, const TQStringList &);
+ GettextImportPlugin(TQObject* parent, const char* name, const TQStringList &);
virtual KBabel::ConversiontqStatus load(const TQString& file, const TQString& mimetype);
virtual const TQString id() { return "GNU gettext"; }
diff --git a/kbabel/filters/linguist/linguistexport.cpp b/kbabel/filters/linguist/linguistexport.cpp
index 072ecde8..10fc37e2 100644
--- a/kbabel/filters/linguist/linguistexport.cpp
+++ b/kbabel/filters/linguist/linguistexport.cpp
@@ -53,8 +53,8 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_linguistexport, KGenericFactory<LinguistExpor
using namespace KBabel;
-LinguistExportPlugin::LinguistExportPlugin( TQObject * tqparent, const char * name, const TQStringList& )
- : CatalogExportPlugin( tqparent, name )
+LinguistExportPlugin::LinguistExportPlugin( TQObject * parent, const char * name, const TQStringList& )
+ : CatalogExportPlugin( parent, name )
{
}
diff --git a/kbabel/filters/linguist/linguistexport.h b/kbabel/filters/linguist/linguistexport.h
index f4ed3240..d468fce4 100644
--- a/kbabel/filters/linguist/linguistexport.h
+++ b/kbabel/filters/linguist/linguistexport.h
@@ -51,7 +51,7 @@ class Catalog;
class LinguistExportPlugin : public KBabel::CatalogExportPlugin
{
public:
- LinguistExportPlugin( TQObject * tqparent, const char * name, const TQStringList& );
+ LinguistExportPlugin( TQObject * parent, const char * name, const TQStringList& );
virtual KBabel::ConversiontqStatus save( const TQString& filename, const TQString& mimetype, const KBabel::Catalog * catalog );
private:
diff --git a/kbabel/filters/linguist/linguistimport.cpp b/kbabel/filters/linguist/linguistimport.cpp
index f4e1102f..6d8dda81 100644
--- a/kbabel/filters/linguist/linguistimport.cpp
+++ b/kbabel/filters/linguist/linguistimport.cpp
@@ -55,8 +55,8 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_linguistimport, KGenericFactory<LinguistImpor
using namespace KBabel;
-LinguistImportPlugin::LinguistImportPlugin( TQObject * tqparent, const char * name, const TQStringList& )
- : CatalogImportPlugin( tqparent, name )
+LinguistImportPlugin::LinguistImportPlugin( TQObject * parent, const char * name, const TQStringList& )
+ : CatalogImportPlugin( parent, name )
{
}
diff --git a/kbabel/filters/linguist/linguistimport.h b/kbabel/filters/linguist/linguistimport.h
index 3f6d8051..b0bc51d9 100644
--- a/kbabel/filters/linguist/linguistimport.h
+++ b/kbabel/filters/linguist/linguistimport.h
@@ -50,7 +50,7 @@ class TQStringList;
class LinguistImportPlugin : public KBabel::CatalogImportPlugin
{
public:
- LinguistImportPlugin( TQObject * tqparent, const char * name, const TQStringList& );
+ LinguistImportPlugin( TQObject * parent, const char * name, const TQStringList& );
virtual KBabel::ConversiontqStatus load( const TQString& filename, const TQString& mimetype );
virtual const TQString id( ) { return "TQt translation source"; }
diff --git a/kbabel/filters/xliff/xliffexport.cpp b/kbabel/filters/xliff/xliffexport.cpp
index 187a1dda..c633e8b1 100644
--- a/kbabel/filters/xliff/xliffexport.cpp
+++ b/kbabel/filters/xliff/xliffexport.cpp
@@ -53,8 +53,8 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_xliffexport, KGenericFactory<XLIFFExportPlugi
using namespace KBabel;
-XLIFFExportPlugin::XLIFFExportPlugin( TQObject * tqparent, const char * name, const TQStringList& )
- : CatalogExportPlugin( tqparent, name )
+XLIFFExportPlugin::XLIFFExportPlugin( TQObject * parent, const char * name, const TQStringList& )
+ : CatalogExportPlugin( parent, name )
{
}
diff --git a/kbabel/filters/xliff/xliffexport.h b/kbabel/filters/xliff/xliffexport.h
index 71253133..eccc311c 100644
--- a/kbabel/filters/xliff/xliffexport.h
+++ b/kbabel/filters/xliff/xliffexport.h
@@ -51,7 +51,7 @@ class Catalog;
class XLIFFExportPlugin : public KBabel::CatalogExportPlugin
{
public:
- XLIFFExportPlugin( TQObject * tqparent, const char * name, const TQStringList& );
+ XLIFFExportPlugin( TQObject * parent, const char * name, const TQStringList& );
virtual KBabel::ConversiontqStatus save( const TQString& filename, const TQString& mimetype, const KBabel::Catalog * catalog );
private:
diff --git a/kbabel/filters/xliff/xliffimport.cpp b/kbabel/filters/xliff/xliffimport.cpp
index 3bf16e19..246b8c24 100644
--- a/kbabel/filters/xliff/xliffimport.cpp
+++ b/kbabel/filters/xliff/xliffimport.cpp
@@ -68,8 +68,8 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_xliffimport, KGenericFactory<XLIFFImportPlugi
using namespace KBabel;
-XLIFFImportPlugin::XLIFFImportPlugin( TQObject * tqparent, const char * name, const TQStringList& )
- : CatalogImportPlugin( tqparent, name )
+XLIFFImportPlugin::XLIFFImportPlugin( TQObject * parent, const char * name, const TQStringList& )
+ : CatalogImportPlugin( parent, name )
{
}
diff --git a/kbabel/filters/xliff/xliffimport.h b/kbabel/filters/xliff/xliffimport.h
index a18a9a82..a32a686b 100644
--- a/kbabel/filters/xliff/xliffimport.h
+++ b/kbabel/filters/xliff/xliffimport.h
@@ -50,7 +50,7 @@ class TQStringList;
class XLIFFImportPlugin : public KBabel::CatalogImportPlugin
{
public:
- XLIFFImportPlugin( TQObject * tqparent, const char * name, const TQStringList& );
+ XLIFFImportPlugin( TQObject * parent, const char * name, const TQStringList& );
virtual KBabel::ConversiontqStatus load( const TQString& filename, const TQString& mimetype );
virtual const TQString id( ) { return "XLIFF 1.1"; }
diff --git a/kbabel/kbabel/charselectview.cpp b/kbabel/kbabel/charselectview.cpp
index f174c3ed..9a19e5ec 100644
--- a/kbabel/kbabel/charselectview.cpp
+++ b/kbabel/kbabel/charselectview.cpp
@@ -49,8 +49,8 @@
using namespace KBabel;
-CharacterSelectorView::CharacterSelectorView(KBCatalog* catalog,TQWidget *tqparent, Project::Ptr project)
- : KBCatalogView(catalog,tqparent,project)
+CharacterSelectorView::CharacterSelectorView(KBCatalog* catalog,TQWidget *parent, Project::Ptr project)
+ : KBCatalogView(catalog,parent,project)
{
TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
tqlayout->setResizeMode( TQLayout::Minimum );
diff --git a/kbabel/kbabel/charselectview.h b/kbabel/kbabel/charselectview.h
index 4d0ee3a6..49113331 100644
--- a/kbabel/kbabel/charselectview.h
+++ b/kbabel/kbabel/charselectview.h
@@ -46,7 +46,7 @@ public:
/**
* Default constructor
*/
- CharacterSelectorView(KBCatalog* catalog,TQWidget *tqparent, KBabel::Project::Ptr project);
+ CharacterSelectorView(KBCatalog* catalog,TQWidget *parent, KBabel::Project::Ptr project);
void saveSettings(KConfig* config);
void restoreSettings(KConfig* config);
diff --git a/kbabel/kbabel/commentview.cpp b/kbabel/kbabel/commentview.cpp
index 324c4d32..44a049dc 100644
--- a/kbabel/kbabel/commentview.cpp
+++ b/kbabel/kbabel/commentview.cpp
@@ -62,8 +62,8 @@
using namespace KBabel;
-CommentView::CommentView(KBCatalog* catalog,TQWidget *tqparent, Project::Ptr project)
- : KBCatalogView(catalog,tqparent, project)
+CommentView::CommentView(KBCatalog* catalog,TQWidget *parent, Project::Ptr project)
+ : KBCatalogView(catalog,parent, project)
{
setAcceptDrops(true);
diff --git a/kbabel/kbabel/commentview.h b/kbabel/kbabel/commentview.h
index f00d1241..0c38b37a 100644
--- a/kbabel/kbabel/commentview.h
+++ b/kbabel/kbabel/commentview.h
@@ -52,7 +52,7 @@ public:
/**
* Default constructor
*/
- CommentView(KBCatalog* catalog,TQWidget *tqparent, KBabel::Project::Ptr project);
+ CommentView(KBCatalog* catalog,TQWidget *parent, KBabel::Project::Ptr project);
/**
* this is called from the catalog when updating his views.
diff --git a/kbabel/kbabel/contextview.cpp b/kbabel/kbabel/contextview.cpp
index 94bbf000..11d8434a 100644
--- a/kbabel/kbabel/contextview.cpp
+++ b/kbabel/kbabel/contextview.cpp
@@ -47,8 +47,8 @@
using namespace KBabel;
-ContextView::ContextView(KBCatalog* catalog,TQWidget *tqparent, Project::Ptr project)
- : KBCatalogView(catalog,tqparent,project)
+ContextView::ContextView(KBCatalog* catalog,TQWidget *parent, Project::Ptr project)
+ : KBCatalogView(catalog,parent,project)
{
TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
tqlayout->setResizeMode( TQLayout::Minimum );
diff --git a/kbabel/kbabel/contextview.h b/kbabel/kbabel/contextview.h
index 9f0b2405..8524faa9 100644
--- a/kbabel/kbabel/contextview.h
+++ b/kbabel/kbabel/contextview.h
@@ -45,7 +45,7 @@ public:
/**
* Default constructor
*/
- ContextView(KBCatalog* catalog,TQWidget *tqparent, KBabel::Project::Ptr project);
+ ContextView(KBCatalog* catalog,TQWidget *parent, KBabel::Project::Ptr project);
public slots:
virtual void updateView();
diff --git a/kbabel/kbabel/errorlistview.cpp b/kbabel/kbabel/errorlistview.cpp
index 74deba91..719798d3 100644
--- a/kbabel/kbabel/errorlistview.cpp
+++ b/kbabel/kbabel/errorlistview.cpp
@@ -47,8 +47,8 @@
using namespace KBabel;
-ErrorListView::ErrorListView(KBCatalog* catalog,TQWidget *tqparent, Project::Ptr project)
- : KBCatalogView(catalog,tqparent,project)
+ErrorListView::ErrorListView(KBCatalog* catalog,TQWidget *parent, Project::Ptr project)
+ : KBCatalogView(catalog,parent,project)
{
TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
tqlayout->setResizeMode( TQLayout::Minimum );
diff --git a/kbabel/kbabel/errorlistview.h b/kbabel/kbabel/errorlistview.h
index 022d94c1..9d812b04 100644
--- a/kbabel/kbabel/errorlistview.h
+++ b/kbabel/kbabel/errorlistview.h
@@ -44,7 +44,7 @@ public:
/**
* Default constructor
*/
- ErrorListView(KBCatalog* catalog,TQWidget *tqparent, KBabel::Project::Ptr project);
+ ErrorListView(KBCatalog* catalog,TQWidget *parent, KBabel::Project::Ptr project);
public slots:
virtual void updateView();
diff --git a/kbabel/kbabel/gotodialog.cpp b/kbabel/kbabel/gotodialog.cpp
index 9bec7bf7..a6fca91e 100644
--- a/kbabel/kbabel/gotodialog.cpp
+++ b/kbabel/kbabel/gotodialog.cpp
@@ -37,8 +37,8 @@
#include "gotodialog.h"
-GotoDialog::GotoDialog(int max,TQWidget* tqparent)
- : KDialogBase(tqparent,0,true,i18n("Go to Entry"),Ok|Cancel)
+GotoDialog::GotoDialog(int max,TQWidget* parent)
+ : KDialogBase(parent,0,true,i18n("Go to Entry"),Ok|Cancel)
{
TQGroupBox* box=new TQGroupBox(1,Qt::Horizontal,i18n("Go to Entry"),this);
_spinBox= new KIntSpinBox(1,max,1,1,10,box);
diff --git a/kbabel/kbabel/gotodialog.h b/kbabel/kbabel/gotodialog.h
index afd9b250..b1022967 100644
--- a/kbabel/kbabel/gotodialog.h
+++ b/kbabel/kbabel/gotodialog.h
@@ -45,7 +45,7 @@ class KIntSpinBox;
class GotoDialog : public KDialogBase
{
public:
- GotoDialog(int max, TQWidget* tqparent);
+ GotoDialog(int max, TQWidget* parent);
virtual ~GotoDialog();
/** reimplemented to select contents when shown*/
diff --git a/kbabel/kbabel/hidingmsgedit.cpp b/kbabel/kbabel/hidingmsgedit.cpp
index d1458fb4..3d0b128a 100644
--- a/kbabel/kbabel/hidingmsgedit.cpp
+++ b/kbabel/kbabel/hidingmsgedit.cpp
@@ -41,8 +41,8 @@
using namespace KBabel;
-HidingMsgEdit::HidingMsgEdit(uint numberOfPlurals, TQWidget* eventFilter, KSpell* spell, TQWidget *tqparent, const char *name ) :
- TQWidgetStack(tqparent,name)
+HidingMsgEdit::HidingMsgEdit(uint numberOfPlurals, TQWidget* eventFilter, KSpell* spell, TQWidget *parent, const char *name ) :
+ TQWidgetStack(parent,name)
, _singleEdit(0)
, _multipleEdit(0)
, _eventFilter(eventFilter)
diff --git a/kbabel/kbabel/hidingmsgedit.h b/kbabel/kbabel/hidingmsgedit.h
index 65c65d40..9aed746d 100644
--- a/kbabel/kbabel/hidingmsgedit.h
+++ b/kbabel/kbabel/hidingmsgedit.h
@@ -53,7 +53,7 @@ class HidingMsgEdit : public TQWidgetStack {
Q_OBJECT
TQ_OBJECT
public:
- HidingMsgEdit(uint numberOfPlurals, TQWidget* eventFilter=0, KSpell* spell=0, TQWidget *tqparent=0, const char *name=0);
+ HidingMsgEdit(uint numberOfPlurals, TQWidget* eventFilter=0, KSpell* spell=0, TQWidget *parent=0, const char *name=0);
~HidingMsgEdit();
void setNumberOfPlurals(uint numberOfPlurals);
diff --git a/kbabel/kbabel/kbabel.cpp b/kbabel/kbabel/kbabel.cpp
index 64733fa1..f7607534 100644
--- a/kbabel/kbabel/kbabel.cpp
+++ b/kbabel/kbabel/kbabel.cpp
@@ -113,7 +113,7 @@ TQPtrList<KBabelPreferences> KBabelMW::prefDialogs;
class MyKProgress: public KProgress
{
public:
- MyKProgress( TQWidget *tqparent, const char *name ) : KProgress( tqparent, name )
+ MyKProgress( TQWidget *parent, const char *name ) : KProgress( parent, name )
{
tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred );
}
@@ -1614,10 +1614,10 @@ KBabelMW *KBabelMW::winForURL(const KURL& url, TQString project)
KBabelView *v = KBabelView::viewForURL(url,project);
if(v)
{
- TQObject *p = v->tqparent();
+ TQObject *p = v->parent();
while(p && !p->inherits("KBabelMW"))
{
- p = p->tqparent();
+ p = p->parent();
}
if(p)
@@ -1634,10 +1634,10 @@ KBabelMW *KBabelMW::emptyWin(TQString project)
KBabelView *v = KBabelView::emptyView(project);
if(v)
{
- TQObject *p = v->tqparent();
+ TQObject *p = v->parent();
while(p && !p->inherits("KBabelMW"))
{
- p = p->tqparent();
+ p = p->parent();
}
if(p)
diff --git a/kbabel/kbabel/kbabelsplash.cpp b/kbabel/kbabel/kbabelsplash.cpp
index e5dcf563..785943d8 100644
--- a/kbabel/kbabel/kbabelsplash.cpp
+++ b/kbabel/kbabel/kbabelsplash.cpp
@@ -40,8 +40,8 @@
KBabelSplash* KBabelSplash::instance = 0;
-KBabelSplash::KBabelSplash( TQWidget* tqparent, const char* name )
- : TQVBox( tqparent, name, WType_Dialog|WShowModal|WStyle_Customize|WStyle_NoBorder|WDestructiveClose )
+KBabelSplash::KBabelSplash( TQWidget* parent, const char* name )
+ : TQVBox( parent, name, WType_Dialog|WShowModal|WStyle_Customize|WStyle_NoBorder|WDestructiveClose )
{
setMargin( 0 );
setSpacing( 0 );
diff --git a/kbabel/kbabel/kbabelsplash.h b/kbabel/kbabel/kbabelsplash.h
index 24f2865a..b799029f 100644
--- a/kbabel/kbabel/kbabelsplash.h
+++ b/kbabel/kbabel/kbabelsplash.h
@@ -44,7 +44,7 @@ Q_OBJECT
TQ_OBJECT
public:
- KBabelSplash( TQWidget* tqparent = 0, const char* name = 0 );
+ KBabelSplash( TQWidget* parent = 0, const char* name = 0 );
~KBabelSplash() { instance = 0; }
static KBabelSplash* instance;
diff --git a/kbabel/kbabel/kbabelview.cpp b/kbabel/kbabel/kbabelview.cpp
index 1f9aab72..8c5746b0 100644
--- a/kbabel/kbabel/kbabelview.cpp
+++ b/kbabel/kbabel/kbabelview.cpp
@@ -115,11 +115,11 @@ using namespace KBabel;
TQPtrList<KBabelView> *KBabelView::viewList = 0;
-KBabelView::KBabelView(KBCatalog* catalog,KBabelMW *tqparent, Project::Ptr project)
- : TQWidget(tqparent)
+KBabelView::KBabelView(KBCatalog* catalog,KBabelMW *parent, Project::Ptr project)
+ : TQWidget(parent)
, _redirectedBackSearch (false)
, _project (project)
- , m_mainwindow (tqparent)
+ , m_mainwindow (parent)
, m_sourceview (0)
{
if(!viewList)
diff --git a/kbabel/kbabel/kbabelview.h b/kbabel/kbabel/kbabelview.h
index a6b8e252..3398457d 100644
--- a/kbabel/kbabel/kbabelview.h
+++ b/kbabel/kbabel/kbabelview.h
@@ -99,7 +99,7 @@ public:
* Default constructor
* @param buildLeds flag, if status leds should be created in editor
*/
- KBabelView(KBCatalog* catalog,KBabelMW *tqparent, KBabel::Project::Ptr project);
+ KBabelView(KBCatalog* catalog,KBabelMW *parent, KBabel::Project::Ptr project);
/**
* Destructor
diff --git a/kbabel/kbabel/kbbookmarkhandler.cpp b/kbabel/kbabel/kbbookmarkhandler.cpp
index 3f9b70b8..d9f080cb 100644
--- a/kbabel/kbabel/kbbookmarkhandler.cpp
+++ b/kbabel/kbabel/kbbookmarkhandler.cpp
@@ -48,7 +48,7 @@ KBabelBookmark::KBabelBookmark(int msgindex, TQString msgtext)
}
// insert one '&' before every consecutive group of ampersands to keep the
- // first of these from acting either as accelerator or tqmask in the menu
+ // first of these from acting either as accelerator or mask in the menu
TQRegExp rx("&+");
int pos = msgtext.find(rx);
while (pos >= 0) {
diff --git a/kbabel/kbabel/kbcatalog.cpp b/kbabel/kbabel/kbcatalog.cpp
index 933df9de..5f3fc9fb 100644
--- a/kbabel/kbabel/kbcatalog.cpp
+++ b/kbabel/kbabel/kbcatalog.cpp
@@ -35,8 +35,8 @@
#include "headereditor.h"
-KBCatalog::KBCatalog(TQString configFile, TQObject* tqparent, const char* name)
- : KBabel::Catalog(tqparent,name,configFile)
+KBCatalog::KBCatalog(TQString configFile, TQObject* parent, const char* name)
+ : KBabel::Catalog(parent,name,configFile)
{
_headerEditor=0;
}
diff --git a/kbabel/kbabel/kbcatalog.h b/kbabel/kbabel/kbcatalog.h
index 9911180b..02cc18c2 100644
--- a/kbabel/kbabel/kbcatalog.h
+++ b/kbabel/kbabel/kbcatalog.h
@@ -49,7 +49,7 @@ class KBCatalog : public KBabel::Catalog
TQ_OBJECT
public:
- KBCatalog(TQString configFile = TQString() ,TQObject* tqparent=0, const char* name=0);
+ KBCatalog(TQString configFile = TQString() ,TQObject* parent=0, const char* name=0);
virtual ~KBCatalog();
HeaderEditor* headerEditor();
diff --git a/kbabel/kbabel/kbcataloglistview.cpp b/kbabel/kbabel/kbcataloglistview.cpp
index 25cff704..cd48f274 100644
--- a/kbabel/kbabel/kbcataloglistview.cpp
+++ b/kbabel/kbabel/kbcataloglistview.cpp
@@ -34,8 +34,8 @@
using namespace KBabel;
-KBCatalogListView::KBCatalogListView(KBCatalog* catalog, TQWidget *tqparent, KBabel::Project::Ptr project)
- : TQWidget(tqparent)
+KBCatalogListView::KBCatalogListView(KBCatalog* catalog, TQWidget *parent, KBabel::Project::Ptr project)
+ : TQWidget(parent)
{
m_catalog= catalog;
TQVBoxLayout* tqlayout=new TQVBoxLayout(this);
diff --git a/kbabel/kbabel/kbcataloglistview.h b/kbabel/kbabel/kbcataloglistview.h
index 53e7327a..2de5974e 100644
--- a/kbabel/kbabel/kbcataloglistview.h
+++ b/kbabel/kbabel/kbcataloglistview.h
@@ -52,7 +52,7 @@ class KBCatalogListView : public TQWidget, public KBabel::CatalogView
Q_OBJECT
TQ_OBJECT
public:
- KBCatalogListView(KBCatalog* catalog, TQWidget *tqparent, KBabel::Project::Ptr project);
+ KBCatalogListView(KBCatalog* catalog, TQWidget *parent, KBabel::Project::Ptr project);
~KBCatalogListView();
diff --git a/kbabel/kbabel/kbcataloglistviewitem.cpp b/kbabel/kbabel/kbcataloglistviewitem.cpp
index 45be428e..dd14221c 100644
--- a/kbabel/kbabel/kbcataloglistviewitem.cpp
+++ b/kbabel/kbabel/kbcataloglistviewitem.cpp
@@ -23,8 +23,8 @@
#include "kbcataloglistviewitem.h"
#include <assert.h>
-KBCatalogListViewItem::KBCatalogListViewItem(KListView* lv, KListViewItem* tqparent, uint id, TQString msgid, TQString msgstr)
- : Super(lv, tqparent, "","",""), m_id(id), m_msgid(msgid), m_msgstr(msgstr)
+KBCatalogListViewItem::KBCatalogListViewItem(KListView* lv, KListViewItem* parent, uint id, TQString msgid, TQString msgstr)
+ : Super(lv, parent, "","",""), m_id(id), m_msgid(msgid), m_msgstr(msgstr)
{
setText(0,TQString::number(id));
}
diff --git a/kbabel/kbabel/kbcataloglistviewitem.h b/kbabel/kbabel/kbcataloglistviewitem.h
index 16353c70..4a24c159 100644
--- a/kbabel/kbabel/kbcataloglistviewitem.h
+++ b/kbabel/kbabel/kbcataloglistviewitem.h
@@ -34,7 +34,7 @@ class KBCatalogListViewItem : public KListViewItem
{
typedef KListViewItem Super;
public:
- KBCatalogListViewItem(KListView* lv, KListViewItem* tqparent, uint id, TQString msgid, TQString msgstr);
+ KBCatalogListViewItem(KListView* lv, KListViewItem* parent, uint id, TQString msgid, TQString msgstr);
~KBCatalogListViewItem();
diff --git a/kbabel/kbabel/kbcatalogview.cpp b/kbabel/kbabel/kbcatalogview.cpp
index fc7898f7..af4dd3dd 100644
--- a/kbabel/kbabel/kbcatalogview.cpp
+++ b/kbabel/kbabel/kbcatalogview.cpp
@@ -36,8 +36,8 @@
using namespace KBabel;
-KBCatalogView::KBCatalogView(KBCatalog* catalog, TQWidget* tqparent, Project::Ptr project)
- : TQWidget (tqparent), KBabel::CatalogView () , _project (project)
+KBCatalogView::KBCatalogView(KBCatalog* catalog, TQWidget* parent, Project::Ptr project)
+ : TQWidget (parent), KBabel::CatalogView () , _project (project)
{
if (catalog == 0)
kdFatal(KBABEL) << "catalog==0" << endl;
diff --git a/kbabel/kbabel/kbcatalogview.h b/kbabel/kbabel/kbcatalogview.h
index 33cf8904..ca3caa87 100644
--- a/kbabel/kbabel/kbcatalogview.h
+++ b/kbabel/kbabel/kbcatalogview.h
@@ -48,7 +48,7 @@ public:
/**
* Default constructor
*/
- KBCatalogView(KBCatalog* catalog, TQWidget* tqparent, KBabel::Project::Ptr project);
+ KBCatalogView(KBCatalog* catalog, TQWidget* parent, KBabel::Project::Ptr project);
/**
* Destructor
diff --git a/kbabel/kbabel/kbcharselect.cpp b/kbabel/kbabel/kbcharselect.cpp
index b2719386..2b55d4f5 100644
--- a/kbabel/kbabel/kbcharselect.cpp
+++ b/kbabel/kbabel/kbcharselect.cpp
@@ -41,8 +41,8 @@
#include <tqspinbox.h>
#include <tqscrollview.h>
-KBCharSelect::KBCharSelect(TQWidget* tqparent,const char* name)
- : TQVBox(tqparent,name)
+KBCharSelect::KBCharSelect(TQWidget* parent,const char* name)
+ : TQVBox(parent,name)
{
setSpacing( KDialog::spacingHint() );
diff --git a/kbabel/kbabel/kbcharselect.h b/kbabel/kbabel/kbcharselect.h
index a13071bf..c8248f9b 100644
--- a/kbabel/kbabel/kbcharselect.h
+++ b/kbabel/kbabel/kbcharselect.h
@@ -44,7 +44,7 @@ class KBCharSelect : public TQVBox
Q_OBJECT
TQ_OBJECT
public:
- KBCharSelect(TQWidget* tqparent, const char* name=0);
+ KBCharSelect(TQWidget* parent, const char* name=0);
void saveSettings(KConfig* config);
void restoreSettings(KConfig* config);
diff --git a/kbabel/kbabel/mymultilineedit.cpp b/kbabel/kbabel/mymultilineedit.cpp
index a3251a6b..af824fdd 100644
--- a/kbabel/kbabel/mymultilineedit.cpp
+++ b/kbabel/kbabel/mymultilineedit.cpp
@@ -62,8 +62,8 @@
using namespace KBabel;
-MyMultiLineEdit::MyMultiLineEdit(int ID, TQWidget* tqparent,const char* name)
- :KTextEdit(tqparent,name), emitUndo(true),
+MyMultiLineEdit::MyMultiLineEdit(int ID, TQWidget* parent,const char* name)
+ :KTextEdit(parent,name), emitUndo(true),
_firstChangedLine(0),
_lastChangedLine(0),
_lastParagraph(0),
@@ -75,7 +75,7 @@ MyMultiLineEdit::MyMultiLineEdit(int ID, TQWidget* tqparent,const char* name)
{
setUndoRedoEnabled(false); // we handle this ourselves
setWordWrap( WidgetWidth );
- viewport()->setAcceptDrops( false ); // we need our tqparent to get drops
+ viewport()->setAcceptDrops( false ); // we need our parent to get drops
connect(this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT( onSelectionChanged() ) );
}
@@ -592,8 +592,8 @@ void MyMultiLineEdit::setOverwriteMode( bool b )
}
/*******************************************************************************/
-MsgMultiLineEdit::MsgMultiLineEdit(int ID, KSpell* spell, TQWidget* tqparent,const char* name)
- :MyMultiLineEdit(ID, tqparent,name),
+MsgMultiLineEdit::MsgMultiLineEdit(int ID, KSpell* spell, TQWidget* parent,const char* name)
+ :MyMultiLineEdit(ID, parent,name),
_quotes(false),
_cleverEditing(false),
_highlightBg(false),
diff --git a/kbabel/kbabel/mymultilineedit.h b/kbabel/kbabel/mymultilineedit.h
index bc0075d0..272878da 100644
--- a/kbabel/kbabel/mymultilineedit.h
+++ b/kbabel/kbabel/mymultilineedit.h
@@ -52,7 +52,7 @@ class MyMultiLineEdit : public KTextEdit
Q_OBJECT
TQ_OBJECT
public:
- MyMultiLineEdit(int ID,TQWidget* tqparent,const char* name=0);
+ MyMultiLineEdit(int ID,TQWidget* parent,const char* name=0);
/**
applies cmd to the displayed text, but does not emit
@@ -130,7 +130,7 @@ protected:
virtual TQPopupMenu *createPopupMenu();
virtual TQPopupMenu *createPopupMenu(const TQPoint &pos);
- /* the tqparent handles this */
+ /* the parent handles this */
virtual void wheelEvent(TQWheelEvent*);
bool emitUndo;
@@ -178,7 +178,7 @@ class MsgMultiLineEdit : public MyMultiLineEdit
public:
enum TextColor { NormalColor, ErrorColor };
- MsgMultiLineEdit(int ID, KSpell* spell=0, TQWidget* tqparent=0,const char* name=0);
+ MsgMultiLineEdit(int ID, KSpell* spell=0, TQWidget* parent=0,const char* name=0);
virtual ~MsgMultiLineEdit();
/** is displaying surrounding quotes enabled? */
diff --git a/kbabel/kbabel/sourceview.cpp b/kbabel/kbabel/sourceview.cpp
index bf61189f..33b0d27b 100644
--- a/kbabel/kbabel/sourceview.cpp
+++ b/kbabel/kbabel/sourceview.cpp
@@ -45,8 +45,8 @@
using namespace KBabel;
-SourceView::SourceView(KBCatalog* catalog,TQWidget *tqparent, Project::Ptr project)
- : KBCatalogView(catalog,tqparent,project)
+SourceView::SourceView(KBCatalog* catalog,TQWidget *parent, Project::Ptr project)
+ : KBCatalogView(catalog,parent,project)
{
TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
tqlayout->setResizeMode( TQLayout::Minimum );
diff --git a/kbabel/kbabel/sourceview.h b/kbabel/kbabel/sourceview.h
index c17c49cc..20d5321f 100644
--- a/kbabel/kbabel/sourceview.h
+++ b/kbabel/kbabel/sourceview.h
@@ -45,7 +45,7 @@ public:
/**
* Default constructor
*/
- SourceView(KBCatalog* catalog,TQWidget *tqparent, KBabel::Project::Ptr project);
+ SourceView(KBCatalog* catalog,TQWidget *parent, KBabel::Project::Ptr project);
public slots:
virtual void updateView();
diff --git a/kbabel/kbabel/spelldlg.cpp b/kbabel/kbabel/spelldlg.cpp
index fc53b6e0..fab8c606 100644
--- a/kbabel/kbabel/spelldlg.cpp
+++ b/kbabel/kbabel/spelldlg.cpp
@@ -40,8 +40,8 @@
#include <kglobal.h>
#include <klocale.h>
-SpellDlg::SpellDlg(bool haveMarkedText,TQWidget *tqparent,const char *name)
- : KDialogBase(tqparent,name,true,i18n("Caption of dialog","Spelling")
+SpellDlg::SpellDlg(bool haveMarkedText,TQWidget *parent,const char *name)
+ : KDialogBase(parent,name,true,i18n("Caption of dialog","Spelling")
, Ok|Cancel)
{
setButtonOK(KGuiItem(i18n("&Spell Check"),"spellcheck"));
diff --git a/kbabel/kbabel/spelldlg.h b/kbabel/kbabel/spelldlg.h
index be182d7e..71ced638 100644
--- a/kbabel/kbabel/spelldlg.h
+++ b/kbabel/kbabel/spelldlg.h
@@ -44,7 +44,7 @@ class SpellDlg : public KDialogBase
TQ_OBJECT
public:
- SpellDlg(bool haveMarkedText, TQWidget* tqparent, const char *name=0);
+ SpellDlg(bool haveMarkedText, TQWidget* parent, const char *name=0);
~SpellDlg();
bool all() const;
diff --git a/kbabel/kbabel/taglistview.cpp b/kbabel/kbabel/taglistview.cpp
index 51a37d49..62d4eba5 100644
--- a/kbabel/kbabel/taglistview.cpp
+++ b/kbabel/kbabel/taglistview.cpp
@@ -44,8 +44,8 @@
using namespace KBabel;
-TagListView::TagListView(KBCatalog* catalog,TQWidget *tqparent, Project::Ptr project)
- : KBCatalogView(catalog,tqparent,project)
+TagListView::TagListView(KBCatalog* catalog,TQWidget *parent, Project::Ptr project)
+ : KBCatalogView(catalog,parent,project)
{
TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
tqlayout->setResizeMode( TQLayout::Minimum );
diff --git a/kbabel/kbabel/taglistview.h b/kbabel/kbabel/taglistview.h
index d2d21308..95de3dc7 100644
--- a/kbabel/kbabel/taglistview.h
+++ b/kbabel/kbabel/taglistview.h
@@ -45,7 +45,7 @@ public:
/**
* Default constructor
*/
- TagListView(KBCatalog* catalog,TQWidget *tqparent, KBabel::Project::Ptr project);
+ TagListView(KBCatalog* catalog,TQWidget *parent, KBabel::Project::Ptr project);
public slots:
virtual void updateView();
diff --git a/kbabel/kbabeldict/aboutmoduledlg.cpp b/kbabel/kbabeldict/aboutmoduledlg.cpp
index c4a5969e..861fe01a 100644
--- a/kbabel/kbabeldict/aboutmoduledlg.cpp
+++ b/kbabel/kbabeldict/aboutmoduledlg.cpp
@@ -35,8 +35,8 @@
#include <kbugreport.h>
#include <klocale.h>
-AboutModuleDlg::AboutModuleDlg(const KAboutData *aboutData, TQWidget *tqparent)
- : KAboutApplication(aboutData, tqparent)
+AboutModuleDlg::AboutModuleDlg(const KAboutData *aboutData, TQWidget *parent)
+ : KAboutApplication(aboutData, parent)
, _aboutData(aboutData)
{
setHelpLinkText(i18n("Report Bug..."));
diff --git a/kbabel/kbabeldict/aboutmoduledlg.h b/kbabel/kbabeldict/aboutmoduledlg.h
index a3b1656e..399ea38f 100644
--- a/kbabel/kbabeldict/aboutmoduledlg.h
+++ b/kbabel/kbabeldict/aboutmoduledlg.h
@@ -44,7 +44,7 @@ class AboutModuleDlg : public KAboutApplication
TQ_OBJECT
public:
- AboutModuleDlg(const KAboutData *aboutData, TQWidget* tqparent=0);
+ AboutModuleDlg(const KAboutData *aboutData, TQWidget* parent=0);
public slots:
virtual void helpClickedSlot(const TQString&);
diff --git a/kbabel/kbabeldict/dictchooser.cpp b/kbabel/kbabeldict/dictchooser.cpp
index e0ccbaf5..d3b8df63 100644
--- a/kbabel/kbabeldict/dictchooser.cpp
+++ b/kbabel/kbabeldict/dictchooser.cpp
@@ -45,8 +45,8 @@
#include <ktempfile.h>
DictChooser::DictChooser(KBabelDictBox*b, TQStringList selected
- , TQWidget *tqparent, const char *name)
- : TQWidget(tqparent,name), box(b)
+ , TQWidget *parent, const char *name)
+ : TQWidget(parent,name), box(b)
{
tempConfig.clear();
tempConfig.setAutoDelete(true);
diff --git a/kbabel/kbabeldict/dictchooser.h b/kbabel/kbabeldict/dictchooser.h
index e8ef1d71..ba5e5c56 100644
--- a/kbabel/kbabeldict/dictchooser.h
+++ b/kbabel/kbabeldict/dictchooser.h
@@ -54,7 +54,7 @@ class KDE_EXPORT DictChooser : public TQWidget
public:
DictChooser(KBabelDictBox* box, TQStringList selected,
- TQWidget *tqparent , const char *name=0);
+ TQWidget *parent , const char *name=0);
TQStringList selectedDicts();
diff --git a/kbabel/kbabeldict/dictionarymenu.cpp b/kbabel/kbabeldict/dictionarymenu.cpp
index ff23e972..d850f9a6 100644
--- a/kbabel/kbabeldict/dictionarymenu.cpp
+++ b/kbabel/kbabeldict/dictionarymenu.cpp
@@ -39,8 +39,8 @@
#include <tqsignalmapper.h>
DictionaryMenu::DictionaryMenu(KPopupMenu *popupMenu, KActionCollection *collection
- , TQObject *tqparent)
- : TQObject(tqparent, "dictionarymenu")
+ , TQObject *parent)
+ : TQObject(parent, "dictionarymenu")
, popup(popupMenu)
, actionCollection(collection)
, maxId(10)
diff --git a/kbabel/kbabeldict/dictionarymenu.h b/kbabel/kbabeldict/dictionarymenu.h
index 5cbc151c..0687ff54 100644
--- a/kbabel/kbabeldict/dictionarymenu.h
+++ b/kbabel/kbabeldict/dictionarymenu.h
@@ -49,7 +49,7 @@ class KDE_EXPORT DictionaryMenu : public TQObject
TQ_OBJECT
public:
- DictionaryMenu(KPopupMenu *menu, KActionCollection *collection, TQObject *tqparent=0);
+ DictionaryMenu(KPopupMenu *menu, KActionCollection *collection, TQObject *parent=0);
~DictionaryMenu();
void add(const TQString& name,const TQString& id);
diff --git a/kbabel/kbabeldict/kbabeldictbox.cpp b/kbabel/kbabeldict/kbabeldictbox.cpp
index 21bd9154..e5c67b57 100644
--- a/kbabel/kbabeldict/kbabeldictbox.cpp
+++ b/kbabel/kbabeldict/kbabeldictbox.cpp
@@ -77,7 +77,7 @@ using namespace KBabel;
class ResultListItem : public TQListViewItem
{
public:
- ResultListItem(TQListView *tqparent, const SearchResult& result,bool richText);
+ ResultListItem(TQListView *parent, const SearchResult& result,bool richText);
virtual TQString key(int column, bool ascending) const;
const SearchResult* result() const;
@@ -88,9 +88,9 @@ private:
bool _richText;
};
-ResultListItem::ResultListItem(TQListView *tqparent, const SearchResult& result
+ResultListItem::ResultListItem(TQListView *parent, const SearchResult& result
, bool richText)
- : TQListViewItem(tqparent)
+ : TQListViewItem(parent)
, _result(result)
, _richText(richText)
{
@@ -179,11 +179,11 @@ const SearchResult *ResultListItem::result() const
}
/*
- * Constructs a KBabelDictBox which is a child of 'tqparent', with the
+ * Constructs a KBabelDictBox which is a child of 'parent', with the
* name 'name' and widget flags set to 'f'
*/
-KBabelDictBox::KBabelDictBox( TQWidget* tqparent, const char* name, WFlags fl )
- : DCOPObject("KBabelDict"), TQWidget( tqparent, name, fl )
+KBabelDictBox::KBabelDictBox( TQWidget* parent, const char* name, WFlags fl )
+ : DCOPObject("KBabelDict"), TQWidget( parent, name, fl )
{
active=-1;
currentResult=0;
@@ -929,7 +929,7 @@ TQPtrList<ModuleInfo> KBabelDictBox::moduleInfos()
}
-TQPtrList<PrefWidget> KBabelDictBox::modPrefWidgets(TQWidget *tqparent)
+TQPtrList<PrefWidget> KBabelDictBox::modPrefWidgets(TQWidget *parent)
{
TQPtrList<PrefWidget> list;
list.setAutoDelete(false);
@@ -937,7 +937,7 @@ TQPtrList<PrefWidget> KBabelDictBox::modPrefWidgets(TQWidget *tqparent)
for(e = moduleList.first(); e != 0; e = moduleList.next())
{
- list.append(e->preferencesWidget(tqparent));
+ list.append(e->preferencesWidget(parent));
}
return list;
diff --git a/kbabel/kbabeldict/kbabeldictbox.h b/kbabel/kbabeldict/kbabeldictbox.h
index 0b850798..147f000a 100644
--- a/kbabel/kbabeldict/kbabeldictbox.h
+++ b/kbabel/kbabeldict/kbabeldictbox.h
@@ -66,7 +66,7 @@ class KDE_EXPORT KBabelDictBox : public TQWidget, virtual public KBabelDictIFace
TQ_OBJECT
public:
- KBabelDictBox( TQWidget* tqparent = 0, const char* name = 0
+ KBabelDictBox( TQWidget* parent = 0, const char* name = 0
, WFlags fl = 0 );
~KBabelDictBox();
@@ -83,7 +83,7 @@ public:
TQPtrList<ModuleInfo> moduleInfos();
/** @returns preferencesWidgets of modules */
- TQPtrList<PrefWidget> modPrefWidgets(TQWidget* tqparent);
+ TQPtrList<PrefWidget> modPrefWidgets(TQWidget* parent);
int activeModule();
bool activeModuleEditable();
diff --git a/kbabel/kbabeldict/kbabeldictview.cpp b/kbabel/kbabeldict/kbabeldictview.cpp
index 5346e758..18bb20ac 100644
--- a/kbabel/kbabeldict/kbabeldictview.cpp
+++ b/kbabel/kbabeldict/kbabeldictview.cpp
@@ -61,11 +61,11 @@
#include <kiconloader.h>
/*
- * Constructs a KBabelDictView which is a child of 'tqparent', with the
+ * Constructs a KBabelDictView which is a child of 'parent', with the
* name 'name' and widget flags set to 'f'
*/
-KBabelDictView::KBabelDictView( TQWidget* tqparent, const char* name, WFlags fl )
- : TQWidget( tqparent, name, fl )
+KBabelDictView::KBabelDictView( TQWidget* parent, const char* name, WFlags fl )
+ : TQWidget( parent, name, fl )
{
TQVBoxLayout *mainLayout = new TQVBoxLayout(this);
mainLayout->setSpacing(KDialog::spacingHint());
diff --git a/kbabel/kbabeldict/kbabeldictview.h b/kbabel/kbabeldict/kbabeldictview.h
index fbde9928..46d082db 100644
--- a/kbabel/kbabeldict/kbabeldictview.h
+++ b/kbabel/kbabeldict/kbabeldictview.h
@@ -54,7 +54,7 @@ class KBabelDictView : public TQWidget
TQ_OBJECT
public:
- KBabelDictView( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+ KBabelDictView( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
~KBabelDictView();
bool prefVisible();
diff --git a/kbabel/kbabeldict/kbabelsplash.cpp b/kbabel/kbabeldict/kbabelsplash.cpp
index eec450c6..a62cec5f 100644
--- a/kbabel/kbabeldict/kbabelsplash.cpp
+++ b/kbabel/kbabeldict/kbabelsplash.cpp
@@ -40,8 +40,8 @@
KBabelSplash* KBabelSplash::instance = 0;
-KBabelSplash::KBabelSplash( TQWidget* tqparent, const char* name )
- : TQVBox( tqparent, name, WType_Dialog|WShowModal|WStyle_Customize|WStyle_NoBorder|WDestructiveClose )
+KBabelSplash::KBabelSplash( TQWidget* parent, const char* name )
+ : TQVBox( parent, name, WType_Dialog|WShowModal|WStyle_Customize|WStyle_NoBorder|WDestructiveClose )
{
setMargin( 0 );
setSpacing( 0 );
diff --git a/kbabel/kbabeldict/kbabelsplash.h b/kbabel/kbabeldict/kbabelsplash.h
index 22ed99d7..25c15f12 100644
--- a/kbabel/kbabeldict/kbabelsplash.h
+++ b/kbabel/kbabeldict/kbabelsplash.h
@@ -44,7 +44,7 @@ Q_OBJECT
TQ_OBJECT
public:
- KBabelSplash( TQWidget* tqparent = 0, const char* name = 0 );
+ KBabelSplash( TQWidget* parent = 0, const char* name = 0 );
~KBabelSplash() { instance = 0; }
static KBabelSplash* instance;
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
index fe312253..16458a75 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
@@ -72,8 +72,8 @@
using namespace KBabel;
-KDBSearchEngine::KDBSearchEngine (TQObject * tqparent, const char *name):
-SearchEngine (tqparent, name)
+KDBSearchEngine::KDBSearchEngine (TQObject * parent, const char *name):
+SearchEngine (parent, name)
{
edited = "unknown";
dm = 0; //Database Manager
@@ -1203,10 +1203,10 @@ KDBSearchEngine::readSettings (KConfigBase * config)
}
PrefWidget *
-KDBSearchEngine::preferencesWidget (TQWidget * tqparent)
+KDBSearchEngine::preferencesWidget (TQWidget * parent)
{
- pw = new PreferencesWidget (tqparent);
+ pw = new PreferencesWidget (parent);
setSettings ();
connect (pw, TQT_SIGNAL (restoreNow ()), this, TQT_SLOT (setSettings ()));
connect (pw, TQT_SIGNAL (applyNow ()), this, TQT_SLOT (updateSettings ()));
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.h b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.h
index d884f233..2f56247c 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.h
+++ b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.h
@@ -99,7 +99,7 @@ class KDBSearchEngine : public SearchEngine
public:
- KDBSearchEngine(TQObject *tqparent=0,const char *name=0);
+ KDBSearchEngine(TQObject *parent=0,const char *name=0);
~KDBSearchEngine();
enum Rules {Equal = 1, Contains = 2, Contained = 4, RegExp = 8};
enum FormatRules { Dots = 1, Ampersand = 2, FirstWordUpper = 4, //Not yet used
@@ -194,7 +194,7 @@ public:
virtual void saveSettings(KConfigBase *config);
virtual void readSettings(KConfigBase *config);
- virtual PrefWidget *preferencesWidget(TQWidget *tqparent);
+ virtual PrefWidget *preferencesWidget(TQWidget *parent);
virtual const KAboutData *about() const;
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/database.cpp b/kbabel/kbabeldict/modules/dbsearchengine/database.cpp
index 6fa383df..05f31654 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/database.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/database.cpp
@@ -294,8 +294,8 @@ DataBaseItem::toRawData (char *_data)
DataBaseManager::DataBaseManager (TQString directory, TQString lang,
- TQObject * tqparent, const char *name):
-TQObject (tqparent, name)
+ TQObject * parent, const char *name):
+TQObject (parent, name)
{
TQString filename;
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/database.h b/kbabel/kbabeldict/modules/dbsearchengine/database.h
index 05a09955..76342634 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/database.h
+++ b/kbabel/kbabeldict/modules/dbsearchengine/database.h
@@ -176,7 +176,7 @@ class DataBaseManager : public TQObject
*/
- DataBaseManager(TQString directory,TQString lang,TQObject *tqparent=0,const char *name=0);
+ DataBaseManager(TQString directory,TQString lang,TQObject *parent=0,const char *name=0);
~DataBaseManager();
/*
Create a new databse structure.
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp b/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp
index 5a4d5a6e..2969a9df 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp
@@ -39,7 +39,7 @@
using namespace KBabel;
PoScanner::PoScanner(DataBaseManager *dbm,
- TQObject *tqparent,const char *name):TQObject(tqparent,name)
+ TQObject *parent,const char *name):TQObject(parent,name)
{
dm=dbm;
removeOldCatalogTranslation=false; //Check if this flag do something.
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbscan.h b/kbabel/kbabeldict/modules/dbsearchengine/dbscan.h
index c6212fbd..85ab77d5 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/dbscan.h
+++ b/kbabel/kbabeldict/modules/dbsearchengine/dbscan.h
@@ -48,7 +48,7 @@ class PoScanner : public TQObject
public:
- PoScanner(DataBaseManager *dbm,TQObject *tqparent=0,const char *name=0);
+ PoScanner(DataBaseManager *dbm,TQObject *parent=0,const char *name=0);
/*
Scan a single PO file.
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.cpp b/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.cpp
index 599ace4c..86975874 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.cpp
@@ -21,8 +21,8 @@ KInstance *DbSeFactory::s_instance = 0;
KAboutData *DbSeFactory::s_about = 0;
-DbSeFactory::DbSeFactory( TQObject *tqparent, const char *name)
- : KLibFactory(tqparent,name)
+DbSeFactory::DbSeFactory( TQObject *parent, const char *name)
+ : KLibFactory(parent,name)
{
}
@@ -42,7 +42,7 @@ DbSeFactory::~DbSeFactory()
}
-TQObject *DbSeFactory::createObject( TQObject *tqparent, const char *name,
+TQObject *DbSeFactory::createObject( TQObject *parent, const char *name,
const char *classname, const TQStringList &)
{
if(TQCString(classname) != "SearchEngine")
@@ -51,7 +51,7 @@ TQObject *DbSeFactory::createObject( TQObject *tqparent, const char *name,
return 0;
}
- KDBSearchEngine *se = new KDBSearchEngine(tqparent,name);
+ KDBSearchEngine *se = new KDBSearchEngine(parent,name);
emit objectCreated(se);
return se;
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.h b/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.h
index b146b021..1016f74d 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.h
+++ b/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.h
@@ -10,10 +10,10 @@ class DbSeFactory : public KLibFactory
Q_OBJECT
TQ_OBJECT
public:
- DbSeFactory( TQObject *tqparent=0, const char *name=0);
+ DbSeFactory( TQObject *parent=0, const char *name=0);
~DbSeFactory();
- virtual TQObject *createObject( TQObject *tqparent=0, const char *name=0,
+ virtual TQObject *createObject( TQObject *parent=0, const char *name=0,
const char *classname=TQOBJECT_OBJECT_NAME_STRING,
const TQStringList &args = TQStringList());
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp b/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp
index c81a8562..a2c8c289 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp
@@ -14,8 +14,8 @@
#include "dbseprefwidget.h"
#include "preferenceswidget.h"
-PreferencesWidget::PreferencesWidget(TQWidget *tqparent, const char* name)
- : PrefWidget(tqparent,name)
+PreferencesWidget::PreferencesWidget(TQWidget *parent, const char* name)
+ : PrefWidget(parent,name)
{
TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
// TQLabel *label = new TQLabel(i18n("Settings for KDE database search engine"),this);
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.h b/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.h
index 134c60bd..980a8f74 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.h
+++ b/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.h
@@ -10,7 +10,7 @@ class PreferencesWidget : public PrefWidget
TQ_OBJECT
public:
- PreferencesWidget(TQWidget *tqparent=0, const char* name=0);
+ PreferencesWidget(TQWidget *parent=0, const char* name=0);
virtual ~PreferencesWidget();
virtual void apply();
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp
index 077565d4..826800d9 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp
@@ -47,8 +47,8 @@
#include <kdebug.h>
#define i18n (const char *)
-KDBSearchEngine2::KDBSearchEngine2(TQObject *tqparent,const char*name)
- : SearchEngine(tqparent,name)
+KDBSearchEngine2::KDBSearchEngine2(TQObject *parent,const char*name)
+ : SearchEngine(parent,name)
{
pw=0;
dbDirectory=".";
@@ -255,10 +255,10 @@ void KDBSearchEngine2::stringChanged( TQString orig, TQString translated
}
-PrefWidget * KDBSearchEngine2::preferencesWidget(TQWidget *tqparent)
+PrefWidget * KDBSearchEngine2::preferencesWidget(TQWidget *parent)
{
- pw = new KDB2PreferencesWidget(tqparent);
+ pw = new KDB2PreferencesWidget(parent);
kdDebug(0) << "new KDB2 preferences widget" << endl;
setSettings();
connect(pw,TQT_SIGNAL(restoreNow()),this,TQT_SLOT(setSettings()));
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.h b/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.h
index 89a32571..6bc46ab1 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.h
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.h
@@ -26,7 +26,7 @@ class KDBSearchEngine2 : public SearchEngine
public:
- KDBSearchEngine2(TQObject *tqparent=0, const char *name=0);
+ KDBSearchEngine2(TQObject *parent=0, const char *name=0);
virtual ~KDBSearchEngine2();
//init if needed.
@@ -78,9 +78,9 @@ class KDBSearchEngine2 : public SearchEngine
* search engine. The returned widget should not be bigger than
* 400x400. If you need more space, you maybe want to use
* a tabbed widget.
- * @param tqparent the tqparent of the returned widget
+ * @param parent the parent of the returned widget
*/
- virtual PrefWidget* preferencesWidget(TQWidget *tqparent);
+ virtual PrefWidget* preferencesWidget(TQWidget *parent);
/** @returns information about this SearchEngine */
virtual const KAboutData *about() const;
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp
index 96239ba9..a21252a2 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp
@@ -120,7 +120,7 @@ TQValueList<KURL> MessagesSource::filesInDir(KURL url,bool recursive)
//FIXME: clean this class
PoScanner::PoScanner(DataBaseInterface *dbi,
- TQObject *tqparent,const char *name):TQObject(tqparent,name)
+ TQObject *parent,const char *name):TQObject(parent,name)
{
di=dbi;
removeOldCatalogTranslation=true;
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.h b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.h
index cbf1d2e6..f3ee15d4 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.h
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.h
@@ -76,7 +76,7 @@ class PoScanner : public TQObject
public:
- PoScanner(DataBaseInterface *dbi,TQObject *tqparent=0,const char *name=0);
+ PoScanner(DataBaseInterface *dbi,TQObject *parent=0,const char *name=0);
/*
Scan a single PO file.
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp
index 0c65710c..55f6a16f 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp
@@ -22,8 +22,8 @@ KInstance *DbSe2Factory::s_instance = 0;
KAboutData *DbSe2Factory::s_about = 0;
-DbSe2Factory::DbSe2Factory( TQObject *tqparent, const char *name)
- : KLibFactory(tqparent,name)
+DbSe2Factory::DbSe2Factory( TQObject *parent, const char *name)
+ : KLibFactory(parent,name)
{
}
@@ -43,7 +43,7 @@ DbSe2Factory::~DbSe2Factory()
}
-TQObject *DbSe2Factory::createObject( TQObject *tqparent, const char *name,
+TQObject *DbSe2Factory::createObject( TQObject *parent, const char *name,
const char *classname, const TQStringList &)
{
if(TQCString(classname) != "SearchEngine")
@@ -52,7 +52,7 @@ TQObject *DbSe2Factory::createObject( TQObject *tqparent, const char *name,
return 0;
}
- KDBSearchEngine2 *se = new KDBSearchEngine2(tqparent,name);
+ KDBSearchEngine2 *se = new KDBSearchEngine2(parent,name);
emit objectCreated(se);
return se;
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.h b/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.h
index 2f1b98ca..793c03d3 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.h
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.h
@@ -10,10 +10,10 @@ class DbSe2Factory : public KLibFactory
Q_OBJECT
TQ_OBJECT
public:
- DbSe2Factory( TQObject *tqparent=0, const char *name=0);
+ DbSe2Factory( TQObject *parent=0, const char *name=0);
~DbSe2Factory();
- virtual TQObject *createObject( TQObject *tqparent=0, const char *name=0,
+ virtual TQObject *createObject( TQObject *parent=0, const char *name=0,
const char *classname=TQOBJECT_OBJECT_NAME_STRING,
const TQStringList &args = TQStringList());
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp
index ba16327c..ff767436 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp
@@ -15,8 +15,8 @@
#include "dbse2.h"
#include "preferenceswidget.h"
-KDB2PreferencesWidget::KDB2PreferencesWidget(TQWidget *tqparent, const char* name)
- : PrefWidget(tqparent,name)
+KDB2PreferencesWidget::KDB2PreferencesWidget(TQWidget *parent, const char* name)
+ : PrefWidget(parent,name)
{
TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
// TQLabel *label = new TQLabel(i18n("Settings for KDE Database Search Engine"),this);
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.h b/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.h
index 68e283bd..3aa9bcb8 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.h
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.h
@@ -10,7 +10,7 @@ class KDB2PreferencesWidget : public PrefWidget
TQ_OBJECT
public:
- KDB2PreferencesWidget(TQWidget *tqparent=0, const char* name=0);
+ KDB2PreferencesWidget(TQWidget *parent=0, const char* name=0);
virtual ~KDB2PreferencesWidget();
virtual void apply();
diff --git a/kbabel/kbabeldict/modules/poauxiliary/pa_factory.cpp b/kbabel/kbabeldict/modules/poauxiliary/pa_factory.cpp
index 730424f1..f17397f9 100644
--- a/kbabel/kbabeldict/modules/poauxiliary/pa_factory.cpp
+++ b/kbabel/kbabeldict/modules/poauxiliary/pa_factory.cpp
@@ -54,8 +54,8 @@ KInstance *PaFactory::s_instance = 0;
KAboutData *PaFactory::s_about = 0;
-PaFactory::PaFactory( TQObject *tqparent, const char *name)
- : KLibFactory(tqparent,name)
+PaFactory::PaFactory( TQObject *parent, const char *name)
+ : KLibFactory(parent,name)
{
}
@@ -75,7 +75,7 @@ PaFactory::~PaFactory()
}
-TQObject *PaFactory::createObject( TQObject *tqparent, const char *name
+TQObject *PaFactory::createObject( TQObject *parent, const char *name
, const char *classname, const TQStringList &)
{
if(TQCString(classname) != "SearchEngine")
@@ -84,7 +84,7 @@ TQObject *PaFactory::createObject( TQObject *tqparent, const char *name
return 0;
}
- return new PoAuxiliary(tqparent,name);
+ return new PoAuxiliary(parent,name);
}
diff --git a/kbabel/kbabeldict/modules/poauxiliary/pa_factory.h b/kbabel/kbabeldict/modules/poauxiliary/pa_factory.h
index 7c92e008..ab0fad0e 100644
--- a/kbabel/kbabeldict/modules/poauxiliary/pa_factory.h
+++ b/kbabel/kbabeldict/modules/poauxiliary/pa_factory.h
@@ -44,10 +44,10 @@ class PaFactory : public KLibFactory
Q_OBJECT
TQ_OBJECT
public:
- PaFactory( TQObject *tqparent=0, const char *name=0);
+ PaFactory( TQObject *parent=0, const char *name=0);
~PaFactory();
- virtual TQObject *createObject( TQObject *tqparent=0, const char *name=0
+ virtual TQObject *createObject( TQObject *parent=0, const char *name=0
, const char *classname=TQOBJECT_OBJECT_NAME_STRING
, const TQStringList &args = TQStringList());
diff --git a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp
index ce4b7800..9025d716 100644
--- a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp
+++ b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp
@@ -50,8 +50,8 @@
using namespace KBabel;
-PoAuxiliary::PoAuxiliary(TQObject *tqparent, const char *name)
- : SearchEngine(tqparent, name)
+PoAuxiliary::PoAuxiliary(TQObject *parent, const char *name)
+ : SearchEngine(parent, name)
{
catalog = new Catalog(this, "PoAuxiliary::catalog");
prefWidget=0;
@@ -124,9 +124,9 @@ void PoAuxiliary::readSettings(KConfigBase *config)
restoreSettings();
}
-PrefWidget *PoAuxiliary::preferencesWidget(TQWidget *tqparent)
+PrefWidget *PoAuxiliary::preferencesWidget(TQWidget *parent)
{
- prefWidget = new AuxiliaryPreferencesWidget(tqparent,"pocompendium_prefwidget");
+ prefWidget = new AuxiliaryPreferencesWidget(parent,"pocompendium_prefwidget");
connect(prefWidget, TQT_SIGNAL(applySettings()), this, TQT_SLOT(applySettings()));
connect(prefWidget, TQT_SIGNAL(restoreSettings())
, this, TQT_SLOT(restoreSettings()));
diff --git a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.h b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.h
index 0ad4c635..d3769237 100644
--- a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.h
+++ b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.h
@@ -53,7 +53,7 @@ class PoAuxiliary : public SearchEngine
TQ_OBJECT
public:
- PoAuxiliary(TQObject *tqparent=0, const char *name=0);
+ PoAuxiliary(TQObject *parent=0, const char *name=0);
virtual ~PoAuxiliary();
virtual bool isReady() const;
@@ -65,7 +65,7 @@ public:
virtual void saveSettings(KConfigBase *config);
virtual void readSettings(KConfigBase *config);
- virtual PrefWidget *preferencesWidget(TQWidget *tqparent);
+ virtual PrefWidget *preferencesWidget(TQWidget *parent);
virtual const KAboutData *about() const;
diff --git a/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp b/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp
index 2c984c46..873c07b6 100644
--- a/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp
+++ b/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp
@@ -43,8 +43,8 @@
#include "preferenceswidget.h"
#include "pwidget.h"
-AuxiliaryPreferencesWidget::AuxiliaryPreferencesWidget(TQWidget *tqparent, const char* name)
- : PrefWidget(tqparent,name)
+AuxiliaryPreferencesWidget::AuxiliaryPreferencesWidget(TQWidget *parent, const char* name)
+ : PrefWidget(parent,name)
, changed(false)
{
TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
diff --git a/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.h b/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.h
index e967d958..ac4e024f 100644
--- a/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.h
+++ b/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.h
@@ -45,7 +45,7 @@ class AuxiliaryPreferencesWidget : public PrefWidget
TQ_OBJECT
public:
- AuxiliaryPreferencesWidget(TQWidget *tqparent=0, const char* name=0);
+ AuxiliaryPreferencesWidget(TQWidget *parent=0, const char* name=0);
virtual ~AuxiliaryPreferencesWidget();
virtual void apply();
diff --git a/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp b/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp
index 71d79641..e6565e54 100644
--- a/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp
+++ b/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp
@@ -42,8 +42,8 @@
using namespace KBabel;
-CompendiumData::CompendiumData(TQObject *tqparent)
- : TQObject(tqparent)
+CompendiumData::CompendiumData(TQObject *parent)
+ : TQObject(parent)
, _active(false)
, _error(false)
, _initialized(false)
diff --git a/kbabel/kbabeldict/modules/pocompendium/compendiumdata.h b/kbabel/kbabeldict/modules/pocompendium/compendiumdata.h
index 6d229d74..1d621bd8 100644
--- a/kbabel/kbabeldict/modules/pocompendium/compendiumdata.h
+++ b/kbabel/kbabeldict/modules/pocompendium/compendiumdata.h
@@ -52,7 +52,7 @@ class CompendiumData : public TQObject
TQ_OBJECT
public:
- CompendiumData(TQObject *tqparent=0);
+ CompendiumData(TQObject *parent=0);
bool load(KURL url);
diff --git a/kbabel/kbabeldict/modules/pocompendium/pc_factory.cpp b/kbabel/kbabeldict/modules/pocompendium/pc_factory.cpp
index 0d3d2d24..cb61de6b 100644
--- a/kbabel/kbabeldict/modules/pocompendium/pc_factory.cpp
+++ b/kbabel/kbabeldict/modules/pocompendium/pc_factory.cpp
@@ -54,8 +54,8 @@ KInstance *PcFactory::s_instance = 0;
KAboutData *PcFactory::s_about = 0;
-PcFactory::PcFactory( TQObject *tqparent, const char *name)
- : KLibFactory(tqparent,name)
+PcFactory::PcFactory( TQObject *parent, const char *name)
+ : KLibFactory(parent,name)
{
}
@@ -75,7 +75,7 @@ PcFactory::~PcFactory()
}
-TQObject *PcFactory::createObject( TQObject *tqparent, const char *name
+TQObject *PcFactory::createObject( TQObject *parent, const char *name
, const char *classname, const TQStringList &)
{
if(TQCString(classname) != "SearchEngine")
@@ -84,7 +84,7 @@ TQObject *PcFactory::createObject( TQObject *tqparent, const char *name
return 0;
}
- return new PoCompendium(tqparent,name);
+ return new PoCompendium(parent,name);
}
diff --git a/kbabel/kbabeldict/modules/pocompendium/pc_factory.h b/kbabel/kbabeldict/modules/pocompendium/pc_factory.h
index b92cfcb0..dca44e09 100644
--- a/kbabel/kbabeldict/modules/pocompendium/pc_factory.h
+++ b/kbabel/kbabeldict/modules/pocompendium/pc_factory.h
@@ -44,10 +44,10 @@ class PcFactory : public KLibFactory
Q_OBJECT
TQ_OBJECT
public:
- PcFactory( TQObject *tqparent=0, const char *name=0);
+ PcFactory( TQObject *parent=0, const char *name=0);
~PcFactory();
- virtual TQObject *createObject( TQObject *tqparent=0, const char *name=0
+ virtual TQObject *createObject( TQObject *parent=0, const char *name=0
, const char *classname=TQOBJECT_OBJECT_NAME_STRING
, const TQStringList &args = TQStringList());
diff --git a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp
index 6e664316..60de6a4f 100644
--- a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp
+++ b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp
@@ -63,8 +63,8 @@ using namespace KBabel;
static KStaticDeleter< TQDict<CompendiumData> > compDataDeleter;
TQDict<CompendiumData> *PoCompendium::_compDict = 0;
-PoCompendium::PoCompendium(TQObject *tqparent, const char *name)
- : SearchEngine(tqparent, name)
+PoCompendium::PoCompendium(TQObject *parent, const char *name)
+ : SearchEngine(parent, name)
{
prefWidget=0;
data=0;
@@ -160,9 +160,9 @@ void PoCompendium::readSettings(KConfigBase *config)
restoreSettings();
}
-PrefWidget *PoCompendium::preferencesWidget(TQWidget *tqparent)
+PrefWidget *PoCompendium::preferencesWidget(TQWidget *parent)
{
- prefWidget = new CompendiumPreferencesWidget(tqparent,"pocompendium_prefwidget");
+ prefWidget = new CompendiumPreferencesWidget(parent,"pocompendium_prefwidget");
kdDebug(KBABEL_SEARCH) << "PreferencesWidget is " << prefWidget << endl;
connect(prefWidget, TQT_SIGNAL(applySettings()), this, TQT_SLOT(applySettings()));
connect(prefWidget, TQT_SIGNAL(restoreSettings())
diff --git a/kbabel/kbabeldict/modules/pocompendium/pocompendium.h b/kbabel/kbabeldict/modules/pocompendium/pocompendium.h
index 1b3d1496..8f2b19a8 100644
--- a/kbabel/kbabeldict/modules/pocompendium/pocompendium.h
+++ b/kbabel/kbabeldict/modules/pocompendium/pocompendium.h
@@ -54,7 +54,7 @@ class PoCompendium : public SearchEngine
TQ_OBJECT
public:
- PoCompendium(TQObject *tqparent=0, const char *name=0);
+ PoCompendium(TQObject *parent=0, const char *name=0);
virtual ~PoCompendium();
virtual bool isReady() const;
@@ -68,7 +68,7 @@ public:
virtual void saveSettings(KConfigBase *config);
virtual void readSettings(KConfigBase *config);
- virtual PrefWidget *preferencesWidget(TQWidget *tqparent);
+ virtual PrefWidget *preferencesWidget(TQWidget *parent);
virtual const KAboutData *about() const;
diff --git a/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp b/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp
index 9cbeb381..74321121 100644
--- a/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp
+++ b/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp
@@ -44,8 +44,8 @@
#include "preferenceswidget.h"
#include "pwidget.h"
-CompendiumPreferencesWidget::CompendiumPreferencesWidget(TQWidget *tqparent, const char* name)
- : PrefWidget(tqparent,name)
+CompendiumPreferencesWidget::CompendiumPreferencesWidget(TQWidget *parent, const char* name)
+ : PrefWidget(parent,name)
, changed(false)
{
TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
diff --git a/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.h b/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.h
index e67a00d9..d98fe9c2 100644
--- a/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.h
+++ b/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.h
@@ -45,7 +45,7 @@ class CompendiumPreferencesWidget : public PrefWidget
TQ_OBJECT
public:
- CompendiumPreferencesWidget(TQWidget *tqparent=0, const char* name=0);
+ CompendiumPreferencesWidget(TQWidget *parent=0, const char* name=0);
virtual ~CompendiumPreferencesWidget();
virtual void apply();
diff --git a/kbabel/kbabeldict/modules/tmx/pc_factory.cpp b/kbabel/kbabeldict/modules/tmx/pc_factory.cpp
index 772eae41..864f9fed 100644
--- a/kbabel/kbabeldict/modules/tmx/pc_factory.cpp
+++ b/kbabel/kbabeldict/modules/tmx/pc_factory.cpp
@@ -54,8 +54,8 @@ KInstance *PcFactory::s_instance = 0;
KAboutData *PcFactory::s_about = 0;
-PcFactory::PcFactory( TQObject *tqparent, const char *name)
- : KLibFactory(tqparent,name)
+PcFactory::PcFactory( TQObject *parent, const char *name)
+ : KLibFactory(parent,name)
{
}
@@ -75,7 +75,7 @@ PcFactory::~PcFactory()
}
-TQObject *PcFactory::createObject( TQObject *tqparent, const char *name
+TQObject *PcFactory::createObject( TQObject *parent, const char *name
, const char *classname, const TQStringList &)
{
if(TQCString(classname) != "SearchEngine")
@@ -84,7 +84,7 @@ TQObject *PcFactory::createObject( TQObject *tqparent, const char *name
return 0;
}
- return new TmxCompendium(tqparent,name);
+ return new TmxCompendium(parent,name);
}
diff --git a/kbabel/kbabeldict/modules/tmx/pc_factory.h b/kbabel/kbabeldict/modules/tmx/pc_factory.h
index f4337116..9ddaf873 100644
--- a/kbabel/kbabeldict/modules/tmx/pc_factory.h
+++ b/kbabel/kbabeldict/modules/tmx/pc_factory.h
@@ -46,10 +46,10 @@ class PcFactory : public KLibFactory
Q_OBJECT
TQ_OBJECT
public:
- PcFactory( TQObject *tqparent=0, const char *name=0);
+ PcFactory( TQObject *parent=0, const char *name=0);
~PcFactory();
- virtual TQObject *createObject( TQObject *tqparent=0, const char *name=0
+ virtual TQObject *createObject( TQObject *parent=0, const char *name=0
, const char *classname=TQOBJECT_OBJECT_NAME_STRING
, const TQStringList &args = TQStringList());
diff --git a/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp b/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp
index 16200985..7aed4474 100644
--- a/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp
+++ b/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp
@@ -46,8 +46,8 @@
#include "preferenceswidget.h"
#include "pwidget.h"
-TmxCompendiumPreferencesWidget::TmxCompendiumPreferencesWidget(TQWidget *tqparent, const char* name)
- : PrefWidget(tqparent,name)
+TmxCompendiumPreferencesWidget::TmxCompendiumPreferencesWidget(TQWidget *parent, const char* name)
+ : PrefWidget(parent,name)
, changed(false)
{
TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
diff --git a/kbabel/kbabeldict/modules/tmx/preferenceswidget.h b/kbabel/kbabeldict/modules/tmx/preferenceswidget.h
index a91aff42..ad18a169 100644
--- a/kbabel/kbabeldict/modules/tmx/preferenceswidget.h
+++ b/kbabel/kbabeldict/modules/tmx/preferenceswidget.h
@@ -47,7 +47,7 @@ class TmxCompendiumPreferencesWidget : public PrefWidget
TQ_OBJECT
public:
- TmxCompendiumPreferencesWidget(TQWidget *tqparent=0, const char* name=0);
+ TmxCompendiumPreferencesWidget(TQWidget *parent=0, const char* name=0);
virtual ~TmxCompendiumPreferencesWidget();
virtual void apply();
diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp
index 42dfbdee..9163d7cb 100644
--- a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp
+++ b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp
@@ -58,8 +58,8 @@
static KStaticDeleter< TQDict<TmxCompendiumData> > compDataDeleter;
TQDict<TmxCompendiumData> *TmxCompendium::_compDict = 0;
-TmxCompendium::TmxCompendium(TQObject *tqparent, const char *name)
- : SearchEngine(tqparent, name)
+TmxCompendium::TmxCompendium(TQObject *parent, const char *name)
+ : SearchEngine(parent, name)
{
prefWidget=0;
data=0;
@@ -152,9 +152,9 @@ void TmxCompendium::readSettings(KConfigBase *config)
restoreSettings();
}
-PrefWidget *TmxCompendium::preferencesWidget(TQWidget *tqparent)
+PrefWidget *TmxCompendium::preferencesWidget(TQWidget *parent)
{
- prefWidget = new TmxCompendiumPreferencesWidget(tqparent,"tmxcompendium_prefwidget");
+ prefWidget = new TmxCompendiumPreferencesWidget(parent,"tmxcompendium_prefwidget");
connect(prefWidget, TQT_SIGNAL(applySettings()), this, TQT_SLOT(applySettings()));
connect(prefWidget, TQT_SIGNAL(restoreSettings())
, this, TQT_SLOT(restoreSettings()));
diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendium.h b/kbabel/kbabeldict/modules/tmx/tmxcompendium.h
index 8e96fbd5..9fec1b92 100644
--- a/kbabel/kbabeldict/modules/tmx/tmxcompendium.h
+++ b/kbabel/kbabeldict/modules/tmx/tmxcompendium.h
@@ -53,7 +53,7 @@ class TmxCompendium : public SearchEngine
TQ_OBJECT
public:
- TmxCompendium(TQObject *tqparent=0, const char *name=0);
+ TmxCompendium(TQObject *parent=0, const char *name=0);
virtual ~TmxCompendium();
virtual bool isReady() const;
@@ -66,7 +66,7 @@ public:
virtual void saveSettings(KConfigBase *config);
virtual void readSettings(KConfigBase *config);
- virtual PrefWidget *preferencesWidget(TQWidget *tqparent);
+ virtual PrefWidget *preferencesWidget(TQWidget *parent);
virtual const KAboutData *about() const;
diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp
index d4497e29..8646806e 100644
--- a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp
+++ b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp
@@ -47,8 +47,8 @@
using namespace KBabel;
-TmxCompendiumData::TmxCompendiumData(TQObject *tqparent)
- : TQObject(tqparent)
+TmxCompendiumData::TmxCompendiumData(TQObject *parent)
+ : TQObject(parent)
, _active(false)
, _error(false)
, _initialized(false)
diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.h b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.h
index 325fb9b5..3e8f2825 100644
--- a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.h
+++ b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.h
@@ -50,7 +50,7 @@ class TmxCompendiumData : public TQObject
TQ_OBJECT
public:
- TmxCompendiumData(TQObject *tqparent=0);
+ TmxCompendiumData(TQObject *parent=0);
bool load(const KURL& url, const TQString& language);
diff --git a/kbabel/kbabeldict/searchengine.cpp b/kbabel/kbabeldict/searchengine.cpp
index 912f4da7..bceec8a8 100644
--- a/kbabel/kbabeldict/searchengine.cpp
+++ b/kbabel/kbabeldict/searchengine.cpp
@@ -62,8 +62,8 @@ SearchResult::SearchResult(const SearchResult& r)
}
-PrefWidget::PrefWidget(TQWidget *tqparent, const char *name)
- : TQWidget(tqparent,name)
+PrefWidget::PrefWidget(TQWidget *parent, const char *name)
+ : TQWidget(parent,name)
{
}
@@ -72,8 +72,8 @@ PrefWidget::~PrefWidget()
}
-SearchEngine::SearchEngine(TQObject *tqparent, const char *name)
- : TQObject(tqparent, name)
+SearchEngine::SearchEngine(TQObject *parent, const char *name)
+ : TQObject(parent, name)
{
autoUpdate=false;
results.setAutoDelete(true);
diff --git a/kbabel/kbabeldict/searchengine.h b/kbabel/kbabeldict/searchengine.h
index f14baa1e..c5b28ad5 100644
--- a/kbabel/kbabeldict/searchengine.h
+++ b/kbabel/kbabeldict/searchengine.h
@@ -247,7 +247,7 @@ class KDE_EXPORT PrefWidget : public TQWidget
TQ_OBJECT
public:
- PrefWidget(TQWidget *tqparent, const char* name=0);
+ PrefWidget(TQWidget *parent, const char* name=0);
virtual ~PrefWidget();
public slots:
@@ -272,7 +272,7 @@ class KDE_EXPORT SearchEngine : public TQObject
TQ_OBJECT
public:
- SearchEngine(TQObject *tqparent=0, const char *name=0);
+ SearchEngine(TQObject *parent=0, const char *name=0);
virtual ~SearchEngine();
@@ -354,9 +354,9 @@ public:
* search engine. The returned widget should not be bigger than
* 400x400. If you need more space, you maybe want to use
* a tabbed widget.
- * @param tqparent the tqparent of the returned widget
+ * @param parent the parent of the returned widget
*/
- virtual PrefWidget* preferencesWidget(TQWidget *tqparent)=0;
+ virtual PrefWidget* preferencesWidget(TQWidget *parent)=0;
/** @returns information about this SearchEngine */
virtual const KAboutData *about() const= 0;
diff --git a/kbugbuster/backend/mailsender.cpp b/kbugbuster/backend/mailsender.cpp
index 58ed6c93..2a5ae930 100644
--- a/kbugbuster/backend/mailsender.cpp
+++ b/kbugbuster/backend/mailsender.cpp
@@ -151,22 +151,22 @@ bool MailSender::send(const TQString &fromName,const TQString &fromEmail,const T
void MailSender::smtpSuccess()
{
- if ( tqparent() != sender() || !tqparent()->inherits( "Smtp" ) )
+ if ( parent() != sender() || !parent()->inherits( "Smtp" ) )
return;
- static_cast<Smtp *>( tqparent() )->quit();
+ static_cast<Smtp *>( parent() )->quit();
emit finished();
}
void MailSender::smtpError(const TQString &_command, const TQString &_response)
{
- if ( tqparent() != sender() || !tqparent()->inherits( "Smtp" ) )
+ if ( parent() != sender() || !parent()->inherits( "Smtp" ) )
return;
TQString command = _command;
TQString response = _response;
- Smtp *smtp = static_cast<Smtp *>( tqparent() );
+ Smtp *smtp = static_cast<Smtp *>( parent() );
smtp->removeChild( this );
delete smtp;
diff --git a/kbugbuster/gui/buglvi.cpp b/kbugbuster/gui/buglvi.cpp
index 320462ff..f4643b8d 100644
--- a/kbugbuster/gui/buglvi.cpp
+++ b/kbugbuster/gui/buglvi.cpp
@@ -27,8 +27,8 @@
using namespace KBugBusterMainWindow;
-BugLVI::BugLVI( KListView *tqparent , const Bug &bug )
-: KListViewItem( tqparent, bug.number() + " ",
+BugLVI::BugLVI( KListView *parent , const Bug &bug )
+: KListViewItem( parent, bug.number() + " ",
i18n( "1 day", "%n days", bug.age() ),
bug.title(), //KStringHandler::csqueeze( bug.title(), 70 ),
Bug::statusLabel( bug.status() ),
diff --git a/kbugbuster/gui/buglvi.h b/kbugbuster/gui/buglvi.h
index 94b91299..5f66f398 100644
--- a/kbugbuster/gui/buglvi.h
+++ b/kbugbuster/gui/buglvi.h
@@ -31,7 +31,7 @@ namespace KBugBusterMainWindow
class BugLVI : public KListViewItem
{
public:
- BugLVI( KListView *tqparent , const Bug &bug );
+ BugLVI( KListView *parent , const Bug &bug );
~BugLVI();
Bug& bug() { return m_bug; }
diff --git a/kbugbuster/gui/centralwidget.cpp b/kbugbuster/gui/centralwidget.cpp
index 2c715bc1..9a747367 100644
--- a/kbugbuster/gui/centralwidget.cpp
+++ b/kbugbuster/gui/centralwidget.cpp
@@ -48,9 +48,9 @@ using namespace KBugBusterMainWindow;
CentralWidget::CentralWidget( const TQCString &initialPackage,
const TQCString &initialComponent,
- const TQCString &initialBug, TQWidget *tqparent,
+ const TQCString &initialBug, TQWidget *parent,
const char * name )
- : TQWidget( tqparent, name )
+ : TQWidget( parent, name )
{
// Master tqlayout
( new TQVBoxLayout( this, 0,
diff --git a/kbugbuster/gui/centralwidget.h b/kbugbuster/gui/centralwidget.h
index 9a4f3574..619c654d 100644
--- a/kbugbuster/gui/centralwidget.h
+++ b/kbugbuster/gui/centralwidget.h
@@ -45,7 +45,7 @@ class CentralWidget : public TQWidget
public:
CentralWidget( const TQCString &initialPackage,
const TQCString &initalComponent,const TQCString& initialBug,
- TQWidget* tqparent = 0, const char* name = 0 );
+ TQWidget* parent = 0, const char* name = 0 );
~CentralWidget();
void initialize( const TQString &initialPackage = TQString(),
diff --git a/kbugbuster/gui/cwbugdetails.cpp b/kbugbuster/gui/cwbugdetails.cpp
index 6c6115c1..f0e07cb2 100644
--- a/kbugbuster/gui/cwbugdetails.cpp
+++ b/kbugbuster/gui/cwbugdetails.cpp
@@ -35,8 +35,8 @@
using namespace KBugBusterMainWindow;
-CWBugDetails::CWBugDetails( TQWidget *tqparent , const char * name )
- : TQWidget( tqparent, name )
+CWBugDetails::CWBugDetails( TQWidget *parent , const char * name )
+ : TQWidget( parent, name )
{
TQBoxLayout *topLayout = new TQVBoxLayout( this );
diff --git a/kbugbuster/gui/cwbugdetails.h b/kbugbuster/gui/cwbugdetails.h
index 169899c3..d5deb1cc 100644
--- a/kbugbuster/gui/cwbugdetails.h
+++ b/kbugbuster/gui/cwbugdetails.h
@@ -38,7 +38,7 @@ class CWBugDetails : public TQWidget
TQ_OBJECT
public:
- CWBugDetails( TQWidget* tqparent = 0, const char* name = 0 );
+ CWBugDetails( TQWidget* parent = 0, const char* name = 0 );
~CWBugDetails();
void setBug( const Bug &, const BugDetails & );
diff --git a/kbugbuster/gui/cwbugdetailscontainer.cpp b/kbugbuster/gui/cwbugdetailscontainer.cpp
index 89611ca0..ef8fc8ef 100644
--- a/kbugbuster/gui/cwbugdetailscontainer.cpp
+++ b/kbugbuster/gui/cwbugdetailscontainer.cpp
@@ -36,8 +36,8 @@
using namespace KBugBusterMainWindow;
-CWBugDetailsContainer::CWBugDetailsContainer( TQWidget *tqparent , const char * name )
-: CWBugDetailsContainer_Base( tqparent, name )
+CWBugDetailsContainer::CWBugDetailsContainer( TQWidget *parent , const char * name )
+: CWBugDetailsContainer_Base( parent, name )
{
// Do some stuff Designer can't do:
m_bugCloseBtn->setIconSet( BarIconSet( "edittrash" ) );
diff --git a/kbugbuster/gui/cwbugdetailscontainer.h b/kbugbuster/gui/cwbugdetailscontainer.h
index 8fedf8bb..f0c2f7c8 100644
--- a/kbugbuster/gui/cwbugdetailscontainer.h
+++ b/kbugbuster/gui/cwbugdetailscontainer.h
@@ -39,7 +39,7 @@ class CWBugDetailsContainer : public CWBugDetailsContainer_Base
TQ_OBJECT
public:
- CWBugDetailsContainer( TQWidget* tqparent = 0, const char* name = 0 );
+ CWBugDetailsContainer( TQWidget* parent = 0, const char* name = 0 );
~CWBugDetailsContainer();
void setBug( const Bug &, const BugDetails & );
diff --git a/kbugbuster/gui/cwbuglistcontainer.cpp b/kbugbuster/gui/cwbuglistcontainer.cpp
index fc496a9b..59b27899 100644
--- a/kbugbuster/gui/cwbuglistcontainer.cpp
+++ b/kbugbuster/gui/cwbuglistcontainer.cpp
@@ -41,8 +41,8 @@
using namespace KBugBusterMainWindow;
-CWBugListContainer::CWBugListContainer( TQWidget *tqparent , const char * name )
- : TQWidget( tqparent, name ), m_find(0), m_findItem(0)
+CWBugListContainer::CWBugListContainer( TQWidget *parent , const char * name )
+ : TQWidget( parent, name ), m_find(0), m_findItem(0)
{
TQBoxLayout *topLayout = new TQVBoxLayout( this );
topLayout->setSpacing( KDialog::spacingHint() );
diff --git a/kbugbuster/gui/cwbuglistcontainer.h b/kbugbuster/gui/cwbuglistcontainer.h
index 878b0a2b..048df22d 100644
--- a/kbugbuster/gui/cwbuglistcontainer.h
+++ b/kbugbuster/gui/cwbuglistcontainer.h
@@ -41,7 +41,7 @@ class CWBugListContainer : public TQWidget
TQ_OBJECT
public:
- CWBugListContainer( TQWidget* tqparent = 0, const char* name = 0 );
+ CWBugListContainer( TQWidget* parent = 0, const char* name = 0 );
~CWBugListContainer();
void setBugList( const Package &package, const TQString &component, const Bug::List &bugs );
diff --git a/kbugbuster/gui/cwloadingwidget.cpp b/kbugbuster/gui/cwloadingwidget.cpp
index 8bff359d..6e8a9852 100644
--- a/kbugbuster/gui/cwloadingwidget.cpp
+++ b/kbugbuster/gui/cwloadingwidget.cpp
@@ -27,16 +27,16 @@
using namespace KBugBusterMainWindow;
-CWLoadingWidget::CWLoadingWidget( WidgetMode mode, TQWidget *tqparent,
+CWLoadingWidget::CWLoadingWidget( WidgetMode mode, TQWidget *parent,
const char * name )
-: TQFrame( tqparent, name )
+: TQFrame( parent, name )
{
init( mode );
}
CWLoadingWidget::CWLoadingWidget( const TQString &text, WidgetMode mode,
- TQWidget *tqparent, const char * name )
-: TQFrame( tqparent, name )
+ TQWidget *parent, const char * name )
+: TQFrame( parent, name )
{
init( mode );
setText( text );
diff --git a/kbugbuster/gui/cwloadingwidget.h b/kbugbuster/gui/cwloadingwidget.h
index b2f49710..b0536b09 100644
--- a/kbugbuster/gui/cwloadingwidget.h
+++ b/kbugbuster/gui/cwloadingwidget.h
@@ -43,10 +43,10 @@ public:
*/
enum WidgetMode { TopFrame = 0, BottomFrame };
- CWLoadingWidget( WidgetMode mode = TopFrame, TQWidget* tqparent = 0,
+ CWLoadingWidget( WidgetMode mode = TopFrame, TQWidget* parent = 0,
const char* name = 0 );
CWLoadingWidget( const TQString &text, WidgetMode mode = TopFrame,
- TQWidget* tqparent = 0, const char* name = 0 );
+ TQWidget* parent = 0, const char* name = 0 );
~CWLoadingWidget();
TQString text() const { return m_text; }
diff --git a/kbugbuster/gui/cwsearchwidget.cpp b/kbugbuster/gui/cwsearchwidget.cpp
index 7fa6fb48..5a075bb8 100644
--- a/kbugbuster/gui/cwsearchwidget.cpp
+++ b/kbugbuster/gui/cwsearchwidget.cpp
@@ -26,8 +26,8 @@
using namespace KBugBusterMainWindow;
-CWSearchWidget::CWSearchWidget( TQWidget *tqparent , const char * name )
-: CWSearchWidget_Base( tqparent, name )
+CWSearchWidget::CWSearchWidget( TQWidget *parent , const char * name )
+: CWSearchWidget_Base( parent, name )
{
// Set fonts and margins
CWSearchWidget_BaseLayout->setSpacing( KDialog::spacingHint() );
diff --git a/kbugbuster/gui/cwsearchwidget.h b/kbugbuster/gui/cwsearchwidget.h
index 5539a45a..178c8631 100644
--- a/kbugbuster/gui/cwsearchwidget.h
+++ b/kbugbuster/gui/cwsearchwidget.h
@@ -31,7 +31,7 @@ class CWSearchWidget : public CWSearchWidget_Base
TQ_OBJECT
public:
- CWSearchWidget( TQWidget* tqparent = 0, const char* name = 0 );
+ CWSearchWidget( TQWidget* parent = 0, const char* name = 0 );
~CWSearchWidget();
public slots:
diff --git a/kbugbuster/gui/kbbmainwindow.cpp b/kbugbuster/gui/kbbmainwindow.cpp
index c351b68e..3c57c6eb 100644
--- a/kbugbuster/gui/kbbmainwindow.cpp
+++ b/kbugbuster/gui/kbbmainwindow.cpp
@@ -61,8 +61,8 @@ using namespace KBugBusterMainWindow;
class TextViewer : public KDialogBase
{
public:
- TextViewer( const TQString &title, TQWidget *tqparent = 0 )
- : KDialogBase( Plain, title, Ok, Ok, tqparent, 0,
+ TextViewer( const TQString &title, TQWidget *parent = 0 )
+ : KDialogBase( Plain, title, Ok, Ok, parent, 0,
false )
{
TQFrame *topFrame = plainPage();
diff --git a/kbugbuster/gui/kbbmainwindow.h b/kbugbuster/gui/kbbmainwindow.h
index 9cb7d2f2..71d621ec 100644
--- a/kbugbuster/gui/kbbmainwindow.h
+++ b/kbugbuster/gui/kbbmainwindow.h
@@ -56,7 +56,7 @@ class KBBMainWindow : public KMainWindow, virtual public KBookmarkOwner
KBBMainWindow( const TQCString &initialPackage = "",
const TQCString &initialCpomponent = "",
const TQCString &initialBug = "",
- TQWidget* tqparent = 0, const char* name = 0 );
+ TQWidget* parent = 0, const char* name = 0 );
~KBBMainWindow();
/// Overloaded functions of KBookmarkOwner
diff --git a/kbugbuster/gui/messageeditor.cpp b/kbugbuster/gui/messageeditor.cpp
index df9ca4e1..54d56ea6 100644
--- a/kbugbuster/gui/messageeditor.cpp
+++ b/kbugbuster/gui/messageeditor.cpp
@@ -14,8 +14,8 @@
#include <tqpushbutton.h>
#include "messageeditor.moc"
-MessageEditor::MessageEditor( TQWidget *tqparent )
- : KDialogBase(Plain,i18n("Edit Message Buttons"),Ok|Cancel,Ok,tqparent,0,
+MessageEditor::MessageEditor( TQWidget *parent )
+ : KDialogBase(Plain,i18n("Edit Message Buttons"),Ok|Cancel,Ok,parent,0,
true,true)
{
TQFrame *topFrame = plainPage();
diff --git a/kbugbuster/gui/messageeditor.h b/kbugbuster/gui/messageeditor.h
index de004511..79d02ccf 100644
--- a/kbugbuster/gui/messageeditor.h
+++ b/kbugbuster/gui/messageeditor.h
@@ -10,7 +10,7 @@ class MessageEditor : public KDialogBase {
Q_OBJECT
TQ_OBJECT
public:
- MessageEditor( TQWidget *tqparent );
+ MessageEditor( TQWidget *parent );
protected slots:
void slotOk();
diff --git a/kbugbuster/gui/msginputdialog.cpp b/kbugbuster/gui/msginputdialog.cpp
index b84e269f..388a02df 100644
--- a/kbugbuster/gui/msginputdialog.cpp
+++ b/kbugbuster/gui/msginputdialog.cpp
@@ -20,8 +20,8 @@
MsgInputDialog::MsgInputDialog(MsgInputDialog::MessageType type, const Bug &bug,
const Package &package, const TQString &quotedMsg,
- TQWidget *tqparent)
- : KDialogBase(Plain,TQString(),User1|User2|Ok|Cancel,Ok,tqparent,0,false,
+ TQWidget *parent)
+ : KDialogBase(Plain,TQString(),User1|User2|Ok|Cancel,Ok,parent,0,false,
true,KStdGuiItem::clear(),i18n( "&Edit Presets..." )),
mBug( bug ),
mPackage( package ),
diff --git a/kbugbuster/gui/msginputdialog.h b/kbugbuster/gui/msginputdialog.h
index 996a46ef..3b0e8ff3 100644
--- a/kbugbuster/gui/msginputdialog.h
+++ b/kbugbuster/gui/msginputdialog.h
@@ -18,7 +18,7 @@ class MsgInputDialog : public KDialogBase
enum MessageType{ Close, Reply, ReplyPrivate };
MsgInputDialog( MessageType, const Bug &, const Package &,
- const TQString &, TQWidget *tqparent=0);
+ const TQString &, TQWidget *parent=0);
virtual ~MsgInputDialog();
TQString message() const;
diff --git a/kbugbuster/gui/packagelvi.cpp b/kbugbuster/gui/packagelvi.cpp
index d432d312..6374fe29 100644
--- a/kbugbuster/gui/packagelvi.cpp
+++ b/kbugbuster/gui/packagelvi.cpp
@@ -16,15 +16,15 @@
#include "packagelvi.h"
-PackageLVI::PackageLVI( TQListView *tqparent , const Package &pkg, const TQString &component )
-: TQListViewItem( tqparent, pkg.name(), pkg.description() )
+PackageLVI::PackageLVI( TQListView *parent , const Package &pkg, const TQString &component )
+: TQListViewItem( parent, pkg.name(), pkg.description() )
{
m_package = pkg;
m_component = component;
}
-PackageLVI::PackageLVI( TQListViewItem *tqparent , const Package &pkg, const TQString &component )
-: TQListViewItem( tqparent, component )
+PackageLVI::PackageLVI( TQListViewItem *parent , const Package &pkg, const TQString &component )
+: TQListViewItem( parent, component )
{
m_package = pkg;
m_component = component;
diff --git a/kbugbuster/gui/packagelvi.h b/kbugbuster/gui/packagelvi.h
index 435c1331..0fae435e 100644
--- a/kbugbuster/gui/packagelvi.h
+++ b/kbugbuster/gui/packagelvi.h
@@ -28,9 +28,9 @@ class PackageLVI : public TQListViewItem
{
public:
// Top-level package
- PackageLVI( TQListView *tqparent , const Package &pkg, const TQString &component );
+ PackageLVI( TQListView *parent , const Package &pkg, const TQString &component );
// Child component
- PackageLVI( TQListViewItem *tqparent , const Package &pkg, const TQString &component );
+ PackageLVI( TQListViewItem *parent , const Package &pkg, const TQString &component );
~PackageLVI();
diff --git a/kbugbuster/gui/packageselectdialog.cpp b/kbugbuster/gui/packageselectdialog.cpp
index 98cb1ece..4d3e72ac 100644
--- a/kbugbuster/gui/packageselectdialog.cpp
+++ b/kbugbuster/gui/packageselectdialog.cpp
@@ -14,8 +14,8 @@
#include "packageselectdialog.h"
#include "packageselectdialog.moc"
-PackageListView::PackageListView( TQWidget *tqparent ) :
- TQListView( tqparent )
+PackageListView::PackageListView( TQWidget *parent ) :
+ TQListView( parent )
{
setFocusPolicy( TQ_StrongFocus );
}
@@ -39,8 +39,8 @@ void PackageListView::keyPressEvent( TQKeyEvent *e )
emit typed( mTyped );
}
-PackageSelectDialog::PackageSelectDialog(TQWidget *tqparent,const char *name) :
- KDialogBase( tqparent, name, true, i18n("Select Product"), Ok|Cancel )
+PackageSelectDialog::PackageSelectDialog(TQWidget *parent,const char *name) :
+ KDialogBase( parent, name, true, i18n("Select Product"), Ok|Cancel )
{
TQWidget *topWidget = new TQWidget( this );
setMainWidget( topWidget );
diff --git a/kbugbuster/gui/packageselectdialog.h b/kbugbuster/gui/packageselectdialog.h
index a3ab9b59..dec96efa 100644
--- a/kbugbuster/gui/packageselectdialog.h
+++ b/kbugbuster/gui/packageselectdialog.h
@@ -15,7 +15,7 @@ class PackageListView : public TQListView
Q_OBJECT
TQ_OBJECT
public:
- PackageListView( TQWidget *tqparent );
+ PackageListView( TQWidget *parent );
void resetTyped();
@@ -34,7 +34,7 @@ class PackageSelectDialog : public KDialogBase
Q_OBJECT
TQ_OBJECT
public:
- PackageSelectDialog(TQWidget *tqparent=0,const char *name=0);
+ PackageSelectDialog(TQWidget *parent=0,const char *name=0);
~PackageSelectDialog();
void setRecentPackages( const TQStringList & );
diff --git a/kbugbuster/gui/preferencesdialog.cpp b/kbugbuster/gui/preferencesdialog.cpp
index 2b6f09ab..2c1a845c 100644
--- a/kbugbuster/gui/preferencesdialog.cpp
+++ b/kbugbuster/gui/preferencesdialog.cpp
@@ -51,7 +51,7 @@ class ServerItem : public TQListViewItem
class ServerListView : public TQListView
{
public:
- ServerListView( TQWidget *tqparent ) : TQListView( tqparent )
+ ServerListView( TQWidget *parent ) : TQListView( parent )
{
addColumn( i18n("Name") );
addColumn( i18n("Base URL") );
@@ -60,9 +60,9 @@ class ServerListView : public TQListView
}
};
-PreferencesDialog::PreferencesDialog( TQWidget* tqparent, const char* name )
+PreferencesDialog::PreferencesDialog( TQWidget* parent, const char* name )
: KDialogBase ( IconList, i18n("Preferences"), Ok|Apply|Cancel, Ok,
- tqparent, name, false, true )
+ parent, name, false, true )
{
setupServerPage();
setupAdvancedPage();
@@ -274,21 +274,21 @@ void PreferencesDialog::writeConfig()
emit configChanged();
}
-SelectServerDlg::SelectServerDlg(PreferencesDialog *tqparent, const char */*name*/ )
- :KDialogBase(tqparent, 0, true, i18n("Select Server"),
+SelectServerDlg::SelectServerDlg(PreferencesDialog *parent, const char */*name*/ )
+ :KDialogBase(parent, 0, true, i18n("Select Server"),
KDialogBase::Ok | KDialogBase::Cancel)
{
list = new ServerListView(this );
setMainWidget( list );
- tqparent->createServerItem( list, "KDE", "http://bugs.kde.org", "KDE" );
- tqparent->createServerItem( list, "GNOME", "http://bugzilla.gnome.org", "2.10" );
- tqparent->createServerItem( list, "Mozilla", "http://bugzilla.mozilla.org", "2.17.1" );
- tqparent->createServerItem( list, "Apache", "http://nagoya.apache.org/bugzilla/", "2.14.2" );
- tqparent->createServerItem( list, "XFree86", "http://bugs.xfree86.org/cgi-bin/bugzilla/", "2.14.2" );
- tqparent->createServerItem( list, "Ximian", "http://bugzilla.ximian.com", "2.10" );
- tqparent->createServerItem( list, "RedHat", "http://bugzilla.redhat.com/bugzilla/", "2.17.1" );
- tqparent->createServerItem( list, "Mandriva", "http://qa.mandriva.com/", "2.17.4" );
+ parent->createServerItem( list, "KDE", "http://bugs.kde.org", "KDE" );
+ parent->createServerItem( list, "GNOME", "http://bugzilla.gnome.org", "2.10" );
+ parent->createServerItem( list, "Mozilla", "http://bugzilla.mozilla.org", "2.17.1" );
+ parent->createServerItem( list, "Apache", "http://nagoya.apache.org/bugzilla/", "2.14.2" );
+ parent->createServerItem( list, "XFree86", "http://bugs.xfree86.org/cgi-bin/bugzilla/", "2.14.2" );
+ parent->createServerItem( list, "Ximian", "http://bugzilla.ximian.com", "2.10" );
+ parent->createServerItem( list, "RedHat", "http://bugzilla.redhat.com/bugzilla/", "2.17.1" );
+ parent->createServerItem( list, "Mandriva", "http://qa.mandriva.com/", "2.17.4" );
connect( list, TQT_SIGNAL( doubleClicked ( TQListViewItem *)), this, TQT_SLOT( slotDoubleClicked( TQListViewItem *)));
}
diff --git a/kbugbuster/gui/preferencesdialog.h b/kbugbuster/gui/preferencesdialog.h
index 209a084c..1e6d824d 100644
--- a/kbugbuster/gui/preferencesdialog.h
+++ b/kbugbuster/gui/preferencesdialog.h
@@ -15,7 +15,7 @@ class PreferencesDialog : public KDialogBase
Q_OBJECT
TQ_OBJECT
public:
- PreferencesDialog( TQWidget* tqparent = 0, const char* name = 0 );
+ PreferencesDialog( TQWidget* parent = 0, const char* name = 0 );
~PreferencesDialog();
void createServerItem( ServerListView *listView, const TQString &name,
@@ -65,7 +65,7 @@ class SelectServerDlg : public KDialogBase
Q_OBJECT
TQ_OBJECT
public:
- SelectServerDlg(PreferencesDialog *tqparent, const char */*name*/ );
+ SelectServerDlg(PreferencesDialog *parent, const char */*name*/ );
ServerItem *serverSelected();
protected slots:
void slotDoubleClicked( TQListViewItem *);
diff --git a/kbugbuster/gui/serverconfigdialog.cpp b/kbugbuster/gui/serverconfigdialog.cpp
index 99cb28f3..feaab83d 100644
--- a/kbugbuster/gui/serverconfigdialog.cpp
+++ b/kbugbuster/gui/serverconfigdialog.cpp
@@ -12,8 +12,8 @@
#include <tqvbox.h>
#include <tqcombobox.h>
-ServerConfigDialog::ServerConfigDialog( TQWidget *tqparent, const char *name ) :
- KDialogBase( tqparent, name, true, i18n("Edit Bugzilla Server"), Ok|Cancel )
+ServerConfigDialog::ServerConfigDialog( TQWidget *parent, const char *name ) :
+ KDialogBase( parent, name, true, i18n("Edit Bugzilla Server"), Ok|Cancel )
{
TQWidget *topFrame = makeMainWidget();
diff --git a/kbugbuster/gui/serverconfigdialog.h b/kbugbuster/gui/serverconfigdialog.h
index 39a0d596..36bdbd96 100644
--- a/kbugbuster/gui/serverconfigdialog.h
+++ b/kbugbuster/gui/serverconfigdialog.h
@@ -13,7 +13,7 @@ class ServerConfigDialog : public KDialogBase
Q_OBJECT
TQ_OBJECT
public:
- ServerConfigDialog( TQWidget *tqparent = 0 , const char *name = 0 );
+ ServerConfigDialog( TQWidget *parent = 0 , const char *name = 0 );
void setServerConfig( const BugServerConfig & );
BugServerConfig serverConfig();
diff --git a/kbugbuster/gui/severityselectdialog.cpp b/kbugbuster/gui/severityselectdialog.cpp
index c21a5383..bef2640b 100644
--- a/kbugbuster/gui/severityselectdialog.cpp
+++ b/kbugbuster/gui/severityselectdialog.cpp
@@ -10,8 +10,8 @@
#include "severityselectdialog.h"
#include "severityselectdialog.moc"
-SeveritySelectDialog::SeveritySelectDialog(TQWidget *tqparent,const char *name) :
- KDialogBase( tqparent, name, true, i18n("Select Severity"), Ok|Cancel )
+SeveritySelectDialog::SeveritySelectDialog(TQWidget *parent,const char *name) :
+ KDialogBase( parent, name, true, i18n("Select Severity"), Ok|Cancel )
{
mButtonGroup = new TQButtonGroup( 1,Qt::Horizontal, i18n("Severity"), this );
setMainWidget( mButtonGroup );
diff --git a/kbugbuster/gui/severityselectdialog.h b/kbugbuster/gui/severityselectdialog.h
index 778f2900..46f52bb0 100644
--- a/kbugbuster/gui/severityselectdialog.h
+++ b/kbugbuster/gui/severityselectdialog.h
@@ -10,7 +10,7 @@ class SeveritySelectDialog : public KDialogBase
Q_OBJECT
TQ_OBJECT
public:
- SeveritySelectDialog(TQWidget *tqparent=0,const char *name=0);
+ SeveritySelectDialog(TQWidget *parent=0,const char *name=0);
void setSeverity( Bug::Severity );
diff --git a/kbugbuster/kresources/kcalresourceconfig.cpp b/kbugbuster/kresources/kcalresourceconfig.cpp
index 3ed92e54..58466642 100644
--- a/kbugbuster/kresources/kcalresourceconfig.cpp
+++ b/kbugbuster/kresources/kcalresourceconfig.cpp
@@ -34,8 +34,8 @@
#include "resourceprefs.h"
#include "kcalresourceconfig.h"
-KCalResourceConfig::KCalResourceConfig( TQWidget* tqparent, const char* name )
- : KRES::ConfigWidget( tqparent, name )
+KCalResourceConfig::KCalResourceConfig( TQWidget* parent, const char* name )
+ : KRES::ConfigWidget( parent, name )
{
resize( 245, 115 );
diff --git a/kbugbuster/kresources/kcalresourceconfig.h b/kbugbuster/kresources/kcalresourceconfig.h
index de8eb4d2..cbfdcfe3 100644
--- a/kbugbuster/kresources/kcalresourceconfig.h
+++ b/kbugbuster/kresources/kcalresourceconfig.h
@@ -36,7 +36,7 @@ class KCalResourceConfig : public KRES::ConfigWidget
Q_OBJECT
TQ_OBJECT
public:
- KCalResourceConfig( TQWidget *tqparent = 0, const char *name = 0 );
+ KCalResourceConfig( TQWidget *parent = 0, const char *name = 0 );
public slots:
virtual void loadSettings( KRES::Resource *resource );
diff --git a/kcachegrind/kcachegrind/callgraphview.cpp b/kcachegrind/kcachegrind/callgraphview.cpp
index 4135f6b4..5fc8dbb3 100644
--- a/kcachegrind/kcachegrind/callgraphview.cpp
+++ b/kcachegrind/kcachegrind/callgraphview.cpp
@@ -963,8 +963,8 @@ void GraphExporter::buildGraph(TraceFunction* f, int d,
//
// PannerView
//
-PannerView::PannerView(TQWidget * tqparent, const char * name)
- : TQCanvasView(tqparent, name, WNoAutoErase | WStaticContents)
+PannerView::PannerView(TQWidget * parent, const char * name)
+ : TQCanvasView(parent, name, WNoAutoErase | WStaticContents)
{
_movingZoomRect = false;
@@ -1368,8 +1368,8 @@ void CallGraphTip::maybeTip( const TQPoint& pos )
// CallGraphView
//
CallGraphView::CallGraphView(TraceItemView* parentView,
- TQWidget* tqparent, const char* name)
- : TQCanvasView(tqparent, name), TraceItemView(parentView)
+ TQWidget* parent, const char* name)
+ : TQCanvasView(parent, name), TraceItemView(parentView)
{
_zoomPosition = DEFAULT_ZOOMPOS;
_lastAutoPosition = TopLeft;
diff --git a/kcachegrind/kcachegrind/callgraphview.h b/kcachegrind/kcachegrind/callgraphview.h
index f2e567c1..631c6a30 100644
--- a/kcachegrind/kcachegrind/callgraphview.h
+++ b/kcachegrind/kcachegrind/callgraphview.h
@@ -287,7 +287,7 @@ class PannerView: public TQCanvasView
TQ_OBJECT
public:
- PannerView(TQWidget * tqparent = 0, const char * name = 0);
+ PannerView(TQWidget * parent = 0, const char * name = 0);
void setZoomRect(TQRect r);
@@ -423,7 +423,7 @@ public:
enum ZoomPosition { TopLeft, TopRight, BottomLeft, BottomRight, Auto };
CallGraphView(TraceItemView* parentView,
- TQWidget* tqparent=0, const char* name=0);
+ TQWidget* parent=0, const char* name=0);
~CallGraphView();
void readViewConfig(KConfig*, TQString prefix, TQString postfix, bool);
diff --git a/kcachegrind/kcachegrind/callitem.cpp b/kcachegrind/kcachegrind/callitem.cpp
index 3667f668..3a3a7266 100644
--- a/kcachegrind/kcachegrind/callitem.cpp
+++ b/kcachegrind/kcachegrind/callitem.cpp
@@ -34,8 +34,8 @@
// CallItem
-CallItem::CallItem(CallView* view, TQListView* tqparent, TraceCall* c)
- : TQListViewItem(tqparent)
+CallItem::CallItem(CallView* view, TQListView* parent, TraceCall* c)
+ : TQListViewItem(parent)
{
_call = c;
_view = view;
diff --git a/kcachegrind/kcachegrind/callmapview.cpp b/kcachegrind/kcachegrind/callmapview.cpp
index 605e572e..3f363f29 100644
--- a/kcachegrind/kcachegrind/callmapview.cpp
+++ b/kcachegrind/kcachegrind/callmapview.cpp
@@ -51,8 +51,8 @@
CallMapView::CallMapView(bool showCallers, TraceItemView* parentView,
- TQWidget* tqparent, const char* name)
- : TreeMapWidget(new CallMapBaseItem(), tqparent, name), TraceItemView(parentView)
+ TQWidget* parent, const char* name)
+ : TreeMapWidget(new CallMapBaseItem(), parent, name), TraceItemView(parentView)
{
_showCallers = showCallers;
@@ -116,7 +116,7 @@ TQString CallMapView::whatsThis() const
"<em>very</em> time consuming, you may want to limit "
"the maximum drawn nesting level before. "
"'Best' determinates the split direction for tqchildren "
- "from the aspect ratio of the tqparent. "
+ "from the aspect ratio of the parent. "
"'Always Best' decides on remaining space for each "
"sibling. "
"'Ignore Proportions' takes space for function name "
@@ -171,7 +171,7 @@ void CallMapView::context(TreeMapItem* i,const TQPoint & p)
if ((int)name.length()>Configuration::maxSymbolLength())
name = name.left(Configuration::maxSymbolLength()) + "...";
fpopup.insertItem(name, 101+count);
- item = item->tqparent();
+ item = item->parent();
count++;
}
popup.insertSeparator();
@@ -223,7 +223,7 @@ void CallMapView::context(TreeMapItem* i,const TQPoint & p)
l2popup.setItemChecked(201+count, true);
foundStopName = true;
}
- item = item->tqparent();
+ item = item->parent();
count++;
}
}
@@ -326,7 +326,7 @@ void CallMapView::context(TreeMapItem* i,const TQPoint & p)
if (r>100 && r<150) {
r -= 100;
while (i && (r>1)) {
- i=i->tqparent();
+ i=i->parent();
r--;
}
activatedSlot(i);
@@ -336,7 +336,7 @@ void CallMapView::context(TreeMapItem* i,const TQPoint & p)
if (r>200 && r<250) {
r -= 200;
while (i && (r>1)) {
- i=i->tqparent();
+ i=i->parent();
r--;
}
if (i)
@@ -556,7 +556,7 @@ TQString CallMapView::tipString(TreeMapItem* i) const
if (!tip.isEmpty()) tip += "\n";
tip += itemTip;
- i = i->tqparent();
+ i = i->parent();
count++;
}
if (count == Configuration::maxSymbolCount()) tip += "\n...";
diff --git a/kcachegrind/kcachegrind/callmapview.h b/kcachegrind/kcachegrind/callmapview.h
index 67cecb6d..1ee45258 100644
--- a/kcachegrind/kcachegrind/callmapview.h
+++ b/kcachegrind/kcachegrind/callmapview.h
@@ -35,7 +35,7 @@ class CallMapView: public TreeMapWidget, public TraceItemView
public:
CallMapView(bool showCallers, TraceItemView* parentView,
- TQWidget* tqparent=0, const char* name=0);
+ TQWidget* parent=0, const char* name=0);
TQWidget* widget() { return this; }
TQString whatsThis() const;
diff --git a/kcachegrind/kcachegrind/callview.cpp b/kcachegrind/kcachegrind/callview.cpp
index 11da69e4..2eb08f68 100644
--- a/kcachegrind/kcachegrind/callview.cpp
+++ b/kcachegrind/kcachegrind/callview.cpp
@@ -36,8 +36,8 @@
CallView::CallView(bool showCallers, TraceItemView* parentView,
- TQWidget* tqparent, const char* name)
- : TQListView(tqparent, name), TraceItemView(parentView)
+ TQWidget* parent, const char* name)
+ : TQListView(parent, name), TraceItemView(parentView)
{
_showCallers = showCallers;
diff --git a/kcachegrind/kcachegrind/callview.h b/kcachegrind/kcachegrind/callview.h
index b18e6c3c..be644f97 100644
--- a/kcachegrind/kcachegrind/callview.h
+++ b/kcachegrind/kcachegrind/callview.h
@@ -34,7 +34,7 @@ class CallView: public TQListView, public TraceItemView
public:
CallView(bool showCallers, TraceItemView* parentView,
- TQWidget* tqparent=0, const char* name=0);
+ TQWidget* parent=0, const char* name=0);
virtual TQWidget* widget() { return this; }
TQString whatsThis() const;
diff --git a/kcachegrind/kcachegrind/configdlg.cpp b/kcachegrind/kcachegrind/configdlg.cpp
index 4fa94f3a..7e56c686 100644
--- a/kcachegrind/kcachegrind/configdlg.cpp
+++ b/kcachegrind/kcachegrind/configdlg.cpp
@@ -38,8 +38,8 @@
ConfigDlg::ConfigDlg(Configuration* c, TraceData* data,
- TQWidget* tqparent, const char* name)
- :ConfigDlgBase(tqparent, name)
+ TQWidget* parent, const char* name)
+ :ConfigDlgBase(parent, name)
{
_config = c;
_data = data;
@@ -340,7 +340,7 @@ void ConfigDlg::dirsItemChanged(TQListViewItem* i)
void ConfigDlg::dirsDeletePressed()
{
if (!_dirItem || (_dirItem->depth() == 0)) return;
- TQListViewItem* p = _dirItem->tqparent();
+ TQListViewItem* p = _dirItem->parent();
if (!p) return;
Configuration* c = Configuration::config();
diff --git a/kcachegrind/kcachegrind/configdlg.h b/kcachegrind/kcachegrind/configdlg.h
index 58c9b80d..5ef6bab0 100644
--- a/kcachegrind/kcachegrind/configdlg.h
+++ b/kcachegrind/kcachegrind/configdlg.h
@@ -35,7 +35,7 @@ class ConfigDlg : public ConfigDlgBase
public:
ConfigDlg(Configuration*, TraceData*,
- TQWidget* tqparent = 0, const char* name = 0);
+ TQWidget* parent = 0, const char* name = 0);
~ConfigDlg();
static bool configure(Configuration*, TraceData*, TQWidget*);
diff --git a/kcachegrind/kcachegrind/costlistitem.cpp b/kcachegrind/kcachegrind/costlistitem.cpp
index 91caea4b..3129838a 100644
--- a/kcachegrind/kcachegrind/costlistitem.cpp
+++ b/kcachegrind/kcachegrind/costlistitem.cpp
@@ -33,9 +33,9 @@
// CostListItem
-CostListItem::CostListItem(TQListView* tqparent, TraceCostItem* costItem,
+CostListItem::CostListItem(TQListView* parent, TraceCostItem* costItem,
TraceCostType* ct, int size)
- :TQListViewItem(tqparent)
+ :TQListViewItem(parent)
{
_groupSize = size;
_skipped = 0;
@@ -49,9 +49,9 @@ CostListItem::CostListItem(TQListView* tqparent, TraceCostItem* costItem,
}
}
-CostListItem::CostListItem(TQListView* tqparent, int skipped,
+CostListItem::CostListItem(TQListView* parent, int skipped,
TraceCostItem* costItem, TraceCostType* ct)
- :TQListViewItem(tqparent)
+ :TQListViewItem(parent)
{
_skipped = skipped;
_costItem = costItem;
diff --git a/kcachegrind/kcachegrind/costlistitem.h b/kcachegrind/kcachegrind/costlistitem.h
index 369a0c74..99f654e1 100644
--- a/kcachegrind/kcachegrind/costlistitem.h
+++ b/kcachegrind/kcachegrind/costlistitem.h
@@ -25,10 +25,10 @@
class CostListItem: public TQListViewItem
{
public:
- CostListItem(TQListView* tqparent, TraceCostItem* cost,
+ CostListItem(TQListView* parent, TraceCostItem* cost,
TraceCostType* ct, int size = -1);
// entry with multiple skipped items
- CostListItem(TQListView* tqparent, int skipped, TraceCostItem* cost,
+ CostListItem(TQListView* parent, int skipped, TraceCostItem* cost,
TraceCostType* ct);
int compare(TQListViewItem * i, int col, bool ascending ) const;
diff --git a/kcachegrind/kcachegrind/costtypeitem.cpp b/kcachegrind/kcachegrind/costtypeitem.cpp
index cf71a3a9..df5bf35a 100644
--- a/kcachegrind/kcachegrind/costtypeitem.cpp
+++ b/kcachegrind/kcachegrind/costtypeitem.cpp
@@ -31,9 +31,9 @@
// CostTypeItem
-CostTypeItem::CostTypeItem(TQListView* tqparent, TraceCostItem* costItem,
+CostTypeItem::CostTypeItem(TQListView* parent, TraceCostItem* costItem,
TraceCostType* ct, TraceCost::CostType gt)
- :TQListViewItem(tqparent)
+ :TQListViewItem(parent)
{
_costItem = costItem;
_costType = ct;
diff --git a/kcachegrind/kcachegrind/costtypeitem.h b/kcachegrind/kcachegrind/costtypeitem.h
index 6bf60fa8..d34973db 100644
--- a/kcachegrind/kcachegrind/costtypeitem.h
+++ b/kcachegrind/kcachegrind/costtypeitem.h
@@ -30,7 +30,7 @@
class CostTypeItem: public TQListViewItem
{
public:
- CostTypeItem(TQListView* tqparent, TraceCostItem* costItem,
+ CostTypeItem(TQListView* parent, TraceCostItem* costItem,
TraceCostType* ct, TraceCost::CostType gt);
int compare(TQListViewItem * i, int col, bool ascending ) const;
diff --git a/kcachegrind/kcachegrind/costtypeview.cpp b/kcachegrind/kcachegrind/costtypeview.cpp
index ff69bf47..d4087eba 100644
--- a/kcachegrind/kcachegrind/costtypeview.cpp
+++ b/kcachegrind/kcachegrind/costtypeview.cpp
@@ -36,8 +36,8 @@
CostTypeView::CostTypeView(TraceItemView* parentView,
- TQWidget* tqparent, const char* name)
- : TQListView(tqparent, name), TraceItemView(parentView)
+ TQWidget* parent, const char* name)
+ : TQListView(parent, name), TraceItemView(parentView)
{
addColumn( i18n( "Event Type" ) );
addColumn( i18n( "Incl." ) );
diff --git a/kcachegrind/kcachegrind/costtypeview.h b/kcachegrind/kcachegrind/costtypeview.h
index 8940b3c7..ee9963e3 100644
--- a/kcachegrind/kcachegrind/costtypeview.h
+++ b/kcachegrind/kcachegrind/costtypeview.h
@@ -34,7 +34,7 @@ class CostTypeView: public TQListView, public TraceItemView
public:
CostTypeView(TraceItemView* parentView,
- TQWidget* tqparent=0, const char* name=0);
+ TQWidget* parent=0, const char* name=0);
virtual TQWidget* widget() { return this; }
TQString whatsThis() const;
diff --git a/kcachegrind/kcachegrind/coverageitem.cpp b/kcachegrind/kcachegrind/coverageitem.cpp
index ab872f71..569359a8 100644
--- a/kcachegrind/kcachegrind/coverageitem.cpp
+++ b/kcachegrind/kcachegrind/coverageitem.cpp
@@ -32,11 +32,11 @@
// CallerCoverageItem
-CallerCoverageItem::CallerCoverageItem(TQListView* tqparent, Coverage* c,
+CallerCoverageItem::CallerCoverageItem(TQListView* parent, Coverage* c,
TraceFunction* base,
TraceCostType* ct,
TraceCost::CostType gt)
- : TQListViewItem(tqparent)
+ : TQListViewItem(parent)
{
_skipped = 0;
_coverage = c;
@@ -50,11 +50,11 @@ CallerCoverageItem::CallerCoverageItem(TQListView* tqparent, Coverage* c,
setGroupType(gt);
}
-CallerCoverageItem::CallerCoverageItem(TQListView* tqparent, int skipped, Coverage* c,
+CallerCoverageItem::CallerCoverageItem(TQListView* parent, int skipped, Coverage* c,
TraceFunction* base,
TraceCostType* ct,
TraceCost::CostType gt)
- : TQListViewItem(tqparent)
+ : TQListViewItem(parent)
{
_skipped = skipped;
_coverage = c;
@@ -172,11 +172,11 @@ int CallerCoverageItem::compare(TQListViewItem * i,
// CalleeCoverageItem
-CalleeCoverageItem::CalleeCoverageItem(TQListView* tqparent, Coverage* c,
+CalleeCoverageItem::CalleeCoverageItem(TQListView* parent, Coverage* c,
TraceFunction* base,
TraceCostType* ct,
TraceCost::CostType gt)
- : TQListViewItem(tqparent)
+ : TQListViewItem(parent)
{
_skipped = 0;
_coverage = c;
@@ -190,11 +190,11 @@ CalleeCoverageItem::CalleeCoverageItem(TQListView* tqparent, Coverage* c,
setGroupType(gt);
}
-CalleeCoverageItem::CalleeCoverageItem(TQListView* tqparent, int skipped, Coverage* c,
+CalleeCoverageItem::CalleeCoverageItem(TQListView* parent, int skipped, Coverage* c,
TraceFunction* base,
TraceCostType* ct,
TraceCost::CostType gt)
- : TQListViewItem(tqparent)
+ : TQListViewItem(parent)
{
_skipped = skipped;
_coverage = c;
diff --git a/kcachegrind/kcachegrind/coverageitem.h b/kcachegrind/kcachegrind/coverageitem.h
index 04da4305..ba442aa6 100644
--- a/kcachegrind/kcachegrind/coverageitem.h
+++ b/kcachegrind/kcachegrind/coverageitem.h
@@ -31,9 +31,9 @@ class Coverage;
class CallerCoverageItem: public TQListViewItem
{
public:
- CallerCoverageItem(TQListView* tqparent, Coverage* c, TraceFunction* base,
+ CallerCoverageItem(TQListView* parent, Coverage* c, TraceFunction* base,
TraceCostType* ct, TraceCost::CostType gt);
- CallerCoverageItem(TQListView* tqparent, int skipped, Coverage* c, TraceFunction* base,
+ CallerCoverageItem(TQListView* parent, int skipped, Coverage* c, TraceFunction* base,
TraceCostType* ct, TraceCost::CostType gt);
int compare(TQListViewItem * i, int col, bool ascending ) const;
@@ -57,9 +57,9 @@ private:
class CalleeCoverageItem: public TQListViewItem
{
public:
- CalleeCoverageItem(TQListView* tqparent, Coverage* c, TraceFunction* base,
+ CalleeCoverageItem(TQListView* parent, Coverage* c, TraceFunction* base,
TraceCostType* ct, TraceCost::CostType gt);
- CalleeCoverageItem(TQListView* tqparent, int skipped, Coverage* c, TraceFunction* base,
+ CalleeCoverageItem(TQListView* parent, int skipped, Coverage* c, TraceFunction* base,
TraceCostType* ct, TraceCost::CostType gt);
int compare(TQListViewItem * i, int col, bool ascending ) const;
diff --git a/kcachegrind/kcachegrind/coverageview.cpp b/kcachegrind/kcachegrind/coverageview.cpp
index ba6ce77f..6243d8af 100644
--- a/kcachegrind/kcachegrind/coverageview.cpp
+++ b/kcachegrind/kcachegrind/coverageview.cpp
@@ -37,8 +37,8 @@
CoverageView::CoverageView(bool showCallers, TraceItemView* parentView,
- TQWidget* tqparent, const char* name)
- : TQListView(tqparent, name), TraceItemView(parentView)
+ TQWidget* parent, const char* name)
+ : TQListView(parent, name), TraceItemView(parentView)
{
_showCallers = showCallers;
diff --git a/kcachegrind/kcachegrind/coverageview.h b/kcachegrind/kcachegrind/coverageview.h
index 0be96e85..09c5de03 100644
--- a/kcachegrind/kcachegrind/coverageview.h
+++ b/kcachegrind/kcachegrind/coverageview.h
@@ -35,7 +35,7 @@ class CoverageView: public TQListView, public TraceItemView
public:
CoverageView(bool showCallers, TraceItemView* parentView,
- TQWidget* tqparent=0, const char* name=0);
+ TQWidget* parent=0, const char* name=0);
virtual TQWidget* widget() { return this; }
TQString whatsThis() const;
diff --git a/kcachegrind/kcachegrind/dumpselection.cpp b/kcachegrind/kcachegrind/dumpselection.cpp
index 15027325..4d812ef9 100644
--- a/kcachegrind/kcachegrind/dumpselection.cpp
+++ b/kcachegrind/kcachegrind/dumpselection.cpp
@@ -20,8 +20,8 @@
DumpSelection::DumpSelection( TopLevel* top,
- TQWidget* tqparent, const char* name)
- : DumpSelectionBase(tqparent, name), TraceItemView(0, top)
+ TQWidget* parent, const char* name)
+ : DumpSelectionBase(parent, name), TraceItemView(0, top)
{
}
diff --git a/kcachegrind/kcachegrind/dumpselection.h b/kcachegrind/kcachegrind/dumpselection.h
index b6bcddce..49ca532d 100644
--- a/kcachegrind/kcachegrind/dumpselection.h
+++ b/kcachegrind/kcachegrind/dumpselection.h
@@ -21,7 +21,7 @@ class DumpSelection : public DumpSelectionBase, public TraceItemView
TQ_OBJECT
public:
- DumpSelection( TopLevel*, TQWidget* tqparent = 0, const char* name = 0);
+ DumpSelection( TopLevel*, TQWidget* parent = 0, const char* name = 0);
virtual ~DumpSelection();
TQWidget* widget() { return this; }
diff --git a/kcachegrind/kcachegrind/functionitem.cpp b/kcachegrind/kcachegrind/functionitem.cpp
index 5b70fd2e..9df7e651 100644
--- a/kcachegrind/kcachegrind/functionitem.cpp
+++ b/kcachegrind/kcachegrind/functionitem.cpp
@@ -37,9 +37,9 @@
// FunctionItem
-FunctionItem::FunctionItem(TQListView* tqparent, TraceFunction* f,
+FunctionItem::FunctionItem(TQListView* parent, TraceFunction* f,
TraceCostType* ct, TraceCost::CostType gt)
- :TQListViewItem(tqparent)
+ :TQListViewItem(parent)
{
#if 0
_costPixValid = false;
@@ -56,9 +56,9 @@ FunctionItem::FunctionItem(TQListView* tqparent, TraceFunction* f,
setText(4, f->prettyLocation());
}
-FunctionItem::FunctionItem(TQListView* tqparent, int skipped,
+FunctionItem::FunctionItem(TQListView* parent, int skipped,
TraceFunction* f, TraceCostType* ct)
- :TQListViewItem(tqparent)
+ :TQListViewItem(parent)
{
#if 0
_costPixValid = false;
diff --git a/kcachegrind/kcachegrind/functionitem.h b/kcachegrind/kcachegrind/functionitem.h
index fcf24123..d8f98f49 100644
--- a/kcachegrind/kcachegrind/functionitem.h
+++ b/kcachegrind/kcachegrind/functionitem.h
@@ -29,10 +29,10 @@
class FunctionItem: public TQListViewItem
{
public:
- FunctionItem(TQListView* tqparent, TraceFunction* function,
+ FunctionItem(TQListView* parent, TraceFunction* function,
TraceCostType* ct, TraceCost::CostType gt);
// constructor for a "Skipped ... " entry
- FunctionItem(TQListView* tqparent, int skipped,
+ FunctionItem(TQListView* parent, int skipped,
TraceFunction* function, TraceCostType* ct);
int compare(TQListViewItem * i, int col, bool ascending ) const;
diff --git a/kcachegrind/kcachegrind/functionselection.cpp b/kcachegrind/kcachegrind/functionselection.cpp
index 0ea7e72c..437a17bf 100644
--- a/kcachegrind/kcachegrind/functionselection.cpp
+++ b/kcachegrind/kcachegrind/functionselection.cpp
@@ -41,8 +41,8 @@
#include "toplevel.h"
FunctionSelection::FunctionSelection( TopLevel* top,
- TQWidget* tqparent, const char* name)
- : FunctionSelectionBase(tqparent, name), TraceItemView(0, top)
+ TQWidget* parent, const char* name)
+ : FunctionSelectionBase(parent, name), TraceItemView(0, top)
{
_group = 0;
_inSetGroup = false;
diff --git a/kcachegrind/kcachegrind/functionselection.h b/kcachegrind/kcachegrind/functionselection.h
index 2aacbeba..c5f78107 100644
--- a/kcachegrind/kcachegrind/functionselection.h
+++ b/kcachegrind/kcachegrind/functionselection.h
@@ -41,7 +41,7 @@ class FunctionSelection : public FunctionSelectionBase, public TraceItemView
TQ_OBJECT
public:
- FunctionSelection( TopLevel*, TQWidget* tqparent = 0, const char* name = 0);
+ FunctionSelection( TopLevel*, TQWidget* parent = 0, const char* name = 0);
~FunctionSelection();
TraceCostItem* group(TQString);
diff --git a/kcachegrind/kcachegrind/instritem.cpp b/kcachegrind/kcachegrind/instritem.cpp
index 3aa7d22d..81341672 100644
--- a/kcachegrind/kcachegrind/instritem.cpp
+++ b/kcachegrind/kcachegrind/instritem.cpp
@@ -37,9 +37,9 @@
// InstrItem
// for messages
-InstrItem::InstrItem(InstrView* iv, TQListView* tqparent,
+InstrItem::InstrItem(InstrView* iv, TQListView* parent,
Addr addr, const TQString& msg)
- : TQListViewItem(tqparent)
+ : TQListViewItem(parent)
{
_view = iv;
_addr = addr;
@@ -56,11 +56,11 @@ InstrItem::InstrItem(InstrView* iv, TQListView* tqparent,
}
// for code lines
-InstrItem::InstrItem(InstrView* iv, TQListView* tqparent,
+InstrItem::InstrItem(InstrView* iv, TQListView* parent,
Addr addr, bool inside,
const TQString& code, const TQString& cmd,
const TQString& args, TraceInstr* instr)
- : TQListViewItem(tqparent)
+ : TQListViewItem(parent)
{
_view = iv;
_addr = addr;
@@ -86,9 +86,9 @@ InstrItem::InstrItem(InstrView* iv, TQListView* tqparent,
}
// for call lines
-InstrItem::InstrItem(InstrView* iv, TQListViewItem* tqparent, Addr addr,
+InstrItem::InstrItem(InstrView* iv, TQListViewItem* parent, Addr addr,
TraceInstr* instr, TraceInstrCall* instrCall)
- : TQListViewItem(tqparent)
+ : TQListViewItem(parent)
{
_view = iv;
_addr = addr;
@@ -118,9 +118,9 @@ InstrItem::InstrItem(InstrView* iv, TQListViewItem* tqparent, Addr addr,
}
// for jump lines
-InstrItem::InstrItem(InstrView* iv, TQListViewItem* tqparent, Addr addr,
+InstrItem::InstrItem(InstrView* iv, TQListViewItem* parent, Addr addr,
TraceInstr* instr, TraceInstrJump* instrJump)
- : TQListViewItem(tqparent)
+ : TQListViewItem(parent)
{
_view = iv;
_addr = addr;
diff --git a/kcachegrind/kcachegrind/instritem.h b/kcachegrind/kcachegrind/instritem.h
index ab5467d9..e521ebe0 100644
--- a/kcachegrind/kcachegrind/instritem.h
+++ b/kcachegrind/kcachegrind/instritem.h
@@ -33,21 +33,21 @@ class InstrItem: public TQListViewItem
public:
// for messages
- InstrItem(InstrView* iv, TQListView* tqparent,
+ InstrItem(InstrView* iv, TQListView* parent,
Addr addr, const TQString&);
// for instruction lines
- InstrItem(InstrView* iv, TQListView* tqparent,
+ InstrItem(InstrView* iv, TQListView* parent,
Addr addr, bool inside,
const TQString&, const TQString&, const TQString&,
TraceInstr* instr);
// for call instr
- InstrItem(InstrView* iv, TQListViewItem* tqparent, Addr addr,
+ InstrItem(InstrView* iv, TQListViewItem* parent, Addr addr,
TraceInstr* instr, TraceInstrCall* instrCall);
// for jump lines
- InstrItem(InstrView* iv, TQListViewItem* tqparent, Addr addr,
+ InstrItem(InstrView* iv, TQListViewItem* parent, Addr addr,
TraceInstr* instr, TraceInstrJump* instrJump);
Addr addr() const { return _addr; }
diff --git a/kcachegrind/kcachegrind/instrview.cpp b/kcachegrind/kcachegrind/instrview.cpp
index d578b4f8..39bd9b0b 100644
--- a/kcachegrind/kcachegrind/instrview.cpp
+++ b/kcachegrind/kcachegrind/instrview.cpp
@@ -111,8 +111,8 @@ static bool parseLine(char* buf, Addr& addr,
InstrView::InstrView(TraceItemView* parentView,
- TQWidget* tqparent, const char* name)
- : TQListView(tqparent, name), TraceItemView(parentView)
+ TQWidget* parent, const char* name)
+ : TQListView(parent, name), TraceItemView(parentView)
{
_showHexCode = DEFAULT_SHOWHEXCODE;
_lastHexCodeWidth = 50;
diff --git a/kcachegrind/kcachegrind/instrview.h b/kcachegrind/kcachegrind/instrview.h
index 86d011cc..79d3d763 100644
--- a/kcachegrind/kcachegrind/instrview.h
+++ b/kcachegrind/kcachegrind/instrview.h
@@ -37,7 +37,7 @@ class InstrView : public TQListView, public TraceItemView
public:
InstrView(TraceItemView* parentView,
- TQWidget* tqparent = 0, const char* name = 0);
+ TQWidget* parent = 0, const char* name = 0);
virtual TQWidget* widget() { return this; }
TQString whatsThis() const;
diff --git a/kcachegrind/kcachegrind/multiview.cpp b/kcachegrind/kcachegrind/multiview.cpp
index d3ad670c..18148927 100644
--- a/kcachegrind/kcachegrind/multiview.cpp
+++ b/kcachegrind/kcachegrind/multiview.cpp
@@ -34,8 +34,8 @@
// MultiView
//
-MultiView::MultiView(TopLevel* top, TQWidget* tqparent, const char* name)
- : TQSplitter(tqparent, name), TraceItemView(0, top)
+MultiView::MultiView(TopLevel* top, TQWidget* parent, const char* name)
+ : TQSplitter(parent, name), TraceItemView(0, top)
{
// default
setOrientation(Qt::Horizontal);
diff --git a/kcachegrind/kcachegrind/multiview.h b/kcachegrind/kcachegrind/multiview.h
index 393638ba..9d771013 100644
--- a/kcachegrind/kcachegrind/multiview.h
+++ b/kcachegrind/kcachegrind/multiview.h
@@ -37,7 +37,7 @@ class MultiView : public TQSplitter, public TraceItemView
TQ_OBJECT
public:
- MultiView(TopLevel* top, TQWidget* tqparent = 0, const char* name = 0);
+ MultiView(TopLevel* top, TQWidget* parent = 0, const char* name = 0);
TQWidget* widget() { return this; }
TabView* activeTabView() const { return _active; }
diff --git a/kcachegrind/kcachegrind/partgraph.cpp b/kcachegrind/kcachegrind/partgraph.cpp
index 44d54984..47bda4c9 100644
--- a/kcachegrind/kcachegrind/partgraph.cpp
+++ b/kcachegrind/kcachegrind/partgraph.cpp
@@ -29,8 +29,8 @@
// PartAreaWidget
-PartAreaWidget::PartAreaWidget(TQWidget* tqparent, const char* name)
- : TreeMapWidget(new BasePartItem(), tqparent, name)
+PartAreaWidget::PartAreaWidget(TQWidget* parent, const char* name)
+ : TreeMapWidget(new BasePartItem(), parent, name)
{
_data = 0;
_function = 0;
@@ -156,12 +156,12 @@ TQString PartAreaWidget::tipString(TreeMapItem* i) const
itemTip += "\n";
tip = itemTip + tip;
- i = i->tqparent();
+ i = i->parent();
count++;
}
// skip to part
- while (i && i->rtti()==3) i = i->tqparent();
+ while (i && i->rtti()==3) i = i->parent();
if (i && i->rtti()==2) {
itemTip = i18n("Profile Part %1").tqarg(i->text(0));
diff --git a/kcachegrind/kcachegrind/partgraph.h b/kcachegrind/kcachegrind/partgraph.h
index 1477382e..f8ad4ccd 100644
--- a/kcachegrind/kcachegrind/partgraph.h
+++ b/kcachegrind/kcachegrind/partgraph.h
@@ -35,7 +35,7 @@ public:
// Visualisation inside of trace parts
enum VisualisationMode { NoVisualisation, Partitioning, Inclusive };
- PartAreaWidget(TQWidget* tqparent=0, const char* name=0);
+ PartAreaWidget(TQWidget* parent=0, const char* name=0);
void setData(TraceData* d);
void setCostType(TraceCostType* ct);
diff --git a/kcachegrind/kcachegrind/partlistitem.cpp b/kcachegrind/kcachegrind/partlistitem.cpp
index f23db9a4..debea16a 100644
--- a/kcachegrind/kcachegrind/partlistitem.cpp
+++ b/kcachegrind/kcachegrind/partlistitem.cpp
@@ -33,10 +33,10 @@
// PartListItem
-PartListItem::PartListItem(TQListView* tqparent, TraceCostItem* costItem,
+PartListItem::PartListItem(TQListView* parent, TraceCostItem* costItem,
TraceCostType* ct, TraceCost::CostType gt,
TracePart* part)
- :TQListViewItem(tqparent)
+ :TQListViewItem(parent)
{
_partCostItem = costItem->findDepFromPart(part);
_part = part;
diff --git a/kcachegrind/kcachegrind/partlistitem.h b/kcachegrind/kcachegrind/partlistitem.h
index c395b239..0ab99a9c 100644
--- a/kcachegrind/kcachegrind/partlistitem.h
+++ b/kcachegrind/kcachegrind/partlistitem.h
@@ -32,7 +32,7 @@
class PartListItem: public TQListViewItem
{
public:
- PartListItem(TQListView* tqparent, TraceCostItem* costItem,
+ PartListItem(TQListView* parent, TraceCostItem* costItem,
TraceCostType* ct, TraceCost::CostType gt, TracePart* part);
int compare(TQListViewItem * i, int col, bool ascending ) const;
diff --git a/kcachegrind/kcachegrind/partselection.cpp b/kcachegrind/kcachegrind/partselection.cpp
index b4eb29be..c501702d 100644
--- a/kcachegrind/kcachegrind/partselection.cpp
+++ b/kcachegrind/kcachegrind/partselection.cpp
@@ -36,8 +36,8 @@
#include "partselection.h"
#include "partgraph.h"
-PartSelection::PartSelection( TQWidget* tqparent, const char* name)
- : PartSelectionBase(tqparent, name)
+PartSelection::PartSelection( TQWidget* parent, const char* name)
+ : PartSelectionBase(parent, name)
{
_data = 0;
_costType = 0;
@@ -310,7 +310,7 @@ void PartSelection::contextMenuRequested(TreeMapItem* i,
str = i18n("Select") + " '" + ni->text(0) + "'";
popup.insertItem(str, id);
- ni = ni->tqparent();
+ ni = ni->parent();
id++;
}
}
@@ -365,7 +365,7 @@ void PartSelection::contextMenuRequested(TreeMapItem* i,
if (r>=100) {
TreeMapItem* ci = i;
while (ci && r>100) {
- ci = ci->tqparent();
+ ci = ci->parent();
r--;
}
doubleClicked(ci);
@@ -545,7 +545,7 @@ void PartSelection::fillInfo()
TQString info = _data->activePartRange();
TreeMapItem* i = partAreaWidget->current();
- while (i && i->rtti()!=2) i = i->tqparent();
+ while (i && i->rtti()!=2) i = i->parent();
if (i) {
TracePart* part = ((PartItem*)i)->part();
diff --git a/kcachegrind/kcachegrind/partselection.h b/kcachegrind/kcachegrind/partselection.h
index dfdeff17..b8a195f8 100644
--- a/kcachegrind/kcachegrind/partselection.h
+++ b/kcachegrind/kcachegrind/partselection.h
@@ -41,7 +41,7 @@ class PartSelection: public PartSelectionBase
TQ_OBJECT
public:
- PartSelection( TQWidget* tqparent = 0, const char* name = 0);
+ PartSelection( TQWidget* parent = 0, const char* name = 0);
~PartSelection();
TraceData* data() { return _data; }
diff --git a/kcachegrind/kcachegrind/partview.cpp b/kcachegrind/kcachegrind/partview.cpp
index 039b708c..853e9928 100644
--- a/kcachegrind/kcachegrind/partview.cpp
+++ b/kcachegrind/kcachegrind/partview.cpp
@@ -38,8 +38,8 @@
PartView::PartView(TraceItemView* parentView,
- TQWidget* tqparent, const char* name)
- : TQListView(tqparent, name), TraceItemView(parentView)
+ TQWidget* parent, const char* name)
+ : TQListView(parent, name), TraceItemView(parentView)
{
_inSelectionUpdate = false;
diff --git a/kcachegrind/kcachegrind/partview.h b/kcachegrind/kcachegrind/partview.h
index 06de9bf7..92761cc1 100644
--- a/kcachegrind/kcachegrind/partview.h
+++ b/kcachegrind/kcachegrind/partview.h
@@ -34,7 +34,7 @@ class PartView: public TQListView, public TraceItemView
public:
PartView(TraceItemView* parentView,
- TQWidget* tqparent=0, const char* name=0);
+ TQWidget* parent=0, const char* name=0);
virtual TQWidget* widget() { return this; }
TQString whatsThis() const;
diff --git a/kcachegrind/kcachegrind/sourceitem.cpp b/kcachegrind/kcachegrind/sourceitem.cpp
index db1ee04b..9556c038 100644
--- a/kcachegrind/kcachegrind/sourceitem.cpp
+++ b/kcachegrind/kcachegrind/sourceitem.cpp
@@ -37,11 +37,11 @@
// SourceItem
// for source lines
-SourceItem::SourceItem(SourceView* sv, TQListView* tqparent,
+SourceItem::SourceItem(SourceView* sv, TQListView* parent,
int fileno, unsigned int lineno,
bool inside, const TQString& src,
TraceLine* line)
- : TQListViewItem(tqparent)
+ : TQListViewItem(parent)
{
_view = sv;
_lineno = lineno;
@@ -64,10 +64,10 @@ SourceItem::SourceItem(SourceView* sv, TQListView* tqparent,
}
// for call lines
-SourceItem::SourceItem(SourceView* sv, TQListViewItem* tqparent,
+SourceItem::SourceItem(SourceView* sv, TQListViewItem* parent,
int fileno, unsigned int lineno,
TraceLine* line, TraceLineCall* lineCall)
- : TQListViewItem(tqparent)
+ : TQListViewItem(parent)
{
_view = sv;
_lineno = lineno;
@@ -98,10 +98,10 @@ SourceItem::SourceItem(SourceView* sv, TQListViewItem* tqparent,
}
// for jump lines
-SourceItem::SourceItem(SourceView* sv, TQListViewItem* tqparent,
+SourceItem::SourceItem(SourceView* sv, TQListViewItem* parent,
int fileno, unsigned int lineno,
TraceLine* line, TraceLineJump* lineJump)
- : TQListViewItem(tqparent)
+ : TQListViewItem(parent)
{
_view = sv;
_lineno = lineno;
diff --git a/kcachegrind/kcachegrind/sourceitem.h b/kcachegrind/kcachegrind/sourceitem.h
index 532811e0..30589835 100644
--- a/kcachegrind/kcachegrind/sourceitem.h
+++ b/kcachegrind/kcachegrind/sourceitem.h
@@ -32,18 +32,18 @@ class SourceItem: public TQListViewItem
{
public:
// for source lines
- SourceItem(SourceView* sv, TQListView* tqparent,
+ SourceItem(SourceView* sv, TQListView* parent,
int fileno, unsigned int lineno,
bool inside, const TQString& src,
TraceLine* line = 0);
// for call lines
- SourceItem(SourceView* sv, TQListViewItem* tqparent,
+ SourceItem(SourceView* sv, TQListViewItem* parent,
int fileno, unsigned int lineno,
TraceLine* line, TraceLineCall* lineCall);
// for jump lines
- SourceItem(SourceView* sv, TQListViewItem* tqparent,
+ SourceItem(SourceView* sv, TQListViewItem* parent,
int fileno, unsigned int lineno,
TraceLine* line, TraceLineJump* lineJump);
diff --git a/kcachegrind/kcachegrind/sourceview.cpp b/kcachegrind/kcachegrind/sourceview.cpp
index be171d90..64b3e995 100644
--- a/kcachegrind/kcachegrind/sourceview.cpp
+++ b/kcachegrind/kcachegrind/sourceview.cpp
@@ -38,8 +38,8 @@
SourceView::SourceView(TraceItemView* parentView,
- TQWidget* tqparent, const char* name)
- : TQListView(tqparent, name), TraceItemView(parentView)
+ TQWidget* parent, const char* name)
+ : TQListView(parent, name), TraceItemView(parentView)
{
_inSelectionUpdate = false;
diff --git a/kcachegrind/kcachegrind/sourceview.h b/kcachegrind/kcachegrind/sourceview.h
index 2e2c0386..b72fc7ad 100644
--- a/kcachegrind/kcachegrind/sourceview.h
+++ b/kcachegrind/kcachegrind/sourceview.h
@@ -37,7 +37,7 @@ class SourceView : public TQListView, public TraceItemView
public:
SourceView(TraceItemView* parentView,
- TQWidget* tqparent = 0, const char* name = 0);
+ TQWidget* parent = 0, const char* name = 0);
TQWidget* widget() { return this; }
TQString whatsThis() const;
diff --git a/kcachegrind/kcachegrind/stackitem.cpp b/kcachegrind/kcachegrind/stackitem.cpp
index 3b41740a..af0499ba 100644
--- a/kcachegrind/kcachegrind/stackitem.cpp
+++ b/kcachegrind/kcachegrind/stackitem.cpp
@@ -31,8 +31,8 @@
// StackItem
StackItem::StackItem(StackSelection* ss,
- TQListView* tqparent, TraceFunction* f)
- :TQListViewItem(tqparent)
+ TQListView* parent, TraceFunction* f)
+ :TQListViewItem(parent)
{
_view = ss;
_function = f;
@@ -46,8 +46,8 @@ StackItem::StackItem(StackSelection* ss,
}
StackItem::StackItem(StackSelection* ss,
- TQListView* tqparent, TraceCall* call)
- :TQListViewItem(tqparent)
+ TQListView* parent, TraceCall* call)
+ :TQListViewItem(parent)
{
_view = ss;
_call = call;
diff --git a/kcachegrind/kcachegrind/stackitem.h b/kcachegrind/kcachegrind/stackitem.h
index 31e24b75..250e9f66 100644
--- a/kcachegrind/kcachegrind/stackitem.h
+++ b/kcachegrind/kcachegrind/stackitem.h
@@ -36,8 +36,8 @@ class StackItem: public TQListViewItem
{
public:
// for top
- StackItem(StackSelection* ss, TQListView* tqparent, TraceFunction* f);
- StackItem(StackSelection* ss, TQListView* tqparent, TraceCall* c);
+ StackItem(StackSelection* ss, TQListView* parent, TraceFunction* f);
+ StackItem(StackSelection* ss, TQListView* parent, TraceCall* c);
TraceFunction* function() { return _function; }
TraceCall* call() { return _call; }
diff --git a/kcachegrind/kcachegrind/stackselection.cpp b/kcachegrind/kcachegrind/stackselection.cpp
index fcba2ab9..59094754 100644
--- a/kcachegrind/kcachegrind/stackselection.cpp
+++ b/kcachegrind/kcachegrind/stackselection.cpp
@@ -35,8 +35,8 @@
#include "stackselection.h"
#include "stackitem.h"
-StackSelection::StackSelection( TQWidget* tqparent, const char* name)
- : StackSelectionBase(tqparent, name)
+StackSelection::StackSelection( TQWidget* parent, const char* name)
+ : StackSelectionBase(parent, name)
{
_data = 0;
_browser = new StackBrowser();
diff --git a/kcachegrind/kcachegrind/stackselection.h b/kcachegrind/kcachegrind/stackselection.h
index 6b71c2b8..2bb3a750 100644
--- a/kcachegrind/kcachegrind/stackselection.h
+++ b/kcachegrind/kcachegrind/stackselection.h
@@ -39,7 +39,7 @@ class StackSelection : public StackSelectionBase
TQ_OBJECT
public:
- StackSelection( TQWidget* tqparent = 0, const char* name = 0);
+ StackSelection( TQWidget* parent = 0, const char* name = 0);
~StackSelection();
TraceData* data() const { return _data; }
diff --git a/kcachegrind/kcachegrind/tabview.cpp b/kcachegrind/kcachegrind/tabview.cpp
index bb5e340c..52f728b5 100644
--- a/kcachegrind/kcachegrind/tabview.cpp
+++ b/kcachegrind/kcachegrind/tabview.cpp
@@ -43,10 +43,10 @@
// TabBar
-TabBar::TabBar(TabView* v, TQTabWidget* tqparent, const char *name)
- : TQTabBar(tqparent, name)
+TabBar::TabBar(TabView* v, TQTabWidget* parent, const char *name)
+ : TQTabBar(parent, name)
{
- _tabWidget = tqparent;
+ _tabWidget = parent;
_tabView = v;
}
@@ -114,8 +114,8 @@ void TabBar::mousePressEvent(TQMouseEvent *e)
// Splitter
//
-Splitter::Splitter(Qt::Orientation o, TQWidget* tqparent, const char* name)
- : TQSplitter(o, tqparent, name)
+Splitter::Splitter(Qt::Orientation o, TQWidget* parent, const char* name)
+ : TQSplitter(o, parent, name)
{}
void Splitter::moveEvent(TQMoveEvent* e)
@@ -145,9 +145,9 @@ void Splitter::checkVisiblity()
// TabWidget
//
-TabWidget::TabWidget(TabView* v, TQWidget* tqparent,
+TabWidget::TabWidget(TabView* v, TQWidget* parent,
const char* name, WFlags f)
- : TQTabWidget(tqparent, name, f)
+ : TQTabWidget(parent, name, f)
{
_hasVisibleRect = false;
setTabBar(new TabBar(v, this));
@@ -229,8 +229,8 @@ void TabWidget::moveEvent(TQMoveEvent* e)
*/
TabView::TabView(TraceItemView* parentView,
- TQWidget* tqparent, const char* name)
- : TQWidget(tqparent, name), TraceItemView(parentView)
+ TQWidget* parent, const char* name)
+ : TQWidget(parent, name), TraceItemView(parentView)
{
setFocusPolicy(TQ_StrongFocus);
@@ -704,7 +704,7 @@ void TabView::selected(TraceItemView*, TraceItem* s)
select(s);
updateView();
- // still forward to tqparent
+ // still forward to parent
if (_parentView) _parentView->selected(this, s);
}
diff --git a/kcachegrind/kcachegrind/tabview.h b/kcachegrind/kcachegrind/tabview.h
index caea8126..221e6e08 100644
--- a/kcachegrind/kcachegrind/tabview.h
+++ b/kcachegrind/kcachegrind/tabview.h
@@ -43,7 +43,7 @@ class TabBar : public TQTabBar
TQ_OBJECT
public:
- TabBar(TabView*, TQTabWidget* tqparent, const char *name = 0);
+ TabBar(TabView*, TQTabWidget* parent, const char *name = 0);
protected:
void mousePressEvent(TQMouseEvent *e);
@@ -65,7 +65,7 @@ class Splitter: public TQSplitter
TQ_OBJECT
public:
- Splitter(Qt::Orientation o, TQWidget* tqparent = 0, const char* name = 0);
+ Splitter(Qt::Orientation o, TQWidget* parent = 0, const char* name = 0);
void checkVisiblity();
protected:
@@ -86,7 +86,7 @@ class TabWidget: public TQTabWidget
public:
- TabWidget(TabView*, TQWidget* tqparent = 0,
+ TabWidget(TabView*, TQWidget* parent = 0,
const char* name = 0, WFlags f = 0);
bool hasVisibleRect() { return _hasVisibleRect; }
@@ -115,7 +115,7 @@ class TabView : public TQWidget, public TraceItemView
public:
TabView(TraceItemView* parentView,
- TQWidget* tqparent = 0, const char* name = 0);
+ TQWidget* parent = 0, const char* name = 0);
virtual TQWidget* widget() { return this; }
TQString whatsThis() const ;
diff --git a/kcachegrind/kcachegrind/toplevel.cpp b/kcachegrind/kcachegrind/toplevel.cpp
index e625e42d..db1dace7 100644
--- a/kcachegrind/kcachegrind/toplevel.cpp
+++ b/kcachegrind/kcachegrind/toplevel.cpp
@@ -631,15 +631,15 @@ void TopLevel::createMiscActions()
actionCollection(),
"view_expanded");
- hint = i18n("Show percentage costs relative to tqparent");
+ hint = i18n("Show percentage costs relative to parent");
_taExpanded->setToolTip( hint );
_taExpanded->setWhatsThis( hint );
- hint = i18n("<b>Show percentage costs relative to tqparent</b>"
+ hint = i18n("<b>Show percentage costs relative to parent</b>"
"<p>If this is switched off, percentage costs are always shown "
"relative to the total cost of the profile part(s) that are "
"currently browsed. By turning on this option, percentage cost "
- "of shown cost items will be relative to the tqparent cost item."
+ "of shown cost items will be relative to the parent cost item."
"<ul><table>"
"<tr><td><b>Cost Type</td><td><b>Parent Cost</td></tr>"
"<tr><td>Function Cumulative</td><td>Total</td></tr>"
diff --git a/kcachegrind/kcachegrind/tracedata.cpp b/kcachegrind/kcachegrind/tracedata.cpp
index c277cde5..526c1cb0 100644
--- a/kcachegrind/kcachegrind/tracedata.cpp
+++ b/kcachegrind/kcachegrind/tracedata.cpp
@@ -4843,10 +4843,10 @@ void TraceData::update()
}
TraceCost* TraceData::search(TraceItem::CostType t, TQString name,
- TraceCostType* ct, TraceCost* tqparent)
+ TraceCostType* ct, TraceCost* parent)
{
TraceCost* result = 0;
- TraceItem::CostType pt = tqparent ? tqparent->type() : NoCostType;
+ TraceItem::CostType pt = parent ? parent->type() : NoCostType;
SubCost sc, scTop = 0;
switch(t) {
@@ -4860,9 +4860,9 @@ TraceCost* TraceData::search(TraceItem::CostType t, TQString name,
if (f->name() != name) continue;
- if ((pt == Class) && (tqparent != f->cls())) continue;
- if ((pt == File) && (tqparent != f->file())) continue;
- if ((pt == Object) && (tqparent != f->object())) continue;
+ if ((pt == Class) && (parent != f->cls())) continue;
+ if ((pt == File) && (parent != f->file())) continue;
+ if ((pt == Object) && (parent != f->object())) continue;
if (ct) {
sc = f->inclusive()->subCost(ct);
@@ -4931,7 +4931,7 @@ TraceCost* TraceData::search(TraceItem::CostType t, TQString name,
case Instr:
if (pt == Function) {
- TraceInstrMap* instrMap = ((TraceFunction*)tqparent)->instrMap();
+ TraceInstrMap* instrMap = ((TraceFunction*)parent)->instrMap();
if (!instrMap) break;
TraceInstr *instr;
@@ -4949,9 +4949,9 @@ TraceCost* TraceData::search(TraceItem::CostType t, TQString name,
{
TraceFunctionSourceList sList;
if (pt == Function)
- sList = ((TraceFunction*)tqparent)->sourceFiles();
+ sList = ((TraceFunction*)parent)->sourceFiles();
else if (pt == FunctionSource)
- sList.append((TraceFunctionSource*) tqparent);
+ sList.append((TraceFunctionSource*) parent);
else break;
TraceLineMap* lineMap;
diff --git a/kcachegrind/kcachegrind/tracedata.h b/kcachegrind/kcachegrind/tracedata.h
index edc4c8f8..cb97e623 100644
--- a/kcachegrind/kcachegrind/tracedata.h
+++ b/kcachegrind/kcachegrind/tracedata.h
@@ -1879,13 +1879,13 @@ class TraceData: public TraceCost
/**
* Search for item with given name and highest subcost of given cost type.
*
- * For some items, they will only be found if the tqparent cost is given:
- * Instr, Line, Call => need tqparent of type Function
- * For Function, a tqparent of type Obj/File/Class can be given, but
+ * For some items, they will only be found if the parent cost is given:
+ * Instr, Line, Call => need parent of type Function
+ * For Function, a parent of type Obj/File/Class can be given, but
* isn't needed.
*/
TraceCost* search(TraceItem::CostType, TQString,
- TraceCostType* ct = 0, TraceCost* tqparent = 0);
+ TraceCostType* ct = 0, TraceCost* parent = 0);
// for pretty function names without signature if unique...
TraceFunctionMap::Iterator functionIterator(TraceFunction*);
diff --git a/kcachegrind/kcachegrind/traceitemview.h b/kcachegrind/kcachegrind/traceitemview.h
index 1d0c0394..f83aa896 100644
--- a/kcachegrind/kcachegrind/traceitemview.h
+++ b/kcachegrind/kcachegrind/traceitemview.h
@@ -66,7 +66,7 @@ public:
enum Direction { None, Back, Forward, Up };
- // a TraceItemView can have a position in a tqparent container
+ // a TraceItemView can have a position in a parent container
enum Position { Hidden, Top, Right, Left, Bottom };
TraceItemView(TraceItemView* parentView, TopLevel* top = 0);
@@ -94,7 +94,7 @@ public:
// Overwrite in container views to also set new data for all members.
virtual void setData(TraceData* d);
- // change from tqparent, call updateView() to update lazily (only if visible)
+ // change from parent, call updateView() to update lazily (only if visible)
void setCostType(TraceCostType* t) { _newCostType = t; }
void setCostType2(TraceCostType* t) { _newCostType2 = t; }
void set(TraceItem::CostType g) { _newGroupType = g; }
@@ -113,7 +113,7 @@ public:
/**
* Notification from child views.
- * Default implementation notifies tqparent
+ * Default implementation notifies parent
*/
virtual void selected(TraceItemView* sender, TraceItem*);
virtual void selected(TraceItemView* sender, const TracePartList&);
diff --git a/kcachegrind/kcachegrind/treemap.cpp b/kcachegrind/kcachegrind/treemap.cpp
index 66c73ad4..c1f7f12b 100644
--- a/kcachegrind/kcachegrind/treemap.cpp
+++ b/kcachegrind/kcachegrind/treemap.cpp
@@ -720,11 +720,11 @@ int TreeMapItemList::compareItems ( Item item1, Item item2 )
bool ascending;
int result;
- TreeMapItem* tqparent = ((TreeMapItem*)item1)->tqparent();
+ TreeMapItem* parent = ((TreeMapItem*)item1)->parent();
// shouldn't happen
- if (!tqparent) return 0;
+ if (!parent) return 0;
- int textNo = tqparent->sorting(&ascending);
+ int textNo = parent->sorting(&ascending);
if (textNo < 0) {
double diff = ((TreeMapItem*)item1)->value() -
@@ -741,22 +741,22 @@ int TreeMapItemList::compareItems ( Item item1, Item item2 )
TreeMapItem* TreeMapItemList::commonParent()
{
- TreeMapItem* tqparent, *item;
- tqparent = first();
- if (tqparent)
+ TreeMapItem* parent, *item;
+ parent = first();
+ if (parent)
while( (item = next()) != 0)
- tqparent = tqparent->commonParent(item);
+ parent = parent->commonParent(item);
- return tqparent;
+ return parent;
}
// TreeMapItem
-TreeMapItem::TreeMapItem(TreeMapItem* tqparent, double value)
+TreeMapItem::TreeMapItem(TreeMapItem* parent, double value)
{
_value = value;
- _parent = tqparent;
+ _parent = parent;
_sum = 0;
_tqchildren = 0;
@@ -767,7 +767,7 @@ TreeMapItem::TreeMapItem(TreeMapItem* tqparent, double value)
_freeRects = 0;
if (_parent) {
- // take sorting from tqparent
+ // take sorting from parent
_sortTextNo = _parent->sorting(&_sortAscending);
_parent->addItem(this);
}
@@ -778,12 +778,12 @@ TreeMapItem::TreeMapItem(TreeMapItem* tqparent, double value)
}
-TreeMapItem::TreeMapItem(TreeMapItem* tqparent, double value,
+TreeMapItem::TreeMapItem(TreeMapItem* parent, double value,
TQString text1, TQString text2,
TQString text3, TQString text4)
{
_value = value;
- _parent = tqparent;
+ _parent = parent;
// this resizes the text vector only if needed
if (!text4.isEmpty()) setText(3, text4);
@@ -832,7 +832,7 @@ bool TreeMapItem::isChildOf(TreeMapItem* item)
TreeMapItem* TreeMapItem::commonParent(TreeMapItem* item)
{
while (item && !isChildOf(item)) {
- item = item->tqparent();
+ item = item->parent();
}
return item;
}
@@ -1106,8 +1106,8 @@ void TreeMapTip::maybeTip( const TQPoint& pos )
// TreeMapWidget
TreeMapWidget::TreeMapWidget(TreeMapItem* base,
- TQWidget* tqparent, const char* name)
- : TQWidget(tqparent, name)
+ TQWidget* parent, const char* name)
+ : TQWidget(parent, name)
{
_base = base;
_base->setWidget(this);
@@ -1472,9 +1472,9 @@ void TreeMapWidget::deletingItem(TreeMapItem* i)
// don't redraw a deleted item
if (_needsRefresh == i) {
- // we can savely redraw the tqparent, as deleting order is
- // from child to tqparent; i.e. i->tqparent() is existing.
- _needsRefresh = i->tqparent();
+ // we can savely redraw the parent, as deleting order is
+ // from child to parent; i.e. i->parent() is existing.
+ _needsRefresh = i->parent();
}
}
@@ -1494,7 +1494,7 @@ TQString TreeMapWidget::tipString(TreeMapItem* i) const
tip += itemTip;
}
- i = i->tqparent();
+ i = i->parent();
}
return tip;
}
@@ -1556,7 +1556,7 @@ TreeMapItem* TreeMapWidget::possibleSelection(TreeMapItem* i) const
if (_maxSelectDepth>=0) {
int depth = i->depth();
while(i && depth > _maxSelectDepth) {
- i = i->tqparent();
+ i = i->parent();
depth--;
}
}
@@ -1570,7 +1570,7 @@ TreeMapItem* TreeMapWidget::visibleItem(TreeMapItem* i) const
/* Must have a visible area */
while(i && ((i->tqitemRect().width() <1) ||
(i->tqitemRect().height() <1))) {
- TreeMapItem* p = i->tqparent();
+ TreeMapItem* p = i->parent();
if (!p) break;
int idx = p->tqchildren()->findRef(i);
idx--;
@@ -1670,13 +1670,13 @@ TreeMapItem* TreeMapWidget::setTmpSelected(TreeMapItem* item, bool selected)
}
-bool TreeMapWidget::clearSelection(TreeMapItem* tqparent)
+bool TreeMapWidget::clearSelection(TreeMapItem* parent)
{
TreeMapItemList old = _selection;
TreeMapItem* i=_selection.first();
while (i) {
- if (i->isChildOf(tqparent)) {
+ if (i->isChildOf(parent)) {
_selection.remove();
i = _selection.current();
}
@@ -1764,11 +1764,11 @@ TreeMapItem* TreeMapWidget::setTmpRangeSelection(TreeMapItem* i1,
TreeMapItem* commonParent = i1;
while (commonParent && !i2->isChildOf(commonParent)) {
i1 = commonParent;
- commonParent = commonParent->tqparent();
+ commonParent = commonParent->parent();
}
if (!commonParent) return changed;
- while (i2 && i2->tqparent() != commonParent)
- i2 = i2->tqparent();
+ while (i2 && i2->parent() != commonParent)
+ i2 = i2->parent();
if (!i2) return changed;
TreeMapItemList* list = commonParent->tqchildren();
@@ -1961,7 +1961,7 @@ void TreeMapWidget::mouseDoubleClickEvent( TQMouseEvent* e )
/* returns -1 if nothing visible found */
int nextVisible(TreeMapItem* i)
{
- TreeMapItem* p = i->tqparent();
+ TreeMapItem* p = i->parent();
if (!p || p->tqitemRect().isEmpty()) return -1;
int idx = p->tqchildren()->findRef(i);
@@ -1979,7 +1979,7 @@ int nextVisible(TreeMapItem* i)
/* returns -1 if nothing visible found */
int prevVisible(TreeMapItem* i)
{
- TreeMapItem* p = i->tqparent();
+ TreeMapItem* p = i->parent();
if (!p || p->tqitemRect().isEmpty()) return -1;
int idx = p->tqchildren()->findRef(i);
@@ -2050,7 +2050,7 @@ void TreeMapWidget::keyPressEvent( TQKeyEvent* e )
}
TreeMapItem* old = _current, *newItem;
- TreeMapItem* p = _current->tqparent();
+ TreeMapItem* p = _current->parent();
bool goBack;
if (_current->sorting(&goBack) == -1) {
@@ -2210,7 +2210,7 @@ void TreeMapWidget::drawItem(TQPainter* p,
TreeMapItem* i;
if (_markNo>0) {
- for(i = item;i;i=i->tqparent())
+ for(i = item;i;i=i->parent())
if (i->isMarked(_markNo)) break;
isSelected = (i!=0);
@@ -2935,7 +2935,7 @@ void TreeMapWidget::selectionActivated(int id)
TreeMapItem* i = _menuItem;
id -= _selectionID;
while (id>0 && i) {
- i=i->tqparent();
+ i=i->parent();
id--;
}
if (i)
@@ -2957,7 +2957,7 @@ void TreeMapWidget::addSelectionItems(TQPopupMenu* popup,
TQString name = i->text(0);
if (name.isEmpty()) break;
popup->insertItem(i->text(0), id++);
- i = i->tqparent();
+ i = i->parent();
}
}
@@ -2968,7 +2968,7 @@ void TreeMapWidget::fieldStopActivated(int id)
TreeMapItem* i = _menuItem;
id -= _fieldStopID+1;
while (id>0 && i) {
- i=i->tqparent();
+ i=i->parent();
id--;
}
if (i)
@@ -3000,7 +3000,7 @@ void TreeMapWidget::addFieldStopItems(TQPopupMenu* popup,
popup->setItemChecked(id, true);
foundFieldStop = true;
}
- i = i->tqparent();
+ i = i->parent();
}
}
diff --git a/kcachegrind/kcachegrind/treemap.h b/kcachegrind/kcachegrind/treemap.h
index de60f40f..1604a51c 100644
--- a/kcachegrind/kcachegrind/treemap.h
+++ b/kcachegrind/kcachegrind/treemap.h
@@ -244,8 +244,8 @@ public:
HAlternate, VAlternate,
Horizontal, Vertical };
- TreeMapItem(TreeMapItem* tqparent = 0, double value = 1.0 );
- TreeMapItem(TreeMapItem* tqparent, double value,
+ TreeMapItem(TreeMapItem* parent = 0, double value = 1.0 );
+ TreeMapItem(TreeMapItem* parent, double value,
TQString text1, TQString text2 = TQString(),
TQString text3 = TQString(), TQString text4 = TQString());
virtual ~TreeMapItem();
@@ -268,9 +268,9 @@ public:
bool initialized();
/**
- * Adds an item to a tqparent.
+ * Adds an item to a parent.
* When no sorting is used, the item is appended (drawn at bottom).
- * This is only needed if the tqparent was not already specified in the
+ * This is only needed if the parent was not already specified in the
* construction of the item.
*/
void addItem(TreeMapItem*);
@@ -289,7 +289,7 @@ public:
/**
* Parent Item
*/
- TreeMapItem* tqparent() const { return _parent; }
+ TreeMapItem* parent() const { return _parent; }
/**
* Temporary rectangle used for drawing this item the last time.
@@ -409,7 +409,7 @@ public:
enum SelectionMode { Single, Multi, Extended, NoSelection };
/* The widget becomes owner of the base item */
- TreeMapWidget(TreeMapItem* base, TQWidget* tqparent=0, const char* name=0);
+ TreeMapWidget(TreeMapItem* base, TQWidget* parent=0, const char* name=0);
~TreeMapWidget();
/**
@@ -436,7 +436,7 @@ public:
/**
* Returns the item possible for selection. this returns the
- * given item itself or a tqparent thereof,
+ * given item itself or a parent thereof,
* depending on setting of maxSelectDepth().
*/
TreeMapItem* possibleSelection(TreeMapItem*) const;
@@ -461,17 +461,17 @@ public:
/**
* Clear selection of all selected items which are tqchildren of
- * tqparent. When tqparent == 0, clears whole selection
+ * parent. When parent == 0, clears whole selection
* Returns true if selection changed.
*/
- bool clearSelection(TreeMapItem* tqparent = 0);
+ bool clearSelection(TreeMapItem* parent = 0);
/**
* Selects or unselects items in a range.
* This is needed internally for Shift-Click in Extented mode.
* Range means for a hierarchical widget:
* - select/unselect i1 and i2 according selected
- * - search common tqparent of i1 and i2, and select/unselect the
+ * - search common parent of i1 and i2, and select/unselect the
* range of direct tqchildren between but excluding the child
* leading to i1 and the child leading to i2.
*/
@@ -535,12 +535,12 @@ public:
* If a tqchildren value() is almost the parents sum(),
* it can happen that the border to be drawn for visibilty of
* nesting relations takes to much space, and the
- * tqparent/child size relation can not be mapped to a correct
+ * parent/child size relation can not be mapped to a correct
* area size relation.
*
* Either
* (1) Ignore the incorrect drawing, or
- * (2) Skip drawing of the tqparent level alltogether.
+ * (2) Skip drawing of the parent level alltogether.
*/
void setSkipIncorrectBorder(bool enable = true);
bool skipIncorrectBorder() const { return _skipIncorrectBorder; }
diff --git a/kfile-plugins/c++/kfile_cpp.cpp b/kfile-plugins/c++/kfile_cpp.cpp
index 7e81352b..0840ab7f 100644
--- a/kfile-plugins/c++/kfile_cpp.cpp
+++ b/kfile-plugins/c++/kfile_cpp.cpp
@@ -31,9 +31,9 @@ typedef KGenericFactory<KCppPlugin> CppFactory;
K_EXPORT_COMPONENT_FACTORY(kfile_cpp, CppFactory("kfile_cpp"))
-KCppPlugin::KCppPlugin(TQObject *tqparent, const char *name,
+KCppPlugin::KCppPlugin(TQObject *parent, const char *name,
const TQStringList &args)
- : KFilePlugin(tqparent, name, args)
+ : KFilePlugin(parent, name, args)
{
kdDebug(7034) << "c++ plugin\n";
makeMimeTypeInfo("text/x-c++src");
diff --git a/kfile-plugins/c++/kfile_cpp.h b/kfile-plugins/c++/kfile_cpp.h
index 40072797..bfc3ed42 100644
--- a/kfile-plugins/c++/kfile_cpp.h
+++ b/kfile-plugins/c++/kfile_cpp.h
@@ -31,7 +31,7 @@ class KCppPlugin: public KFilePlugin
TQ_OBJECT
public:
- KCppPlugin(TQObject *tqparent, const char *name, const TQStringList& args);
+ KCppPlugin(TQObject *parent, const char *name, const TQStringList& args);
virtual bool readInfo(KFileMetaInfo& info, uint what);
private:
diff --git a/kfile-plugins/diff/kfile_diff.cpp b/kfile-plugins/diff/kfile_diff.cpp
index e0ff1bb4..957d0574 100644
--- a/kfile-plugins/diff/kfile_diff.cpp
+++ b/kfile-plugins/diff/kfile_diff.cpp
@@ -44,9 +44,9 @@
K_EXPORT_COMPONENT_FACTORY(kfile_diff, KGenericFactory<KDiffPlugin>("kfile_diff"))
-KDiffPlugin::KDiffPlugin(TQObject *tqparent, const char *name,
+KDiffPlugin::KDiffPlugin(TQObject *parent, const char *name,
const TQStringList &preferredItems)
- : KFilePlugin(tqparent, name, preferredItems)
+ : KFilePlugin(parent, name, preferredItems)
{
kdDebug(7034) << "diff plugin" << endl;
diff --git a/kfile-plugins/diff/kfile_diff.h b/kfile-plugins/diff/kfile_diff.h
index 36b9f13b..be3ac019 100644
--- a/kfile-plugins/diff/kfile_diff.h
+++ b/kfile-plugins/diff/kfile_diff.h
@@ -28,7 +28,7 @@ class KDiffPlugin: public KFilePlugin
TQ_OBJECT
public:
- KDiffPlugin( TQObject *tqparent, const char *name,
+ KDiffPlugin( TQObject *parent, const char *name,
const TQStringList& preferredItems );
diff --git a/kfile-plugins/ts/kfile_ts.cpp b/kfile-plugins/ts/kfile_ts.cpp
index 72714887..0d6f5dc1 100644
--- a/kfile-plugins/ts/kfile_ts.cpp
+++ b/kfile-plugins/ts/kfile_ts.cpp
@@ -29,8 +29,8 @@ typedef KGenericFactory<KTsPlugin> TsFactory;
K_EXPORT_COMPONENT_FACTORY(kfile_ts, TsFactory("kfile_ts"))
-KTsPlugin::KTsPlugin(TQObject *tqparent, const char *name,
- const TQStringList &args) : KFilePlugin(tqparent, name, args)
+KTsPlugin::KTsPlugin(TQObject *parent, const char *name,
+ const TQStringList &args) : KFilePlugin(parent, name, args)
{
makeMimeTypeInfo( "application/x-linguist" );
}
diff --git a/kfile-plugins/ts/kfile_ts.h b/kfile-plugins/ts/kfile_ts.h
index 65941e47..7d4fba66 100644
--- a/kfile-plugins/ts/kfile_ts.h
+++ b/kfile-plugins/ts/kfile_ts.h
@@ -30,7 +30,7 @@ class KTsPlugin: public KFilePlugin
TQ_OBJECT
public:
- KTsPlugin(TQObject *tqparent, const char *name, const TQStringList& args);
+ KTsPlugin(TQObject *parent, const char *name, const TQStringList& args);
virtual bool readInfo(KFileMetaInfo& info, uint what);
private:
diff --git a/kmtrace/ktrace.c b/kmtrace/ktrace.c
index cf3c55c0..21fca376 100644
--- a/kmtrace/ktrace.c
+++ b/kmtrace/ktrace.c
@@ -495,14 +495,14 @@ addAllocationToTree(void)
int i, j;
void *bt[TR_BT_SIZE + 1];
CallerNode* cn = CallTree;
- CallerNode** tqparent = &CallTree;
+ CallerNode** parent = &CallTree;
bt_size = backtrace(bt, TR_BT_SIZE);
for (i = bt_size - 1; i >= 4; i--)
{
if (cn == NULL)
{
- *tqparent = cn = (CallerNode*) malloc(sizeof(CallerNode));
+ *parent = cn = (CallerNode*) malloc(sizeof(CallerNode));
cn->funcAdr = bt[i];
cn->mallocs = 0;
cn->noCallees = 0;
@@ -517,7 +517,7 @@ addAllocationToTree(void)
for (j = 0; j < cn->noCallees; j++)
if (bt[i - 1] == cn->callees[j]->funcAdr)
{
- tqparent = &cn->callees[j];
+ parent = &cn->callees[j];
cn = cn->callees[j];
knownCallee = 1;
break;
@@ -541,7 +541,7 @@ addAllocationToTree(void)
(newSize - cn->maxCallees) * sizeof(CallerNode*));
cn->maxCallees = newSize;
}
- tqparent = &cn->callees[cn->noCallees++];
+ parent = &cn->callees[cn->noCallees++];
cn = 0;
}
}
diff --git a/kompare/komparenavtreepart/komparenavtreepart.cpp b/kompare/komparenavtreepart/komparenavtreepart.cpp
index 87e8ce2b..1a402260 100644
--- a/kompare/komparenavtreepart/komparenavtreepart.cpp
+++ b/kompare/komparenavtreepart/komparenavtreepart.cpp
@@ -37,8 +37,8 @@
using namespace Diff2;
-KompareNavTreePart::KompareNavTreePart( TQWidget* tqparent, const char* name )
- : KParts::ReadOnlyPart( TQT_TQOBJECT(tqparent), name ),
+KompareNavTreePart::KompareNavTreePart( TQWidget* parent, const char* name )
+ : KParts::ReadOnlyPart( TQT_TQOBJECT(parent), name ),
m_splitter( 0 ),
m_modelList( 0 ),
m_srcDirTree( 0 ),
@@ -453,7 +453,7 @@ void KChangeLVI::setDifferenceText()
setText( 2, text );
}
-KChangeLVI::KChangeLVI( KListView* tqparent, Difference* diff ) : KListViewItem( tqparent )
+KChangeLVI::KChangeLVI( KListView* parent, Difference* diff ) : KListViewItem( parent )
{
m_difference = diff;
@@ -487,7 +487,7 @@ KChangeLVI::~KChangeLVI()
{
}
-KFileLVI::KFileLVI( KListView* tqparent, DiffModel* model ) : KListViewItem( tqparent )
+KFileLVI::KFileLVI( KListView* parent, DiffModel* model ) : KListViewItem( parent )
{
m_model = model;
@@ -519,7 +519,7 @@ KFileLVI::~KFileLVI()
{
}
-KDirLVI::KDirLVI( KListView* tqparent, TQString& dir ) : KListViewItem( tqparent )
+KDirLVI::KDirLVI( KListView* parent, TQString& dir ) : KListViewItem( parent )
{
// kdDebug(8105) << "KDirLVI (KListView) constructor called with dir = " << dir << endl;
m_rootItem = true;
@@ -533,7 +533,7 @@ KDirLVI::KDirLVI( KListView* tqparent, TQString& dir ) : KListViewItem( tqparent
setText( 0, m_dirName );
}
-KDirLVI::KDirLVI( KDirLVI* tqparent, TQString& dir ) : KListViewItem( tqparent )
+KDirLVI::KDirLVI( KDirLVI* parent, TQString& dir ) : KListViewItem( parent )
{
// kdDebug(8105) << "KDirLVI (KDirLVI) constructor called with dir = " << dir << endl;
m_rootItem = false;
@@ -619,7 +619,7 @@ TQString KDirLVI::fullPath( TQString& path )
path = path.prepend( m_dirName );
- KDirLVI* lviParent = dynamic_cast<KDirLVI*>( tqparent() );
+ KDirLVI* lviParent = dynamic_cast<KDirLVI*>( parent() );
if ( lviParent )
{
path = lviParent->fullPath( path );
@@ -676,7 +676,7 @@ KompareNavTreePartFactory::~KompareNavTreePartFactory()
}
KParts::Part* KompareNavTreePartFactory::createPartObject( TQWidget* parentWidget, const char* widgetName,
- TQObject* /*tqparent*/, const char* /*name*/,
+ TQObject* /*parent*/, const char* /*name*/,
const char* /*classname*/, const TQStringList & /*args*/ )
{
// Create an instance of our Part
diff --git a/kompare/komparenavtreepart/komparenavtreepart.h b/kompare/komparenavtreepart/komparenavtreepart.h
index 45a16001..b0177a8c 100644
--- a/kompare/komparenavtreepart/komparenavtreepart.h
+++ b/kompare/komparenavtreepart/komparenavtreepart.h
@@ -50,7 +50,7 @@ class KompareNavTreePart : public KParts::ReadOnlyPart
TQ_OBJECT
public:
- KompareNavTreePart( TQWidget* tqparent = 0L, const char* name = 0L );
+ KompareNavTreePart( TQWidget* parent = 0L, const char* name = 0L );
virtual ~KompareNavTreePart();
public:
@@ -88,7 +88,7 @@ private:
TQString compareFromEndAndReturnSame( const TQString& string1, const TQString& string2 );
void addDirToTreeView( enum Kompare::Target, const TQString& filename );
- KListViewItem* findDirInDirTree( const KListViewItem* tqparent, const TQString& dir );
+ KListViewItem* findDirInDirTree( const KListViewItem* parent, const TQString& dir );
// KListViewItem* firstItem();
// KListViewItem* lastItem();
@@ -125,7 +125,7 @@ private:
class KChangeLVI : public KListViewItem
{
public:
- KChangeLVI( KListView* tqparent, Diff2::Difference* diff );
+ KChangeLVI( KListView* parent, Diff2::Difference* diff );
~KChangeLVI();
public:
Diff2::Difference* difference() { return m_difference; };
@@ -139,7 +139,7 @@ private:
class KFileLVI : public KListViewItem
{
public:
- KFileLVI( KListView* tqparent, Diff2::DiffModel* model );
+ KFileLVI( KListView* parent, Diff2::DiffModel* model );
~KFileLVI();
public:
Diff2::DiffModel* model() { return m_model; };
@@ -151,8 +151,8 @@ private:
class KDirLVI : public KListViewItem
{
public:
- KDirLVI( KDirLVI* tqparent, TQString& dir );
- KDirLVI( KListView* tqparent, TQString& dir );
+ KDirLVI( KDirLVI* parent, TQString& dir );
+ KDirLVI( KListView* parent, TQString& dir );
~KDirLVI();
public:
void addModel( TQString& dir, Diff2::DiffModel* model, TQPtrDict<KDirLVI>* modelToDirItemDict );
@@ -181,7 +181,7 @@ public:
KompareNavTreePartFactory();
virtual ~KompareNavTreePartFactory();
virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName,
- TQObject *tqparent, const char *name,
+ TQObject *parent, const char *name,
const char *classname, const TQStringList &args );
static KInstance* instance();
diff --git a/kompare/komparepart/kompare_part.cpp b/kompare/komparepart/kompare_part.cpp
index 1ea3217e..1339a203 100644
--- a/kompare/komparepart/kompare_part.cpp
+++ b/kompare/komparepart/kompare_part.cpp
@@ -57,8 +57,8 @@ ViewSettings* KomparePart::m_viewSettings = 0L;
DiffSettings* KomparePart::m_diffSettings = 0L;
KomparePart::KomparePart( TQWidget *parentWidget, const char *widgetName,
- TQObject *tqparent, const char *name, const TQStringList & /*args*/ ) :
- KParts::ReadWritePart(tqparent, name),
+ TQObject *parent, const char *name, const TQStringList & /*args*/ ) :
+ KParts::ReadWritePart(parent, name),
m_tempDiff( 0 ),
m_info()
{
diff --git a/kompare/komparepart/kompare_part.h b/kompare/komparepart/kompare_part.h
index 985fe6fc..7afc93fc 100644
--- a/kompare/komparepart/kompare_part.h
+++ b/kompare/komparepart/kompare_part.h
@@ -66,7 +66,7 @@ public:
* Default constructor
*/
KomparePart( TQWidget *parentWidget, const char *widgetName,
- TQObject *tqparent, const char *name, const TQStringList & /*args*/);
+ TQObject *parent, const char *name, const TQStringList & /*args*/);
/**
* Destructor
diff --git a/kompare/komparepart/kompareconnectwidget.cpp b/kompare/komparepart/kompareconnectwidget.cpp
index 07781942..4d7bd603 100644
--- a/kompare/komparepart/kompareconnectwidget.cpp
+++ b/kompare/komparepart/kompareconnectwidget.cpp
@@ -39,9 +39,9 @@ using namespace Diff2;
KompareConnectWidgetFrame::KompareConnectWidgetFrame( KompareListView* left,
KompareListView* right,
ViewSettings* settings,
- KompareSplitter* tqparent,
+ KompareSplitter* parent,
const char* name ) :
- TQSplitterHandle(Qt::Horizontal, (TQSplitter *)tqparent, name),
+ TQSplitterHandle(Qt::Horizontal, (TQSplitter *)parent, name),
m_wid ( left, right, settings, this, name ),
m_label ( "", this ),
m_layout ( this )
@@ -101,8 +101,8 @@ void KompareConnectWidgetFrame::mouseReleaseEvent( TQMouseEvent *e )
}
KompareConnectWidget::KompareConnectWidget( KompareListView* left, KompareListView* right,
- ViewSettings* settings, TQWidget* tqparent, const char* name )
- : TQWidget(tqparent, name),
+ ViewSettings* settings, TQWidget* parent, const char* name )
+ : TQWidget(parent, name),
m_settings( settings ),
m_leftView( left ),
m_rightView( right ),
@@ -112,7 +112,7 @@ KompareConnectWidget::KompareConnectWidget( KompareListView* left, KompareListVi
// connect( m_settings, TQT_SIGNAL( settingsChanged() ), this, TQT_SLOT( slotDelayedRepaint() ) );
setBackgroundMode( NoBackground );
tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) );
- setFocusProxy( tqparent->parentWidget() );
+ setFocusProxy( parent->parentWidget() );
}
KompareConnectWidget::~KompareConnectWidget()
diff --git a/kompare/komparepart/kompareconnectwidget.h b/kompare/komparepart/kompareconnectwidget.h
index a5561a8a..cc22ed86 100644
--- a/kompare/komparepart/kompareconnectwidget.h
+++ b/kompare/komparepart/kompareconnectwidget.h
@@ -39,7 +39,7 @@ class KompareConnectWidget : public TQWidget
public:
KompareConnectWidget( KompareListView* left, KompareListView* right,
- ViewSettings* settings, TQWidget* tqparent, const char* name = 0 );
+ ViewSettings* settings, TQWidget* parent, const char* name = 0 );
~KompareConnectWidget();
public slots:
@@ -73,7 +73,7 @@ class KompareConnectWidgetFrame : public TQSplitterHandle
TQ_OBJECT
public:
KompareConnectWidgetFrame( KompareListView* left, KompareListView* right,
- ViewSettings* settings, KompareSplitter* tqparent, const char* name = 0 );
+ ViewSettings* settings, KompareSplitter* parent, const char* name = 0 );
~KompareConnectWidgetFrame();
TQSize tqsizeHint() const;
@@ -81,7 +81,7 @@ public:
KompareConnectWidget* wid() { return &m_wid; }
protected:
- // stop the tqparent TQSplitterHandle painting
+ // stop the parent TQSplitterHandle painting
void paintEvent( TQPaintEvent* /* e */ ) { }
void mouseMoveEvent( TQMouseEvent * );
diff --git a/kompare/komparepart/komparelistview.cpp b/kompare/komparepart/komparelistview.cpp
index f52191a6..f8779fa9 100644
--- a/kompare/komparepart/komparelistview.cpp
+++ b/kompare/komparepart/komparelistview.cpp
@@ -47,9 +47,9 @@ using namespace Diff2;
KompareListViewFrame::KompareListViewFrame( bool isSource,
ViewSettings* settings,
- KompareSplitter* tqparent,
+ KompareSplitter* parent,
const char* name ):
- TQFrame ( tqparent, name ),
+ TQFrame ( parent, name ),
m_view ( isSource, settings, this, name ),
m_label ( isSource?"Source":"Dest", this ),
m_layout ( this )
@@ -69,11 +69,11 @@ KompareListViewFrame::KompareListViewFrame( bool isSource,
m_layout.addWidget(&m_view);
connect( &m_view, TQT_SIGNAL(differenceClicked(const Diff2::Difference*)),
- tqparent, TQT_SLOT(slotDifferenceClicked(const Diff2::Difference*)) );
+ parent, TQT_SLOT(slotDifferenceClicked(const Diff2::Difference*)) );
- connect( tqparent, TQT_SIGNAL(scrollViewsToId(int)), &m_view, TQT_SLOT(scrollToId(int)) );
- connect( tqparent, TQT_SIGNAL(setXOffset(int)), &m_view, TQT_SLOT(setXOffset(int)) );
- connect( &m_view, TQT_SIGNAL(resized()), tqparent, TQT_SLOT(slotUpdateScrollBars()) );
+ connect( parent, TQT_SIGNAL(scrollViewsToId(int)), &m_view, TQT_SLOT(scrollToId(int)) );
+ connect( parent, TQT_SIGNAL(setXOffset(int)), &m_view, TQT_SLOT(setXOffset(int)) );
+ connect( &m_view, TQT_SIGNAL(resized()), parent, TQT_SLOT(slotUpdateScrollBars()) );
}
void KompareListViewFrame::slotSetModel( const DiffModel* model )
@@ -98,8 +98,8 @@ void KompareListViewFrame::slotSetModel( const DiffModel* model )
KompareListView::KompareListView( bool isSource,
ViewSettings* settings,
- TQWidget* tqparent, const char* name ) :
- KListView( tqparent, name ),
+ TQWidget* parent, const char* name ) :
+ KListView( parent, name ),
m_isSource( isSource ),
m_settings( settings ),
m_scrollId( -1 ),
@@ -125,7 +125,7 @@ KompareListView::KompareListView( bool isSource,
setFocusPolicy( TQ_NoFocus );
setFont( m_settings->m_font );
setSpaces( m_settings->m_tabToNumberOfSpaces );
- setFocusProxy( tqparent->parentWidget() );
+ setFocusProxy( parent->parentWidget() );
}
KompareListView::~KompareListView()
@@ -410,7 +410,7 @@ void KompareListView::setSpaces( int spaces )
void KompareListView::wheelEvent( TQWheelEvent* e )
{
- e->ignore(); // we want the tqparent to catch wheel events
+ e->ignore(); // we want the parent to catch wheel events
}
void KompareListView::resizeEvent( TQResizeEvent* e )
@@ -420,28 +420,28 @@ void KompareListView::resizeEvent( TQResizeEvent* e )
kdDebug() << "resizeEvent " << endl;
}
-KompareListViewItem::KompareListViewItem( KompareListView* tqparent )
- : TQListViewItem( tqparent ),
+KompareListViewItem::KompareListViewItem( KompareListView* parent )
+ : TQListViewItem( parent ),
m_scrollId( 0 )
{
// kdDebug(8104) << "Created KompareListViewItem with scroll id " << m_scrollId << endl;
}
-KompareListViewItem::KompareListViewItem( KompareListView* tqparent, KompareListViewItem* after )
- : TQListViewItem( tqparent, after ),
+KompareListViewItem::KompareListViewItem( KompareListView* parent, KompareListViewItem* after )
+ : TQListViewItem( parent, after ),
m_scrollId( after->scrollId() + after->maxHeight() )
{
// kdDebug(8104) << "Created KompareListViewItem with scroll id " << m_scrollId << endl;
}
-KompareListViewItem::KompareListViewItem( KompareListViewItem* tqparent )
- : TQListViewItem( tqparent ),
+KompareListViewItem::KompareListViewItem( KompareListViewItem* parent )
+ : TQListViewItem( parent ),
m_scrollId( 0 )
{
}
-KompareListViewItem::KompareListViewItem( KompareListViewItem* tqparent, KompareListViewItem* /*after*/ )
- : TQListViewItem( tqparent ),
+KompareListViewItem::KompareListViewItem( KompareListViewItem* parent, KompareListViewItem* /*after*/ )
+ : TQListViewItem( parent ),
m_scrollId( 0 )
{
}
@@ -456,8 +456,8 @@ void KompareListViewItem::paintFocus( TQPainter* /* p */, const TQColorGroup& /*
// Don't paint anything
}
-KompareListViewDiffItem::KompareListViewDiffItem( KompareListView* tqparent, Difference* difference )
- : KompareListViewItem( tqparent ),
+KompareListViewDiffItem::KompareListViewDiffItem( KompareListView* parent, Difference* difference )
+ : KompareListViewItem( parent ),
m_difference( difference ),
m_sourceItem( 0L ),
m_destItem( 0L )
@@ -465,8 +465,8 @@ KompareListViewDiffItem::KompareListViewDiffItem( KompareListView* tqparent, Dif
init();
}
-KompareListViewDiffItem::KompareListViewDiffItem( KompareListView* tqparent, KompareListViewItem* after, Difference* difference )
- : KompareListViewItem( tqparent, after ),
+KompareListViewDiffItem::KompareListViewDiffItem( KompareListView* parent, KompareListViewItem* after, Difference* difference )
+ : KompareListViewItem( parent, after ),
m_difference( difference ),
m_sourceItem( 0L ),
m_destItem( 0L )
@@ -525,8 +525,8 @@ void KompareListViewDiffItem::setSelected( bool b )
}
}
-KompareListViewLineContainerItem::KompareListViewLineContainerItem( KompareListViewDiffItem* tqparent, bool isSource )
- : KompareListViewItem( tqparent ),
+KompareListViewLineContainerItem::KompareListViewLineContainerItem( KompareListViewDiffItem* parent, bool isSource )
+ : KompareListViewItem( parent ),
m_isSource( isSource )
{
// kdDebug(8104) << "isSource ? " << (isSource ? " Yes!" : " No!") << endl;
@@ -554,7 +554,7 @@ void KompareListViewLineContainerItem::setup()
KompareListViewDiffItem* KompareListViewLineContainerItem::diffItemParent() const
{
- return (KompareListViewDiffItem*)tqparent();
+ return (KompareListViewDiffItem*)parent();
}
int KompareListViewLineContainerItem::lineCount() const
@@ -575,8 +575,8 @@ DifferenceString* KompareListViewLineContainerItem::lineAt( int i ) const
diffItemParent()->difference()->destinationLineAt( i );
}
-KompareListViewLineItem::KompareListViewLineItem( KompareListViewLineContainerItem* tqparent, int line, DifferenceString* text )
- : KompareListViewItem( tqparent )
+KompareListViewLineItem::KompareListViewLineItem( KompareListViewLineContainerItem* parent, int line, DifferenceString* text )
+ : KompareListViewItem( parent )
{
setText( COL_LINE_NO, TQString::number( line ) );
setText( COL_MAIN, text->string() );
@@ -618,7 +618,7 @@ void KompareListViewLineItem::paintCell( TQPainter * p, const TQColorGroup & cg,
if ( diffItemParent()->isSelected() )
{
p->setPen( bg.dark(135) );
- if ( this == tqparent()->firstChild() )
+ if ( this == parent()->firstChild() )
p->drawLine( 0, 0, width, 0 );
if ( nextSibling() == 0 )
p->drawLine( 0, height() - 1, width, height() - 1 );
@@ -713,12 +713,12 @@ void KompareListViewLineItem::paintText( TQPainter* p, const TQColor& bg, int co
KompareListViewDiffItem* KompareListViewLineItem::diffItemParent() const
{
- KompareListViewLineContainerItem* p = (KompareListViewLineContainerItem*)tqparent();
+ KompareListViewLineContainerItem* p = (KompareListViewLineContainerItem*)parent();
return p->diffItemParent();
}
-KompareListViewBlankLineItem::KompareListViewBlankLineItem( KompareListViewLineContainerItem* tqparent )
- : KompareListViewLineItem( tqparent, 0, new DifferenceString() )
+KompareListViewBlankLineItem::KompareListViewBlankLineItem( KompareListViewLineContainerItem* parent )
+ : KompareListViewLineItem( parent, 0, new DifferenceString() )
{
}
@@ -737,16 +737,16 @@ void KompareListViewBlankLineItem::paintText( TQPainter* p, const TQColor& bg, i
}
}
-KompareListViewHunkItem::KompareListViewHunkItem( KompareListView* tqparent, DiffHunk* hunk, bool zeroHeight )
- : KompareListViewItem( tqparent ),
+KompareListViewHunkItem::KompareListViewHunkItem( KompareListView* parent, DiffHunk* hunk, bool zeroHeight )
+ : KompareListViewItem( parent ),
m_zeroHeight( zeroHeight ),
m_hunk( hunk )
{
setSelectable( false );
}
-KompareListViewHunkItem::KompareListViewHunkItem( KompareListView* tqparent, KompareListViewItem* after, DiffHunk* hunk, bool zeroHeight )
- : KompareListViewItem( tqparent, after ),
+KompareListViewHunkItem::KompareListViewHunkItem( KompareListView* parent, KompareListViewItem* after, DiffHunk* hunk, bool zeroHeight )
+ : KompareListViewItem( parent, after ),
m_zeroHeight( zeroHeight ),
m_hunk( hunk )
{
diff --git a/kompare/komparepart/komparelistview.h b/kompare/komparepart/komparelistview.h
index 7c10ff6d..b5de7661 100644
--- a/kompare/komparepart/komparelistview.h
+++ b/kompare/komparepart/komparelistview.h
@@ -49,7 +49,7 @@ class KompareListView : public KListView
TQ_OBJECT
public:
- KompareListView( bool isSource, ViewSettings* settings, TQWidget* tqparent, const char* name = 0 );
+ KompareListView( bool isSource, ViewSettings* settings, TQWidget* parent, const char* name = 0 );
virtual ~KompareListView();
KompareListViewItem* itemAtIndex( int i );
@@ -109,7 +109,7 @@ class KompareListViewFrame : public TQFrame
TQ_OBJECT
public:
- KompareListViewFrame( bool isSource, ViewSettings* settings, KompareSplitter* tqparent, const char* name = 0 );
+ KompareListViewFrame( bool isSource, ViewSettings* settings, KompareSplitter* parent, const char* name = 0 );
virtual ~KompareListViewFrame() {};
KompareListView* view() { return &m_view; };
@@ -125,10 +125,10 @@ private:
class KompareListViewItem : public TQListViewItem
{
public:
- KompareListViewItem( KompareListView* tqparent );
- KompareListViewItem( KompareListView* tqparent, KompareListViewItem* after );
- KompareListViewItem( KompareListViewItem* tqparent );
- KompareListViewItem( KompareListViewItem* tqparent, KompareListViewItem* after );
+ KompareListViewItem( KompareListView* parent );
+ KompareListViewItem( KompareListView* parent, KompareListViewItem* after );
+ KompareListViewItem( KompareListViewItem* parent );
+ KompareListViewItem( KompareListViewItem* parent, KompareListViewItem* after );
void paintFocus( TQPainter* p, const TQColorGroup& cg, const TQRect& r );
int scrollId() { return m_scrollId; };
@@ -144,8 +144,8 @@ private:
class KompareListViewDiffItem : public KompareListViewItem
{
public:
- KompareListViewDiffItem( KompareListView* tqparent, Diff2::Difference* difference );
- KompareListViewDiffItem( KompareListView* tqparent, KompareListViewItem* after, Diff2::Difference* difference );
+ KompareListViewDiffItem( KompareListView* parent, Diff2::Difference* difference );
+ KompareListViewDiffItem( KompareListView* parent, KompareListViewItem* after, Diff2::Difference* difference );
void setup();
void setSelected( bool b );
@@ -167,7 +167,7 @@ private:
class KompareListViewLineContainerItem : public KompareListViewItem
{
public:
- KompareListViewLineContainerItem( KompareListViewDiffItem* tqparent, bool isSource );
+ KompareListViewLineContainerItem( KompareListViewDiffItem* parent, bool isSource );
void setup();
int maxHeight() { return 0; }
@@ -184,7 +184,7 @@ private:
class KompareListViewLineItem : public KompareListViewItem
{
public:
- KompareListViewLineItem( KompareListViewLineContainerItem* tqparent, int line, Diff2::DifferenceString* text );
+ KompareListViewLineItem( KompareListViewLineContainerItem* parent, int line, Diff2::DifferenceString* text );
virtual void setup();
int maxHeight() { return 0; }
@@ -201,7 +201,7 @@ private:
class KompareListViewBlankLineItem : public KompareListViewLineItem
{
public:
- KompareListViewBlankLineItem( KompareListViewLineContainerItem* tqparent );
+ KompareListViewBlankLineItem( KompareListViewLineContainerItem* parent );
void setup();
@@ -211,8 +211,8 @@ public:
class KompareListViewHunkItem : public KompareListViewItem
{
public:
- KompareListViewHunkItem( KompareListView* tqparent, Diff2::DiffHunk* hunk, bool zeroHeight = false );
- KompareListViewHunkItem( KompareListView* tqparent, KompareListViewItem* after, Diff2::DiffHunk* hunk, bool zeroHeight= false );
+ KompareListViewHunkItem( KompareListView* parent, Diff2::DiffHunk* hunk, bool zeroHeight = false );
+ KompareListViewHunkItem( KompareListView* parent, KompareListViewItem* after, Diff2::DiffHunk* hunk, bool zeroHeight= false );
void setup();
void paintCell( TQPainter* p, const TQColorGroup& cg, int column, int width, int align );
diff --git a/kompare/komparepart/komparesaveoptionswidget.cpp b/kompare/komparepart/komparesaveoptionswidget.cpp
index cf6e9bf7..723093ac 100644
--- a/kompare/komparepart/komparesaveoptionswidget.cpp
+++ b/kompare/komparepart/komparesaveoptionswidget.cpp
@@ -31,8 +31,8 @@
#include "komparesaveoptionswidget.h"
KompareSaveOptionsWidget::KompareSaveOptionsWidget( TQString source, TQString destination,
- DiffSettings * settings, TQWidget * tqparent )
- : KompareSaveOptionsBase( tqparent, "save options" )
+ DiffSettings * settings, TQWidget * parent )
+ : KompareSaveOptionsBase( parent, "save options" )
, m_source( source )
, m_destination( destination )
{
diff --git a/kompare/komparepart/komparesaveoptionswidget.h b/kompare/komparepart/komparesaveoptionswidget.h
index 3618a2b2..04b3977e 100644
--- a/kompare/komparepart/komparesaveoptionswidget.h
+++ b/kompare/komparepart/komparesaveoptionswidget.h
@@ -32,7 +32,7 @@ class KompareSaveOptionsWidget : public KompareSaveOptionsBase, public KompareFu
Q_OBJECT
TQ_OBJECT
public:
- KompareSaveOptionsWidget( TQString source, TQString destination, DiffSettings* settings, TQWidget* tqparent );
+ KompareSaveOptionsWidget( TQString source, TQString destination, DiffSettings* settings, TQWidget* parent );
~KompareSaveOptionsWidget();
void saveOptions();
diff --git a/kompare/komparepart/komparesplitter.cpp b/kompare/komparepart/komparesplitter.cpp
index 32b7aa29..5e30652c 100644
--- a/kompare/komparepart/komparesplitter.cpp
+++ b/kompare/komparepart/komparesplitter.cpp
@@ -34,12 +34,12 @@
using namespace Diff2;
-KompareSplitter::KompareSplitter( ViewSettings *settings, TQWidget * tqparent,
+KompareSplitter::KompareSplitter( ViewSettings *settings, TQWidget * parent,
const char *name) :
- TQSplitter(Qt::Horizontal, tqparent, name ),
+ TQSplitter(Qt::Horizontal, parent, name ),
m_settings( settings )
{
- TQFrame *scrollFrame = new TQFrame( tqparent, "scrollFrame" );
+ TQFrame *scrollFrame = new TQFrame( parent, "scrollFrame" );
reparent( scrollFrame, *(new TQPoint()), false );
// Set up the scrollFrame
diff --git a/kompare/komparepart/komparesplitter.h b/kompare/komparepart/komparesplitter.h
index 2ce07e29..812906af 100644
--- a/kompare/komparepart/komparesplitter.h
+++ b/kompare/komparepart/komparesplitter.h
@@ -41,7 +41,7 @@ class KompareSplitter : public TQSplitter
TQ_OBJECT
public:
- KompareSplitter(ViewSettings *settings, TQWidget *tqparent=0, const char *name = 0);
+ KompareSplitter(ViewSettings *settings, TQWidget *parent=0, const char *name = 0);
~KompareSplitter();
signals:
diff --git a/kompare/kompareurldialog.cpp b/kompare/kompareurldialog.cpp
index be28295c..d24abaf9 100644
--- a/kompare/kompareurldialog.cpp
+++ b/kompare/kompareurldialog.cpp
@@ -32,8 +32,8 @@
#include "kompareurldialog.h"
-KompareURLDialog::KompareURLDialog( TQWidget *tqparent, const char *name )
- : KDialogBase( IconList, "", Ok|Cancel, Ok, tqparent, name )
+KompareURLDialog::KompareURLDialog( TQWidget *parent, const char *name )
+ : KDialogBase( IconList, "", Ok|Cancel, Ok, parent, name )
{
setIconListAllVisible(true);
diff --git a/kompare/kompareurldialog.h b/kompare/kompareurldialog.h
index 2bc2a929..14e3ed47 100644
--- a/kompare/kompareurldialog.h
+++ b/kompare/kompareurldialog.h
@@ -44,7 +44,7 @@ class KompareURLDialog : public KDialogBase
TQ_OBJECT
public:
- KompareURLDialog( TQWidget* tqparent = 0, const char* name = 0 );
+ KompareURLDialog( TQWidget* parent = 0, const char* name = 0 );
~KompareURLDialog();
KURL getFirstURL() const;
diff --git a/kompare/libdialogpages/diffpage.cpp b/kompare/libdialogpages/diffpage.cpp
index 70c8af2b..8e6d55e5 100644
--- a/kompare/libdialogpages/diffpage.cpp
+++ b/kompare/libdialogpages/diffpage.cpp
@@ -42,7 +42,7 @@
#include "diffpage.h"
-DiffPage::DiffPage( TQWidget* tqparent ) : PageBase( tqparent ),
+DiffPage::DiffPage( TQWidget* parent ) : PageBase( parent ),
m_ignoreRegExpDialog( 0 )
{
addDiffTab();
diff --git a/kompare/libdialogpages/diffsettings.cpp b/kompare/libdialogpages/diffsettings.cpp
index 3f7cb1be..6c2186f5 100644
--- a/kompare/libdialogpages/diffsettings.cpp
+++ b/kompare/libdialogpages/diffsettings.cpp
@@ -19,8 +19,8 @@
#include "diffsettings.h"
-DiffSettings::DiffSettings( TQWidget* tqparent )
- : SettingsBase( tqparent ),
+DiffSettings::DiffSettings( TQWidget* parent )
+ : SettingsBase( parent ),
m_linesOfContext( 0 ),
m_format( Kompare::Unified ),
m_largeFiles( false ),
diff --git a/kompare/libdialogpages/diffsettings.h b/kompare/libdialogpages/diffsettings.h
index 3d219c96..23bbb6ea 100644
--- a/kompare/libdialogpages/diffsettings.h
+++ b/kompare/libdialogpages/diffsettings.h
@@ -31,7 +31,7 @@ class DiffSettings : public SettingsBase
Q_OBJECT
TQ_OBJECT
public:
- DiffSettings( TQWidget* tqparent );
+ DiffSettings( TQWidget* parent );
virtual ~DiffSettings();
public:
// some virtual functions that will be overloaded from the base class
diff --git a/kompare/libdialogpages/filespage.cpp b/kompare/libdialogpages/filespage.cpp
index fd0f6de6..0bbc87fe 100644
--- a/kompare/libdialogpages/filespage.cpp
+++ b/kompare/libdialogpages/filespage.cpp
@@ -31,7 +31,7 @@
#include "filessettings.h"
#include "filespage.h"
-FilesPage::FilesPage( TQWidget* tqparent ) : PageBase( tqparent ), m_URLChanged( false )
+FilesPage::FilesPage( TQWidget* parent ) : PageBase( parent ), m_URLChanged( false )
{
TQWidget* page = new TQWidget( this );
TQVBoxLayout* tqlayout = new TQVBoxLayout( page );
diff --git a/kompare/libdialogpages/filespage.h b/kompare/libdialogpages/filespage.h
index 24380f7c..ef66771b 100644
--- a/kompare/libdialogpages/filespage.h
+++ b/kompare/libdialogpages/filespage.h
@@ -38,7 +38,7 @@ class FilesPage : PageBase
Q_OBJECT
TQ_OBJECT
public:
- FilesPage( TQWidget* tqparent );
+ FilesPage( TQWidget* parent );
virtual ~FilesPage();
public:
diff --git a/kompare/libdialogpages/filessettings.cpp b/kompare/libdialogpages/filessettings.cpp
index fa982a12..01b70076 100644
--- a/kompare/libdialogpages/filessettings.cpp
+++ b/kompare/libdialogpages/filessettings.cpp
@@ -21,8 +21,8 @@
#include "filessettings.h"
-FilesSettings::FilesSettings( TQWidget* tqparent )
- : SettingsBase( tqparent )
+FilesSettings::FilesSettings( TQWidget* parent )
+ : SettingsBase( parent )
{
}
diff --git a/kompare/libdialogpages/filessettings.h b/kompare/libdialogpages/filessettings.h
index a2e5898b..8b8a8342 100644
--- a/kompare/libdialogpages/filessettings.h
+++ b/kompare/libdialogpages/filessettings.h
@@ -30,7 +30,7 @@ class FilesSettings : public SettingsBase
Q_OBJECT
TQ_OBJECT
public:
- FilesSettings( TQWidget* tqparent );
+ FilesSettings( TQWidget* parent );
virtual ~FilesSettings();
public:
diff --git a/kompare/libdialogpages/pagebase.cpp b/kompare/libdialogpages/pagebase.cpp
index bf13986b..33c45dba 100644
--- a/kompare/libdialogpages/pagebase.cpp
+++ b/kompare/libdialogpages/pagebase.cpp
@@ -22,7 +22,7 @@
#include "pagebase.h"
-PageBase::PageBase( TQWidget* tqparent ) : KTabCtl( tqparent )
+PageBase::PageBase( TQWidget* parent ) : KTabCtl( parent )
{
}
diff --git a/kompare/libdialogpages/settingsbase.cpp b/kompare/libdialogpages/settingsbase.cpp
index 36f70a1b..6e347719 100644
--- a/kompare/libdialogpages/settingsbase.cpp
+++ b/kompare/libdialogpages/settingsbase.cpp
@@ -21,7 +21,7 @@
#include "settingsbase.h"
-SettingsBase::SettingsBase( TQWidget* tqparent ) : TQObject( tqparent )
+SettingsBase::SettingsBase( TQWidget* parent ) : TQObject( parent )
{
}
diff --git a/kompare/libdialogpages/settingsbase.h b/kompare/libdialogpages/settingsbase.h
index 79e556cc..98e85308 100644
--- a/kompare/libdialogpages/settingsbase.h
+++ b/kompare/libdialogpages/settingsbase.h
@@ -32,7 +32,7 @@ class SettingsBase : public TQObject
Q_OBJECT
TQ_OBJECT
public:
- SettingsBase( TQWidget* tqparent );
+ SettingsBase( TQWidget* parent );
~SettingsBase();
public:
diff --git a/kompare/libdialogpages/viewpage.cpp b/kompare/libdialogpages/viewpage.cpp
index f7261011..827e8a4d 100644
--- a/kompare/libdialogpages/viewpage.cpp
+++ b/kompare/libdialogpages/viewpage.cpp
@@ -33,7 +33,7 @@
#include "viewpage.h"
#include "viewsettings.h"
-ViewPage::ViewPage( TQWidget* tqparent ) : PageBase( tqparent )
+ViewPage::ViewPage( TQWidget* parent ) : PageBase( parent )
{
TQWidget* page;
TQVBoxLayout* tqlayout;
diff --git a/kompare/libdialogpages/viewsettings.cpp b/kompare/libdialogpages/viewsettings.cpp
index 8e61117e..403746b1 100644
--- a/kompare/libdialogpages/viewsettings.cpp
+++ b/kompare/libdialogpages/viewsettings.cpp
@@ -31,8 +31,8 @@ const TQColor ViewSettings::default_changeColor (237, 190, 190);
const TQColor ViewSettings::default_addColor (190, 190, 237);
const TQColor ViewSettings::default_appliedColor(237, 237, 190);
-ViewSettings::ViewSettings( TQWidget* tqparent )
- : SettingsBase( tqparent ),
+ViewSettings::ViewSettings( TQWidget* parent )
+ : SettingsBase( parent ),
m_removeColor( 0, 0, 0 ),
m_changeColor( 0, 0, 0),
m_addColor( 0, 0, 0),
diff --git a/kompare/libdialogpages/viewsettings.h b/kompare/libdialogpages/viewsettings.h
index c7a2cfd5..3d314afe 100644
--- a/kompare/libdialogpages/viewsettings.h
+++ b/kompare/libdialogpages/viewsettings.h
@@ -36,7 +36,7 @@ public:
static const TQColor default_addColor;
static const TQColor default_appliedColor;
- ViewSettings( TQWidget* tqparent );
+ ViewSettings( TQWidget* parent );
~ViewSettings();
public:
// some virtual functions that will be overloaded from the base class
diff --git a/kompare/libdiff2/komparemodellist.cpp b/kompare/libdiff2/komparemodellist.cpp
index ada2b949..89912eac 100644
--- a/kompare/libdiff2/komparemodellist.cpp
+++ b/kompare/libdiff2/komparemodellist.cpp
@@ -46,8 +46,8 @@
using namespace Diff2;
-KompareModelList::KompareModelList( DiffSettings* diffSettings, struct Kompare::Info& info, TQObject* tqparent, const char* name )
- : TQObject( tqparent, name ),
+KompareModelList::KompareModelList( DiffSettings* diffSettings, struct Kompare::Info& info, TQObject* parent, const char* name )
+ : TQObject( parent, name ),
m_diffProcess( 0 ),
m_diffSettings( diffSettings ),
m_models( 0 ),
@@ -60,32 +60,32 @@ KompareModelList::KompareModelList( DiffSettings* diffSettings, struct Kompare::
{
m_applyDifference = new KAction( i18n("&Apply Difference"), "1rightarrow", TQt::Key_Space,
this, TQT_SLOT(slotActionApplyDifference()),
- (( KomparePart* )tqparent)->actionCollection(), "difference_apply" );
+ (( KomparePart* )parent)->actionCollection(), "difference_apply" );
m_unApplyDifference = new KAction( i18n("Un&apply Difference"), "1leftarrow", TQt::Key_BackSpace,
this, TQT_SLOT(slotActionUnApplyDifference()),
- (( KomparePart* )tqparent)->actionCollection(), "difference_unapply" );
+ (( KomparePart* )parent)->actionCollection(), "difference_unapply" );
m_applyAll = new KAction( i18n("App&ly All"), "2rightarrow", TQt::CTRL + TQt::Key_A,
this, TQT_SLOT(slotActionApplyAllDifferences()),
- (( KomparePart* )tqparent)->actionCollection(), "difference_applyall" );
+ (( KomparePart* )parent)->actionCollection(), "difference_applyall" );
m_unapplyAll = new KAction( i18n("&Unapply All"), "2leftarrow", TQt::CTRL + TQt::Key_U,
this, TQT_SLOT(slotActionUnapplyAllDifferences()),
- (( KomparePart* )tqparent)->actionCollection(), "difference_unapplyall" );
+ (( KomparePart* )parent)->actionCollection(), "difference_unapplyall" );
m_previousFile = new KAction( i18n("P&revious File"), "2uparrow", TQt::CTRL + TQt::Key_PageUp,
this, TQT_SLOT(slotPreviousModel()),
- (( KomparePart* )tqparent)->actionCollection(), "difference_previousfile" );
+ (( KomparePart* )parent)->actionCollection(), "difference_previousfile" );
m_nextFile = new KAction( i18n("N&ext File"), "2downarrow", TQt::CTRL + TQt::Key_PageDown,
this, TQT_SLOT(slotNextModel()),
- (( KomparePart* )tqparent)->actionCollection(), "difference_nextfile" );
+ (( KomparePart* )parent)->actionCollection(), "difference_nextfile" );
m_previousDifference = new KAction( i18n("&Previous Difference"), "1uparrow", TQt::CTRL + TQt::Key_Up,
this, TQT_SLOT(slotPreviousDifference()),
- (( KomparePart* )tqparent)->actionCollection(), "difference_previous" );
+ (( KomparePart* )parent)->actionCollection(), "difference_previous" );
m_nextDifference = new KAction( i18n("&Next Difference"), "1downarrow", TQt::CTRL + TQt::Key_Down,
this, TQT_SLOT(slotNextDifference()),
- (( KomparePart* )tqparent)->actionCollection(), "difference_next" );
+ (( KomparePart* )parent)->actionCollection(), "difference_next" );
m_previousDifference->setEnabled( false );
m_nextDifference->setEnabled( false );
- m_save = KStdAction::save( this, TQT_SLOT(slotSaveDestination()), ((KomparePart*)tqparent)->actionCollection() );
+ m_save = KStdAction::save( this, TQT_SLOT(slotSaveDestination()), ((KomparePart*)parent)->actionCollection() );
m_save->setEnabled( false );
updateModelListActions();
@@ -361,21 +361,21 @@ bool KompareModelList::saveDestination( DiffModel* model )
kdDebug(8101) << "Tempfilename : " << temp->name() << endl;
kdDebug(8101) << "DestinationURL : " << destination << endl;
KIO::UDSEntry entry;
- if ( !KIO::NetAccess::stat( KURL( destination ).path(), entry, (TQWidget*)tqparent() ) )
+ if ( !KIO::NetAccess::stat( KURL( destination ).path(), entry, (TQWidget*)parent() ) )
{
- if ( !KIO::NetAccess::mkdir( KURL( destination ).path(), (TQWidget*)tqparent() ) )
+ if ( !KIO::NetAccess::mkdir( KURL( destination ).path(), (TQWidget*)parent() ) )
{
emit error( i18n( "<qt>Could not create destination directory <b>%1</b>.\nThe file has not been saved.</qt>" ) );
return false;
}
}
- result = KIO::NetAccess::upload( temp->name(), KURL( destination ), (TQWidget*)tqparent() );
+ result = KIO::NetAccess::upload( temp->name(), KURL( destination ), (TQWidget*)parent() );
}
else
{
kdDebug(8101) << "Tempfilename : " << temp->name() << endl;
kdDebug(8101) << "DestinationURL : " << m_destination << endl;
- result = KIO::NetAccess::upload( temp->name(), KURL( m_destination ), (TQWidget*)tqparent() );
+ result = KIO::NetAccess::upload( temp->name(), KURL( m_destination ), (TQWidget*)parent() );
}
if ( !result )
@@ -613,7 +613,7 @@ void KompareModelList::slotWriteDiffOutput( bool success )
emit error( i18n( "Could not write to the temporary file." ) );
}
- KIO::NetAccess::upload( m_diffTemp->name(), KURL( m_diffURL ), (TQWidget*)tqparent() );
+ KIO::NetAccess::upload( m_diffTemp->name(), KURL( m_diffURL ), (TQWidget*)parent() );
emit status( Kompare::FinishedWritingDiff );
}
@@ -1272,7 +1272,7 @@ void KompareModelList::updateModelListActions()
{
if ( m_models && m_selectedModel && m_selectedDifference )
{
- if ( ( ( KomparePart* )tqparent() )->isReadWrite() )
+ if ( ( ( KomparePart* )parent() )->isReadWrite() )
{
if ( m_selectedModel->appliedCount() != m_selectedModel->differenceCount() )
m_applyAll->setEnabled( true );
diff --git a/kompare/libdiff2/komparemodellist.h b/kompare/libdiff2/komparemodellist.h
index f4fb797e..22230db0 100644
--- a/kompare/libdiff2/komparemodellist.h
+++ b/kompare/libdiff2/komparemodellist.h
@@ -43,7 +43,7 @@ class KompareModelList : public TQObject
Q_OBJECT
TQ_OBJECT
public:
- KompareModelList( DiffSettings* diffSettings, struct Kompare::Info& info, TQObject* tqparent = 0, const char* name = 0 );
+ KompareModelList( DiffSettings* diffSettings, struct Kompare::Info& info, TQObject* parent = 0, const char* name = 0 );
~KompareModelList();
public:
diff --git a/kspy/classinfoview.cpp b/kspy/classinfoview.cpp
index 02de2773..0fa16c86 100644
--- a/kspy/classinfoview.cpp
+++ b/kspy/classinfoview.cpp
@@ -25,7 +25,7 @@
#include "classinfoview.h"
-ClassInfoView::ClassInfoView(TQWidget *tqparent, const char *name ) : KListView(tqparent,name)
+ClassInfoView::ClassInfoView(TQWidget *parent, const char *name ) : KListView(parent,name)
{
addColumn( i18n( "Name" ) );
addColumn( i18n( "Value" ) );
diff --git a/kspy/classinfoview.h b/kspy/classinfoview.h
index 0526cc35..6b10a8f7 100644
--- a/kspy/classinfoview.h
+++ b/kspy/classinfoview.h
@@ -29,7 +29,7 @@ class ClassInfoView : public KListView {
Q_OBJECT
TQ_OBJECT
public:
- ClassInfoView(TQWidget *tqparent=0, const char *name=0);
+ ClassInfoView(TQWidget *parent=0, const char *name=0);
~ClassInfoView();
void buildList( TQObject *o );
diff --git a/kspy/navview.cpp b/kspy/navview.cpp
index 388e6bb5..2cdbec90 100644
--- a/kspy/navview.cpp
+++ b/kspy/navview.cpp
@@ -23,7 +23,7 @@
#include "navview.h"
#include "navviewitem.h"
-NavView::NavView(TQWidget *tqparent, const char *name ) : KListView(tqparent,name)
+NavView::NavView(TQWidget *parent, const char *name ) : KListView(parent,name)
{
addColumn( i18n( "Name" ) );
addColumn( i18n( "Type" ) );
@@ -70,9 +70,9 @@ void NavView::selectItem( TQListViewItem *item )
emit selected( navItem->data );
}
-void NavView::createSubTree( NavViewItem *tqparent )
+void NavView::createSubTree( NavViewItem *parent )
{
- const TQObjectList kids = tqparent->data->childrenListObject();
+ const TQObjectList kids = parent->data->childrenListObject();
if ( kids.isEmpty() )
return;
@@ -80,7 +80,7 @@ void NavView::createSubTree( NavViewItem *tqparent )
TQObjectListIt it( kids );
while ( (obj=it.current()) != 0 ) {
++it;
- NavViewItem *item = new NavViewItem( tqparent, obj );
+ NavViewItem *item = new NavViewItem( parent, obj );
createSubTree( item );
}
}
diff --git a/kspy/navview.h b/kspy/navview.h
index 29ebf842..ff6a0571 100644
--- a/kspy/navview.h
+++ b/kspy/navview.h
@@ -32,7 +32,7 @@ class NavView : public KListView
TQ_OBJECT
public:
- NavView( TQWidget *tqparent = 0, const char *name = 0 );
+ NavView( TQWidget *parent = 0, const char *name = 0 );
~NavView();
/**
diff --git a/kspy/navviewitem.cpp b/kspy/navviewitem.cpp
index 596ba7ed..641332ac 100644
--- a/kspy/navviewitem.cpp
+++ b/kspy/navviewitem.cpp
@@ -20,15 +20,15 @@
#include "navview.h"
#include "navviewitem.h"
-NavViewItem::NavViewItem(NavView *tqparent, TQObject *obj )
- : KListViewItem(tqparent, obj->name(), obj->className() )
+NavViewItem::NavViewItem(NavView *parent, TQObject *obj )
+ : KListViewItem(parent, obj->name(), obj->className() )
{
data = obj;
setExpandable( true );
}
-NavViewItem::NavViewItem(NavViewItem *tqparent, TQObject *obj )
- : KListViewItem(tqparent, obj->name(), obj->className() )
+NavViewItem::NavViewItem(NavViewItem *parent, TQObject *obj )
+ : KListViewItem(parent, obj->name(), obj->className() )
{
data = obj;
setExpandable( true );
diff --git a/kspy/navviewitem.h b/kspy/navviewitem.h
index a6c0e888..d9b7ba23 100644
--- a/kspy/navviewitem.h
+++ b/kspy/navviewitem.h
@@ -28,8 +28,8 @@ class NavView;
class NavViewItem : public KListViewItem {
public:
- NavViewItem(NavView *tqparent, TQObject *item );
- NavViewItem(NavViewItem *tqparent, TQObject *item );
+ NavViewItem(NavView *parent, TQObject *item );
+ NavViewItem(NavViewItem *parent, TQObject *item );
~NavViewItem();
TQObject *data;
diff --git a/kspy/propsview.cpp b/kspy/propsview.cpp
index 8ae92ea7..93747c28 100644
--- a/kspy/propsview.cpp
+++ b/kspy/propsview.cpp
@@ -29,8 +29,8 @@
class KSpyItem : KListViewItem
{
public:
- KSpyItem( TQListView * tqparent, TQString label1, TQString label2 = TQString(), TQString label3 = TQString(), TQString label4 = TQString(), TQString label5 = TQString(), TQString label6 = TQString() )
- : KListViewItem(tqparent, label1, label2, label3, label4, label5, label6)
+ KSpyItem( TQListView * parent, TQString label1, TQString label2 = TQString(), TQString label3 = TQString(), TQString label4 = TQString(), TQString label5 = TQString(), TQString label6 = TQString() )
+ : KListViewItem(parent, label1, label2, label3, label4, label5, label6)
{
}
protected:
@@ -48,7 +48,7 @@ protected:
}
};
-PropsView::PropsView(TQWidget *tqparent, const char *name ) : KListView(tqparent,name)
+PropsView::PropsView(TQWidget *parent, const char *name ) : KListView(parent,name)
{
addColumn( i18n( "Name" ) );
addColumn( i18n( "Value" ) );
diff --git a/kspy/propsview.h b/kspy/propsview.h
index 6cc1285d..acf8a44d 100644
--- a/kspy/propsview.h
+++ b/kspy/propsview.h
@@ -29,7 +29,7 @@ class PropsView : public KListView {
Q_OBJECT
TQ_OBJECT
public:
- PropsView(TQWidget *tqparent=0, const char *name=0);
+ PropsView(TQWidget *parent=0, const char *name=0);
~PropsView();
void buildList( TQObject *o );
diff --git a/kspy/receiversview.cpp b/kspy/receiversview.cpp
index 2b04303a..36e06e63 100644
--- a/kspy/receiversview.cpp
+++ b/kspy/receiversview.cpp
@@ -31,7 +31,7 @@ public:
TQConnectionList *public_tqreceivers(int signal) const { return tqreceivers(signal); }
};
-ReceiversView::ReceiversView(TQWidget *tqparent, const char *name ) : KListView(tqparent,name)
+ReceiversView::ReceiversView(TQWidget *parent, const char *name ) : KListView(parent,name)
{
addColumn( i18n( "Object" ) );
addColumn( i18n( "Type" ) );
diff --git a/kspy/receiversview.h b/kspy/receiversview.h
index 07a18188..6e703472 100644
--- a/kspy/receiversview.h
+++ b/kspy/receiversview.h
@@ -29,7 +29,7 @@ class ReceiversView : public KListView {
Q_OBJECT
TQ_OBJECT
public:
- ReceiversView(TQWidget *tqparent=0, const char *name=0);
+ ReceiversView(TQWidget *parent=0, const char *name=0);
~ReceiversView();
void buildList( TQObject *o );
diff --git a/kspy/sigslotview.cpp b/kspy/sigslotview.cpp
index 98400ed7..97d024fb 100644
--- a/kspy/sigslotview.cpp
+++ b/kspy/sigslotview.cpp
@@ -25,7 +25,7 @@
#include "sigslotview.h"
-SigSlotView::SigSlotView(TQWidget *tqparent, const char *name ) : KListView(tqparent,name)
+SigSlotView::SigSlotView(TQWidget *parent, const char *name ) : KListView(parent,name)
{
addColumn( i18n( "Signals/Slots" ) );
diff --git a/kspy/sigslotview.h b/kspy/sigslotview.h
index a1184771..cd2bd97b 100644
--- a/kspy/sigslotview.h
+++ b/kspy/sigslotview.h
@@ -29,7 +29,7 @@ class SigSlotView : public KListView {
Q_OBJECT
TQ_OBJECT
public:
- SigSlotView(TQWidget *tqparent=0, const char *name=0);
+ SigSlotView(TQWidget *parent=0, const char *name=0);
~SigSlotView();
void buildList( TQObject *o );
diff --git a/kspy/spy.cpp b/kspy/spy.cpp
index 6607e484..1ef024d0 100644
--- a/kspy/spy.cpp
+++ b/kspy/spy.cpp
@@ -44,8 +44,8 @@ extern "C"
}
}
-Spy::Spy( TQWidget *tqparent, const char *name )
- : TQWidget( tqparent, name )
+Spy::Spy( TQWidget *parent, const char *name )
+ : TQWidget( parent, name )
{
TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 11, 6 );
diff --git a/kspy/spy.h b/kspy/spy.h
index f3f313b9..f745ac35 100644
--- a/kspy/spy.h
+++ b/kspy/spy.h
@@ -40,7 +40,7 @@ class Spy : public TQWidget
TQ_OBJECT
public:
- Spy( TQWidget *tqparent = 0, const char *name = 0 );
+ Spy( TQWidget *parent = 0, const char *name = 0 );
~Spy();
void setTarget( TQWidget *target );
diff --git a/kuiviewer/kuiviewer_part.cpp b/kuiviewer/kuiviewer_part.cpp
index 16f23292..d4d3fc21 100644
--- a/kuiviewer/kuiviewer_part.cpp
+++ b/kuiviewer/kuiviewer_part.cpp
@@ -52,9 +52,9 @@ typedef KParts::GenericFactory<KUIViewerPart> KUIViewerPartFactory;
K_EXPORT_COMPONENT_FACTORY( libkuiviewerpart, KUIViewerPartFactory )
KUIViewerPart::KUIViewerPart( TQWidget *parentWidget, const char *widgetName,
- TQObject *tqparent, const char *name,
+ TQObject *parent, const char *name,
const TQStringList & /*args*/ )
- : KParts::ReadOnlyPart(tqparent, name)
+ : KParts::ReadOnlyPart(parent, name)
{
// we need an instance
setInstance( KUIViewerPartFactory::instance() );
diff --git a/kuiviewer/kuiviewer_part.h b/kuiviewer/kuiviewer_part.h
index 1d19afad..3400f3bd 100644
--- a/kuiviewer/kuiviewer_part.h
+++ b/kuiviewer/kuiviewer_part.h
@@ -49,7 +49,7 @@ public:
* Default constructor
*/
KUIViewerPart(TQWidget *parentWidget, const char *widgetName,
- TQObject *tqparent, const char *name, const TQStringList &args);
+ TQObject *parent, const char *name, const TQStringList &args);
/**
* Destructor
diff --git a/kunittest/runnergui.cpp b/kunittest/runnergui.cpp
index 64fbd27a..73e888e4 100644
--- a/kunittest/runnergui.cpp
+++ b/kunittest/runnergui.cpp
@@ -95,7 +95,7 @@ namespace KUnitTest
RunnerGUI *m_rg;
};
- RunnerGUI::RunnerGUI(TQWidget *tqparent) : TQHBox(tqparent)
+ RunnerGUI::RunnerGUI(TQWidget *parent) : TQHBox(parent)
{
m_dcop = new RunnerGUIDCOPImpl(this);
@@ -222,7 +222,7 @@ namespace KUnitTest
TQListViewItem *RunnerGUI::getItem(const TQString &name, TQListViewItem *item /*= 0L*/)
{
- TQListViewItem *tqparent = item;
+ TQListViewItem *parent = item;
if ( item == 0L ) item = m_testerWidget->resultList()->firstChild();
else item = item->firstChild();
@@ -233,10 +233,10 @@ namespace KUnitTest
// item not found, create it
if ( item == 0L )
{
- if ( tqparent == 0L )
+ if ( parent == 0L )
item = new TQListViewItem(m_testerWidget->resultList());
else
- item = new TQListViewItem(tqparent);
+ item = new TQListViewItem(parent);
item->setText(g_nameColumn, name);
}
@@ -288,13 +288,13 @@ namespace KUnitTest
bool passed = (item->text(g_failedColumn).toInt(&ok) + item->text(g_xfailedColumn).toInt(&ok)) == 0;
item->setPixmap(g_nameColumn, passed ? SmallIcon("button_ok") : SmallIcon("button_cancel") );
- setSummary(item->tqparent(), res);
+ setSummary(item->parent(), res);
}
TQString RunnerGUI::fullName(TQListViewItem *item)
{
TQString name = item->text(g_nameColumn);
- while ( (item = item->tqparent()) != 0L )
+ while ( (item = item->parent()) != 0L )
name = item->text(g_nameColumn) + "::" + name;
return name;
@@ -358,7 +358,7 @@ namespace KUnitTest
if ( item == 0L ) return;
TQString name = fullName(item);
- if ( name.endsWith("()") ) name = fullName(item->tqparent());
+ if ( name.endsWith("()") ) name = fullName(item->parent());
Tester *tester = Runner::self()->registry().find(name.local8Bit());
diff --git a/kunittest/runnergui.h b/kunittest/runnergui.h
index 6d996849..8b4399d3 100644
--- a/kunittest/runnergui.h
+++ b/kunittest/runnergui.h
@@ -47,7 +47,7 @@ namespace KUnitTest
TQ_OBJECT
public:
- RunnerGUI(TQWidget *tqparent);
+ RunnerGUI(TQWidget *parent);
~RunnerGUI();
private slots:
diff --git a/poxml/antlr/antlr/TokenStreamBasicFilter.hpp b/poxml/antlr/antlr/TokenStreamBasicFilter.hpp
index 9857a122..5438878b 100644
--- a/poxml/antlr/antlr/TokenStreamBasicFilter.hpp
+++ b/poxml/antlr/antlr/TokenStreamBasicFilter.hpp
@@ -25,7 +25,7 @@ public:
void discard(int ttype);
- void discard(const BitSet& tqmask);
+ void discard(const BitSet& mask);
RefToken nextToken();
};
diff --git a/poxml/antlr/antlr/TokenStreamHiddenTokenFilter.hpp b/poxml/antlr/antlr/TokenStreamHiddenTokenFilter.hpp
index b7904ce3..47aad001 100644
--- a/poxml/antlr/antlr/TokenStreamHiddenTokenFilter.hpp
+++ b/poxml/antlr/antlr/TokenStreamHiddenTokenFilter.hpp
@@ -60,7 +60,7 @@ public:
void hide(int m);
- void hide(const BitSet& tqmask);
+ void hide(const BitSet& mask);
protected:
RefToken LA(int i);
diff --git a/poxml/antlr/src/TokenStreamBasicFilter.cpp b/poxml/antlr/src/TokenStreamBasicFilter.cpp
index 82922967..71257f46 100644
--- a/poxml/antlr/src/TokenStreamBasicFilter.cpp
+++ b/poxml/antlr/src/TokenStreamBasicFilter.cpp
@@ -16,9 +16,9 @@ void TokenStreamBasicFilter::discard(int ttype)
discardMask.add(ttype);
}
-void TokenStreamBasicFilter::discard(const BitSet& tqmask)
+void TokenStreamBasicFilter::discard(const BitSet& mask)
{
- discardMask = tqmask;
+ discardMask = mask;
}
RefToken TokenStreamBasicFilter::nextToken()
diff --git a/poxml/antlr/src/TokenStreamHiddenTokenFilter.cpp b/poxml/antlr/src/TokenStreamHiddenTokenFilter.cpp
index 5325fed2..827ca382 100644
--- a/poxml/antlr/src/TokenStreamHiddenTokenFilter.cpp
+++ b/poxml/antlr/src/TokenStreamHiddenTokenFilter.cpp
@@ -86,9 +86,9 @@ void TokenStreamHiddenTokenFilter::hide(int m)
hideMask.add(m);
}
-void TokenStreamHiddenTokenFilter::hide(const BitSet& tqmask)
+void TokenStreamHiddenTokenFilter::hide(const BitSet& mask)
{
- hideMask = tqmask;
+ hideMask = mask;
}
RefToken TokenStreamHiddenTokenFilter::LA(int i)
diff --git a/scheck/scheck.cpp b/scheck/scheck.cpp
index 033051b8..5d8d3582 100644
--- a/scheck/scheck.cpp
+++ b/scheck/scheck.cpp
@@ -1341,7 +1341,7 @@ void StyleCheckStyle::drawPrimitive( PrimitiveElement pe,
}
- // RADIOBUTTON (exclusive indicator) tqmask
+ // RADIOBUTTON (exclusive indicator) mask
// -------------------------------------------------------------------
case PE_ExclusiveIndicatorMask: {
if (maskBmp.isNull()) {
@@ -2330,21 +2330,21 @@ void StyleCheckStyle::tqdrawComplexControl( ComplexControl control,
TQPixmap pixmap = *(toolbutton->parentWidget()->backgroundPixmap());
p->drawTiledPixmap( r, pixmap, toolbutton->pos() );
}
- else if (widget->tqparent())
+ else if (widget->parent())
{
- if (widget->tqparent()->inherits(TQTOOLBAR_OBJECT_NAME_STRING))
+ if (widget->parent()->inherits(TQTOOLBAR_OBJECT_NAME_STRING))
{
- TQToolBar* tqparent = (TQToolBar*)widget->tqparent();
- TQRect pr = tqparent->rect();
+ TQToolBar* parent = (TQToolBar*)widget->parent();
+ TQRect pr = parent->rect();
renderGradient( p, r, cg.button(),
- tqparent->orientation() == Qt::Vertical,
+ parent->orientation() == Qt::Vertical,
r.x(), r.y(), pr.width()-2, pr.height()-2);
}
- else if (widget->tqparent()->inherits("TQToolBarExtensionWidget"))
+ else if (widget->parent()->inherits("TQToolBarExtensionWidget"))
{
- TQWidget* tqparent = (TQWidget*)widget->tqparent();
- TQToolBar* toolbar = (TQToolBar*)tqparent->tqparent();
+ TQWidget* parent = (TQWidget*)widget->parent();
+ TQToolBar* toolbar = (TQToolBar*)parent->parent();
TQRect tr = toolbar->rect();
if ( toolbar->orientation() == Qt::Horizontal ) {
@@ -2682,14 +2682,14 @@ bool StyleCheckStyle::eventFilter( TQObject *object, TQEvent *event )
bool nestedGroupBox = false;
TQString stripped_title = removedXX(stripAccelViolations(gb->title()));
- //Walk tqparent hierarchy to check whether any are groupboxes too..
- TQObject* tqparent = TQT_TQOBJECT(gb);
+ //Walk parent hierarchy to check whether any are groupboxes too..
+ TQObject* parent = TQT_TQOBJECT(gb);
// GCC suggested parentheses around assignment used as truth value
// I suggested that it could eat me. GCC won.
- while ( (tqparent = tqparent->tqparent()) )
+ while ( (parent = parent->parent()) )
{
- if (tqparent->inherits(TQGROUPBOX_OBJECT_NAME_STRING))
+ if (parent->inherits(TQGROUPBOX_OBJECT_NAME_STRING))
{
nestedGroupBox = true;
break;
diff --git a/scripts/fixuifiles b/scripts/fixuifiles
index 3b387df9..785b45b4 100755
--- a/scripts/fixuifiles
+++ b/scripts/fixuifiles
@@ -212,7 +212,7 @@ sub fix_captions($)
}
}
-# Find a .qt_minversion in $dir or any tqparent directory.
+# Find a .qt_minversion in $dir or any parent directory.
sub read_required_version($)
{
my $dir = Cwd::abs_path( shift @_ );
diff --git a/scripts/kde-devel-gdb b/scripts/kde-devel-gdb
index 7627adad..f35161b5 100644
--- a/scripts/kde-devel-gdb
+++ b/scripts/kde-devel-gdb
@@ -188,10 +188,10 @@ define _qmapiterator_inc
set $ret = $ret->left
end
else
- set $y = $ret->tqparent
+ set $y = $ret->parent
while $ret == $y->right
set $ret = $y
- set $y = $y->tqparent
+ set $y = $y->parent
end
if $ret->right != $y
set $ret = $y
diff --git a/scripts/kde-emacs/dirvars.el b/scripts/kde-emacs/dirvars.el
index 94f682b0..5fba18e7 100644
--- a/scripts/kde-emacs/dirvars.el
+++ b/scripts/kde-emacs/dirvars.el
@@ -96,18 +96,18 @@ The FILE-NAME specifies the file name to search for."
(setq dir-name (expand-file-name dir-name))
;; Move up in the dir hierarchy till we find a change log file.
(let ((file1 (concat dir-name file-name))
- tqparent-dir)
+ parent-dir)
(while (and (not (file-exists-p file1))
- (progn (setq tqparent-dir
+ (progn (setq parent-dir
(file-name-directory
(directory-file-name
(file-name-directory file1))))
;; Give up if we are already at the root dir.
(not (string= (file-name-directory file1)
- tqparent-dir))))
- ;; Move up to the tqparent dir and try again.
- (setq file1 (expand-file-name file-name tqparent-dir)))
- ;; If we found the file in a tqparent dir, use that. Otherwise,
+ parent-dir))))
+ ;; Move up to the parent dir and try again.
+ (setq file1 (expand-file-name file-name parent-dir)))
+ ;; If we found the file in a parent dir, use that. Otherwise,
;; return nil
(if (or (get-file-buffer file1) (file-exists-p file1))
file1
diff --git a/scripts/kde-emacs/kde-emacs-compat.el b/scripts/kde-emacs/kde-emacs-compat.el
index baa88a4d..1ff1fe7a 100644
--- a/scripts/kde-emacs/kde-emacs-compat.el
+++ b/scripts/kde-emacs/kde-emacs-compat.el
@@ -59,7 +59,7 @@ Otherwise treat `\\' in NEWTEXT as special:
(let ((map (make-sparse-keymap 'read-shell-command-map)))
(if (eq kde-emacs-type 'xemacs)
(set-keymap-parents map (list minibuffer-local-map))
- (set-keymap-tqparent map minibuffer-local-map))
+ (set-keymap-parent map minibuffer-local-map))
(define-key map "\t" 'comint-dynamic-complete)
(define-key map "\M-\t" 'comint-dynamic-complete)
(define-key map "\M-?" 'comint-dynamic-list-completions)
diff --git a/scripts/kde-emacs/kde-emacs-semantic.el b/scripts/kde-emacs/kde-emacs-semantic.el
index 6b5f8c3f..6cc8dd54 100644
--- a/scripts/kde-emacs/kde-emacs-semantic.el
+++ b/scripts/kde-emacs/kde-emacs-semantic.el
@@ -138,9 +138,9 @@ token and TOKENS have to be a list of functions from buffer."
(equal (semantic-token-type FUNC)
(semantic-token-type elt))
;; FIXME (semantic) : Functions in some classes don't have the
- ;; 'tqparent property set !!!
- ;;(string= (semantic-token-function-tqparent FUNC1)
- ;; (semantic-token-function-tqparent FUNC2))
+ ;; 'parent property set !!!
+ ;;(string= (semantic-token-function-parent FUNC1)
+ ;; (semantic-token-function-parent FUNC2))
(string= (kde-format-args (semantic-token-function-args FUNC))
(kde-format-args (semantic-token-function-args elt))))
(setq ret t))
@@ -224,7 +224,7 @@ would return t"
))
(defun kde-function-construct (token pclass)
- "Constructs a function string from the TOKEN, with the tqparent class PCLASS."
+ "Constructs a function string from the TOKEN, with the parent class PCLASS."
(let ((fname (semantic-token-name token)))
(if (semantic-token-function-destructor token)
(setq fname (concat "~" fname))
@@ -262,7 +262,7 @@ would return t"
class-token has to be a token representing either a class or a struct."
(let ((ret "")
(name (semantic-token-name class-token))
- (parents (semantic-token-type-tqparent class-token))
+ (parents (semantic-token-type-parent class-token))
(parts (semantic-token-type-parts class-token))
(cur-token)
(cur-token-name)
@@ -432,13 +432,13 @@ in the current header file."
(func (kde-function-at-point PT))
(file)
(buf)
- (tqparent))
+ (parent))
(if (and object (equal (semantic-token-type object) "class"))
- (setq tqparent (semantic-token-name object)))
+ (setq parent (semantic-token-name object)))
(if (and (not (kde-function-expanded-at-point PT))
(kde-is-prototype func))
(progn
- (setq func (kde-function-construct func tqparent))
+ (setq func (kde-function-construct func parent))
(setq file (car (kde-file-get-cpp-h)))
(setq buf (current-buffer))
(find-file file)
diff --git a/scripts/kde-emacs/kde-emacs-utils.el b/scripts/kde-emacs/kde-emacs-utils.el
index cb5b58da..4ad2e314 100644
--- a/scripts/kde-emacs/kde-emacs-utils.el
+++ b/scripts/kde-emacs/kde-emacs-utils.el
@@ -451,11 +451,11 @@ This function does not do any hidden buffer changes."
(n (progn
(insert " ")
(self-insert-command (prefix-numeric-value arg))
- (insert kde-emacs-after-tqparent-string)
+ (insert kde-emacs-after-parent-string)
))
(t ;else
(self-insert-command (prefix-numeric-value arg))
- (cond ((not except) (insert kde-emacs-after-tqparent-string)))
+ (cond ((not except) (insert kde-emacs-after-parent-string)))
)))
(self-insert-command (prefix-numeric-value arg)))
)
@@ -489,7 +489,7 @@ This function does not do any hidden buffer changes."
(t ;else
(if abbrev-mode ; XEmacs
(expand-abbrev))
- (insert kde-emacs-after-tqparent-string)
+ (insert kde-emacs-after-parent-string)
(self-insert-command (prefix-numeric-value arg))
))) ; normal case, prepend a space
;;(blink-matching-open) ; show the matching parens
diff --git a/scripts/kde-emacs/kde-emacs-vars.el b/scripts/kde-emacs/kde-emacs-vars.el
index 1b4bcd2e..b2333b30 100644
--- a/scripts/kde-emacs/kde-emacs-vars.el
+++ b/scripts/kde-emacs/kde-emacs-vars.el
@@ -118,7 +118,7 @@ file named /home/domi/src/kdenonbeta/kig/misc/newtype.h"
:group 'kde-devel
:type 'integer)
-(defcustom kde-emacs-after-tqparent-string " "
+(defcustom kde-emacs-after-parent-string " "
"Set this to whatever you want to have inserted after the first parenthesis. Works only if
magic-keys-mode is set to true. "
:group 'kde-devel
diff --git a/scripts/kdesvn-build b/scripts/kdesvn-build
index 1cd46284..b0389d52 100755
--- a/scripts/kdesvn-build
+++ b/scripts/kdesvn-build
@@ -2581,7 +2581,7 @@ sub safe_system(@)
return 0; # Return true
}
-# Helper subroutine to create a directory, including any tqparent
+# Helper subroutine to create a directory, including any parent
# directories that may also need created.
# Returns 0 on failure, non-zero on success
sub super_mkdir
diff --git a/umbrello/THANKS b/umbrello/THANKS
index 33ab7791..ab1462c5 100644
--- a/umbrello/THANKS
+++ b/umbrello/THANKS
@@ -61,7 +61,7 @@ Lutz Mueller <lutz.mueller @gmx.de>
Heiko Nardmann <heiko.nardmann @onlinehome.de>
Dimitri Ognibene <ognibened @yahoo.it>
Michael Palomas <mpalomas @gmail.com>
-Anthony Parent <anthony.tqparent @intel.com>
+Anthony Parent <anthony.parent @intel.com>
Carsten Pfeiffer <pfeiffer @kde.org>
Ivan Porres <iporres @abo.fi>
Maciej Puzio <maciek @work.swmed.edu>
diff --git a/umbrello/umbrello/activitywidget.h b/umbrello/umbrello/activitywidget.h
index 86e494e1..1b82a4aa 100644
--- a/umbrello/umbrello/activitywidget.h
+++ b/umbrello/umbrello/activitywidget.h
@@ -47,7 +47,7 @@ public:
/**
* Creates a Activity widget.
*
- * @param view The tqparent of the widget.
+ * @param view The parent of the widget.
* @param activityType The type of activity.
* @param id The ID to assign (-1 will prompt a new ID.)
*/
diff --git a/umbrello/umbrello/actorwidget.h b/umbrello/umbrello/actorwidget.h
index 7555bf77..6b62bc98 100644
--- a/umbrello/umbrello/actorwidget.h
+++ b/umbrello/umbrello/actorwidget.h
@@ -46,7 +46,7 @@ public:
/**
* Constructs an ActorWidget.
*
- * @param view The tqparent of this ActorWidget.
+ * @param view The parent of this ActorWidget.
* @param o The Actor class this ActorWidget will display.
*/
ActorWidget(UMLView * view, UMLActor *o);
@@ -64,7 +64,7 @@ public:
/**
* Saves the widget to the "actorwidget" XMI element.
- * Note: For loading from XMI, the inherited tqparent method is used.
+ * Note: For loading from XMI, the inherited parent method is used.
*/
void saveToXMI( TQDomDocument & qDoc, TQDomElement & qElement );
diff --git a/umbrello/umbrello/aligntoolbar.h b/umbrello/umbrello/aligntoolbar.h
index 4e515489..7e2170a5 100644
--- a/umbrello/umbrello/aligntoolbar.h
+++ b/umbrello/umbrello/aligntoolbar.h
@@ -36,7 +36,7 @@ public:
/**
* Creates a bar with tools for tqalignment.
*
- * @param parentWindow The tqparent of the toolbar.
+ * @param parentWindow The parent of the toolbar.
* @param name The name of the toolbar.
*/
AlignToolBar(TQMainWindow* parentWindow, const char* name);
diff --git a/umbrello/umbrello/artifactwidget.h b/umbrello/umbrello/artifactwidget.h
index 68ca425a..3fdd26c2 100644
--- a/umbrello/umbrello/artifactwidget.h
+++ b/umbrello/umbrello/artifactwidget.h
@@ -35,7 +35,7 @@ public:
/**
* Constructs a ArtifactWidget.
*
- * @param view The tqparent of this ArtifactWidget.
+ * @param view The parent of this ArtifactWidget.
* @param a The Artifact this widget will be representing.
*/
ArtifactWidget(UMLView *view, UMLArtifact *a);
@@ -52,7 +52,7 @@ public:
/**
* Saves the widget to the "artifactwidget" XMI element.
- * Note: For loading from XMI, the inherited tqparent method is used.
+ * Note: For loading from XMI, the inherited parent method is used.
*/
void saveToXMI(TQDomDocument& qDoc, TQDomElement& qElement);
diff --git a/umbrello/umbrello/association.cpp b/umbrello/umbrello/association.cpp
index a4c9d9d5..62f47a43 100644
--- a/umbrello/umbrello/association.cpp
+++ b/umbrello/umbrello/association.cpp
@@ -164,7 +164,7 @@ void UMLAssociation::saveToXMI( TQDomDocument & qDoc, TQDomElement & qElement )
TQDomElement assocElement = UMLObject::save("UML:Generalization", qDoc);
assocElement.setAttribute( "discriminator", "" );
assocElement.setAttribute( "child", ID2STR(getObjectId(A)) );
- assocElement.setAttribute( "tqparent", ID2STR(getObjectId(B)) );
+ assocElement.setAttribute( "parent", ID2STR(getObjectId(B)) );
qElement.appendChild( assocElement );
return;
}
@@ -201,7 +201,7 @@ bool UMLAssociation::load( TQDomElement & element ) {
m_AssocType == Uml::at_Dependency) {
for (unsigned r = Uml::A; r <= Uml::B; r++) {
const TQString fetch = (m_AssocType == Uml::at_Generalization ?
- r == Uml::A ? "child" : "tqparent"
+ r == Uml::A ? "child" : "parent"
: r == Uml::A ? "client" : "supplier");
TQString roleIdStr = element.attribute(fetch, "");
if (roleIdStr.isEmpty()) {
@@ -235,7 +235,7 @@ bool UMLAssociation::load( TQDomElement & element ) {
continue;
// Permitted tag names:
// roleA: "child" "subtype" "client"
- // roleB: "tqparent" "supertype" "supplier"
+ // roleB: "parent" "supertype" "supplier"
TQString idStr = tempElement.attribute( "xmi.id", "" );
if (idStr.isEmpty())
idStr = tempElement.attribute( "xmi.idref", "" );
@@ -335,7 +335,7 @@ bool UMLAssociation::load( TQDomElement & element ) {
// In the old days, we could just record this on the association,
// and be done with it. But thats not how the UML13.dtd does things.
// As a result, we are checking roleA for information about the
- // tqparent association (!) which by this point in the parse, should
+ // parent association (!) which by this point in the parse, should
// be set. However, the information that the roles are allowed to have
// is not complete, so we need to finish the analysis here.
diff --git a/umbrello/umbrello/association.h b/umbrello/umbrello/association.h
index f3cb5a6f..139a2eb6 100644
--- a/umbrello/umbrello/association.h
+++ b/umbrello/umbrello/association.h
@@ -258,7 +258,7 @@ protected:
*/
bool load(TQDomElement& element);
- // keep track of number of tqparent widgets
+ // keep track of number of parent widgets
int nrof_parent_widgets;
/**
diff --git a/umbrello/umbrello/associationwidget.cpp b/umbrello/umbrello/associationwidget.cpp
index 3b4468f6..6ded541d 100644
--- a/umbrello/umbrello/associationwidget.cpp
+++ b/umbrello/umbrello/associationwidget.cpp
@@ -775,7 +775,7 @@ void AssociationWidget::setUMLAssociation (UMLAssociation * assoc)
umla->nrof_parent_widgets--;
// we are the last "owner" of this association, so delete it
- // from the tqparent UMLDoc, and as a stand-alone
+ // from the parent UMLDoc, and as a stand-alone
//DISCUSS: Should we really do this?
// It implies that an association's existence is ONLY
// governed by its existence on at least one diagram.
@@ -785,16 +785,16 @@ void AssociationWidget::setUMLAssociation (UMLAssociation * assoc)
// relies on (at least the way it's implemented now)
// ANSWER: yes, we *should* do this.
// This only implies that IF an association once 'belonged'
- // to one or more tqparent associationwidgets, then it must 'die' when the
- // last widget does. UMLAssociations which never had a tqparent
+ // to one or more parent associationwidgets, then it must 'die' when the
+ // last widget does. UMLAssociations which never had a parent
// in the first place wont be affected by this code, and can happily
- // live on without a tqparent.
+ // live on without a parent.
//DISCUSS: Sorry Brian, but this breaks cut/paste.
// In particular, cut/paste means that the UMLAssociation _does_
- // have the assocwidget tqparent - the only means of doing a cut/paste
+ // have the assocwidget parent - the only means of doing a cut/paste
// on the diagram is via the widgets. I.e. in practice there is no
// such thing as an "orphan" UMLAssociation.
- // BTW, IMHO the concept of a widget being the tqparent of a UML object
+ // BTW, IMHO the concept of a widget being the parent of a UML object
// is fundamentally flawed. Widgets are pure presentation - they can
// come and go at a whim. If at all, the widgets could be considered
// tqchildren of the corresponding UML object.
@@ -3121,14 +3121,14 @@ void AssociationWidget::setUMLObject(UMLObject *obj) {
setOperation(dynamic_cast<UMLOperation *>(obj));
break;
case Uml::ot_Attribute:
- klass = static_cast<UMLClassifier*>(obj->tqparent());
+ klass = static_cast<UMLClassifier*>(obj->parent());
connect(klass, TQT_SIGNAL(attributeRemoved(UMLClassifierListItem*)),
this, TQT_SLOT(slotAttributeRemoved(UMLClassifierListItem*)));
attr = static_cast<UMLAttribute*>(obj);
connect(attr, TQT_SIGNAL(attributeChanged()), this, TQT_SLOT(slotAttributeChanged()));
break;
case Uml::ot_EntityAttribute:
- ent = static_cast<UMLEntity*>(obj->tqparent());
+ ent = static_cast<UMLEntity*>(obj->parent());
connect(ent, TQT_SIGNAL(entityAttributeRemoved(UMLClassifierListItem*)),
this, TQT_SLOT(slotAttributeRemoved(UMLClassifierListItem*)));
break;
diff --git a/umbrello/umbrello/associationwidget.h b/umbrello/umbrello/associationwidget.h
index b6a9de63..fbbdf214 100644
--- a/umbrello/umbrello/associationwidget.h
+++ b/umbrello/umbrello/associationwidget.h
@@ -69,14 +69,14 @@ public:
/**
* Constructor.
*
- * @param view The tqparent view of this widget.
+ * @param view The parent view of this widget.
*/
AssociationWidget(UMLView *view);
/**
* Constructor.
*
- * @param view The tqparent view of this widget.
+ * @param view The parent view of this widget.
* @param WidgetA Pointer to the role A widget for the association.
* @param Type The Association_Type for this association.
* @param WidgetB Pointer to the role B widget for the association.
diff --git a/umbrello/umbrello/attribute.cpp b/umbrello/umbrello/attribute.cpp
index d18f4d5e..9266c1f4 100644
--- a/umbrello/umbrello/attribute.cpp
+++ b/umbrello/umbrello/attribute.cpp
@@ -23,11 +23,11 @@
#include "dialogs/umlattributedialog.h"
#include "object_factory.h"
-UMLAttribute::UMLAttribute( const UMLObject *tqparent,
+UMLAttribute::UMLAttribute( const UMLObject *parent,
const TQString& name, Uml::IDType id,
Uml::Visibility s,
UMLObject *type, const TQString& iv )
- : UMLClassifierListItem(tqparent, name, id) {
+ : UMLClassifierListItem(parent, name, id) {
m_InitialValue = iv;
m_BaseType = Uml::ot_Attribute;
m_Vis = s;
@@ -40,7 +40,7 @@ UMLAttribute::UMLAttribute( const UMLObject *tqparent,
m_pSecondary = type;
}
-UMLAttribute::UMLAttribute(const UMLObject *tqparent) : UMLClassifierListItem(tqparent) {
+UMLAttribute::UMLAttribute(const UMLObject *parent) : UMLClassifierListItem(parent) {
m_BaseType = Uml::ot_Attribute;
m_Vis = Uml::Visibility::Private;
m_ParmKind = Uml::pd_In;
@@ -88,15 +88,15 @@ TQString UMLAttribute::toString(Uml::Signature_Type sig) {
if(sig == Uml::st_ShowSig || sig == Uml::st_SigNoVis) {
// Determine whether the type name needs to be scoped.
- UMLObject *owningObject = static_cast<UMLObject*>(tqparent());
+ UMLObject *owningObject = static_cast<UMLObject*>(parent());
if (owningObject->getBaseType() == Uml::ot_Operation) {
- // The immediate tqparent() is the UMLOperation but we want
+ // The immediate parent() is the UMLOperation but we want
// the UMLClassifier:
- owningObject = static_cast<UMLObject*>(owningObject->tqparent());
+ owningObject = static_cast<UMLObject*>(owningObject->parent());
}
UMLClassifier *ownParent = dynamic_cast<UMLClassifier*>(owningObject);
if (ownParent == NULL) {
- kError() << "UMLAttribute::toString: tqparent "
+ kError() << "UMLAttribute::toString: parent "
<< owningObject->getName()
<< " is not a UMLClassifier" << endl;
return "";
@@ -129,15 +129,15 @@ TQString UMLAttribute::toString(Uml::Signature_Type sig) {
TQString UMLAttribute::getFullyQualifiedName( const TQString& separator,
bool includeRoot /* = false */) const {
UMLOperation *op = NULL;
- UMLObject *owningObject = static_cast<UMLObject*>(tqparent());
+ UMLObject *owningObject = static_cast<UMLObject*>(parent());
if (owningObject->getBaseType() == Uml::ot_Operation) {
op = static_cast<UMLOperation*>(owningObject);
- owningObject = static_cast<UMLObject*>(owningObject->tqparent());
+ owningObject = static_cast<UMLObject*>(owningObject->parent());
}
UMLClassifier *ownParent = dynamic_cast<UMLClassifier*>(owningObject);
if (ownParent == NULL) {
kError() << "UMLAttribute::getFullyQualifiedName(" << m_Name
- << "): tqparent " << owningObject->getName()
+ << "): parent " << owningObject->getName()
<< " is not a UMLClassifier" << endl;
return "";
}
@@ -168,7 +168,7 @@ bool UMLAttribute::operator==( UMLAttribute &rhs) {
void UMLAttribute::copyInto(UMLAttribute *rhs) const
{
- // call the tqparent first.
+ // call the parent first.
UMLClassifierListItem::copyInto(rhs);
// Copy all datamembers
@@ -180,8 +180,8 @@ void UMLAttribute::copyInto(UMLAttribute *rhs) const
UMLObject* UMLAttribute::clone() const
{
- //FIXME: The new attribute should be slaved to the NEW tqparent not the old.
- UMLAttribute *clone = new UMLAttribute( static_cast<UMLObject*>(tqparent()) );
+ //FIXME: The new attribute should be slaved to the NEW parent not the old.
+ UMLAttribute *clone = new UMLAttribute( static_cast<UMLObject*>(parent()) );
copyInto(clone);
return clone;
@@ -249,8 +249,8 @@ bool UMLAttribute::load( TQDomElement & element ) {
return true;
}
-bool UMLAttribute::showPropertiesDialog(TQWidget* tqparent) {
- UMLAttributeDialog dialog(tqparent, this);
+bool UMLAttribute::showPropertiesDialog(TQWidget* parent) {
+ UMLAttributeDialog dialog(parent, this);
return dialog.exec();
}
diff --git a/umbrello/umbrello/attribute.h b/umbrello/umbrello/attribute.h
index ab904874..4f900389 100644
--- a/umbrello/umbrello/attribute.h
+++ b/umbrello/umbrello/attribute.h
@@ -32,14 +32,14 @@ public:
/**
* Sets up an attribute.
*
- * @param tqparent The tqparent of this UMLAttribute.
+ * @param parent The parent of this UMLAttribute.
* @param name The name of this UMLAttribute.
* @param id The unique id given to this UMLAttribute.
* @param s The visibility of the UMLAttribute.
* @param type The type of this UMLAttribute.
* @param iv The initial value of the attribute.
*/
- UMLAttribute(const UMLObject *tqparent, const TQString& name,
+ UMLAttribute(const UMLObject *parent, const TQString& name,
Uml::IDType id = Uml::id_None,
Uml::Visibility s = Uml::Visibility::Private,
UMLObject *type = 0, const TQString& iv = 0);
@@ -47,9 +47,9 @@ public:
/**
* Sets up an attribute.
*
- * @param tqparent The tqparent of this UMLAttribute.
+ * @param parent The parent of this UMLAttribute.
*/
- UMLAttribute(const UMLObject *tqparent);
+ UMLAttribute(const UMLObject *parent);
/**
* Overloaded '==' operator
@@ -121,7 +121,7 @@ public:
/**
* Display the properties configuration dialog for the attribute.
*/
- virtual bool showPropertiesDialog(TQWidget* tqparent);
+ virtual bool showPropertiesDialog(TQWidget* parent);
void setParmKind (Uml::Parameter_Direction pk);
Uml::Parameter_Direction getParmKind () const;
diff --git a/umbrello/umbrello/autolayout/autolayoutdlg.cpp b/umbrello/umbrello/autolayout/autolayoutdlg.cpp
index 7df110fb..e47911e6 100644
--- a/umbrello/umbrello/autolayout/autolayoutdlg.cpp
+++ b/umbrello/umbrello/autolayout/autolayoutdlg.cpp
@@ -20,8 +20,8 @@
#include <kdebug.h>
-AutolayoutDlg::AutolayoutDlg(KConfig* c,UMLView* v,TQWidget *tqparent, const char *name)
- :MyDialog1(tqparent, name)
+AutolayoutDlg::AutolayoutDlg(KConfig* c,UMLView* v,TQWidget *parent, const char *name)
+ :MyDialog1(parent, name)
{
view=v;
readConfig(c);
diff --git a/umbrello/umbrello/autolayout/autolayoutdlg.h b/umbrello/umbrello/autolayout/autolayoutdlg.h
index ece6fc5f..f2614d03 100644
--- a/umbrello/umbrello/autolayout/autolayoutdlg.h
+++ b/umbrello/umbrello/autolayout/autolayoutdlg.h
@@ -23,7 +23,7 @@ class AutolayoutDlg : public MyDialog1
Q_OBJECT
TQ_OBJECT
public:
- AutolayoutDlg(KConfig* c,UMLView* v, TQWidget *tqparent = 0, const char *name = 0);
+ AutolayoutDlg(KConfig* c,UMLView* v, TQWidget *parent = 0, const char *name = 0);
public slots:
virtual void slotSetAssociationWeight(int i);
virtual void slotSetDependenciesWeight(int i);
diff --git a/umbrello/umbrello/boxwidget.h b/umbrello/umbrello/boxwidget.h
index 02e56eb8..13f7e480 100644
--- a/umbrello/umbrello/boxwidget.h
+++ b/umbrello/umbrello/boxwidget.h
@@ -35,7 +35,7 @@ public:
/**
* Constructs a BoxWidget.
*
- * @param view The tqparent to this widget.
+ * @param view The parent to this widget.
* @param id The ID to assign (-1 will prompt a new ID.)
*/
explicit BoxWidget(UMLView * view, Uml::IDType id = Uml::id_None);
@@ -52,7 +52,7 @@ public:
/**
* Saves the widget to the "boxwidget" XMI element.
- * Note: For loading from XMI, the inherited tqparent method is used.
+ * Note: For loading from XMI, the inherited parent method is used.
*/
void saveToXMI(TQDomDocument& qDoc, TQDomElement& qElement);
};
diff --git a/umbrello/umbrello/classifier.cpp b/umbrello/umbrello/classifier.cpp
index 167bf674..4b8e0bc0 100644
--- a/umbrello/umbrello/classifier.cpp
+++ b/umbrello/umbrello/classifier.cpp
@@ -571,7 +571,7 @@ UMLAttribute* UMLClassifier::addAttribute(const TQString &name, UMLObject *type,
bool UMLClassifier::addAttribute(UMLAttribute* att, IDChangeLog* Log /* = 0 */,
int position /* = -1 */) {
if (findChildObject(att->getName()) == NULL) {
- att->tqparent()->removeChild( att );
+ att->parent()->removeChild( att );
this->insertChild( att );
if (position >= 0 && position < (int)m_List.count())
m_List.insert(position, att);
@@ -636,10 +636,10 @@ UMLOperationList UMLClassifier::getOpList(bool includeInherited) {
for (UMLClassifierListIt pit(parents); (c = pit.current()) != NULL; ++pit) {
if (c == this) {
kError() << "UMLClassifier::getOpList: class " << c->getName()
- << " is tqparent of itself ?!?" << endl;
+ << " is parent of itself ?!?" << endl;
continue;
}
- // get operations for each tqparent by recursive call
+ // get operations for each parent by recursive call
UMLOperationList pops = c->getOpList(true);
// add these operations to operation list, but only if unique.
for (UMLOperation *po = pops.first(); po; po = pops.next()) {
@@ -684,7 +684,7 @@ UMLTemplate* UMLClassifier::addTemplate(const TQString &name, Uml::IDType id) {
bool UMLClassifier::addTemplate(UMLTemplate* newTemplate, IDChangeLog* log /* = 0*/) {
TQString name = newTemplate->getName();
if (findChildObject(name) == NULL) {
- newTemplate->tqparent()->removeChild(newTemplate);
+ newTemplate->parent()->removeChild(newTemplate);
this->insertChild(newTemplate);
m_List.append(newTemplate);
emit templateAdded(newTemplate);
@@ -702,7 +702,7 @@ bool UMLClassifier::addTemplate(UMLTemplate* Template, int position)
{
TQString name = Template->getName();
if (findChildObject(name) == NULL) {
- Template->tqparent()->removeChild(Template);
+ Template->parent()->removeChild(Template);
this->insertChild(Template);
if( position >= 0 && position <= (int)m_List.count() )
m_List.insert(position,Template);
diff --git a/umbrello/umbrello/classifier.h b/umbrello/umbrello/classifier.h
index 56dde52c..495f4812 100644
--- a/umbrello/umbrello/classifier.h
+++ b/umbrello/umbrello/classifier.h
@@ -152,7 +152,7 @@ public:
* no new method is created and the existing operation is returned.
* If no name is provided, or if the params are NULL, an Operation
* Dialog is shown to ask the user for a name and parameters.
- * The operation's signature is checked for validity within the tqparent
+ * The operation's signature is checked for validity within the parent
* classifier.
*
* @param name The operation name (will be chosen internally if
@@ -325,7 +325,7 @@ public:
/**
* Needs to be called after all UML objects are loaded from file.
- * Calls the tqparent resolveRef(), and calls resolveRef() on all
+ * Calls the parent resolveRef(), and calls resolveRef() on all
* UMLClassifierListItems.
* Overrides the method from UMLObject.
*
diff --git a/umbrello/umbrello/classifiercodedocument.cpp b/umbrello/umbrello/classifiercodedocument.cpp
index d5335a34..29e4bd88 100644
--- a/umbrello/umbrello/classifiercodedocument.cpp
+++ b/umbrello/umbrello/classifiercodedocument.cpp
@@ -38,9 +38,9 @@
// Constructors/Destructors
//
-ClassifierCodeDocument::ClassifierCodeDocument ( UMLClassifier * tqparent )
+ClassifierCodeDocument::ClassifierCodeDocument ( UMLClassifier * parent )
{
- init (tqparent);
+ init (parent);
}
ClassifierCodeDocument::~ClassifierCodeDocument ( )
@@ -344,7 +344,7 @@ void ClassifierCodeDocument::addCodeClassFieldMethods(CodeClassFieldList &list )
// add declaration blocks for the passed classfields
void ClassifierCodeDocument::declareClassFields (CodeClassFieldList & list ,
- CodeGenObjectWithTextBlocks * tqparent )
+ CodeGenObjectWithTextBlocks * parent )
{
for (CodeClassFieldListIt ccflit(list); ccflit.current(); ++ccflit)
@@ -356,18 +356,18 @@ void ClassifierCodeDocument::declareClassFields (CodeClassFieldList & list ,
// if it has a tag, check
if(!declBlock->getTag().isEmpty())
{
- // In C++, because we may shift the declaration to a different tqparent
+ // In C++, because we may shift the declaration to a different parent
// block for a change in scope, we need to track down any pre-existing
- // location, and remove FIRST before adding to new tqparent
+ // location, and remove FIRST before adding to new parent
CodeGenObjectWithTextBlocks * oldParent = findParentObjectForTaggedTextBlock (declBlock->getTag());
if(oldParent) {
- if(oldParent != tqparent)
+ if(oldParent != parent)
oldParent->removeTextBlock(declBlock);
}
}
*/
- tqparent->addTextBlock(declBlock); // wont add it IF its already present. Will give it a tag if missing
+ parent->addTextBlock(declBlock); // wont add it IF its already present. Will give it a tag if missing
}
}
@@ -573,8 +573,8 @@ void ClassifierCodeDocument::addAssociationClassField (UMLAssociation * a, bool
void ClassifierCodeDocument::setAttributesFromNode ( TQDomElement & elem )
{
- // NOTE: we DON'T set the tqparent here as we ONLY get to this point
- // IF the tqparent codegenerator could find a matching tqparent classifier
+ // NOTE: we DON'T set the parent here as we ONLY get to this point
+ // IF the parent codegenerator could find a matching parent classifier
// that already has a code document.
// We FIRST set code class field stuff..check re-linnking with
@@ -599,7 +599,7 @@ void ClassifierCodeDocument::setAttributesFromNode ( TQDomElement & elem )
}
// look at all classfields currently in document.. match up
-// by tqparent object ID and Role ID (needed for self-association CF's)
+// by parent object ID and Role ID (needed for self-association CF's)
CodeClassField *
ClassifierCodeDocument::findCodeClassFieldFromParentID (Uml::IDType id,
int role_id)
@@ -619,7 +619,7 @@ ClassifierCodeDocument::findCodeClassFieldFromParentID (Uml::IDType id,
}
// shouldn't happen..
- kError() << "Failed to find codeclassfield for tqparent uml id:"
+ kError() << "Failed to find codeclassfield for parent uml id:"
<< ID2STR(id) << " (role id:" << role_id
<< ") Do you have a corrupt classifier code document?"
<< endl;
@@ -640,7 +640,7 @@ void ClassifierCodeDocument::loadClassFieldsFromXMI( TQDomElement & elem) {
CodeClassField * cf = findCodeClassFieldFromParentID(STR2ID(id), role_id);
if(cf)
{
- // Because we just may change the tqparent object here,
+ // Because we just may change the parent object here,
// we need to yank it from the map of umlobjects
m_classFieldMap.remove(cf->getParentObject());
diff --git a/umbrello/umbrello/classifiercodedocument.h b/umbrello/umbrello/classifiercodedocument.h
index 33aed6ad..dfdb4438 100644
--- a/umbrello/umbrello/classifiercodedocument.h
+++ b/umbrello/umbrello/classifiercodedocument.h
@@ -52,7 +52,7 @@ public:
/**
* Empty Constructor
*/
- ClassifierCodeDocument ( UMLClassifier * tqparent );
+ ClassifierCodeDocument ( UMLClassifier * parent );
/**
* Empty Destructor
@@ -79,12 +79,12 @@ public:
// some Utility methods
/**
- * Return if the tqparent classifier is an interface
+ * Return if the parent classifier is an interface
*/
bool parentIsInterface();
/**
- * Return if the tqparent classifier is a class
+ * Return if the parent classifier is a class
*/
bool parentIsClass();
@@ -133,11 +133,11 @@ public:
*/
CodeClassFieldList getSpecificClassFields (CodeClassField::ClassFieldType cfType, bool isStatic, Uml::Visibility visibility);
- /** Using the tqparent object's UML ID, find the corresponding
+ /** Using the parent object's UML ID, find the corresponding
* codeclassfield object in this classifiercodedocument. Returns
* NULL if no such codeclassfield object exists in this document.
*
- * @param id ID of the tqparent object
+ * @param id ID of the parent object
* @param role_id 0 for role A of the asssociation
* 1 for role B of the asssociation
* -1 if this is an attribute.
@@ -198,11 +198,11 @@ protected:
TextBlock * findCodeClassFieldTextBlockByTag (const TQString &tag);
// add the declaration text blocks for various classfields
- void declareClassFields (CodeClassFieldList & list , CodeGenObjectWithTextBlocks * tqparent);
+ void declareClassFields (CodeClassFieldList & list , CodeGenObjectWithTextBlocks * parent);
virtual void updateContent( ) = 0;
- // force syncronization of child classfields to their tqparent objects
+ // force syncronization of child classfields to their parent objects
void syncClassFields( );
// IF the classifier object is modified, this will get called.
@@ -219,7 +219,7 @@ private:
// based on UMLRoles (e.g. derived from associations with other classifiers).
void updateAssociationClassFields ( UMLAssociationList &assocList );
- // update code operations in this document using the tqparent classifier
+ // update code operations in this document using the parent classifier
void updateOperations( );
/**
@@ -237,7 +237,7 @@ private:
public slots:
/**
- * Synchronize this document to the attributes/associations of the tqparent classifier.
+ * Synchronize this document to the attributes/associations of the parent classifier.
*/
void addAttributeClassField(UMLClassifierListItem *at, bool syncToParentIfAdded = true);
void addAssociationClassField (UMLAssociation * assoc, bool syncToParentIfAdded = true);
diff --git a/umbrello/umbrello/classifierlistitem.cpp b/umbrello/umbrello/classifierlistitem.cpp
index 0e3fc206..60e5b7bf 100644
--- a/umbrello/umbrello/classifierlistitem.cpp
+++ b/umbrello/umbrello/classifierlistitem.cpp
@@ -23,18 +23,18 @@
#include "model_utils.h"
#include "object_factory.h"
-UMLClassifierListItem::UMLClassifierListItem(const UMLObject *tqparent,
+UMLClassifierListItem::UMLClassifierListItem(const UMLObject *parent,
const TQString& name, Uml::IDType id)
- : UMLObject(tqparent, name, id) {
- UMLObject *parentObj = const_cast<UMLObject*>(tqparent);
+ : UMLObject(parent, name, id) {
+ UMLObject *parentObj = const_cast<UMLObject*>(parent);
UMLClassifier *pc = dynamic_cast<UMLClassifier*>(parentObj);
if (pc)
UMLObject::setUMLPackage(pc);
}
-UMLClassifierListItem::UMLClassifierListItem(const UMLObject *tqparent)
- : UMLObject(tqparent) {
- UMLObject *parentObj = const_cast<UMLObject*>(tqparent);
+UMLClassifierListItem::UMLClassifierListItem(const UMLObject *parent)
+ : UMLObject(parent) {
+ UMLObject *parentObj = const_cast<UMLObject*>(parent);
UMLClassifier *pc = dynamic_cast<UMLClassifier*>(parentObj);
if (pc)
UMLObject::setUMLPackage(pc);
@@ -45,7 +45,7 @@ UMLClassifierListItem::~UMLClassifierListItem() {
void UMLClassifierListItem::copyInto(UMLClassifierListItem *rhs) const
{
- // Call the tqparent.
+ // Call the parent.
UMLObject::copyInto(rhs);
}
diff --git a/umbrello/umbrello/classifierlistitem.h b/umbrello/umbrello/classifierlistitem.h
index aba5dd86..c7333150 100644
--- a/umbrello/umbrello/classifierlistitem.h
+++ b/umbrello/umbrello/classifierlistitem.h
@@ -35,30 +35,30 @@ public:
/**
* Constructor. Empty.
*
- * @param tqparent The tqparent to this operation.
+ * @param parent The parent to this operation.
* At first sight it would appear that the type of the
- * tqparent should be UMLClassifier. However, the class
+ * parent should be UMLClassifier. However, the class
* UMLAttribute is also used for the parameters of
* operations, and in this case the UMLOperation is the
- * tqparent.
+ * parent.
* @param name The name of the operation.
* @param id The id of the operation.
*/
- UMLClassifierListItem(const UMLObject *tqparent,
+ UMLClassifierListItem(const UMLObject *parent,
const TQString& name,
Uml::IDType id = Uml::id_None);
/**
* Constructor. Empty.
*
- * @param tqparent The tqparent to this operation.
+ * @param parent The parent to this operation.
* At first sight it would appear that the type of the
- * tqparent should be UMLClassifier. However, the class
+ * parent should be UMLClassifier. However, the class
* UMLAttribute is also used for the parameters of
* operations, and in this case the UMLOperation is the
- * tqparent.
+ * parent.
*/
- UMLClassifierListItem(const UMLObject *tqparent);
+ UMLClassifierListItem(const UMLObject *parent);
/**
* Destructor. Empty.
@@ -105,10 +105,10 @@ public:
/**
* Display the properties configuration dialog for the list item.
*
- * @param tqparent The tqparent widget.
+ * @param parent The parent widget.
* @return True for success of this operation.
*/
- virtual bool showPropertiesDialog(TQWidget* tqparent) = 0;
+ virtual bool showPropertiesDialog(TQWidget* parent) = 0;
/**
* Copy the internal presentation of this object into the new
diff --git a/umbrello/umbrello/classifierwidget.h b/umbrello/umbrello/classifierwidget.h
index 4fa1041d..b92b774f 100644
--- a/umbrello/umbrello/classifierwidget.h
+++ b/umbrello/umbrello/classifierwidget.h
@@ -30,7 +30,7 @@ public:
/**
* Constructs a ClassifierWidget.
*
- * @param view The tqparent of this ClassifierWidget.
+ * @param view The parent of this ClassifierWidget.
* @param o The UMLObject to represent.
*/
ClassifierWidget(UMLView * view, UMLClassifier * o);
diff --git a/umbrello/umbrello/clipboard/umlclipboard.cpp b/umbrello/umbrello/clipboard/umlclipboard.cpp
index ec5b6c84..d654e083 100644
--- a/umbrello/umbrello/clipboard/umlclipboard.cpp
+++ b/umbrello/umbrello/clipboard/umlclipboard.cpp
@@ -290,14 +290,14 @@ bool UMLClipboard::insertItemChildren(UMLListViewItem * Item, UMLListViewItemLis
return true;
}
-bool UMLClipboard::pasteChildren(UMLListViewItem *tqparent, IDChangeLog *chgLog) {
- if (!tqparent) {
- kWarning() << "Paste Children Error, tqparent missing" << endl;
+bool UMLClipboard::pasteChildren(UMLListViewItem *parent, IDChangeLog *chgLog) {
+ if (!parent) {
+ kWarning() << "Paste Children Error, parent missing" << endl;
return false;
}
UMLDoc *doc = UMLApp::app()->getDocument();
UMLListView *listView = UMLApp::app()->getListView();
- UMLListViewItem *childItem = static_cast<UMLListViewItem*>(tqparent->firstChild());
+ UMLListViewItem *childItem = static_cast<UMLListViewItem*>(parent->firstChild());
while (childItem) {
Uml::IDType oldID = childItem->getID();
Uml::IDType newID = chgLog->findNewID(oldID);
@@ -571,9 +571,9 @@ bool UMLClipboard::pasteClip5(TQMimeSource* data) {
(lvitem->getType() != Uml::lvt_Class && lvitem->getType() != Uml::lvt_Interface)) {
return false;
}
- UMLClassifier *tqparent = dynamic_cast<UMLClassifier *>(lvitem->getUMLObject());
- if (tqparent == NULL) {
- kError() << "UMLClipboard::pasteClip5: tqparent is not a UMLClassifier"
+ UMLClassifier *parent = dynamic_cast<UMLClassifier *>(lvitem->getUMLObject());
+ if (parent == NULL) {
+ kError() << "UMLClipboard::pasteClip5: parent is not a UMLClassifier"
<< endl;
return false;
}
@@ -581,7 +581,7 @@ bool UMLClipboard::pasteClip5(TQMimeSource* data) {
UMLObjectList objects;
objects.setAutoDelete(false);
IDChangeLog* idchanges = 0;
- bool result = UMLDrag::decodeClip5(data, objects, tqparent);
+ bool result = UMLDrag::decodeClip5(data, objects, parent);
if(!result) {
return false;
@@ -599,16 +599,16 @@ bool UMLClipboard::pasteClip5(TQMimeSource* data) {
switch(obj->getBaseType()) {
case Uml::ot_Attribute :
{
- UMLObject *exist = tqparent->findChildObject(obj->getName(), Uml::ot_Attribute);
+ UMLObject *exist = parent->findChildObject(obj->getName(), Uml::ot_Attribute);
if (exist) {
- TQString newName = tqparent->uniqChildName(Uml::ot_Attribute, obj->getName());
+ TQString newName = parent->uniqChildName(Uml::ot_Attribute, obj->getName());
obj->setName(newName);
}
UMLAttribute *att = static_cast<UMLAttribute*>(obj);
- if (tqparent->addAttribute(att, idchanges)) {
+ if (parent->addAttribute(att, idchanges)) {
result = true;
} else {
- kError() << "UMLClipboard::pasteClip5: " << tqparent->getName()
+ kError() << "UMLClipboard::pasteClip5: " << parent->getName()
<< "->addAttribute(" << att->getName() << ") failed" << endl;
}
break;
@@ -616,15 +616,15 @@ bool UMLClipboard::pasteClip5(TQMimeSource* data) {
case Uml::ot_Operation :
{
UMLOperation *op = static_cast<UMLOperation*>(obj);
- UMLOperation *exist = tqparent->checkOperationSignature(op->getName(), op->getParmList());
+ UMLOperation *exist = parent->checkOperationSignature(op->getName(), op->getParmList());
if (exist) {
- TQString newName = tqparent->uniqChildName(Uml::ot_Operation, obj->getName());
+ TQString newName = parent->uniqChildName(Uml::ot_Operation, obj->getName());
op->setName(newName);
}
- if (tqparent->addOperation(op, idchanges)) {
+ if (parent->addOperation(op, idchanges)) {
result = true;
} else {
- kError() << "UMLClipboard::pasteClip5: " << tqparent->getName()
+ kError() << "UMLClipboard::pasteClip5: " << parent->getName()
<< "->addOperation(" << op->getName() << ") failed" << endl;
}
break;
diff --git a/umbrello/umbrello/clipboard/umlclipboard.h b/umbrello/umbrello/clipboard/umlclipboard.h
index b7a42e2e..b0607ef2 100644
--- a/umbrello/umbrello/clipboard/umlclipboard.h
+++ b/umbrello/umbrello/clipboard/umlclipboard.h
@@ -183,7 +183,7 @@ private:
/**
* Pastes the tqchildren of a UMLListViewItem (The Parent)
*/
- bool pasteChildren(UMLListViewItem* tqparent, IDChangeLog *chgLog);
+ bool pasteChildren(UMLListViewItem* parent, IDChangeLog *chgLog);
/**
* Gives a `sorry' message box if you're pasting an item which
diff --git a/umbrello/umbrello/clipboard/umldrag.cpp b/umbrello/umbrello/clipboard/umldrag.cpp
index 6fb0be93..543a4b39 100644
--- a/umbrello/umbrello/clipboard/umldrag.cpp
+++ b/umbrello/umbrello/clipboard/umldrag.cpp
@@ -439,12 +439,12 @@ bool UMLDrag::decodeClip2(const TQMimeSource* mimeSource, UMLObjectList& objects
while ( !diagramElement.isNull() ) {
TQString type = diagramElement.attribute("type", "0");
Uml::Diagram_Type dt = (Uml::Diagram_Type)type.toInt();
- UMLListViewItem *tqparent = listView->findFolderForDiagram(dt);
- if (tqparent == NULL)
+ UMLListViewItem *parent = listView->findFolderForDiagram(dt);
+ if (parent == NULL)
return false;
- UMLObject *po = tqparent->getUMLObject();
+ UMLObject *po = parent->getUMLObject();
if (po == NULL || po->getBaseType() != Uml::ot_Folder) {
- kError() << "UMLDrag::decodeClip2: bad tqparent for view" << endl;
+ kError() << "UMLDrag::decodeClip2: bad parent for view" << endl;
return false;
}
UMLFolder *f = static_cast<UMLFolder*>(po);
@@ -584,8 +584,8 @@ bool UMLDrag::decodeClip3(const TQMimeSource* mimeSource, UMLListViewItemList& u
continue;
}
Uml::ListView_Type t = (Uml::ListView_Type)(type.toInt());
- UMLListViewItem* tqparent = parentListView->determineParentItem(t);
- UMLListViewItem* itemData = new UMLListViewItem(tqparent);
+ UMLListViewItem* parent = parentListView->determineParentItem(t);
+ UMLListViewItem* itemData = new UMLListViewItem(parent);
if ( itemData->loadFromXMI(listItemElement) )
umlListViewItems.append(itemData);
else
diff --git a/umbrello/umbrello/codeaccessormethod.cpp b/umbrello/umbrello/codeaccessormethod.cpp
index 938aa88f..e7890865 100644
--- a/umbrello/umbrello/codeaccessormethod.cpp
+++ b/umbrello/umbrello/codeaccessormethod.cpp
@@ -59,8 +59,8 @@ bool CodeAccessorMethod::parentIsAttribute( ) {
}
/**
- * Utility method to get the value of the tqparent object of the tqparent classifield.
- * @return the value of the tqparent of the tqparent classfield
+ * Utility method to get the value of the parent object of the parent classifield.
+ * @return the value of the parent of the parent classfield
*/
/*
UMLObject * CodeAccessorMethod::getParentObject ( ) {
@@ -92,7 +92,7 @@ void CodeAccessorMethod::release () {
// do nothing
}
-// ok, a method so the tqparent can force it to release
+// ok, a method so the parent can force it to release
void CodeAccessorMethod::forceRelease () {
if(m_parentclassfield)
m_parentclassfield->disconnect(this);
@@ -142,8 +142,8 @@ void CodeAccessorMethod::setAttributesFromNode ( TQDomElement & root) {
/*
// I don't believe this is needed for a load from XMI. We never delete
- // accessor methods from the tqparent classfield.. they are essentially
- // in composition with the tqparent class and are arent meant to be out
+ // accessor methods from the parent classfield.. they are essentially
+ // in composition with the parent class and are arent meant to be out
// on their own. Well, this is fine for now, but IF we start allowing
// clipping and pasting of these methods between classes/ classfields
// then we may have problems (ugh.. I cant imagine allowing this, but
@@ -158,7 +158,7 @@ void CodeAccessorMethod::setAttributesFromNode ( TQDomElement & root) {
if(newCF)
initFields(newCF);
else
- kError()<<"ERROR: code accessor method cant load tqparent codeclassfield, corrupt file?"<<endl;
+ kError()<<"ERROR: code accessor method cant load parent codeclassfield, corrupt file?"<<endl;
*/
// now load/set other local attributes
diff --git a/umbrello/umbrello/codeaccessormethod.h b/umbrello/umbrello/codeaccessormethod.h
index 14289e74..2e8457a2 100644
--- a/umbrello/umbrello/codeaccessormethod.h
+++ b/umbrello/umbrello/codeaccessormethod.h
@@ -66,7 +66,7 @@ public:
*/
void setType ( AccessorType type);
- /** Utility method to get the value of the tqparent object of the tqparent classifield.
+ /** Utility method to get the value of the parent object of the parent classifield.
*/
// virtual UMLObject * getParentObject();
@@ -104,7 +104,7 @@ protected:
virtual void updateContent() = 0;
- // a method so the tqparent code classfield can force code block to release
+ // a method so the parent code classfield can force code block to release
void forceRelease ();
private:
diff --git a/umbrello/umbrello/codeblock.h b/umbrello/umbrello/codeblock.h
index 49ad0fe1..b6ec86dd 100644
--- a/umbrello/umbrello/codeblock.h
+++ b/umbrello/umbrello/codeblock.h
@@ -44,8 +44,8 @@ public:
/** constructor with TQString so we can create & populate it in
* one step.
*/
- explicit CodeBlock ( CodeDocument * tqparent, const TQString & body = "");
- explicit CodeBlock ( HierarchicalCodeBlock * tqparent, const TQString & body = "" );
+ explicit CodeBlock ( CodeDocument * parent, const TQString & body = "");
+ explicit CodeBlock ( HierarchicalCodeBlock * parent, const TQString & body = "" );
/**
* Empty Destructor
diff --git a/umbrello/umbrello/codeblockwithcomments.cpp b/umbrello/umbrello/codeblockwithcomments.cpp
index b4a92825..07709cf8 100644
--- a/umbrello/umbrello/codeblockwithcomments.cpp
+++ b/umbrello/umbrello/codeblockwithcomments.cpp
@@ -34,10 +34,10 @@ CodeBlockWithComments::CodeBlockWithComments ( HierarchicalCodeBlock * hb, const
initFields(hb->getParentDocument(), comment);
}
-CodeBlockWithComments::CodeBlockWithComments ( CodeDocument * tqparent , const TQString & body, const TQString & comment)
- : CodeBlock (tqparent, body)
+CodeBlockWithComments::CodeBlockWithComments ( CodeDocument * parent , const TQString & body, const TQString & comment)
+ : CodeBlock (parent, body)
{
- initFields(tqparent, comment);
+ initFields(parent, comment);
}
CodeBlockWithComments::~CodeBlockWithComments ( ) { }
@@ -171,9 +171,9 @@ void CodeBlockWithComments::setOverallIndentationLevel ( int level )
m_comment->setIndentationLevel(level);
}
-void CodeBlockWithComments::initFields(CodeDocument *tqparent, const TQString& comment)
+void CodeBlockWithComments::initFields(CodeDocument *parent, const TQString& comment)
{
- CodeComment * codecomment = CodeGenFactory::newCodeComment(tqparent);
+ CodeComment * codecomment = CodeGenFactory::newCodeComment(parent);
codecomment->setText(comment);
m_comment = codecomment;
}
diff --git a/umbrello/umbrello/codeblockwithcomments.h b/umbrello/umbrello/codeblockwithcomments.h
index ee7b88eb..3b5d3f66 100644
--- a/umbrello/umbrello/codeblockwithcomments.h
+++ b/umbrello/umbrello/codeblockwithcomments.h
@@ -101,7 +101,7 @@ private:
CodeComment * m_comment;
- void initFields(CodeDocument *tqparent, const TQString& comment);
+ void initFields(CodeDocument *parent, const TQString& comment);
};
diff --git a/umbrello/umbrello/codeclassfield.cpp b/umbrello/umbrello/codeclassfield.cpp
index 0ed3a1f4..60e97c77 100644
--- a/umbrello/umbrello/codeclassfield.cpp
+++ b/umbrello/umbrello/codeclassfield.cpp
@@ -52,7 +52,7 @@ CodeClassField::CodeClassField ( ClassifierCodeDocument * doc , UMLAttribute * a
CodeClassField::~CodeClassField ( ) {
- // remove methods from tqparent document
+ // remove methods from parent document
CodeAccessorMethodList list = m_methodVector;
for(CodeAccessorMethod * m = list.first(); m ; m=list.next())
{
@@ -61,7 +61,7 @@ CodeClassField::~CodeClassField ( ) {
}
list.clear();
- // clear the decl block from tqparent text block list too
+ // clear the decl block from parent text block list too
if(m_declCodeBlock)
{
getParentDocument()->removeTextBlock(m_declCodeBlock);
@@ -270,10 +270,10 @@ void CodeClassField::setAttributesFromNode ( TQDomElement & root) {
// always disconnect
getParentObject()->disconnect(this);
- // superclass call.. may reset the tqparent object
+ // superclass call.. may reset the parent object
CodeParameter::setAttributesFromNode(root);
- // make AFTER super-class call. This will reconnect to the tqparent
+ // make AFTER super-class call. This will reconnect to the parent
// and re-check we have all needed child accessor methods and decl blocks
initFields( );
@@ -301,7 +301,7 @@ void CodeClassField::setAttributesFromNode ( TQDomElement & root) {
} else
if( tag == "header" ) {
- // this is treated in tqparent.. skip over here
+ // this is treated in parent.. skip over here
} else
kWarning()<<"ERROR: bad savefile? code classfield loadFromXMI got child element with unknown tag:"<<tag<<" ignoring node."<<endl;
@@ -482,7 +482,7 @@ void CodeClassField::updateContent()
{
// Set properties for writing out the various methods derived from UMLRoles.
- // I suppose this could be supported under individual accessor method synctotqparent
+ // I suppose this could be supported under individual accessor method synctoparent
// calls, but its going to happen again and again for many languages. Why not a catch
// all here? -b.t.
if (parentIsAttribute())
@@ -569,7 +569,7 @@ void CodeClassField::updateContent()
}
}
-// determine whether the tqparent object in this classfield indicates that it is
+// determine whether the parent object in this classfield indicates that it is
// a single variable or a List (Vector). One day this will be done correctly with special
// multiplicity object that we don't have to figure out what it means via regex.
bool CodeClassField::fieldIsSingleValue ( )
diff --git a/umbrello/umbrello/codeclassfield.h b/umbrello/umbrello/codeclassfield.h
index a1674318..bbc3c8d6 100644
--- a/umbrello/umbrello/codeclassfield.h
+++ b/umbrello/umbrello/codeclassfield.h
@@ -103,7 +103,7 @@ public:
*/
CodeAccessorMethod * findMethodByType(CodeAccessorMethod::AccessorType type, int role_id = -1);
- /** Determine whether the tqparent object in this classfield indicates that it is
+ /** Determine whether the parent object in this classfield indicates that it is
* a single variable or a List (Vector). One day this will be done correctly with special
* multiplicity object.
*/
@@ -114,7 +114,7 @@ public:
*/
ClassFieldType getClassFieldType();
- // quick utility call to figure out if tqparent is an attribute or not
+ // quick utility call to figure out if parent is an attribute or not
bool parentIsAttribute ( );
// get the type of object that will be added/removed from lists
@@ -164,7 +164,7 @@ public:
protected:
- /** Set the tqparent UMLobject appropriately.
+ /** Set the parent UMLobject appropriately.
*/
void setParentUMLObject (UMLObject * obj);
diff --git a/umbrello/umbrello/codeclassfielddeclarationblock.cpp b/umbrello/umbrello/codeclassfielddeclarationblock.cpp
index 7c4f5af6..ba7c6878 100644
--- a/umbrello/umbrello/codeclassfielddeclarationblock.cpp
+++ b/umbrello/umbrello/codeclassfielddeclarationblock.cpp
@@ -51,7 +51,7 @@ CodeClassField * CodeClassFieldDeclarationBlock::getParentClassField ( ) {
return m_parentclassfield;
}
-/** Get the tqparent object of the parentCodeClassfield
+/** Get the parent object of the parentCodeClassfield
*/
UMLObject * CodeClassFieldDeclarationBlock::getParentObject ( ) {
return m_parentclassfield->getParentObject();
@@ -143,10 +143,10 @@ void CodeClassFieldDeclarationBlock::syncToParent () {
// the name of the role is not defined.
if(!(getParentClassField()->parentIsAttribute()))
{
- UMLRole * tqparent = dynamic_cast<UMLRole*>(getParentObject());
- if (tqparent == NULL)
+ UMLRole * parent = dynamic_cast<UMLRole*>(getParentObject());
+ if (parent == NULL)
return;
- if(tqparent->getName().isEmpty())
+ if(parent->getName().isEmpty())
{
getComment()->setWriteOutText(false);
setWriteOutText(false);
diff --git a/umbrello/umbrello/codeclassfielddeclarationblock.h b/umbrello/umbrello/codeclassfielddeclarationblock.h
index add38fa8..3233c8f7 100644
--- a/umbrello/umbrello/codeclassfielddeclarationblock.h
+++ b/umbrello/umbrello/codeclassfielddeclarationblock.h
@@ -28,7 +28,7 @@ class CodeClassField;
* class CodeClassFieldDeclarationBlock
* Used to declare classifier fields (e.g. either class attributes or classifier
* associations) in the code document for any given code classfield. This is a
- * special CodeBlockWithComments which is "sync'd" to the tqparent CodeClassField.
+ * special CodeBlockWithComments which is "sync'd" to the parent CodeClassField.
*/
class CodeClassFieldDeclarationBlock : public CodeBlockWithComments, public OwnedCodeBlock
@@ -44,7 +44,7 @@ public:
/**
* Constructor
*/
- CodeClassFieldDeclarationBlock (CodeClassField * tqparent);
+ CodeClassFieldDeclarationBlock (CodeClassField * parent);
/**
* Empty Destructor
@@ -57,11 +57,11 @@ public:
*/
CodeClassField * getParentClassField ( );
- /** A Utility method to get the tqparent object of the parentCodeClassfield
+ /** A Utility method to get the parent object of the parentCodeClassfield
*/
UMLObject * getParentObject ( );
- // get the tqparent document
+ // get the parent document
CodeDocument * getParentDocument ( );
/**
@@ -96,13 +96,13 @@ protected:
*/
virtual void updateContent() = 0;
- // so tqparent can actually release this block
+ // so parent can actually release this block
void forceRelease ();
private:
CodeClassField * m_parentclassfield;
- void init(CodeClassField * tqparent);
+ void init(CodeClassField * parent);
public slots:
diff --git a/umbrello/umbrello/codecomment.cpp b/umbrello/umbrello/codecomment.cpp
index b172c3c2..78873e3d 100644
--- a/umbrello/umbrello/codecomment.cpp
+++ b/umbrello/umbrello/codecomment.cpp
@@ -47,7 +47,7 @@ void CodeComment::saveToXMI ( TQDomDocument & doc, TQDomElement & root ) {
kDebug() << "CodeComment::saveToXMI is called!" << endl;
TQDomElement blockElement = doc.createElement( "codecomment" );
setAttributesOnNode(doc, blockElement); // as we added no additional fields to this class we may
- // just use tqparent TextBlock method
+ // just use parent TextBlock method
root.appendChild( blockElement );
}
diff --git a/umbrello/umbrello/codedocument.cpp b/umbrello/umbrello/codedocument.cpp
index 6fea4367..cb571b6b 100644
--- a/umbrello/umbrello/codedocument.cpp
+++ b/umbrello/umbrello/codedocument.cpp
@@ -364,7 +364,7 @@ void CodeDocument::setAttributesOnNode ( TQDomDocument & doc, TQDomElement & doc
docElement.appendChild( commElement);
// doc codePolicy?
- // FIX: store ONLY if different from the tqparent generator
+ // FIX: store ONLY if different from the parent generator
// policy.. something which is not possible right now. -b.t.
}
diff --git a/umbrello/umbrello/codegenerationpolicy.h b/umbrello/umbrello/codegenerationpolicy.h
index 1876fced..50dfd998 100644
--- a/umbrello/umbrello/codegenerationpolicy.h
+++ b/umbrello/umbrello/codegenerationpolicy.h
@@ -290,7 +290,7 @@ public:
* Create a new dialog interface for this object.
* @return dialog object
*/
- virtual CodeGenerationPolicyPage * createPage ( TQWidget *tqparent = 0, const char * name = 0);
+ virtual CodeGenerationPolicyPage * createPage ( TQWidget *parent = 0, const char * name = 0);
/**
* Gets the heading file (as a string) to be inserted at the
diff --git a/umbrello/umbrello/codegenerator.cpp b/umbrello/umbrello/codegenerator.cpp
index 87c518a2..44a65c62 100644
--- a/umbrello/umbrello/codegenerator.cpp
+++ b/umbrello/umbrello/codegenerator.cpp
@@ -166,10 +166,10 @@ CodeDocumentList * CodeGenerator::getCodeDocumentList ( ) {
}
// the vanilla version
-CodeViewerDialog * CodeGenerator::getCodeViewerDialog ( TQWidget* tqparent, CodeDocument *doc,
+CodeViewerDialog * CodeGenerator::getCodeViewerDialog ( TQWidget* parent, CodeDocument *doc,
Settings::CodeViewerState state)
{
- return new CodeViewerDialog(tqparent, doc, state);
+ return new CodeViewerDialog(parent, doc, state);
}
// Other methods
@@ -227,7 +227,7 @@ void CodeGenerator::saveToXMI ( TQDomDocument & doc, TQDomElement & root ) {
}
/**
- * Initialize this code generator from its tqparent UMLDoc. When this is called, it will
+ * Initialize this code generator from its parent UMLDoc. When this is called, it will
* (re-)generate the list of code documents for this project (generator) by checking
* for new objects/attributes which have been added or changed in the documnet. One or more
* CodeDocuments will be created/overwritten/amended as is appropriate for the given language.
@@ -261,7 +261,7 @@ void CodeGenerator::initFromParentDocument( ) {
}
/**
- * Force a synchronize of this code generator, and its present contents, to that of the tqparent UMLDocument.
+ * Force a synchronize of this code generator, and its present contents, to that of the parent UMLDocument.
* "UserGenerated" code will be preserved, but Autogenerated contents will be updated/replaced
* or removed as is apppropriate.
*/
diff --git a/umbrello/umbrello/codegenerator.h b/umbrello/umbrello/codegenerator.h
index eedec15d..e7e2c24d 100644
--- a/umbrello/umbrello/codegenerator.h
+++ b/umbrello/umbrello/codegenerator.h
@@ -281,7 +281,7 @@ public:
/** Get the editing dialog for this code document
*/
- virtual CodeViewerDialog * getCodeViewerDialog( TQWidget* tqparent, CodeDocument * doc,
+ virtual CodeViewerDialog * getCodeViewerDialog( TQWidget* parent, CodeDocument * doc,
Settings::CodeViewerState state);
/**
@@ -304,7 +304,7 @@ public:
virtual void createDefaultStereotypes ();
/**
- * Initialize this code generator from its tqparent UMLDoc. When this is called,
+ * Initialize this code generator from its parent UMLDoc. When this is called,
* it will (re-)generate the list of code documents for this project (generator)
* by checking for new objects/attributes which have been added or changed in the
* document. One or more CodeDocuments will be created/overwritten/amended as is
@@ -394,7 +394,7 @@ public slots:
virtual void checkRemoveUMLObject (UMLObject * obj);
/**
- * Force a synchronize of this code generator, and its present contents, to that of the tqparent UMLDocument.
+ * Force a synchronize of this code generator, and its present contents, to that of the parent UMLDocument.
* "UserGenerated" code will be preserved, but Autogenerated contents will be updated/replaced
* or removed as is apppropriate.
*/
diff --git a/umbrello/umbrello/codegenerators/adawriter.cpp b/umbrello/umbrello/codegenerators/adawriter.cpp
index 6dc6e4e7..ec2bf59a 100644
--- a/umbrello/umbrello/codegenerators/adawriter.cpp
+++ b/umbrello/umbrello/codegenerators/adawriter.cpp
@@ -298,8 +298,8 @@ void AdaWriter::writeClass(UMLClassifier *c) {
ada << "tagged ";
} else {
// FIXME: Multiple inheritance is not yet supported
- UMLClassifier* tqparent = superclasses.first();
- ada << "new " << className(tqparent, false) << " with ";
+ UMLClassifier* parent = superclasses.first();
+ ada << "new " << className(parent, false) << " with ";
}
ada << "private;" << m_endl << m_endl;
ada << getIndent() << "type " << name << "_Ptr is access all " << name << "'Class;" << m_endl << m_endl;
@@ -363,8 +363,8 @@ void AdaWriter::writeClass(UMLClassifier *c) {
ada << "tagged ";
} else {
// FIXME: Multiple inheritance is not yet supported
- UMLClassifier* tqparent = superclasses.first();
- ada << "new " << className(tqparent, false) << " with ";
+ UMLClassifier* parent = superclasses.first();
+ ada << "new " << className(parent, false) << " with ";
}
ada << "record" << m_endl;
m_indentLevel++;
diff --git a/umbrello/umbrello/codegenerators/codegenfactory.h b/umbrello/umbrello/codegenerators/codegenfactory.h
index 0930f43d..27a0f293 100644
--- a/umbrello/umbrello/codegenerators/codegenfactory.h
+++ b/umbrello/umbrello/codegenerators/codegenfactory.h
@@ -46,7 +46,7 @@ namespace CodeGenFactory {
* Create a CodeOperation belonging to the given ClassifierCodeDocument.
* Only applies to the advanced generators.
*
- * @param cd the tqparent ClassifierCodeDocument.
+ * @param cd the parent ClassifierCodeDocument.
* @param op the related UMLOperation
* @return CodeOperation which is specific to the current language
*/
@@ -57,8 +57,8 @@ namespace CodeGenFactory {
* ClassifierCodeDocument.
* Only applies to the advanced generators.
*
- * @param cd the tqparent ClassifierCodeDocument
- * @param at attribute which is tqparent of this class field
+ * @param cd the parent ClassifierCodeDocument
+ * @param at attribute which is parent of this class field
* @return CodeClassField which is specific to the current language
*/
CodeClassField * newCodeClassField (ClassifierCodeDocument *cd, UMLAttribute * at);
@@ -68,8 +68,8 @@ namespace CodeGenFactory {
* ClassifierCodeDocument.
* Only applies to the advanced generators.
*
- * @param cd the tqparent ClassifierCodeDocument
- * @param role association role which is tqparent of this class field
+ * @param cd the parent ClassifierCodeDocument
+ * @param role association role which is parent of this class field
* @return CodeClassField which is specific to the current language
*/
CodeClassField * newCodeClassField(ClassifierCodeDocument *cd, UMLRole *role);
@@ -78,8 +78,8 @@ namespace CodeGenFactory {
* Create a CodeAccessorMethod object belonging to the given ClassifierCodeDocument.
* Only applies to the advanced generators.
*
- * @param cd the tqparent ClassifierCodeDocument
- * @param cf CodeClassField which is tqparent of this object
+ * @param cd the parent ClassifierCodeDocument
+ * @param cf CodeClassField which is parent of this object
* @param type CodeAccessorMethod::AccessorType to create
*
* @return CodeAccessorMethod which is specific to the current language
@@ -93,8 +93,8 @@ namespace CodeGenFactory {
* ClassifierCodeDocument.
* Only applies to the advanced generators.
*
- * @param cd the tqparent ClassifierCodeDocument
- * @param cf CodeClassField which is tqparent of this object
+ * @param cd the parent ClassifierCodeDocument
+ * @param cf CodeClassField which is parent of this object
*
* @return CodeClassFieldDeclarationBlock which is specific to the current language
*/
@@ -105,7 +105,7 @@ namespace CodeGenFactory {
* Create a new CodeComment object belonging to the given CodeDocument.
* Only applies to the advanced generators.
*
- * @param cd the tqparent CodeDocument
+ * @param cd the parent CodeDocument
* @return CodeBlockWithComments
*/
CodeComment * newCodeComment (CodeDocument *cd);
diff --git a/umbrello/umbrello/codegenerators/codegenpolicyext.h b/umbrello/umbrello/codegenerators/codegenpolicyext.h
index ea792388..29e358a1 100644
--- a/umbrello/umbrello/codegenerators/codegenpolicyext.h
+++ b/umbrello/umbrello/codegenerators/codegenpolicyext.h
@@ -36,7 +36,7 @@ public:
* Create a new dialog interface for this object.
* @return dialog object
*/
- virtual CodeGenerationPolicyPage * createPage(TQWidget *tqparent = 0, const char *name = 0) = 0;
+ virtual CodeGenerationPolicyPage * createPage(TQWidget *parent = 0, const char *name = 0) = 0;
/**
* set the defaults from a config file for this code generator from the passed KConfig pointer.
diff --git a/umbrello/umbrello/codegenerators/cppcodeclassfield.cpp b/umbrello/umbrello/codegenerators/cppcodeclassfield.cpp
index bdba3604..4742cd6d 100644
--- a/umbrello/umbrello/codegenerators/cppcodeclassfield.cpp
+++ b/umbrello/umbrello/codegenerators/cppcodeclassfield.cpp
@@ -86,7 +86,7 @@ TQString CPPCodeClassField::getInitialValue() {
if (at) {
return fixInitialStringDeclValue(at->getInitialValue(), getTypeName());
} else {
- kError() << "CPPCodeClassField::getInitialValue: tqparent object is not a UMLAttribute"
+ kError() << "CPPCodeClassField::getInitialValue: parent object is not a UMLAttribute"
<< endl;
return "";
}
diff --git a/umbrello/umbrello/codegenerators/cppcodecomment.cpp b/umbrello/umbrello/codegenerators/cppcodecomment.cpp
index dada5357..ecb100bd 100644
--- a/umbrello/umbrello/codegenerators/cppcodecomment.cpp
+++ b/umbrello/umbrello/codegenerators/cppcodecomment.cpp
@@ -53,7 +53,7 @@ CPPCodeComment::~CPPCodeComment ( ) { }
void CPPCodeComment::saveToXMI ( TQDomDocument & doc, TQDomElement & root ) {
TQDomElement blockElement = doc.createElement( "cppcodecomment" );
setAttributesOnNode(doc, blockElement); // as we added no additional fields to this class we may
- // just use tqparent TextBlock method
+ // just use parent TextBlock method
root.appendChild( blockElement );
}
diff --git a/umbrello/umbrello/codegenerators/cppcodedocumentation.cpp b/umbrello/umbrello/codegenerators/cppcodedocumentation.cpp
index c8e68f4c..ba303284 100644
--- a/umbrello/umbrello/codegenerators/cppcodedocumentation.cpp
+++ b/umbrello/umbrello/codegenerators/cppcodedocumentation.cpp
@@ -53,7 +53,7 @@ CPPCodeDocumentation::~CPPCodeDocumentation ( ) { }
void CPPCodeDocumentation::saveToXMI ( TQDomDocument & doc, TQDomElement & root ) {
TQDomElement blockElement = doc.createElement( "cppcodedocumentation" );
setAttributesOnNode(doc, blockElement); // as we added no additional fields to this class we may
- // just use tqparent TextBlock method
+ // just use parent TextBlock method
root.appendChild( blockElement );
}
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationform.cpp b/umbrello/umbrello/codegenerators/cppcodegenerationform.cpp
index 563a86ee..1051b6c6 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerationform.cpp
+++ b/umbrello/umbrello/codegenerators/cppcodegenerationform.cpp
@@ -28,8 +28,8 @@
#include <kmessagebox.h>
-CPPCodeGenerationForm::CPPCodeGenerationForm( TQWidget *tqparent, const char *name )
- : CPPCodeGenerationFormBase (tqparent,name)
+CPPCodeGenerationForm::CPPCodeGenerationForm( TQWidget *parent, const char *name )
+ : CPPCodeGenerationFormBase (parent,name)
{
init();
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationform.h b/umbrello/umbrello/codegenerators/cppcodegenerationform.h
index 7a98ef91..aebaa5d5 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerationform.h
+++ b/umbrello/umbrello/codegenerators/cppcodegenerationform.h
@@ -31,7 +31,7 @@ public:
/**
* std ctor
*/
- explicit CPPCodeGenerationForm (TQWidget *tqparent=0, const char *name=0);
+ explicit CPPCodeGenerationForm (TQWidget *parent=0, const char *name=0);
/**
* std dtor
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.cpp b/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.cpp
index d14d92b9..8aec0351 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.cpp
+++ b/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.cpp
@@ -359,8 +359,8 @@ void CPPCodeGenerationPolicy::setDefaults( KConfig * config, bool emitUpdateSign
* Create a new dialog interface for this object.
* @return dialog object
*/
-CodeGenerationPolicyPage * CPPCodeGenerationPolicy::createPage ( TQWidget *tqparent, const char *name ) {
- return new CPPCodeGenerationPolicyPage ( tqparent, name, this );
+CodeGenerationPolicyPage * CPPCodeGenerationPolicy::createPage ( TQWidget *parent, const char *name ) {
+ return new CPPCodeGenerationPolicyPage ( parent, name, this );
}
void CPPCodeGenerationPolicy::init() {
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.h b/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.h
index 949b451c..5788a2fe 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.h
+++ b/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.h
@@ -193,7 +193,7 @@ public:
* Create a new dialog interface for this object.
* @return dialog object
*/
- CodeGenerationPolicyPage * createPage ( TQWidget *tqparent = 0, const char * name = 0);
+ CodeGenerationPolicyPage * createPage ( TQWidget *parent = 0, const char * name = 0);
protected:
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.cpp b/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.cpp
index a008daab..60d37bac 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.cpp
+++ b/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.cpp
@@ -26,8 +26,8 @@
#include "cppcodegenerationformbase.h"
#include "../uml.h"
-CPPCodeGenerationPolicyPage::CPPCodeGenerationPolicyPage( TQWidget *tqparent, const char *name, CPPCodeGenerationPolicy * policy )
- : CodeGenerationPolicyPage(tqparent, name, policy)
+CPPCodeGenerationPolicyPage::CPPCodeGenerationPolicyPage( TQWidget *parent, const char *name, CPPCodeGenerationPolicy * policy )
+ : CodeGenerationPolicyPage(parent, name, policy)
{
CodeGenerationPolicy *common = UMLApp::app()->getCommonPolicy();
form = new CPPCodeGenerationForm(this);
@@ -59,31 +59,31 @@ void CPPCodeGenerationPolicyPage::apply()
CodeGenerationPolicy *common = UMLApp::app()->getCommonPolicy();
// now do our cpp-specific configs
- CPPCodeGenerationPolicy * tqparent = (CPPCodeGenerationPolicy*) m_parentPolicy;
+ CPPCodeGenerationPolicy * parent = (CPPCodeGenerationPolicy*) m_parentPolicy;
// block signals so that we don't generate too many sync signals for child code
// documents
- tqparent->blockSignals(true);
+ parent->blockSignals(true);
common->setCommentStyle((CodeGenerationPolicy::CommentStyle ) form->m_SelectCommentStyle->currentItem());
common->setAutoGenerateConstructors(form->getGenerateEmptyConstructors());
- tqparent->setAutoGenerateAccessors(form->getGenerateAccessorMethods());
+ parent->setAutoGenerateAccessors(form->getGenerateAccessorMethods());
- tqparent->setDestructorsAreVirtual(form->getVirtualDestructors());
- tqparent->setPackageIsNamespace(form->getPackageIsANamespace());
- tqparent->setAccessorsAreInline(form->getAccessorsAreInline());
- tqparent->setOperationsAreInline(form->getOperationsAreInline());
- tqparent->setAccessorsArePublic(form->getAccessorsArePublic());
+ parent->setDestructorsAreVirtual(form->getVirtualDestructors());
+ parent->setPackageIsNamespace(form->getPackageIsANamespace());
+ parent->setAccessorsAreInline(form->getAccessorsAreInline());
+ parent->setOperationsAreInline(form->getOperationsAreInline());
+ parent->setAccessorsArePublic(form->getAccessorsArePublic());
- tqparent->setStringClassName(form->m_stringClassHCombo->currentText());
- tqparent->setStringClassNameInclude(form->m_stringIncludeFileHistoryCombo->currentText());
- tqparent->setStringIncludeIsGlobal(form->m_globalStringCheckBox->isChecked());
+ parent->setStringClassName(form->m_stringClassHCombo->currentText());
+ parent->setStringClassNameInclude(form->m_stringIncludeFileHistoryCombo->currentText());
+ parent->setStringIncludeIsGlobal(form->m_globalStringCheckBox->isChecked());
- tqparent->setVectorClassName(form->m_listClassHCombo->currentText());
- tqparent->setVectorClassNameInclude(form->m_listIncludeFileHistoryCombo->currentText());
- tqparent->setVectorIncludeIsGlobal(form->m_globalListCheckBox->isChecked());
+ parent->setVectorClassName(form->m_listClassHCombo->currentText());
+ parent->setVectorClassNameInclude(form->m_listIncludeFileHistoryCombo->currentText());
+ parent->setVectorIncludeIsGlobal(form->m_globalListCheckBox->isChecked());
- tqparent->blockSignals(false);
+ parent->blockSignals(false);
// now send out modified code content signal
common->emitModifiedCodeContentSig();
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.h b/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.h
index 6e32c62d..a918acfb 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.h
+++ b/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.h
@@ -31,7 +31,7 @@ class CPPCodeGenerationPolicyPage : public CodeGenerationPolicyPage {
TQ_OBJECT
public:
- explicit CPPCodeGenerationPolicyPage (TQWidget *tqparent=0, const char *name=0, CPPCodeGenerationPolicy * policy = 0);
+ explicit CPPCodeGenerationPolicyPage (TQWidget *parent=0, const char *name=0, CPPCodeGenerationPolicy * policy = 0);
virtual ~CPPCodeGenerationPolicyPage();
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerator.cpp b/umbrello/umbrello/codegenerators/cppcodegenerator.cpp
index b5571d02..b5c12dd6 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerator.cpp
+++ b/umbrello/umbrello/codegenerators/cppcodegenerator.cpp
@@ -120,14 +120,14 @@ bool CPPCodeGenerator::removeHeaderCodeDocument ( CPPHeaderCodeDocument * remove
// In the C++ version, we need to make both source and header files as well
// as the makefile available.
-CodeViewerDialog * CPPCodeGenerator::getCodeViewerDialog ( TQWidget* tqparent, CodeDocument *doc,
+CodeViewerDialog * CPPCodeGenerator::getCodeViewerDialog ( TQWidget* parent, CodeDocument *doc,
Settings::CodeViewerState state)
{
ClassifierCodeDocument * cdoc = dynamic_cast<ClassifierCodeDocument*>(doc);
if(!cdoc)
// bah..not a classcode document?? then just use vanilla version
- return CodeGenerator::getCodeViewerDialog(tqparent,doc,state);
+ return CodeGenerator::getCodeViewerDialog(parent,doc,state);
else {
// build with passed (source) code document
CodeViewerDialog *dialog;
@@ -138,11 +138,11 @@ CodeViewerDialog * CPPCodeGenerator::getCodeViewerDialog ( TQWidget* tqparent, C
if(hdoc)
{
// if we have a header document..build with that
- dialog = new CodeViewerDialog(tqparent, hdoc, state);
+ dialog = new CodeViewerDialog(parent, hdoc, state);
dialog->addCodeDocument(doc);
} else
// shouldn't happen, but lets try to gracefully deliver something.
- dialog = new CodeViewerDialog(tqparent, doc, state);
+ dialog = new CodeViewerDialog(parent, doc, state);
// add in makefile if available and desired
if(getCreateProjectMakefile())
@@ -178,8 +178,8 @@ void CPPCodeGenerator::saveToXMI ( TQDomDocument & doc, TQDomElement & root ) {
}
/**
- * Force a synchronize of this code generator, and its present contents, to that of the tqparent UMLDocument.
- * Need to override tqparent method because we have header documents to consider too.
+ * Force a synchronize of this code generator, and its present contents, to that of the parent UMLDocument.
+ * Need to override parent method because we have header documents to consider too.
*/
void CPPCodeGenerator::syncCodeToDocument ( ) {
@@ -347,7 +347,7 @@ void CPPCodeGenerator::initAttributes ( )
UMLApp::app()->setPolicyExt ( new CPPCodeGenerationPolicy(UMLApp::app()->getConfig()) );
- // load Classifier documents from tqparent document
+ // load Classifier documents from parent document
//initFromParentDocument();
}
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerator.h b/umbrello/umbrello/codegenerators/cppcodegenerator.h
index 90b0c3f2..5d73f881 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerator.h
+++ b/umbrello/umbrello/codegenerators/cppcodegenerator.h
@@ -89,7 +89,7 @@ public:
/** Get the editing dialog for this code document
*/
- virtual CodeViewerDialog * getCodeViewerDialog( TQWidget* tqparent, CodeDocument * doc,
+ virtual CodeViewerDialog * getCodeViewerDialog( TQWidget* parent, CodeDocument * doc,
Settings::CodeViewerState state);
/**
@@ -158,7 +158,7 @@ public slots:
virtual void checkRemoveUMLObject (UMLObject * obj);
/**
- * Force a synchronize of this code generator, and its present contents, to that of the tqparent UMLDocument.
+ * Force a synchronize of this code generator, and its present contents, to that of the parent UMLDocument.
* "UserGenerated" code will be preserved, but Autogenerated contents will be updated/replaced
* or removed as is apppropriate.
*/
diff --git a/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.h b/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.h
index 84fc128a..7277ea87 100644
--- a/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.h
+++ b/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.h
@@ -61,7 +61,7 @@ protected:
private:
- void init (CPPHeaderCodeDocument * tqparent, const TQString &comment);
+ void init (CPPHeaderCodeDocument * parent, const TQString &comment);
};
diff --git a/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.cpp b/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.cpp
index 55edd167..3f15d05b 100644
--- a/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.cpp
+++ b/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.cpp
@@ -21,8 +21,8 @@
// Constructors/Destructors
//
-CPPHeaderCodeClassFieldDeclarationBlock::CPPHeaderCodeClassFieldDeclarationBlock ( CodeClassField * tqparent )
- : CodeClassFieldDeclarationBlock ( tqparent )
+CPPHeaderCodeClassFieldDeclarationBlock::CPPHeaderCodeClassFieldDeclarationBlock ( CodeClassField * parent )
+ : CodeClassFieldDeclarationBlock ( parent )
{
setOverallIndentationLevel(1);
updateContent();
@@ -41,8 +41,8 @@ CPPHeaderCodeClassFieldDeclarationBlock::~CPPHeaderCodeClassFieldDeclarationBloc
*/
void CPPHeaderCodeClassFieldDeclarationBlock::updateContent( )
{
- UMLObject *umltqparent = CodeClassFieldDeclarationBlock::getParentObject();
- if (umltqparent == NULL) {
+ UMLObject *umlparent = CodeClassFieldDeclarationBlock::getParentObject();
+ if (umlparent == NULL) {
return;
}
@@ -50,7 +50,7 @@ void CPPHeaderCodeClassFieldDeclarationBlock::updateContent( )
CPPCodeClassField * hcppcf = dynamic_cast<CPPCodeClassField*>(cf);
// Set the comment
- TQString notes = umltqparent->getDoc();
+ TQString notes = umlparent->getDoc();
getComment()->setText(notes);
if(notes.isEmpty())
getComment()->setWriteOutText(false);
@@ -59,7 +59,7 @@ void CPPHeaderCodeClassFieldDeclarationBlock::updateContent( )
// Set the body
- TQString staticValue = umltqparent->getStatic() ? "static " : "";
+ TQString staticValue = umlparent->getStatic() ? "static " : "";
TQString typeName = hcppcf->getTypeName();
TQString fieldName = hcppcf->getFieldName();
diff --git a/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.h b/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.h
index dc3a4c29..d4e28bb9 100644
--- a/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.h
+++ b/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.h
@@ -32,7 +32,7 @@ public:
/**
* Constructor
*/
- CPPHeaderCodeClassFieldDeclarationBlock ( CodeClassField * tqparent );
+ CPPHeaderCodeClassFieldDeclarationBlock ( CodeClassField * parent );
/**
* Empty Destructor
@@ -41,7 +41,7 @@ public:
protected:
- // this will be called by syncToParent whenever the tqparent object is "modified"
+ // this will be called by syncToParent whenever the parent object is "modified"
void updateContent ( );
private:
diff --git a/umbrello/umbrello/codegenerators/cppheadercodedocument.cpp b/umbrello/umbrello/codegenerators/cppheadercodedocument.cpp
index c725439f..9da4c6aa 100644
--- a/umbrello/umbrello/codegenerators/cppheadercodedocument.cpp
+++ b/umbrello/umbrello/codegenerators/cppheadercodedocument.cpp
@@ -206,7 +206,7 @@ void CPPHeaderCodeDocument::loadChildTextBlocksFromNode ( TQDomElement & root)
{
CPPHeaderClassDeclarationBlock * block = getClassDecl();
block->loadFromXMI(element);
- // normally this would be populated by the following syncTotqparent
+ // normally this would be populated by the following syncToparent
// call, but we cant wait for it, so lets just do it now.
namespaceBlock = getHierarchicalCodeBlock("namespace", "Namespace", 0);
@@ -326,7 +326,7 @@ void CPPHeaderCodeDocument::saveToXMI ( TQDomDocument & doc, TQDomElement & root
*/
// This method will cause the class to rebuild its text representation.
-// based on the tqparent classifier object.
+// based on the parent classifier object.
// For any situation in which this is called, we are either building the code
// document up, or replacing/regenerating the existing auto-generated parts. As
// such, we will want to insert everything we resonablely will want
@@ -334,7 +334,7 @@ void CPPHeaderCodeDocument::saveToXMI ( TQDomDocument & doc, TQDomElement & root
// comments) to appear or not, as needed.
void CPPHeaderCodeDocument::updateContent( )
{
- // Gather info on the various fields and tqparent objects of this class...
+ // Gather info on the various fields and parent objects of this class...
UMLClassifier * c = getParentClassifier();
CodeGenPolicyExt *pe = UMLApp::app()->getPolicyExt();
CPPCodeGenerationPolicy * policy = dynamic_cast<CPPCodeGenerationPolicy*>(pe);
@@ -800,7 +800,7 @@ void CPPHeaderCodeDocument::updateContent( )
// Operations
//
- // nothing to do here.. "updateOperations" in tqparent class puts things
+ // nothing to do here.. "updateOperations" in parent class puts things
// in the right place using the "addCodeOperation" method we defined in this class
// FINISH up with hash def block close
diff --git a/umbrello/umbrello/codegenerators/cppheadercodeoperation.cpp b/umbrello/umbrello/codegenerators/cppheadercodeoperation.cpp
index 37951553..471c7734 100644
--- a/umbrello/umbrello/codegenerators/cppheadercodeoperation.cpp
+++ b/umbrello/umbrello/codegenerators/cppheadercodeoperation.cpp
@@ -26,8 +26,8 @@
//
CPPHeaderCodeOperation::CPPHeaderCodeOperation
- ( CPPHeaderCodeDocument * doc, UMLOperation *tqparent, const TQString & body, const TQString & comment )
- : CodeOperation (doc, tqparent, body, comment)
+ ( CPPHeaderCodeDocument * doc, UMLOperation *parent, const TQString & body, const TQString & comment )
+ : CodeOperation (doc, parent, body, comment)
{
// lets not go with the default comment and instead use
// full-blown cpp documentation object instead
diff --git a/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.cpp b/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.cpp
index 2e55e92a..016249e5 100644
--- a/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.cpp
+++ b/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.cpp
@@ -20,8 +20,8 @@
// Constructors/Destructors
//
-CPPSourceCodeClassFieldDeclarationBlock::CPPSourceCodeClassFieldDeclarationBlock ( CodeClassField * tqparent )
- : CodeClassFieldDeclarationBlock ( tqparent )
+CPPSourceCodeClassFieldDeclarationBlock::CPPSourceCodeClassFieldDeclarationBlock ( CodeClassField * parent )
+ : CodeClassFieldDeclarationBlock ( parent )
{
setOverallIndentationLevel(1);
updateContent();
diff --git a/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.h b/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.h
index 00b6135f..46183b70 100644
--- a/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.h
+++ b/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.h
@@ -32,7 +32,7 @@ public:
/**
* Constructor
*/
- CPPSourceCodeClassFieldDeclarationBlock ( CodeClassField * tqparent );
+ CPPSourceCodeClassFieldDeclarationBlock ( CodeClassField * parent );
/**
* Empty Destructor
@@ -41,7 +41,7 @@ public:
protected:
- // this will be called by syncToParent whenever the tqparent object is "modified"
+ // this will be called by syncToParent whenever the parent object is "modified"
void updateContent ( );
private:
diff --git a/umbrello/umbrello/codegenerators/cppsourcecodedocument.cpp b/umbrello/umbrello/codegenerators/cppsourcecodedocument.cpp
index 53ee06f7..57bf4637 100644
--- a/umbrello/umbrello/codegenerators/cppsourcecodedocument.cpp
+++ b/umbrello/umbrello/codegenerators/cppsourcecodedocument.cpp
@@ -106,7 +106,7 @@ void CPPSourceCodeDocument::resetTextBlocks()
}
// This method will cause the class to rebuild its text representation.
-// based on the tqparent classifier object.
+// based on the parent classifier object.
// For any situation in which this is called, we are either building the code
// document up, or replacing/regenerating the existing auto-generated parts. As
// such, we will want to insert everything we reasonably will want
@@ -115,7 +115,7 @@ void CPPSourceCodeDocument::resetTextBlocks()
void CPPSourceCodeDocument::updateContent( )
{
- // Gather info on the various fields and tqparent objects of this class...
+ // Gather info on the various fields and parent objects of this class...
//UMLClassifier * c = getParentClassifier();
CodeGenPolicyExt *pe = UMLApp::app()->getPolicyExt();
CPPCodeGenerationPolicy * policy = dynamic_cast<CPPCodeGenerationPolicy*>(pe);
diff --git a/umbrello/umbrello/codegenerators/cppsourcecodeoperation.cpp b/umbrello/umbrello/codegenerators/cppsourcecodeoperation.cpp
index 9409b207..61b1950e 100644
--- a/umbrello/umbrello/codegenerators/cppsourcecodeoperation.cpp
+++ b/umbrello/umbrello/codegenerators/cppsourcecodeoperation.cpp
@@ -25,8 +25,8 @@
// Constructors/Destructors
//
-CPPSourceCodeOperation::CPPSourceCodeOperation ( CPPSourceCodeDocument * doc, UMLOperation *tqparent, const TQString & body, const TQString & comment )
- : CodeOperation (doc, tqparent, body, comment)
+CPPSourceCodeOperation::CPPSourceCodeOperation ( CPPSourceCodeDocument * doc, UMLOperation *parent, const TQString & body, const TQString & comment )
+ : CodeOperation (doc, parent, body, comment)
{
// lets not go with the default comment and instead use
// full-blown cpp documentation object instead
diff --git a/umbrello/umbrello/codegenerators/csharpwriter.cpp b/umbrello/umbrello/codegenerators/csharpwriter.cpp
index 884661b5..180ba176 100644
--- a/umbrello/umbrello/codegenerators/csharpwriter.cpp
+++ b/umbrello/umbrello/codegenerators/csharpwriter.cpp
@@ -405,7 +405,7 @@ void CSharpWriter::writeOverridesRecursive(UMLClassifierList *superclasses, TQTe
opabstract.clear();
}
- // Recurse to tqparent superclasses
+ // Recurse to parent superclasses
UMLClassifierList superRecursive = obj->getSuperClasses();
UMLClassifierList *superRecursivePtr =& superRecursive;
if (superRecursivePtr->count() > 0) {
@@ -433,7 +433,7 @@ void CSharpWriter::writeRealizationsRecursive(UMLClassifier *currentClass, UMLAs
writeOperations(opreal,cs,false,false,true);
cs << m_container_indent << m_indentation << "#endregion" << m_endl << m_endl;
- // Recurse to tqparent realizations
+ // Recurse to parent realizations
UMLAssociationList parentReal = real->getRealizations();
if (!parentReal.isEmpty()) {
writeRealizationsRecursive(real, &parentReal, cs);
@@ -493,7 +493,7 @@ void CSharpWriter::writeOperations(UMLOperationList opList,
if (op->getStatic()) cs << "static ";
}
else {
- // method overriding an abstract tqparent
+ // method overriding an abstract parent
cs << op->getVisibility().toString() << " override ";
if (op->getStatic()) cs << "static ";
}
diff --git a/umbrello/umbrello/codegenerators/csharpwriter.h b/umbrello/umbrello/codegenerators/csharpwriter.h
index 6cf4d3f6..322ce06c 100644
--- a/umbrello/umbrello/codegenerators/csharpwriter.h
+++ b/umbrello/umbrello/codegenerators/csharpwriter.h
@@ -80,7 +80,7 @@ private:
int m_unnamedRoles;
/**
- * write realizations of a class and recurse to tqparent classes
+ * write realizations of a class and recurse to parent classes
* @param currentClass class to start with
* @param realizations realizations of this class
diff --git a/umbrello/umbrello/codegenerators/idlwriter.cpp b/umbrello/umbrello/codegenerators/idlwriter.cpp
index 1d517fbb..efb49dc9 100644
--- a/umbrello/umbrello/codegenerators/idlwriter.cpp
+++ b/umbrello/umbrello/codegenerators/idlwriter.cpp
@@ -275,13 +275,13 @@ void IDLWriter::writeClass(UMLClassifier *c) {
UMLClassifierList superclasses = c->getSuperClasses();
if (! superclasses.isEmpty()) {
idl << " : ";
- UMLClassifier *tqparent = superclasses.first();
+ UMLClassifier *parent = superclasses.first();
int n_parents = superclasses.count();
while (n_parents--) {
- idl << tqparent->getFullyQualifiedName("::");
+ idl << parent->getFullyQualifiedName("::");
if (n_parents)
idl << ", ";
- tqparent = superclasses.next();
+ parent = superclasses.next();
}
}
idl << " {" << m_endl << m_endl;
diff --git a/umbrello/umbrello/codegenerators/javaclassdeclarationblock.h b/umbrello/umbrello/codegenerators/javaclassdeclarationblock.h
index 0c1709ba..19a743d5 100644
--- a/umbrello/umbrello/codegenerators/javaclassdeclarationblock.h
+++ b/umbrello/umbrello/codegenerators/javaclassdeclarationblock.h
@@ -60,7 +60,7 @@ protected:
private:
- void init (JavaClassifierCodeDocument * tqparent, const TQString &comment);
+ void init (JavaClassifierCodeDocument * parent, const TQString &comment);
};
diff --git a/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp b/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp
index 877111e1..1587c265 100644
--- a/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp
+++ b/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp
@@ -326,7 +326,7 @@ void JavaClassifierCodeDocument::resetTextBlocks()
}
// This method will cause the class to rebuild its text representation.
-// based on the tqparent classifier object.
+// based on the parent classifier object.
// For any situation in which this is called, we are either building the code
// document up, or replacing/regenerating the existing auto-generated parts. As
// such, we will want to insert everything we resonablely will want
@@ -334,7 +334,7 @@ void JavaClassifierCodeDocument::resetTextBlocks()
// comments) to appear or not, as needed.
void JavaClassifierCodeDocument::updateContent( )
{
- // Gather info on the various fields and tqparent objects of this class...
+ // Gather info on the various fields and parent objects of this class...
UMLClassifier * c = getParentClassifier();
CodeGenerationPolicy * commonPolicy = UMLApp::app()->getCommonPolicy();
CodeGenPolicyExt * pe = UMLApp::app()->getPolicyExt();
diff --git a/umbrello/umbrello/codegenerators/javacodeaccessormethod.cpp b/umbrello/umbrello/codegenerators/javacodeaccessormethod.cpp
index c0b08396..6c883952 100644
--- a/umbrello/umbrello/codegenerators/javacodeaccessormethod.cpp
+++ b/umbrello/umbrello/codegenerators/javacodeaccessormethod.cpp
@@ -159,7 +159,7 @@ void JavaCodeAccessorMethod::updateMethodDeclaration()
break;
default:
case CodeGenerationPolicy::FromParent:
- // do nothing..already have taken tqparent value
+ // do nothing..already have taken parent value
break;
}
diff --git a/umbrello/umbrello/codegenerators/javacodeclassfield.cpp b/umbrello/umbrello/codegenerators/javacodeclassfield.cpp
index c3ebb9e2..0777cf1d 100644
--- a/umbrello/umbrello/codegenerators/javacodeclassfield.cpp
+++ b/umbrello/umbrello/codegenerators/javacodeclassfield.cpp
@@ -84,7 +84,7 @@ TQString JavaCodeClassField::getInitialValue() {
if (at) {
return fixInitialStringDeclValue(at->getInitialValue(), getTypeName());
} else {
- kError() << "JavaodeClassField::getInitialValue: tqparent object is not a UMLAttribute"
+ kError() << "JavaodeClassField::getInitialValue: parent object is not a UMLAttribute"
<< endl;
return "";
}
diff --git a/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.cpp b/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.cpp
index 520f5611..5507c314 100644
--- a/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.cpp
+++ b/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.cpp
@@ -27,8 +27,8 @@
// Constructors/Destructors
//
-JavaCodeClassFieldDeclarationBlock::JavaCodeClassFieldDeclarationBlock ( CodeClassField * tqparent )
- : CodeClassFieldDeclarationBlock ( tqparent )
+JavaCodeClassFieldDeclarationBlock::JavaCodeClassFieldDeclarationBlock ( CodeClassField * parent )
+ : CodeClassFieldDeclarationBlock ( parent )
{
setOverallIndentationLevel(1);
updateContent();
@@ -77,7 +77,7 @@ void JavaCodeClassFieldDeclarationBlock::updateContent( )
break;
default:
case CodeGenerationPolicy::FromParent:
- // do nothing here... will leave as from tqparent object
+ // do nothing here... will leave as from parent object
break;
}
}
@@ -101,7 +101,7 @@ void JavaCodeClassFieldDeclarationBlock::updateContent( )
} else {
// FIX?: IF a constructor method exists in the classifiercodedoc
- // of the tqparent Object, then we can use that instead (if its empty).
+ // of the parent Object, then we can use that instead (if its empty).
if(cf->fieldIsSingleValue())
{
if(!typeName.isEmpty())
diff --git a/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.h b/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.h
index d7f3c2f5..869954cf 100644
--- a/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.h
+++ b/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.h
@@ -32,7 +32,7 @@ public:
/**
* Constructor
*/
- JavaCodeClassFieldDeclarationBlock ( CodeClassField * tqparent );
+ JavaCodeClassFieldDeclarationBlock ( CodeClassField * parent );
/**
* Empty Destructor
@@ -41,7 +41,7 @@ public:
protected:
- // this will be called by syncToParent whenever the tqparent object is "modified"
+ // this will be called by syncToParent whenever the parent object is "modified"
void updateContent ( );
private:
diff --git a/umbrello/umbrello/codegenerators/javacodedocumentation.cpp b/umbrello/umbrello/codegenerators/javacodedocumentation.cpp
index a04a3cd1..2eeff46a 100644
--- a/umbrello/umbrello/codegenerators/javacodedocumentation.cpp
+++ b/umbrello/umbrello/codegenerators/javacodedocumentation.cpp
@@ -54,7 +54,7 @@ JavaCodeDocumentation::~JavaCodeDocumentation ( ) { }
void JavaCodeDocumentation::saveToXMI ( TQDomDocument & doc, TQDomElement & root ) {
TQDomElement blockElement = doc.createElement( "javacodedocumentation" );
setAttributesOnNode(doc, blockElement); // as we added no additional fields to this class we may
- // just use tqparent TextBlock method
+ // just use parent TextBlock method
root.appendChild( blockElement );
}
diff --git a/umbrello/umbrello/codegenerators/javacodegenerationpolicy.cpp b/umbrello/umbrello/codegenerators/javacodegenerationpolicy.cpp
index aeee86e0..6225485f 100644
--- a/umbrello/umbrello/codegenerators/javacodegenerationpolicy.cpp
+++ b/umbrello/umbrello/codegenerators/javacodegenerationpolicy.cpp
@@ -174,8 +174,8 @@ void JavaCodeGenerationPolicy::setDefaults( KConfig * config, bool emitUpdateSig
* Create a new dialog interface for this object.
* @return dialog object
*/
-CodeGenerationPolicyPage * JavaCodeGenerationPolicy::createPage ( TQWidget *tqparent, const char *name ) {
- return new JavaCodeGenerationPolicyPage ( tqparent, name, this );
+CodeGenerationPolicyPage * JavaCodeGenerationPolicy::createPage ( TQWidget *parent, const char *name ) {
+ return new JavaCodeGenerationPolicyPage ( parent, name, this );
}
void JavaCodeGenerationPolicy::init() {
diff --git a/umbrello/umbrello/codegenerators/javacodegenerationpolicy.h b/umbrello/umbrello/codegenerators/javacodegenerationpolicy.h
index cb9171f4..8f95c1c8 100644
--- a/umbrello/umbrello/codegenerators/javacodegenerationpolicy.h
+++ b/umbrello/umbrello/codegenerators/javacodegenerationpolicy.h
@@ -97,7 +97,7 @@ public:
* Create a new dialog interface for this object.
* @return dialog object
*/
- CodeGenerationPolicyPage * createPage ( TQWidget *tqparent = 0, const char * name = 0);
+ CodeGenerationPolicyPage * createPage ( TQWidget *parent = 0, const char * name = 0);
protected:
diff --git a/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.cpp b/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.cpp
index c802024a..c7bfbf0b 100644
--- a/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.cpp
+++ b/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.cpp
@@ -26,8 +26,8 @@
#include "javacodegenerationformbase.h"
#include "../uml.h"
-JavaCodeGenerationPolicyPage::JavaCodeGenerationPolicyPage( TQWidget *tqparent, const char *name, JavaCodeGenerationPolicy * policy )
- : CodeGenerationPolicyPage(tqparent, name, policy)
+JavaCodeGenerationPolicyPage::JavaCodeGenerationPolicyPage( TQWidget *parent, const char *name, JavaCodeGenerationPolicy * policy )
+ : CodeGenerationPolicyPage(parent, name, policy)
{
CodeGenerationPolicy *commonPolicy = UMLApp::app()->getCommonPolicy();
form = new JavaCodeGenerationFormBase(this);
@@ -54,7 +54,7 @@ JavaCodeGenerationPolicyPage::~JavaCodeGenerationPolicyPage()
void JavaCodeGenerationPolicyPage::apply()
{
CodeGenerationPolicy *commonPolicy = UMLApp::app()->getCommonPolicy();
- JavaCodeGenerationPolicy * tqparent = (JavaCodeGenerationPolicy*) m_parentPolicy;
+ JavaCodeGenerationPolicy * parent = (JavaCodeGenerationPolicy*) m_parentPolicy;
// block signals so we don't cause too many update content calls to code documents
commonPolicy->blockSignals(true);
@@ -63,8 +63,8 @@ void JavaCodeGenerationPolicyPage::apply()
commonPolicy->setAttributeAccessorScope((CodeGenerationPolicy::ScopePolicy) (form->m_accessorScopeCB->currentItem()+200));
commonPolicy->setAssociationFieldScope((CodeGenerationPolicy::ScopePolicy) (form->m_assocFieldScopeCB->currentItem()+200));
commonPolicy->setAutoGenerateConstructors(form->m_generateConstructors->isChecked());
- tqparent->setAutoGenerateAttribAccessors(form->m_generateAttribAccessors->isChecked());
- tqparent->setAutoGenerateAssocAccessors(form->m_generateAssocAccessors->isChecked());
+ parent->setAutoGenerateAttribAccessors(form->m_generateAttribAccessors->isChecked());
+ parent->setAutoGenerateAssocAccessors(form->m_generateAssocAccessors->isChecked());
/**
* @todo unclean - CreateANTBuildFile attribute should be in java policy
diff --git a/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.h b/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.h
index 2ace585e..8236e1a2 100644
--- a/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.h
+++ b/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.h
@@ -31,7 +31,7 @@ class JavaCodeGenerationPolicyPage : public CodeGenerationPolicyPage {
TQ_OBJECT
public:
- explicit JavaCodeGenerationPolicyPage (TQWidget *tqparent=0, const char *name=0, JavaCodeGenerationPolicy * policy = 0);
+ explicit JavaCodeGenerationPolicyPage (TQWidget *parent=0, const char *name=0, JavaCodeGenerationPolicy * policy = 0);
virtual ~JavaCodeGenerationPolicyPage();
diff --git a/umbrello/umbrello/codegenerators/javacodegenerator.cpp b/umbrello/umbrello/codegenerators/javacodegenerator.cpp
index d51a7b3c..0f78a0fb 100644
--- a/umbrello/umbrello/codegenerators/javacodegenerator.cpp
+++ b/umbrello/umbrello/codegenerators/javacodegenerator.cpp
@@ -79,10 +79,10 @@ bool JavaCodeGenerator::getCreateANTBuildFile ( ) {
}
// In the Java version, we make the ANT build file also available.
-CodeViewerDialog * JavaCodeGenerator::getCodeViewerDialog ( TQWidget* tqparent, CodeDocument *doc,
+CodeViewerDialog * JavaCodeGenerator::getCodeViewerDialog ( TQWidget* parent, CodeDocument *doc,
Settings::CodeViewerState state)
{
- CodeViewerDialog *dialog = new CodeViewerDialog(tqparent, doc, state);
+ CodeViewerDialog *dialog = new CodeViewerDialog(parent, doc, state);
if(getCreateANTBuildFile())
dialog->addCodeDocument(findCodeDocumentByID("ANTDOC"));
return dialog;
@@ -143,7 +143,7 @@ CodeDocument * JavaCodeGenerator::newClassifierCodeDocument ( UMLClassifier * c)
}
void JavaCodeGenerator::init() {
- // load Classifier documents from tqparent document
+ // load Classifier documents from parent document
//initFromParentDocument();
// add in an ANT document
diff --git a/umbrello/umbrello/codegenerators/javacodegenerator.h b/umbrello/umbrello/codegenerators/javacodegenerator.h
index c9fc49e7..24ab718a 100644
--- a/umbrello/umbrello/codegenerators/javacodegenerator.h
+++ b/umbrello/umbrello/codegenerators/javacodegenerator.h
@@ -92,7 +92,7 @@ public:
/** Get the editing dialog for this code document
*/
- virtual CodeViewerDialog * getCodeViewerDialog( TQWidget* tqparent, CodeDocument * doc,
+ virtual CodeViewerDialog * getCodeViewerDialog( TQWidget* parent, CodeDocument * doc,
Settings::CodeViewerState state);
// Other methods
diff --git a/umbrello/umbrello/codegenerators/javacodeoperation.cpp b/umbrello/umbrello/codegenerators/javacodeoperation.cpp
index 54b34f46..c7e7d162 100644
--- a/umbrello/umbrello/codegenerators/javacodeoperation.cpp
+++ b/umbrello/umbrello/codegenerators/javacodeoperation.cpp
@@ -25,8 +25,8 @@
//
JavaCodeOperation::JavaCodeOperation
- ( JavaClassifierCodeDocument * doc, UMLOperation *tqparent, const TQString & body, const TQString & comment )
- : CodeOperation (doc, tqparent, body, comment)
+ ( JavaClassifierCodeDocument * doc, UMLOperation *parent, const TQString & body, const TQString & comment )
+ : CodeOperation (doc, parent, body, comment)
{
// lets not go with the default comment and instead use
// full-blown java documentation object instead
@@ -81,7 +81,7 @@ void JavaCodeOperation::updateMethodDeclaration()
maybeStatic = "static ";
TQString startText = strVis + ' ' + maybeStatic + returnType + methodName + " (" + paramStr + ')';
- // IF the tqparent is an interface, our operations look different
+ // IF the parent is an interface, our operations look different
// e.g. they have no body
if(isInterface) {
startText += ';';
diff --git a/umbrello/umbrello/codegenerators/pascalwriter.cpp b/umbrello/umbrello/codegenerators/pascalwriter.cpp
index 8d11b893..0f3c32ef 100644
--- a/umbrello/umbrello/codegenerators/pascalwriter.cpp
+++ b/umbrello/umbrello/codegenerators/pascalwriter.cpp
@@ -244,8 +244,8 @@ void PascalWriter::writeClass(UMLClassifier *c) {
pas << getIndent() << classname << " = object";
if (!superclasses.isEmpty()) {
// FIXME: Multiple inheritance is not yet supported
- UMLClassifier* tqparent = superclasses.first();
- pas << "(" << qualifiedName(tqparent) << ")";
+ UMLClassifier* parent = superclasses.first();
+ pas << "(" << qualifiedName(parent) << ")";
}
pas << m_endl;
diff --git a/umbrello/umbrello/codegenerators/php5writer.cpp b/umbrello/umbrello/codegenerators/php5writer.cpp
index e0fe4828..10146b6c 100644
--- a/umbrello/umbrello/codegenerators/php5writer.cpp
+++ b/umbrello/umbrello/codegenerators/php5writer.cpp
@@ -1776,7 +1776,7 @@ static const char *php5words[] =
"ncurses_killchar",
"ncurses_longname",
"ncurses_mouseinterval",
- "ncurses_mousetqmask",
+ "ncurses_mousemask",
"ncurses_move",
"ncurses_mvaddch",
"ncurses_mvaddchnstr",
diff --git a/umbrello/umbrello/codegenerators/phpwriter.cpp b/umbrello/umbrello/codegenerators/phpwriter.cpp
index b3c8a43e..4116020d 100644
--- a/umbrello/umbrello/codegenerators/phpwriter.cpp
+++ b/umbrello/umbrello/codegenerators/phpwriter.cpp
@@ -1772,7 +1772,7 @@ static const char *words[] =
"ncurses_killchar",
"ncurses_longname",
"ncurses_mouseinterval",
- "ncurses_mousetqmask",
+ "ncurses_mousemask",
"ncurses_move",
"ncurses_mvaddch",
"ncurses_mvaddchnstr",
diff --git a/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.h b/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.h
index 327516a3..d181fc65 100644
--- a/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.h
+++ b/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.h
@@ -68,7 +68,7 @@ protected:
private:
- void init (RubyClassifierCodeDocument * tqparent, const TQString &comment);
+ void init (RubyClassifierCodeDocument * parent, const TQString &comment);
};
diff --git a/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp b/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp
index 6f5b881d..22fa56fc 100644
--- a/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp
+++ b/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp
@@ -355,7 +355,7 @@ void RubyClassifierCodeDocument::resetTextBlocks()
}
// This method will cause the class to rebuild its text representation.
-// based on the tqparent classifier object.
+// based on the parent classifier object.
// For any situation in which this is called, we are either building the code
// document up, or replacing/regenerating the existing auto-generated parts. As
// such, we will want to insert everything we resonablely will want
@@ -363,7 +363,7 @@ void RubyClassifierCodeDocument::resetTextBlocks()
// comments) to appear or not, as needed.
void RubyClassifierCodeDocument::updateContent( )
{
- // Gather info on the various fields and tqparent objects of this class...
+ // Gather info on the various fields and parent objects of this class...
UMLClassifier * c = getParentClassifier();
RubyCodeGenerator * gen = dynamic_cast<RubyCodeGenerator*>(UMLApp::app()->getGenerator());
diff --git a/umbrello/umbrello/codegenerators/rubycodeaccessormethod.cpp b/umbrello/umbrello/codegenerators/rubycodeaccessormethod.cpp
index a3f4d26f..43986061 100644
--- a/umbrello/umbrello/codegenerators/rubycodeaccessormethod.cpp
+++ b/umbrello/umbrello/codegenerators/rubycodeaccessormethod.cpp
@@ -168,7 +168,7 @@ void RubyCodeAccessorMethod::updateMethodDeclaration()
break;
default:
case CodeGenerationPolicy::FromParent:
- // do nothing..already have taken tqparent value
+ // do nothing..already have taken parent value
break;
}
diff --git a/umbrello/umbrello/codegenerators/rubycodeclassfield.cpp b/umbrello/umbrello/codegenerators/rubycodeclassfield.cpp
index 793db6ed..b3b723b9 100644
--- a/umbrello/umbrello/codegenerators/rubycodeclassfield.cpp
+++ b/umbrello/umbrello/codegenerators/rubycodeclassfield.cpp
@@ -86,7 +86,7 @@ TQString RubyCodeClassField::getInitialValue() {
if (at) {
return fixInitialStringDeclValue(at->getInitialValue(), getTypeName());
} else {
- kError() << "RubyodeClassField::getInitialValue: tqparent object is not a UMLAttribute"
+ kError() << "RubyodeClassField::getInitialValue: parent object is not a UMLAttribute"
<< endl;
return "";
}
diff --git a/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.cpp b/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.cpp
index da8eb00e..e99ca774 100644
--- a/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.cpp
+++ b/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.cpp
@@ -22,8 +22,8 @@
// Constructors/Destructors
//
-RubyCodeClassFieldDeclarationBlock::RubyCodeClassFieldDeclarationBlock ( CodeClassField * tqparent )
- : CodeClassFieldDeclarationBlock ( tqparent )
+RubyCodeClassFieldDeclarationBlock::RubyCodeClassFieldDeclarationBlock ( CodeClassField * parent )
+ : CodeClassFieldDeclarationBlock ( parent )
{
setOverallIndentationLevel(1);
updateContent();
@@ -71,7 +71,7 @@ void RubyCodeClassFieldDeclarationBlock::updateContent( )
break;
default:
case CodeGenerationPolicy::FromParent:
- // do nothing here... will leave as from tqparent object
+ // do nothing here... will leave as from parent object
break;
}
}
@@ -95,7 +95,7 @@ void RubyCodeClassFieldDeclarationBlock::updateContent( )
} else {
// FIX?: IF a constructor method exists in the classifiercodedoc
- // of the tqparent Object, then we can use that instead (if its empty).
+ // of the parent Object, then we can use that instead (if its empty).
if(cf->fieldIsSingleValue())
{
if(!typeName.isEmpty())
diff --git a/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.h b/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.h
index 1dd6b342..493f768c 100644
--- a/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.h
+++ b/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.h
@@ -36,7 +36,7 @@ public:
/**
* Constructor
*/
- RubyCodeClassFieldDeclarationBlock ( CodeClassField * tqparent );
+ RubyCodeClassFieldDeclarationBlock ( CodeClassField * parent );
/**
* Empty Destructor
@@ -45,7 +45,7 @@ public:
protected:
- // this will be called by syncToParent whenever the tqparent object is "modified"
+ // this will be called by syncToParent whenever the parent object is "modified"
void updateContent ( );
private:
diff --git a/umbrello/umbrello/codegenerators/rubycodedocumentation.cpp b/umbrello/umbrello/codegenerators/rubycodedocumentation.cpp
index 9afee3f1..776e0c1e 100644
--- a/umbrello/umbrello/codegenerators/rubycodedocumentation.cpp
+++ b/umbrello/umbrello/codegenerators/rubycodedocumentation.cpp
@@ -57,7 +57,7 @@ RubyCodeDocumentation::~RubyCodeDocumentation ( ) { }
void RubyCodeDocumentation::saveToXMI ( TQDomDocument & doc, TQDomElement & root ) {
TQDomElement blockElement = doc.createElement( "rubycodedocumentation" );
setAttributesOnNode(doc, blockElement); // as we added no additional fields to this class we may
- // just use tqparent TextBlock method
+ // just use parent TextBlock method
root.appendChild( blockElement );
}
diff --git a/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.cpp b/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.cpp
index 62df797d..8e58fdf0 100644
--- a/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.cpp
+++ b/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.cpp
@@ -156,8 +156,8 @@ void RubyCodeGenerationPolicy::setDefaults( KConfig * config, bool emitUpdateSig
* Create a new dialog interface for this object.
* @return dialog object
*/
-CodeGenerationPolicyPage * RubyCodeGenerationPolicy::createPage ( TQWidget *tqparent, const char *name ) {
- return new RubyCodeGenerationPolicyPage ( tqparent, name, this );
+CodeGenerationPolicyPage * RubyCodeGenerationPolicy::createPage ( TQWidget *parent, const char *name ) {
+ return new RubyCodeGenerationPolicyPage ( parent, name, this );
}
void RubyCodeGenerationPolicy::init() {
diff --git a/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.h b/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.h
index 459e80d0..542f3166 100644
--- a/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.h
+++ b/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.h
@@ -99,7 +99,7 @@ public:
* Create a new dialog interface for this object.
* @return dialog object
*/
- CodeGenerationPolicyPage * createPage ( TQWidget *tqparent = 0, const char * name = 0);
+ CodeGenerationPolicyPage * createPage ( TQWidget *parent = 0, const char * name = 0);
protected:
diff --git a/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.cpp b/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.cpp
index c6153448..5c890b4f 100644
--- a/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.cpp
+++ b/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.cpp
@@ -30,8 +30,8 @@
#include "../codegenerationpolicy.h"
#include "../uml.h"
-RubyCodeGenerationPolicyPage::RubyCodeGenerationPolicyPage( TQWidget *tqparent, const char *name, RubyCodeGenerationPolicy * policy )
- : CodeGenerationPolicyPage(tqparent, name, policy)
+RubyCodeGenerationPolicyPage::RubyCodeGenerationPolicyPage( TQWidget *parent, const char *name, RubyCodeGenerationPolicy * policy )
+ : CodeGenerationPolicyPage(parent, name, policy)
{
CodeGenerationPolicy *common = UMLApp::app()->getCommonPolicy();
form = new RubyCodeGenerationFormBase(this);
@@ -52,19 +52,19 @@ void RubyCodeGenerationPolicyPage::apply()
CodeGenerationPolicy *common = UMLApp::app()->getCommonPolicy();
// now do our ruby-specific configs
- RubyCodeGenerationPolicy * tqparent = (RubyCodeGenerationPolicy*) m_parentPolicy;
+ RubyCodeGenerationPolicy * parent = (RubyCodeGenerationPolicy*) m_parentPolicy;
// block signals so we don't cause too many update content calls to code documents
- tqparent->blockSignals(true);
+ parent->blockSignals(true);
common->setCommentStyle((CodeGenerationPolicy::CommentStyle) form->m_SelectCommentStyle->currentItem());
common->setAttributeAccessorScope((CodeGenerationPolicy::ScopePolicy) (form->m_accessorScopeCB->currentItem()+200));
common->setAssociationFieldScope((CodeGenerationPolicy::ScopePolicy) (form->m_assocFieldScopeCB->currentItem()+200));
common->setAutoGenerateConstructors(form->m_generateConstructors->isChecked());
- tqparent->setAutoGenerateAttribAccessors(form->m_generateAttribAccessors->isChecked());
- tqparent->setAutoGenerateAssocAccessors(form->m_generateAssocAccessors->isChecked());
+ parent->setAutoGenerateAttribAccessors(form->m_generateAttribAccessors->isChecked());
+ parent->setAutoGenerateAssocAccessors(form->m_generateAssocAccessors->isChecked());
- tqparent->blockSignals(false);
+ parent->blockSignals(false);
// now send out modified code content signal
common->emitModifiedCodeContentSig();
diff --git a/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.h b/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.h
index c994dff8..fc29fc3f 100644
--- a/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.h
+++ b/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.h
@@ -34,7 +34,7 @@ class RubyCodeGenerationPolicyPage : public CodeGenerationPolicyPage {
TQ_OBJECT
public:
- explicit RubyCodeGenerationPolicyPage (TQWidget *tqparent=0, const char *name=0, RubyCodeGenerationPolicy * policy = 0);
+ explicit RubyCodeGenerationPolicyPage (TQWidget *parent=0, const char *name=0, RubyCodeGenerationPolicy * policy = 0);
virtual ~RubyCodeGenerationPolicyPage();
diff --git a/umbrello/umbrello/codegenerators/rubycodegenerator.cpp b/umbrello/umbrello/codegenerators/rubycodegenerator.cpp
index 65b2af15..0cd9176f 100644
--- a/umbrello/umbrello/codegenerators/rubycodegenerator.cpp
+++ b/umbrello/umbrello/codegenerators/rubycodegenerator.cpp
@@ -59,10 +59,10 @@ Uml::Programming_Language RubyCodeGenerator::getLanguage() {
}
// In the Java version, we make the ANT build file also available.
-CodeViewerDialog * RubyCodeGenerator::getCodeViewerDialog ( TQWidget* tqparent, CodeDocument *doc,
+CodeViewerDialog * RubyCodeGenerator::getCodeViewerDialog ( TQWidget* parent, CodeDocument *doc,
Settings::CodeViewerState state)
{
- CodeViewerDialog *dialog = new CodeViewerDialog(tqparent, doc, state);
+ CodeViewerDialog *dialog = new CodeViewerDialog(parent, doc, state);
return dialog;
}
@@ -127,7 +127,7 @@ CodeDocument * RubyCodeGenerator::newClassifierCodeDocument ( UMLClassifier * c)
/* These initializations are done in CodeGenFactory::createObject()
void RubyCodeGenerator::initFields() {
UMLApp::app()->setPolicyExt ( new RubyCodeGenerationPolicy(UMLApp::app()->getConfig()) );
- // load Classifier documents from tqparent document
+ // load Classifier documents from parent document
initFromParentDocument();
}
*/
diff --git a/umbrello/umbrello/codegenerators/rubycodegenerator.h b/umbrello/umbrello/codegenerators/rubycodegenerator.h
index 4be5e7e8..035daa86 100644
--- a/umbrello/umbrello/codegenerators/rubycodegenerator.h
+++ b/umbrello/umbrello/codegenerators/rubycodegenerator.h
@@ -77,7 +77,7 @@ public:
/** Get the editing dialog for this code document
*/
- virtual CodeViewerDialog * getCodeViewerDialog( TQWidget* tqparent, CodeDocument * doc,
+ virtual CodeViewerDialog * getCodeViewerDialog( TQWidget* parent, CodeDocument * doc,
Settings::CodeViewerState state);
// Other methods
diff --git a/umbrello/umbrello/codegenerators/rubycodeoperation.cpp b/umbrello/umbrello/codegenerators/rubycodeoperation.cpp
index 5a360838..7354281b 100644
--- a/umbrello/umbrello/codegenerators/rubycodeoperation.cpp
+++ b/umbrello/umbrello/codegenerators/rubycodeoperation.cpp
@@ -32,8 +32,8 @@
// Constructors/Destructors
//
-RubyCodeOperation::RubyCodeOperation ( RubyClassifierCodeDocument * doc, UMLOperation *tqparent, const TQString & body, const TQString & comment )
- : CodeOperation (doc, tqparent, body, comment)
+RubyCodeOperation::RubyCodeOperation ( RubyClassifierCodeDocument * doc, UMLOperation *parent, const TQString & body, const TQString & comment )
+ : CodeOperation (doc, parent, body, comment)
{
// lets not go with the default comment and instead use
// full-blown ruby documentation object instead
diff --git a/umbrello/umbrello/codegenerators/simplecodegenerator.cpp b/umbrello/umbrello/codegenerators/simplecodegenerator.cpp
index a3bb17df..6b7ac992 100644
--- a/umbrello/umbrello/codegenerators/simplecodegenerator.cpp
+++ b/umbrello/umbrello/codegenerators/simplecodegenerator.cpp
@@ -258,7 +258,7 @@ void SimpleCodeGenerator::writeCodeToFile ( UMLClassifierList & concepts) {
void SimpleCodeGenerator::initFields ( UMLDoc * parentDoc ) {
- // load Classifier documents from tqparent document
+ // load Classifier documents from parent document
// initFromParentDocument();
m_fileMap.clear();
@@ -282,7 +282,7 @@ void SimpleCodeGenerator::syncCodeToDocument() {
}
-// override tqparent method
+// override parent method
void SimpleCodeGenerator::initFromParentDocument( )
{
// Do nothing
diff --git a/umbrello/umbrello/codegenerators/simplecodegenerator.h b/umbrello/umbrello/codegenerators/simplecodegenerator.h
index 301dc780..c27e02ff 100644
--- a/umbrello/umbrello/codegenerators/simplecodegenerator.h
+++ b/umbrello/umbrello/codegenerators/simplecodegenerator.h
@@ -89,7 +89,7 @@ protected:
*/
TQMap<UMLPackage*,TQString> m_fileMap;
- // the tqparent document
+ // the parent document
UMLDoc *m_doc;
/**
@@ -105,7 +105,7 @@ protected:
int m_indentLevel;
TQString m_endl;
- // override tqparent method..we need special handling
+ // override parent method..we need special handling
void initFromParentDocument( );
private:
diff --git a/umbrello/umbrello/codegenerators/xmlelementcodeblock.h b/umbrello/umbrello/codegenerators/xmlelementcodeblock.h
index adbe39b7..46342658 100644
--- a/umbrello/umbrello/codegenerators/xmlelementcodeblock.h
+++ b/umbrello/umbrello/codegenerators/xmlelementcodeblock.h
@@ -82,7 +82,7 @@ private:
UMLAttributeList m_attList;
TQString m_nodeName;
- void init (CodeDocument * tqparent, const TQString &nodeName, const TQString &comment);
+ void init (CodeDocument * parent, const TQString &nodeName, const TQString &comment);
};
diff --git a/umbrello/umbrello/codegenerators/xmlschemawriter.cpp b/umbrello/umbrello/codegenerators/xmlschemawriter.cpp
index 39b530bb..f2bf7a66 100644
--- a/umbrello/umbrello/codegenerators/xmlschemawriter.cpp
+++ b/umbrello/umbrello/codegenerators/xmlschemawriter.cpp
@@ -690,13 +690,13 @@ void XMLSchemaWriter::writeAssociationRoleDecl( UMLClassifier *c, const TQString
// class (err. node) is inherit from it with a "concrete" element. Therefore,
// in this manner, we need a group node for abstract classes to lay out the child
// element choices so that the child, concrete class may be plugged into whatever spot
- // it tqparent could go. The tradeoff is that "group" nodes may not be extended, so the
+ // it parent could go. The tradeoff is that "group" nodes may not be extended, so the
// choices that you lay out here are it (e.g. no more nodes may inherit" from this group)
//
// The flipside for concrete classes is that we want to use them as elements in our document.
// Unfortunately, about all you can do with complexTypes in terms of inheritance, is to
// use these as the basis for a new node type. This is NOT full inheritence because the new
- // class (err. element node) wont be able to go into the document where it tqparent went without
+ // class (err. element node) wont be able to go into the document where it parent went without
// you heavily editing the schema.
//
// Therefore, IF a group is abstract, but has no inheriting sub-classes, there are no choices, and its nigh
diff --git a/umbrello/umbrello/codegenobjectwithtextblocks.cpp b/umbrello/umbrello/codegenobjectwithtextblocks.cpp
index 839e82b4..0c689e1e 100644
--- a/umbrello/umbrello/codegenobjectwithtextblocks.cpp
+++ b/umbrello/umbrello/codegenobjectwithtextblocks.cpp
@@ -32,8 +32,8 @@
// Constructors/Destructors
//
-CodeGenObjectWithTextBlocks::CodeGenObjectWithTextBlocks ( CodeDocument *tqparent )
- : m_pCodeDoc(tqparent)
+CodeGenObjectWithTextBlocks::CodeGenObjectWithTextBlocks ( CodeDocument *parent )
+ : m_pCodeDoc(parent)
{
initFields();
}
@@ -85,8 +85,8 @@ bool CodeGenObjectWithTextBlocks::addTextBlock(TextBlock* add_object ) {
else
{
- // if it has a tag, check to see that its not in some other tqparent object
- // IF it is then we will need to remove it FIRST before adding to new tqparent
+ // if it has a tag, check to see that its not in some other parent object
+ // IF it is then we will need to remove it FIRST before adding to new parent
CodeDocument * parentDoc = add_object->getParentDocument();
if(parentDoc) {
@@ -142,9 +142,9 @@ TextBlock * CodeGenObjectWithTextBlocks::findTextBlockByTag( const TQString &tag
return (TextBlock*) NULL;
}
-// IMPORTANT: this will only search for a tqparent from the viewpoint of this object
+// IMPORTANT: this will only search for a parent from the viewpoint of this object
// and down into its Hierarchical codeblocks. This means you should start any
-// search from the tqparent document of the text block. This method NOT meant for
+// search from the parent document of the text block. This method NOT meant for
// casual usage.
CodeGenObjectWithTextBlocks * CodeGenObjectWithTextBlocks::findParentObjectForTaggedTextBlock (const TQString & tag) {
diff --git a/umbrello/umbrello/codegenobjectwithtextblocks.h b/umbrello/umbrello/codegenobjectwithtextblocks.h
index 0e522e83..b8f50454 100644
--- a/umbrello/umbrello/codegenobjectwithtextblocks.h
+++ b/umbrello/umbrello/codegenobjectwithtextblocks.h
@@ -45,7 +45,7 @@ public:
/**
* Constructor
*/
- CodeGenObjectWithTextBlocks ( CodeDocument *tqparent );
+ CodeGenObjectWithTextBlocks ( CodeDocument *parent );
/**
* Empty Destructor
@@ -140,9 +140,9 @@ public:
virtual CodeBlockWithComments * newCodeBlockWithComments() = 0;
virtual HierarchicalCodeBlock * newHierarchicalCodeBlock() = 0;
- /** Find the direct tqparent for a given textblock. This
+ /** Find the direct parent for a given textblock. This
* may be any object which holds text blocks, e.g. a CodeGenObjectWithTextBlocks.
- * @return tqparent object. Could return null if the textblock is missing from the
+ * @return parent object. Could return null if the textblock is missing from the
* branch of the document tree being examined.
*/
CodeGenObjectWithTextBlocks * findParentObjectForTaggedTextBlock (const TQString & tag);
diff --git a/umbrello/umbrello/codeimport/adaimport.cpp b/umbrello/umbrello/codeimport/adaimport.cpp
index c568cf3f..0cbd8d1c 100644
--- a/umbrello/umbrello/codeimport/adaimport.cpp
+++ b/umbrello/umbrello/codeimport/adaimport.cpp
@@ -324,8 +324,8 @@ bool AdaImport::parseStmt() {
UMLClassifier *klass = static_cast<UMLClassifier*>(ns);
TQString base = expand(advance());
UMLObject *p = Import_Utils::createUMLObject(Uml::ot_Interface, base, m_scope[m_scopeIndex]);
- UMLClassifier *tqparent = static_cast<UMLClassifier*>(p);
- Import_Utils::createGeneralization(klass, tqparent);
+ UMLClassifier *parent = static_cast<UMLClassifier*>(p);
+ Import_Utils::createGeneralization(klass, parent);
}
} else {
ns->setAbstract(m_isAbstract);
@@ -359,13 +359,13 @@ bool AdaImport::parseStmt() {
t = (known ? known->getBaseType() : Uml::ot_Datatype);
}
UMLObject *ns = Import_Utils::createUMLObject(t, base, NULL);
- UMLClassifier *tqparent = static_cast<UMLClassifier*>(ns);
+ UMLClassifier *parent = static_cast<UMLClassifier*>(ns);
ns = Import_Utils::createUMLObject(t, name, m_scope[m_scopeIndex], m_comment);
if (isExtension) {
next = advance();
if (next == "null" || next == "record") {
UMLClassifier *klass = static_cast<UMLClassifier*>(ns);
- Import_Utils::createGeneralization(klass, tqparent);
+ Import_Utils::createGeneralization(klass, parent);
if (next == "record") {
// Set the m_klass for attributes.
m_klass = klass;
@@ -375,8 +375,8 @@ bool AdaImport::parseStmt() {
TQStringList::Iterator end(baseInterfaces.end());
for (TQStringList::Iterator bi(baseInterfaces.begin()); bi != end; ++bi) {
ns = Import_Utils::createUMLObject(t, *bi, m_scope[m_scopeIndex]);
- tqparent = static_cast<UMLClassifier*>(ns);
- Import_Utils::createGeneralization(klass, tqparent);
+ parent = static_cast<UMLClassifier*>(ns);
+ Import_Utils::createGeneralization(klass, parent);
}
}
}
diff --git a/umbrello/umbrello/codeimport/import_utils.cpp b/umbrello/umbrello/codeimport/import_utils.cpp
index 5afae684..4e38a1aa 100644
--- a/umbrello/umbrello/codeimport/import_utils.cpp
+++ b/umbrello/umbrello/codeimport/import_utils.cpp
@@ -274,8 +274,8 @@ UMLObject *createUMLObject(Uml::Object_Type type,
return o;
}
-UMLOperation* makeOperation(UMLClassifier *tqparent, const TQString &name) {
- UMLOperation *op = Object_Factory::createOperation(tqparent, name);
+UMLOperation* makeOperation(UMLClassifier *parent, const TQString &name) {
+ UMLOperation *op = Object_Factory::createOperation(parent, name);
return op;
}
@@ -396,7 +396,7 @@ void insertMethod(UMLClassifier *klass, UMLOperation* &op,
UMLAttribute* addMethodParameter(UMLOperation *method,
const TQString& type,
const TQString& name) {
- UMLClassifier *owner = static_cast<UMLClassifier*>(method->tqparent());
+ UMLClassifier *owner = static_cast<UMLClassifier*>(method->parent());
UMLObject *typeObj = owner->findTemplate(type);
if (typeObj == NULL) {
bPutAtGlobalScope = true;
@@ -415,19 +415,19 @@ void addEnumLiteral(UMLEnum *enumType, const TQString &literal, const TQString &
el->setDoc(comment);
}
-void createGeneralization(UMLClassifier *child, UMLClassifier *tqparent) {
- // if the child is an interface, so is the tqparent.
+void createGeneralization(UMLClassifier *child, UMLClassifier *parent) {
+ // if the child is an interface, so is the parent.
if (child->isInterface())
- tqparent->setBaseType(Uml::ot_Interface);
+ parent->setBaseType(Uml::ot_Interface);
Uml::Association_Type association = Uml::at_Generalization;
- if (tqparent->isInterface() && !child->isInterface()) {
- // if the tqparent is an interface, but the child is not, then
+ if (parent->isInterface() && !child->isInterface()) {
+ // if the parent is an interface, but the child is not, then
// this is really realization.
//
association = Uml::at_Realization;
}
- UMLAssociation *assoc = new UMLAssociation(association, child, tqparent);
+ UMLAssociation *assoc = new UMLAssociation(association, child, parent);
UMLDoc *umldoc = UMLApp::app()->getDocument();
assoc->setUMLPackage(umldoc->getRootFolder(Uml::mt_Logical));
umldoc->addAssociation(assoc);
@@ -435,8 +435,8 @@ void createGeneralization(UMLClassifier *child, UMLClassifier *tqparent) {
void createGeneralization(UMLClassifier *child, const TQString &parentName) {
UMLObject *parentObj = createUMLObject( Uml::ot_Class, parentName );
- UMLClassifier *tqparent = static_cast<UMLClassifier*>(parentObj);
- createGeneralization(child, tqparent);
+ UMLClassifier *parent = static_cast<UMLClassifier*>(parentObj);
+ createGeneralization(child, parent);
}
TQStringList includePathList() {
diff --git a/umbrello/umbrello/codeimport/import_utils.h b/umbrello/umbrello/codeimport/import_utils.h
index bec9e0ff..4a04190f 100644
--- a/umbrello/umbrello/codeimport/import_utils.h
+++ b/umbrello/umbrello/codeimport/import_utils.h
@@ -88,7 +88,7 @@ namespace Import_Utils {
* a conflict with a pre-existing parameterless method of the same
* name.)
*/
- UMLOperation* makeOperation(UMLClassifier *tqparent, const TQString &name);
+ UMLOperation* makeOperation(UMLClassifier *parent, const TQString &name);
/**
* Insert the UMLOperation into the given classifier.
@@ -131,13 +131,13 @@ namespace Import_Utils {
/**
* Create a generalization from the given child classifier to the given
- * tqparent classifier.
+ * parent classifier.
*/
- void createGeneralization(UMLClassifier *child, UMLClassifier *tqparent);
+ void createGeneralization(UMLClassifier *child, UMLClassifier *parent);
/**
* Create a generalization from the existing child UMLObject to the given
- * tqparent class name.
+ * parent class name.
*/
void createGeneralization(UMLClassifier *child, const TQString &parentName);
diff --git a/umbrello/umbrello/codeimport/javaimport.cpp b/umbrello/umbrello/codeimport/javaimport.cpp
index 0ff5b689..7f62a1a9 100644
--- a/umbrello/umbrello/codeimport/javaimport.cpp
+++ b/umbrello/umbrello/codeimport/javaimport.cpp
@@ -172,15 +172,15 @@ UMLObject* JavaImport::resolveClass (TQString className) {
spawnImport( aFile );
// we need to set the package for the class that will be resolved
// start at the root package
- UMLPackage *tqparent = m_scope[0];
+ UMLPackage *parent = m_scope[0];
UMLPackage *current = NULL;
for (TQStringList::Iterator it = split.begin(); it != split.end(); ++it) {
TQString name = (*it);
UMLObject *ns = Import_Utils::createUMLObject(Uml::ot_Package,
- name, tqparent);
+ name, parent);
current = static_cast<UMLPackage*>(ns);
- tqparent = current;
+ parent = current;
} // for
if ( isArray ) {
// we have imported the type. For arrays we want to return
@@ -292,9 +292,9 @@ bool JavaImport::parseStmt() {
const TQString& baseName = advance();
// try to resolve the class we are extending, or if impossible
// create a placeholder
- UMLObject *tqparent = resolveClass( baseName );
- if ( tqparent ) {
- Import_Utils::createGeneralization(m_klass, static_cast<UMLClassifier*>(tqparent));
+ UMLObject *parent = resolveClass( baseName );
+ if ( parent ) {
+ Import_Utils::createGeneralization(m_klass, static_cast<UMLClassifier*>(parent));
} else {
kDebug() << "importJava parentClass " << baseName
<< " is not resolveable. Creating placeholder" << endl;
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp b/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp
index 8e107ccf..e273aeb7 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp
@@ -170,14 +170,14 @@ void AST::getEndPosition( int* line, int* col ) const
* col = m_endColumn;
}
-void AST::setParent( AST* tqparent )
+void AST::setParent( AST* parent )
{
#ifndef CPPPARSER_NO_CHILDREN
if( m_parent )
m_parent->removeChild( this );
#endif
- m_parent = tqparent;
+ m_parent = parent;
#ifndef CPPPARSER_NO_CHILDREN
if( m_parent )
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast.h b/umbrello/umbrello/codeimport/kdevcppparser/ast.h
index 568b480a..0d6a4759 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/ast.h
+++ b/umbrello/umbrello/codeimport/kdevcppparser/ast.h
@@ -222,8 +222,8 @@ public:
int nodeType() const { return m_nodeType; }
void setNodeType( int nodeType ) { m_nodeType = nodeType; }
- AST* tqparent() { return m_parent; }
- void setParent( AST* tqparent );
+ AST* parent() { return m_parent; }
+ void setParent( AST* parent );
void setStartPosition( int line, int col );
void getStartPosition( int* line, int* col ) const;
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp b/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp
index a30db121..9d070334 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp
@@ -57,8 +57,8 @@ void scopeOfNode( AST* ast, TQStringList& scope )
if( !ast )
return;
- if( ast->tqparent() )
- scopeOfNode( ast->tqparent(), scope );
+ if( ast->parent() )
+ scopeOfNode( ast->parent(), scope );
TQString s;
switch( ast->nodeType() )
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/cpptree2uml.h b/umbrello/umbrello/codeimport/kdevcppparser/cpptree2uml.h
index b97c7ced..7248c782 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/cpptree2uml.h
+++ b/umbrello/umbrello/codeimport/kdevcppparser/cpptree2uml.h
@@ -33,21 +33,21 @@ public:
virtual void parseTranslationUnit( TranslationUnitAST* );
// declarations
- //virtual void parseDeclaration( DeclarationAST* ); // use tqparent method
- //virtual void parseLinkageSpecification( LinkageSpecificationAST* ); // use tqparent method
+ //virtual void parseDeclaration( DeclarationAST* ); // use parent method
+ //virtual void parseLinkageSpecification( LinkageSpecificationAST* ); // use parent method
virtual void parseNamespace( NamespaceAST* );
- //virtual void parseNamespaceAlias( NamespaceAliasAST* ); // use tqparent method
- //virtual void parseUsing( UsingAST* ); // use tqparent method
- //virtual void parseUsingDirective( UsingDirectiveAST* ); // use tqparent method
+ //virtual void parseNamespaceAlias( NamespaceAliasAST* ); // use parent method
+ //virtual void parseUsing( UsingAST* ); // use parent method
+ //virtual void parseUsingDirective( UsingDirectiveAST* ); // use parent method
virtual void parseTypedef( TypedefAST* );
virtual void parseTemplateDeclaration( TemplateDeclarationAST* );
virtual void parseSimpleDeclaration( SimpleDeclarationAST* );
virtual void parseFunctionDefinition( FunctionDefinitionAST* );
- //virtual void parseLinkageBody( LinkageBodyAST* ); // use tqparent method
+ //virtual void parseLinkageBody( LinkageBodyAST* ); // use parent method
virtual void parseAccessDeclaration( AccessDeclarationAST* );
// type-specifier
- //virtual void parseTypeSpecifier( TypeSpecifierAST* ); // use tqparent method
+ //virtual void parseTypeSpecifier( TypeSpecifierAST* ); // use parent method
virtual void parseClassSpecifier( ClassSpecifierAST* );
virtual void parseEnumSpecifier( EnumSpecifierAST* );
virtual void parseElaboratedTypeSpecifier( ElaboratedTypeSpecifierAST* );
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp b/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp
index 806a29a9..b6c55a61 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp
@@ -53,22 +53,22 @@ TQString URLUtil::directory(const TQString & name) {
///////////////////////////////////////////////////////////////////////////////
-TQString URLUtil::relativePath(const KURL & tqparent, const KURL & child, uint slashPolicy) {
+TQString URLUtil::relativePath(const KURL & parent, const KURL & child, uint slashPolicy) {
bool slashPrefix = slashPolicy & SLASH_PREFIX;
bool slashSuffix = slashPolicy & SLASH_SUFFIX;
- if (tqparent == child)
+ if (parent == child)
return slashPrefix ? TQString("/") : TQString("");
- if (!tqparent.isParentOf(child)) return TQString();
+ if (!parent.isParentOf(child)) return TQString();
int a=slashPrefix ? -1 : 1;
int b=slashSuffix ? 1 : -1;
- return child.path(b).mid(tqparent.path(a).length());
+ return child.path(b).mid(parent.path(a).length());
}
///////////////////////////////////////////////////////////////////////////////
-TQString URLUtil::relativePath(const TQString & tqparent, const TQString & child, uint slashPolicy) {
- return relativePath(KURL(tqparent), KURL(child), slashPolicy);
+TQString URLUtil::relativePath(const TQString & parent, const TQString & child, uint slashPolicy) {
+ return relativePath(KURL(parent), KURL(child), slashPolicy);
}
///////////////////////////////////////////////////////////////////////////////
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/urlutil.h b/umbrello/umbrello/codeimport/kdevcppparser/urlutil.h
index d243ddbd..2d05b162 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/urlutil.h
+++ b/umbrello/umbrello/codeimport/kdevcppparser/urlutil.h
@@ -38,13 +38,13 @@ namespace URLUtil
*/
TQString directory(const TQString & pathName);
/**
- * Returns the relative path between a tqparent and child URL, or blank if the specified child is not a child of tqparent
+ * Returns the relative path between a parent and child URL, or blank if the specified child is not a child of parent
*/
- TQString relativePath(const KURL & tqparent, const KURL & child, uint slashPolicy = SLASH_PREFIX);
+ TQString relativePath(const KURL & parent, const KURL & child, uint slashPolicy = SLASH_PREFIX);
/**
- * Returns the relative path between a tqparent and child URL, or blank if the specified child is not a child of tqparent
+ * Returns the relative path between a parent and child URL, or blank if the specified child is not a child of parent
*/
- TQString relativePath(const TQString & tqparent, const TQString & child, uint slashPolicy = SLASH_PREFIX);
+ TQString relativePath(const TQString & parent, const TQString & child, uint slashPolicy = SLASH_PREFIX);
/**
* Returns the relative path between a directory and file. Should never return empty path.
* Example:
diff --git a/umbrello/umbrello/codeimport/pascalimport.cpp b/umbrello/umbrello/codeimport/pascalimport.cpp
index 30d39128..a769571d 100644
--- a/umbrello/umbrello/codeimport/pascalimport.cpp
+++ b/umbrello/umbrello/codeimport/pascalimport.cpp
@@ -332,9 +332,9 @@ bool PascalImport::parseStmt() {
do {
TQString base = advance();
UMLObject *ns = Import_Utils::createUMLObject(Uml::ot_Class, base, NULL);
- UMLClassifier *tqparent = static_cast<UMLClassifier*>(ns);
+ UMLClassifier *parent = static_cast<UMLClassifier*>(ns);
m_comment = TQString();
- Import_Utils::createGeneralization(klass, tqparent);
+ Import_Utils::createGeneralization(klass, parent);
} while (advance() == ",");
if (m_source[m_srcIndex] != ")") {
kError() << "PascalImport: expecting \")\" at "
diff --git a/umbrello/umbrello/codemethodblock.h b/umbrello/umbrello/codemethodblock.h
index 1e7f7ea0..62651750 100644
--- a/umbrello/umbrello/codemethodblock.h
+++ b/umbrello/umbrello/codemethodblock.h
@@ -71,7 +71,7 @@ public:
*/
TQString getEndMethodText () const;
- // get the tqparent code document
+ // get the parent code document
CodeDocument * getParentDocument();
protected:
@@ -93,13 +93,13 @@ protected:
*/
void setEndMethodText (const TQString &value);
- /** this is the method called from within syncTotqparent().
+ /** this is the method called from within syncToparent().
* to update the start and end Method text. It is called
* whether or not the method is Auto or User generated.
*/
virtual void updateMethodDeclaration ( ) = 0;
- /** this is the method called from within syncTotqparent().
+ /** this is the method called from within syncToparent().
* to update the *body* of the method
* It is only called if the method is Auto-generated.
*/
diff --git a/umbrello/umbrello/codeoperation.cpp b/umbrello/umbrello/codeoperation.cpp
index 3fa716dc..13f5121b 100644
--- a/umbrello/umbrello/codeoperation.cpp
+++ b/umbrello/umbrello/codeoperation.cpp
@@ -77,7 +77,7 @@ TQPtrList<CodeParameter> CodeOperation::getParameterList ( ) {
*/
/**
- * Get the tqparent UMLOperation of this codeoperation.
+ * Get the parent UMLOperation of this codeoperation.
*/
UMLOperation * CodeOperation::getParentOperation( ) {
return dynamic_cast<UMLOperation*>(getParentObject());
@@ -129,9 +129,9 @@ void CodeOperation::setAttributesFromNode ( TQDomElement & element)
// now set local attributes
- // oops..this is done in the tqparent class "ownedcodeblock".
- // we simply need to record the tqparent operation here
- // m_parentOperation->disconnect(this); // always disconnect from current tqparent
+ // oops..this is done in the parent class "ownedcodeblock".
+ // we simply need to record the parent operation here
+ // m_parentOperation->disconnect(this); // always disconnect from current parent
TQString idStr = element.attribute("parent_id","-1");
Uml::IDType id = STR2ID(idStr);
@@ -162,7 +162,7 @@ void CodeOperation::init (UMLOperation * parentOp)
m_canDelete = false; // we cant delete these with the codeeditor, delete the UML operation instead.
setTag(CodeOperation::findTag(parentOp));
- // not needed.. done by tqparent "ownedcodeblock" class
+ // not needed.. done by parent "ownedcodeblock" class
// connect(parentOp,TQT_SIGNAL(modified()),this,TQT_SLOT(syncToParent()));
}
diff --git a/umbrello/umbrello/codeoperation.h b/umbrello/umbrello/codeoperation.h
index 5709f31a..8bdc34fd 100644
--- a/umbrello/umbrello/codeoperation.h
+++ b/umbrello/umbrello/codeoperation.h
@@ -36,7 +36,7 @@ public:
/**
* Constructors
*/
- CodeOperation ( ClassifierCodeDocument * doc , UMLOperation * tqparent,
+ CodeOperation ( ClassifierCodeDocument * doc , UMLOperation * parent,
const TQString & body = "", const TQString & comment = "");
/**
@@ -45,7 +45,7 @@ public:
virtual ~CodeOperation ( );
/**
- * Get the tqparent UMLOperation of this codeoperation.
+ * Get the parent UMLOperation of this codeoperation.
*/
UMLOperation * getParentOperation( );
diff --git a/umbrello/umbrello/codeparameter.cpp b/umbrello/umbrello/codeparameter.cpp
index 60f5d098..cd10e438 100644
--- a/umbrello/umbrello/codeparameter.cpp
+++ b/umbrello/umbrello/codeparameter.cpp
@@ -50,15 +50,15 @@ CodeParameter::~CodeParameter ( ) { }
//
/**
- * Utility method to get the value of tqparent object abstract value
- * @return the value of tqparent object abstrtact
+ * Utility method to get the value of parent object abstract value
+ * @return the value of parent object abstrtact
*/
bool CodeParameter::getAbstract ( ) {
return m_parentObject->getAbstract();
}
/**
- * Utility method to get the value of tqparent object static
+ * Utility method to get the value of parent object static
* Whether or not this is static.
* @return the value of static
*/
@@ -67,7 +67,7 @@ bool CodeParameter::getStatic ( ) {
}
/**
- * Utility method to get the value of tqparent object name
+ * Utility method to get the value of parent object name
* The name of this code parameter.
* @return the value
*/
@@ -76,7 +76,7 @@ TQString CodeParameter::getName ( ) const {
}
/**
- * Utility method to get the value of tqparent object type.
+ * Utility method to get the value of parent object type.
* the typeName of this parameters (e.g. boolean, int, etc or perhaps Class name of
* an object)
* @return the value of type
@@ -87,9 +87,9 @@ TQString CodeParameter::getTypeName ( ) {
}
/**
- * Utility method to get the value of tqparent object scope.
+ * Utility method to get the value of parent object scope.
* The visibility of this code parameter.
- * @return the value of tqparent object scope
+ * @return the value of parent object scope
*/
Uml::Visibility CodeParameter::getVisibility ( ) const {
return m_parentObject->getVisibility();
@@ -139,7 +139,7 @@ UMLObject * CodeParameter::getParentObject ( ) {
return m_parentObject;
}
-// need to get the ID of the tqparent object
+// need to get the ID of the parent object
// this is kind of broken for UMLRoles.
TQString CodeParameter::getID () {
UMLRole * role = dynamic_cast<UMLRole*>(m_parentObject);
@@ -187,7 +187,7 @@ void CodeParameter::setAttributesOnNode ( TQDomDocument & doc, TQDomElement & bl
*/
void CodeParameter::setAttributesFromNode ( TQDomElement & root) {
- // set local attributes, tqparent object first
+ // set local attributes, parent object first
TQString idStr = root.attribute("parent_id","-1");
Uml::IDType id = STR2ID(idStr);
@@ -202,7 +202,7 @@ void CodeParameter::setAttributesFromNode ( TQDomElement & root) {
// FIX..one day.
// Ugh. This is UGLY, but we have to do it this way because UMLRoles
// don't go into the document list of UMLobjects, and have the same
- // ID as their tqparent UMLAssociations. So..the drill is then special
+ // ID as their parent UMLAssociations. So..the drill is then special
// for Associations..in that case we need to find out which role will
// serve as the parameter here. The REAL fix, of course, would be to
// treat UMLRoles on a more even footing, but im not sure how that change
diff --git a/umbrello/umbrello/codeparameter.h b/umbrello/umbrello/codeparameter.h
index dd86d05c..dd4cd7d9 100644
--- a/umbrello/umbrello/codeparameter.h
+++ b/umbrello/umbrello/codeparameter.h
@@ -57,23 +57,23 @@ public:
//
/**
- * Get the tqparent Code Document
+ * Get the parent Code Document
*/
ClassifierCodeDocument * getParentDocument ( );
/**
- * Get the tqparent UMLObject
+ * Get the parent UMLObject
*/
UMLObject * getParentObject ( );
/**
- * Utility method. Get the value of tqparent abstract value.
+ * Utility method. Get the value of parent abstract value.
* @return the value
*/
bool getAbstract ( );
/**
- * Utility method. Get the value of tqparent Static
+ * Utility method. Get the value of parent Static
* Whether or not this is static.
* @return the value
*/
@@ -124,7 +124,7 @@ public:
*/
CodeComment * getComment ( );
- // the id of this parameter is the same as the tqparent UMLObject id.
+ // the id of this parameter is the same as the parent UMLObject id.
TQString getID ();
protected:
diff --git a/umbrello/umbrello/componentwidget.h b/umbrello/umbrello/componentwidget.h
index 4f0a3a05..d07b0536 100644
--- a/umbrello/umbrello/componentwidget.h
+++ b/umbrello/umbrello/componentwidget.h
@@ -33,7 +33,7 @@ public:
/**
* Constructs a ComponentWidget.
*
- * @param view The tqparent of this ComponentWidget.
+ * @param view The parent of this ComponentWidget.
* @param c The UMLComponent this will be representing.
*/
ComponentWidget(UMLView * view, UMLComponent *c);
diff --git a/umbrello/umbrello/datatypewidget.h b/umbrello/umbrello/datatypewidget.h
index 81dbe0f9..81a53ca6 100644
--- a/umbrello/umbrello/datatypewidget.h
+++ b/umbrello/umbrello/datatypewidget.h
@@ -33,7 +33,7 @@ public:
/**
* Constructs an DatatypeWidget.
*
- * @param view The tqparent of this DatatypeWidget.
+ * @param view The parent of this DatatypeWidget.
* @param d The UMLClassifier this will be representing.
*/
DatatypeWidget(UMLView* view, UMLClassifier *d);
diff --git a/umbrello/umbrello/dialogs/assocgenpage.cpp b/umbrello/umbrello/dialogs/assocgenpage.cpp
index 07c9e3af..b093cae0 100644
--- a/umbrello/umbrello/dialogs/assocgenpage.cpp
+++ b/umbrello/umbrello/dialogs/assocgenpage.cpp
@@ -25,8 +25,8 @@
#include "../association.h"
#include "../dialog_utils.h"
-AssocGenPage::AssocGenPage (UMLDoc *d, TQWidget *tqparent, AssociationWidget *assoc)
- : TQWidget(tqparent)
+AssocGenPage::AssocGenPage (UMLDoc *d, TQWidget *parent, AssociationWidget *assoc)
+ : TQWidget(parent)
{
m_pAssociationWidget = assoc;
diff --git a/umbrello/umbrello/dialogs/assocgenpage.h b/umbrello/umbrello/dialogs/assocgenpage.h
index 06c32c05..6d6ffcdf 100644
--- a/umbrello/umbrello/dialogs/assocgenpage.h
+++ b/umbrello/umbrello/dialogs/assocgenpage.h
@@ -49,10 +49,10 @@ public:
* Sets up the AssocGenPage.
*
* @param d The UMLDoc which controls controls object creation.
- * @param tqparent The tqparent to the AssocGenPage.
+ * @param parent The parent to the AssocGenPage.
* @param a The AssociationWidget to display the properties of.
*/
- AssocGenPage(UMLDoc *d, TQWidget *tqparent, AssociationWidget *a);
+ AssocGenPage(UMLDoc *d, TQWidget *parent, AssociationWidget *a);
/**
* Standard deconstructor.
diff --git a/umbrello/umbrello/dialogs/assocpage.cpp b/umbrello/umbrello/dialogs/assocpage.cpp
index 425f01fe..ec95f619 100644
--- a/umbrello/umbrello/dialogs/assocpage.cpp
+++ b/umbrello/umbrello/dialogs/assocpage.cpp
@@ -14,7 +14,7 @@
#include <klocale.h>
#include "assocpropdlg.h"
-AssocPage::AssocPage(TQWidget *tqparent, UMLView * v, UMLObject * o) : TQWidget(tqparent) {
+AssocPage::AssocPage(TQWidget *parent, UMLView * v, UMLObject * o) : TQWidget(parent) {
m_pObject = o;
m_pView = v;
int margin = fontMetrics().height();
diff --git a/umbrello/umbrello/dialogs/assocpage.h b/umbrello/umbrello/dialogs/assocpage.h
index 469dd35d..dbb0eec8 100644
--- a/umbrello/umbrello/dialogs/assocpage.h
+++ b/umbrello/umbrello/dialogs/assocpage.h
@@ -45,11 +45,11 @@ public:
/**
* Constructs an instance of AssocPage.
*
- * @param tqparent The tqparent of the page
+ * @param parent The parent of the page
* @param v The view the UMLObject being represented.
* @param o The UMLObject being represented
*/
- AssocPage(TQWidget *tqparent, UMLView * v, UMLObject * o);
+ AssocPage(TQWidget *parent, UMLView * v, UMLObject * o);
/**
* Standard deconstructor.
diff --git a/umbrello/umbrello/dialogs/assocpropdlg.cpp b/umbrello/umbrello/dialogs/assocpropdlg.cpp
index cf4f5b21..1d5b9c77 100644
--- a/umbrello/umbrello/dialogs/assocpropdlg.cpp
+++ b/umbrello/umbrello/dialogs/assocpropdlg.cpp
@@ -35,14 +35,14 @@
#include "../umlview.h"
-AssocPropDlg::AssocPropDlg (TQWidget *tqparent, AssociationWidget * assocWidget, int pageNum)
+AssocPropDlg::AssocPropDlg (TQWidget *parent, AssociationWidget * assocWidget, int pageNum)
: KDialogBase(IconList, i18n("Association Properties"), Ok | Apply | Cancel | Help,
- Ok, tqparent, "_ASSOCPROPDLG_", true, true)
+ Ok, parent, "_ASSOCPROPDLG_", true, true)
{
init();
m_pAssoc = assocWidget;
- m_pDoc = ((UMLApp *)tqparent) -> getDocument(); // needed?
+ m_pDoc = ((UMLApp *)parent) -> getDocument(); // needed?
setupPages(assocWidget);
showPage(pageNum);
diff --git a/umbrello/umbrello/dialogs/assocpropdlg.h b/umbrello/umbrello/dialogs/assocpropdlg.h
index 359add61..10fe344b 100644
--- a/umbrello/umbrello/dialogs/assocpropdlg.h
+++ b/umbrello/umbrello/dialogs/assocpropdlg.h
@@ -36,12 +36,12 @@ public:
/**
* Sets up a Association Properties Dialog.
- * @param tqparent The tqparent of the AssocPropDlg
+ * @param parent The parent of the AssocPropDlg
* @param a The Association Widget to display properties of.
* @param pageNum The page to show first.
*/
- AssocPropDlg(TQWidget *tqparent, AssociationWidget *a, int pageNum = 0);
+ AssocPropDlg(TQWidget *parent, AssociationWidget *a, int pageNum = 0);
/**
* Standard deconstructor
diff --git a/umbrello/umbrello/dialogs/assocrolepage.cpp b/umbrello/umbrello/dialogs/assocrolepage.cpp
index f603abee..a44a5f05 100644
--- a/umbrello/umbrello/dialogs/assocrolepage.cpp
+++ b/umbrello/umbrello/dialogs/assocrolepage.cpp
@@ -23,8 +23,8 @@
// local includes
#include "../dialog_utils.h"
-AssocRolePage::AssocRolePage (UMLDoc *d, TQWidget *tqparent, AssociationWidget *assoc)
- : TQWidget(tqparent)
+AssocRolePage::AssocRolePage (UMLDoc *d, TQWidget *parent, AssociationWidget *assoc)
+ : TQWidget(parent)
{
m_pAssociationWidget = assoc;
diff --git a/umbrello/umbrello/dialogs/assocrolepage.h b/umbrello/umbrello/dialogs/assocrolepage.h
index ada69b4f..beede96e 100644
--- a/umbrello/umbrello/dialogs/assocrolepage.h
+++ b/umbrello/umbrello/dialogs/assocrolepage.h
@@ -45,10 +45,10 @@ public:
* Sets up the AssocRolePage.
*
* @param d The UMLDoc which controls controls object creation.
- * @param tqparent The tqparent to the AssocRolePage.
+ * @param parent The parent to the AssocRolePage.
* @param a The AssociationWidget to display the properties of.
*/
- AssocRolePage(UMLDoc *d, TQWidget *tqparent, AssociationWidget *a);
+ AssocRolePage(UMLDoc *d, TQWidget *parent, AssociationWidget *a);
/**
* Standard deconstructor.
diff --git a/umbrello/umbrello/dialogs/classgenpage.cpp b/umbrello/umbrello/dialogs/classgenpage.cpp
index 7757b2d8..d633b6ae 100644
--- a/umbrello/umbrello/dialogs/classgenpage.cpp
+++ b/umbrello/umbrello/dialogs/classgenpage.cpp
@@ -38,7 +38,7 @@
#include "../umlview.h"
#include "../stereotype.h"
-ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* tqparent, UMLObject* o) : TQWidget(tqparent) {
+ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* parent, UMLObject* o) : TQWidget(parent) {
m_pWidget = 0;
m_pObject = 0;
m_pInstanceWidget = 0;
@@ -236,7 +236,7 @@ ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* tqparent, UMLObject* o) : TQWidg
//////////
}
-ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* tqparent, ObjectWidget* o) : TQWidget(tqparent) {
+ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* parent, ObjectWidget* o) : TQWidget(parent) {
m_pObject = 0;
m_pInstanceWidget = 0;
m_pWidget = o;
@@ -301,7 +301,7 @@ ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* tqparent, ObjectWidget* o) : TQW
connect( m_pDrawActorCB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotActorToggled( bool ) ) );
}
-ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* tqparent, UMLWidget* widget) : TQWidget(tqparent) {
+ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* parent, UMLWidget* widget) : TQWidget(parent) {
m_pWidget = 0;
m_pObject = 0;
m_pInstanceWidget = widget;
diff --git a/umbrello/umbrello/dialogs/classgenpage.h b/umbrello/umbrello/dialogs/classgenpage.h
index d6d06a50..fed32a2d 100644
--- a/umbrello/umbrello/dialogs/classgenpage.h
+++ b/umbrello/umbrello/dialogs/classgenpage.h
@@ -45,29 +45,29 @@ public:
* Sets up the ClassGenPage.
*
* @param d The UMLDoc which controls controls object creation.
- * @param tqparent The tqparent to the ClassGenPage.
+ * @param parent The parent to the ClassGenPage.
* @param o The UMLObject to display the properties of.
*/
- ClassGenPage(UMLDoc *d, TQWidget *tqparent, UMLObject * o);
+ ClassGenPage(UMLDoc *d, TQWidget *parent, UMLObject * o);
/**
* Sets up the ClassGenPage for an ObjectWidget
*
* @param d The UMLDoc which controls controls object creation.
- * @param tqparent The tqparent to the ClassGenPage.
+ * @param parent The parent to the ClassGenPage.
* @param o The ObjectWidget to display the properties of.
*/
- ClassGenPage(UMLDoc *d, TQWidget *tqparent, ObjectWidget * o);
+ ClassGenPage(UMLDoc *d, TQWidget *parent, ObjectWidget * o);
/**
* Sets up the ClassGenPage for a UMLWidget instance (used
* for component instances on deployment diagrams)
*
* @param d The UMLDoc which controls controls object creation.
- * @param tqparent The tqparent to the ClassGenPage.
+ * @param parent The parent to the ClassGenPage.
* @param widget The UMLWidget to display the properties of.
*/
- ClassGenPage(UMLDoc* d, TQWidget* tqparent, UMLWidget* widget);
+ ClassGenPage(UMLDoc* d, TQWidget* parent, UMLWidget* widget);
/**
* Standard deconstructor.
diff --git a/umbrello/umbrello/dialogs/classifierlistpage.cpp b/umbrello/umbrello/dialogs/classifierlistpage.cpp
index df0efb41..a96cb645 100644
--- a/umbrello/umbrello/dialogs/classifierlistpage.cpp
+++ b/umbrello/umbrello/dialogs/classifierlistpage.cpp
@@ -29,8 +29,8 @@
using namespace Uml;
-ClassifierListPage::ClassifierListPage(TQWidget* tqparent, UMLClassifier* classifier,
- UMLDoc* doc, Uml::Object_Type type) : TQWidget(tqparent) {
+ClassifierListPage::ClassifierListPage(TQWidget* parent, UMLClassifier* classifier,
+ UMLDoc* doc, Uml::Object_Type type) : TQWidget(parent) {
m_itemType = type;
TQString typeName("");
TQString newItemType("");
diff --git a/umbrello/umbrello/dialogs/classifierlistpage.h b/umbrello/umbrello/dialogs/classifierlistpage.h
index 7f0e298f..2675fd35 100644
--- a/umbrello/umbrello/dialogs/classifierlistpage.h
+++ b/umbrello/umbrello/dialogs/classifierlistpage.h
@@ -43,12 +43,12 @@ public:
/**
* Sets up the ClassifierListPage
*
- * @param tqparent The tqparent to the ClassAttPage.
+ * @param parent The parent to the ClassAttPage.
* @param classifier The Concept to display the properties of.
* @param doc The UMLDoc document
* @param type The type of listItem this handles
*/
- ClassifierListPage(TQWidget* tqparent, UMLClassifier* classifier, UMLDoc* doc, Uml::Object_Type type);
+ ClassifierListPage(TQWidget* parent, UMLClassifier* classifier, UMLDoc* doc, Uml::Object_Type type);
/**
* Standard deconstructor.
diff --git a/umbrello/umbrello/dialogs/classpropdlg.cpp b/umbrello/umbrello/dialogs/classpropdlg.cpp
index 1b744ca0..169de20e 100644
--- a/umbrello/umbrello/dialogs/classpropdlg.cpp
+++ b/umbrello/umbrello/dialogs/classpropdlg.cpp
@@ -33,9 +33,9 @@
#include "../uml.h"
#include "../umlview.h"
-ClassPropDlg::ClassPropDlg(TQWidget *tqparent, UMLObject * c, int pageNum, bool assoc)
+ClassPropDlg::ClassPropDlg(TQWidget *parent, UMLObject * c, int pageNum, bool assoc)
: KDialogBase(IconList, i18n("Properties"), Ok | Apply | Cancel | Help,
- Ok, tqparent, "_CLASSDLG_", true, true) {
+ Ok, parent, "_CLASSDLG_", true, true) {
m_pWidget = 0;
m_pGenPage = 0;
m_pAttPage = 0;
@@ -52,9 +52,9 @@ ClassPropDlg::ClassPropDlg(TQWidget *tqparent, UMLObject * c, int pageNum, bool
showPage(pageNum);
}
-ClassPropDlg::ClassPropDlg(TQWidget *tqparent, ObjectWidget * o)
+ClassPropDlg::ClassPropDlg(TQWidget *parent, ObjectWidget * o)
: KDialogBase(IconList, i18n("Properties"), Ok | Apply | Cancel | Help,
- Ok, tqparent, "_CLASSDLG_", true, true) {
+ Ok, parent, "_CLASSDLG_", true, true) {
m_pWidget = o;
m_pGenPage = 0;
m_pAttPage = 0;
@@ -82,9 +82,9 @@ ClassPropDlg::ClassPropDlg(TQWidget *tqparent, ObjectWidget * o)
setMinimumSize(340,420);
}
-ClassPropDlg::ClassPropDlg(TQWidget *tqparent, UMLWidget * w)
+ClassPropDlg::ClassPropDlg(TQWidget *parent, UMLWidget * w)
: KDialogBase(IconList, i18n("Properties"), Ok | Apply | Cancel | Help,
- Ok, tqparent, "_CLASSDLG_", true, true) {
+ Ok, parent, "_CLASSDLG_", true, true) {
m_pWidget = w;
m_pGenPage = 0;
m_pAttPage = 0;
@@ -95,7 +95,7 @@ ClassPropDlg::ClassPropDlg(TQWidget *tqparent, UMLWidget * w)
m_pOptionsPage = 0;
m_Type = pt_Widget;
m_pObject = w -> getUMLObject();
- m_pDoc = ((UMLApp *)tqparent) -> getDocument();
+ m_pDoc = ((UMLApp *)parent) -> getDocument();
if (w->getBaseType() == Uml::wt_Class
|| w->getBaseType() == Uml::wt_Interface
diff --git a/umbrello/umbrello/dialogs/classpropdlg.h b/umbrello/umbrello/dialogs/classpropdlg.h
index afb89f46..8078f372 100644
--- a/umbrello/umbrello/dialogs/classpropdlg.h
+++ b/umbrello/umbrello/dialogs/classpropdlg.h
@@ -45,28 +45,28 @@ public:
/**
* Sets up a ClassPropDlg.
*
- * @param tqparent The tqparent of the ClassPropDlg
+ * @param parent The parent of the ClassPropDlg
* @param c The UMLObject to display properties of.
* @param pageNum The page to show first.
* @param assoc Determines whether to display associations
*/
- ClassPropDlg(TQWidget *tqparent, UMLObject *c, int pageNum = 0, bool assoc = false);
+ ClassPropDlg(TQWidget *parent, UMLObject *c, int pageNum = 0, bool assoc = false);
/**
* Sets up a ClassPropDlg.
*
- * @param tqparent The tqparent of the ClassPropDlg
+ * @param parent The parent of the ClassPropDlg
* @param o The ObjectWidget to display properties of.
*/
- ClassPropDlg(TQWidget *tqparent, ObjectWidget * o);
+ ClassPropDlg(TQWidget *parent, ObjectWidget * o);
/**
* Sets up a ClassPropDlg.
*
- * @param tqparent The tqparent of the ClassPropDlg
+ * @param parent The parent of the ClassPropDlg
* @param o The UMLWidget to display properties of.
*/
- ClassPropDlg(TQWidget *tqparent, UMLWidget * o);
+ ClassPropDlg(TQWidget *parent, UMLWidget * o);
/**
diff --git a/umbrello/umbrello/dialogs/classwizard.cpp b/umbrello/umbrello/dialogs/classwizard.cpp
index 1cabe1b2..c49e418f 100644
--- a/umbrello/umbrello/dialogs/classwizard.cpp
+++ b/umbrello/umbrello/dialogs/classwizard.cpp
@@ -26,7 +26,7 @@
#include "../umlclassifierlistitemlist.h"
#include "../classifierlistitem.h"
-ClassWizard::ClassWizard( UMLDoc * pDoc ) : KWizard( (TQWidget*)pDoc -> tqparent(), "_CLASSWIZARD_", true) {
+ClassWizard::ClassWizard( UMLDoc * pDoc ) : KWizard( (TQWidget*)pDoc -> parent(), "_CLASSWIZARD_", true) {
m_pDoc = pDoc;
//create a unique class to start with
UMLObject * pTemp = 0;
diff --git a/umbrello/umbrello/dialogs/codeeditor.cpp b/umbrello/umbrello/dialogs/codeeditor.cpp
index 4f9f03a8..33fb743b 100644
--- a/umbrello/umbrello/dialogs/codeeditor.cpp
+++ b/umbrello/umbrello/dialogs/codeeditor.cpp
@@ -55,16 +55,16 @@
#include "umlroledialog.h"
#include "umloperationdialog.h"
-CodeEditor::CodeEditor ( const TQString & text, const TQString & context, CodeViewerDialog * tqparent, const char * name , CodeDocument * doc)
- : TQTextEdit ( text, context, tqparent, name)
+CodeEditor::CodeEditor ( const TQString & text, const TQString & context, CodeViewerDialog * parent, const char * name , CodeDocument * doc)
+ : TQTextEdit ( text, context, parent, name)
{
- init(tqparent, doc);
+ init(parent, doc);
}
-CodeEditor::CodeEditor ( CodeViewerDialog * tqparent, const char* name, CodeDocument * doc )
- : TQTextEdit ( tqparent, name )
+CodeEditor::CodeEditor ( CodeViewerDialog * parent, const char* name, CodeDocument * doc )
+ : TQTextEdit ( parent, name )
{
- init(tqparent, doc);
+ init(parent, doc);
}
/*
@@ -129,7 +129,7 @@ void CodeEditor::doubleClicked(int para, int pos)
}
-// allow us to edit, as appropriate, the tqparent UMLObject of the
+// allow us to edit, as appropriate, the parent UMLObject of the
// given text block.
void CodeEditor::editTextBlock(TextBlock * tBlock, int para) {
@@ -168,7 +168,7 @@ void CodeEditor::editTextBlock(TextBlock * tBlock, int para) {
}
else
{
- kError()<<" CodeViewerDlg ERROR: UNKNOWN tqparent for textBlock"<<endl;
+ kError()<<" CodeViewerDlg ERROR: UNKNOWN parent for textBlock"<<endl;
}
}
@@ -223,7 +223,7 @@ void CodeEditor::loadFromDocument ()
}
-void CodeEditor::insert (const TQString & text, TextBlock * tqparent, bool editable, const TQColor & fgcolor, const TQColor & bgcolor, UMLObject * umlobj, const TQString & displayName, int startLine)
+void CodeEditor::insert (const TQString & text, TextBlock * parent, bool editable, const TQColor & fgcolor, const TQColor & bgcolor, UMLObject * umlobj, const TQString & displayName, int startLine)
{
// set some params
@@ -253,18 +253,18 @@ void CodeEditor::insert (const TQString & text, TextBlock * tqparent, bool edita
setParagraphBackgroundColor(para,bgcolor);
// record paragraph information
- // Did we already start recording info for this tqparent object?
+ // Did we already start recording info for this parent object?
TextBlockInfo * tbinfo;
- if(m_tbInfoMap->contains(tqparent))
- tbinfo = (*m_tbInfoMap)[tqparent];
+ if(m_tbInfoMap->contains(parent))
+ tbinfo = (*m_tbInfoMap)[parent];
else {
tbinfo = new TextBlockInfo();
tbinfo->displayName = displayName;
- tbinfo->isCodeAccessorMethod = dynamic_cast<CodeAccessorMethod*>(tqparent) ? true : false;
- m_tbInfoMap->insert(tqparent,tbinfo);
+ tbinfo->isCodeAccessorMethod = dynamic_cast<CodeAccessorMethod*>(parent) ? true : false;
+ m_tbInfoMap->insert(parent,tbinfo);
}
- // set a tqparent, if its not already set
+ // set a parent, if its not already set
if(umlobj && !tbinfo->getParent())
{
tbinfo->displayName = displayName;
@@ -272,13 +272,13 @@ void CodeEditor::insert (const TQString & text, TextBlock * tqparent, bool edita
tbinfo->isClickable = textBlockIsClickable(umlobj);
}
- // now mark all lines that we just inserted as belonging to the tqparent
+ // now mark all lines that we just inserted as belonging to the parent
for(int para=startLine;para<=endLine;para++)
- m_textBlockList.insert(para,tqparent);
+ m_textBlockList.insert(para,parent);
// lastly, update the para info
- // start position is relative to the FIRST tqparent position
- int start = startLine - m_textBlockList.findRef(tqparent);
+ // start position is relative to the FIRST parent position
+ int start = startLine - m_textBlockList.findRef(parent);
int size = endLine-startLine;
// create the object that records this particular "paragraph"
@@ -293,7 +293,7 @@ void CodeEditor::insert (const TQString & text, TextBlock * tqparent, bool edita
{
// now we have to fix the 'start' value for all the para
// info blocks that coorspond to textblocks that we inserted
- // inside of. This means tqparent tblock paragraph locations
+ // inside of. This means parent tblock paragraph locations
// that are greater than zero in that type of textblock
int increase = size + 1;
@@ -353,7 +353,7 @@ void CodeEditor::appendText(TextBlockList * items)
appendText(cb);
/*
// no! shouldn't be any 'naked' comments floating about. Always
- // are assocated with a tqparent code block
+ // are assocated with a parent code block
else if ( (cm = dynamic_cast<CodeComment*>(tb)) )
appendText(cm);
*/
@@ -363,7 +363,7 @@ void CodeEditor::appendText(TextBlockList * items)
}
-void CodeEditor::appendText (CodeComment * comment, TextBlock * tqparent, UMLObject * umlObj , const TQString & componentName)
+void CodeEditor::appendText (CodeComment * comment, TextBlock * parent, UMLObject * umlObj , const TQString & componentName)
{
if(!comment->getWriteOutText() && !m_showHiddenBlocks)
@@ -376,7 +376,7 @@ void CodeEditor::appendText (CodeComment * comment, TextBlock * tqparent, UMLObj
TQString indent = comment->getIndentationString();
TQString text = comment->toString(); // use comment formatting, NOT formatMultiLineText(comment->toString(), indent, "\n");
if(!StringIsBlank(text))
- insert(text,tqparent,true,getState().fontColor, bgcolor, umlObj, componentName);
+ insert(text,parent,true,getState().fontColor, bgcolor, umlObj, componentName);
}
@@ -462,7 +462,7 @@ void CodeEditor::appendText (CodeMethodBlock * mb) {
TQString componentName = TQString("<b>parentless method\?</b>");
- // ugly, but we need to know if there is a tqparent object here.
+ // ugly, but we need to know if there is a parent object here.
CodeOperation * op = dynamic_cast<CodeOperation*>(mb);
CodeAccessorMethod * accessor = dynamic_cast<CodeAccessorMethod*>(mb);
UMLObject * parentObj = 0;
@@ -798,7 +798,7 @@ void CodeEditor::init ( CodeViewerDialog * parentDlg, CodeDocument * parentDoc )
setFont( getState().font );
- // set name of tqparent doc
+ // set name of parent doc
ClassifierCodeDocument * cdoc = dynamic_cast<ClassifierCodeDocument*>(m_parentDoc);
if(cdoc)
parentDocName = cdoc->getParentClassifier()->getName();
@@ -860,7 +860,7 @@ void CodeEditor::updateTextBlockFromText (TextBlock * block) {
//cerr<<"UPDATE GOT CONTENT:["<<content.latin1()<<"] to block:"<<block<<endl;
block->setText(content);
- // if a tqparent for the block, try to set its documentation
+ // if a parent for the block, try to set its documentation
// as long as its NOT an accessor codeblock.
if(parentObj && !info->isCodeAccessorMethod)
parentObj->setDoc(content);
diff --git a/umbrello/umbrello/dialogs/codeeditor.h b/umbrello/umbrello/dialogs/codeeditor.h
index 5f72fc7a..d5c42d1f 100644
--- a/umbrello/umbrello/dialogs/codeeditor.h
+++ b/umbrello/umbrello/dialogs/codeeditor.h
@@ -46,8 +46,8 @@ class CodeEditor : public TQTextEdit
TQ_OBJECT
public:
- explicit CodeEditor ( const TQString & text, const TQString & context = TQString(), CodeViewerDialog * tqparent = 0, const char * name = 0 , CodeDocument * doc = 0);
- explicit CodeEditor ( CodeViewerDialog * tqparent, const char* name = 0, CodeDocument * doc = 0);
+ explicit CodeEditor ( const TQString & text, const TQString & context = TQString(), CodeViewerDialog * parent = 0, const char * name = 0 , CodeDocument * doc = 0);
+ explicit CodeEditor ( CodeViewerDialog * parent, const char* name = 0, CodeDocument * doc = 0);
~CodeEditor ();
// return code viewer state
@@ -63,7 +63,7 @@ protected:
void appendText (CodeClassFieldDeclarationBlock * db );
void appendText (TextBlockList * items);
void appendText (CodeMethodBlock * mb);
- void appendText (CodeComment * comment, TextBlock * tqparent, UMLObject * umlObj = 0, const TQString & compName="");
+ void appendText (CodeComment * comment, TextBlock * parent, UMLObject * umlObj = 0, const TQString & compName="");
void appendText (CodeBlockWithComments * cb );
// Rebuild our view of the document. Happens whenever we change
@@ -83,7 +83,7 @@ protected:
// and 'return' events.
void keyPressEvent ( TQKeyEvent * e );
- // (re) load the tqparent code document into the editor
+ // (re) load the parent code document into the editor
void loadFromDocument();
// specialized popup menu for our tool
@@ -111,7 +111,7 @@ private:
TextBlockList m_textBlockList;
// main insert routine. Will append if startline is not supplied.
- void insert (const TQString & text, TextBlock * tqparent, bool isEditable = false,
+ void insert (const TQString & text, TextBlock * parent, bool isEditable = false,
const TQColor & fgcolor = TQColor("black"), const TQColor & bgcolor = TQColor("white"),
UMLObject * umlobj = 0, const TQString & displayName = "", int startLine = -1);
diff --git a/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp b/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp
index ab54eb3d..a5ce2f57 100644
--- a/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp
+++ b/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp
@@ -37,8 +37,8 @@
#include <tqlistview.h>
#include <tqbuttongroup.h>
-CodeGenerationOptionsPage::CodeGenerationOptionsPage(TQWidget *tqparent)
- : CodeGenerationOptionsBase(tqparent)
+CodeGenerationOptionsPage::CodeGenerationOptionsPage(TQWidget *parent)
+ : CodeGenerationOptionsBase(parent)
{
init();
}
@@ -154,7 +154,7 @@ void CodeGenerationOptionsPage::apply() {
m_parentPolicy->setIndentationAmount(m_SelectIndentationNumber->value());
// emit in THIS order.. the first signal triggers any sub-class to do its apply
- // slot, THEN, once we are all updated, we may sync the tqparent generator's code
+ // slot, THEN, once we are all updated, we may sync the parent generator's code
// documents
emit applyClicked();
emit syncCodeDocumentsToParent();
diff --git a/umbrello/umbrello/dialogs/codegenerationoptionspage.h b/umbrello/umbrello/dialogs/codegenerationoptionspage.h
index f444254e..15ac05b4 100644
--- a/umbrello/umbrello/dialogs/codegenerationoptionspage.h
+++ b/umbrello/umbrello/dialogs/codegenerationoptionspage.h
@@ -41,7 +41,7 @@ class CodeGenerationOptionsPage : public CodeGenerationOptionsBase {
Q_OBJECT
TQ_OBJECT
public:
- CodeGenerationOptionsPage(TQWidget *tqparent=0);
+ CodeGenerationOptionsPage(TQWidget *parent=0);
~CodeGenerationOptionsPage();
void setDefaults();
TQString getCodeGenerationLanguage();
diff --git a/umbrello/umbrello/dialogs/codegenerationpolicypage.cpp b/umbrello/umbrello/dialogs/codegenerationpolicypage.cpp
index 0cdd5e08..0e488e75 100644
--- a/umbrello/umbrello/dialogs/codegenerationpolicypage.cpp
+++ b/umbrello/umbrello/dialogs/codegenerationpolicypage.cpp
@@ -29,8 +29,8 @@
/** This is the page which comes up IF there is no special options for the
* code generator.
*/
-CodeGenerationPolicyPage::CodeGenerationPolicyPage( TQWidget *tqparent, const char *name, CodeGenPolicyExt * policy )
- :CodeGenerationPolicyBase(tqparent,name)
+CodeGenerationPolicyPage::CodeGenerationPolicyPage( TQWidget *parent, const char *name, CodeGenPolicyExt * policy )
+ :CodeGenerationPolicyBase(parent,name)
{
m_parentPolicy = policy;
}
diff --git a/umbrello/umbrello/dialogs/codegenerationpolicypage.h b/umbrello/umbrello/dialogs/codegenerationpolicypage.h
index 54723dd3..6325a91e 100644
--- a/umbrello/umbrello/dialogs/codegenerationpolicypage.h
+++ b/umbrello/umbrello/dialogs/codegenerationpolicypage.h
@@ -33,7 +33,7 @@ class CodeGenerationPolicyPage : public CodeGenerationPolicyBase {
Q_OBJECT
TQ_OBJECT
public:
- explicit CodeGenerationPolicyPage (TQWidget *tqparent=0, const char *name=0, CodeGenPolicyExt * policy = 0);
+ explicit CodeGenerationPolicyPage (TQWidget *parent=0, const char *name=0, CodeGenPolicyExt * policy = 0);
virtual ~CodeGenerationPolicyPage();
diff --git a/umbrello/umbrello/dialogs/codegenerationwizard.cpp b/umbrello/umbrello/dialogs/codegenerationwizard.cpp
index 3859d519..30ab5817 100644
--- a/umbrello/umbrello/dialogs/codegenerationwizard.cpp
+++ b/umbrello/umbrello/dialogs/codegenerationwizard.cpp
@@ -165,7 +165,7 @@ void CodeGenerationWizard::showPage(TQWidget *page) {
TQDir dir;
if(!dir.mkdir(info.filePath()))
{
- KMessageBox::sorry(this,i18n("The folder could not be created.\nPlease make sure you have write access to its tqparent folder or select another, valid, folder."),
+ KMessageBox::sorry(this,i18n("The folder could not be created.\nPlease make sure you have write access to its parent folder or select another, valid, folder."),
i18n("Error Creating Folder"));
return;
}
diff --git a/umbrello/umbrello/dialogs/codeviewerdialog.cpp b/umbrello/umbrello/dialogs/codeviewerdialog.cpp
index ef0091fe..3f11adb3 100644
--- a/umbrello/umbrello/dialogs/codeviewerdialog.cpp
+++ b/umbrello/umbrello/dialogs/codeviewerdialog.cpp
@@ -30,10 +30,10 @@
#include "../classifiercodedocument.h"
#include "codeeditor.h"
-CodeViewerDialog::CodeViewerDialog ( TQWidget* tqparent, CodeDocument * doc,
+CodeViewerDialog::CodeViewerDialog ( TQWidget* parent, CodeDocument * doc,
Settings::CodeViewerState state,
const char* name, bool modal, WFlags fl )
- : CodeViewerDialogBase ( tqparent, name, modal, fl )
+ : CodeViewerDialogBase ( parent, name, modal, fl )
{
m_state = state;
diff --git a/umbrello/umbrello/dialogs/codeviewerdialog.h b/umbrello/umbrello/dialogs/codeviewerdialog.h
index 2228dfae..eef90445 100644
--- a/umbrello/umbrello/dialogs/codeviewerdialog.h
+++ b/umbrello/umbrello/dialogs/codeviewerdialog.h
@@ -45,7 +45,7 @@ class CodeViewerDialog : public CodeViewerDialogBase
TQ_OBJECT
public:
- CodeViewerDialog ( TQWidget* tqparent, CodeDocument * doc, Settings::CodeViewerState state,
+ CodeViewerDialog ( TQWidget* parent, CodeDocument * doc, Settings::CodeViewerState state,
const char* name = 0, bool modal = false, WFlags fl = 0 );
~CodeViewerDialog ();
diff --git a/umbrello/umbrello/dialogs/codevieweroptionspage.cpp b/umbrello/umbrello/dialogs/codevieweroptionspage.cpp
index 3950d682..f4715b0d 100644
--- a/umbrello/umbrello/dialogs/codevieweroptionspage.cpp
+++ b/umbrello/umbrello/dialogs/codevieweroptionspage.cpp
@@ -26,8 +26,8 @@
#include <kcolorbutton.h>
-CodeViewerOptionsPage::CodeViewerOptionsPage( Settings::CodeViewerState options, TQWidget *tqparent, const char *name )
- :CodeViewerOptionsBase(tqparent,name)
+CodeViewerOptionsPage::CodeViewerOptionsPage( Settings::CodeViewerState options, TQWidget *parent, const char *name )
+ :CodeViewerOptionsBase(parent,name)
{
init (options);
}
diff --git a/umbrello/umbrello/dialogs/codevieweroptionspage.h b/umbrello/umbrello/dialogs/codevieweroptionspage.h
index f5a21736..1e1b4eea 100644
--- a/umbrello/umbrello/dialogs/codevieweroptionspage.h
+++ b/umbrello/umbrello/dialogs/codevieweroptionspage.h
@@ -30,7 +30,7 @@ class CodeViewerOptionsPage : public CodeViewerOptionsBase {
Q_OBJECT
TQ_OBJECT
public:
- CodeViewerOptionsPage (Settings::CodeViewerState options, TQWidget *tqparent, const char *name=0);
+ CodeViewerOptionsPage (Settings::CodeViewerState options, TQWidget *parent, const char *name=0);
~CodeViewerOptionsPage();
Settings::CodeViewerState getOptions();
diff --git a/umbrello/umbrello/dialogs/defaultcodegenpolicypage.cpp b/umbrello/umbrello/dialogs/defaultcodegenpolicypage.cpp
index 9732bbaf..3da163b7 100644
--- a/umbrello/umbrello/dialogs/defaultcodegenpolicypage.cpp
+++ b/umbrello/umbrello/dialogs/defaultcodegenpolicypage.cpp
@@ -29,10 +29,10 @@
/** This is the page which comes up IF there is no special options for the
* code generator.
*/
-DefaultCodeGenPolicyPage::DefaultCodeGenPolicyPage ( TQWidget *tqparent, const char *name, CodeGenPolicyExt * policy )
- :CodeGenerationPolicyPage(tqparent,name,policy)
+DefaultCodeGenPolicyPage::DefaultCodeGenPolicyPage ( TQWidget *parent, const char *name, CodeGenPolicyExt * policy )
+ :CodeGenerationPolicyPage(parent,name,policy)
{
- textLabel = new TQLabel(tqparent,"textLabel");
+ textLabel = new TQLabel(parent,"textLabel");
textLabel->setText(tr2i18n("<p align=\"center\">No Options Available.</p>"));
}
diff --git a/umbrello/umbrello/dialogs/defaultcodegenpolicypage.h b/umbrello/umbrello/dialogs/defaultcodegenpolicypage.h
index 2bbf169c..bbc1c85a 100644
--- a/umbrello/umbrello/dialogs/defaultcodegenpolicypage.h
+++ b/umbrello/umbrello/dialogs/defaultcodegenpolicypage.h
@@ -28,7 +28,7 @@ class DefaultCodeGenPolicyPage : public CodeGenerationPolicyPage
public:
- explicit DefaultCodeGenPolicyPage( TQWidget* tqparent = 0, const char* name = 0, CodeGenPolicyExt * policy =0);
+ explicit DefaultCodeGenPolicyPage( TQWidget* parent = 0, const char* name = 0, CodeGenPolicyExt * policy =0);
~DefaultCodeGenPolicyPage();
diff --git a/umbrello/umbrello/dialogs/diagramprintpage.cpp b/umbrello/umbrello/dialogs/diagramprintpage.cpp
index cff98397..34176e3a 100644
--- a/umbrello/umbrello/dialogs/diagramprintpage.cpp
+++ b/umbrello/umbrello/dialogs/diagramprintpage.cpp
@@ -30,7 +30,7 @@
#include "../umlnamespace.h"
-DiagramPrintPage::DiagramPrintPage(TQWidget * tqparent, UMLDoc * m_pDoc) : KPrintDialogPage(tqparent), m_pDoc(m_pDoc) {
+DiagramPrintPage::DiagramPrintPage(TQWidget * parent, UMLDoc * m_pDoc) : KPrintDialogPage(parent), m_pDoc(m_pDoc) {
int margin = fontMetrics().height();
setTitle(i18n("&Diagrams"));
TQHBoxLayout * mainLayout = new TQHBoxLayout(this);
diff --git a/umbrello/umbrello/dialogs/diagramprintpage.h b/umbrello/umbrello/dialogs/diagramprintpage.h
index 94e1deb5..b7980ca0 100644
--- a/umbrello/umbrello/dialogs/diagramprintpage.h
+++ b/umbrello/umbrello/dialogs/diagramprintpage.h
@@ -41,10 +41,10 @@ public:
/**
* Constructs the diagram print page.
*
- * @param tqparent The tqparent to the page.
+ * @param parent The parent to the page.
* @param doc The @ref UMLDoc class instance being used.
*/
- DiagramPrintPage(TQWidget * tqparent, UMLDoc *doc);
+ DiagramPrintPage(TQWidget * parent, UMLDoc *doc);
/**
* Stnadard deconstructor.
diff --git a/umbrello/umbrello/dialogs/exportallviewsdialog.cpp b/umbrello/umbrello/dialogs/exportallviewsdialog.cpp
index fa1e6d60..443ad9e2 100644
--- a/umbrello/umbrello/dialogs/exportallviewsdialog.cpp
+++ b/umbrello/umbrello/dialogs/exportallviewsdialog.cpp
@@ -25,12 +25,12 @@
#include "../umlviewimageexportermodel.h"
ExportAllViewsDialog::ExportAllViewsDialog(
- TQWidget* tqparent /* = 0 */,
+ TQWidget* parent /* = 0 */,
const char* name /* = 0 */,
bool modal /* = false */,
WFlags fl /* = 0*/,
const TQString &defaultMimeType /*= "image/png"*/)
- : ExportAllViewsDialogBase(tqparent,name, modal,fl) {
+ : ExportAllViewsDialogBase(parent,name, modal,fl) {
// create and initialize m_imageType
m_imageType = new KFileFilterCombo(this, "m_imageType");
m_imageType->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 0, 0, m_imageType->sizePolicy().hasHeightForWidth()));
diff --git a/umbrello/umbrello/dialogs/exportallviewsdialog.h b/umbrello/umbrello/dialogs/exportallviewsdialog.h
index 3b28037c..69a4135d 100644
--- a/umbrello/umbrello/dialogs/exportallviewsdialog.h
+++ b/umbrello/umbrello/dialogs/exportallviewsdialog.h
@@ -35,7 +35,7 @@ public:
/**
* Constructor for UMLViewImageExporterModel.
*
- * @param tqparent The tqparent of the dialog.
+ * @param parent The parent of the dialog.
* @param name The internal name.
* @param modal If modal is true the dialog will block input to other the windows
* in the application until it's closed.
@@ -44,7 +44,7 @@ public:
*
* @see TQDialog::TQDialog
*/
- explicit ExportAllViewsDialog(TQWidget* tqparent = 0, const char* name = 0,
+ explicit ExportAllViewsDialog(TQWidget* parent = 0, const char* name = 0,
bool modal = false, WFlags fl = 0,
const TQString& defaultMimeType = "image/png");
diff --git a/umbrello/umbrello/dialogs/notedialog.cpp b/umbrello/umbrello/dialogs/notedialog.cpp
index 420b425e..effb585d 100644
--- a/umbrello/umbrello/dialogs/notedialog.cpp
+++ b/umbrello/umbrello/dialogs/notedialog.cpp
@@ -22,7 +22,7 @@
#include <kmessagebox.h>
-NoteDialog::NoteDialog( TQWidget * tqparent, NoteWidget * pNote ) : KDialogBase(Plain, i18n("Note Documentation"), Help | Ok | Cancel , Ok, tqparent, "_NOTEDIALOG_", true, true) {
+NoteDialog::NoteDialog( TQWidget * parent, NoteWidget * pNote ) : KDialogBase(Plain, i18n("Note Documentation"), Help | Ok | Cancel , Ok, parent, "_NOTEDIALOG_", true, true) {
m_pNoteWidget = pNote;
int margin = fontMetrics().height();
diff --git a/umbrello/umbrello/dialogs/notedialog.h b/umbrello/umbrello/dialogs/notedialog.h
index 6f6e2fd2..ed42319f 100644
--- a/umbrello/umbrello/dialogs/notedialog.h
+++ b/umbrello/umbrello/dialogs/notedialog.h
@@ -33,7 +33,7 @@ public:
/**
* Constructs an NoteDialog.
*/
- NoteDialog( TQWidget * tqparent, NoteWidget * pNote );
+ NoteDialog( TQWidget * parent, NoteWidget * pNote );
/**
* Standard deconstructor.
diff --git a/umbrello/umbrello/dialogs/overwritedialogue.cpp b/umbrello/umbrello/dialogs/overwritedialogue.cpp
index c7661ced..9088b794 100644
--- a/umbrello/umbrello/dialogs/overwritedialogue.cpp
+++ b/umbrello/umbrello/dialogs/overwritedialogue.cpp
@@ -23,8 +23,8 @@
OverwriteDialogue::OverwriteDialogue(
const TQString& fileName,
const TQString& outputDirectory,
- bool applyToAllRemaining, TQWidget* tqparent, const char* name) :
-KDialogBase(Plain, i18n("Destination File Already Exists"), Ok|Apply|Cancel, Yes, tqparent, name) {
+ bool applyToAllRemaining, TQWidget* parent, const char* name) :
+KDialogBase(Plain, i18n("Destination File Already Exists"), Ok|Apply|Cancel, Yes, parent, name) {
TQVBoxLayout* tqlayout = new TQVBoxLayout( plainPage(), 0, spacingHint() );
diff --git a/umbrello/umbrello/dialogs/overwritedialogue.h b/umbrello/umbrello/dialogs/overwritedialogue.h
index f67d7673..fb85e967 100644
--- a/umbrello/umbrello/dialogs/overwritedialogue.h
+++ b/umbrello/umbrello/dialogs/overwritedialogue.h
@@ -36,7 +36,7 @@ public:
* constructor sets up the dialog, adding checkbox and label
*/
OverwriteDialogue(const TQString& fileName, const TQString& outputDirectory,
- bool applyToAllRemaining, TQWidget* tqparent=0, const char* name=0);
+ bool applyToAllRemaining, TQWidget* parent=0, const char* name=0);
/**
* destrictor doesn't do anything
diff --git a/umbrello/umbrello/dialogs/parmpropdlg.cpp b/umbrello/umbrello/dialogs/parmpropdlg.cpp
index ce5b5590..38a75292 100644
--- a/umbrello/umbrello/dialogs/parmpropdlg.cpp
+++ b/umbrello/umbrello/dialogs/parmpropdlg.cpp
@@ -31,8 +31,8 @@
#include "parmpropdlg.moc"
-ParmPropDlg::ParmPropDlg(TQWidget * tqparent, UMLDoc * doc, UMLAttribute * a)
- : KDialogBase(Plain, i18n("Parameter Properties"), Help | Ok | Cancel , Ok, tqparent, "_PARMPROPDLG_", true, true)
+ParmPropDlg::ParmPropDlg(TQWidget * parent, UMLDoc * doc, UMLAttribute * a)
+ : KDialogBase(Plain, i18n("Parameter Properties"), Help | Ok | Cancel , Ok, parent, "_PARMPROPDLG_", true, true)
{
m_pUmldoc = doc;
m_pAtt = a;
@@ -127,9 +127,9 @@ ParmPropDlg::ParmPropDlg(TQWidget * tqparent, UMLDoc * doc, UMLAttribute * a)
// m_pTypeCB->setAutoCompletion(false);
//add template parameters
- UMLClassifier *pConcept = dynamic_cast<UMLClassifier*>( m_pAtt->tqparent()->tqparent() );
+ UMLClassifier *pConcept = dynamic_cast<UMLClassifier*>( m_pAtt->parent()->parent() );
if (pConcept == NULL) {
- kError() << "ParmPropDlg: grandtqparent of " << m_pAtt->getName()
+ kError() << "ParmPropDlg: grandparent of " << m_pAtt->getName()
<< " is not a UMLClassifier" << endl;
} else {
UMLTemplateList tmplParams( pConcept->getTemplateList() );
@@ -219,9 +219,9 @@ void ParmPropDlg::slotOk() {
m_pAtt->setParmKind( getParmKind() );
m_pAtt->setStereotype( m_pStereoTypeCB->currentText() );
TQString typeName = m_pTypeCB->currentText();
- UMLClassifier * pConcept = dynamic_cast<UMLClassifier*>( m_pAtt->tqparent()->tqparent() );
+ UMLClassifier * pConcept = dynamic_cast<UMLClassifier*>( m_pAtt->parent()->parent() );
if (pConcept == NULL) {
- kError() << "ParmPropDlg::slotOk: grandtqparent of " << m_pAtt->getName()
+ kError() << "ParmPropDlg::slotOk: grandparent of " << m_pAtt->getName()
<< " is not a UMLClassifier" << endl;
} else {
UMLTemplate *tmplParam = pConcept->findTemplate(typeName);
diff --git a/umbrello/umbrello/dialogs/parmpropdlg.h b/umbrello/umbrello/dialogs/parmpropdlg.h
index 8beca582..0164277d 100644
--- a/umbrello/umbrello/dialogs/parmpropdlg.h
+++ b/umbrello/umbrello/dialogs/parmpropdlg.h
@@ -29,7 +29,7 @@ class UMLDoc;
/**
* Displays a dialog box that displays properties of a paramater.
* You need to make sure that @ref UMLDoc is made to be the
- * tqparent.
+ * parent.
*
* @short A properties dialog box for a parameter.
* @author Paul Hensgen <phensgen@techie.com>
@@ -42,10 +42,10 @@ public:
/**
* Constructs a ParmPropDlg.
*
- * @param tqparent The tqparent of the dialog.
+ * @param parent The parent of the dialog.
* @param a The parameter to represent.
*/
- ParmPropDlg(TQWidget * tqparent, UMLDoc * doc, UMLAttribute * a);
+ ParmPropDlg(TQWidget * parent, UMLDoc * doc, UMLAttribute * a);
/**
* Standard deconstructor.
diff --git a/umbrello/umbrello/dialogs/pkgcontentspage.cpp b/umbrello/umbrello/dialogs/pkgcontentspage.cpp
index 6d9473c7..a5b742b1 100644
--- a/umbrello/umbrello/dialogs/pkgcontentspage.cpp
+++ b/umbrello/umbrello/dialogs/pkgcontentspage.cpp
@@ -17,8 +17,8 @@
#include "../umldoc.h"
#include "classpropdlg.h"
-PkgContentsPage::PkgContentsPage(TQWidget *tqparent, UMLPackage *pkg)
- : TQWidget(tqparent)
+PkgContentsPage::PkgContentsPage(TQWidget *parent, UMLPackage *pkg)
+ : TQWidget(parent)
{
m_pPackage = pkg;
int margin = fontMetrics().height();
diff --git a/umbrello/umbrello/dialogs/pkgcontentspage.h b/umbrello/umbrello/dialogs/pkgcontentspage.h
index ef6faff1..65db8d8f 100644
--- a/umbrello/umbrello/dialogs/pkgcontentspage.h
+++ b/umbrello/umbrello/dialogs/pkgcontentspage.h
@@ -32,10 +32,10 @@ public:
/**
* Constructs an instance of PkgContentsPage.
*
- * @param tqparent The tqparent of the page.
+ * @param parent The parent of the page.
* @param pkg The UMLPackage being represented.
*/
- PkgContentsPage(TQWidget *tqparent, UMLPackage *pkg);
+ PkgContentsPage(TQWidget *parent, UMLPackage *pkg);
/**
* Standard destructor.
diff --git a/umbrello/umbrello/dialogs/selectopdlg.cpp b/umbrello/umbrello/dialogs/selectopdlg.cpp
index e49ea6d9..1c175752 100644
--- a/umbrello/umbrello/dialogs/selectopdlg.cpp
+++ b/umbrello/umbrello/dialogs/selectopdlg.cpp
@@ -26,10 +26,10 @@
#include "../umlview.h"
#include "../dialog_utils.h"
-SelectOpDlg::SelectOpDlg(UMLView * tqparent, UMLClassifier * c)
- : KDialogBase(Plain, i18n("Select Operation"), Ok | Cancel , Ok, tqparent, "_SELOPDLG_", true, true)
+SelectOpDlg::SelectOpDlg(UMLView * parent, UMLClassifier * c)
+ : KDialogBase(Plain, i18n("Select Operation"), Ok | Cancel , Ok, parent, "_SELOPDLG_", true, true)
{
- m_pView = tqparent;
+ m_pView = parent;
TQVBoxLayout * topLayout = new TQVBoxLayout(plainPage());
m_pOpGB = new TQGroupBox(i18n("Select Operation"), plainPage());
diff --git a/umbrello/umbrello/dialogs/selectopdlg.h b/umbrello/umbrello/dialogs/selectopdlg.h
index 3c12b1b1..be8a38ad 100644
--- a/umbrello/umbrello/dialogs/selectopdlg.h
+++ b/umbrello/umbrello/dialogs/selectopdlg.h
@@ -44,10 +44,10 @@ public:
/**
* Constructs a SelectOpDlg instance.
*
- * @param tqparent The tqparent to this instance.
+ * @param parent The parent to this instance.
* @param c The concept to get the operations from.
*/
- SelectOpDlg(UMLView * tqparent, UMLClassifier * c);
+ SelectOpDlg(UMLView * parent, UMLClassifier * c);
/**
* Standard deconstructor.
diff --git a/umbrello/umbrello/dialogs/settingsdlg.cpp b/umbrello/umbrello/dialogs/settingsdlg.cpp
index a227572d..b5cddff5 100644
--- a/umbrello/umbrello/dialogs/settingsdlg.cpp
+++ b/umbrello/umbrello/dialogs/settingsdlg.cpp
@@ -26,9 +26,9 @@
#include "codevieweroptionspage.h"
#include "../dialog_utils.h"
-SettingsDlg::SettingsDlg( TQWidget * tqparent, Settings::OptionState *state )
+SettingsDlg::SettingsDlg( TQWidget * parent, Settings::OptionState *state )
: KDialogBase( IconList, i18n("Umbrello Setup"),
- Help | Default | Apply | Ok | Cancel, Ok, tqparent, 0, true, true ) {
+ Help | Default | Apply | Ok | Cancel, Ok, parent, 0, true, true ) {
m_bChangesApplied = false;
m_pOptionState = state;
setHelp( "umbrello/index.html", TQString() );
diff --git a/umbrello/umbrello/dialogs/settingsdlg.h b/umbrello/umbrello/dialogs/settingsdlg.h
index a01696c8..228ac654 100644
--- a/umbrello/umbrello/dialogs/settingsdlg.h
+++ b/umbrello/umbrello/dialogs/settingsdlg.h
@@ -46,7 +46,7 @@ class SettingsDlg : public KDialogBase {
TQ_OBJECT
public:
- SettingsDlg(TQWidget * tqparent, Settings::OptionState *state);
+ SettingsDlg(TQWidget * parent, Settings::OptionState *state);
~SettingsDlg();
//public methods
diff --git a/umbrello/umbrello/dialogs/umlattributedialog.cpp b/umbrello/umbrello/dialogs/umlattributedialog.cpp
index af59de17..d6ea57ce 100644
--- a/umbrello/umbrello/dialogs/umlattributedialog.cpp
+++ b/umbrello/umbrello/dialogs/umlattributedialog.cpp
@@ -157,7 +157,7 @@ bool UMLAttributeDialog::apply() {
m_pNameLE->setText( m_pAttribute->getName() );
return false;
}
- UMLClassifier * pConcept = dynamic_cast<UMLClassifier *>( m_pAttribute->tqparent() );
+ UMLClassifier * pConcept = dynamic_cast<UMLClassifier *>( m_pAttribute->parent() );
UMLObject *o = pConcept->findChildObject(name);
if (o && o != m_pAttribute) {
KMessageBox::error(this, i18n("The attribute name you have chosen is already being used in this operation."),
diff --git a/umbrello/umbrello/dialogs/umlentityattributedialog.cpp b/umbrello/umbrello/dialogs/umlentityattributedialog.cpp
index ba111405..55a47857 100644
--- a/umbrello/umbrello/dialogs/umlentityattributedialog.cpp
+++ b/umbrello/umbrello/dialogs/umlentityattributedialog.cpp
@@ -186,7 +186,7 @@ bool UMLEntityAttributeDialog::apply() {
m_pNameLE->setText( m_pEntityAttribute->getName() );
return false;
}
- UMLClassifier * pConcept = dynamic_cast<UMLClassifier *>( m_pEntityAttribute->tqparent() );
+ UMLClassifier * pConcept = dynamic_cast<UMLClassifier *>( m_pEntityAttribute->parent() );
UMLObject *o = pConcept->findChildObject(name);
if (o && o != m_pEntityAttribute) {
KMessageBox::error(this, i18n("The entity attribute name you have chosen is already being used in this operation."),
diff --git a/umbrello/umbrello/dialogs/umloperationdialog.cpp b/umbrello/umbrello/dialogs/umloperationdialog.cpp
index 7edb1e35..e8216b99 100644
--- a/umbrello/umbrello/dialogs/umloperationdialog.cpp
+++ b/umbrello/umbrello/dialogs/umloperationdialog.cpp
@@ -46,8 +46,8 @@
#include "../stereotype.h"
#include "../uniqueid.h"
-UMLOperationDialog::UMLOperationDialog( TQWidget * tqparent, UMLOperation * pOperation )
- : KDialogBase( Plain, i18n("Operation Properties"), Help | Ok | Cancel , Ok, tqparent, "_UMLOPERATIONDLG_", true, true) {
+UMLOperationDialog::UMLOperationDialog( TQWidget * parent, UMLOperation * pOperation )
+ : KDialogBase( Plain, i18n("Operation Properties"), Help | Ok | Cancel , Ok, parent, "_UMLOPERATIONDLG_", true, true) {
m_pOperation = pOperation;
m_doc = UMLApp::app()->getDocument();
m_pMenu = 0;
@@ -162,7 +162,7 @@ void UMLOperationDialog::setupDialog() {
m_pRtypeCB->setCompletionMode( KGlobalSettings::CompletionPopup );
// add template parameters
- UMLClassifier *classifier = dynamic_cast<UMLClassifier*>(m_pOperation->tqparent());
+ UMLClassifier *classifier = dynamic_cast<UMLClassifier*>(m_pOperation->parent());
if (classifier) {
UMLClassifierListItemList tmplParams( classifier->getFilteredList(Uml::ot_Template) );
for (UMLClassifierListItem *li = tmplParams.first(); li; li = tmplParams.next())
@@ -459,7 +459,7 @@ bool UMLOperationDialog::apply()
return false;
}
- UMLClassifier *classifier = dynamic_cast<UMLClassifier*>( m_pOperation->tqparent() );
+ UMLClassifier *classifier = dynamic_cast<UMLClassifier*>( m_pOperation->parent() );
if( classifier != 0L &&
classifier->checkOperationSignature(name, m_pOperation->getParmList(), m_pOperation) )
{
diff --git a/umbrello/umbrello/dialogs/umloperationdialog.h b/umbrello/umbrello/dialogs/umloperationdialog.h
index 2f67bfe2..7a932554 100644
--- a/umbrello/umbrello/dialogs/umloperationdialog.h
+++ b/umbrello/umbrello/dialogs/umloperationdialog.h
@@ -43,7 +43,7 @@ public:
/**
* Constructor
*/
- UMLOperationDialog( TQWidget * tqparent, UMLOperation * pOperation );
+ UMLOperationDialog( TQWidget * parent, UMLOperation * pOperation );
/**
* Deconstructor
diff --git a/umbrello/umbrello/dialogs/umlroledialog.cpp b/umbrello/umbrello/dialogs/umlroledialog.cpp
index 00f2bd1a..607ac759 100644
--- a/umbrello/umbrello/dialogs/umlroledialog.cpp
+++ b/umbrello/umbrello/dialogs/umlroledialog.cpp
@@ -21,8 +21,8 @@
#include "../umlrole.h"
#include "umlroleproperties.h"
-UMLRoleDialog::UMLRoleDialog( TQWidget * tqparent, UMLRole * pRole )
- : KDialogBase( Plain, i18n("Role Properties"), Help | Ok | Cancel , Ok, tqparent, "_UMLROLEDLG_", true, true)
+UMLRoleDialog::UMLRoleDialog( TQWidget * parent, UMLRole * pRole )
+ : KDialogBase( Plain, i18n("Role Properties"), Help | Ok | Cancel , Ok, parent, "_UMLROLEDLG_", true, true)
{
m_pRole = pRole;
setupDialog();
diff --git a/umbrello/umbrello/dialogs/umlroledialog.h b/umbrello/umbrello/dialogs/umlroledialog.h
index 0b41060d..c429e2e4 100644
--- a/umbrello/umbrello/dialogs/umlroledialog.h
+++ b/umbrello/umbrello/dialogs/umlroledialog.h
@@ -30,7 +30,7 @@ public:
/**
* Constructor
*/
- UMLRoleDialog( TQWidget * tqparent, UMLRole * pRole );
+ UMLRoleDialog( TQWidget * parent, UMLRole * pRole );
/**
* Deconstructor
diff --git a/umbrello/umbrello/dialogs/umlroleproperties.cpp b/umbrello/umbrello/dialogs/umlroleproperties.cpp
index 481eafb3..fe2e2f5f 100644
--- a/umbrello/umbrello/dialogs/umlroleproperties.cpp
+++ b/umbrello/umbrello/dialogs/umlroleproperties.cpp
@@ -21,8 +21,8 @@
#include <kdebug.h>
-UMLRoleProperties::UMLRoleProperties ( TQWidget *tqparent, UMLRole *role)
- : UMLRolePropertiesBase (tqparent)
+UMLRoleProperties::UMLRoleProperties ( TQWidget *parent, UMLRole *role)
+ : UMLRolePropertiesBase (parent)
{
m_pRole = role;
diff --git a/umbrello/umbrello/dialogs/umlroleproperties.h b/umbrello/umbrello/dialogs/umlroleproperties.h
index cd3cb005..f52eaf4d 100644
--- a/umbrello/umbrello/dialogs/umlroleproperties.h
+++ b/umbrello/umbrello/dialogs/umlroleproperties.h
@@ -30,10 +30,10 @@ public:
/**
* Sets up the UMLRoleProperties.
*
- * @param tqparent The tqparent widget to the UMLRoleProperties.
+ * @param parent The parent widget to the UMLRoleProperties.
* @param role The UMLRole to display the properties of.
*/
- UMLRoleProperties( TQWidget *tqparent, UMLRole *role);
+ UMLRoleProperties( TQWidget *parent, UMLRole *role);
/**
* Standard deconstructor.
@@ -48,7 +48,7 @@ public:
protected:
- // the tqparent role object
+ // the parent role object
UMLRole * m_pRole;
private:
diff --git a/umbrello/umbrello/dialogs/umltemplatedialog.cpp b/umbrello/umbrello/dialogs/umltemplatedialog.cpp
index 20183e3a..6075fbe4 100644
--- a/umbrello/umbrello/dialogs/umltemplatedialog.cpp
+++ b/umbrello/umbrello/dialogs/umltemplatedialog.cpp
@@ -131,7 +131,7 @@ bool UMLTemplateDialog::apply() {
return false;
}
- UMLClassifier * pClass = dynamic_cast<UMLClassifier *>( m_pTemplate->tqparent() );
+ UMLClassifier * pClass = dynamic_cast<UMLClassifier *>( m_pTemplate->parent() );
if (pClass) {
UMLObject *o = pClass->findChildObject(name);
if (o && o != m_pTemplate) {
diff --git a/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp b/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp
index a330ad30..824d708f 100644
--- a/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp
+++ b/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp
@@ -87,12 +87,12 @@ void UMLWidgetColorPage::init()
UMLWidgetColorPage::~UMLWidgetColorPage() {}
void UMLWidgetColorPage::slotLineButtonClicked() {
- // UMLView * pView = dynamic_cast<UMLView *>( m_pUMLWidget -> tqparent() );
+ // UMLView * pView = dynamic_cast<UMLView *>( m_pUMLWidget -> parent() );
m_pLineColorB -> setColor( Settings::getOptionState().uiState.lineColor );
}
void UMLWidgetColorPage::slotFillButtonClicked() {
- // UMLView * pView = dynamic_cast<UMLView *>( m_pUMLWidget -> tqparent() );
+ // UMLView * pView = dynamic_cast<UMLView *>( m_pUMLWidget -> parent() );
m_pFillColorB -> setColor( Settings::getOptionState().uiState.fillColor );
}
diff --git a/umbrello/umbrello/docgenerators/xmi2docbook.xsl b/umbrello/umbrello/docgenerators/xmi2docbook.xsl
index a48938f7..ff10aac5 100644
--- a/umbrello/umbrello/docgenerators/xmi2docbook.xsl
+++ b/umbrello/umbrello/docgenerators/xmi2docbook.xsl
@@ -450,12 +450,12 @@
<title>Supertypes:</title>
<xsl:for-each select="$generalizations">
- <!-- get the tqparent in the generalization -->
+ <!-- get the parent in the generalization -->
<xsl:variable name="generalization"
select="key('generalization', ./@xmi.idref)" />
<xsl:variable name="target"
select="$generalization/
- Foundation.Core.Generalization.tqparent/
+ Foundation.Core.Generalization.parent/
*/@xmi.idref" />
<xsl:call-template name="classify">
<xsl:with-param name="target" select="$target"/>
diff --git a/umbrello/umbrello/docwindow.cpp b/umbrello/umbrello/docwindow.cpp
index ddd056a2..ab935d00 100644
--- a/umbrello/umbrello/docwindow.cpp
+++ b/umbrello/umbrello/docwindow.cpp
@@ -26,7 +26,7 @@
#include "umlwidget.h"
-DocWindow::DocWindow( UMLDoc * doc, TQWidget *tqparent, const char *name ) : TQWidget( tqparent, name ) {
+DocWindow::DocWindow( UMLDoc * doc, TQWidget *parent, const char *name ) : TQWidget( parent, name ) {
//setup visual display
TQHBoxLayout * mainLayout = new TQHBoxLayout( this );
diff --git a/umbrello/umbrello/docwindow.h b/umbrello/umbrello/docwindow.h
index 217e7d83..a2dce505 100644
--- a/umbrello/umbrello/docwindow.h
+++ b/umbrello/umbrello/docwindow.h
@@ -34,7 +34,7 @@ public:
/**
* Constructor
*/
- explicit DocWindow( UMLDoc * doc, TQWidget *tqparent = 0, const char *name = 0 );
+ explicit DocWindow( UMLDoc * doc, TQWidget *parent = 0, const char *name = 0 );
/**
* Deconstructor
diff --git a/umbrello/umbrello/entity.cpp b/umbrello/umbrello/entity.cpp
index 38c73138..31ef1513 100644
--- a/umbrello/umbrello/entity.cpp
+++ b/umbrello/umbrello/entity.cpp
@@ -107,7 +107,7 @@ UMLObject* UMLEntity::addEntityAttribute(const TQString& name, Uml::IDType id) {
bool UMLEntity::addEntityAttribute(UMLEntityAttribute* attribute, IDChangeLog* Log /* = 0*/) {
TQString name = (TQString)attribute->getName();
if (findChildObject(name) == NULL) {
- attribute->tqparent()->removeChild(attribute);
+ attribute->parent()->removeChild(attribute);
this->insertChild(attribute);
m_List.append(attribute);
emit entityAttributeAdded(attribute);
@@ -124,7 +124,7 @@ bool UMLEntity::addEntityAttribute(UMLEntityAttribute* attribute, IDChangeLog* L
bool UMLEntity::addEntityAttribute(UMLEntityAttribute* attribute, int position) {
TQString name = (TQString)attribute->getName();
if (findChildObject(name) == NULL) {
- attribute->tqparent()->removeChild(attribute);
+ attribute->parent()->removeChild(attribute);
this->insertChild(attribute);
if ( position >= 0 && position <= (int)m_List.count() ) {
m_List.insert(position,attribute);
diff --git a/umbrello/umbrello/entity.h b/umbrello/umbrello/entity.h
index 9b507f00..c9ec4633 100644
--- a/umbrello/umbrello/entity.h
+++ b/umbrello/umbrello/entity.h
@@ -60,7 +60,7 @@ public:
virtual UMLObject* clone() const;
/**
- * Creates an entity attribute for the tqparent concept.
+ * Creates an entity attribute for the parent concept.
* Reimplementation of method from UMLClassifier.
*
* @param name An optional name, used by when creating through UMLListView
diff --git a/umbrello/umbrello/entityattribute.cpp b/umbrello/umbrello/entityattribute.cpp
index ebc2111f..b8030fed 100644
--- a/umbrello/umbrello/entityattribute.cpp
+++ b/umbrello/umbrello/entityattribute.cpp
@@ -21,17 +21,17 @@
#include "dialogs/umlentityattributedialog.h"
#include "object_factory.h"
-UMLEntityAttribute::UMLEntityAttribute( const UMLObject *tqparent, const TQString& name,
+UMLEntityAttribute::UMLEntityAttribute( const UMLObject *parent, const TQString& name,
Uml::IDType id, Uml::Visibility s,
UMLObject *type, const TQString& iv )
- : UMLAttribute(tqparent, name, id, s, type, iv) {
+ : UMLAttribute(parent, name, id, s, type, iv) {
init();
if (m_pSecondary) {
m_pSecondary->setBaseType(Uml::ot_Entity);
}
}
-UMLEntityAttribute::UMLEntityAttribute(const UMLObject *tqparent) : UMLAttribute(tqparent) {
+UMLEntityAttribute::UMLEntityAttribute(const UMLObject *parent) : UMLAttribute(parent) {
init();
}
@@ -119,7 +119,7 @@ bool UMLEntityAttribute::operator==( UMLEntityAttribute &rhs) {
void UMLEntityAttribute::copyInto(UMLEntityAttribute *rhs) const
{
- // call the tqparent first.
+ // call the parent first.
UMLClassifierListItem::copyInto(rhs);
// Copy all datamembers
@@ -131,7 +131,7 @@ void UMLEntityAttribute::copyInto(UMLEntityAttribute *rhs) const
UMLObject* UMLEntityAttribute::clone() const
{
- UMLEntityAttribute* clone = new UMLEntityAttribute( (UMLEntityAttribute*)tqparent() );
+ UMLEntityAttribute* clone = new UMLEntityAttribute( (UMLEntityAttribute*)parent() );
copyInto(clone);
return clone;
@@ -169,8 +169,8 @@ bool UMLEntityAttribute::load( TQDomElement & element ) {
return true;
}
-bool UMLEntityAttribute::showPropertiesDialog(TQWidget* tqparent) {
- UMLEntityAttributeDialog dialog(tqparent, this);
+bool UMLEntityAttribute::showPropertiesDialog(TQWidget* parent) {
+ UMLEntityAttributeDialog dialog(parent, this);
return dialog.exec();
}
diff --git a/umbrello/umbrello/entityattribute.h b/umbrello/umbrello/entityattribute.h
index 4a094dfb..aee70bcf 100644
--- a/umbrello/umbrello/entityattribute.h
+++ b/umbrello/umbrello/entityattribute.h
@@ -31,14 +31,14 @@ public:
/**
* Sets up an entityattribute.
*
- * @param tqparent The tqparent of this UMLEntityAttribute.
+ * @param parent The parent of this UMLEntityAttribute.
* @param name The name of this UMLEntityAttribute.
* @param id The unique id given to this UMLEntityAttribute.
* @param s The visibility of the UMLEntityAttribute.
* @param type The type of this UMLEntityAttribute.
* @param iv The initial value of the entityattribute.
*/
- UMLEntityAttribute(const UMLObject* tqparent, const TQString& name,
+ UMLEntityAttribute(const UMLObject* parent, const TQString& name,
Uml::IDType id = Uml::id_None,
Uml::Visibility s = Uml::Visibility::Private,
UMLObject *type = 0, const TQString& iv = 0);
@@ -46,9 +46,9 @@ public:
/**
* Sets up an entityattribute.
*
- * @param tqparent The tqparent of this UMLEntityAttribute.
+ * @param parent The parent of this UMLEntityAttribute.
*/
- UMLEntityAttribute(const UMLObject* tqparent);
+ UMLEntityAttribute(const UMLObject* parent);
/**
* Overloaded '==' operator
@@ -158,7 +158,7 @@ public:
/**
* Display the properties configuration dialog for the entityattribute.
*/
- bool showPropertiesDialog(TQWidget* tqparent);
+ bool showPropertiesDialog(TQWidget* parent);
protected:
/**
diff --git a/umbrello/umbrello/entitywidget.h b/umbrello/umbrello/entitywidget.h
index 55b0e625..e99da521 100644
--- a/umbrello/umbrello/entitywidget.h
+++ b/umbrello/umbrello/entitywidget.h
@@ -33,7 +33,7 @@ public:
/**
* Constructs an EntityWidget.
*
- * @param view The tqparent of this EntityWidget.
+ * @param view The parent of this EntityWidget.
* @param o The UMLObject this will be representing.
*/
EntityWidget(UMLView* view, UMLObject* o);
diff --git a/umbrello/umbrello/enum.cpp b/umbrello/umbrello/enum.cpp
index 491817e2..93ee1bdd 100644
--- a/umbrello/umbrello/enum.cpp
+++ b/umbrello/umbrello/enum.cpp
@@ -109,7 +109,7 @@ UMLObject* UMLEnum::addEnumLiteral(const TQString &name, Uml::IDType id) {
bool UMLEnum::addEnumLiteral(UMLEnumLiteral* literal, IDChangeLog* Log /* = 0*/) {
TQString name = (TQString)literal->getName();
if (findChildObject(name) == NULL) {
- literal->tqparent()->removeChild(literal);
+ literal->parent()->removeChild(literal);
this->insertChild(literal);
m_List.append(literal);
UMLObject::emitModified();
@@ -126,7 +126,7 @@ bool UMLEnum::addEnumLiteral(UMLEnumLiteral* literal, IDChangeLog* Log /* = 0*/)
bool UMLEnum::addEnumLiteral(UMLEnumLiteral* literal, int position) {
TQString name = (TQString)literal->getName();
if (findChildObject(name) == NULL) {
- literal->tqparent()->removeChild(literal);
+ literal->parent()->removeChild(literal);
this->insertChild(literal);
if ( position >= 0 && position <= (int)m_List.count() ) {
m_List.insert(position,literal);
diff --git a/umbrello/umbrello/enumliteral.cpp b/umbrello/umbrello/enumliteral.cpp
index b6efb808..8158e40e 100644
--- a/umbrello/umbrello/enumliteral.cpp
+++ b/umbrello/umbrello/enumliteral.cpp
@@ -15,13 +15,13 @@
#include <kdebug.h>
#include <klocale.h>
-UMLEnumLiteral::UMLEnumLiteral(const UMLObject *tqparent,
+UMLEnumLiteral::UMLEnumLiteral(const UMLObject *parent,
const TQString& name, Uml::IDType id)
- : UMLClassifierListItem(tqparent, name, id) {
+ : UMLClassifierListItem(parent, name, id) {
m_BaseType = Uml::ot_EnumLiteral;
}
-UMLEnumLiteral::UMLEnumLiteral(const UMLObject *tqparent) : UMLClassifierListItem(tqparent) {
+UMLEnumLiteral::UMLEnumLiteral(const UMLObject *parent) : UMLClassifierListItem(parent) {
m_BaseType = Uml::ot_EnumLiteral;
}
@@ -44,7 +44,7 @@ void UMLEnumLiteral::copyInto(UMLEnumLiteral *rhs) const
UMLObject* UMLEnumLiteral::clone() const
{
- UMLEnumLiteral *clone = new UMLEnumLiteral((UMLObject *) tqparent());
+ UMLEnumLiteral *clone = new UMLEnumLiteral((UMLObject *) parent());
copyInto(clone);
return clone;
@@ -60,9 +60,9 @@ bool UMLEnumLiteral::load(TQDomElement& ) {
return true;
}
-bool UMLEnumLiteral::showPropertiesDialog(TQWidget* tqparent) {
+bool UMLEnumLiteral::showPropertiesDialog(TQWidget* parent) {
bool ok;
- TQString name = KInputDialog::getText(i18n("Name"), i18n("Enter name:"), getName(), &ok, tqparent);
+ TQString name = KInputDialog::getText(i18n("Name"), i18n("Enter name:"), getName(), &ok, parent);
if ( ok && !name.isEmpty() ) {
setName(name);
return true;
diff --git a/umbrello/umbrello/enumliteral.h b/umbrello/umbrello/enumliteral.h
index 3e530c4d..e9a63b1a 100644
--- a/umbrello/umbrello/enumliteral.h
+++ b/umbrello/umbrello/enumliteral.h
@@ -29,19 +29,19 @@ public:
/**
* Sets up an enum literal.
*
- * @param tqparent The tqparent of this UMLEnumLiteral.
+ * @param parent The parent of this UMLEnumLiteral.
* @param name The name of this UMLEnumLiteral.
* @param id The unique id given to this UMLEnumLiteral.
*/
- UMLEnumLiteral(const UMLObject* tqparent,
+ UMLEnumLiteral(const UMLObject* parent,
const TQString& name, Uml::IDType id = Uml::id_None);
/**
* Sets up an enum literal.
*
- * @param tqparent The tqparent of this UMLEnumLiteral.
+ * @param parent The parent of this UMLEnumLiteral.
*/
- UMLEnumLiteral(const UMLObject* tqparent);
+ UMLEnumLiteral(const UMLObject* parent);
/**
* Overloaded '==' operator
@@ -72,7 +72,7 @@ public:
/**
* Display the properties configuration dialog for the enum literal.
*/
- bool showPropertiesDialog(TQWidget* tqparent);
+ bool showPropertiesDialog(TQWidget* parent);
protected:
/**
diff --git a/umbrello/umbrello/enumwidget.h b/umbrello/umbrello/enumwidget.h
index b5802135..aa61f4ea 100644
--- a/umbrello/umbrello/enumwidget.h
+++ b/umbrello/umbrello/enumwidget.h
@@ -33,7 +33,7 @@ public:
/**
* Constructs an EnumWidget.
*
- * @param view The tqparent of this EnumWidget.
+ * @param view The parent of this EnumWidget.
* @param o The UMLObject this will be representing.
*/
EnumWidget(UMLView* view, UMLObject* o);
diff --git a/umbrello/umbrello/floatingtextwidget.h b/umbrello/umbrello/floatingtextwidget.h
index ad33e532..635d750e 100644
--- a/umbrello/umbrello/floatingtextwidget.h
+++ b/umbrello/umbrello/floatingtextwidget.h
@@ -54,7 +54,7 @@ public:
/**
* Constructs a FloatingTextWidget instance.
*
- * @param view The tqparent of this FloatingTextWidget.
+ * @param view The parent of this FloatingTextWidget.
* @param role The role this FloatingTextWidget will take up.
* @param text The main text to display.
* @param id The ID to assign (-1 will prompt a new ID.)
diff --git a/umbrello/umbrello/floatingtextwidgetcontroller.h b/umbrello/umbrello/floatingtextwidgetcontroller.h
index 5b89c3ad..93c91d69 100644
--- a/umbrello/umbrello/floatingtextwidgetcontroller.h
+++ b/umbrello/umbrello/floatingtextwidgetcontroller.h
@@ -55,7 +55,7 @@ protected:
/**
* Overridden from UMLWidgetController.
* Saves the values of the widget needed for move/resize.
- * Calls tqparent method and then saves the value of m_unconstrainedPositionX/Y
+ * Calls parent method and then saves the value of m_unconstrainedPositionX/Y
* and m_movementDirectionX/Y.
*
* @param me The TQMouseEvent to get the offset from.
diff --git a/umbrello/umbrello/folder.cpp b/umbrello/umbrello/folder.cpp
index 7a4d11ab..127c3b34 100644
--- a/umbrello/umbrello/folder.cpp
+++ b/umbrello/umbrello/folder.cpp
@@ -157,8 +157,8 @@ void UMLFolder::removeAllViews() {
UMLView *v = NULL;
for (UMLViewListIt vit(m_diagrams); (v = vit.current()) != NULL; ++vit) {
// TODO ------------------ check this code - bad: calling back to UMLDoc::removeView()
- v->removeAllAssociations(); // note : It may not be aptqparent, but when we remove all associations
- // from a view, it also causes any UMLAssociations that lack tqparent
+ v->removeAllAssociations(); // note : It may not be apparent, but when we remove all associations
+ // from a view, it also causes any UMLAssociations that lack parent
// association widgets (but once had them) to remove themselves from
// this document.
UMLApp::app()->getDocument()->removeView(v, false);
@@ -249,7 +249,7 @@ void UMLFolder::saveToXMI(TQDomDocument& qDoc, TQDomElement& qElement) {
folderRoot.setAttribute("filename", m_folderFile);
folderRoot.setAttribute("mainModel", umldoc->URL().fileName());
folderRoot.setAttribute("parentId", ID2STR(m_pUMLPackage->getID()));
- folderRoot.setAttribute("tqparent", m_pUMLPackage->getFullyQualifiedName("::", true));
+ folderRoot.setAttribute("parent", m_pUMLPackage->getFullyQualifiedName("::", true));
saveContents(folderDoc, folderRoot);
folderDoc.appendChild(folderRoot);
TQTextStream stream(&file);
diff --git a/umbrello/umbrello/forkjoinwidget.h b/umbrello/umbrello/forkjoinwidget.h
index def633b4..8ee869ea 100644
--- a/umbrello/umbrello/forkjoinwidget.h
+++ b/umbrello/umbrello/forkjoinwidget.h
@@ -31,7 +31,7 @@ public:
/**
* Constructs a ForkJoinWidget.
*
- * @param view The tqparent to this widget.
+ * @param view The parent to this widget.
* @param drawVertical Whether to draw the plate horizontally or vertically.
* @param id The ID to assign (-1 will prompt a new ID.)
*/
diff --git a/umbrello/umbrello/hierarchicalcodeblock.cpp b/umbrello/umbrello/hierarchicalcodeblock.cpp
index 73e59bab..8802cbcf 100644
--- a/umbrello/umbrello/hierarchicalcodeblock.cpp
+++ b/umbrello/umbrello/hierarchicalcodeblock.cpp
@@ -114,7 +114,7 @@ bool HierarchicalCodeBlock::insertTextBlock(TextBlock * newBlock, TextBlock * ex
return false;
TQString tag = existingBlock->getTag();
- // FIX: just do a quick check if the tqparent DOCUMENT has this.
+ // FIX: just do a quick check if the parent DOCUMENT has this.
// IF it does, then the lack of an index will force us into
// a search of any child hierarchical codeblocks we may have
// Its not efficient, but works. I don't think speed is a problem
@@ -365,7 +365,7 @@ TextBlock * HierarchicalCodeBlock::findCodeClassFieldTextBlockByTag ( const TQSt
if(cdoc)
return cdoc->findCodeClassFieldTextBlockByTag(tag);
else
- kError()<<" HierarchicalCodeBlock: findCodeClassFieldTextBlockByTag() finds NO tqparent document! Badly constructed textblock?!?"<<endl;
+ kError()<<" HierarchicalCodeBlock: findCodeClassFieldTextBlockByTag() finds NO parent document! Badly constructed textblock?!?"<<endl;
// if we get here, we failed.
return (TextBlock*) NULL;
diff --git a/umbrello/umbrello/kplayerslideraction.cpp b/umbrello/umbrello/kplayerslideraction.cpp
index 5210f8ea..c5efcb65 100644
--- a/umbrello/umbrello/kplayerslideraction.cpp
+++ b/umbrello/umbrello/kplayerslideraction.cpp
@@ -67,8 +67,8 @@ void KPlayerPopupFrame::mouseReleaseEvent (TQMouseEvent* ev)
KPlayerPopupSliderAction::KPlayerPopupSliderAction (const TQString& text,
const TQString& pix, const KShortcut& shortcut, const TQObject* receiver,
- const char* slot, TQObject* tqparent, const char* name)
- : KAction (text, pix, shortcut, tqparent, name)
+ const char* slot, TQObject* parent, const char* name)
+ : KAction (text, pix, shortcut, parent, name)
{
m_frame = new KPlayerPopupFrame;
m_frame -> setFrameStyle (TQFrame::PopupPanel | TQFrame::Raised);
@@ -158,9 +158,9 @@ void KPlayerPopupSliderAction::slotActivated (void)
}
KPlayerSliderAction::KPlayerSliderAction (const TQString& text, const KShortcut& cut,
- const TQObject* receiver, const char* slot, KActionCollection* tqparent, const char* name)
- : KWidgetAction (new KPlayerSlider (Qt::Horizontal, 0, name), text, cut, receiver, slot, tqparent, name)
- //: KAction (text, 0, tqparent, name)
+ const TQObject* receiver, const char* slot, KActionCollection* parent, const char* name)
+ : KWidgetAction (new KPlayerSlider (Qt::Horizontal, 0, name), text, cut, receiver, slot, parent, name)
+ //: KAction (text, 0, parent, name)
{
setAutoSized (true);
connect (slider(), TQT_SIGNAL (changed (int)), receiver, slot);
@@ -213,7 +213,7 @@ void KPlayerSliderAction::unplug (TQWidget* widget)
//Q_ASSERT (isPlugged());
//Q_ASSERT (widget -> inherits ("KToolBar"));
KWidgetAction::unplug (widget);
- if ( ! slider() || ! isPlugged() || TQT_BASE_OBJECT(widget) != TQT_BASE_OBJECT(slider() -> tqparent()) )
+ if ( ! slider() || ! isPlugged() || TQT_BASE_OBJECT(widget) != TQT_BASE_OBJECT(slider() -> parent()) )
return;
//KToolBar* toolbar = (KToolBar*) widget;
disconnect (widget, TQT_SIGNAL (orientationChanged (Qt::Orientation)), this, TQT_SLOT (orientationChanged (Qt::Orientation)));
@@ -264,9 +264,9 @@ void KPlayerSliderAction::orientationChanged (Qt::Orientation orientation)
m_slider -> reparent (0, TQPoint());
}*/
-KPlayerSlider::KPlayerSlider (Qt::Orientation orientation, TQWidget* tqparent, const char* name)
-//CHANGED : TQSlider (orientation, tqparent, name)
- : TQSlider (300, 2200, 400, 1000, orientation, tqparent, name)
+KPlayerSlider::KPlayerSlider (Qt::Orientation orientation, TQWidget* parent, const char* name)
+//CHANGED : TQSlider (orientation, parent, name)
+ : TQSlider (300, 2200, 400, 1000, orientation, parent, name)
{
m_changing_orientation = false;
setTickmarks (TQSlider::Both);
diff --git a/umbrello/umbrello/kplayerslideraction.h b/umbrello/umbrello/kplayerslideraction.h
index ea4d290d..8c0b11ef 100644
--- a/umbrello/umbrello/kplayerslideraction.h
+++ b/umbrello/umbrello/kplayerslideraction.h
@@ -31,7 +31,7 @@ class KPlayerSlider : public TQSlider
public:
/** The KPlayerSlider constructor. Parameters are passed on to TQSlider.
*/
- explicit KPlayerSlider (Qt::Orientation, TQWidget* tqparent = 0, const char* name = 0);
+ explicit KPlayerSlider (Qt::Orientation, TQWidget* parent = 0, const char* name = 0);
/** The KPlayerSlider destructor. Does nothing.
*/
virtual ~KPlayerSlider();
@@ -110,8 +110,8 @@ class KPlayerPopupFrame : public TQFrame
public:
/** The KPlayerPopupFrame constructor. Parameters are passed on to TQFrame.
*/
- KPlayerPopupFrame (TQWidget* tqparent = 0, const char* name = 0)
- : TQFrame (tqparent, name, TQt::WType_Popup) { }
+ KPlayerPopupFrame (TQWidget* parent = 0, const char* name = 0)
+ : TQFrame (parent, name, TQt::WType_Popup) { }
/** The KPlayerPopupFrame destructor. Does nothing.
*/
virtual ~KPlayerPopupFrame() { }
@@ -134,7 +134,7 @@ public:
/** The KPlayerPopupSliderAction constructor. Parameters are passed on to KAction.
*/
KPlayerPopupSliderAction (const TQString& text, const TQString& pix, const KShortcut& shortcut,
- const TQObject* receiver, const char* slot, TQObject* tqparent = 0, const char* name = 0);
+ const TQObject* receiver, const char* slot, TQObject* parent = 0, const char* name = 0);
/** The KPlayerPopupSliderAction destructor. Deletes the KPlayerPopupFrame.
*/
virtual ~KPlayerPopupSliderAction();
@@ -175,7 +175,7 @@ public:
/** The KPlayerSliderAction constructor. Parameters are passed on to KAction.
*/
KPlayerSliderAction (const TQString& text, const KShortcut&, const TQObject* receiver,
- const char* slot, KActionCollection* tqparent = 0, const char* name = 0);
+ const char* slot, KActionCollection* parent = 0, const char* name = 0);
/** The KPlayerSliderAction destructor. Does nothing.
*/
virtual ~KPlayerSliderAction();
diff --git a/umbrello/umbrello/kstartuplogo.cpp b/umbrello/umbrello/kstartuplogo.cpp
index 48df28a8..1839dc06 100644
--- a/umbrello/umbrello/kstartuplogo.cpp
+++ b/umbrello/umbrello/kstartuplogo.cpp
@@ -17,8 +17,8 @@
#include <kstandarddirs.h>
#include <tqtimer.h>
-KStartupLogo::KStartupLogo(TQWidget * tqparent, const char *name)
- : TQWidget(tqparent,name, TQt::WStyle_NoBorder | TQt::WStyle_Customize | TQt::WDestructiveClose )
+KStartupLogo::KStartupLogo(TQWidget * parent, const char *name)
+ : TQWidget(parent,name, TQt::WStyle_NoBorder | TQt::WStyle_Customize | TQt::WDestructiveClose )
,m_bReadyToHide(false) {
//pm.load(locate("appdata", "pics/startlogo.png"));
KStandardDirs * dirs = KGlobal::dirs();
diff --git a/umbrello/umbrello/kstartuplogo.h b/umbrello/umbrello/kstartuplogo.h
index 07770d6c..84302075 100644
--- a/umbrello/umbrello/kstartuplogo.h
+++ b/umbrello/umbrello/kstartuplogo.h
@@ -28,7 +28,7 @@ class KStartupLogo : public TQWidget {
Q_OBJECT
TQ_OBJECT
public:
- KStartupLogo(TQWidget *tqparent=0, const char *name=0);
+ KStartupLogo(TQWidget *parent=0, const char *name=0);
~KStartupLogo();
void setHideEnabled(bool bEnabled);
diff --git a/umbrello/umbrello/linepath.cpp b/umbrello/umbrello/linepath.cpp
index 12f4b6c8..2d23021d 100644
--- a/umbrello/umbrello/linepath.cpp
+++ b/umbrello/umbrello/linepath.cpp
@@ -84,7 +84,7 @@ void LinePath::setAssociation(AssociationWidget * association ) {
createHeadLines();
if( getAssocType() == Uml::at_Coll_Message )
setupParallelLine();
- UMLView * view = (UMLView *)m_pAssociation -> tqparent();
+ UMLView * view = (UMLView *)m_pAssociation -> parent();
connect( view, TQT_SIGNAL( sigColorChanged( Uml::IDType ) ), this, TQT_SLOT( slotLineColorChanged( Uml::IDType ) ) );
connect( view, TQT_SIGNAL( sigLineWidthChanged( Uml::IDType ) ), this, TQT_SLOT( slotLineWidthChanged( Uml::IDType ) ) );
}
@@ -847,7 +847,7 @@ void LinePath::cleanup() {
m_pClearPoly = 0;
m_bHeadCreated = m_bParallelLineCreated = false;
if( m_pAssociation ) {
- UMLView * view = (UMLView *)m_pAssociation -> tqparent();
+ UMLView * view = (UMLView *)m_pAssociation -> parent();
if(view) {
disconnect( view, TQT_SIGNAL( sigColorChanged( Uml::IDType ) ), this, TQT_SLOT( slotLineColorChanged( Uml::IDType ) ) );
disconnect( view, TQT_SIGNAL( sigLineWidthChanged( Uml::IDType ) ), this, TQT_SLOT( slotLineWidthChanged( Uml::IDType ) ) );
diff --git a/umbrello/umbrello/linepath.h b/umbrello/umbrello/linepath.h
index d02714ed..c0343478 100644
--- a/umbrello/umbrello/linepath.h
+++ b/umbrello/umbrello/linepath.h
@@ -169,7 +169,7 @@ public:
* This is needed because the m_pAssociation does not yet
* exist at the time of the LinePath::loadFromXMI call.
* However, this means that the points in the m_LineList
- * do not have a tqparent when they are loaded.
+ * do not have a parent when they are loaded.
* They need to be reparented by calling LinePath::activate()
* once the m_pAssociation exists.
*/
diff --git a/umbrello/umbrello/linkwidget.cpp b/umbrello/umbrello/linkwidget.cpp
index 259d6567..508de933 100644
--- a/umbrello/umbrello/linkwidget.cpp
+++ b/umbrello/umbrello/linkwidget.cpp
@@ -30,7 +30,7 @@ UMLClassifier *LinkWidget::getOperationOwner() {
UMLOperation *op = getOperation();
if (op == NULL)
return NULL;
- return static_cast<UMLClassifier*>(op->tqparent());
+ return static_cast<UMLClassifier*>(op->parent());
}
TQString LinkWidget::getOperationText(UMLView *view /* = NULL */) {
diff --git a/umbrello/umbrello/listpopupmenu.cpp b/umbrello/umbrello/listpopupmenu.cpp
index 548ded25..8eacf57e 100644
--- a/umbrello/umbrello/listpopupmenu.cpp
+++ b/umbrello/umbrello/listpopupmenu.cpp
@@ -37,15 +37,15 @@
#include "objectwidget.h"
//ListPopupMenu for a UMLView (diagram)
-ListPopupMenu::ListPopupMenu(TQWidget *tqparent, Menu_Type type, UMLView * view)
- : KPopupMenu(tqparent) {
+ListPopupMenu::ListPopupMenu(TQWidget *parent, Menu_Type type, UMLView * view)
+ : KPopupMenu(parent) {
init();
setupMenu(type, view);
}
//ListPopupMenu for the tree list view
-ListPopupMenu::ListPopupMenu(TQWidget *tqparent, Uml::ListView_Type type)
- : KPopupMenu(tqparent) {
+ListPopupMenu::ListPopupMenu(TQWidget *parent, Uml::ListView_Type type)
+ : KPopupMenu(parent) {
init();
Menu_Type mt = mt_Undefined;
switch(type)
@@ -205,9 +205,9 @@ ListPopupMenu::ListPopupMenu(TQWidget *tqparent, Uml::ListView_Type type)
}
//ListPopupMenu for a canvas widget
-ListPopupMenu::ListPopupMenu(TQWidget * tqparent, UMLWidget * object,
+ListPopupMenu::ListPopupMenu(TQWidget * parent, UMLWidget * object,
bool multi, bool unique)
- : KPopupMenu(tqparent)
+ : KPopupMenu(parent)
{
init();
//make the right menu for the type
@@ -259,7 +259,7 @@ ListPopupMenu::ListPopupMenu(TQWidget * tqparent, UMLWidget * object,
StateWidget *pState;
ActivityWidget *pActivity;
- UMLView * pView = static_cast<UMLView *>( tqparent );
+ UMLView * pView = static_cast<UMLView *>( parent );
switch(type) {
case Uml::wt_Actor:
diff --git a/umbrello/umbrello/listpopupmenu.h b/umbrello/umbrello/listpopupmenu.h
index 54c7336c..e7030090 100644
--- a/umbrello/umbrello/listpopupmenu.h
+++ b/umbrello/umbrello/listpopupmenu.h
@@ -187,30 +187,30 @@ public:
/**
* Constructs the popup menu for a diagram
*
- * @param tqparent The tqparent to ListPopupMenu.
+ * @param parent The parent to ListPopupMenu.
* @param type The type of menu to display.
* @param view The UMLView in which this ListPopupMenu is going to be displayed
*/
- explicit ListPopupMenu(TQWidget* tqparent, Menu_Type type = mt_Undefined, UMLView* view = 0);
+ explicit ListPopupMenu(TQWidget* parent, Menu_Type type = mt_Undefined, UMLView* view = 0);
/**
* Constructs the popup menu for a list view item.
*
- * @param tqparent The tqparent to ListPopupMenu.
+ * @param parent The parent to ListPopupMenu.
* @param type The type of menu to display.
*/
- ListPopupMenu(TQWidget* tqparent, Uml::ListView_Type type);
+ ListPopupMenu(TQWidget* parent, Uml::ListView_Type type);
/**
* Constructs the popup menu for a canvas widget.
*
- * @param tqparent The tqparent to ListPopupMenu.
+ * @param parent The parent to ListPopupMenu.
* @param object The UMLWidget to represent a menu for.
* @param multi True if multiple items are selected.
* @param unique True if multiple selected items all have
* the same type (e.g. Class, Interface)
*/
- ListPopupMenu(TQWidget* tqparent, UMLWidget* object, bool multi = false, bool unique = false);
+ ListPopupMenu(TQWidget* parent, UMLWidget* object, bool multi = false, bool unique = false);
/**
* Standard deconstructor.
@@ -296,7 +296,7 @@ private:
* Shortcut for commonly used menu initializations.
*
* @param type The Menu_Type for which to set up the menu.
- * @param view The UMLView tqparent of the menu.
+ * @param view The UMLView parent of the menu.
*/
void setupMenu(Menu_Type type, UMLView * view = 0);
diff --git a/umbrello/umbrello/messagewidget.h b/umbrello/umbrello/messagewidget.h
index e1374cd3..9d36922b 100644
--- a/umbrello/umbrello/messagewidget.h
+++ b/umbrello/umbrello/messagewidget.h
@@ -47,7 +47,7 @@ public:
/**
* Constructs a MessageWidget.
*
- * @param view The tqparent to this class.
+ * @param view The parent to this class.
* @param a The role A widget for this message.
* @param b The role B widget for this message.
* @param y The vertical position to display this message.
@@ -62,7 +62,7 @@ public:
/**
* Constructs a MessageWidget.
*
- * @param view The tqparent to this class.
+ * @param view The parent to this class.
* @param sequenceMessageType The Uml::Sequence_Message_Type of this message widget
* @param id The ID to assign (-1 will prompt a new ID.)
*/
diff --git a/umbrello/umbrello/messagewidgetcontroller.h b/umbrello/umbrello/messagewidgetcontroller.h
index 6d13034b..a691f465 100644
--- a/umbrello/umbrello/messagewidgetcontroller.h
+++ b/umbrello/umbrello/messagewidgetcontroller.h
@@ -64,7 +64,7 @@ protected:
/**
* Overriden from UMLWidgetController.
* Saves the values of the widget needed for move/resize.
- * Calls tqparent method and then saves the value of m_unconstrainedPositionY
+ * Calls parent method and then saves the value of m_unconstrainedPositionY
*
* @param me The TQMouseEvent to get the offset from.
*/
diff --git a/umbrello/umbrello/model_utils.cpp b/umbrello/umbrello/model_utils.cpp
index 3f012e08..4131d9b1 100644
--- a/umbrello/umbrello/model_utils.cpp
+++ b/umbrello/umbrello/model_utils.cpp
@@ -130,7 +130,7 @@ UMLObject* findUMLObject(const UMLObjectList& inList,
if (currentObj) {
UMLPackage *pkg = NULL;
if (dynamic_cast<UMLClassifierListItem*>(currentObj)) {
- currentObj = static_cast<UMLObject*>(currentObj->tqparent());
+ currentObj = static_cast<UMLObject*>(currentObj->parent());
}
pkg = dynamic_cast<UMLPackage*>(currentObj);
if (pkg == NULL)
diff --git a/umbrello/umbrello/nodewidget.h b/umbrello/umbrello/nodewidget.h
index c1151212..c06ea759 100644
--- a/umbrello/umbrello/nodewidget.h
+++ b/umbrello/umbrello/nodewidget.h
@@ -31,7 +31,7 @@ public:
/**
* Constructs a NodeWidget.
*
- * @param view The tqparent of this NodeWidget.
+ * @param view The parent of this NodeWidget.
* @param n The UMLNode this will be representing.
*/
NodeWidget(UMLView * view, UMLNode *n );
diff --git a/umbrello/umbrello/notewidget.h b/umbrello/umbrello/notewidget.h
index b14dbe57..1ba65a57 100644
--- a/umbrello/umbrello/notewidget.h
+++ b/umbrello/umbrello/notewidget.h
@@ -41,7 +41,7 @@ public:
/**
* Constructs a NoteWidget.
*
- * @param view The tqparent to this widget.
+ * @param view The parent to this widget.
* @param noteType The NoteWidget::NoteType of this NoteWidget
* @param id The unique id of the widget.
* The default (-1) will prompt a new ID.
diff --git a/umbrello/umbrello/object_factory.cpp b/umbrello/umbrello/object_factory.cpp
index cf49a1e1..327cb54b 100644
--- a/umbrello/umbrello/object_factory.cpp
+++ b/umbrello/umbrello/object_factory.cpp
@@ -176,8 +176,8 @@ UMLObject* createUMLObject(Uml::Object_Type type, const TQString &n,
return o;
}
-UMLAttribute *createAttribute(UMLObject *tqparent, const TQString& name, UMLObject *type) {
- UMLAttribute *attr = new UMLAttribute(tqparent);
+UMLAttribute *createAttribute(UMLObject *parent, const TQString& name, UMLObject *type) {
+ UMLAttribute *attr = new UMLAttribute(parent);
attr->setName(name);
attr->setType(type);
if (g_predefinedId == Uml::id_None)
@@ -185,35 +185,35 @@ UMLAttribute *createAttribute(UMLObject *tqparent, const TQString& name, UMLObje
return attr;
}
-UMLOperation *createOperation(UMLClassifier *tqparent, const TQString& name) {
- UMLOperation *op = new UMLOperation(tqparent, name, g_predefinedId);
+UMLOperation *createOperation(UMLClassifier *parent, const TQString& name) {
+ UMLOperation *op = new UMLOperation(parent, name, g_predefinedId);
return op;
}
-UMLClassifierListItem* createChildObject(UMLClassifier* tqparent, Uml::Object_Type type) {
+UMLClassifierListItem* createChildObject(UMLClassifier* parent, Uml::Object_Type type) {
UMLObject* returnObject = NULL;
switch (type) {
case Uml::ot_Attribute:
case Uml::ot_EntityAttribute: {
- UMLClassifier *c = dynamic_cast<UMLClassifier*>(tqparent);
+ UMLClassifier *c = dynamic_cast<UMLClassifier*>(parent);
if (c && !c->isInterface())
returnObject = c->createAttribute();
break;
}
case Uml::ot_Operation: {
- UMLClassifier *c = dynamic_cast<UMLClassifier*>(tqparent);
+ UMLClassifier *c = dynamic_cast<UMLClassifier*>(parent);
if (c)
returnObject = c->createOperation();
break;
}
case Uml::ot_Template: {
- UMLClassifier *c = dynamic_cast<UMLClassifier*>(tqparent);
+ UMLClassifier *c = dynamic_cast<UMLClassifier*>(parent);
if (c)
returnObject = c->createTemplate();
break;
}
case Uml::ot_EnumLiteral: {
- UMLEnum* umlenum = dynamic_cast<UMLEnum*>(tqparent);
+ UMLEnum* umlenum = dynamic_cast<UMLEnum*>(parent);
if (umlenum) {
returnObject = umlenum->createEnumLiteral();
}
diff --git a/umbrello/umbrello/object_factory.h b/umbrello/umbrello/object_factory.h
index 69338203..4c178ba4 100644
--- a/umbrello/umbrello/object_factory.h
+++ b/umbrello/umbrello/object_factory.h
@@ -31,7 +31,7 @@ namespace Object_Factory {
* @param n A name to give to the object (optional.)
* If not given then an input dialog prompts
* the user to supply a name.
- * @param parentPkg The object's tqparent package.
+ * @param parentPkg The object's parent package.
* @param solicitNewName Ask user for a different name if an object
* of the given name already exists.
* If set to false and the name already exists
@@ -45,18 +45,18 @@ UMLObject* createUMLObject(Uml::Object_Type type,
/**
* Creates an operation, attribute, template, or enum literal
- * for the tqparent classifier.
+ * for the parent classifier.
*
- * @param tqparent The tqparent concept
+ * @param parent The parent concept
* @param type The type to create
* @return Pointer to the UMLClassifierListItem created
*/
-UMLClassifierListItem* createChildObject(UMLClassifier *tqparent, Uml::Object_Type type);
+UMLClassifierListItem* createChildObject(UMLClassifier *parent, Uml::Object_Type type);
-UMLAttribute *createAttribute(UMLObject *tqparent, const TQString& name,
+UMLAttribute *createAttribute(UMLObject *parent, const TQString& name,
UMLObject *type = 0);
-UMLOperation *createOperation(UMLClassifier *tqparent, const TQString& name);
+UMLOperation *createOperation(UMLClassifier *parent, const TQString& name);
/**
* Control whether the createUMLObject() solicits a new unique ID for the
diff --git a/umbrello/umbrello/objectwidget.h b/umbrello/umbrello/objectwidget.h
index fff23f2a..812ea067 100644
--- a/umbrello/umbrello/objectwidget.h
+++ b/umbrello/umbrello/objectwidget.h
@@ -39,7 +39,7 @@ public:
/**
* Creates an ObjectWidget.
*
- * @param view The tqparent to this object.
+ * @param view The parent to this object.
* @param o The object it will be representing.
* @param lid The local id for the object.
*/
diff --git a/umbrello/umbrello/operation.cpp b/umbrello/umbrello/operation.cpp
index 3f62bf05..dce9b41e 100644
--- a/umbrello/umbrello/operation.cpp
+++ b/umbrello/umbrello/operation.cpp
@@ -25,9 +25,9 @@
#include "uniqueid.h"
#include "dialogs/umloperationdialog.h"
-UMLOperation::UMLOperation(const UMLClassifier *tqparent, const TQString& name,
+UMLOperation::UMLOperation(const UMLClassifier *parent, const TQString& name,
Uml::IDType id, Uml::Visibility s, UMLObject *rt)
- : UMLClassifierListItem(tqparent, name, id)
+ : UMLClassifierListItem(parent, name, id)
{
if (rt)
m_returnId = UniqueID::gen();
@@ -39,8 +39,8 @@ UMLOperation::UMLOperation(const UMLClassifier *tqparent, const TQString& name,
m_bConst = false;
}
-UMLOperation::UMLOperation(const UMLClassifier * tqparent)
- : UMLClassifierListItem (tqparent)
+UMLOperation::UMLOperation(const UMLClassifier * parent)
+ : UMLClassifierListItem (parent)
{
m_BaseType = Uml::ot_Operation;
m_bConst = false;
@@ -150,7 +150,7 @@ TQString UMLOperation::toString(Uml::Signature_Type sig) {
} else if (parameterlessOpNeedsParentheses) {
s.append("()");
}
- UMLClassifier *ownParent = static_cast<UMLClassifier*>(tqparent());
+ UMLClassifier *ownParent = static_cast<UMLClassifier*>(parent());
TQString returnType;
UMLClassifier *retType = UMLClassifierListItem::getType();
if (retType) {
@@ -218,8 +218,8 @@ void UMLOperation::copyInto(UMLOperation *rhs) const
UMLObject* UMLOperation::clone() const
{
- //FIXME: The new operation should be slaved to the NEW tqparent not the old.
- UMLOperation *clone = new UMLOperation( static_cast<UMLClassifier*>(tqparent()) );
+ //FIXME: The new operation should be slaved to the NEW parent not the old.
+ UMLOperation *clone = new UMLOperation( static_cast<UMLClassifier*>(parent()) );
copyInto(clone);
return clone;
@@ -243,24 +243,24 @@ bool UMLOperation::isConstructorOperation() {
if (getStereotype() == strConstructor)
return true;
- UMLClassifier * c = static_cast<UMLClassifier*>(this->tqparent());
+ UMLClassifier * c = static_cast<UMLClassifier*>(this->parent());
TQString cName = c->getName();
TQString opName = getName();
// It's a constructor operation if the operation name
- // matches that of the tqparent classifier.
+ // matches that of the parent classifier.
return (cName == opName);
}
bool UMLOperation::isDestructorOperation() {
if (getStereotype() == "destructor")
return true;
- UMLClassifier * c = static_cast<UMLClassifier*>(this->tqparent());
+ UMLClassifier * c = static_cast<UMLClassifier*>(this->parent());
TQString cName = c->getName();
TQString opName = getName();
// Special support for C++ syntax:
// It's a destructor operation if the operation name begins
- // with "~" followed by the name of the tqparent classifier.
+ // with "~" followed by the name of the parent classifier.
if (! opName.startsWith("~"))
return false;
opName.remove( TQRegExp("^~\\s*") );
@@ -279,8 +279,8 @@ bool UMLOperation::getConst() const {
return m_bConst;
}
-bool UMLOperation::showPropertiesDialog(TQWidget* tqparent) {
- UMLOperationDialog dialog(tqparent, this);
+bool UMLOperation::showPropertiesDialog(TQWidget* parent) {
+ UMLOperationDialog dialog(parent, this);
return dialog.exec();
}
diff --git a/umbrello/umbrello/operation.h b/umbrello/umbrello/operation.h
index 12625ac2..a088ef5e 100644
--- a/umbrello/umbrello/operation.h
+++ b/umbrello/umbrello/operation.h
@@ -32,13 +32,13 @@ public:
* umbrello's TQt signalling for object creation.
* If you want to create an Operation use the method in UMLDoc instead.
*
- * @param tqparent The tqparent to this operation.
+ * @param parent The parent to this operation.
* @param name The name of the operation.
* @param id The id of the operation.
* @param s The visibility of the operation.
* @param rt The return type of the operation.
*/
- UMLOperation(const UMLClassifier * tqparent, const TQString& name,
+ UMLOperation(const UMLClassifier * parent, const TQString& name,
Uml::IDType id = Uml::id_None,
Uml::Visibility s = Uml::Visibility::Public,
UMLObject *rt = 0);
@@ -49,9 +49,9 @@ public:
* umbrello's TQt signalling for object creation.
* If you want to create an Operation use the method in UMLDoc instead.
*
- * @param tqparent The tqparent to this operation.
+ * @param parent The parent to this operation.
*/
- UMLOperation(const UMLClassifier * tqparent);
+ UMLOperation(const UMLClassifier * parent);
public:
/**
@@ -157,7 +157,7 @@ public:
/**
* Display the properties configuration dialog for the template.
*/
- bool showPropertiesDialog(TQWidget* tqparent);
+ bool showPropertiesDialog(TQWidget* parent);
/**
* Returns whether this operation is a constructor.
diff --git a/umbrello/umbrello/ownedcodeblock.cpp b/umbrello/umbrello/ownedcodeblock.cpp
index 3b141500..f80fd315 100644
--- a/umbrello/umbrello/ownedcodeblock.cpp
+++ b/umbrello/umbrello/ownedcodeblock.cpp
@@ -34,10 +34,10 @@
// Constructors/Destructors
//
-OwnedCodeBlock::OwnedCodeBlock ( UMLObject * tqparent )
- : TQObject ( (TQObject*)tqparent, "anOwnedCodeBlock" )
+OwnedCodeBlock::OwnedCodeBlock ( UMLObject * parent )
+ : TQObject ( (TQObject*)parent, "anOwnedCodeBlock" )
{
- initFields(tqparent);
+ initFields(parent);
}
OwnedCodeBlock::~OwnedCodeBlock ( ) {
@@ -110,11 +110,11 @@ void OwnedCodeBlock::setAttributesOnNode(TQDomDocument& /*doc*/, TQDomElement& e
*/
void OwnedCodeBlock::setAttributesFromNode ( TQDomElement & elem) {
- // set local attributes, tqparent object first
+ // set local attributes, parent object first
TQString idStr = elem.attribute("parent_id","-1");
Uml::IDType id = STR2ID(idStr);
- // always disconnect from current tqparent
+ // always disconnect from current parent
getParentObject()->disconnect(this);
// now, what is the new object we want to set?
@@ -125,7 +125,7 @@ void OwnedCodeBlock::setAttributesFromNode ( TQDomElement & elem) {
// FIX..one day.
// Ugh. This is UGLY, but we have to do it this way because UMLRoles
// don't go into the document list of UMLobjects, and have the same
- // ID as their tqparent UMLAssociations. So..the drill is then special
+ // ID as their parent UMLAssociations. So..the drill is then special
// for Associations..in that case we need to find out which role will
// serve as the parametger here. The REAL fix, of course, would be to
// treat UMLRoles on a more even footing, but im not sure how that change
@@ -159,13 +159,13 @@ void OwnedCodeBlock::setAttributesFromNode ( TQDomElement & elem) {
}
-void OwnedCodeBlock::initFields(UMLObject * tqparent )
+void OwnedCodeBlock::initFields(UMLObject * parent )
{
- m_parentObject = tqparent;
+ m_parentObject = parent;
// one reason for being: set up the connection between
- // this code block and the tqparent UMLObject..when the tqparent
+ // this code block and the parent UMLObject..when the parent
// signals a change has been made, we automatically update
// ourselves
connect(m_parentObject, TQT_SIGNAL(modified()), this, TQT_SLOT(syncToParent()));
diff --git a/umbrello/umbrello/ownedcodeblock.h b/umbrello/umbrello/ownedcodeblock.h
index 130bd4dd..a911351b 100644
--- a/umbrello/umbrello/ownedcodeblock.h
+++ b/umbrello/umbrello/ownedcodeblock.h
@@ -29,7 +29,7 @@ class UMLObject;
/**
* class OwnedCodeBlock
* Describes any codeblock which is 'owned' by a UMLobject of some sort and should
- * be in sync with that tqparent.
+ * be in sync with that parent.
*/
class OwnedCodeBlock : virtual public TQObject
@@ -44,7 +44,7 @@ public:
/**
* Constructor
*/
- OwnedCodeBlock ( UMLObject * tqparent );
+ OwnedCodeBlock ( UMLObject * parent );
/**
* Empty Destructor
@@ -56,7 +56,7 @@ public:
*/
UMLObject * getParentObject ( );
- // get the tqparent code document of this code block
+ // get the parent code document of this code block
virtual CodeDocument * getParentDocument ( ) = 0;
protected:
@@ -88,7 +88,7 @@ protected:
private:
- void initFields ( UMLObject * tqparent );
+ void initFields ( UMLObject * parent );
UMLObject * m_parentObject;
diff --git a/umbrello/umbrello/ownedhierarchicalcodeblock.cpp b/umbrello/umbrello/ownedhierarchicalcodeblock.cpp
index bb2e4990..078a02b7 100644
--- a/umbrello/umbrello/ownedhierarchicalcodeblock.cpp
+++ b/umbrello/umbrello/ownedhierarchicalcodeblock.cpp
@@ -31,8 +31,8 @@
// Constructors/Destructors
//
-OwnedHierarchicalCodeBlock::OwnedHierarchicalCodeBlock ( UMLObject *tqparent, CodeDocument * doc, const TQString &start, const TQString &end, const TQString &comment)
- : HierarchicalCodeBlock ( doc, start, end, comment), OwnedCodeBlock(tqparent)
+OwnedHierarchicalCodeBlock::OwnedHierarchicalCodeBlock ( UMLObject *parent, CodeDocument * doc, const TQString &start, const TQString &end, const TQString &comment)
+ : HierarchicalCodeBlock ( doc, start, end, comment), OwnedCodeBlock(parent)
{
}
diff --git a/umbrello/umbrello/ownedhierarchicalcodeblock.h b/umbrello/umbrello/ownedhierarchicalcodeblock.h
index 0999b02f..6cbdb983 100644
--- a/umbrello/umbrello/ownedhierarchicalcodeblock.h
+++ b/umbrello/umbrello/ownedhierarchicalcodeblock.h
@@ -39,7 +39,7 @@ public:
/** constructor with TQString so we can create & populate it in
* one step.
*/
- OwnedHierarchicalCodeBlock ( UMLObject * tqparent, CodeDocument * parentDoc, const TQString &start="", const TQString &end="", const TQString &comment="" );
+ OwnedHierarchicalCodeBlock ( UMLObject * parent, CodeDocument * parentDoc, const TQString &start="", const TQString &end="", const TQString &comment="" );
/**
* Empty Destructor
@@ -49,7 +49,7 @@ public:
// Public attributes
//
- // Return the tqparent code document
+ // Return the parent code document
CodeDocument * getParentDocument();
// these next 2 methods should be supplied by inheriting classes
diff --git a/umbrello/umbrello/packagewidget.h b/umbrello/umbrello/packagewidget.h
index c3fa4a8e..3cff4ed6 100644
--- a/umbrello/umbrello/packagewidget.h
+++ b/umbrello/umbrello/packagewidget.h
@@ -33,7 +33,7 @@ public:
/**
* Constructs a PackageWidget.
*
- * @param view The tqparent of this PackageWidget.
+ * @param view The parent of this PackageWidget.
* @param o The UMLObject this will be representing.
*/
PackageWidget(UMLView * view, UMLPackage * o);
diff --git a/umbrello/umbrello/petaltree2uml.cpp b/umbrello/umbrello/petaltree2uml.cpp
index 6bd4086f..8d56a3ec 100644
--- a/umbrello/umbrello/petaltree2uml.cpp
+++ b/umbrello/umbrello/petaltree2uml.cpp
@@ -129,12 +129,12 @@ public:
}
/**
- * Insert the given UMLClassifierListItem at the tqparent Umbrello object.
+ * Insert the given UMLClassifierListItem at the parent Umbrello object.
* Abstract method to be implemented by inheriting classes.
- * NB the tqparent Umbrello object is not included in the ClassifierListReader
+ * NB the parent Umbrello object is not included in the ClassifierListReader
* class - it must be added at inheriting classes.
*
- * @param node The PetalNode which corresponds to the tqparent Umbrello object.
+ * @param node The PetalNode which corresponds to the parent Umbrello object.
* @param o The UMLObject to insert.
*/
virtual void insertAtParent(const PetalNode *node, UMLObject *o) = 0;
@@ -249,7 +249,7 @@ public:
return new UMLAssociation(Uml::at_Generalization);
}
/**
- * Override tqparent implementation: The secondary data is not for the
+ * Override parent implementation: The secondary data is not for the
* UMLAssociation itself but for its role B object.
*/
void setTypeReferences(UMLObject *item,
@@ -282,7 +282,7 @@ public:
return new UMLAssociation(Uml::at_Realization);
}
/**
- * Override tqparent implementation: The secondary data is not for the
+ * Override parent implementation: The secondary data is not for the
* UMLAssociation itself but for its role B object.
*/
void setTypeReferences(UMLObject *item,
@@ -310,7 +310,7 @@ protected:
* @param node Pointer to the PetalNode which may contain a controlled unit
* @param name Name of the current node
* @param id TQUID of the current node
- * @param parentPkg Pointer to the current tqparent UMLPackage.
+ * @param parentPkg Pointer to the current parent UMLPackage.
* @return True if the node actually contained a controlled unit.
*/
bool handleControlledUnit(PetalNode *node, const TQString& name, Uml::IDType id, UMLPackage *parentPkg) {
@@ -455,9 +455,9 @@ bool umbrellify(PetalNode *node, UMLPackage *parentPkg = NULL) {
return true;
}
-Uml::ListView_Type folderType(UMLListViewItem *tqparent) {
+Uml::ListView_Type folderType(UMLListViewItem *parent) {
Uml::ListView_Type type = Uml::lvt_Unknown;
- switch (tqparent->getType()) {
+ switch (parent->getType()) {
case Uml::lvt_Logical_View:
case Uml::lvt_Logical_Folder:
type = Uml::lvt_Logical_Folder;
@@ -488,7 +488,7 @@ Uml::ListView_Type folderType(UMLListViewItem *tqparent) {
* Given a PetalNode for which the mapping to Umbrello is not yet
* implemented umbrellify() is a no-op but also returns true.
*/
-bool umbrellify(PetalNode *node, const TQString& modelsName, UMLListViewItem *tqparent) {
+bool umbrellify(PetalNode *node, const TQString& modelsName, UMLListViewItem *parent) {
if (node == NULL) {
kError() << "umbrellify(" << modelsName << "): node is NULL" << endl;
return false;
@@ -501,13 +501,13 @@ bool umbrellify(PetalNode *node, const TQString& modelsName, UMLListViewItem *tq
UMLListViewItem *item = NULL;
if (objType == "Class_Category") {
- Uml::ListView_Type lvType = folderType(tqparent);
- item = new UMLListViewItem( tqparent, name, lvType, id );
+ Uml::ListView_Type lvType = folderType(parent);
+ item = new UMLListViewItem( parent, name, lvType, id );
} else if (objType == "Class") {
TQString stereotype = clean(node->findAttribute("stereotype").string);
if (stereotype == "Actor") {
UMLActor *act = new UMLActor(name, id);
- item = new UMLListViewItem(tqparent, name, Uml::lvt_Actor, act);
+ item = new UMLListViewItem(parent, name, Uml::lvt_Actor, act);
obj = act;
} else {
kDebug() << "umbrellify(" << name << "): handling of Class stereotype "
@@ -515,16 +515,16 @@ bool umbrellify(PetalNode *node, const TQString& modelsName, UMLListViewItem *tq
}
} else if (objType == "UseCase") {
UMLUseCase *uc = new UMLUseCase(name, id);
- item = new UMLListViewItem(tqparent, name, Uml::lvt_UseCase, uc);
+ item = new UMLListViewItem(parent, name, Uml::lvt_UseCase, uc);
obj = uc;
} else if (objType == "SubSystem") {
UMLComponent *comp = new UMLComponent(name, id);
- item = new UMLListViewItem(tqparent, name, Uml::lvt_Component, comp);
+ item = new UMLListViewItem(parent, name, Uml::lvt_Component, comp);
obj = comp;
} else if (objType == "Processor" || objType == "Device") {
UMLNode *un = new UMLNode(name, id);
un->setStereotype(objType.lower());
- item = new UMLListViewItem(tqparent, name, Uml::lvt_Node, un);
+ item = new UMLListViewItem(parent, name, Uml::lvt_Node, un);
obj = un;
} else {
kDebug() << "umbrellify: object type " << objType
diff --git a/umbrello/umbrello/plugin.cpp b/umbrello/umbrello/plugin.cpp
index 72dc3169..a682db06 100644
--- a/umbrello/umbrello/plugin.cpp
+++ b/umbrello/umbrello/plugin.cpp
@@ -28,10 +28,10 @@
using namespace Umbrello;
-Plugin::Plugin(TQObject *tqparent,
+Plugin::Plugin(TQObject *parent,
const char *name,
const TQStringList & /* args */) :
- TQObject(tqparent, name),
+ TQObject(parent, name),
Configurable(),
_ref(0),
_instanceName(name),
diff --git a/umbrello/umbrello/plugin.h b/umbrello/umbrello/plugin.h
index e566c5cc..1fa4d7f4 100644
--- a/umbrello/umbrello/plugin.h
+++ b/umbrello/umbrello/plugin.h
@@ -81,7 +81,7 @@ class PluginLoader;
* only available within the scope of the shared library, the configuration
* records must be set in the constructor of the derived plugin class. However,
* because the construction name is passed to this constructor (as are the
- * tqparent object and args), we can simply capture the name when the object
+ * parent object and args), we can simply capture the name when the object
* is constructed.
*/
class Plugin :
@@ -113,7 +113,7 @@ public:
protected:
/** Construct a plugin */
- Plugin(TQObject *tqparent, const char *name, const TQStringList &args);
+ Plugin(TQObject *parent, const char *name, const TQStringList &args);
/** Can be reimplemented to define plugin specific startup behavior */
virtual bool onInit();
diff --git a/umbrello/umbrello/refactoring/refactoringassistant.cpp b/umbrello/umbrello/refactoring/refactoringassistant.cpp
index 3c0cb32c..1986cfa3 100644
--- a/umbrello/umbrello/refactoring/refactoringassistant.cpp
+++ b/umbrello/umbrello/refactoring/refactoringassistant.cpp
@@ -35,8 +35,8 @@
using std::type_info;
-RefactoringAssistant::RefactoringAssistant( UMLDoc *doc, UMLClassifier *obj, TQWidget *tqparent, const char *name ):
- KListView( tqparent, name ), m_doc( doc )
+RefactoringAssistant::RefactoringAssistant( UMLDoc *doc, UMLClassifier *obj, TQWidget *parent, const char *name ):
+ KListView( parent, name ), m_doc( doc )
{
loadPixmaps();
@@ -159,7 +159,7 @@ void RefactoringAssistant::umlObjectModified( const UMLObject *obj )
void RefactoringAssistant::operationAdded( UMLClassifierListItem *o )
{
UMLOperation *op = static_cast<UMLOperation*>(o);
- UMLClassifier *c = dynamic_cast<UMLClassifier*>(op->tqparent());
+ UMLClassifier *c = dynamic_cast<UMLClassifier*>(op->parent());
if(!c)
{
kWarning() << "RefactoringAssistant::operationAdded(" << op->getName()
@@ -201,7 +201,7 @@ void RefactoringAssistant::operationRemoved( UMLClassifierListItem *o )
void RefactoringAssistant::attributeAdded( UMLClassifierListItem *a )
{
UMLAttribute *att = static_cast<UMLAttribute*>(a);
- UMLClassifier *c = dynamic_cast<UMLClassifier*>(att->tqparent());
+ UMLClassifier *c = dynamic_cast<UMLClassifier*>(att->parent());
if(!c)
{
kWarning() << "RefactoringAssistant::attributeAdded(" << att->getName()
@@ -456,12 +456,12 @@ void RefactoringAssistant::createAttribute()
}
-void RefactoringAssistant::addClassifier( UMLClassifier *classifier, TQListViewItem *tqparent, bool addSuper, bool addSub, bool recurse)
+void RefactoringAssistant::addClassifier( UMLClassifier *classifier, TQListViewItem *parent, bool addSuper, bool addSub, bool recurse)
{
TQListViewItem *classifierItem, *item;
- if( tqparent )
+ if( parent )
{
- classifierItem = tqparent;
+ classifierItem = parent;
}
else
{
@@ -566,7 +566,7 @@ bool RefactoringAssistant::acceptDrag(TQDropEvent *event) const
break;
}
if(!movingItem || !parentItem)
- { kDebug()<<"moving/tqparent items not found - can't accept drag!"<<endl;
+ { kDebug()<<"moving/parent items not found - can't accept drag!"<<endl;
return false;
}
@@ -583,18 +583,18 @@ bool RefactoringAssistant::acceptDrag(TQDropEvent *event) const
return false;
}
- kDebug()<<"tqparent item is "<<parentItem->text(0)<<endl;
+ kDebug()<<"parent item is "<<parentItem->text(0)<<endl;
UMLObject *parentObject = me->findUMLObject(parentItem);
if( parentObject && dynamic_cast<UMLClassifier*>(parentObject) )
{
//droping to a classifier, ok
}
else
- {//tqparent is not a classifier, so maybe it's a folder.. check types
+ {//parent is not a classifier, so maybe it's a folder.. check types
if( (parentItem->text(1) == "operations" && t == Uml::ot_Operation)
|| (parentItem->text(1) == "attributes" && t == Uml::ot_Attribute))
{
- parentObject = me->findUMLObject( parentItem->tqparent() );
+ parentObject = me->findUMLObject( parentItem->parent() );
}
else
{
@@ -637,11 +637,11 @@ void RefactoringAssistant::movableDropEvent (TQListViewItem* parentItem, TQListV
if ((parentItem->text(1) == "operations" && t == Uml::ot_Operation)
|| (parentItem->text(1) == "attributes" && t == Uml::ot_Attribute))
{
- newClassifier = dynamic_cast<UMLClassifier*>( findUMLObject( parentItem->tqparent() ) );
+ newClassifier = dynamic_cast<UMLClassifier*>( findUMLObject( parentItem->parent() ) );
}
if(!newClassifier)
{
- kWarning()<<"New tqparent of object is not a Classifier - Drop had already been accepted - check!"<<endl;
+ kWarning()<<"New parent of object is not a Classifier - Drop had already been accepted - check!"<<endl;
return;
}
}
@@ -656,7 +656,7 @@ void RefactoringAssistant::movableDropEvent (TQListViewItem* parentItem, TQListV
KMessageBox::error(this, msg, i18n("Operation Name Invalid"), false);
return;
}
- UMLClassifier *oldClassifier = dynamic_cast<UMLClassifier*>(op->tqparent());
+ UMLClassifier *oldClassifier = dynamic_cast<UMLClassifier*>(op->parent());
if(oldClassifier)
oldClassifier->removeOperation( op );
newClassifier->addOperation( op );
diff --git a/umbrello/umbrello/refactoring/refactoringassistant.h b/umbrello/umbrello/refactoring/refactoringassistant.h
index f69536ad..7acec605 100644
--- a/umbrello/umbrello/refactoring/refactoringassistant.h
+++ b/umbrello/umbrello/refactoring/refactoringassistant.h
@@ -35,7 +35,7 @@ class RefactoringAssistant : public KListView
public:
typedef std::map<TQListViewItem*, UMLObject*> UMLObjectMap;
- explicit RefactoringAssistant( UMLDoc *doc, UMLClassifier *obj = 0, TQWidget *tqparent = 0, const char *name = 0 );
+ explicit RefactoringAssistant( UMLDoc *doc, UMLClassifier *obj = 0, TQWidget *parent = 0, const char *name = 0 );
virtual ~RefactoringAssistant();
void refactor( UMLClassifier *obj );
@@ -72,10 +72,10 @@ protected:
UMLObject* findUMLObject( const TQListViewItem* );
TQListViewItem* findListViewItem( const UMLObject *obj );
void editProperties( UMLObject *obj );
- void addClassifier( UMLClassifier *classifier, TQListViewItem *tqparent = 0, bool addSuper = true, bool addSub = true, bool recurse = false );
+ void addClassifier( UMLClassifier *classifier, TQListViewItem *parent = 0, bool addSuper = true, bool addSub = true, bool recurse = false );
void loadPixmaps();
virtual bool acceptDrag(TQDropEvent *event) const;
- virtual void movableDropEvent (TQListViewItem* tqparent, TQListViewItem* afterme);
+ virtual void movableDropEvent (TQListViewItem* parent, TQListViewItem* afterme);
void setVisibilityIcon( TQListViewItem *item , const UMLObject *obj );
UMLClassifier *m_umlObject;
UMLDoc *m_doc;
diff --git a/umbrello/umbrello/statewidget.h b/umbrello/umbrello/statewidget.h
index 84471f10..eabe0670 100644
--- a/umbrello/umbrello/statewidget.h
+++ b/umbrello/umbrello/statewidget.h
@@ -51,7 +51,7 @@ public:
/**
* Creates a State widget.
*
- * @param view The tqparent of the widget.
+ * @param view The parent of the widget.
* @param stateType The type of state.
* @param id The ID to assign (-1 will prompt a new ID.)
*/
diff --git a/umbrello/umbrello/stereotype.cpp b/umbrello/umbrello/stereotype.cpp
index e77f6c03..c3b912f4 100644
--- a/umbrello/umbrello/stereotype.cpp
+++ b/umbrello/umbrello/stereotype.cpp
@@ -71,9 +71,9 @@ void UMLStereotype::saveToXMI(TQDomDocument& qDoc, TQDomElement& qElement) {
qElement.appendChild( stereotypeElement );
}
-bool UMLStereotype::showPropertiesDialog(TQWidget* tqparent) {
+bool UMLStereotype::showPropertiesDialog(TQWidget* parent) {
bool ok;
- TQString name = KInputDialog::getText(i18n("Stereotype"), i18n("Enter name:"), getName(),&ok, tqparent);
+ TQString name = KInputDialog::getText(i18n("Stereotype"), i18n("Enter name:"), getName(),&ok, parent);
if (ok) {
setName(name);
}
diff --git a/umbrello/umbrello/stereotype.h b/umbrello/umbrello/stereotype.h
index e5e593cc..a727fed8 100644
--- a/umbrello/umbrello/stereotype.h
+++ b/umbrello/umbrello/stereotype.h
@@ -85,7 +85,7 @@ public:
* Display the properties configuration dialog for the stereotype
* (just a line edit).
*/
- bool showPropertiesDialog(TQWidget* tqparent);
+ bool showPropertiesDialog(TQWidget* parent);
protected:
/**
diff --git a/umbrello/umbrello/template.cpp b/umbrello/umbrello/template.cpp
index 615e12de..f02f4426 100644
--- a/umbrello/umbrello/template.cpp
+++ b/umbrello/umbrello/template.cpp
@@ -21,15 +21,15 @@
#include "umldoc.h"
#include "dialogs/umltemplatedialog.h"
-UMLTemplate::UMLTemplate(const UMLObject *tqparent, const TQString& name,
+UMLTemplate::UMLTemplate(const UMLObject *parent, const TQString& name,
Uml::IDType id, const TQString& type)
- : UMLClassifierListItem( tqparent, name, id ) {
+ : UMLClassifierListItem( parent, name, id ) {
setTypeName( type );
m_BaseType = Uml::ot_Template;
}
-UMLTemplate::UMLTemplate(const UMLObject *tqparent)
- : UMLClassifierListItem( tqparent ) {
+UMLTemplate::UMLTemplate(const UMLObject *parent)
+ : UMLClassifierListItem( parent ) {
m_BaseType = Uml::ot_Template;
}
@@ -69,7 +69,7 @@ void UMLTemplate::copyInto(UMLTemplate *rhs) const
UMLObject* UMLTemplate::clone() const
{
- UMLTemplate *clone = new UMLTemplate( (UMLTemplate*) tqparent());
+ UMLTemplate *clone = new UMLTemplate( (UMLTemplate*) parent());
copyInto(clone);
return clone;
@@ -89,7 +89,7 @@ bool UMLTemplate::load(TQDomElement& element) {
return true;
}
-bool UMLTemplate::showPropertiesDialog(TQWidget* tqparent) {
- UMLTemplateDialog dialog(tqparent, this);
+bool UMLTemplate::showPropertiesDialog(TQWidget* parent) {
+ UMLTemplateDialog dialog(parent, this);
return dialog.exec();
}
diff --git a/umbrello/umbrello/template.h b/umbrello/umbrello/template.h
index e7558010..6b471207 100644
--- a/umbrello/umbrello/template.h
+++ b/umbrello/umbrello/template.h
@@ -30,20 +30,20 @@ public:
/**
* Sets up a template.
*
- * @param tqparent The tqparent of this UMLTemplate (i.e. its concept).
+ * @param parent The parent of this UMLTemplate (i.e. its concept).
* @param name The name of this UMLTemplate.
* @param id The unique id given to this UMLTemplate.
* @param type The type of this UMLTemplate.
*/
- UMLTemplate(const UMLObject *tqparent, const TQString& name,
+ UMLTemplate(const UMLObject *parent, const TQString& name,
Uml::IDType id = Uml::id_None, const TQString& type = "class");
/**
* Sets up a template.
*
- * @param tqparent The tqparent of this UMLTemplate (i.e. its concept).
+ * @param parent The parent of this UMLTemplate (i.e. its concept).
*/
- UMLTemplate(const UMLObject *tqparent);
+ UMLTemplate(const UMLObject *parent);
/**
* Overloaded '==' operator
@@ -89,7 +89,7 @@ public:
*
* @return Success status.
*/
- bool showPropertiesDialog(TQWidget* tqparent);
+ bool showPropertiesDialog(TQWidget* parent);
/**
* Writes the <UML:TemplateParameter> XMI element.
diff --git a/umbrello/umbrello/textblock.cpp b/umbrello/umbrello/textblock.cpp
index 1a66c113..6ae42c52 100644
--- a/umbrello/umbrello/textblock.cpp
+++ b/umbrello/umbrello/textblock.cpp
@@ -30,10 +30,10 @@
// Constructors/Destructors
//
-TextBlock::TextBlock ( CodeDocument * tqparent, const TQString & text )
- : TQObject ( (TQObject *)tqparent, "textBlock")
+TextBlock::TextBlock ( CodeDocument * parent, const TQString & text )
+ : TQObject ( (TQObject *)parent, "textBlock")
{
- initFields(tqparent);
+ initFields(parent);
setText(text);
}
@@ -49,7 +49,7 @@ TextBlock::~TextBlock ( ) { }
/**
- * Set the value of the tqparent code document
+ * Set the value of the parent code document
* @param new_var the new value of m_parentDocument
*/
void TextBlock::setParentDocument ( CodeDocument * new_var ) {
@@ -137,7 +137,7 @@ void TextBlock::setIndentationLevel ( int level ) {
}
/** Get how many times to indent this text block.
- * The amount of each indenatation is determined from the tqparent
+ * The amount of each indenatation is determined from the parent
* codedocument codegeneration policy.
*/
int TextBlock::getIndentationLevel ( ) {
@@ -308,10 +308,10 @@ TQString TextBlock::toString ( )
return "";
}
-void TextBlock::initFields ( CodeDocument * tqparent ) {
+void TextBlock::initFields ( CodeDocument * parent ) {
m_canDelete = true;
m_writeOutText = true;
- m_parentDocument = tqparent;
+ m_parentDocument = parent;
m_text = "";
m_tag = "";
m_indentationLevel = 0;
diff --git a/umbrello/umbrello/textblock.h b/umbrello/umbrello/textblock.h
index 3e470c7a..9386f3d6 100644
--- a/umbrello/umbrello/textblock.h
+++ b/umbrello/umbrello/textblock.h
@@ -42,7 +42,7 @@ public:
/**
* Constructors
*/
- explicit TextBlock ( CodeDocument * tqparent, const TQString & text = "");
+ explicit TextBlock ( CodeDocument * parent, const TQString & text = "");
// destructor
~TextBlock ( );
@@ -108,13 +108,13 @@ public:
bool getWriteOutText ( );
/** Set how many times to indent this text block.
- * The amount of each indenatation is determined from the tqparent
+ * The amount of each indenatation is determined from the parent
* codedocument codegeneration policy.
*/
void setIndentationLevel ( int level );
/** Get how many times to indent this text block.
- * The amount of each indenatation is determined from the tqparent
+ * The amount of each indenatation is determined from the parent
* codedocument codegeneration policy.
*/
int getIndentationLevel ( );
diff --git a/umbrello/umbrello/toolbarstate.h b/umbrello/umbrello/toolbarstate.h
index 5bcb12bf..976a4a90 100644
--- a/umbrello/umbrello/toolbarstate.h
+++ b/umbrello/umbrello/toolbarstate.h
@@ -163,7 +163,7 @@ protected:
/**
* Creates a new ToolBarState.
- * UMLView is set as tqparent of this TQObject, and name is left empty.
+ * UMLView is set as parent of this TQObject, and name is left empty.
* Protected to avoid classes other than derived to create objects of this
* class.
*
diff --git a/umbrello/umbrello/uml.h b/umbrello/umbrello/uml.h
index 93cd981e..b2f9181d 100644
--- a/umbrello/umbrello/uml.h
+++ b/umbrello/umbrello/uml.h
@@ -82,7 +82,7 @@ public:
/**
* Constructor. Calls all init functions to create the application.
*/
- UMLApp(TQWidget* tqparent=0, const char* name=0);
+ UMLApp(TQWidget* parent=0, const char* name=0);
/**
* Standard deconstructor.
@@ -247,7 +247,7 @@ public:
void setDiagramMenuItemsState(bool bState);
/**
- * Returns the widget used as the tqparent for UMLViews.
+ * Returns the widget used as the parent for UMLViews.
* @return The main view widget.
*/
TQWidget* getMainViewWidget();
@@ -984,13 +984,13 @@ private:
bool m_loading;
/**
- * Shows, and is tqparent of, all the UMLViews (diagrams)
+ * Shows, and is parent of, all the UMLViews (diagrams)
* if tabbed diagrams are not enabled.
*/
TQWidgetStack* m_viewStack;
/**
- * Shows, and is tqparent of, all the UMLViews (diagrams)
+ * Shows, and is parent of, all the UMLViews (diagrams)
* if tabbed diagrams are enabled.
*/
KTabWidget* m_tabWidget;
diff --git a/umbrello/umbrello/umldoc.cpp b/umbrello/umbrello/umldoc.cpp
index 4f692cba..6abc0f8e 100644
--- a/umbrello/umbrello/umldoc.cpp
+++ b/umbrello/umbrello/umldoc.cpp
@@ -733,7 +733,7 @@ bool UMLDoc::addUMLObject(UMLObject* object) {
if (pkg == NULL) {
pkg = currentRoot();
kDebug() << "UMLDoc::addUMLObject(" << object->getName()
- << "): no tqparent package set, assuming " << pkg->getName() << endl;
+ << "): no parent package set, assuming " << pkg->getName() << endl;
object->setUMLPackage( pkg );
}
return pkg->addObject(object);
@@ -759,7 +759,7 @@ void UMLDoc::slotRemoveUMLObject(UMLObject* object) {
UMLPackage *pkg = object->getUMLPackage();
if (pkg == NULL) {
kError() << "UMLDoc::slotRemoveUMLObject(" << object->getName()
- << "): tqparent package is not set !" << endl;
+ << "): parent package is not set !" << endl;
return;
}
pkg->removeObject(object);
@@ -772,7 +772,7 @@ bool UMLDoc::isUnique(const TQString &name)
UMLListViewItem *parentItem = 0;
// check for current item, if its a package, then we do a check on that
- // otherwise, if current item exists, find its tqparent and check if thats
+ // otherwise, if current item exists, find its parent and check if thats
// a package..
if(currentItem)
{
@@ -780,7 +780,7 @@ bool UMLDoc::isUnique(const TQString &name)
// do check now
if (Model_Utils::typeIsContainer(currentItem->getType()))
return isUnique (name, (UMLPackage*) currentItem->getUMLObject());
- parentItem = (UMLListViewItem*)currentItem->tqparent();
+ parentItem = (UMLListViewItem*)currentItem->parent();
}
// item is in a package so do check only in that
@@ -791,7 +791,7 @@ bool UMLDoc::isUnique(const TQString &name)
kError() << "UMLDoc::isUnique(" << name << "): Not currently in a package"
<< endl;
- /* Check against all objects that _don't_ have a tqparent package.
+ /* Check against all objects that _don't_ have a parent package.
for (UMLObjectListIt oit(m_objectList); oit.current(); ++oit) {
UMLObject *obj = oit.current();
if (obj->getUMLPackage() == NULL && obj->getName() == name)
@@ -810,7 +810,7 @@ bool UMLDoc::isUnique(const TQString &name, UMLPackage *package)
// Not currently in a package: ERROR
kError() << "UMLDoc::isUnique(2)(" << name << "): Not currently in a package"
<< endl;
- /* Check against all objects that _don't_ have a tqparent package.
+ /* Check against all objects that _don't_ have a parent package.
for (UMLObjectListIt oit(m_objectList); oit.current(); ++oit) {
UMLObject *obj = oit.current();
if (obj->getUMLPackage() == NULL && obj->getName() == name)
@@ -848,7 +848,7 @@ void UMLDoc::removeAssociation (UMLAssociation * assoc, bool doSetModified /*=tr
UMLPackage *pkg = assoc->getUMLPackage();
if (pkg == NULL) {
kError() << "UMLDoc::removeAssociation(" << assoc->getName()
- << "): tqparent package is not set !" << endl;
+ << "): parent package is not set !" << endl;
return;
}
pkg->removeObject(assoc);
@@ -917,7 +917,7 @@ void UMLDoc::addAssociation(UMLAssociation *Assoc)
UMLPackage *pkg = Assoc->getUMLPackage();
if (pkg == NULL) {
kError() << "UMLDoc::addAssociation(" << Assoc->getName()
- << "): tqparent package is not set !" << endl;
+ << "): parent package is not set !" << endl;
return;
}
pkg->addObject(Assoc);
@@ -1048,9 +1048,9 @@ void UMLDoc::renameUMLObject(UMLObject *o) {
void UMLDoc::renameChildUMLObject(UMLObject *o) {
bool ok = false;
- UMLClassifier* p = dynamic_cast<UMLClassifier *>(o->tqparent());
+ UMLClassifier* p = dynamic_cast<UMLClassifier *>(o->parent());
if(!p) {
- kDebug() << "Can't create object, no tqparent found" << endl;
+ kDebug() << "Can't create object, no parent found" << endl;
return;
}
@@ -1134,25 +1134,25 @@ void UMLDoc::removeUMLObject(UMLObject* umlobject) {
umlobject->setUMLStereotype(NULL); // triggers possible cleanup of UMLStereotype
if (dynamic_cast<UMLClassifierListItem*>(umlobject)) {
- UMLClassifier* tqparent = dynamic_cast<UMLClassifier*>(umlobject->tqparent());
- if (tqparent == NULL) {
- kError() << "UMLDoc::removeUMLObject: tqparent of umlobject is NULL"
+ UMLClassifier* parent = dynamic_cast<UMLClassifier*>(umlobject->parent());
+ if (parent == NULL) {
+ kError() << "UMLDoc::removeUMLObject: parent of umlobject is NULL"
<< endl;
return;
}
if (type == ot_Operation) {
- tqparent->removeOperation(static_cast<UMLOperation*>(umlobject));
+ parent->removeOperation(static_cast<UMLOperation*>(umlobject));
} else if (type == ot_EnumLiteral) {
- UMLEnum *e = static_cast<UMLEnum*>(tqparent);
+ UMLEnum *e = static_cast<UMLEnum*>(parent);
e->removeEnumLiteral(static_cast<UMLEnumLiteral*>(umlobject));
} else if (type == ot_EntityAttribute) {
- UMLEntity *ent = static_cast<UMLEntity*>(tqparent);
+ UMLEntity *ent = static_cast<UMLEntity*>(parent);
ent->removeEntityAttribute(static_cast<UMLClassifierListItem*>(umlobject));
} else {
- UMLClassifier* pClass = dynamic_cast<UMLClassifier*>(tqparent);
+ UMLClassifier* pClass = dynamic_cast<UMLClassifier*>(parent);
if (pClass == NULL) {
- kError() << "UMLDoc::removeUMLObject: tqparent of umlobject has "
- << "unexpected type " << tqparent->getBaseType() << endl;
+ kError() << "UMLDoc::removeUMLObject: parent of umlobject has "
+ << "unexpected type " << parent->getBaseType() << endl;
return;
}
if (type == ot_Attribute) {
@@ -1174,7 +1174,7 @@ void UMLDoc::removeUMLObject(UMLObject* umlobject) {
pkg->removeObject(umlobject);
} else {
kError() << "UMLDoc::removeUMLObject(" << umlobject->getName()
- << "): tqparent package is not set !" << endl;
+ << "): parent package is not set !" << endl;
}
}
emit sigObjectRemoved(umlobject);
@@ -1693,7 +1693,7 @@ bool UMLDoc::loadUMLObjectsFromXMI(TQDomElement& element) {
continue;
}
Uml::Object_Type ot = pObject->getBaseType();
- // Set the tqparent root folder.
+ // Set the parent root folder.
UMLPackage *pkg = NULL;
if (ot == Uml::ot_Datatype) {
pkg = m_datatypeRoot;
@@ -1839,7 +1839,7 @@ bool UMLDoc::loadDiagramsFromXMI( TQDomNode & node ) {
return false;
}
// Put diagram in default predefined folder.
- // @todo pass in the tqparent folder - it might be a user defined one.
+ // @todo pass in the parent folder - it might be a user defined one.
Uml::Model_Type mt = Model_Utils::convert_DT_MT(pView->getType());
pView->setFolder(m_root[mt]);
pView -> hide();
diff --git a/umbrello/umbrello/umldoc.h b/umbrello/umbrello/umldoc.h
index 60154fa9..5ee9cc39 100644
--- a/umbrello/umbrello/umldoc.h
+++ b/umbrello/umbrello/umldoc.h
@@ -213,7 +213,7 @@ public:
bool isUnique(const TQString &name, UMLPackage *package);
/**
- * Finds or creates a stereotype for the tqparent object.
+ * Finds or creates a stereotype for the parent object.
*/
UMLStereotype* findOrCreateStereotype(const TQString &name);
diff --git a/umbrello/umbrello/umllistview.cpp b/umbrello/umbrello/umllistview.cpp
index 992e0f7f..6fe7b84f 100644
--- a/umbrello/umbrello/umllistview.cpp
+++ b/umbrello/umbrello/umllistview.cpp
@@ -66,7 +66,7 @@
class LVToolTip : public TQToolTip
{
public:
- LVToolTip (TQWidget* tqparent) : TQToolTip (tqparent) {}
+ LVToolTip (TQWidget* parent) : TQToolTip (parent) {}
virtual ~LVToolTip () {}
protected:
/**
@@ -93,8 +93,8 @@ protected:
#endif
-UMLListView::UMLListView(TQWidget *tqparent, const char *name)
- : KListView(tqparent,name), m_pMenu(0), m_doc(UMLApp::app()->getDocument())
+UMLListView::UMLListView(TQWidget *parent, const char *name)
+ : KListView(parent,name), m_pMenu(0), m_doc(UMLApp::app()->getDocument())
{
loadPixmaps();
@@ -232,7 +232,7 @@ void UMLListView::keyPressEvent(TQKeyEvent *ke) {
deleteItem(dynamic_cast<UMLListViewItem*>(item));
}
} else {
- TQListView::keyPressEvent(ke); // let tqparent handle it
+ TQListView::keyPressEvent(ke); // let parent handle it
}
}
}
@@ -601,7 +601,7 @@ UMLListViewItem* UMLListView::determineParentItem(UMLObject* object) const {
UMLListViewItem* pkgItem = findUMLObject(pkg);
if (pkgItem == NULL)
kError() << "UMLListView::determineParentItem: could not find "
- << "tqparent package " << pkg->getName() << endl;
+ << "parent package " << pkg->getName() << endl;
else
parentItem = pkgItem;
} else if ((lvt == Uml::lvt_UseCase_Folder &&
@@ -764,22 +764,22 @@ void UMLListView::slotObjectChanged() {
}
void UMLListView::childObjectAdded(UMLClassifierListItem* obj) {
- UMLClassifier *tqparent = const_cast<UMLClassifier*>(dynamic_cast<const UMLClassifier*>(sender()));
- childObjectAdded(obj, tqparent);
+ UMLClassifier *parent = const_cast<UMLClassifier*>(dynamic_cast<const UMLClassifier*>(sender()));
+ childObjectAdded(obj, parent);
}
-void UMLListView::childObjectAdded(UMLClassifierListItem* child, UMLClassifier* tqparent) {
+void UMLListView::childObjectAdded(UMLClassifierListItem* child, UMLClassifier* parent) {
if (m_bCreatingChildObject)
return;
const TQString text = child->toString(Uml::st_SigNoVis);
UMLListViewItem *childItem = NULL;
- UMLListViewItem *parentItem = findUMLObject(tqparent);
+ UMLListViewItem *parentItem = findUMLObject(parent);
if (parentItem == NULL) {
kDebug() << "UMLListView::childObjectAdded(" << child->getName()
- << "): tqparent " << tqparent->getName()
+ << "): parent " << parent->getName()
<< " does not yet exist, creating it now." << endl;
- const Uml::ListView_Type lvt = Model_Utils::convert_OT_LVT(tqparent);
- parentItem = new UMLListViewItem(m_lv[Uml::mt_Logical], tqparent->getName(), lvt, tqparent);
+ const Uml::ListView_Type lvt = Model_Utils::convert_OT_LVT(parent);
+ parentItem = new UMLListViewItem(m_lv[Uml::mt_Logical], parent->getName(), lvt, parent);
} else {
childItem = parentItem->findChildObject(child);
}
@@ -798,11 +798,11 @@ void UMLListView::childObjectAdded(UMLClassifierListItem* child, UMLClassifier*
}
void UMLListView::childObjectRemoved(UMLClassifierListItem* obj) {
- UMLClassifier *tqparent = const_cast<UMLClassifier*>(dynamic_cast<const UMLClassifier*>(sender()));
- UMLListViewItem *parentItem = findUMLObject(tqparent);
+ UMLClassifier *parent = const_cast<UMLClassifier*>(dynamic_cast<const UMLClassifier*>(sender()));
+ UMLListViewItem *parentItem = findUMLObject(parent);
if (parentItem == NULL) {
kError() << "UMLListView::childObjectRemoved(" << obj->getName()
- << "): cannot find tqparent UMLListViewItem" << endl;
+ << "): cannot find parent UMLListViewItem" << endl;
return;
}
parentItem->deleteChildItem(obj);
@@ -1065,7 +1065,7 @@ void UMLListView::contentsMouseDoubleClickEvent(TQMouseEvent * me) {
Uml::Object_Type type = object -> getBaseType();
int page = ClassPropDlg::page_gen;
if(type == Uml::ot_Attribute || type == Uml::ot_Operation)
- object = (UMLObject *)object -> tqparent();
+ object = (UMLObject *)object -> parent();
//set what page to show
if(type == Uml::ot_Attribute)
page = ClassPropDlg::page_att;
@@ -1222,12 +1222,12 @@ bool UMLListView::acceptDrag(TQDropEvent* event) const {
return accept;
}
-void UMLListView::addAtContainer(UMLListViewItem *item, UMLListViewItem *tqparent) {
+void UMLListView::addAtContainer(UMLListViewItem *item, UMLListViewItem *parent) {
UMLCanvasObject *o = static_cast<UMLCanvasObject*>(item->getUMLObject());
if (o == NULL) {
kDebug() << "UMLListView::addAtContainer(" << item->getText()
<< "): item's UMLObject is NULL" << endl;
- } else if (Model_Utils::typeIsContainer(tqparent->getType())) {
+ } else if (Model_Utils::typeIsContainer(parent->getType())) {
/**** TBC: Do this here?
If yes then remove that logic at the callers
and rename this method to moveAtContainer()
@@ -1235,12 +1235,12 @@ void UMLListView::addAtContainer(UMLListViewItem *item, UMLListViewItem *tqparen
if (oldPkg)
oldPkg->removeObject(o);
*********/
- UMLPackage *pkg = static_cast<UMLPackage*>(tqparent->getUMLObject());
+ UMLPackage *pkg = static_cast<UMLPackage*>(parent->getUMLObject());
o->setUMLPackage(pkg);
pkg->addObject(o);
} else {
kError() << "UMLListView::addAtContainer(" << item->getText()
- << "): tqparent type is " << tqparent->getType() << endl;
+ << "): parent type is " << parent->getType() << endl;
}
UMLView *currentView = UMLApp::app()->getCurrentView();
if (currentView)
@@ -1256,7 +1256,7 @@ UMLListViewItem * UMLListView::moveObject(Uml::IDType srcId, Uml::ListView_Type
return NULL;
UMLObject *newParentObj = NULL;
- // Remove the source object at the old tqparent package.
+ // Remove the source object at the old parent package.
UMLObject *srcObj = m_doc->findObjectById(srcId);
if (srcObj) {
newParentObj = newParent->getUMLObject();
@@ -1422,14 +1422,14 @@ UMLListViewItem * UMLListView::moveObject(Uml::IDType srcId, Uml::ListView_Type
// update model objects
m_bCreatingChildObject = true;
- UMLClassifier *oldParentClassifier = dynamic_cast<UMLClassifier*>(srcObj->tqparent());
+ UMLClassifier *oldParentClassifier = dynamic_cast<UMLClassifier*>(srcObj->parent());
UMLClassifier *newParentClassifier = dynamic_cast<UMLClassifier*>(newParentObj);
if (srcType == Uml::lvt_Attribute) {
UMLAttribute *att = dynamic_cast<UMLAttribute*>(srcObj);
// We can't use the existing 'att' directly
- // because its tqparent is fixed to the old classifier
+ // because its parent is fixed to the old classifier
// and we have no way of changing that:
- // TQObject does not permit changing the tqparent().
+ // TQObject does not permit changing the parent().
if (att == NULL) {
kError() << "moveObject internal error: srcObj "
<< srcObj->getName() << " is not a UMLAttribute" << endl;
@@ -1454,9 +1454,9 @@ UMLListViewItem * UMLListView::moveObject(Uml::IDType srcId, Uml::ListView_Type
} else {
UMLOperation *op = dynamic_cast<UMLOperation*>(srcObj);
// We can't use the existing 'op' directly
- // because its tqparent is fixed to the old classifier
+ // because its parent is fixed to the old classifier
// and we have no way of changing that:
- // TQObject does not permit changing the tqparent().
+ // TQObject does not permit changing the parent().
if (op && oldParentClassifier->takeItem(op) != -1) {
bool isExistingOp;
Model_Utils::NameAndType_List ntDummyList;
@@ -1502,7 +1502,7 @@ UMLListViewItem * UMLListView::moveObject(Uml::IDType srcId, Uml::ListView_Type
return newItem;
}
-void UMLListView::slotDropped(TQDropEvent* de, TQListViewItem* /* tqparent */, TQListViewItem* item) {
+void UMLListView::slotDropped(TQDropEvent* de, TQListViewItem* /* parent */, TQListViewItem* item) {
item = (UMLListViewItem *)currentItem();
if(!item) {
kDebug() << "UMLListView::slotDropped: item is NULL - doing nothing" << endl;
@@ -1545,10 +1545,10 @@ int UMLListView::getSelectedItemsRoot(UMLListViewItemList &ItemList) {
for ( ; it.current(); ++it ) {
if ( it.current()->isSelected() ) {
UMLListViewItem *item = (UMLListViewItem*)it.current();
- // this is the trick, we select only the item with a tqparent unselected
- // since we can't select a child and its grandfather without its tqparent
+ // this is the trick, we select only the item with a parent unselected
+ // since we can't select a child and its grandfather without its parent
// we would be able to delete each item individually, without an invalid iterator
- if (item && item->tqparent() && item->tqparent()->isSelected()==false) {
+ if (item && item->parent() && item->parent()->isSelected()==false) {
ItemList.append(item);
}
}
@@ -1560,37 +1560,37 @@ int UMLListView::getSelectedItemsRoot(UMLListViewItemList &ItemList) {
UMLListViewItem* UMLListView::createDiagramItem(UMLView *v) {
Uml::ListView_Type lvt = Model_Utils::convert_DT_LVT(v->getType());
- UMLListViewItem *tqparent = NULL;
+ UMLListViewItem *parent = NULL;
UMLFolder *f = v->getFolder();
if (f) {
- tqparent = findUMLObject(f);
- if (tqparent == NULL)
+ parent = findUMLObject(f);
+ if (parent == NULL)
kError() << "UMLListView::createDiagramItem(" << v->getName()
<< "): findUMLObject(" << f->getName() << ") returns NULL"
<< endl;
} else {
kDebug() << "UMLListView::createDiagramItem(" << v->getName()
- << "): no tqparent folder set, using predefined folder" << endl;
+ << "): no parent folder set, using predefined folder" << endl;
}
- if (tqparent == NULL) {
- tqparent = determineParentItem(lvt);
+ if (parent == NULL) {
+ parent = determineParentItem(lvt);
lvt = Model_Utils::convert_DT_LVT(v->getType());
}
- UMLListViewItem *item = new UMLListViewItem(tqparent, v->getName(), lvt, v->getID());
+ UMLListViewItem *item = new UMLListViewItem(parent, v->getName(), lvt, v->getID());
return item;
}
/** Creates a new UMLListViewItem from a UMLListViewItem,
- if tqparent is null the ListView Decides who is going to be
- the tqparent */
+ if parent is null the ListView Decides who is going to be
+ the parent */
UMLListViewItem* UMLListView::createItem(UMLListViewItem& Data, IDChangeLog& IDChanges,
- UMLListViewItem* tqparent /*= 0*/) {
+ UMLListViewItem* parent /*= 0*/) {
UMLObject* pObject = 0;
UMLListViewItem* item = 0;
Uml::ListView_Type lvt = Data.getType();
- if(!tqparent) {
- tqparent = determineParentItem(lvt);
- if (!tqparent)
+ if(!parent) {
+ parent = determineParentItem(lvt);
+ if (!parent)
return 0;
}
@@ -1618,13 +1618,13 @@ UMLListViewItem* UMLListView::createItem(UMLListViewItem& Data, IDChangeLog& IDC
//it could exist an Item already asocciated if the user chose to reuse an uml object
if(!(item = findItem(newID))) {
pObject = m_doc->findObjectById( IDChanges.findNewID(Data.getID()) );
- item = new UMLListViewItem(tqparent, Data.getText(), lvt, pObject);
+ item = new UMLListViewItem(parent, Data.getText(), lvt, pObject);
} ***/
pObject = m_doc->findObjectById( Data.getID() );
- item = new UMLListViewItem(tqparent, Data.getText(), lvt, pObject);
+ item = new UMLListViewItem(parent, Data.getText(), lvt, pObject);
break;
case Uml::lvt_Datatype_Folder:
- item = new UMLListViewItem(tqparent, Data.getText(), lvt);
+ item = new UMLListViewItem(parent, Data.getText(), lvt);
break;
case Uml::lvt_Attribute:
case Uml::lvt_EntityAttribute:
@@ -1632,11 +1632,11 @@ UMLListViewItem* UMLListView::createItem(UMLListViewItem& Data, IDChangeLog& IDC
case Uml::lvt_Template:
case Uml::lvt_EnumLiteral:
{
- UMLClassifier *pClass = static_cast<UMLClassifier*>(tqparent->getUMLObject());
+ UMLClassifier *pClass = static_cast<UMLClassifier*>(parent->getUMLObject());
Uml::IDType newID = IDChanges.findNewID( Data.getID() );
pObject = pClass->findChildObjectById(newID);
if (pObject) {
- item = new UMLListViewItem( tqparent, Data.getText(), lvt, pObject );
+ item = new UMLListViewItem( parent, Data.getText(), lvt, pObject );
} else {
item = 0;
}
@@ -1658,7 +1658,7 @@ UMLListViewItem* UMLListView::createItem(UMLListViewItem& Data, IDChangeLog& IDC
return NULL;
}
const Uml::ListView_Type lvt = Model_Utils::convert_DT_LVT(v->getType());
- item = new UMLListViewItem(tqparent, v->getName(), lvt, newID);
+ item = new UMLListViewItem(parent, v->getName(), lvt, newID);
}
break;
default:
@@ -1669,36 +1669,36 @@ UMLListViewItem* UMLListView::createItem(UMLListViewItem& Data, IDChangeLog& IDC
}
UMLListViewItem* UMLListView::determineParentItem(Uml::ListView_Type lvt) const {
- UMLListViewItem* tqparent = 0;
+ UMLListViewItem* parent = 0;
switch (lvt) {
case Uml::lvt_Datatype:
- tqparent = m_datatypeFolder;
+ parent = m_datatypeFolder;
break;
case Uml::lvt_Actor:
case Uml::lvt_UseCase:
case Uml::lvt_UseCase_Folder:
case Uml::lvt_UseCase_Diagram:
- tqparent = m_lv[Uml::mt_UseCase];
+ parent = m_lv[Uml::mt_UseCase];
break;
case Uml::lvt_Component_Diagram:
case Uml::lvt_Component:
case Uml::lvt_Artifact:
- tqparent = m_lv[Uml::mt_Component];
+ parent = m_lv[Uml::mt_Component];
break;
case Uml::lvt_Deployment_Diagram:
case Uml::lvt_Node:
- tqparent = m_lv[Uml::mt_Deployment];
+ parent = m_lv[Uml::mt_Deployment];
break;
case Uml::lvt_EntityRelationship_Diagram:
case Uml::lvt_Entity:
- tqparent = m_lv[Uml::mt_EntityRelationship];
+ parent = m_lv[Uml::mt_EntityRelationship];
break;
default:
if (Model_Utils::typeIsDiagram(lvt) || !Model_Utils::typeIsClassifierList(lvt))
- tqparent = m_lv[Uml::mt_Logical];
+ parent = m_lv[Uml::mt_Logical];
break;
}
- return tqparent;
+ return parent;
}
int UMLListView::getSelectedCount() {
@@ -1737,9 +1737,9 @@ Uml::ListView_Type UMLListView::rootViewType(UMLListViewItem *item) {
return Uml::lvt_Deployment_View;
if (item == m_lv[Uml::mt_EntityRelationship])
return Uml::lvt_EntityRelationship_Model;
- UMLListViewItem *tqparent = dynamic_cast<UMLListViewItem*>(item->tqparent());
- if (tqparent)
- return rootViewType(tqparent);
+ UMLListViewItem *parent = dynamic_cast<UMLListViewItem*>(item->parent());
+ if (parent)
+ return rootViewType(parent);
return Uml::lvt_Unknown;
}
@@ -1872,8 +1872,8 @@ void UMLListView::addNewItem(UMLListViewItem *parentItem, Uml::ListView_Type typ
return;
}
if (Model_Utils::typeIsClassifierList(type)) {
- UMLClassifier *tqparent = static_cast<UMLClassifier*>(parentPkg);
- name = tqparent->uniqChildName(ot);
+ UMLClassifier *parent = static_cast<UMLClassifier*>(parentPkg);
+ name = parent->uniqChildName(ot);
} else {
name = Model_Utils::uniqObjectName(ot, parentPkg);
}
@@ -2073,7 +2073,7 @@ UMLObject *UMLListView::createUMLObject( UMLListViewItem * item, Uml::Object_Typ
return NULL;
}
- UMLListViewItem * parentItem = static_cast<UMLListViewItem *>(item->tqparent());
+ UMLListViewItem * parentItem = static_cast<UMLListViewItem *>(item->parent());
const Uml::ListView_Type lvt = parentItem->getType();
if (! Model_Utils::typeIsContainer(lvt)) {
kError() << "UMLListView::createUMLObject(" << object->getName()
@@ -2093,9 +2093,9 @@ UMLObject *UMLListView::createUMLObject( UMLListViewItem * item, Uml::Object_Typ
bool UMLListView::createChildUMLObject( UMLListViewItem * item, Uml::Object_Type type ) {
m_bCreatingChildObject = true;
TQString text = item->text( 0 );
- UMLObject* tqparent = static_cast<UMLListViewItem *>( item->tqparent() )->getUMLObject();
- if( !tqparent ) {
- kError() << "UMLListView::createChildUMLObject: tqparent UMLObject is NULL" << endl;
+ UMLObject* parent = static_cast<UMLListViewItem *>( item->parent() )->getUMLObject();
+ if( !parent ) {
+ kError() << "UMLListView::createChildUMLObject: parent UMLObject is NULL" << endl;
m_bCreatingChildObject = false;
return false;
}
@@ -2103,13 +2103,13 @@ bool UMLListView::createChildUMLObject( UMLListViewItem * item, Uml::Object_Type
//kDebug() << "UMLListView::createChildUMLObject (" << text << ")" << endl;
UMLObject* newObject = NULL;
if ( type == Uml::ot_EnumLiteral ) {
- UMLEnum *owningEnum = static_cast<UMLEnum*>(tqparent);
+ UMLEnum *owningEnum = static_cast<UMLEnum*>(parent);
newObject = owningEnum->createEnumLiteral(text);
UMLEnumLiteral* enumLiteral = static_cast<UMLEnumLiteral*>(newObject);
text = enumLiteral->toString(Uml::st_SigNoVis);
} else if ( type == Uml::ot_Template ) {
- UMLClassifier *owningClassifier = static_cast<UMLClassifier*>(tqparent);
+ UMLClassifier *owningClassifier = static_cast<UMLClassifier*>(parent);
Model_Utils::NameAndType nt;
Model_Utils::Parse_tqStatus st = Model_Utils::parseTemplate(text, nt, owningClassifier);
if (st) {
@@ -2124,7 +2124,7 @@ bool UMLListView::createChildUMLObject( UMLListViewItem * item, Uml::Object_Type
tmplParm->setType(nt.m_type);
text = tmplParm->toString(Uml::st_SigNoVis);
} else if (type == Uml::ot_Attribute || type == Uml::ot_EntityAttribute) {
- UMLClassifier *owningClass = static_cast<UMLClassifier*>(tqparent);
+ UMLClassifier *owningClass = static_cast<UMLClassifier*>(parent);
Model_Utils::NameAndType nt;
Uml::Visibility vis;
Model_Utils::Parse_tqStatus st;
@@ -2141,7 +2141,7 @@ bool UMLListView::createChildUMLObject( UMLListViewItem * item, Uml::Object_Type
att->setParmKind(nt.m_direction);
text = att->toString(Uml::st_SigNoVis);
} else if ( type == Uml::ot_Operation ) {
- UMLClassifier *owningClassifier = static_cast<UMLClassifier*>(tqparent);
+ UMLClassifier *owningClassifier = static_cast<UMLClassifier*>(parent);
Model_Utils::OpDescriptor od;
Model_Utils::Parse_tqStatus st = Model_Utils::parseOperation(text, od, owningClassifier);
if (st) {
@@ -2180,9 +2180,9 @@ bool UMLListView::createChildUMLObject( UMLListViewItem * item, Uml::Object_Type
item->setText( text );
ensureItemVisible(item);
- // as it's a ClassifierListItem add it to the childObjectMap of the tqparent
+ // as it's a ClassifierListItem add it to the childObjectMap of the parent
UMLClassifierListItem* classifierListItem = static_cast<UMLClassifierListItem*>( newObject );
- static_cast<UMLListViewItem*>( item->tqparent() )->addClassifierListItem(classifierListItem, item );
+ static_cast<UMLListViewItem*>( item->parent() )->addClassifierListItem(classifierListItem, item );
m_bCreatingChildObject = false;
@@ -2198,11 +2198,11 @@ void UMLListView::createDiagram( UMLListViewItem * item, Uml::Diagram_Type type
delete item;
return;
}
- UMLListViewItem *parentItem = static_cast<UMLListViewItem*>(item->tqparent());
+ UMLListViewItem *parentItem = static_cast<UMLListViewItem*>(item->parent());
UMLFolder *parentFolder = dynamic_cast<UMLFolder*>(parentItem->getUMLObject());
if (parentFolder == NULL) {
kError() << "UMLListView::createDiagram(" << name
- << "): tqparent UMLObject is not a UMLFolder" << endl;
+ << "): parent UMLObject is not a UMLFolder" << endl;
delete item;
return;
}
@@ -2223,7 +2223,7 @@ TQString UMLListView::getUniqueDiagramName(Uml::Diagram_Type type) {
}
bool UMLListView::isUnique( UMLListViewItem * item, const TQString &name ) {
- UMLListViewItem * parentItem = static_cast<UMLListViewItem *>( item -> tqparent() );
+ UMLListViewItem * parentItem = static_cast<UMLListViewItem *>( item -> parent() );
Uml::ListView_Type type = item -> getType();
switch( type ) {
case Uml::lvt_Class_Diagram:
@@ -2289,7 +2289,7 @@ bool UMLListView::isUnique( UMLListViewItem * item, const TQString &name ) {
UMLPackage *pkg = static_cast<UMLPackage*>(parentItem->getUMLObject());
if (pkg == NULL) {
kError() << "UMLListView::isUnique: internal error - "
- << "tqparent listviewitem is package but has no UMLObject" << endl;
+ << "parent listviewitem is package but has no UMLObject" << endl;
return true;
}
return (pkg->findObject(name) == NULL);
@@ -2302,8 +2302,8 @@ bool UMLListView::isUnique( UMLListViewItem * item, const TQString &name ) {
case Uml::lvt_Operation:
case Uml::lvt_EnumLiteral:
{
- UMLClassifier *tqparent = static_cast<UMLClassifier*>(parentItem->getUMLObject());
- return (tqparent->findChildObject(name) == NULL);
+ UMLClassifier *parent = static_cast<UMLClassifier*>(parentItem->getUMLObject());
+ return (parent->findChildObject(name) == NULL);
break;
}
@@ -2355,7 +2355,7 @@ bool UMLListView::loadFromXMI( TQDomElement & element ) {
return true;
}
-bool UMLListView::loadChildrenFromXMI( UMLListViewItem * tqparent, TQDomElement & element ) {
+bool UMLListView::loadChildrenFromXMI( UMLListViewItem * parent, TQDomElement & element ) {
TQDomNode node = element.firstChild();
TQDomElement domElement = node.toElement();
const TQString pfx("UMLListView::loadChildrenFromXMI: ");
@@ -2400,7 +2400,7 @@ bool UMLListView::loadChildrenFromXMI( UMLListViewItem * tqparent, TQDomElement
label = pObject->getName();
} else if (Model_Utils::typeIsFolder(lvType)) {
// Synthesize the UMLFolder here
- UMLObject *umlParent = tqparent->getUMLObject();
+ UMLObject *umlParent = parent->getUMLObject();
UMLPackage *parentPkg = dynamic_cast<UMLPackage*>(umlParent);
if (parentPkg == NULL) {
kError() << pfx << "umlParent(" << umlParent << ") is not a UMLPackage"
@@ -2412,7 +2412,7 @@ bool UMLListView::loadChildrenFromXMI( UMLListViewItem * tqparent, TQDomElement
f->setUMLPackage(parentPkg);
parentPkg->addObject(f);
pObject = f;
- item = new UMLListViewItem(tqparent, label, lvType, pObject);
+ item = new UMLListViewItem(parent, label, lvType, pObject);
// Moving all relevant UMLObjects to the new UMLFolder is done below,
// in the switch(lvType)
}
@@ -2454,7 +2454,7 @@ bool UMLListView::loadChildrenFromXMI( UMLListViewItem * tqparent, TQDomElement
<< "findItem(id " << ID2STR(nID) << ") returns NULL" << endl;
/*
if (pObject && pObject->getUMLPackage() &&
- tqparent->getType() != Uml::lvt_Package) {
+ parent->getType() != Uml::lvt_Package) {
// Pre-1.2 file format:
// Objects were not nested in their packages.
// Synthesize the nesting here.
@@ -2463,17 +2463,17 @@ bool UMLListView::loadChildrenFromXMI( UMLListViewItem * tqparent, TQDomElement
if (pkgItem == NULL) {
kDebug() << pfx << "synthesizing ListViewItem for package "
<< ID2STR(umlpkg->getID()) << endl;
- pkgItem = new UMLListViewItem(tqparent, umlpkg->getName(),
+ pkgItem = new UMLListViewItem(parent, umlpkg->getName(),
Uml::lvt_Package, umlpkg);
pkgItem->setOpen(true);
}
item = new UMLListViewItem(pkgItem, label, lvType, pObject);
} else {
- item = new UMLListViewItem(tqparent, label, lvType, pObject);
+ item = new UMLListViewItem(parent, label, lvType, pObject);
}
*/
}
- else if (tqparent != item->tqparent()) {
+ else if (parent != item->parent()) {
// The existing item was created by the slot event triggered
// by the loading of the corresponding model object from the
// XMI file.
@@ -2481,23 +2481,23 @@ bool UMLListView::loadChildrenFromXMI( UMLListViewItem * tqparent, TQDomElement
// of foreign XMI files that do not have the umbrello specific
// <listview> tag.
// However, now that we encountered the real <listview> info,
- // we need to delete the existing item: Its tqparent is always
+ // we need to delete the existing item: Its parent is always
// one of the default predefined folders, but the actual
// listview item might be located in a user created folder.
// Thanks to Achim Spangler for spotting the problem.
- UMLListViewItem *itmParent = dynamic_cast<UMLListViewItem*>(item->tqparent());
- kDebug() << pfx << item->getText() << " tqparent "
- << tqparent->getText() << " (" << tqparent << ") != "
+ UMLListViewItem *itmParent = dynamic_cast<UMLListViewItem*>(item->parent());
+ kDebug() << pfx << item->getText() << " parent "
+ << parent->getText() << " (" << parent << ") != "
<< itmParent->getText() << " (" << itmParent << ")" << endl;
if (item == m_datatypeFolder && itmParent == m_lv[Uml::mt_Logical]) {
kDebug() << pfx << "Reparenting the Datatypes folder is prohibited" << endl;
} else {
- UMLListViewItem *newItem = moveObject(nID, lvType, tqparent);
+ UMLListViewItem *newItem = moveObject(nID, lvType, parent);
item = newItem;
if (item) {
kDebug() << pfx << "Attempted reparenting of " << item->getText()
- << "(current tqparent: " << (itmParent ? itmParent->getText() : "NULL")
- << ", new tqparent: " << tqparent->getText() << ")" << endl;
+ << "(current parent: " << (itmParent ? itmParent->getText() : "NULL")
+ << ", new parent: " << parent->getText() << ")" << endl;
}
}
}
@@ -2511,9 +2511,9 @@ bool UMLListView::loadChildrenFromXMI( UMLListViewItem * tqparent, TQDomElement
if (item == NULL) {
kDebug() << pfx << "item " << ID2STR(nID) << " (of type "
<< lvType << ") does not yet exist..." << endl;
- UMLObject* umlObject = tqparent->getUMLObject();
+ UMLObject* umlObject = parent->getUMLObject();
if (!umlObject) {
- kDebug() << "And also the tqparent->getUMLObject() does not exist" << endl;
+ kDebug() << "And also the parent->getUMLObject() does not exist" << endl;
return false;
}
if (nID == Uml::id_None) {
@@ -2525,7 +2525,7 @@ bool UMLListView::loadChildrenFromXMI( UMLListViewItem * tqparent, TQDomElement
if (umlObject) {
connectNewObjectsSlots(umlObject);
label = umlObject->getName();
- item = new UMLListViewItem( tqparent, label, lvType, umlObject);
+ item = new UMLListViewItem( parent, label, lvType, umlObject);
} else {
kDebug() << pfx << "lvtype " << lvType << " child object "
<< ID2STR(nID) << " not found" << endl;
@@ -2556,7 +2556,7 @@ bool UMLListView::loadChildrenFromXMI( UMLListViewItem * tqparent, TQDomElement
break;
default:
if (Model_Utils::typeIsDiagram(lvType)) {
- item = new UMLListViewItem( tqparent, label, lvType, nID );
+ item = new UMLListViewItem( parent, label, lvType, nID );
} else {
kError() << pfx << "INTERNAL ERROR: unexpected listview type "
<< lvType << " (ID " << ID2STR(nID) << ")" << endl;
@@ -2634,14 +2634,14 @@ UMLListViewItem *UMLListView::rootView(Uml::ListView_Type type) {
return theView;
}
-void UMLListView::deleteChildrenOf(TQListViewItem* tqparent) {
- if ( !tqparent ) {
+void UMLListView::deleteChildrenOf(TQListViewItem* parent) {
+ if ( !parent ) {
return;
}
- if (tqparent == m_lv[Uml::mt_Logical])
+ if (parent == m_lv[Uml::mt_Logical])
m_datatypeFolder = NULL;
- while ( tqparent->firstChild() ) {
- delete tqparent->firstChild();
+ while ( parent->firstChild() ) {
+ delete parent->firstChild();
}
}
diff --git a/umbrello/umbrello/umllistview.h b/umbrello/umbrello/umllistview.h
index 3420c1f4..b6bf201c 100644
--- a/umbrello/umbrello/umllistview.h
+++ b/umbrello/umbrello/umllistview.h
@@ -49,10 +49,10 @@ public:
/**
* Constructs the tree view.
*
- * @param tqparent The tqparent to this.
+ * @param parent The parent to this.
* @param name The internal name for this class.
*/
- UMLListView(TQWidget *tqparent,const char *name);
+ UMLListView(TQWidget *parent,const char *name);
/**
* Standard deconstructor.
@@ -106,41 +106,41 @@ public:
* CHECK - This is perhaps redundant since the
* UMLListViewItemData => UMLListViewItem merge.
* Creates a new UMLListViewItem from a UMLListViewItem, if
- * tqparent is null the ListView Decides who is going to be the
- * tqparent
+ * parent is null the ListView Decides who is going to be the
+ * parent
*/
UMLListViewItem* createItem(UMLListViewItem& Data, IDChangeLog& IDChanges,
- UMLListViewItem* tqparent = 0);
+ UMLListViewItem* parent = 0);
/**
- * Find the tqparent folder for a diagram.
+ * Find the parent folder for a diagram.
* If the currently selected item in the list view is a folder
- * then that folder is returned as the tqparent.
+ * then that folder is returned as the parent.
*
* @param dt The Diagram_Type of the diagram.
* The type will only be used if there is no currently
* selected item, or if the current item is not a folder.
* In that case the root folder which is suitable for the
* Diagram_Type is returned.
- * @return Pointer to the tqparent UMLListViewItem for the diagram.
+ * @return Pointer to the parent UMLListViewItem for the diagram.
*/
UMLListViewItem *findFolderForDiagram(Uml::Diagram_Type dt);
/**
- * Determine the tqparent ListViewItem given an UMLObject.
+ * Determine the parent ListViewItem given an UMLObject.
*
- * @param object Pointer to the UMLObject for which to look up the tqparent.
- * @return Pointer to the tqparent UMLListViewItem chosen.
- * Returns NULL on error (no tqparent could be determined.)
+ * @param object Pointer to the UMLObject for which to look up the parent.
+ * @return Pointer to the parent UMLListViewItem chosen.
+ * Returns NULL on error (no parent could be determined.)
*/
UMLListViewItem* determineParentItem(UMLObject* object) const;
/**
- * Determine the tqparent ListViewItem given a ListView_Type.
- * This tqparent is used for creating new UMLListViewItems.
+ * Determine the parent ListViewItem given a ListView_Type.
+ * This parent is used for creating new UMLListViewItems.
*
- * @param lvt The ListView_Type for which to lookup the tqparent.
- * @return Pointer to the tqparent UMLListViewItem chosen.
+ * @param lvt The ListView_Type for which to lookup the parent.
+ * @return Pointer to the parent UMLListViewItem chosen.
*/
UMLListViewItem* determineParentItem(Uml::ListView_Type lvt) const;
@@ -169,11 +169,11 @@ public:
}
/**
- * Adds a new item to the tree of the given type under the given tqparent.
+ * Adds a new item to the tree of the given type under the given parent.
* Method will take care of signalling anyone needed on creation of new item.
* e.g. UMLDoc if an UMLObject is created.
*/
- void addNewItem(UMLListViewItem * tqparent, Uml::ListView_Type type);
+ void addNewItem(UMLListViewItem * parent, Uml::ListView_Type type);
/**
* Find an UMLObject in the listview.
@@ -260,7 +260,7 @@ public:
/**
* Moves an object given is unique ID and listview type to an
- * other listview tqparent item.
+ * other listview parent item.
* Also takes care of the corresponding move in the model.
*/
UMLListViewItem * moveObject(Uml::IDType srcId, Uml::ListView_Type srcType,
@@ -286,7 +286,7 @@ public:
* predefined root views (Root, Logical, UseCase, Component,
* Deployment, EntityRelationship.) Returns the ListView_Type
* of the matching root view; if no match then continues the
- * search using the item's tqparent, then grandtqparent, and so forth.
+ * search using the item's parent, then grandparent, and so forth.
* Returns Uml::lvt_Unknown if no match at all is found.
*/
Uml::ListView_Type rootViewType(UMLListViewItem *item);
@@ -295,7 +295,7 @@ public:
bool loadFromXMI( TQDomElement & element );
- bool loadChildrenFromXMI( UMLListViewItem * tqparent, TQDomElement & element );
+ bool loadChildrenFromXMI( UMLListViewItem * parent, TQDomElement & element );
protected:
UMLListViewItem* m_rv; // root view (home)
@@ -343,9 +343,9 @@ protected:
void loadPixmaps();
/**
- * Deletes all child-items of @p tqparent.
+ * Deletes all child-items of @p parent.
*/
- void deleteChildrenOf( TQListViewItem *tqparent );
+ void deleteChildrenOf( TQListViewItem *parent );
/**
* Delete a listview item.
@@ -357,18 +357,18 @@ protected:
/**
* Adds a new operation, attribute or template item to a classifier, identical to
- * childObjectAdded(obj) but with an explicit tqparent.
+ * childObjectAdded(obj) but with an explicit parent.
* @param child the child object
- * @param tqparent the tqparent object
+ * @param parent the parent object
*/
- void childObjectAdded(UMLClassifierListItem* child, UMLClassifier* tqparent);
+ void childObjectAdded(UMLClassifierListItem* child, UMLClassifier* parent);
/**
* Auxiliary method for moveObject(): Adds the model object at the proper
* new container (package if nested, UMLDoc if at global level), and
* updates the containment relationships in the model.
*/
- void addAtContainer(UMLListViewItem *item, UMLListViewItem *tqparent);
+ void addAtContainer(UMLListViewItem *item, UMLListViewItem *parent);
public slots:
@@ -433,7 +433,7 @@ public slots:
/**
* Something has been dragged and dropped onto the list view
*/
- void slotDropped(TQDropEvent* de, TQListViewItem* tqparent, TQListViewItem* item);
+ void slotDropped(TQDropEvent* de, TQListViewItem* parent, TQListViewItem* item);
/**
* calls updateFolder() on the item to update the icon to open
diff --git a/umbrello/umbrello/umllistviewitem.cpp b/umbrello/umbrello/umllistviewitem.cpp
index e6b7e569..01680fde 100644
--- a/umbrello/umbrello/umllistviewitem.cpp
+++ b/umbrello/umbrello/umllistviewitem.cpp
@@ -39,10 +39,10 @@
UMLListView* UMLListViewItem::s_pListView = 0;
-UMLListViewItem::UMLListViewItem( UMLListView * tqparent, const TQString &name,
+UMLListViewItem::UMLListViewItem( UMLListView * parent, const TQString &name,
Uml::ListView_Type t, UMLObject* o)
- : TQListViewItem(tqparent, name) {
- init(tqparent);
+ : TQListViewItem(parent, name) {
+ init(parent);
m_Type = t;
m_pObject = o;
if (o)
@@ -52,20 +52,20 @@ UMLListViewItem::UMLListViewItem( UMLListView * tqparent, const TQString &name,
setRenameEnabled( 0, false );
}
-UMLListViewItem::UMLListViewItem(UMLListView * tqparent)
- : TQListViewItem(tqparent) {
- init(tqparent);
- if (tqparent == NULL)
- kDebug() << "UMLListViewItem constructor called with a NULL listview tqparent" << endl;
+UMLListViewItem::UMLListViewItem(UMLListView * parent)
+ : TQListViewItem(parent) {
+ init(parent);
+ if (parent == NULL)
+ kDebug() << "UMLListViewItem constructor called with a NULL listview parent" << endl;
}
-UMLListViewItem::UMLListViewItem(UMLListViewItem * tqparent)
- : TQListViewItem(tqparent) {
+UMLListViewItem::UMLListViewItem(UMLListViewItem * parent)
+ : TQListViewItem(parent) {
init();
}
-UMLListViewItem::UMLListViewItem(UMLListViewItem * tqparent, const TQString &name, Uml::ListView_Type t,UMLObject*o)
- : TQListViewItem(tqparent, name) {
+UMLListViewItem::UMLListViewItem(UMLListViewItem * parent, const TQString &name, Uml::ListView_Type t,UMLObject*o)
+ : TQListViewItem(parent, name) {
init();
m_Type = t;
m_pObject = o;
@@ -75,7 +75,7 @@ UMLListViewItem::UMLListViewItem(UMLListViewItem * tqparent, const TQString &nam
} else {
UMLClassifierListItem *umlchild = dynamic_cast<UMLClassifierListItem*>(o);
if (umlchild)
- tqparent->addClassifierListItem(umlchild, this);
+ parent->addClassifierListItem(umlchild, this);
updateObject();
m_nId = o->getID();
}
@@ -83,8 +83,8 @@ UMLListViewItem::UMLListViewItem(UMLListViewItem * tqparent, const TQString &nam
setText( name );
}
-UMLListViewItem::UMLListViewItem(UMLListViewItem * tqparent, const TQString &name, Uml::ListView_Type t,Uml::IDType id)
- : TQListViewItem(tqparent, name) {
+UMLListViewItem::UMLListViewItem(UMLListViewItem * parent, const TQString &name, Uml::ListView_Type t,Uml::IDType id)
+ : TQListViewItem(parent, name) {
init();
m_Type = t;
m_nId = id;
@@ -127,16 +127,16 @@ UMLListViewItem::UMLListViewItem(UMLListViewItem * tqparent, const TQString &nam
UMLListViewItem::~UMLListViewItem() {}
-void UMLListViewItem::init(UMLListView * tqparent) {
+void UMLListViewItem::init(UMLListView * parent) {
m_Type = Uml::lvt_Unknown;
m_bCreating = false;
m_pObject = NULL;
m_nId = Uml::id_None;
m_nChildren = 0;
- if (s_pListView == NULL && tqparent != NULL) {
+ if (s_pListView == NULL && parent != NULL) {
kDebug() << "UMLListViewItem::init: s_pListView still NULL, setting it now "
<< endl;
- s_pListView = tqparent;
+ s_pListView = parent;
}
}
@@ -182,7 +182,7 @@ bool UMLListViewItem::isOwnParent(Uml::IDType listViewItemID) {
<< ID2STR(listViewItemID) << ") returns NULL" << endl;
return true;
}
- for (TQListViewItem *self = (TQListViewItem*)this; self; self = self->tqparent()) {
+ for (TQListViewItem *self = (TQListViewItem*)this; self; self = self->parent()) {
if (lvi == self)
return true;
}
@@ -331,9 +331,9 @@ void UMLListViewItem::okRename( int col ) {
return;
}
UMLOperation *op = static_cast<UMLOperation*>(m_pObject);
- UMLClassifier *tqparent = static_cast<UMLClassifier *>( op -> tqparent() );
+ UMLClassifier *parent = static_cast<UMLClassifier *>( op -> parent() );
Model_Utils::OpDescriptor od;
- Model_Utils::Parse_tqStatus st = Model_Utils::parseOperation(newText, od, tqparent);
+ Model_Utils::Parse_tqStatus st = Model_Utils::parseOperation(newText, od, parent);
if (st == Model_Utils::PS_OK) {
// TODO: Check that no operation with the exact same profile exists.
op->setName( od.m_name );
@@ -382,13 +382,13 @@ void UMLListViewItem::okRename( int col ) {
cancelRenameWithMsg();
return;
}
- UMLClassifier *tqparent = static_cast<UMLClassifier*>(m_pObject->tqparent());
+ UMLClassifier *parent = static_cast<UMLClassifier*>(m_pObject->parent());
Model_Utils::NameAndType nt;
Uml::Visibility vis;
Model_Utils::Parse_tqStatus st;
- st = Model_Utils::parseAttribute(newText, nt, tqparent, &vis);
+ st = Model_Utils::parseAttribute(newText, nt, parent, &vis);
if (st == Model_Utils::PS_OK) {
- UMLObject *exists = tqparent->findChildObject(newText);
+ UMLObject *exists = parent->findChildObject(newText);
if (exists) {
cancelRenameWithMsg();
return;
@@ -415,11 +415,11 @@ void UMLListViewItem::okRename( int col ) {
cancelRenameWithMsg();
return;
}
- UMLClassifier *tqparent = static_cast<UMLClassifier*>(m_pObject->tqparent());
+ UMLClassifier *parent = static_cast<UMLClassifier*>(m_pObject->parent());
Model_Utils::NameAndType nt;
- Model_Utils::Parse_tqStatus st = Model_Utils::parseTemplate(newText, nt, tqparent);
+ Model_Utils::Parse_tqStatus st = Model_Utils::parseTemplate(newText, nt, parent);
if (st == Model_Utils::PS_OK) {
- UMLObject *exists = tqparent->findChildObject(newText);
+ UMLObject *exists = parent->findChildObject(newText);
if (exists) {
cancelRenameWithMsg();
return;
@@ -521,8 +521,8 @@ int UMLListViewItem::compare(TQListViewItem *other, int col, bool ascending) con
#endif
return retval;
}
- UMLClassifier *ourParent = dynamic_cast<UMLClassifier*>(m_pObject->tqparent());
- UMLClassifier *otherParent = dynamic_cast<UMLClassifier*>(otherObj->tqparent());
+ UMLClassifier *ourParent = dynamic_cast<UMLClassifier*>(m_pObject->parent());
+ UMLClassifier *otherParent = dynamic_cast<UMLClassifier*>(otherObj->parent());
if (ourParent == NULL) {
retval = (subItem ? 1 : alphaOrder);
#ifdef DEBUG_LVITEM_INSERTION_ORDER
diff --git a/umbrello/umbrello/umllistviewitem.h b/umbrello/umbrello/umllistviewitem.h
index 105b751e..596a93f5 100644
--- a/umbrello/umbrello/umllistviewitem.h
+++ b/umbrello/umbrello/umllistviewitem.h
@@ -38,46 +38,46 @@ public:
/**
* Sets up an instance.
*
- * @param tqparent The tqparent to this instance.
+ * @param parent The parent to this instance.
* @param name The name of this instance.
* @param t The type of this instance.
* @param o The object it represents.
*/
- UMLListViewItem(UMLListView * tqparent, const TQString &name, Uml::ListView_Type t, UMLObject*o=0);
+ UMLListViewItem(UMLListView * parent, const TQString &name, Uml::ListView_Type t, UMLObject*o=0);
/**
* Sets up an instance for subsequent loadFromXMI().
*
- * @param tqparent The tqparent to this instance.
+ * @param parent The parent to this instance.
*/
- UMLListViewItem(UMLListView * tqparent);
+ UMLListViewItem(UMLListView * parent);
/**
* Sets up an instance for subsequent loadFromXMI().
*
- * @param tqparent The tqparent to this instance.
+ * @param parent The parent to this instance.
*/
- UMLListViewItem(UMLListViewItem * tqparent);
+ UMLListViewItem(UMLListViewItem * parent);
/**
* Sets up an instance.
*
- * @param tqparent The tqparent to this instance.
+ * @param parent The parent to this instance.
* @param name The name of this instance.
* @param t The type of this instance.
* @param o The object it represents.
*/
- UMLListViewItem(UMLListViewItem * tqparent, const TQString &name, Uml::ListView_Type t, UMLObject*o=0);
+ UMLListViewItem(UMLListViewItem * parent, const TQString &name, Uml::ListView_Type t, UMLObject*o=0);
/**
* Sets up an instance.
*
- * @param tqparent The tqparent to this instance.
+ * @param parent The parent to this instance.
* @param name The name of this instance.
* @param t The type of this instance.
* @param id The id of this instance.
*/
- UMLListViewItem(UMLListViewItem * tqparent, const TQString &name, Uml::ListView_Type t, Uml::IDType id);
+ UMLListViewItem(UMLListViewItem * parent, const TQString &name, Uml::ListView_Type t, Uml::IDType id);
/**
* Standard deconstructor.
@@ -126,7 +126,7 @@ public:
}
/**
- * Returns true if the UMLListViewItem of the given ID is a tqparent of
+ * Returns true if the UMLListViewItem of the given ID is a parent of
* this UMLListViewItem.
*/
bool isOwnParent(Uml::IDType listViewItemID);
@@ -199,7 +199,7 @@ public:
/**
* Create a deep copy of this UMLListViewItem, but using the
- * given tqparent instead of the tqparent of this UMLListViewItem.
+ * given parent instead of the parent of this UMLListViewItem.
* Return the new UMLListViewItem created.
*/
UMLListViewItem* deepCopy(UMLListViewItem *newParent);
@@ -243,7 +243,7 @@ protected:
/**
* Initializes key variables of the class.
*/
- void init(UMLListView * tqparent = 0);
+ void init(UMLListView * parent = 0);
/**
* This function is called if the user presses Enter during in-place renaming
diff --git a/umbrello/umbrello/umlobject.cpp b/umbrello/umbrello/umlobject.cpp
index b9a1b2d8..85de579f 100644
--- a/umbrello/umbrello/umlobject.cpp
+++ b/umbrello/umbrello/umlobject.cpp
@@ -30,8 +30,8 @@
#include "docwindow.h"
#include "dialogs/classpropdlg.h"
-UMLObject::UMLObject(const UMLObject * tqparent, const TQString &name, Uml::IDType id)
- : TQObject(const_cast<UMLObject*>(tqparent), "UMLObject" ) {
+UMLObject::UMLObject(const UMLObject * parent, const TQString &name, Uml::IDType id)
+ : TQObject(const_cast<UMLObject*>(parent), "UMLObject" ) {
init();
if (id == Uml::id_None)
m_nId = UniqueID::gen();
@@ -50,8 +50,8 @@ UMLObject::UMLObject(const TQString &name, Uml::IDType id)
m_Name = name;
}
-UMLObject::UMLObject(const UMLObject * tqparent)
- : TQObject(const_cast<UMLObject*>(tqparent)) {
+UMLObject::UMLObject(const UMLObject * parent)
+ : TQObject(const_cast<UMLObject*>(parent)) {
init();
}
@@ -200,9 +200,9 @@ void UMLObject::copyInto(UMLObject *rhs) const
// Create a new ID.
rhs->m_nId = UniqueID::gen();
- // Hope that the tqparent from TQObject is okay.
- if (rhs->tqparent() != tqparent())
- kDebug() << "copyInto has a wrong tqparent" << endl;
+ // Hope that the parent from TQObject is okay.
+ if (rhs->parent() != parent())
+ kDebug() << "copyInto has a wrong parent" << endl;
}
@@ -721,7 +721,7 @@ bool UMLObject::loadFromXMI( TQDomElement & element) {
m_BaseType != Uml::ot_Template && m_BaseType != Uml::ot_Stereotype &&
m_BaseType != Uml::ot_Role) {
if (m_bInPaste) {
- m_pUMLPackage = NULL; // forget any old tqparent
+ m_pUMLPackage = NULL; // forget any old parent
UMLListView *listView = UMLApp::app()->getListView();
UMLListViewItem *parentItem = (UMLListViewItem*)listView->currentItem();
if (parentItem) {
diff --git a/umbrello/umbrello/umlobject.h b/umbrello/umbrello/umlobject.h
index 727ec1d9..a0e02160 100644
--- a/umbrello/umbrello/umlobject.h
+++ b/umbrello/umbrello/umlobject.h
@@ -41,19 +41,19 @@ public:
/**
* Creates a UMLObject.
*
- * @param tqparent The tqparent of the object.
+ * @param parent The parent of the object.
* @param name The name of the object.
* @param id The ID of the object (optional.) If omitted
* then a new ID will be assigned internally.
*/
- UMLObject(const UMLObject * tqparent, const TQString &name, Uml::IDType id = Uml::id_None);
+ UMLObject(const UMLObject * parent, const TQString &name, Uml::IDType id = Uml::id_None);
/**
* Creates a UMLObject.
*
- * @param tqparent The tqparent of the object.
+ * @param parent The parent of the object.
*/
- UMLObject(const UMLObject * tqparent);
+ UMLObject(const UMLObject * parent);
/**
* Creates a UMLObject with a given name and unique ID.
diff --git a/umbrello/umbrello/umlrole.cpp b/umbrello/umbrello/umlrole.cpp
index 939b7167..ca33dffb 100644
--- a/umbrello/umbrello/umlrole.cpp
+++ b/umbrello/umbrello/umlrole.cpp
@@ -23,10 +23,10 @@
// constructor
-UMLRole::UMLRole(UMLAssociation * tqparent, UMLObject * parentObj, Uml::Role_Type role)
- : UMLObject(const_cast<UMLAssociation*>(tqparent))
+UMLRole::UMLRole(UMLAssociation * parent, UMLObject * parentObj, Uml::Role_Type role)
+ : UMLObject(const_cast<UMLAssociation*>(parent))
{
- init(tqparent, parentObj, role);
+ init(parent, parentObj, role);
}
UMLRole::~UMLRole() { }
@@ -59,9 +59,9 @@ TQString UMLRole::getMultiplicity() const {
}
void UMLRole::setObject (UMLObject *obj) {
- // because we will get the id of this role from the tqparent
+ // because we will get the id of this role from the parent
// object, we CANT allow UMLRoles to take other UMLRoles as
- // tqparent objects. In fact, there is probably good reason
+ // parent objects. In fact, there is probably good reason
// to only take UMLClassifiers here, but I'll leave it more open
// for the time being. -b.t.
if (obj && dynamic_cast<UMLRole*>(obj)) {
@@ -88,17 +88,17 @@ Uml::Role_Type UMLRole::getRole() {
return m_role;
}
-void UMLRole::init(UMLAssociation * tqparent, UMLObject * parentObj, Uml::Role_Type r) {
+void UMLRole::init(UMLAssociation * parent, UMLObject * parentObj, Uml::Role_Type r) {
m_BaseType = Uml::ot_Role;
m_role = r;
- m_pAssoc = tqparent;
+ m_pAssoc = parent;
m_pSecondary = parentObj;
m_Multi = "";
m_Name = "";
m_Changeability = Uml::chg_Changeable;
- // connect this up to tqparent
- connect(this,TQT_SIGNAL(modified()),tqparent,TQT_SIGNAL(modified()));
+ // connect this up to parent
+ connect(this,TQT_SIGNAL(modified()),parent,TQT_SIGNAL(modified()));
}
void UMLRole::saveToXMI( TQDomDocument & qDoc, TQDomElement & qElement ) {
@@ -110,7 +110,7 @@ void UMLRole::saveToXMI( TQDomDocument & qDoc, TQDomElement & qElement ) {
<< "): m_pSecondary is NULL" << endl;
if (!m_Multi.isEmpty())
roleElement.setAttribute("multiplicity", m_Multi);
- if (m_role == Uml::A) { // role aggregation based on tqparent type
+ if (m_role == Uml::A) { // role aggregation based on parent type
// role A
switch (m_pAssoc->getAssocType()) {
case Uml::at_Composition:
@@ -268,8 +268,8 @@ bool UMLRole::load( TQDomElement & element ) {
// Here comes the handling of the association type.
// This is open for discussion - I'm pretty sure there are better ways..
- // Yeah, for one, setting the *tqparent* object parameters from here is sucky
- // as hell. Why are we using roleA to store what is essentially a tqparent (association)
+ // Yeah, for one, setting the *parent* object parameters from here is sucky
+ // as hell. Why are we using roleA to store what is essentially a parent (association)
// parameter, eh? The UML13.dtd is pretty silly, but since that is what
// is driving us to that point, we have to go with it. Some analysis of
// the component roles/linked items needs to be done in order to get things
diff --git a/umbrello/umbrello/umlrole.h b/umbrello/umbrello/umlrole.h
index 464e264e..57bacbb1 100644
--- a/umbrello/umbrello/umlrole.h
+++ b/umbrello/umbrello/umlrole.h
@@ -30,11 +30,11 @@ public:
/**
* Sets up an association.
*
- * @param tqparent The tqparent (association) of this UMLRole.
+ * @param parent The parent (association) of this UMLRole.
* @param parentUMLObject The Parent UML Object of this UMLRole
* @param role The Uml::Role_Type of this UMLRole
*/
- UMLRole (UMLAssociation * tqparent, UMLObject * parentUMLObject, Uml::Role_Type role);
+ UMLRole (UMLAssociation * parent, UMLObject * parentUMLObject, Uml::Role_Type role);
/**
* Overloaded '==' operator
@@ -89,7 +89,7 @@ public:
UMLAssociation * getParentAssociation ();
- /** get the 'id' of the role (NOT the tqparent object). This could be
+ /** get the 'id' of the role (NOT the parent object). This could be
* either Uml::A or Uml::B. Yes, it would be better if we
* could get along without this, but we need it to distinguish saved
* umlrole objects in the XMI for 'self' associations where both roles
@@ -118,7 +118,7 @@ protected:
private:
/** do some initialization at construction time */
- void init (UMLAssociation * tqparent, UMLObject * parentObj, Uml::Role_Type r);
+ void init (UMLAssociation * parent, UMLObject * parentObj, Uml::Role_Type r);
UMLAssociation * m_pAssoc;
Uml::Role_Type m_role;
diff --git a/umbrello/umbrello/umlview.cpp b/umbrello/umbrello/umlview.cpp
index 7054105d..a64b770c 100644
--- a/umbrello/umbrello/umlview.cpp
+++ b/umbrello/umbrello/umlview.cpp
@@ -1149,10 +1149,10 @@ bool UMLView::isSavedInSeparateFile() {
<< "listView->findUMLObject(this) returns false" << endl;
return false;
}
- UMLListViewItem *parentItem = dynamic_cast<UMLListViewItem*>( lvItem->tqparent() );
+ UMLListViewItem *parentItem = dynamic_cast<UMLListViewItem*>( lvItem->parent() );
if (parentItem == NULL) {
kError() << msgPrefix
- << "tqparent item in listview is not a UMLListViewItem (?)" << endl;
+ << "parent item in listview is not a UMLListViewItem (?)" << endl;
return false;
}
const Uml::ListView_Type lvt = parentItem->getType();
@@ -1161,7 +1161,7 @@ bool UMLView::isSavedInSeparateFile() {
UMLFolder *modelFolder = dynamic_cast<UMLFolder*>(parentItem->getUMLObject());
if (modelFolder == NULL) {
kError() << msgPrefix
- << "tqparent model object is not a UMLFolder (?)" << endl;
+ << "parent model object is not a UMLFolder (?)" << endl;
return false;
}
TQString folderFile = modelFolder->getFolderFile();
@@ -1882,7 +1882,7 @@ void UMLView::updateContainment(UMLCanvasObject *self) {
if (self == NULL)
return;
// See if the object has a widget representation in this view.
- // While we're at it, also see if the new tqparent has a widget here.
+ // While we're at it, also see if the new parent has a widget here.
UMLWidget *selfWidget = NULL, *newParentWidget = NULL;
UMLPackage *newParent = self->getUMLPackage();
for (UMLWidgetListIt wit(m_WidgetList); wit.current(); ++wit) {
@@ -2073,11 +2073,11 @@ void UMLView::createAutoAssociations( UMLWidget * widget ) {
}
}
// if the UMLCanvasObject has a parentPackage then
- UMLPackage *tqparent = umlObj->getUMLPackage();
- if (tqparent == NULL)
+ UMLPackage *parent = umlObj->getUMLPackage();
+ if (parent == NULL)
return;
// if the parentPackage has a widget representation on this view then
- Uml::IDType pkgID = tqparent->getID();
+ Uml::IDType pkgID = parent->getID();
UMLWidget *pWidget;
UMLWidgetListIt wit(m_WidgetList);
while ((pWidget = wit.current()) != NULL) {
diff --git a/umbrello/umbrello/umlviewimageexportermodel.cpp b/umbrello/umbrello/umlviewimageexportermodel.cpp
index 0fab653a..a8de3637 100644
--- a/umbrello/umbrello/umlviewimageexportermodel.cpp
+++ b/umbrello/umbrello/umlviewimageexportermodel.cpp
@@ -174,14 +174,14 @@ TQString UMLViewImageExporterModel::getDiagramFileName(UMLView *view, const TQSt
UMLListView *listView = UMLApp::app()->getListView();
UMLListViewItem* listViewItem = listView->findItem(view->getID());
// skip the name of the first item because it's the View
- listViewItem = static_cast<UMLListViewItem*>(listViewItem->tqparent());
+ listViewItem = static_cast<UMLListViewItem*>(listViewItem->parent());
// Relies on the tree structure of the UMLListView. There are a base "Views" folder
// and five tqchildren, one for each view type (Logical, use case, components, deployment
// and entity relationship)
while (listView->rootView(listViewItem->getType()) == NULL) {
name.insert(0, listViewItem->getText() + '/');
- listViewItem = static_cast<UMLListViewItem*>(listViewItem->tqparent());
+ listViewItem = static_cast<UMLListViewItem*>(listViewItem->parent());
if (listViewItem == NULL)
break;
}
@@ -193,7 +193,7 @@ bool UMLViewImageExporterModel::prepareDirectory(const KURL &url) const {
KURL directory = url;
directory.setPath("");
- // creates the directory and any needed tqparent directories
+ // creates the directory and any needed parent directories
TQStringList dirs = TQStringList::split(TQDir::separator(), url.directory());
for (TQStringList::ConstIterator it = dirs.begin() ; it != dirs.end(); ++it ) {
directory.addPath(*it);
diff --git a/umbrello/umbrello/umlviewimageexportermodel.h b/umbrello/umbrello/umlviewimageexportermodel.h
index a7f0193d..5e1b7dd5 100644
--- a/umbrello/umbrello/umlviewimageexportermodel.h
+++ b/umbrello/umbrello/umlviewimageexportermodel.h
@@ -129,11 +129,11 @@ private:
/**
* Returns the name of the file where the view will be exported to.
* The name of the exported images will be like their view's name and using the
- * 'imageType' as extension. It can also include the tqparent folders of the view.
+ * 'imageType' as extension. It can also include the parent folders of the view.
*
* The views are stored in folders in the document. The same tree structure used
* in the document to store the views can be created with 'useFolders', so the file name
- * will include recursively also its tqparent folders. Only the folders made by the user
+ * will include recursively also its parent folders. Only the folders made by the user
* are included in the file name (Logical view, use case view and so on aren't created).
*
* @param view The view to export.
@@ -146,7 +146,7 @@ private:
/**
* Creates, if it doesn't exist, the directory to save the file.
- * It also creates all the needed tqparent directories.
+ * It also creates all the needed parent directories.
*
* @param url The url where the image will be saved.
* @return True if the operation was successful,
diff --git a/umbrello/umbrello/umlwidgetcontroller.h b/umbrello/umbrello/umlwidgetcontroller.h
index 032b3fbd..8b3e2091 100644
--- a/umbrello/umbrello/umlwidgetcontroller.h
+++ b/umbrello/umbrello/umlwidgetcontroller.h
@@ -186,7 +186,7 @@ protected:
* size in m_oldW/H.
*
* It can be overridden to save subclass specific values whenever a move or
- * resize begins. However, tqparent method (that is, this method) must be
+ * resize begins. However, parent method (that is, this method) must be
* called in the overridden method.
*
* @param me The TQMouseEvent to get the offset from.
diff --git a/umbrello/umbrello/usecasewidget.h b/umbrello/umbrello/usecasewidget.h
index de330b62..65613d1e 100644
--- a/umbrello/umbrello/usecasewidget.h
+++ b/umbrello/umbrello/usecasewidget.h
@@ -41,7 +41,7 @@ public:
/**
* Creates a UseCase widget.
*
- * @param view The tqparent of the widget.
+ * @param view The parent of the widget.
* @param o The UMLObject to represent.
*/
UseCaseWidget(UMLView * view, UMLUseCase *o);
diff --git a/umbrello/umbrello/worktoolbar.h b/umbrello/umbrello/worktoolbar.h
index 410644d2..6893284b 100644
--- a/umbrello/umbrello/worktoolbar.h
+++ b/umbrello/umbrello/worktoolbar.h
@@ -47,7 +47,7 @@ public:
/**
* Creates a work tool bar.
*
- * @param parentWindow The tqparent of the toolbar.
+ * @param parentWindow The parent of the toolbar.
*/
WorkToolBar(TQMainWindow *parentWindow, const char *name);