From 9150603ad32928e9c514c0492a8518b742d82ac3 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 9 Jul 2011 02:23:29 +0000 Subject: [PATCH] Remove the tq in front of these incorrectly TQt4-converted methods/data members: tqrepaint[...] tqinvalidate[...] tqparent[...] tqmask[...] tqlayout[...] tqalignment[...] git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- cervisia/cervisiapart.cpp | 8 +- cervisia/cervisiapart.h | 2 +- cervisia/settingsdlg_advanced.ui | 2 +- cervisia/tooltip.cpp | 10 +-- cervisia/updateview.cpp | 4 +- cervisia/updateview_items.cpp | 6 +- cervisia/updateview_visitors.cpp | 2 +- kapptemplate/kpartapp/app_part.cpp | 4 +- kapptemplate/kpartapp/app_part.h | 2 +- kbabel/catalogmanager/catmanlistitem.h | 2 +- kbabel/catalogmanager/markpatternwidget.ui | 2 +- .../catalogmanager/validateprogresswidget.ui | 2 +- kbabel/catalogmanager/validationoptions.ui | 2 +- kbabel/commonui/diffpreferences.ui | 2 +- kbabel/commonui/klisteditor.ui | 2 +- kbabel/commonui/projectwizardwidget.ui | 4 +- kbabel/commonui/projectwizardwidget2.ui | 2 +- kbabel/filters/linguist/linguistimport.cpp | 4 +- kbabel/filters/linguist/linguistimport.h | 2 +- kbabel/filters/xliff/xliffexport.cpp | 10 +-- kbabel/filters/xliff/xliffimport.cpp | 4 +- kbabel/filters/xliff/xliffimport.h | 2 +- kbabel/kbabel/colorpreferences.ui | 2 +- kbabel/kbabel/editordiffpreferences.ui | 2 +- kbabel/kbabel/editorpreferences.ui | 2 +- kbabel/kbabel/fontpreferences.ui | 2 +- kbabel/kbabel/headerwidget.ui | 2 +- kbabel/kbabel/mymultilineedit.h | 2 +- kbabel/kbabel/searchpreferences.ui | 2 +- kbabel/kbabel/spelldlgwidget.ui | 2 +- .../modules/dbsearchengine/dbseprefwidget.ui | 2 +- .../modules/dbsearchengine2/dbse2.ui | 2 +- .../modules/dbsearchengine2/dbseprefwidget.ui | 2 +- .../modules/dbsearchengine2/sourcedialog.ui | 2 +- .../modules/pocompendium/pocompendium.cpp | 14 +-- .../modules/pocompendium/pocompendium.h | 2 +- kbabel/kbabeldict/modules/tmx/pwidget.ui | 2 +- .../kbabeldict/modules/tmx/tmxcompendium.cpp | 14 +-- kbabel/kbabeldict/modules/tmx/tmxcompendium.h | 2 +- kbugbuster/backend/bugcache.cpp | 8 +- kbugbuster/backend/bugcache.h | 6 +- kbugbuster/backend/bugserver.cpp | 6 +- kbugbuster/gui/centralwidget.cpp | 6 +- kbugbuster/gui/centralwidget_base.ui | 2 +- kbugbuster/gui/cwbugdetailscontainer_base.ui | 2 +- kbugbuster/gui/cwsearchwidget_base.ui | 2 +- kcachegrind/kcachegrind/callgraphview.cpp | 20 ++--- kcachegrind/kcachegrind/callgraphview.h | 6 +- kcachegrind/kcachegrind/callmapview.cpp | 4 +- kcachegrind/kcachegrind/callmapview.h | 2 +- kcachegrind/kcachegrind/callview.cpp | 4 +- kcachegrind/kcachegrind/callview.h | 2 +- kcachegrind/kcachegrind/configdlgbase.ui | 2 +- kcachegrind/kcachegrind/costlistitem.h | 2 +- kcachegrind/kcachegrind/costtypeview.cpp | 4 +- kcachegrind/kcachegrind/costtypeview.h | 2 +- kcachegrind/kcachegrind/coverageview.cpp | 8 +- kcachegrind/kcachegrind/coverageview.h | 2 +- kcachegrind/kcachegrind/dumpselectionbase.ui | 2 +- .../kcachegrind/functionselectionbase.ui | 2 +- kcachegrind/kcachegrind/instrview.cpp | 4 +- kcachegrind/kcachegrind/instrview.h | 2 +- kcachegrind/kcachegrind/partselectionbase.ui | 2 +- kcachegrind/kcachegrind/partview.cpp | 4 +- kcachegrind/kcachegrind/partview.h | 2 +- kcachegrind/kcachegrind/sourceview.cpp | 4 +- kcachegrind/kcachegrind/sourceview.h | 2 +- kcachegrind/kcachegrind/stackselectionbase.ui | 2 +- kcachegrind/kcachegrind/tabview.cpp | 4 +- kcachegrind/kcachegrind/tabview.h | 2 +- kcachegrind/kcachegrind/toplevel.cpp | 52 +++++------ kcachegrind/kcachegrind/toplevel.h | 16 ++-- kcachegrind/kcachegrind/tracedata.cpp | 28 +++--- kcachegrind/kcachegrind/tracedata.h | 20 ++--- kcachegrind/kcachegrind/traceitemview.cpp | 6 +- kcachegrind/kcachegrind/traceitemview.h | 4 +- kcachegrind/kcachegrind/treemap.cpp | 6 +- kcachegrind/kcachegrind/treemap.h | 4 +- kioslave/svn/ksvnd/commitdlg.ui | 2 +- kioslave/svn/ksvnd/ksvnd.cpp | 14 +-- kioslave/svn/svnhelper/subversioncheckout.ui | 2 +- kioslave/svn/svnhelper/subversiondiff.ui | 2 +- kioslave/svn/svnhelper/subversionlog.ui | 2 +- kioslave/svn/svnhelper/subversionswitch.ui | 2 +- .../komparenavtreepart/komparenavtreepart.cpp | 4 +- .../komparenavtreepart/komparenavtreepart.h | 2 +- kompare/komparepart/kompare_part.cpp | 6 +- kompare/komparepart/kompare_part.h | 2 +- kompare/komparepart/kompareconnectwidget.cpp | 6 +- kompare/komparepart/komparelistview.cpp | 2 +- kompare/komparepart/komparesaveoptionsbase.ui | 2 +- kuiviewer/kuiviewer_part.cpp | 4 +- kuiviewer/kuiviewer_part.h | 2 +- kunittest/testerwidget.ui | 2 +- poxml/antlr/src/CharScanner.cpp | 2 +- scheck/bitmaps.h | 2 +- scheck/scheck.cpp | 22 ++--- scheck/status.txt | 2 +- scripts/completions/bash/dcop | 2 +- scripts/kDebug2kdDebug.sh | 2 +- scripts/kde-emacs/dirvars.el | 2 +- scripts/kde-emacs/kde-emacs-compat.el | 2 +- scripts/kde-emacs/kde-emacs-core.el | 8 +- scripts/kde-emacs/kde-emacs-semantic.el | 2 +- scripts/kde-emacs/kde-emacs-tips.texi | 4 +- scripts/kde-emacs/kde-emacs-utils.el | 4 +- scripts/kde-emacs/kde-emacs-vars.el | 2 +- scripts/kdesvn-build | 8 +- umbrello/umbrello/aligntoolbar.cpp | 4 +- umbrello/umbrello/aligntoolbar.h | 4 +- umbrello/umbrello/autolayout/autolayout.h | 12 +-- .../umbrello/autolayout/autolayoutdlg.cpp | 56 ++++++------ umbrello/umbrello/autolayout/autolayoutdlg.h | 8 +- umbrello/umbrello/autolayout/autolayouter.cpp | 4 +- umbrello/umbrello/autolayout/autolayouter.h | 4 +- .../autolayout/autolayouteradapter.cpp | 40 ++++----- .../umbrello/autolayout/autolayouteradapter.h | 8 +- .../umbrello/autolayout/dotautolayouter.cpp | 10 +-- .../umbrello/autolayout/dotautolayouter.h | 8 +- .../autolayout/graphvizautolayouter.cpp | 18 ++-- .../autolayout/graphvizautolayouter.h | 8 +- umbrello/umbrello/autolayout/graphvizgraph.h | 2 +- .../autolayout/newautolayoutdialog.ui | 2 +- umbrello/umbrello/classifier.cpp | 14 +-- umbrello/umbrello/classifiercodedocument.cpp | 14 +-- umbrello/umbrello/classifiercodedocument.h | 4 +- umbrello/umbrello/classifierlistitem.cpp | 8 +- umbrello/umbrello/clipboard/umldrag.cpp | 4 +- umbrello/umbrello/clipboard/umldrag.h | 2 +- umbrello/umbrello/codeaccessormethod.cpp | 14 +-- umbrello/umbrello/codeaccessormethod.h | 4 +- umbrello/umbrello/codeclassfield.cpp | 20 ++--- umbrello/umbrello/codeclassfield.h | 6 +- .../codeclassfielddeclarationblock.cpp | 18 ++-- .../umbrello/codeclassfielddeclarationblock.h | 2 +- .../umbrello/codegenerators/adawriter.cpp | 4 +- umbrello/umbrello/codegenerators/aswriter.cpp | 2 +- .../codegenerators/cppcodeclassfield.cpp | 12 +-- .../codegenerators/cppcodeclassfield.h | 4 +- .../cppcodegenerationformbase.ui | 2 +- .../cppheaderclassdeclarationblock.cpp | 18 ++-- .../cppheaderclassdeclarationblock.h | 2 +- .../cppheadercodeaccessormethod.cpp | 12 +-- ...ppheadercodeclassfielddeclarationblock.cpp | 2 +- .../codegenerators/cppheadercodedocument.cpp | 4 +- .../codegenerators/cppheadercodeoperation.cpp | 4 +- .../cppsourcecodeaccessormethod.cpp | 10 +-- .../codegenerators/cppsourcecodeoperation.cpp | 4 +- .../umbrello/codegenerators/csharpwriter.cpp | 6 +- .../codegenerators/javaantcodedocument.cpp | 2 +- .../javaclassdeclarationblock.cpp | 24 ++--- .../javaclassdeclarationblock.h | 2 +- .../javaclassifiercodedocument.cpp | 8 +- .../codegenerators/javacodeaccessormethod.cpp | 6 +- .../codegenerators/javacodeclassfield.cpp | 12 +-- .../codegenerators/javacodeclassfield.h | 4 +- .../javacodeclassfielddeclarationblock.cpp | 6 +- .../javacodegenerationformbase.ui | 2 +- .../codegenerators/javacodeoperation.cpp | 2 +- .../umbrello/codegenerators/php5writer.cpp | 4 +- .../umbrello/codegenerators/phpwriter.cpp | 4 +- .../rubyclassdeclarationblock.cpp | 20 ++--- .../rubyclassdeclarationblock.h | 2 +- .../rubyclassifiercodedocument.cpp | 6 +- .../codegenerators/rubycodeaccessormethod.cpp | 6 +- .../codegenerators/rubycodeclassfield.cpp | 12 +-- .../codegenerators/rubycodeclassfield.h | 4 +- .../rubycodeclassfielddeclarationblock.cpp | 6 +- .../rubycodegenerationformbase.ui | 2 +- .../codegenerators/rubycodeoperation.cpp | 2 +- .../codegenerators/simplecodegenerator.cpp | 10 +-- .../codegenerators/xmlelementcodeblock.cpp | 10 +-- .../codegenerators/xmlelementcodeblock.h | 2 +- .../umbrello/codegenobjectwithtextblocks.cpp | 8 +- umbrello/umbrello/codeimport/adaimport.cpp | 6 +- umbrello/umbrello/codeimport/import_utils.cpp | 42 ++++----- umbrello/umbrello/codeimport/import_utils.h | 10 +-- umbrello/umbrello/codeimport/javaimport.cpp | 6 +- umbrello/umbrello/codemethodblock.cpp | 4 +- umbrello/umbrello/codemethodblock.h | 2 +- umbrello/umbrello/codeoperation.cpp | 14 +-- umbrello/umbrello/codeoperation.h | 2 +- umbrello/umbrello/codeparameter.cpp | 12 +-- umbrello/umbrello/codeparameter.h | 2 +- umbrello/umbrello/dialogs/codeeditor.cpp | 80 ++++++++--------- umbrello/umbrello/dialogs/codeeditor.h | 4 +- .../dialogs/codegenerationoptionsbase.ui | 2 +- .../dialogs/codegenerationpolicybase.ui | 2 +- .../dialogs/codegenerationwizardbase.ui | 2 +- umbrello/umbrello/dialogs/codeviewerdialog.h | 2 +- .../umbrello/dialogs/codeviewerdialogbase.ui | 2 +- .../umbrello/dialogs/codevieweroptionsbase.ui | 2 +- .../umbrello/dialogs/diagrampropertiespage.ui | 2 +- .../dialogs/exportallviewsdialogbase.ui | 2 +- umbrello/umbrello/dialogs/settingsdlg.cpp | 2 +- .../umbrello/dialogs/umlrolepropertiesbase.ui | 2 +- umbrello/umbrello/folder.cpp | 2 +- umbrello/umbrello/import_rose.cpp | 20 ++--- umbrello/umbrello/kplayerslideraction.cpp | 4 +- umbrello/umbrello/kplayerslideraction.h | 4 +- umbrello/umbrello/model_utils.cpp | 10 +-- umbrello/umbrello/model_utils.h | 4 +- umbrello/umbrello/object_factory.cpp | 30 +++---- umbrello/umbrello/object_factory.h | 4 +- umbrello/umbrello/ownedcodeblock.cpp | 8 +- .../umbrello/ownedhierarchicalcodeblock.cpp | 2 +- .../umbrello/ownedhierarchicalcodeblock.h | 2 +- umbrello/umbrello/petaltree2uml.cpp | 12 +-- .../refactoring/refactoringassistant.cpp | 34 +++---- umbrello/umbrello/uml.cpp | 4 +- umbrello/umbrello/uml.h | 2 +- umbrello/umbrello/umldoc.cpp | 14 +-- umbrello/umbrello/umllistview.cpp | 90 +++++++++---------- umbrello/umbrello/umlobject.cpp | 8 +- umbrello/umbrello/umlrole.cpp | 8 +- umbrello/umbrello/umlrole.h | 6 +- umbrello/umbrello/umlview.cpp | 20 ++--- umbrello/umbrello/umlview.h | 2 +- umbrello/umbrello/widget_factory.cpp | 4 +- umbrello/umbrello/worktoolbar.cpp | 4 +- umbrello/umbrello/worktoolbar.h | 4 +- 221 files changed, 786 insertions(+), 786 deletions(-) diff --git a/cervisia/cervisiapart.cpp b/cervisia/cervisiapart.cpp index abc66521..6fccdae6 100644 --- a/cervisia/cervisiapart.cpp +++ b/cervisia/cervisiapart.cpp @@ -80,7 +80,7 @@ using Cervisia::TagDialog; K_EXPORT_COMPONENT_FACTORY( libcervisiapart, CervisiaFactory ) -CervisiaPart::CervisiaPart( TQWidget *tqparentWidget, const char *widgetName, +CervisiaPart::CervisiaPart( TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, const TQStringList& /*args*/ ) : KParts::ReadOnlyPart( tqparent, name ) , hasRunningJob( false ) @@ -131,7 +131,7 @@ CervisiaPart::CervisiaPart( TQWidget *tqparentWidget, const char *widgetName, { Qt::Orientation o = splitHorz ? Qt::Vertical : Qt::Horizontal; - splitter = new TQSplitter(o, tqparentWidget, widgetName); + splitter = new TQSplitter(o, parentWidget, widgetName); // avoid PartManager's warning that Part's window can't handle focus splitter->setFocusPolicy( TQ_StrongFocus ); @@ -151,7 +151,7 @@ CervisiaPart::CervisiaPart( TQWidget *tqparentWidget, const char *widgetName, else setWidget(new TQLabel(i18n("This KPart is non-functional, because the " "cvs DCOP service could not be started."), - tqparentWidget)); + parentWidget)); if( cvsService ) { @@ -1692,7 +1692,7 @@ void CervisiaPart::slotJobFinished() if( m_jobType == Commit ) { - KNotifyClient::event(widget()->tqparentWidget()->winId(), "cvs_commit_done", + KNotifyClient::event(widget()->parentWidget()->winId(), "cvs_commit_done", i18n("A CVS commit to repository %1 is done") .tqarg(repository)); m_jobType = Unknown; diff --git a/cervisia/cervisiapart.h b/cervisia/cervisiapart.h index 877f5cfc..337529e0 100644 --- a/cervisia/cervisiapart.h +++ b/cervisia/cervisiapart.h @@ -56,7 +56,7 @@ class CervisiaPart : public KParts::ReadOnlyPart TQ_OBJECT public: - CervisiaPart( TQWidget *tqparentWidget, const char *widgetName, + CervisiaPart( TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name=0, const TQStringList& args = TQStringList()); virtual ~CervisiaPart(); diff --git a/cervisia/settingsdlg_advanced.ui b/cervisia/settingsdlg_advanced.ui index 78191d32..2100e8ff 100644 --- a/cervisia/settingsdlg_advanced.ui +++ b/cervisia/settingsdlg_advanced.ui @@ -87,7 +87,7 @@ - + knuminput.h knuminput.h diff --git a/cervisia/tooltip.cpp b/cervisia/tooltip.cpp index efc5108e..d898e80c 100644 --- a/cervisia/tooltip.cpp +++ b/cervisia/tooltip.cpp @@ -49,8 +49,8 @@ void ToolTip::maybeTip(const TQPoint& pos) { text = truncateLines(text, font(), - tqparentWidget()->mapToGlobal(pos), - KGlobalSettings::desktopGeometry(tqparentWidget())); + parentWidget()->mapToGlobal(pos), + KGlobalSettings::desktopGeometry(parentWidget())); tip(rect, text); } } @@ -94,12 +94,12 @@ TQString truncateLines(const TQString& text, - desktopGeometry.top() - 10); // calculate the tooltip's size - const TQSimpleRichText tqlayoutedText(text, font); + const TQSimpleRichText layoutedText(text, font); // only if the tooltip's size is bigger in x- and y-direction the text must // be truncated otherwise the tip is moved to a position where it fits - return ((tqlayoutedText.widthUsed() > maxWidth) - && (tqlayoutedText.height() > maxHeight)) + return ((layoutedText.widthUsed() > maxWidth) + && (layoutedText.height() > maxHeight)) ? truncateLines(text, TQFontMetrics(font), TQSize(maxWidth, maxHeight)) : text; } diff --git a/cervisia/updateview.cpp b/cervisia/updateview.cpp index 62e691ee..a60e0cd9 100644 --- a/cervisia/updateview.cpp +++ b/cervisia/updateview.cpp @@ -500,8 +500,8 @@ void UpdateView::syncSelection() UpdateDirItem* dirItem(0); if (isDirItem(item)) dirItem = static_cast(item); - else if (TQListViewItem* tqparentItem = item->tqparent()) - dirItem = static_cast(tqparentItem); + else if (TQListViewItem* parentItem = item->tqparent()) + dirItem = static_cast(parentItem); if (dirItem) setDirItems.insert(dirItem); diff --git a/cervisia/updateview_items.cpp b/cervisia/updateview_items.cpp index efa83593..44f81853 100644 --- a/cervisia/updateview_items.cpp +++ b/cervisia/updateview_items.cpp @@ -54,13 +54,13 @@ TQString UpdateItem::dirPath() const const UpdateItem* item = static_cast(tqparent()); while (item) { - const UpdateItem* tqparentItem = static_cast(item->tqparent()); - if (tqparentItem) + const UpdateItem* parentItem = static_cast(item->tqparent()); + if (parentItem) { path.prepend(item->m_entry.m_name + TQDir::separator()); } - item = tqparentItem; + item = parentItem; } return path; diff --git a/cervisia/updateview_visitors.cpp b/cervisia/updateview_visitors.cpp index 74e7f41b..0da6940b 100644 --- a/cervisia/updateview_visitors.cpp +++ b/cervisia/updateview_visitors.cpp @@ -90,7 +90,7 @@ void ApplyFilterVisitor::markAllParentsAsVisible(UpdateItem* item) } else { - // if this item isn't in the map anymore all tqparents + // if this item isn't in the map anymore all parents // are already removed too break; } diff --git a/kapptemplate/kpartapp/app_part.cpp b/kapptemplate/kpartapp/app_part.cpp index 25bf0886..831e5f95 100644 --- a/kapptemplate/kpartapp/app_part.cpp +++ b/kapptemplate/kpartapp/app_part.cpp @@ -17,7 +17,7 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}_part.cpp 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 *tqparentWidget, const char *widgetName, +${APP_NAME}Part::${APP_NAME}Part( TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, const TQStringList & /*args*/ ) : KParts::ReadWritePart(tqparent, name) @@ -26,7 +26,7 @@ ${APP_NAME}Part::${APP_NAME}Part( TQWidget *tqparentWidget, const char *widgetNa setInstance( ${APP_NAME}PartFactory::instance() ); // this should be your custom internal widget - m_widget = new TQMultiLineEdit( tqparentWidget, widgetName ); + m_widget = new TQMultiLineEdit( parentWidget, widgetName ); // notify the part that this is our internal widget setWidget(m_widget); diff --git a/kapptemplate/kpartapp/app_part.h b/kapptemplate/kpartapp/app_part.h index 908adaa3..72687a6d 100644 --- a/kapptemplate/kpartapp/app_part.h +++ b/kapptemplate/kpartapp/app_part.h @@ -27,7 +27,7 @@ public: /** * Default constructor */ - ${APP_NAME}Part(TQWidget *tqparentWidget, const char *widgetName, + ${APP_NAME}Part(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, const TQStringList &args); /** diff --git a/kbabel/catalogmanager/catmanlistitem.h b/kbabel/catalogmanager/catmanlistitem.h index a21db4f0..e31a5d4d 100644 --- a/kbabel/catalogmanager/catmanlistitem.h +++ b/kbabel/catalogmanager/catmanlistitem.h @@ -184,7 +184,7 @@ private: * file using @ref Catalog::info * ( slow for big files ) * @param includeChildren flag, if possible tqchildren should be updated,too - * @param noParents flag, if tqparents should be updated, when state + * @param noParents flag, if parents should be updated, when state * of the item has changed */ void update(bool showPoInfo=true,bool includeChildren=false diff --git a/kbabel/catalogmanager/markpatternwidget.ui b/kbabel/catalogmanager/markpatternwidget.ui index 056bf6aa..1380acfe 100644 --- a/kbabel/catalogmanager/markpatternwidget.ui +++ b/kbabel/catalogmanager/markpatternwidget.ui @@ -120,7 +120,7 @@ class KComboBox; - + klineedit.h diff --git a/kbabel/catalogmanager/validateprogresswidget.ui b/kbabel/catalogmanager/validateprogresswidget.ui index 4477d800..01cb4c5f 100644 --- a/kbabel/catalogmanager/validateprogresswidget.ui +++ b/kbabel/catalogmanager/validateprogresswidget.ui @@ -119,7 +119,7 @@ setupFileProgressBar( TQString text, int maxvalue ) - + kprogress.h ksqueezedtextlabel.h diff --git a/kbabel/catalogmanager/validationoptions.ui b/kbabel/catalogmanager/validationoptions.ui index 0357f3fe..23c3cb71 100644 --- a/kbabel/catalogmanager/validationoptions.ui +++ b/kbabel/catalogmanager/validationoptions.ui @@ -56,5 +56,5 @@ marked as fuzzy will not be validated at all.</p></qt> - + diff --git a/kbabel/commonui/diffpreferences.ui b/kbabel/commonui/diffpreferences.ui index f7ea7c7f..c52e3c27 100644 --- a/kbabel/commonui/diffpreferences.ui +++ b/kbabel/commonui/diffpreferences.ui @@ -133,7 +133,7 @@ the database are used for diffing.</p></qt> init() - + klineedit.h kpushbutton.h diff --git a/kbabel/commonui/klisteditor.ui b/kbabel/commonui/klisteditor.ui index 14cc8dc1..b31497b4 100644 --- a/kbabel/commonui/klisteditor.ui +++ b/kbabel/commonui/klisteditor.ui @@ -257,5 +257,5 @@ setTitle( const TQString & s ) list() - + diff --git a/kbabel/commonui/projectwizardwidget.ui b/kbabel/commonui/projectwizardwidget.ui index 7adae4fb..c9329be7 100644 --- a/kbabel/commonui/projectwizardwidget.ui +++ b/kbabel/commonui/projectwizardwidget.ui @@ -255,8 +255,8 @@ done</li> projectwizardwidget.ui.h - - + + kurlrequester.h klineedit.h diff --git a/kbabel/commonui/projectwizardwidget2.ui b/kbabel/commonui/projectwizardwidget2.ui index f99a0367..97030b94 100644 --- a/kbabel/commonui/projectwizardwidget2.ui +++ b/kbabel/commonui/projectwizardwidget2.ui @@ -149,7 +149,7 @@ will not work. - + kpushbutton.h kpushbutton.h diff --git a/kbabel/filters/linguist/linguistimport.cpp b/kbabel/filters/linguist/linguistimport.cpp index b46f5f97..82dd6ad4 100644 --- a/kbabel/filters/linguist/linguistimport.cpp +++ b/kbabel/filters/linguist/linguistimport.cpp @@ -113,9 +113,9 @@ ConversiontqStatus LinguistImportPlugin::load( const TQString& filename, const T return OK; } -void LinguistImportPlugin::parse( const TQDomElement& tqparentElement ) +void LinguistImportPlugin::parse( const TQDomElement& parentElement ) { - TQDomNode node = tqparentElement.firstChild( ); + TQDomNode node = parentElement.firstChild( ); while ( !node.isNull( ) ) { if ( node.isElement( ) ) { diff --git a/kbabel/filters/linguist/linguistimport.h b/kbabel/filters/linguist/linguistimport.h index fa7aa36c..3f6d8051 100644 --- a/kbabel/filters/linguist/linguistimport.h +++ b/kbabel/filters/linguist/linguistimport.h @@ -56,7 +56,7 @@ class LinguistImportPlugin : public KBabel::CatalogImportPlugin virtual const TQString id( ) { return "TQt translation source"; } private: - void parse( const TQDomElement& tqparentElement ); + void parse( const TQDomElement& parentElement ); private: uint msgcnt; diff --git a/kbabel/filters/xliff/xliffexport.cpp b/kbabel/filters/xliff/xliffexport.cpp index 82033521..187a1dda 100644 --- a/kbabel/filters/xliff/xliffexport.cpp +++ b/kbabel/filters/xliff/xliffexport.cpp @@ -147,7 +147,7 @@ void XLIFFExportPlugin::createMessage( TQDomDocument& doc, TQDomElement& transla TQDomElement XLIFFExportPlugin::getContext( TQDomDocument& doc, const TQString& file, const TQString& id ) { // Find out whether there is already such a context in the TQDomDocument. - TQDomNode tqparentelem = doc.documentElement(); + TQDomNode parentelem = doc.documentElement(); TQDomNode elem = doc.documentElement( ).firstChild( ); while ( !elem.isNull( ) ) { if ( elem.isElement( ) && elem.toElement().tagName( ) == "file" && elem.toElement().attribute ("original") == file ) { @@ -162,12 +162,12 @@ TQDomElement XLIFFExportPlugin::getContext( TQDomDocument& doc, const TQString& kdError () << "File not found at all, creating" << endl; TQDomElement newelem = doc.createElement ("file"); newelem.setAttribute ("original", file); - tqparentelem.appendChild (newelem); + parentelem.appendChild (newelem); elem = newelem; } // lookup body tag - tqparentelem = elem; + parentelem = elem; elem = elem.firstChild (); while ( !elem.isNull( ) ) { if ( elem.isElement( ) && elem.toElement().tagName( ) == "body" ) { @@ -181,7 +181,7 @@ TQDomElement XLIFFExportPlugin::getContext( TQDomDocument& doc, const TQString& { kdError () << "File body not found at all, creating" << endl; TQDomElement newelem = doc.createElement ("body"); - tqparentelem.appendChild (newelem); + parentelem.appendChild (newelem); elem = newelem; } @@ -192,7 +192,7 @@ TQDomElement XLIFFExportPlugin::getContext( TQDomDocument& doc, const TQString& kdError () << "Trans-unit not found at all, creating" << endl; TQDomElement newelem = doc.createElement ("trans-unit"); newelem.setAttribute ("id", id); - tqparentelem.appendChild (newelem); + parentelem.appendChild (newelem); elem = newelem; } diff --git a/kbabel/filters/xliff/xliffimport.cpp b/kbabel/filters/xliff/xliffimport.cpp index 9d14c054..01c39092 100644 --- a/kbabel/filters/xliff/xliffimport.cpp +++ b/kbabel/filters/xliff/xliffimport.cpp @@ -128,9 +128,9 @@ ConversiontqStatus XLIFFImportPlugin::load( const TQString& filename, const TQSt return OK; } -void XLIFFImportPlugin::parse( const TQDomElement& tqparentElement ) +void XLIFFImportPlugin::parse( const TQDomElement& parentElement ) { - TQDomNode node = tqparentElement.firstChild( ); + TQDomNode node = parentElement.firstChild( ); while ( !node.isNull( ) ) { if ( node.isElement( ) ) { diff --git a/kbabel/filters/xliff/xliffimport.h b/kbabel/filters/xliff/xliffimport.h index 2dbe1066..a18a9a82 100644 --- a/kbabel/filters/xliff/xliffimport.h +++ b/kbabel/filters/xliff/xliffimport.h @@ -56,7 +56,7 @@ class XLIFFImportPlugin : public KBabel::CatalogImportPlugin virtual const TQString id( ) { return "XLIFF 1.1"; } private: - void parse( const TQDomElement& tqparentElement ); + void parse( const TQDomElement& parentElement ); private: uint msgcnt; diff --git a/kbabel/kbabel/colorpreferences.ui b/kbabel/kbabel/colorpreferences.ui index d2c89da6..ae8e57fe 100644 --- a/kbabel/kbabel/colorpreferences.ui +++ b/kbabel/kbabel/colorpreferences.ui @@ -175,7 +175,7 @@ phrases.</qt> - + kcolorbutton.h kcolorbutton.h diff --git a/kbabel/kbabel/editordiffpreferences.ui b/kbabel/kbabel/editordiffpreferences.ui index c1e6caa9..33460635 100644 --- a/kbabel/kbabel/editordiffpreferences.ui +++ b/kbabel/kbabel/editordiffpreferences.ui @@ -184,7 +184,7 @@ init() - + kcolorbutton.h kcolorbutton.h diff --git a/kbabel/kbabel/editorpreferences.ui b/kbabel/kbabel/editorpreferences.ui index f47a5c56..15498f32 100644 --- a/kbabel/kbabel/editorpreferences.ui +++ b/kbabel/kbabel/editorpreferences.ui @@ -345,7 +345,7 @@ activated, you will still see a message in the statusbar. ledWarning( bool show ) toggleOther( bool other ) - + toolselectionwidget.h kcolorbutton.h diff --git a/kbabel/kbabel/fontpreferences.ui b/kbabel/kbabel/fontpreferences.ui index 4ef37af7..22b49455 100644 --- a/kbabel/kbabel/fontpreferences.ui +++ b/kbabel/kbabel/fontpreferences.ui @@ -59,5 +59,5 @@ showOnlyFixedFonts( bool on ) - + diff --git a/kbabel/kbabel/headerwidget.ui b/kbabel/kbabel/headerwidget.ui index 303d6426..344ef7f0 100644 --- a/kbabel/kbabel/headerwidget.ui +++ b/kbabel/kbabel/headerwidget.ui @@ -56,7 +56,7 @@ - + ktextedit.h ktextedit.h diff --git a/kbabel/kbabel/mymultilineedit.h b/kbabel/kbabel/mymultilineedit.h index 10592b0c..bc0075d0 100644 --- a/kbabel/kbabel/mymultilineedit.h +++ b/kbabel/kbabel/mymultilineedit.h @@ -253,7 +253,7 @@ private: TQRect mapToView( int para, int index ); /** - * tests if the character in string str at position col is tqmasked with + * tests if the character in string str at position col is masked with * '\' by counting the number of '\' backwards */ static bool isMasked(TQString *str,uint col); diff --git a/kbabel/kbabel/searchpreferences.ui b/kbabel/kbabel/searchpreferences.ui index ee56f125..c00e537f 100644 --- a/kbabel/kbabel/searchpreferences.ui +++ b/kbabel/kbabel/searchpreferences.ui @@ -105,5 +105,5 @@ the desired dictionary from <b>Settings->Configure Dictionary</b> - + diff --git a/kbabel/kbabel/spelldlgwidget.ui b/kbabel/kbabel/spelldlgwidget.ui index 8fa2a06b..1c770064 100644 --- a/kbabel/kbabel/spelldlgwidget.ui +++ b/kbabel/kbabel/spelldlgwidget.ui @@ -122,5 +122,5 @@ endBtn defaultBtn - + diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui b/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui index 5b80967f..3e694330 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui +++ b/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui @@ -1032,5 +1032,5 @@ Finally you can set the maximum number of entries in the list. klocale.h kseparator.h - + diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbse2.ui b/kbabel/kbabeldict/modules/dbsearchengine2/dbse2.ui index ca3b0f90..285319e5 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/dbse2.ui +++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbse2.ui @@ -706,7 +706,7 @@ - + klineedit.h kpushbutton.h diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui b/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui index 6ba04971..fe3b1f6f 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui +++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui @@ -1035,5 +1035,5 @@ Finally you can set the maximum number of entries in the list. klocale.h kseparator.h - + diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/sourcedialog.ui b/kbabel/kbabeldict/modules/dbsearchengine2/sourcedialog.ui index 8c595c07..39e1f2ac 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/sourcedialog.ui +++ b/kbabel/kbabeldict/modules/dbsearchengine2/sourcedialog.ui @@ -251,7 +251,7 @@ reject() - + kpushbutton.h kpushbutton.h diff --git a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp index dab127bf..bc79f082 100644 --- a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp +++ b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp @@ -421,7 +421,7 @@ bool PoCompendium::searchWords(const TQString& searchStr, uint pluralForm, TQPtr if(!found && matchContains && !wholeWords) { - TQString s=tqmaskString(searchStr); + TQString s=maskString(searchStr); TQRegExp searchReg(s); if(searchReg.search(origStr) >= 0) @@ -430,7 +430,7 @@ bool PoCompendium::searchWords(const TQString& searchStr, uint pluralForm, TQPtr if(!found && matchIsContained && !wholeWords) { - TQString s=tqmaskString(origStr); + TQString s=maskString(origStr); TQRegExp reg(s); if(reg.search(searchStr) >= 0) @@ -445,7 +445,7 @@ bool PoCompendium::searchWords(const TQString& searchStr, uint pluralForm, TQPtr for ( TQStringList::Iterator wit2 = list.begin() ; wit2 != list.end(); ++wit2 ) { - TQString s=tqmaskString(*wit2); + TQString s=maskString(*wit2); TQRegExp reg(s); if(reg.search(origStr) >= 0) @@ -491,7 +491,7 @@ bool PoCompendium::searchNGram(const TQString& searchStr, uint pluralForm, TQPtr TQRegExp searchReg; if(matchContains) { - TQString s=tqmaskString(searchStr); + TQString s=maskString(searchStr); searchReg.setPattern(s); } @@ -564,7 +564,7 @@ bool PoCompendium::searchNGram(const TQString& searchStr, uint pluralForm, TQPtr if(!found && matchIsContained) { - TQString s=tqmaskString(origStr); + TQString s=maskString(origStr); TQRegExp reg(s); if(reg.search(searchStr) >= 0) @@ -580,7 +580,7 @@ bool PoCompendium::searchNGram(const TQString& searchStr, uint pluralForm, TQPtr for ( TQStringList::Iterator wit2 = list.begin() ; wit2 != list.end(); ++wit2 ) { - TQString s=tqmaskString(*wit2); + TQString s=maskString(*wit2); if(wholeWords) { @@ -864,7 +864,7 @@ void PoCompendium::recheckData() loading=false; } -TQString PoCompendium::tqmaskString(TQString s) +TQString PoCompendium::maskString(TQString s) { s.tqreplace("\\","\\\\"); s.tqreplace("\?","\\?"); diff --git a/kbabel/kbabeldict/modules/pocompendium/pocompendium.h b/kbabel/kbabeldict/modules/pocompendium/pocompendium.h index 70386572..1b3d1496 100644 --- a/kbabel/kbabeldict/modules/pocompendium/pocompendium.h +++ b/kbabel/kbabeldict/modules/pocompendium/pocompendium.h @@ -99,7 +99,7 @@ protected slots: protected: void loadCompendium(); void addResult(SearchResult *, TQPtrList& allResults); - TQString tqmaskString(TQString string); + TQString maskString(TQString string); void registerData(); void unregisterData(); diff --git a/kbabel/kbabeldict/modules/tmx/pwidget.ui b/kbabel/kbabeldict/modules/tmx/pwidget.ui index ab3fd636..9d0d4281 100644 --- a/kbabel/kbabeldict/modules/tmx/pwidget.ui +++ b/kbabel/kbabeldict/modules/tmx/pwidget.ui @@ -209,7 +209,7 @@ kseparator.h - + kurlrequester.h diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp index f375574c..123935e7 100644 --- a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp +++ b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp @@ -389,7 +389,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea if(!found && matchContains && !wholeWords) { - TQString s=tqmaskString(searchStr); + TQString s=maskString(searchStr); TQRegExp searchReg(s); if(searchReg.search(origStr) >= 0) @@ -398,7 +398,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea if(!found && matchIsContained && !wholeWords) { - TQString s=tqmaskString(origStr); + TQString s=maskString(origStr); TQRegExp reg(s); if(reg.search(searchStr) >= 0) @@ -413,7 +413,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea for ( TQStringList::Iterator wit2 = list.begin() ; wit2 != list.end(); ++wit2 ) { - TQString s=tqmaskString(*wit2); + TQString s=maskString(*wit2); TQRegExp reg(s); if(reg.search(origStr) >= 0) @@ -454,7 +454,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea TQRegExp searchReg; if(matchContains) { - TQString s=tqmaskString(searchStr); + TQString s=maskString(searchStr); searchReg.setPattern(s); } @@ -523,7 +523,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea if(!found && matchIsContained) { - TQString s=tqmaskString(origStr); + TQString s=maskString(origStr); TQRegExp reg(s); if(reg.search(searchStr) >= 0) @@ -538,7 +538,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea for ( TQStringList::Iterator wit2 = list.begin() ; wit2 != list.end(); ++wit2 ) { - TQString s=tqmaskString(*wit2); + TQString s=maskString(*wit2); if(wholeWords) { @@ -746,7 +746,7 @@ void TmxCompendium::recheckData() loading=false; } -TQString TmxCompendium::tqmaskString(TQString s) const +TQString TmxCompendium::maskString(TQString s) const { s.tqreplace('\\',"\\\\"); s.tqreplace('?',"\\?"); diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendium.h b/kbabel/kbabeldict/modules/tmx/tmxcompendium.h index e6b76f53..8e96fbd5 100644 --- a/kbabel/kbabeldict/modules/tmx/tmxcompendium.h +++ b/kbabel/kbabeldict/modules/tmx/tmxcompendium.h @@ -97,7 +97,7 @@ protected slots: protected: void loadCompendium(); void addResult(SearchResult *); - TQString tqmaskString(TQString string) const; + TQString maskString(TQString string) const; void registerData(); void unregisterData(); diff --git a/kbugbuster/backend/bugcache.cpp b/kbugbuster/backend/bugcache.cpp index 1ce73241..b2d13814 100644 --- a/kbugbuster/backend/bugcache.cpp +++ b/kbugbuster/backend/bugcache.cpp @@ -75,7 +75,7 @@ Package::List BugCache::loadPackageList() return pkgs; } -void BugCache::tqinvalidatePackageList() +void BugCache::invalidatePackageList() { // Completely wipe out packages.cache TQStringList packages = m_cachePackages->groupList(); @@ -158,9 +158,9 @@ Bug::List BugCache::loadBugList( const Package &pkg, const TQString &component, return bugList; } -void BugCache::tqinvalidateBugList( const Package& pkg, const TQString &component ) +void BugCache::invalidateBugList( const Package& pkg, const TQString &component ) { - kdDebug() << "BugCache::tqinvalidateBugList " << pkg.name() + kdDebug() << "BugCache::invalidateBugList " << pkg.name() << " (" << component << ")" << endl; // Erase bug list for this package @@ -249,7 +249,7 @@ BugDetails BugCache::loadBugDetails( const Bug &bug ) parts ) ); } -void BugCache::tqinvalidateBugDetails( const Bug& bug ) +void BugCache::invalidateBugDetails( const Bug& bug ) { m_cacheBugs->deleteGroup( bug.number(), true ); } diff --git a/kbugbuster/backend/bugcache.h b/kbugbuster/backend/bugcache.h index ec317ca8..bef22493 100644 --- a/kbugbuster/backend/bugcache.h +++ b/kbugbuster/backend/bugcache.h @@ -15,15 +15,15 @@ class BugCache void savePackageList( const Package::List &pkgs ); Package::List loadPackageList(); - void tqinvalidatePackageList(); + void invalidatePackageList(); void saveBugList( const Package &pkg, const TQString &component, const Bug::List & ); Bug::List loadBugList( const Package &pkg, const TQString &component, bool disconnected ); - void tqinvalidateBugList( const Package &pkg, const TQString &component ); + void invalidateBugList( const Package &pkg, const TQString &component ); void saveBugDetails( const Bug &bug, const BugDetails & ); BugDetails loadBugDetails( const Bug &bug ); - void tqinvalidateBugDetails( const Bug &bug ); + void invalidateBugDetails( const Bug &bug ); bool hasBugDetails( const Bug& bug ) const; void clear(); diff --git a/kbugbuster/backend/bugserver.cpp b/kbugbuster/backend/bugserver.cpp index a5d31bbf..37089623 100644 --- a/kbugbuster/backend/bugserver.cpp +++ b/kbugbuster/backend/bugserver.cpp @@ -270,13 +270,13 @@ void BugServer::sendCommands( MailSender *mailer, const TQString &senderName, } if (!bug.isNull()) { mCommandsFile->deleteGroup( bug.number(), true ); // done, remove command - mCache->tqinvalidateBugDetails( bug ); + mCache->invalidateBugDetails( bug ); if ( !pkg.isNull() ) { - mCache->tqinvalidateBugList( pkg, TQString() ); // the status of the bug comes from the buglist... + mCache->invalidateBugList( pkg, TQString() ); // the status of the bug comes from the buglist... TQStringList::ConstIterator it2; for (it2 = pkg.components().begin();it2 != pkg.components().end();++it2) { - mCache->tqinvalidateBugList( pkg, (*it2) ); // the status of the bug comes from the buglist... + mCache->invalidateBugList( pkg, (*it2) ); // the status of the bug comes from the buglist... } } } diff --git a/kbugbuster/gui/centralwidget.cpp b/kbugbuster/gui/centralwidget.cpp index 6ceebe0f..1813d627 100644 --- a/kbugbuster/gui/centralwidget.cpp +++ b/kbugbuster/gui/centralwidget.cpp @@ -296,14 +296,14 @@ void CentralWidget::updateBugDetails( const Bug &bug, const BugDetails &bd ) void CentralWidget::slotReloadPackageList() { - BugSystem::self()->cache()->tqinvalidatePackageList(); + BugSystem::self()->cache()->invalidatePackageList(); BugSystem::self()->retrievePackageList(); } void CentralWidget::slotReloadPackage() { if (!m_currentPackage.isNull()) { - BugSystem::self()->cache()->tqinvalidateBugList( m_currentPackage, m_currentComponent ); + BugSystem::self()->cache()->invalidateBugList( m_currentPackage, m_currentComponent ); BugSystem::self()->retrieveBugList( m_currentPackage, m_currentComponent ); } } @@ -316,7 +316,7 @@ void CentralWidget::slotLoadMyBugs() void CentralWidget::slotReloadBug() { if (!m_currentBug.isNull()) { - BugSystem::self()->cache()->tqinvalidateBugDetails( m_currentBug ); + BugSystem::self()->cache()->invalidateBugDetails( m_currentBug ); BugSystem::self()->retrieveBugDetails( m_currentBug ); } } diff --git a/kbugbuster/gui/centralwidget_base.ui b/kbugbuster/gui/centralwidget_base.ui index 8a1e3e0d..969709aa 100644 --- a/kbugbuster/gui/centralwidget_base.ui +++ b/kbugbuster/gui/centralwidget_base.ui @@ -232,5 +232,5 @@ 789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758 - + diff --git a/kbugbuster/gui/cwbugdetailscontainer_base.ui b/kbugbuster/gui/cwbugdetailscontainer_base.ui index 30eabb06..338a0b7b 100644 --- a/kbugbuster/gui/cwbugdetailscontainer_base.ui +++ b/kbugbuster/gui/cwbugdetailscontainer_base.ui @@ -240,5 +240,5 @@ 789c6dd2c10ac2300c00d07bbf2234b7229d1ddec44f503c0ae2a154410f53d0ed20e2bf6bdb656dd6861dd23d9a66591b0587fd1654235ebded6f0edcd53e419d87ae7b1f4f9b8f906d0bfe012317426a70b07bdc2f3ec77f8ed6b89559061a0343d06a124cc105596482585094bc0ae599b04646c9018926491b2205e140c485cace25755c175d0a967b622ff900b8cc9c7d29af594ea722d589167f813aa852ba07d94b9dce296e883fe7bb163f23896753 - + diff --git a/kbugbuster/gui/cwsearchwidget_base.ui b/kbugbuster/gui/cwsearchwidget_base.ui index 5f386680..8b09cb74 100644 --- a/kbugbuster/gui/cwsearchwidget_base.ui +++ b/kbugbuster/gui/cwsearchwidget_base.ui @@ -194,5 +194,5 @@ kcombobox.h - + diff --git a/kcachegrind/kcachegrind/callgraphview.cpp b/kcachegrind/kcachegrind/callgraphview.cpp index c66c5809..99613171 100644 --- a/kcachegrind/kcachegrind/callgraphview.cpp +++ b/kcachegrind/kcachegrind/callgraphview.cpp @@ -369,7 +369,7 @@ TraceCall* GraphEdge::priorVisible() // GraphOptions // -TQString GraphOptions::tqlayoutString(Layout l) +TQString GraphOptions::layoutString(Layout l) { if (l == Circular) return TQString("Circular"); if (l == LeftRight) return TQString("LeftRight"); @@ -1313,8 +1313,8 @@ protected: void CallGraphTip::maybeTip( const TQPoint& pos ) { - if (!tqparentWidget()->inherits( "CallGraphView" )) return; - CallGraphView* cgv = (CallGraphView*)tqparentWidget(); + if (!parentWidget()->inherits( "CallGraphView" )) return; + CallGraphView* cgv = (CallGraphView*)parentWidget(); TQPoint cPos = cgv->viewportToContents(pos); @@ -1367,9 +1367,9 @@ void CallGraphTip::maybeTip( const TQPoint& pos ) // // CallGraphView // -CallGraphView::CallGraphView(TraceItemView* tqparentView, +CallGraphView::CallGraphView(TraceItemView* parentView, TQWidget* tqparent, const char* name) - : TQCanvasView(tqparent, name), TraceItemView(tqparentView) + : TQCanvasView(tqparent, name), TraceItemView(parentView) { _zoomPosition = DEFAULT_ZOOMPOS; _lastAutoPosition = TopLeft; @@ -1786,7 +1786,7 @@ void CallGraphView::showRenderWarning() TQString s; if (_renderProcess) - s =i18n("Warning: a long lasting graph tqlayouting is in progress.\n" + s =i18n("Warning: a long lasting graph layouting is in progress.\n" "Reduce node/edge limits for speedup.\n"); else s = i18n("Layouting stopped.\n"); @@ -1878,7 +1878,7 @@ void CallGraphView::refresh() _unparsedOutput = TQString(); - // tqlayouting of more than seconds is dubious + // layouting of more than seconds is dubious _renderTimer.start(1000, true); } @@ -2195,7 +2195,7 @@ void CallGraphView::dotExited() if (!_canvas) { _canvas = new TQCanvas(size().width(),size().height()); - TQString s = i18n("Error running the graph tqlayouting tool.\n"); + TQString s = i18n("Error running the graph layouting tool.\n"); s += i18n("Please check that 'dot' is installed (package GraphViz)."); TQCanvasText* t = new TQCanvasText(s, _canvas); t->move(5, 5); @@ -2702,7 +2702,7 @@ void CallGraphView::readViewConfig(KConfig* c, DEFAULT_CLUSTERGROUPS); _detailLevel = g->readNumEntry("DetailLevel", DEFAULT_DETAILLEVEL); _layout = GraphOptions::tqlayout(g->readEntry("Layout", - tqlayoutString(DEFAULT_LAYOUT))); + layoutString(DEFAULT_LAYOUT))); _zoomPosition = zoomPos(g->readEntry("ZoomPosition", zoomPosString(DEFAULT_ZOOMPOS))); @@ -2724,7 +2724,7 @@ void CallGraphView::saveViewConfig(KConfig* c, DEFAULT_CLUSTERGROUPS); writeConfigEntry(&g, "DetailLevel", _detailLevel, DEFAULT_DETAILLEVEL); writeConfigEntry(&g, "Layout", - tqlayoutString(_layout), tqlayoutString(DEFAULT_LAYOUT).utf8().data()); + layoutString(_layout), layoutString(DEFAULT_LAYOUT).utf8().data()); writeConfigEntry(&g, "ZoomPosition", zoomPosString(_zoomPosition), zoomPosString(DEFAULT_ZOOMPOS).utf8().data()); diff --git a/kcachegrind/kcachegrind/callgraphview.h b/kcachegrind/kcachegrind/callgraphview.h index 2e15022d..f2e567c1 100644 --- a/kcachegrind/kcachegrind/callgraphview.h +++ b/kcachegrind/kcachegrind/callgraphview.h @@ -169,7 +169,7 @@ class GraphOptions virtual int detailLevel() = 0; virtual Layout tqlayout() = 0; - static TQString tqlayoutString(Layout); + static TQString layoutString(Layout); static Layout tqlayout(TQString); }; @@ -240,7 +240,7 @@ public: // calls createGraph before dumping of not already created void writeDot(); - // to map back to structures when parsing a tqlayouted graph + // to map back to structures when parsing a layouted graph /* is a helper for node() and edge(). * Don't use the returned pointer directly, but only with @@ -422,7 +422,7 @@ class CallGraphView: public TQCanvasView, public TraceItemView, public: enum ZoomPosition { TopLeft, TopRight, BottomLeft, BottomRight, Auto }; - CallGraphView(TraceItemView* tqparentView, + CallGraphView(TraceItemView* parentView, TQWidget* tqparent=0, const char* name=0); ~CallGraphView(); diff --git a/kcachegrind/kcachegrind/callmapview.cpp b/kcachegrind/kcachegrind/callmapview.cpp index 53727a2d..605e572e 100644 --- a/kcachegrind/kcachegrind/callmapview.cpp +++ b/kcachegrind/kcachegrind/callmapview.cpp @@ -50,9 +50,9 @@ #define DEFAULT_MAXAREA 100 -CallMapView::CallMapView(bool showCallers, TraceItemView* tqparentView, +CallMapView::CallMapView(bool showCallers, TraceItemView* parentView, TQWidget* tqparent, const char* name) - : TreeMapWidget(new CallMapBaseItem(), tqparent, name), TraceItemView(tqparentView) + : TreeMapWidget(new CallMapBaseItem(), tqparent, name), TraceItemView(parentView) { _showCallers = showCallers; diff --git a/kcachegrind/kcachegrind/callmapview.h b/kcachegrind/kcachegrind/callmapview.h index 4bff8857..67cecb6d 100644 --- a/kcachegrind/kcachegrind/callmapview.h +++ b/kcachegrind/kcachegrind/callmapview.h @@ -34,7 +34,7 @@ class CallMapView: public TreeMapWidget, public TraceItemView public: - CallMapView(bool showCallers, TraceItemView* tqparentView, + CallMapView(bool showCallers, TraceItemView* parentView, TQWidget* tqparent=0, const char* name=0); TQWidget* widget() { return this; } diff --git a/kcachegrind/kcachegrind/callview.cpp b/kcachegrind/kcachegrind/callview.cpp index 0329fefe..11da69e4 100644 --- a/kcachegrind/kcachegrind/callview.cpp +++ b/kcachegrind/kcachegrind/callview.cpp @@ -35,9 +35,9 @@ // -CallView::CallView(bool showCallers, TraceItemView* tqparentView, +CallView::CallView(bool showCallers, TraceItemView* parentView, TQWidget* tqparent, const char* name) - : TQListView(tqparent, name), TraceItemView(tqparentView) + : TQListView(tqparent, name), TraceItemView(parentView) { _showCallers = showCallers; diff --git a/kcachegrind/kcachegrind/callview.h b/kcachegrind/kcachegrind/callview.h index 9d20d95f..b18e6c3c 100644 --- a/kcachegrind/kcachegrind/callview.h +++ b/kcachegrind/kcachegrind/callview.h @@ -33,7 +33,7 @@ class CallView: public TQListView, public TraceItemView TQ_OBJECT public: - CallView(bool showCallers, TraceItemView* tqparentView, + CallView(bool showCallers, TraceItemView* parentView, TQWidget* tqparent=0, const char* name=0); virtual TQWidget* widget() { return this; } diff --git a/kcachegrind/kcachegrind/configdlgbase.ui b/kcachegrind/kcachegrind/configdlgbase.ui index b2a818ac..9e5c0b59 100644 --- a/kcachegrind/kcachegrind/configdlgbase.ui +++ b/kcachegrind/kcachegrind/configdlgbase.ui @@ -649,5 +649,5 @@ kcolorbutton.h - + diff --git a/kcachegrind/kcachegrind/costlistitem.h b/kcachegrind/kcachegrind/costlistitem.h index b5607ce6..369a0c74 100644 --- a/kcachegrind/kcachegrind/costlistitem.h +++ b/kcachegrind/kcachegrind/costlistitem.h @@ -45,7 +45,7 @@ private: TraceCostItem* _costItem; // >0 only for last item in list, if items are skipped int _skipped; - // number of items in group, is put in tqparenthesis after name + // number of items in group, is put in parenthesis after name int _groupSize; }; diff --git a/kcachegrind/kcachegrind/costtypeview.cpp b/kcachegrind/kcachegrind/costtypeview.cpp index 28558f6c..ff69bf47 100644 --- a/kcachegrind/kcachegrind/costtypeview.cpp +++ b/kcachegrind/kcachegrind/costtypeview.cpp @@ -35,9 +35,9 @@ // -CostTypeView::CostTypeView(TraceItemView* tqparentView, +CostTypeView::CostTypeView(TraceItemView* parentView, TQWidget* tqparent, const char* name) - : TQListView(tqparent, name), TraceItemView(tqparentView) + : TQListView(tqparent, name), TraceItemView(parentView) { addColumn( i18n( "Event Type" ) ); addColumn( i18n( "Incl." ) ); diff --git a/kcachegrind/kcachegrind/costtypeview.h b/kcachegrind/kcachegrind/costtypeview.h index 3a68a6c7..8940b3c7 100644 --- a/kcachegrind/kcachegrind/costtypeview.h +++ b/kcachegrind/kcachegrind/costtypeview.h @@ -33,7 +33,7 @@ class CostTypeView: public TQListView, public TraceItemView TQ_OBJECT public: - CostTypeView(TraceItemView* tqparentView, + CostTypeView(TraceItemView* parentView, TQWidget* tqparent=0, const char* name=0); virtual TQWidget* widget() { return this; } diff --git a/kcachegrind/kcachegrind/coverageview.cpp b/kcachegrind/kcachegrind/coverageview.cpp index 460a4969..ba6ce77f 100644 --- a/kcachegrind/kcachegrind/coverageview.cpp +++ b/kcachegrind/kcachegrind/coverageview.cpp @@ -36,9 +36,9 @@ // -CoverageView::CoverageView(bool showCallers, TraceItemView* tqparentView, +CoverageView::CoverageView(bool showCallers, TraceItemView* parentView, TQWidget* tqparent, const char* name) - : TQListView(tqparent, name), TraceItemView(tqparentView) + : TQListView(tqparent, name), TraceItemView(parentView) { _showCallers = showCallers; @@ -108,7 +108,7 @@ TQString CoverageView::whatsThis() const "

As there can be many calls from the same function, " "the distance column sometimes shows " "the range of distances for all " - "calls happening; then, in tqparentheses, there is the " + "calls happening; then, in parentheses, there is the " "medium distance, i.e. the distance where most of the " "call costs happened.

" @@ -138,7 +138,7 @@ TQString CoverageView::whatsThis() const "

As there can be many calls to the same function, " "the distance column sometimes shows " "the range of distances for all " - "calls happening; then, in tqparentheses, there is the " + "calls happening; then, in parentheses, there is the " "medium distance, i.e. the distance where most of the " "call costs happened.

" diff --git a/kcachegrind/kcachegrind/coverageview.h b/kcachegrind/kcachegrind/coverageview.h index 64b56c4a..0be96e85 100644 --- a/kcachegrind/kcachegrind/coverageview.h +++ b/kcachegrind/kcachegrind/coverageview.h @@ -34,7 +34,7 @@ class CoverageView: public TQListView, public TraceItemView TQ_OBJECT public: - CoverageView(bool showCallers, TraceItemView* tqparentView, + CoverageView(bool showCallers, TraceItemView* parentView, TQWidget* tqparent=0, const char* name=0); virtual TQWidget* widget() { return this; } diff --git a/kcachegrind/kcachegrind/dumpselectionbase.ui b/kcachegrind/kcachegrind/dumpselectionbase.ui index a56e582c..0643eed7 100644 --- a/kcachegrind/kcachegrind/dumpselectionbase.ui +++ b/kcachegrind/kcachegrind/dumpselectionbase.ui @@ -1078,5 +1078,5 @@ - + diff --git a/kcachegrind/kcachegrind/functionselectionbase.ui b/kcachegrind/kcachegrind/functionselectionbase.ui index 606fb1cd..3ab3378d 100644 --- a/kcachegrind/kcachegrind/functionselectionbase.ui +++ b/kcachegrind/kcachegrind/functionselectionbase.ui @@ -159,5 +159,5 @@ - + diff --git a/kcachegrind/kcachegrind/instrview.cpp b/kcachegrind/kcachegrind/instrview.cpp index 24e83cf6..aea8c0f5 100644 --- a/kcachegrind/kcachegrind/instrview.cpp +++ b/kcachegrind/kcachegrind/instrview.cpp @@ -110,9 +110,9 @@ static bool parseLine(char* buf, Addr& addr, // -InstrView::InstrView(TraceItemView* tqparentView, +InstrView::InstrView(TraceItemView* parentView, TQWidget* tqparent, const char* name) - : TQListView(tqparent, name), TraceItemView(tqparentView) + : TQListView(tqparent, name), TraceItemView(parentView) { _showHexCode = DEFAULT_SHOWHEXCODE; _lastHexCodeWidth = 50; diff --git a/kcachegrind/kcachegrind/instrview.h b/kcachegrind/kcachegrind/instrview.h index fa175ae4..86d011cc 100644 --- a/kcachegrind/kcachegrind/instrview.h +++ b/kcachegrind/kcachegrind/instrview.h @@ -36,7 +36,7 @@ class InstrView : public TQListView, public TraceItemView TQ_OBJECT public: - InstrView(TraceItemView* tqparentView, + InstrView(TraceItemView* parentView, TQWidget* tqparent = 0, const char* name = 0); virtual TQWidget* widget() { return this; } diff --git a/kcachegrind/kcachegrind/partselectionbase.ui b/kcachegrind/kcachegrind/partselectionbase.ui index 88f74ead..5ee69746 100644 --- a/kcachegrind/kcachegrind/partselectionbase.ui +++ b/kcachegrind/kcachegrind/partselectionbase.ui @@ -85,5 +85,5 @@ 789c9597db4e1d4b0e86eff31428be8b46b5fb54dd551acd051020211c4320c0682eecaa5e9ccf90005bf3ee53cbbfe9d9c9c548a38ea27c2977b5cbfe6dd7fae3c3c2e1cee6c2873fde3d3cf2e3595a48a77cbff0213f5d5dbdfcf35ffff8f3ddfba65998fff161a179ffb777ef771f17d2c2d6cdf53807c705a889cdac6ee72c47736eebd637b5f2b672d70ecd30e744ca7d9b9a4ad7579587363433e527e5d072abefbb03636978ceb4a31c5bc13a91716ad41f89e0aec2fe74abcc6d6ad5f9e4945357375ef75f997357751dd61d19c71afb61bdef421b951f274ebaffb6716cb3f2b2f230f18d3183dd95b1b441d7d59f2e94757ccf1b27eceff69563618d0f5dcfd9d7beeb7a5dd7f3fac6fb4ee32b87c619f1168d976f7d6ff6df26d6ef4b301e1bac7f54f63e747a5e87f5c173276aff605c22a8fefc540e5e3af5972f956359577bf2c6d978cb78d6697edc9eb2f8b143fed7945359d778b0e6c3e7be81bf7465dce23cf4ac3c16567f19fecefaae53bd081b7baccbb131b7d05f679ca03f27c6b9d1f388c6bbaffab7f80dca4d1fed7bfafdbeedb9533d490f1e2ae8d5693ccacb83d77cd027e3d4416faa97beefa3d7f8f086f168f9d9020f43a3f5c5aa877e28eb88f74fe319becfaa873e0c15de775f95639f3dec37c143d361bf2be3cef4b76bdcb7d84ff5d2cbd0227facf1ecd360fa67d54b9f078ffcd10f636e11ff53e3847853ad3c1b668837e9fe43358c2df45a81430b3db2e6676842d368fd48abdc068b87e0fd2e788bf792b21f861e7afd0e0e5ce37dcdd7d0872218e5d789f57b3218a71ae7bb501eca3af67b510e21c05fd27a1b6218ac3ef17d0ed68fe8cb1be3fc6e5159863ca0bfed824340fe687d62c4838c23f677f0370de380fcdd2be7e03dfab1d6cf300bcd80fa80bfb358dbf9547fa18abe413d68fe421d63ade7737aded094cf63fdcc38f4d0bfee17dac2d08380a3a0dff24cb90bdc23ffaa87e0636c912fed87612e38d4df1e982bc4dbdd29872001f14aca319413eb793e83cbfbe8af27606e4c0f5f8d3bcb7763ec6b8da73b57e69083d61f9d82b9b5fada31f635fcaf8d7b7b5ffb41f16e34ff34fe214dfc0c8e1ef1a22330bfcdc345e31e4c33e3c1e6e181b1609e3ac43f8759803e8cd9f2e7e0ff18ab80ef5d8239e2fc0ef129f90ff0bf0773347fee8d13ce279bc6b34af5c61abf58157bf4b765b05435f4abfec726968c2b67e536fa80fe388279067f680d2c750dff75fe9766da07e44bc02521ba4e1d584c1fb261dcc23fd97f63f8c3af136bfc687362c4e76962ed8fac7a2ecdb7853f7c63ec6bf467bd3fc421c680780c60b6f9275fc045aea84fadaf18a2e0fc04ff0237bd9e8fefc0d236e8ef3f8d83c57fdd38daf94edeb886be74fec618b3ed7f3731e66b0fe67a403e76c0454ef8de9231dbfe9f8dc5fc47be38a6887ad2f950964d2fdc1a27d3c7b6710693f6ef9864b4fdb4ffc6cc5540fea0972c339c87afc1c9f4443a5fe2c84d40bd2f82cb3ae6c7b1716dbc37b1e68bf5be118b7e3dead78125d87d0bfa99bd7d8fb78c1bdb4fcfcfd51bcb9d716bebda3fb8966cf7cf57709103f2e327c6fe5a2fdc4ab4fb01deef5283fa65d50ffb54c13fd67ec37d61e845fb070f8571df7c341eec7e7a691c6ae453fb771937d1fa999ebfa43358bf573d3327c6fdd0a9de59b87414e59f60911ef3ff07380d16bf0b63b6fbb8ce0f4e523a80ee8ff8a5f21fe83f384f2e8cf9d419db7d4bb4bff32cb1dd871ae38c79417962dd9f8f2786bfaa3fa992ddbf68d5d8d6797d62dc27b4bf4a9bdeee5be7c619efbb169c2b9bb7aa67e972857a67d59bf8943cf4a6f5237dae3b9c3f4f8cef5713637e6a3c6548e546a7eb87e0b28e7cf7c68ddd2fb15f28acf166bd2f484c19f921f8cbc57de84ff52c397b8f7e178d7bbb7f7e9f18f743d593ccd210d12f9e8c05fd8417c1e5e704e2afefa7aa5cf850ff4fc6a1473debfc4d7561c4ebd3c48897f69fd4e4d8eb7e4efb736a0b23fe9adfd465bb3f388d6ff22933fa1df6f7597ad483c62371f6e6ff8671b6f89e198fb8cfb0ea3f49619c6f6562cc27d5474a7906e6b589d1df549f29e78479450fe0b1c2fc67d5731a0ba33ffc97a167fd7d92ebb1b1f9a87acdcdd8a23ff2e3c4a81fed0fb91bbb88f8e9f772f9b9c6b8bfac187bd41febbcc8c35831f4bb6edc227eeec8b847bc58ef0f398d91a1179d6f391746bdebfd60ac4716b0180bd8a97e473f8ea2dfdb7d9c3f8e1cff8f8760057b27e57f92cb6e743377e24efff29cb97377e12edd55b190c99eddb5bb71b7eeceddbb07f7e89edc0ff7d33dbb17f7ea16dd925b761fdd8a63d8174f52b15e756bee93fbecd6dd17b7e136dd96db763b6ed77d2dd67bee9bdb77078ed49e8b27b7c5fabb3b7447eed855ae768d6bcbd339ef7a37b8e022392a2734fbd1dd119350a24c23cde8844ee98ccee9c2f9c2977445d77443b793fd8ceee89e1ee8919ee807fdb4e7995ee8b5d82fd252b15ffe8bfd097da4155aa535fa34597fa6f5f2f717da28f69bb445dbb433d99fd22e7da53dfa3659efd3017da7c3f2af233aa68aeadfec1b6aa9236fd63d0d14ca15c0719913737b965fedcbf0c83cc29a677cc2a77cc6e77cc1977cc5d7c5fee637fbdbb2db9d5adff343b17ee427fec1737ee69762fffa9bfd222ff17259fdc82bbcca6bfc893ff33a7fe10ddee42ddee69ddfec77f92beff137dee703fece877cc4c7aee58a6b6ee8b8fc10ed7eb13f635f9a4bc5e54719477152ba671977a505c84845c57222a7bfd89fcb999ccb855cca955cbfc5546ee456ee68b14cf67b799047799aec2fdc92fc28999cef567224cff222afb2c85b32e36d599265f9282bb23ad95fba6559934f2593f3e798b74acc8fd5f6b3accb17d9904dd9926db3a7520d1fdd37d9915df95a72599e1291566df7e49beccb817c974339829eb55e56dc7e51ec0d2dcbb1545297a791563af1c5eff2d3beb4faf8562f568f0744745b9e9d5f1f7992d5e412a186ffef7afff7dfdffd077c99ae99 - + diff --git a/kcachegrind/kcachegrind/partview.cpp b/kcachegrind/kcachegrind/partview.cpp index 24262885..60a96bac 100644 --- a/kcachegrind/kcachegrind/partview.cpp +++ b/kcachegrind/kcachegrind/partview.cpp @@ -37,9 +37,9 @@ // -PartView::PartView(TraceItemView* tqparentView, +PartView::PartView(TraceItemView* parentView, TQWidget* tqparent, const char* name) - : TQListView(tqparent, name), TraceItemView(tqparentView) + : TQListView(tqparent, name), TraceItemView(parentView) { _inSelectionUpdate = false; diff --git a/kcachegrind/kcachegrind/partview.h b/kcachegrind/kcachegrind/partview.h index 0d4e882c..06de9bf7 100644 --- a/kcachegrind/kcachegrind/partview.h +++ b/kcachegrind/kcachegrind/partview.h @@ -33,7 +33,7 @@ class PartView: public TQListView, public TraceItemView TQ_OBJECT public: - PartView(TraceItemView* tqparentView, + PartView(TraceItemView* parentView, TQWidget* tqparent=0, const char* name=0); virtual TQWidget* widget() { return this; } diff --git a/kcachegrind/kcachegrind/sourceview.cpp b/kcachegrind/kcachegrind/sourceview.cpp index cdd3589c..be171d90 100644 --- a/kcachegrind/kcachegrind/sourceview.cpp +++ b/kcachegrind/kcachegrind/sourceview.cpp @@ -37,9 +37,9 @@ // -SourceView::SourceView(TraceItemView* tqparentView, +SourceView::SourceView(TraceItemView* parentView, TQWidget* tqparent, const char* name) - : TQListView(tqparent, name), TraceItemView(tqparentView) + : TQListView(tqparent, name), TraceItemView(parentView) { _inSelectionUpdate = false; diff --git a/kcachegrind/kcachegrind/sourceview.h b/kcachegrind/kcachegrind/sourceview.h index 4c40b13d..2e2c0386 100644 --- a/kcachegrind/kcachegrind/sourceview.h +++ b/kcachegrind/kcachegrind/sourceview.h @@ -36,7 +36,7 @@ class SourceView : public TQListView, public TraceItemView TQ_OBJECT public: - SourceView(TraceItemView* tqparentView, + SourceView(TraceItemView* parentView, TQWidget* tqparent = 0, const char* name = 0); TQWidget* widget() { return this; } diff --git a/kcachegrind/kcachegrind/stackselectionbase.ui b/kcachegrind/kcachegrind/stackselectionbase.ui index 728308a8..c61010f9 100644 --- a/kcachegrind/kcachegrind/stackselectionbase.ui +++ b/kcachegrind/kcachegrind/stackselectionbase.ui @@ -76,5 +76,5 @@ - + diff --git a/kcachegrind/kcachegrind/tabview.cpp b/kcachegrind/kcachegrind/tabview.cpp index d40b284e..41accc9c 100644 --- a/kcachegrind/kcachegrind/tabview.cpp +++ b/kcachegrind/kcachegrind/tabview.cpp @@ -228,9 +228,9 @@ void TabWidget::moveEvent(TQMoveEvent* e) * bottomSplitter mainSplitter */ -TabView::TabView(TraceItemView* tqparentView, +TabView::TabView(TraceItemView* parentView, TQWidget* tqparent, const char* name) - : TQWidget(tqparent, name), TraceItemView(tqparentView) + : TQWidget(tqparent, name), TraceItemView(parentView) { setFocusPolicy(TQ_StrongFocus); diff --git a/kcachegrind/kcachegrind/tabview.h b/kcachegrind/kcachegrind/tabview.h index 323464e9..caea8126 100644 --- a/kcachegrind/kcachegrind/tabview.h +++ b/kcachegrind/kcachegrind/tabview.h @@ -114,7 +114,7 @@ class TabView : public TQWidget, public TraceItemView public: - TabView(TraceItemView* tqparentView, + TabView(TraceItemView* parentView, TQWidget* tqparent = 0, const char* name = 0); virtual TQWidget* widget() { return this; } diff --git a/kcachegrind/kcachegrind/toplevel.cpp b/kcachegrind/kcachegrind/toplevel.cpp index cf06a75d..ad5344b5 100644 --- a/kcachegrind/kcachegrind/toplevel.cpp +++ b/kcachegrind/kcachegrind/toplevel.cpp @@ -449,42 +449,42 @@ void TopLevel::createLayoutActions() action = new KAction( i18n( "&Duplicate" ), KShortcut(KKey("Ctrl+Plus")), - TQT_TQOBJECT(this), TQT_SLOT(tqlayoutDuplicate()), - actionCollection(), "tqlayout_duplicate" ); + TQT_TQOBJECT(this), TQT_SLOT(layoutDuplicate()), + actionCollection(), "layout_duplicate" ); hint = i18n("Duplicate Current Layout" "

Make a copy of the current tqlayout.

"); action->setWhatsThis( hint ); action = new KAction( i18n( "&Remove" ), KShortcut(), - TQT_TQOBJECT(this), TQT_SLOT(tqlayoutRemove()), - actionCollection(), "tqlayout_remove" ); + TQT_TQOBJECT(this), TQT_SLOT(layoutRemove()), + actionCollection(), "layout_remove" ); hint = i18n("Remove Current Layout" "

Delete current tqlayout and make the previous active.

"); action->setWhatsThis( hint ); action = new KAction( i18n( "&Go to Next" ), KShortcut(KKey("Ctrl+Right")), - TQT_TQOBJECT(this), TQT_SLOT(tqlayoutNext()), - actionCollection(), "tqlayout_next" ); + TQT_TQOBJECT(this), TQT_SLOT(layoutNext()), + actionCollection(), "layout_next" ); hint = i18n("Go to Next Layout"); action->setWhatsThis( hint ); action = new KAction( i18n( "&Go to Previous" ), KShortcut(KKey("Ctrl+Left")), - TQT_TQOBJECT(this), TQT_SLOT(tqlayoutPrevious()), - actionCollection(), "tqlayout_previous" ); + TQT_TQOBJECT(this), TQT_SLOT(layoutPrevious()), + actionCollection(), "layout_previous" ); hint = i18n("Go to Previous Layout"); action->setWhatsThis( hint ); action = new KAction( i18n( "&Restore to Default" ), KShortcut(), - TQT_TQOBJECT(this), TQT_SLOT(tqlayoutRestore()), - actionCollection(), "tqlayout_restore" ); + TQT_TQOBJECT(this), TQT_SLOT(layoutRestore()), + actionCollection(), "layout_restore" ); hint = i18n("Restore Layouts to Default"); action->setWhatsThis( hint ); action = new KAction( i18n( "&Save as Default" ), KShortcut(), - TQT_TQOBJECT(this), TQT_SLOT(tqlayoutSave()), - actionCollection(), "tqlayout_save" ); + TQT_TQOBJECT(this), TQT_SLOT(layoutSave()), + actionCollection(), "layout_save" ); hint = i18n("Save Layouts as Default"); action->setWhatsThis( hint ); } @@ -920,7 +920,7 @@ void TopLevel::toggleCycles() if (!_data) return; - _data->tqinvalidateDynamicCost(); + _data->invalidateDynamicCost(); _data->updateFunctionCycles(); _partSelection->refresh(); @@ -1744,7 +1744,7 @@ void TopLevel::restoreTraceTypes() KConfigGroup aConfig(KGlobal::config(), TQCString("Layouts")); _layoutCount = aConfig.readNumEntry(TQString("Count%1").tqarg(key), 0); _layoutCurrent = aConfig.readNumEntry(TQString("Current%1").tqarg(key), 0); - if (_layoutCount == 0) tqlayoutRestore(); + if (_layoutCount == 0) layoutRestore(); updateLayoutActions(); } @@ -1778,7 +1778,7 @@ void TopLevel::restoreTraceSettings() /* Layout */ -void TopLevel::tqlayoutDuplicate() +void TopLevel::layoutDuplicate() { // save current and allocate a new slot _multiView->saveViewConfig(KGlobal::config(), @@ -1789,10 +1789,10 @@ void TopLevel::tqlayoutDuplicate() updateLayoutActions(); - kdDebug() << "TopLevel::tqlayoutDuplicate: count " << _layoutCount << endl; + kdDebug() << "TopLevel::layoutDuplicate: count " << _layoutCount << endl; } -void TopLevel::tqlayoutRemove() +void TopLevel::layoutRemove() { if (_layoutCount <2) return; @@ -1807,7 +1807,7 @@ void TopLevel::tqlayoutRemove() updateLayoutActions(); } -void TopLevel::tqlayoutNext() +void TopLevel::layoutNext() { if (_layoutCount <2) return; @@ -1824,11 +1824,11 @@ void TopLevel::tqlayoutNext() TQString("Layout%1-MainView").tqarg(_layoutCurrent), key, false); - if (0) kdDebug() << "TopLevel::tqlayoutNext: current " + if (0) kdDebug() << "TopLevel::layoutNext: current " << _layoutCurrent << endl; } -void TopLevel::tqlayoutPrevious() +void TopLevel::layoutPrevious() { if (_layoutCount <2) return; @@ -1845,11 +1845,11 @@ void TopLevel::tqlayoutPrevious() TQString("Layout%1-MainView").tqarg(_layoutCurrent), key, false); - if (0) kdDebug() << "TopLevel::tqlayoutPrevious: current " + if (0) kdDebug() << "TopLevel::layoutPrevious: current " << _layoutCurrent << endl; } -void TopLevel::tqlayoutSave() +void TopLevel::layoutSave() { KConfig* config = KGlobal::config(); TQString key = traceKey(); @@ -1876,7 +1876,7 @@ void TopLevel::tqlayoutSave() aConfig.writeEntry("DefaultCurrent", _layoutCurrent); } -void TopLevel::tqlayoutRestore() +void TopLevel::layoutRestore() { KConfig* config = KGlobal::config(); KConfigGroup aConfig(config, TQCString("Layouts")); @@ -1909,13 +1909,13 @@ void TopLevel::updateLayoutActions() { KAction* ka; - ka = actionCollection()->action("tqlayout_next"); + ka = actionCollection()->action("layout_next"); if (ka) ka->setEnabled(_layoutCount>1); - ka = actionCollection()->action("tqlayout_previous"); + ka = actionCollection()->action("layout_previous"); if (ka) ka->setEnabled(_layoutCount>1); - ka = actionCollection()->action("tqlayout_remove"); + ka = actionCollection()->action("layout_remove"); if (ka) ka->setEnabled(_layoutCount>1); _statusbar->message(i18n("Layout Count: %1").tqarg(_layoutCount), 1000); diff --git a/kcachegrind/kcachegrind/toplevel.h b/kcachegrind/kcachegrind/toplevel.h index c24b27d3..c437ceae 100644 --- a/kcachegrind/kcachegrind/toplevel.h +++ b/kcachegrind/kcachegrind/toplevel.h @@ -104,13 +104,13 @@ public slots: void querySlot(); void dummySlot(); - // tqlayouts - void tqlayoutDuplicate(); - void tqlayoutRemove(); - void tqlayoutNext(); - void tqlayoutPrevious(); - void tqlayoutSave(); - void tqlayoutRestore(); + // layouts + void layoutDuplicate(); + void layoutRemove(); + void layoutNext(); + void layoutPrevious(); + void layoutSave(); + void layoutRestore(); void updateLayoutActions(); void updateStatusBar(); @@ -251,7 +251,7 @@ private: TracePartList _activeParts; // hidden parts TracePartList _hiddenParts; - // tqlayouts + // layouts int _layoutCurrent, _layoutCount; // for delayed slots diff --git a/kcachegrind/kcachegrind/tracedata.cpp b/kcachegrind/kcachegrind/tracedata.cpp index 83cc1488..50de3e3a 100644 --- a/kcachegrind/kcachegrind/tracedata.cpp +++ b/kcachegrind/kcachegrind/tracedata.cpp @@ -2511,7 +2511,7 @@ TraceLineCall* TraceCall::lineCall(TraceLine* l) } -void TraceCall::tqinvalidateDynamicCost() +void TraceCall::invalidateDynamicCost() { TraceLineCall* lc; for (lc=_lineCalls.first();lc;lc=_lineCalls.next()) @@ -2945,7 +2945,7 @@ void TraceFunctionSource::update() _dirty = false; } -void TraceFunctionSource::tqinvalidateDynamicCost() +void TraceFunctionSource::invalidateDynamicCost() { // no need to create lineMap if not already created if (_lineMap) { @@ -3130,7 +3130,7 @@ void TraceAssoziation::tqinvalidate(TraceData* d, int rtti) TraceFunctionMap::Iterator it; for ( it = d->functionMap().begin(); it != d->functionMap().end(); ++it ) - (*it).tqinvalidateAssoziation(rtti); + (*it).invalidateAssoziation(rtti); } @@ -3198,7 +3198,7 @@ void TraceFunction::removeAssoziation(int rtti, bool reallyDelete) } } -void TraceFunction::tqinvalidateAssoziation(int rtti) +void TraceFunction::invalidateAssoziation(int rtti) { TraceAssoziation* a; for (a=_assoziations.first();a;a=_assoziations.next()) @@ -3587,15 +3587,15 @@ const TraceCallList& TraceFunction::callings(bool /* skipCycle */) const return _callings; } -void TraceFunction::tqinvalidateDynamicCost() +void TraceFunction::invalidateDynamicCost() { TraceCall* c; for (c=_callings.first();c;c=_callings.next()) - c->tqinvalidateDynamicCost(); + c->invalidateDynamicCost(); TraceFunctionSource* sf; for (sf=_sourceFiles.first();sf;sf=_sourceFiles.next()) - sf->tqinvalidateDynamicCost(); + sf->invalidateDynamicCost(); if (_instrMap) { TraceInstrMap::Iterator iit; @@ -4310,7 +4310,7 @@ bool TracePart::activate(bool active) _active = active; // to be done by the client of this function - // data()->tqinvalidateDynamicCost(); + // data()->invalidateDynamicCost(); // So better use the TraceData functions... return true; @@ -4527,7 +4527,7 @@ void TraceData::load(const TQString& base) } _parts.sort(); - tqinvalidateDynamicCost(); + invalidateDynamicCost(); updateFunctionCycles(); // clear loading messages from status bar @@ -4574,7 +4574,7 @@ bool TraceData::activateParts(const TracePartList& l) if (changed) { // because active parts have changed, throw away calculated // costs... - tqinvalidateDynamicCost(); + invalidateDynamicCost(); updateFunctionCycles(); } @@ -4593,7 +4593,7 @@ bool TraceData::activateParts(TracePartList l, bool active) changed = true; if (changed) { - tqinvalidateDynamicCost(); + invalidateDynamicCost(); updateFunctionCycles(); } @@ -4645,7 +4645,7 @@ TQString TraceData::activePartRange() return res; } -void TraceData::tqinvalidateDynamicCost() +void TraceData::invalidateDynamicCost() { // tqinvalidate all dynamic costs @@ -4667,7 +4667,7 @@ void TraceData::tqinvalidateDynamicCost() TraceFunctionMap::Iterator it; for ( it = _functionMap.begin(); it != _functionMap.end(); ++it ) { - (*it).tqinvalidateDynamicCost(); + (*it).invalidateDynamicCost(); } tqinvalidate(); @@ -5044,7 +5044,7 @@ void TraceData::updateFunctionCycles() _inFunctionCycleUpdate = false; // we have to tqinvalidate costs because cycles are now taken into account - tqinvalidateDynamicCost(); + invalidateDynamicCost(); #if 0 if (0) if (_topLevel) _topLevel->showtqStatus(TQString(),0); diff --git a/kcachegrind/kcachegrind/tracedata.h b/kcachegrind/kcachegrind/tracedata.h index 1b57d297..edc4c8f8 100644 --- a/kcachegrind/kcachegrind/tracedata.h +++ b/kcachegrind/kcachegrind/tracedata.h @@ -64,7 +64,7 @@ class TQFile; * * For cost items, which are sums over all trace files read in, the * summed cost metrics change when e.g. a new trace file is read. - * Thus, their cached costs are tqinvalidated, and again recalculated + * Thus, their cached costs are invalidated, and again recalculated * only on demand. In the following list, theses cost items are called * "dynamic", the other "fixed" (but neverless calculated lazy). * @@ -301,7 +301,7 @@ public: virtual void clear(); /** Invalidate the cost attributes. - * An tqinvalidated object needs to be recalculated when a cost + * An invalidated object needs to be recalculated when a cost * attribute is requested (e.g. by subCost()). * Has to be overwritten by subclasses when the cost influences costs of * other cost items. If only one item depends on the cost of this item, @@ -310,7 +310,7 @@ public: virtual void tqinvalidate(); /** - * Sets a dependant to be tqinvalidated when this cost is tqinvalidated. + * Sets a dependant to be invalidated when this cost is invalidated. * Call this function directly after the constructor. */ void setDependant(TraceItem* d) { _dep = d; } @@ -1303,7 +1303,7 @@ class TraceCall: public TraceCallListCost // we need some special handling for cycle calls void update(); - void tqinvalidateDynamicCost(); + void invalidateDynamicCost(); // factories TracePartCall* partCall(TracePart*, @@ -1502,7 +1502,7 @@ public: uint lastLineno(); TraceLineMap* lineMap(); - void tqinvalidateDynamicCost(); + void invalidateDynamicCost(); /* factories */ TraceLine* line(uint lineno, bool createNew = true); @@ -1592,7 +1592,7 @@ class TraceFunction: public TraceCostItem // this tqinvalidate all subcosts of function depending on // active status of parts - void tqinvalidateDynamicCost(); + void invalidateDynamicCost(); void addCaller(TraceCall*); @@ -1651,7 +1651,7 @@ class TraceFunction: public TraceCostItem void addAssoziation(TraceAssoziation* a); void removeAssoziation(TraceAssoziation* a); void removeAssoziation(int rtti, bool reallyDelete = true); - void tqinvalidateAssoziation(int rtti); + void invalidateAssoziation(int rtti); TraceAssoziation* assoziation(int rtti); // cycles @@ -1844,7 +1844,7 @@ class TraceData: public TraceCost * tqinvalidate the dynamic costs on a activation change, * i.e. all cost items dependend on active parts. * This has to be done by the caller when true is returned by - * calling tqinvalidateDynamicCost(). + * calling invalidateDynamicCost(). */ bool activateParts(const TracePartList&); bool activateParts(TracePartList, bool active); @@ -1914,8 +1914,8 @@ class TraceData: public TraceCost virtual void update(); - // tqinvalidates all cost items dependant on active state of parts - void tqinvalidateDynamicCost(); + // invalidates all cost items dependant on active state of parts + void invalidateDynamicCost(); // cycle detection void updateFunctionCycles(); diff --git a/kcachegrind/kcachegrind/traceitemview.cpp b/kcachegrind/kcachegrind/traceitemview.cpp index 1d612ac3..8323ea61 100644 --- a/kcachegrind/kcachegrind/traceitemview.cpp +++ b/kcachegrind/kcachegrind/traceitemview.cpp @@ -30,10 +30,10 @@ #define TRACE_UPDATES 0 -TraceItemView::TraceItemView(TraceItemView* tqparentView, TopLevel* top) +TraceItemView::TraceItemView(TraceItemView* parentView, TopLevel* top) { - _parentView = tqparentView; - _topLevel = top ? top : tqparentView->topLevel(); + _parentView = parentView; + _topLevel = top ? top : parentView->topLevel(); _data = _newData = 0; // _partList and _newPartList is empty diff --git a/kcachegrind/kcachegrind/traceitemview.h b/kcachegrind/kcachegrind/traceitemview.h index a842a1d2..1d0c0394 100644 --- a/kcachegrind/kcachegrind/traceitemview.h +++ b/kcachegrind/kcachegrind/traceitemview.h @@ -69,7 +69,7 @@ public: // a TraceItemView can have a position in a tqparent container enum Position { Hidden, Top, Right, Left, Bottom }; - TraceItemView(TraceItemView* tqparentView, TopLevel* top = 0); + TraceItemView(TraceItemView* parentView, TopLevel* top = 0); virtual ~TraceItemView() {} virtual TQString whatsThis() const; @@ -165,7 +165,7 @@ public: void addGoMenu(TQPopupMenu*); protected: - // helpers to call selected()/activated() of tqparentView + // helpers to call selected()/activated() of parentView void selected(TraceItem*); void selected(const TracePartList&); void activated(TraceItem*); diff --git a/kcachegrind/kcachegrind/treemap.cpp b/kcachegrind/kcachegrind/treemap.cpp index cdc48cc8..39207fd2 100644 --- a/kcachegrind/kcachegrind/treemap.cpp +++ b/kcachegrind/kcachegrind/treemap.cpp @@ -855,7 +855,7 @@ void TreeMapItem::clear() } -// tqinvalidates current tqchildren and forces redraw +// invalidates current tqchildren and forces redraw // this is only usefull when tqchildren are created on demand in items() void TreeMapItem::refresh() { @@ -1086,10 +1086,10 @@ protected: void TreeMapTip::maybeTip( const TQPoint& pos ) { - if ( !tqparentWidget()->inherits( "TreeMapWidget" ) ) + if ( !parentWidget()->inherits( "TreeMapWidget" ) ) return; - TreeMapWidget* p = (TreeMapWidget*)tqparentWidget(); + TreeMapWidget* p = (TreeMapWidget*)parentWidget(); TreeMapItem* i; i = p->item(pos.x(), pos.y()); TQPtrList* rList = i ? i->freeRects() : 0; diff --git a/kcachegrind/kcachegrind/treemap.h b/kcachegrind/kcachegrind/treemap.h index 9c936cbd..17cba09d 100644 --- a/kcachegrind/kcachegrind/treemap.h +++ b/kcachegrind/kcachegrind/treemap.h @@ -444,7 +444,7 @@ public: /** * Selects or unselects an item. * In multiselection mode, the constrain that a selected item - * has no selected tqchildren or tqparents stays true. + * has no selected tqchildren or parents stays true. */ void setSelected(TreeMapItem*, bool selected = true); @@ -532,7 +532,7 @@ public: void setVisibleWidth(int width, bool reuseSpace = false); /** - * If a tqchildren value() is almost the tqparents sum(), + * 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 diff --git a/kioslave/svn/ksvnd/commitdlg.ui b/kioslave/svn/ksvnd/commitdlg.ui index 54e46f3f..35b9a97e 100644 --- a/kioslave/svn/ksvnd/commitdlg.ui +++ b/kioslave/svn/ksvnd/commitdlg.ui @@ -108,7 +108,7 @@ setLog( const TQString & comment ) logMessage() const - + ktextedit.h ktextedit.h diff --git a/kioslave/svn/ksvnd/ksvnd.cpp b/kioslave/svn/ksvnd/ksvnd.cpp index 82777818..174d9fc9 100644 --- a/kioslave/svn/ksvnd/ksvnd.cpp +++ b/kioslave/svn/ksvnd/ksvnd.cpp @@ -198,7 +198,7 @@ bool KSvnd::anyValidWorkingCopy( const KURL::List& wclist ) { int KSvnd::gettqStatus( const KURL::List& list ) { int result = 0; - uint files = 0, folders = 0, tqparentsentries = 0, tqparentshavesvn = 0, subdirhavesvn = 0, external = 0; + uint files = 0, folders = 0, parentsentries = 0, parentshavesvn = 0, subdirhavesvn = 0, external = 0; for ( TQValueListConstIterator it = list.begin(); it != list.end() ; ++it ) { if ( isFolder ( ( *it ) ) ) { folders++; @@ -206,7 +206,7 @@ int KSvnd::gettqStatus( const KURL::List& list ) { files++; } if ( isFileInSvnEntries ( (*it).filename(),( *it ).directory() + "/.svn/entries" ) ) { // normal subdir known in the working copy - tqparentsentries++; + parentsentries++; } else if ( isFolder( *it ) ) { // other subfolders (either another module checkouted or an external, or something not known at all) if ( TQFile::exists( ( *it ).path() + "/.svn/entries" ) ) subdirhavesvn++; @@ -215,7 +215,7 @@ int KSvnd::gettqStatus( const KURL::List& list ) { } } if ( ( isFolder( ( *it ) ) && TQFile::exists( ( *it ).directory() + "../.svn/entries" ) ) || TQFile::exists( ( *it ).directory() + "/.svn/entries" ) ) //tqparent has a .svn ? - tqparentshavesvn++; + parentshavesvn++; } if ( files > 0 ) result |= SomeAreFiles; @@ -225,15 +225,15 @@ int KSvnd::gettqStatus( const KURL::List& list ) { } if ( folders > 0 ) result |= SomeAreFolders; - if ( tqparentsentries == list.count() ) { + if ( parentsentries == list.count() ) { result |= AllAreInParentsEntries; result |= SomeAreInParentsEntries; - } else if ( tqparentsentries != 0 ) + } else if ( parentsentries != 0 ) result |= SomeAreInParentsEntries; - if ( tqparentshavesvn == list.count() ) { + if ( parentshavesvn == list.count() ) { result |= AllParentsHaveSvn; result |= SomeParentsHaveSvn; - } else if ( tqparentshavesvn > 0 ) + } else if ( parentshavesvn > 0 ) result |= SomeParentsHaveSvn; if ( subdirhavesvn == list.count() ) { result |= AllHaveSvn; diff --git a/kioslave/svn/svnhelper/subversioncheckout.ui b/kioslave/svn/svnhelper/subversioncheckout.ui index 7d757c4c..3ed752e7 100644 --- a/kioslave/svn/svnhelper/subversioncheckout.ui +++ b/kioslave/svn/svnhelper/subversioncheckout.ui @@ -195,7 +195,7 @@ reject() - + kurlrequester.h klineedit.h diff --git a/kioslave/svn/svnhelper/subversiondiff.ui b/kioslave/svn/svnhelper/subversiondiff.ui index 14c5f307..e647f6b6 100644 --- a/kioslave/svn/svnhelper/subversiondiff.ui +++ b/kioslave/svn/svnhelper/subversiondiff.ui @@ -96,5 +96,5 @@ accept() - + diff --git a/kioslave/svn/svnhelper/subversionlog.ui b/kioslave/svn/svnhelper/subversionlog.ui index b58eb84e..20060f73 100644 --- a/kioslave/svn/svnhelper/subversionlog.ui +++ b/kioslave/svn/svnhelper/subversionlog.ui @@ -96,5 +96,5 @@ accept() - + diff --git a/kioslave/svn/svnhelper/subversionswitch.ui b/kioslave/svn/svnhelper/subversionswitch.ui index 6e40a322..c0642bc4 100644 --- a/kioslave/svn/svnhelper/subversionswitch.ui +++ b/kioslave/svn/svnhelper/subversionswitch.ui @@ -195,7 +195,7 @@ reject() - + kurlrequester.h klineedit.h diff --git a/kompare/komparenavtreepart/komparenavtreepart.cpp b/kompare/komparenavtreepart/komparenavtreepart.cpp index 1fe65b4f..a8c5e8f2 100644 --- a/kompare/komparenavtreepart/komparenavtreepart.cpp +++ b/kompare/komparenavtreepart/komparenavtreepart.cpp @@ -675,12 +675,12 @@ KompareNavTreePartFactory::~KompareNavTreePartFactory() s_instance = 0L; } -KParts::Part* KompareNavTreePartFactory::createPartObject( TQWidget* tqparentWidget, const char* widgetName, +KParts::Part* KompareNavTreePartFactory::createPartObject( TQWidget* parentWidget, const char* widgetName, TQObject* /*tqparent*/, const char* /*name*/, const char* /*classname*/, const TQStringList & /*args*/ ) { // Create an instance of our Part - KompareNavTreePart* obj = new KompareNavTreePart( tqparentWidget, widgetName ); + KompareNavTreePart* obj = new KompareNavTreePart( parentWidget, widgetName ); KGlobal::locale()->insertCatalogue("kompare"); diff --git a/kompare/komparenavtreepart/komparenavtreepart.h b/kompare/komparenavtreepart/komparenavtreepart.h index 6fa0667b..45a16001 100644 --- a/kompare/komparenavtreepart/komparenavtreepart.h +++ b/kompare/komparenavtreepart/komparenavtreepart.h @@ -180,7 +180,7 @@ class KompareNavTreePartFactory : public KParts::Factory public: KompareNavTreePartFactory(); virtual ~KompareNavTreePartFactory(); - virtual KParts::Part* createPartObject( TQWidget *tqparentWidget, const char *widgetName, + virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, 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 24c23ffe..1ea3217e 100644 --- a/kompare/komparepart/kompare_part.cpp +++ b/kompare/komparepart/kompare_part.cpp @@ -56,7 +56,7 @@ K_EXPORT_COMPONENT_FACTORY( libkomparepart, KomparePartFactory ) ViewSettings* KomparePart::m_viewSettings = 0L; DiffSettings* KomparePart::m_diffSettings = 0L; -KomparePart::KomparePart( TQWidget *tqparentWidget, const char *widgetName, +KomparePart::KomparePart( TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, const TQStringList & /*args*/ ) : KParts::ReadWritePart(tqparent, name), m_tempDiff( 0 ), @@ -116,7 +116,7 @@ KomparePart::KomparePart( TQWidget *tqparentWidget, const char *widgetName, this, TQT_SIGNAL(applyDifference(const Diff2::Difference*, bool)) ); // This creates the splitterwidget and connects the signals and slots - m_splitter = new KompareSplitter ( m_viewSettings, tqparentWidget, widgetName ); + m_splitter = new KompareSplitter ( m_viewSettings, parentWidget, widgetName ); connect( m_modelList, TQT_SIGNAL(setSelection(const Diff2::DiffModel*, const Diff2::Difference*)), m_splitter, TQT_SLOT(slotSetSelection(const Diff2::DiffModel*, const Diff2::Difference*)) ); @@ -136,7 +136,7 @@ KomparePart::KomparePart( TQWidget *tqparentWidget, const char *widgetName, connect( this, TQT_SIGNAL(configChanged()), m_splitter, TQT_SIGNAL(configChanged()) ); // notify the part that this is our internal widget - setWidget( m_splitter->tqparentWidget() ); + setWidget( m_splitter->parentWidget() ); setupActions(); diff --git a/kompare/komparepart/kompare_part.h b/kompare/komparepart/kompare_part.h index 33c19a64..985fe6fc 100644 --- a/kompare/komparepart/kompare_part.h +++ b/kompare/komparepart/kompare_part.h @@ -65,7 +65,7 @@ public: /** * Default constructor */ - KomparePart( TQWidget *tqparentWidget, const char *widgetName, + KomparePart( TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, const TQStringList & /*args*/); /** diff --git a/kompare/komparepart/kompareconnectwidget.cpp b/kompare/komparepart/kompareconnectwidget.cpp index 6b70ff4e..50c8f221 100644 --- a/kompare/komparepart/kompareconnectwidget.cpp +++ b/kompare/komparepart/kompareconnectwidget.cpp @@ -78,7 +78,7 @@ void KompareConnectWidgetFrame::mouseMoveEvent( TQMouseEvent *e ) if ( !(e->state()&Qt::LeftButton) ) return; - TQCOORD pos = s->pick( tqparentWidget()->mapFromGlobal(e->globalPos()) ) + TQCOORD pos = s->pick( parentWidget()->mapFromGlobal(e->globalPos()) ) - kMouseOffset; ((KompareSplitter*)s)->moveSplitter( pos, id() ); @@ -94,7 +94,7 @@ void KompareConnectWidgetFrame::mousePressEvent( TQMouseEvent *e ) void KompareConnectWidgetFrame::mouseReleaseEvent( TQMouseEvent *e ) { if ( !opaque() && e->button() == Qt::LeftButton ) { - TQCOORD pos = s->pick( tqparentWidget()->mapFromGlobal(e->globalPos()) ) + TQCOORD pos = s->pick( parentWidget()->mapFromGlobal(e->globalPos()) ) - kMouseOffset; ((KompareSplitter*)s)->moveSplitter( pos, id() ); } @@ -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->tqparentWidget() ); + setFocusProxy( tqparent->parentWidget() ); } KompareConnectWidget::~KompareConnectWidget() diff --git a/kompare/komparepart/komparelistview.cpp b/kompare/komparepart/komparelistview.cpp index 7dd21845..5bf8e910 100644 --- a/kompare/komparepart/komparelistview.cpp +++ b/kompare/komparepart/komparelistview.cpp @@ -125,7 +125,7 @@ KompareListView::KompareListView( bool isSource, setFocusPolicy( TQ_NoFocus ); setFont( m_settings->m_font ); setSpaces( m_settings->m_tabToNumberOfSpaces ); - setFocusProxy( tqparent->tqparentWidget() ); + setFocusProxy( tqparent->parentWidget() ); } KompareListView::~KompareListView() diff --git a/kompare/komparepart/komparesaveoptionsbase.ui b/kompare/komparepart/komparesaveoptionsbase.ui index 29ac061b..7636a27f 100644 --- a/kompare/komparepart/komparesaveoptionsbase.ui +++ b/kompare/komparepart/komparesaveoptionsbase.ui @@ -332,5 +332,5 @@ - + diff --git a/kuiviewer/kuiviewer_part.cpp b/kuiviewer/kuiviewer_part.cpp index 2ff58821..16f23292 100644 --- a/kuiviewer/kuiviewer_part.cpp +++ b/kuiviewer/kuiviewer_part.cpp @@ -51,7 +51,7 @@ typedef KParts::GenericFactory KUIViewerPartFactory; K_EXPORT_COMPONENT_FACTORY( libkuiviewerpart, KUIViewerPartFactory ) -KUIViewerPart::KUIViewerPart( TQWidget *tqparentWidget, const char *widgetName, +KUIViewerPart::KUIViewerPart( TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, const TQStringList & /*args*/ ) : KParts::ReadOnlyPart(tqparent, name) @@ -62,7 +62,7 @@ KUIViewerPart::KUIViewerPart( TQWidget *tqparentWidget, const char *widgetName, KGlobal::locale()->insertCatalogue("kuiviewer"); // this should be your custom internal widget - m_widget = new TQVBox( tqparentWidget, widgetName ); + m_widget = new TQVBox( parentWidget, widgetName ); // notify the part that this is our internal widget setWidget(m_widget); diff --git a/kuiviewer/kuiviewer_part.h b/kuiviewer/kuiviewer_part.h index 09a2a882..1d19afad 100644 --- a/kuiviewer/kuiviewer_part.h +++ b/kuiviewer/kuiviewer_part.h @@ -48,7 +48,7 @@ public: /** * Default constructor */ - KUIViewerPart(TQWidget *tqparentWidget, const char *widgetName, + KUIViewerPart(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, const TQStringList &args); /** diff --git a/kunittest/testerwidget.ui b/kunittest/testerwidget.ui index 0607aee1..1f294c02 100644 --- a/kunittest/testerwidget.ui +++ b/kunittest/testerwidget.ui @@ -193,5 +193,5 @@ resultsLabel() selectCombo() - + diff --git a/poxml/antlr/src/CharScanner.cpp b/poxml/antlr/src/CharScanner.cpp index 93080338..ff40138d 100644 --- a/poxml/antlr/src/CharScanner.cpp +++ b/poxml/antlr/src/CharScanner.cpp @@ -55,7 +55,7 @@ ANTLR_C_USING(exit) ANTLR_C_USING(tolower) #ifdef ANTLR_REALLY_NO_STRCASECMP -// Aptqparently, neither strcasecmp nor stricmp is standard, and Codewarrior +// Apparently, neither strcasecmp nor stricmp is standard, and Codewarrior // on the mac has neither... inline int strcasecmp(const char *s1, const char *s2) { diff --git a/scheck/bitmaps.h b/scheck/bitmaps.h index ec3829e0..6d0d280a 100644 --- a/scheck/bitmaps.h +++ b/scheck/bitmaps.h @@ -22,7 +22,7 @@ static const unsigned char radiooff_center_bits[] = { 0xfc, 0x07, 0xfc, 0x07, 0xfc, 0x07, 0xf8, 0x03, 0xf0, 0x01, 0x00, 0x00, 0x00, 0x00}; -static const unsigned char radiotqmask_bits[] = { +static const unsigned char radiomask_bits[] = { 0xf0, 0x01, 0xfc, 0x07, 0xfe, 0x0b, 0xfe, 0x0b, 0xff, 0x17, 0xff, 0x17, 0xff, 0x17, 0xff, 0x17, 0xff, 0x17, 0xfe, 0x0b, 0xf2, 0x09, 0x0c, 0x06, 0xf0, 0x01}; diff --git a/scheck/scheck.cpp b/scheck/scheck.cpp index 4e4dd724..0e4aa9c2 100644 --- a/scheck/scheck.cpp +++ b/scheck/scheck.cpp @@ -104,7 +104,7 @@ static TQBitmap lightBmp; static TQBitmap grayBmp; static TQBitmap dgrayBmp; static TQBitmap centerBmp; -static TQBitmap tqmaskBmp; +static TQBitmap maskBmp; static TQBitmap xBmp; static const int itemFrame = 1; @@ -991,7 +991,7 @@ void StyleCheckStyle::unPolish(TQWidget* widget) -// This function draws primitive elements as well as their tqmasks. +// This function draws primitive elements as well as their masks. void StyleCheckStyle::drawPrimitive( PrimitiveElement pe, TQPainter *p, const TQRect &r, @@ -1344,13 +1344,13 @@ void StyleCheckStyle::drawPrimitive( PrimitiveElement pe, // RADIOBUTTON (exclusive indicator) tqmask // ------------------------------------------------------------------- case PE_ExclusiveIndicatorMask: { - if (tqmaskBmp.isNull()) { - tqmaskBmp = TQBitmap(13, 13, radiotqmask_bits, true); - tqmaskBmp.setMask(tqmaskBmp); + if (maskBmp.isNull()) { + maskBmp = TQBitmap(13, 13, radiomask_bits, true); + maskBmp.setMask(maskBmp); } p->setPen(TQt::color1); - p->drawPixmap(r.x(), r.y(), tqmaskBmp); + p->drawPixmap(r.x(), r.y(), maskBmp); break; } @@ -2323,11 +2323,11 @@ void StyleCheckStyle::tqdrawComplexControl( ComplexControl control, drawPrimitive(PE_ButtonTool, p, button, cg, bflags, opt); // Check whether to draw a background pixmap - else if ( toolbutton->tqparentWidget() && - toolbutton->tqparentWidget()->backgroundPixmap() && - !toolbutton->tqparentWidget()->backgroundPixmap()->isNull() ) + else if ( toolbutton->parentWidget() && + toolbutton->parentWidget()->backgroundPixmap() && + !toolbutton->parentWidget()->backgroundPixmap()->isNull() ) { - TQPixmap pixmap = *(toolbutton->tqparentWidget()->backgroundPixmap()); + TQPixmap pixmap = *(toolbutton->parentWidget()->backgroundPixmap()); p->drawTiledPixmap( r, pixmap, toolbutton->pos() ); } else if (widget->tqparent()) @@ -2685,7 +2685,7 @@ bool StyleCheckStyle::eventFilter( TQObject *object, TQEvent *event ) //Walk tqparent hierarchy to check whether any are groupboxes too.. TQObject* tqparent = TQT_TQOBJECT(gb); - // GCC suggested tqparentheses around assignment used as truth value + // GCC suggested parentheses around assignment used as truth value // I suggested that it could eat me. GCC won. while ( (tqparent = tqparent->tqparent()) ) { diff --git a/scheck/status.txt b/scheck/status.txt index d8e8376a..4860b230 100644 --- a/scheck/status.txt +++ b/scheck/status.txt @@ -31,7 +31,7 @@ other non heading/title text - Kind of -- hard to distinguish from title Other violations -Check for nested groupboxes. - Done, when tqparenting hierarchy isn't bizzare. +Check for nested groupboxes. - Done, when parenting hierarchy isn't bizzare. Other todo: diff --git a/scripts/completions/bash/dcop b/scripts/completions/bash/dcop index d3e0fba4..675bf6cf 100644 --- a/scripts/completions/bash/dcop +++ b/scripts/completions/bash/dcop @@ -32,7 +32,7 @@ _complete_dcop () elif (( $COMP_CWORD == 2 )); then # # Object. 'dcop ' returns all objects the application - # supports plus (default). The tqparenthesis in (default) should be + # supports plus (default). The parenthesis in (default) should be # omitted when using it as an argument so we need to remove them. # wordlist=$(dcop ${COMP_WORDS[1]} | sed -e "s,(default),default,") diff --git a/scripts/kDebug2kdDebug.sh b/scripts/kDebug2kdDebug.sh index 24f605f4..edf284cb 100755 --- a/scripts/kDebug2kdDebug.sh +++ b/scripts/kDebug2kdDebug.sh @@ -109,7 +109,7 @@ while (<>) $arg =~ s/\.ascii\(\)$//; # remove $arg =~ s/\.latin1\(\)$//; # remove $arg =~ s/debugString\(([^\)]+)\)/$1/; # remove - # If "a ? b : c" then add tqparenthesis + # If "a ? b : c" then add parenthesis if ( $arg =~ m/.+\s*\?\s*.+\s*:\s*.+/ ) { $arg = "(" . $arg . ")"; } diff --git a/scripts/kde-emacs/dirvars.el b/scripts/kde-emacs/dirvars.el index 302bb75e..489ece98 100644 --- a/scripts/kde-emacs/dirvars.el +++ b/scripts/kde-emacs/dirvars.el @@ -79,7 +79,7 @@ The meaningful values are nil and non-nil.") (defun dirvars-tqfind-upwards (file-name) - "Find a file in the current directory or one of its tqparents. + "Find a file in the current directory or one of its parents. Returns the fully qualified file name, or nil if it isn't found. diff --git a/scripts/kde-emacs/kde-emacs-compat.el b/scripts/kde-emacs/kde-emacs-compat.el index c492d7ca..2cddbb1e 100644 --- a/scripts/kde-emacs/kde-emacs-compat.el +++ b/scripts/kde-emacs/kde-emacs-compat.el @@ -58,7 +58,7 @@ Otherwise treat `\\' in NEWTEXT as special: (defvar read-shell-command-map (let ((map (make-sparse-keymap 'read-shell-command-map))) (if (eq kde-emacs-type 'xemacs) - (set-keymap-tqparents map (list minibuffer-local-map)) + (set-keymap-parents map (list minibuffer-local-map)) (set-keymap-tqparent map minibuffer-local-map)) (define-key map "\t" 'comint-dynamic-complete) (define-key map "\M-\t" 'comint-dynamic-complete) diff --git a/scripts/kde-emacs/kde-emacs-core.el b/scripts/kde-emacs/kde-emacs-core.el index 40c95d5b..52ff6314 100644 --- a/scripts/kde-emacs/kde-emacs-core.el +++ b/scripts/kde-emacs/kde-emacs-core.el @@ -263,7 +263,7 @@ This function does not do any hidden buffer changes." (setq lim (1+ containing-sexp)))) (setq lim (point-min))) - ;; If we're in a tqparenthesis list then ',' delimits the + ;; If we're in a parenthesis list then ',' delimits the ;; "statements" rather than being an operator (with the ;; exception of the "for" clause). This difference is ;; typically only noticeable when statements are used in macro @@ -398,7 +398,7 @@ This function does not do any hidden buffer changes." (goto-char placeholder))))) placeholder)) (if (looking-at c-block-stmt-2-key) - ;; Require a tqparenthesis after these keywords. + ;; Require a parenthesis after these keywords. ;; Necessary to catch e.g. synchronized in Java, ;; which can be used both as statement and ;; modifier. @@ -1540,7 +1540,7 @@ This function does not do any hidden buffer changes." (setq lim (1+ containing-sexp)))) (setq lim (point-min))) - ;; If we're in a tqparenthesis list then ',' delimits the + ;; If we're in a parenthesis list then ',' delimits the ;; "statements" rather than being an operator (with the ;; exception of the "for" clause). This difference is ;; typically only noticeable when statements are used in macro @@ -1661,7 +1661,7 @@ This function does not do any hidden buffer changes." (goto-char placeholder))))) placeholder)) (if (looking-at c-block-stmt-2-key) - ;; Require a tqparenthesis after these keywords. + ;; Require a parenthesis after these keywords. ;; Necessary to catch e.g. synchronized in Java, ;; which can be used both as statement and ;; modifier. diff --git a/scripts/kde-emacs/kde-emacs-semantic.el b/scripts/kde-emacs/kde-emacs-semantic.el index a8228f2d..4f09f5da 100644 --- a/scripts/kde-emacs/kde-emacs-semantic.el +++ b/scripts/kde-emacs/kde-emacs-semantic.el @@ -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)) - (tqparents (semantic-token-type-tqparent class-token)) + (parents (semantic-token-type-tqparent class-token)) (parts (semantic-token-type-parts class-token)) (cur-token) (cur-token-name) diff --git a/scripts/kde-emacs/kde-emacs-tips.texi b/scripts/kde-emacs/kde-emacs-tips.texi index 80a44bc7..ee7c0f19 100644 --- a/scripts/kde-emacs/kde-emacs-tips.texi +++ b/scripts/kde-emacs/kde-emacs-tips.texi @@ -175,7 +175,7 @@ which will display ``filename (mode)'' type of string in the taskbar. Type @kbd{C-h v frame-title-format} to get more info. @sp 1 -@strong{Q.} @emph{Can I make Emacs jump to the matching tqparenthesis +@strong{Q.} @emph{Can I make Emacs jump to the matching parenthesis with @kbd{%} just like vi?} @strong{A.} Yes, just add to your @file{.emacs} something like: @@ -184,7 +184,7 @@ with @kbd{%} just like vi?} (global-set-key "%" 'match-paren) (defun match-paren (arg) - "Go to the matching tqparenthesis if on tqparenthesis otherwise insert %." + "Go to the matching parenthesis if on parenthesis otherwise insert %." (interactive "p") (cond ((looking-at "\\s\(") (forward-list 1) (backward-char 1)) ((looking-at "\\s\)") (forward-char 1) (backward-list 1)) diff --git a/scripts/kde-emacs/kde-emacs-utils.el b/scripts/kde-emacs/kde-emacs-utils.el index 165f620a..ee1ae19e 100644 --- a/scripts/kde-emacs/kde-emacs-utils.el +++ b/scripts/kde-emacs/kde-emacs-utils.el @@ -523,7 +523,7 @@ This function does not do any hidden buffer changes." (setq oneliner t))) (forward-char -1) ; These three lines are for the situation where (if (not (looking-at " ")) ; the user already have inserted a space after - (forward-char 1) ; the closing tqparenthesis + (forward-char 1) ; the closing parenthesis (setq spacep t)) (forward-char -2) (setq o (looking-at "()")) @@ -638,7 +638,7 @@ This function does not do any hidden buffer changes." (defun scroll-other-down () (interactive) (scroll-other-window 1)) (defun match-paren (arg) - "Go to the matching tqparenthesis if on tqparenthesis otherwise insert %." + "Go to the matching parenthesis if on parenthesis otherwise insert %." (interactive "p") (cond ((looking-at "\\s\(") (forward-list 1) (backward-char 1)) ((looking-at "\\s\)") (forward-char 1) (backward-list 1)) diff --git a/scripts/kde-emacs/kde-emacs-vars.el b/scripts/kde-emacs/kde-emacs-vars.el index 9d3734d6..1b4bcd2e 100644 --- a/scripts/kde-emacs/kde-emacs-vars.el +++ b/scripts/kde-emacs/kde-emacs-vars.el @@ -119,7 +119,7 @@ file named /home/domi/src/kdenonbeta/kig/misc/newtype.h" :type 'integer) (defcustom kde-emacs-after-tqparent-string " " - "Set this to whatever you want to have inserted after the first tqparenthesis. Works only if + "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 :type 'string) diff --git a/scripts/kdesvn-build b/scripts/kdesvn-build index e247c3db..7e7f5a71 100755 --- a/scripts/kdesvn-build +++ b/scripts/kdesvn-build @@ -383,14 +383,14 @@ sub clr($) } # Subroutine which returns true if pretend mode is on. Uses the prototype -# feature so you don't need the tqparentheses to use it. +# feature so you don't need the parentheses to use it. sub pretending() { return get_option('global', 'pretend'); } # Subroutine which returns true if debug mode is on. Uses the prototype -# feature so you don't need the tqparentheses to use it. +# feature so you don't need the parentheses to use it. sub debugging() { return get_option('global', 'debug-level') <= DEBUG; @@ -1292,7 +1292,7 @@ sub safe_make (@) } # Convert the path to an absolute path since I've encountered a sudo that - # is aptqparently unable to guess. Maybe it's better that it doesn't guess + # is apparently unable to guess. Maybe it's better that it doesn't guess # anyways from a security point-of-view. $make = path_to_prog($make) unless pretending; @@ -2887,7 +2887,7 @@ sub create_admin_dir if (not -e $admindir) { - # Can't find kde-common, it's aptqparently not installed. + # Can't find kde-common, it's apparently not installed. if (not has_updated_kdecommon()) { # We haven't tried downloading it, now would be a good time. diff --git a/umbrello/umbrello/aligntoolbar.cpp b/umbrello/umbrello/aligntoolbar.cpp index aa62f500..2ac38d4e 100644 --- a/umbrello/umbrello/aligntoolbar.cpp +++ b/umbrello/umbrello/aligntoolbar.cpp @@ -31,8 +31,8 @@ #include "umlwidget.h" #include "umlwidgetlist.h" -AlignToolBar::AlignToolBar(TQMainWindow* tqparentWindow, const char* ) - : KToolBar(tqparentWindow,TQt::DockRight,false) { +AlignToolBar::AlignToolBar(TQMainWindow* parentWindow, const char* ) + : KToolBar(parentWindow,TQt::DockRight,false) { // load images for the buttons loadPixmaps(); diff --git a/umbrello/umbrello/aligntoolbar.h b/umbrello/umbrello/aligntoolbar.h index 297b0a8a..4e515489 100644 --- a/umbrello/umbrello/aligntoolbar.h +++ b/umbrello/umbrello/aligntoolbar.h @@ -36,10 +36,10 @@ public: /** * Creates a bar with tools for tqalignment. * - * @param tqparentWindow The tqparent of the toolbar. + * @param parentWindow The tqparent of the toolbar. * @param name The name of the toolbar. */ - AlignToolBar(TQMainWindow* tqparentWindow, const char* name); + AlignToolBar(TQMainWindow* parentWindow, const char* name); /** * Standard deconstructor. diff --git a/umbrello/umbrello/autolayout/autolayout.h b/umbrello/umbrello/autolayout/autolayout.h index fecb2c6f..9f34a1d8 100644 --- a/umbrello/umbrello/autolayout/autolayout.h +++ b/umbrello/umbrello/autolayout/autolayout.h @@ -31,12 +31,12 @@ -#include "autotqlayouter.h" -#include "autotqlayouteradapter.h" -#include "graphvizautotqlayouter.h" -#include "dotautotqlayouter.h" -#include "circoautotqlayouter.h" -#include "neatoautotqlayouter.h" +#include "autolayouter.h" +#include "autolayouteradapter.h" +#include "graphvizautolayouter.h" +#include "dotautolayouter.h" +#include "circoautolayouter.h" +#include "neatoautolayouter.h" diff --git a/umbrello/umbrello/autolayout/autolayoutdlg.cpp b/umbrello/umbrello/autolayout/autolayoutdlg.cpp index 61bf16b6..7df110fb 100644 --- a/umbrello/umbrello/autolayout/autolayoutdlg.cpp +++ b/umbrello/umbrello/autolayout/autolayoutdlg.cpp @@ -9,18 +9,18 @@ * * ***************************************************************************/ -#include "autotqlayoutdlg.h" +#include "autolayoutdlg.h" #include "../associationwidget.h" #include "../umlwidget.h" #include "autotqlayout.h" -#include "newautotqlayoutdialog.h" +#include "newautolayoutdialog.h" #include #include #include #include -AutotqlayoutDlg::AutotqlayoutDlg(KConfig* c,UMLView* v,TQWidget *tqparent, const char *name) +AutolayoutDlg::AutolayoutDlg(KConfig* c,UMLView* v,TQWidget *tqparent, const char *name) :MyDialog1(tqparent, name) { view=v; @@ -28,81 +28,81 @@ AutotqlayoutDlg::AutotqlayoutDlg(KConfig* c,UMLView* v,TQWidget *tqparent, const config=c; } -void AutotqlayoutDlg::slotSetAssociationWeight(int i) +void AutolayoutDlg::slotSetAssociationWeight(int i) { associationWeight=i; } -void AutotqlayoutDlg::slotSetDependenciesWeight(int i) +void AutolayoutDlg::slotSetDependenciesWeight(int i) { dependenciesWeight=i; } -void AutotqlayoutDlg::slotSetGeneralizationWeight(int i) +void AutolayoutDlg::slotSetGeneralizationWeight(int i) { generalizationWeight=i; } -void AutotqlayoutDlg::slotSetGenralizationAsEdges(bool b) +void AutolayoutDlg::slotSetGenralizationAsEdges(bool b) { genralizationAsEdges=b; } -void AutotqlayoutDlg::slotSetDependenciesAsEdges(bool b) +void AutolayoutDlg::slotSetDependenciesAsEdges(bool b) { dependenciesAsEdges=b; } -void AutotqlayoutDlg::slotSetAssociationAsEdges(bool b) +void AutolayoutDlg::slotSetAssociationAsEdges(bool b) { associationAsEdges=b; } -void AutotqlayoutDlg::slotSetCompressShapes(bool b) +void AutolayoutDlg::slotSetCompressShapes(bool b) { compressShapes=b; } -void AutotqlayoutDlg::slotSetCenterDiagram(bool b) +void AutolayoutDlg::slotSetCenterDiagram(bool b) { centerDiagram=b; } -void AutotqlayoutDlg::slotSetClusterizeHierarchies(bool b) +void AutolayoutDlg::slotSetClusterizeHierarchies(bool b) { clusterizeHierarchies=b; } -void AutotqlayoutDlg::slotSetShapeSeparation(int i) +void AutolayoutDlg::slotSetShapeSeparation(int i) { tqshapeSeparation=i; } -void AutotqlayoutDlg::slotReloadSettings() +void AutolayoutDlg::slotReloadSettings() { readConfig(config); } -void AutotqlayoutDlg::slotSaveSettings() +void AutolayoutDlg::slotSaveSettings() { writeConfig(config); } -void AutotqlayoutDlg::slotDoAutotqlayout() +void AutolayoutDlg::slotDoAutotqlayout() { - Autotqlayout::Autotqlayouter* a=getAutotqlayouter();; + Autotqlayout::Autolayouter* a=getAutolayouter();; a->setAssociationAsEdges( associationAsEdges); a->setAssociationWeight( associationWeight ); @@ -122,9 +122,9 @@ void AutotqlayoutDlg::slotDoAutotqlayout() accept(); } -void AutotqlayoutDlg::readConfig( KConfig * conf) +void AutolayoutDlg::readConfig( KConfig * conf) { - conf->setGroup("AutotqlayoutDlg"); + conf->setGroup("AutolayoutDlg"); associationEdgesCB->setChecked((bool)(conf->readBoolEntry( "associationAsEdges",false))); centerDiagramCB->setChecked((bool)(conf->readBoolEntry( "centerDiagram",true))); dependenciesEdgesCB->setChecked((bool)(conf->readBoolEntry( "dependenciesAsEdges",false))); @@ -138,10 +138,10 @@ void AutotqlayoutDlg::readConfig( KConfig * conf) algorithmCOB->setCurrentItem((int)(conf->readNumEntry( "algorithm",0))); } -void AutotqlayoutDlg::writeConfig( KConfig * conf) +void AutolayoutDlg::writeConfig( KConfig * conf) { // conf=kapp->config(); - conf->setGroup("AutotqlayoutDlg"); + conf->setGroup("AutolayoutDlg"); conf->writeEntry( "associationAsEdges",associationEdgesCB->isChecked()); conf->writeEntry( "centerDiagram", centerDiagramCB->isChecked()); conf->writeEntry("dependenciesAsEdges",dependenciesEdgesCB->isChecked()); @@ -159,26 +159,26 @@ void AutotqlayoutDlg::writeConfig( KConfig * conf) } -void AutotqlayoutDlg::slotSelectAlgorithm( const TQString& _algname) +void AutolayoutDlg::slotSelectAlgorithm( const TQString& _algname) { algname=_algname; } -Autotqlayout::Autotqlayouter * AutotqlayoutDlg::getAutotqlayouter( ) +Autotqlayout::Autolayouter * AutolayoutDlg::getAutolayouter( ) { const TQString text = algorithmCOB->currentText(); kDebug() << "Autotqlayout Algorithm " << algname << " found " << text << endl; if (text == "dot") - return new Autotqlayout::DotAutotqlayouter(); + return new Autotqlayout::DotAutolayouter(); if (text == "circo") - return new Autotqlayout::CircoAutotqlayouter(); + return new Autotqlayout::CircoAutolayouter(); if (text == "neato") - return new Autotqlayout::NeatoAutotqlayouter(); + return new Autotqlayout::NeatoAutolayouter(); kError() << "Autotqlayout Algorithm not found" << endl; - return new Autotqlayout::DotAutotqlayouter(); + return new Autotqlayout::DotAutolayouter(); } -#include "autotqlayoutdlg.moc" +#include "autolayoutdlg.moc" diff --git a/umbrello/umbrello/autolayout/autolayoutdlg.h b/umbrello/umbrello/autolayout/autolayoutdlg.h index a664a7b7..ece6fc5f 100644 --- a/umbrello/umbrello/autolayout/autolayoutdlg.h +++ b/umbrello/umbrello/autolayout/autolayoutdlg.h @@ -12,18 +12,18 @@ #ifndef AUTOLAYOUTDLG_H #define AUTOLAYOUTDLG_H -#include "newautotqlayoutdialog.h" +#include "newautolayoutdialog.h" #include "../umlview.h" #include #include #include "autotqlayout.h" -class AutotqlayoutDlg : public MyDialog1 +class AutolayoutDlg : public MyDialog1 { Q_OBJECT TQ_OBJECT public: - AutotqlayoutDlg(KConfig* c,UMLView* v, TQWidget *tqparent = 0, const char *name = 0); + AutolayoutDlg(KConfig* c,UMLView* v, TQWidget *tqparent = 0, const char *name = 0); public slots: virtual void slotSetAssociationWeight(int i); virtual void slotSetDependenciesWeight(int i); @@ -57,7 +57,7 @@ class AutotqlayoutDlg : public MyDialog1 int tqshapeSeparation; KConfig* config; TQString algname; - Autotqlayout::Autotqlayouter* getAutotqlayouter(); + Autotqlayout::Autolayouter* getAutolayouter(); }; diff --git a/umbrello/umbrello/autolayout/autolayouter.cpp b/umbrello/umbrello/autolayout/autolayouter.cpp index caf852b7..802bc438 100644 --- a/umbrello/umbrello/autolayout/autolayouter.cpp +++ b/umbrello/umbrello/autolayout/autolayouter.cpp @@ -11,13 +11,13 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "autotqlayouter.h" +#include "autolayouter.h" namespace Autotqlayout { -void Autotqlayouter::autotqlayout( UMLView * v ) +void Autolayouter::autotqlayout( UMLView * v ) { setCanvas(v); setGraph(v); diff --git a/umbrello/umbrello/autolayout/autolayouter.h b/umbrello/umbrello/autolayout/autolayouter.h index 40a24235..5d4645f9 100644 --- a/umbrello/umbrello/autolayout/autolayouter.h +++ b/umbrello/umbrello/autolayout/autolayouter.h @@ -21,9 +21,9 @@ This is the super class of any class which encapsulate an autotqlayout algorithm @author Dimitri Ognibene */ -class Autotqlayouter { +class Autolayouter { public: - virtual ~Autotqlayouter() {} + virtual ~Autolayouter() {} virtual void setNoteConnectionWeight(int i)=0; virtual void setNoteConnectionsAsEdges(bool b)=0; diff --git a/umbrello/umbrello/autolayout/autolayouteradapter.cpp b/umbrello/umbrello/autolayout/autolayouteradapter.cpp index 0bba19c7..3a245cbc 100644 --- a/umbrello/umbrello/autolayout/autolayouteradapter.cpp +++ b/umbrello/umbrello/autolayout/autolayouteradapter.cpp @@ -9,21 +9,21 @@ * * ***************************************************************************/ -#include "autotqlayouteradapter.h" +#include "autolayouteradapter.h" namespace Autotqlayout { - AutotqlayouterAdapter::AutotqlayouterAdapter() - : Autotqlayout::Autotqlayouter() + AutolayouterAdapter::AutolayouterAdapter() + : Autotqlayout::Autolayouter() {} - AutotqlayouterAdapter::~AutotqlayouterAdapter() + AutolayouterAdapter::~AutolayouterAdapter() {}} -void Autotqlayout::AutotqlayouterAdapter::addRelationship( AssociationWidget * a ) +void Autotqlayout::AutolayouterAdapter::addRelationship( AssociationWidget * a ) { int weight; switch (a->getAssocType()) @@ -71,57 +71,57 @@ void Autotqlayout::AutotqlayouterAdapter::addRelationship( AssociationWidget * a getGraph()->addEdge(a->getWidgetID(Uml::A).c_str(),a->getWidgetID(Uml::B).c_str(),weight); } -void Autotqlayout::AutotqlayouterAdapter::setAssociationWeight( int i ) +void Autotqlayout::AutolayouterAdapter::setAssociationWeight( int i ) { associationWeight=i; } -void Autotqlayout::AutotqlayouterAdapter::setDependenciesWeight( int i ) +void Autotqlayout::AutolayouterAdapter::setDependenciesWeight( int i ) { dependenciesWeight=i; } -void Autotqlayout::AutotqlayouterAdapter::setGeneralizationWeight( int i ) +void Autotqlayout::AutolayouterAdapter::setGeneralizationWeight( int i ) { generalizationWeight=i; } -void Autotqlayout::AutotqlayouterAdapter::setGeneralizationAsEdges( bool b ) +void Autotqlayout::AutolayouterAdapter::setGeneralizationAsEdges( bool b ) { genralizationAsEdges=b; } -void Autotqlayout::AutotqlayouterAdapter::setDependenciesAsEdges( bool b ) +void Autotqlayout::AutolayouterAdapter::setDependenciesAsEdges( bool b ) { dependenciesAsEdges=b; } -void Autotqlayout::AutotqlayouterAdapter::setAssociationAsEdges( bool b ) +void Autotqlayout::AutolayouterAdapter::setAssociationAsEdges( bool b ) { associationAsEdges=b; } -void Autotqlayout::AutotqlayouterAdapter::setCompressShapes( bool b ) +void Autotqlayout::AutolayouterAdapter::setCompressShapes( bool b ) { compressShapes=b; } -void Autotqlayout::AutotqlayouterAdapter::setCenterDiagram( bool b ) +void Autotqlayout::AutolayouterAdapter::setCenterDiagram( bool b ) { centerDiagram=b; } -void Autotqlayout::AutotqlayouterAdapter::setClusterizeHierarchies( bool b ) +void Autotqlayout::AutolayouterAdapter::setClusterizeHierarchies( bool b ) { clusterizeHierarchies=b; } -void Autotqlayout::AutotqlayouterAdapter::setShapeSeparation( int i ) +void Autotqlayout::AutolayouterAdapter::setShapeSeparation( int i ) { tqshapeSeparation=i; } -Autotqlayout::Graph * Autotqlayout::AutotqlayouterAdapter::setGraph( UMLView * view ) +Autotqlayout::Graph * Autotqlayout::AutolayouterAdapter::setGraph( UMLView * view ) { if (! view) return 0; Autotqlayout::Graph * g=getGraph(); @@ -151,7 +151,7 @@ Autotqlayout::Graph * Autotqlayout::AutotqlayouterAdapter::setGraph( UMLView * return g; } -void Autotqlayout::AutotqlayouterAdapter::updateView( UMLView* view ) +void Autotqlayout::AutolayouterAdapter::updateView( UMLView* view ) { if (! view) return ; UMLWidgetList list = view->getWidgetList(); @@ -175,17 +175,17 @@ UMLWidgetList list = view->getWidgetList(); } } -Autotqlayout::Canvas * Autotqlayout::AutotqlayouterAdapter::setCanvas( UMLView* view ) +Autotqlayout::Canvas * Autotqlayout::AutolayouterAdapter::setCanvas( UMLView* view ) { return canvas=new Autotqlayout::SimpleCanvas(view->getCanvasWidth(),view->getCanvasHeight()); } -void Autotqlayout::AutotqlayouterAdapter::setNoteConnectionWeight( int i ) +void Autotqlayout::AutolayouterAdapter::setNoteConnectionWeight( int i ) { noteConnectionWeight=i; } -void Autotqlayout::AutotqlayouterAdapter::setNoteConnectionsAsEdges( bool b ) +void Autotqlayout::AutolayouterAdapter::setNoteConnectionsAsEdges( bool b ) { noteConnectionAsEdges=b; } diff --git a/umbrello/umbrello/autolayout/autolayouteradapter.h b/umbrello/umbrello/autolayout/autolayouteradapter.h index 0d8e9021..1d05f0d2 100644 --- a/umbrello/umbrello/autolayout/autolayouteradapter.h +++ b/umbrello/umbrello/autolayout/autolayouteradapter.h @@ -13,7 +13,7 @@ #define AUTOLAYOUTAUTOLAYOUTERADAPTER_H //#include "autotqlayout.h" #include "baseinclude.h" -#include "autotqlayouter.h" +#include "autolayouter.h" #include "../umlnamespace.h" @@ -23,12 +23,12 @@ namespace Autotqlayout /** @author Dimitri Ognibene */ -class AutotqlayouterAdapter : virtual public Autotqlayout::Autotqlayouter +class AutolayouterAdapter : virtual public Autotqlayout::Autolayouter { public: - AutotqlayouterAdapter(); + AutolayouterAdapter(); - virtual ~AutotqlayouterAdapter(); + virtual ~AutolayouterAdapter(); virtual void setAssociationWeight(int i); virtual void setDependenciesWeight(int i); diff --git a/umbrello/umbrello/autolayout/dotautolayouter.cpp b/umbrello/umbrello/autolayout/dotautolayouter.cpp index 20d5d34c..dea9b554 100644 --- a/umbrello/umbrello/autolayout/dotautolayouter.cpp +++ b/umbrello/umbrello/autolayout/dotautolayouter.cpp @@ -11,25 +11,25 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "dotautotqlayouter.h" +#include "dotautolayouter.h" #include namespace Autotqlayout { -DotAutotqlayouter::DotAutotqlayouter() - : Autotqlayout::GraphvizAutotqlayouter() +DotAutolayouter::DotAutolayouter() + : Autotqlayout::GraphvizAutolayouter() { } -DotAutotqlayouter::~DotAutotqlayouter() +DotAutolayouter::~DotAutolayouter() { dot_cleanup(gg->_agraph); } -void DotAutotqlayouter::run() +void DotAutolayouter::run() { //#ifndef internal_renderizer /* bind graph to GV context - currently must be done before tqlayout */ diff --git a/umbrello/umbrello/autolayout/dotautolayouter.h b/umbrello/umbrello/autolayout/dotautolayouter.h index 1ccb4bcc..4b8af212 100644 --- a/umbrello/umbrello/autolayout/dotautolayouter.h +++ b/umbrello/umbrello/autolayout/dotautolayouter.h @@ -15,19 +15,19 @@ #ifndef AUTOLAYOUTDOTAUTOLAYOUTER_H #define AUTOLAYOUTDOTAUTOLAYOUTER_H #include "baseinclude.h" -#include "graphvizautotqlayouter.h" +#include "graphvizautolayouter.h" namespace Autotqlayout { /** @author Dimitri Ognibene */ -class DotAutotqlayouter : virtual public Autotqlayout::GraphvizAutotqlayouter +class DotAutolayouter : virtual public Autotqlayout::GraphvizAutolayouter { public: - DotAutotqlayouter(); + DotAutolayouter(); - virtual ~DotAutotqlayouter(); + virtual ~DotAutolayouter(); virtual void run(); diff --git a/umbrello/umbrello/autolayout/graphvizautolayouter.cpp b/umbrello/umbrello/autolayout/graphvizautolayouter.cpp index b8fe49d1..da075642 100644 --- a/umbrello/umbrello/autolayout/graphvizautolayouter.cpp +++ b/umbrello/umbrello/autolayout/graphvizautolayouter.cpp @@ -11,42 +11,42 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "graphvizautotqlayouter.h" +#include "graphvizautolayouter.h" #include namespace Autotqlayout { -GraphvizAutotqlayouter::GraphvizAutotqlayouter() - : Autotqlayout::AutotqlayouterAdapter() +GraphvizAutolayouter::GraphvizAutolayouter() + : Autotqlayout::AutolayouterAdapter() { gg = new GraphvizGraph(); } -GraphvizAutotqlayouter::~GraphvizAutotqlayouter() +GraphvizAutolayouter::~GraphvizAutolayouter() { agclose(gg->_agraph); delete gg; } -void GraphvizAutotqlayouter::setCompressShapes( bool b ) +void GraphvizAutolayouter::setCompressShapes( bool b ) { gg->setCompressShapes(b); } -void GraphvizAutotqlayouter::setCenterDiagram( bool b ) +void GraphvizAutolayouter::setCenterDiagram( bool b ) { gg->setCenterDiagram(b); } -void GraphvizAutotqlayouter::setShapeSeparation( int i ) +void GraphvizAutolayouter::setShapeSeparation( int i ) { gg->setShapeSeparation(i); } -Autotqlayout::Canvas * GraphvizAutotqlayouter::setCanvas( UMLView * view ) +Autotqlayout::Canvas * GraphvizAutolayouter::setCanvas( UMLView * view ) { - Canvas* canvas= AutotqlayouterAdapter::setCanvas(view); + Canvas* canvas= AutolayouterAdapter::setCanvas(view); gg->setCanvas(canvas); } diff --git a/umbrello/umbrello/autolayout/graphvizautolayouter.h b/umbrello/umbrello/autolayout/graphvizautolayouter.h index a2036749..95fa46ba 100644 --- a/umbrello/umbrello/autolayout/graphvizautolayouter.h +++ b/umbrello/umbrello/autolayout/graphvizautolayouter.h @@ -12,7 +12,7 @@ #ifndef AUTOLAYOUTGRAPHVIZAUTOLAYOUTER_H #define AUTOLAYOUTGRAPHVIZAUTOLAYOUTER_H #include "baseinclude.h" -#include "autotqlayouteradapter.h" +#include "autolayouteradapter.h" #include "graphvizgraph.h" namespace Autotqlayout @@ -21,10 +21,10 @@ namespace Autotqlayout /** @author Dimitri Ognibene */ -class GraphvizAutotqlayouter : virtual public Autotqlayout::AutotqlayouterAdapter +class GraphvizAutolayouter : virtual public Autotqlayout::AutolayouterAdapter { public: - GraphvizAutotqlayouter(); + GraphvizAutolayouter(); virtual void setCompressShapes(bool b); @@ -35,7 +35,7 @@ public: virtual Canvas* setCanvas(UMLView* view); - virtual ~GraphvizAutotqlayouter(); + virtual ~GraphvizAutolayouter(); protected: virtual Graph* getGraph(){if (!gg) gg=new GraphvizGraph(); return gg;} diff --git a/umbrello/umbrello/autolayout/graphvizgraph.h b/umbrello/umbrello/autolayout/graphvizgraph.h index 96ae6c31..1be57139 100644 --- a/umbrello/umbrello/autolayout/graphvizgraph.h +++ b/umbrello/umbrello/autolayout/graphvizgraph.h @@ -50,7 +50,7 @@ public: std::deque nodelist; GVC_t* gvc; bool empty_flag; - friend class GraphvizAutotqlayouter; + friend class GraphvizAutolayouter; }; } diff --git a/umbrello/umbrello/autolayout/newautolayoutdialog.ui b/umbrello/umbrello/autolayout/newautolayoutdialog.ui index 459f0e25..9301abe3 100644 --- a/umbrello/umbrello/autolayout/newautolayoutdialog.ui +++ b/umbrello/umbrello/autolayout/newautolayoutdialog.ui @@ -550,5 +550,5 @@ slotSetShapeSeparation(int i) slotSelectAlgorithm(const QString&) - + diff --git a/umbrello/umbrello/classifier.cpp b/umbrello/umbrello/classifier.cpp index b994097a..947590c1 100644 --- a/umbrello/umbrello/classifier.cpp +++ b/umbrello/umbrello/classifier.cpp @@ -392,13 +392,13 @@ UMLClassifierList UMLClassifier::findSuperClassConcepts (ClassifierType type) { UMLClassifierList list = getSuperClasses(); UMLAssociationList rlist = getRealizations(); - UMLClassifierList tqparentConcepts; + UMLClassifierList parentConcepts; Uml::IDType myID = getID(); for (UMLClassifier *concept = list.first(); concept; concept = list.next()) { if (type == ALL || (!concept->isInterface() && type == CLASS) || (concept->isInterface() && type == INTERFACE)) - tqparentConcepts.append(concept); + parentConcepts.append(concept); } for (UMLAssociation *a = rlist.first(); a; a = rlist.next()) @@ -409,12 +409,12 @@ UMLClassifierList UMLClassifier::findSuperClassConcepts (ClassifierType type) { UMLClassifier *concept = dynamic_cast(obj); if (concept && (type == ALL || (!concept->isInterface() && type == CLASS) || (concept->isInterface() && type == INTERFACE)) - && (tqparentConcepts.tqfindRef(concept) == -1)) - tqparentConcepts.append(concept); + && (parentConcepts.tqfindRef(concept) == -1)) + parentConcepts.append(concept); } } - return tqparentConcepts; + return parentConcepts; } bool UMLClassifier::operator==( UMLClassifier & rhs ) { @@ -631,9 +631,9 @@ UMLOperationList UMLClassifier::getOpList(bool includeInherited) { ops.append(static_cast(li)); } if (includeInherited) { - UMLClassifierList tqparents = findSuperClassConcepts(); + UMLClassifierList parents = findSuperClassConcepts(); UMLClassifier *c; - for (UMLClassifierListIt pit(tqparents); (c = pit.current()) != NULL; ++pit) { + for (UMLClassifierListIt pit(parents); (c = pit.current()) != NULL; ++pit) { if (c == this) { kError() << "UMLClassifier::getOpList: class " << c->getName() << " is tqparent of itself ?!?" << endl; diff --git a/umbrello/umbrello/classifiercodedocument.cpp b/umbrello/umbrello/classifiercodedocument.cpp index 4f92dede..6ffca075 100644 --- a/umbrello/umbrello/classifiercodedocument.cpp +++ b/umbrello/umbrello/classifiercodedocument.cpp @@ -372,11 +372,11 @@ void ClassifierCodeDocument::declareClassFields (CodeClassFieldList & list , } } -bool ClassifierCodeDocument::tqparentIsClass() { +bool ClassifierCodeDocument::parentIsClass() { return (m_parentclassifier->getBaseType() == Uml::ot_Class); } -bool ClassifierCodeDocument::tqparentIsInterface() { +bool ClassifierCodeDocument::parentIsInterface() { return (m_parentclassifier->getBaseType() == Uml::ot_Interface); } @@ -396,7 +396,7 @@ void ClassifierCodeDocument::init (UMLClassifier * c ) // initCodeClassFields(); // cant call here?..newCodeClassField is pure virtual // slots - if (tqparentIsClass()) { + if (parentIsClass()) { connect(c,TQT_SIGNAL(attributeAdded(UMLClassifierListItem*)),this,TQT_SLOT(addAttributeClassField(UMLClassifierListItem*))); connect(c,TQT_SIGNAL(attributeRemoved(UMLClassifierListItem*)),this,TQT_SLOT(removeAttributeClassField(UMLClassifierListItem*))); } @@ -494,7 +494,7 @@ void ClassifierCodeDocument::initCodeClassFields ( ) { UMLClassifier * c = getParentClassifier(); // first, do the code classifields that arise from attributes - if (tqparentIsClass()) { + if (parentIsClass()) { UMLAttributeList alist = c->getAttributeList(); for(UMLAttribute * at = alist.first(); at; at = alist.next()) { @@ -635,7 +635,7 @@ void ClassifierCodeDocument::loadClassFieldsFromXMI( TQDomElement & elem) { TQString nodeName = childElem.tagName(); if( nodeName == "codeclassfield") { - TQString id = childElem.attribute("tqparent_id","-1"); + TQString id = childElem.attribute("parent_id","-1"); int role_id = childElem.attribute("role_id","-1").toInt(); CodeClassField * cf = findCodeClassFieldFromParentID(STR2ID(id), role_id); if(cf) @@ -651,7 +651,7 @@ void ClassifierCodeDocument::loadClassFieldsFromXMI( TQDomElement & elem) { m_classFieldMap.insert(cf->getParentObject(),cf); } else - kError()<<" LoadFromXMI: can't load classfield tqparent_id:"<getID())); + docElement.setAttribute("parent_class", ID2STR(getParentClassifier()->getID())); // (code) class fields // which we will store in its own separate child node block diff --git a/umbrello/umbrello/classifiercodedocument.h b/umbrello/umbrello/classifiercodedocument.h index f142cade..33aed6ad 100644 --- a/umbrello/umbrello/classifiercodedocument.h +++ b/umbrello/umbrello/classifiercodedocument.h @@ -81,12 +81,12 @@ public: /** * Return if the tqparent classifier is an interface */ - bool tqparentIsInterface(); + bool parentIsInterface(); /** * Return if the tqparent classifier is a class */ - bool tqparentIsClass(); + bool parentIsClass(); /** * Tell if one or more codeclassfields are derived from any kind of association. diff --git a/umbrello/umbrello/classifierlistitem.cpp b/umbrello/umbrello/classifierlistitem.cpp index 933d9d59..3025353a 100644 --- a/umbrello/umbrello/classifierlistitem.cpp +++ b/umbrello/umbrello/classifierlistitem.cpp @@ -26,16 +26,16 @@ UMLClassifierListItem::UMLClassifierListItem(const UMLObject *tqparent, const TQString& name, Uml::IDType id) : UMLObject(tqparent, name, id) { - UMLObject *tqparentObj = const_cast(tqparent); - UMLClassifier *pc = dynamic_cast(tqparentObj); + UMLObject *parentObj = const_cast(tqparent); + UMLClassifier *pc = dynamic_cast(parentObj); if (pc) UMLObject::setUMLPackage(pc); } UMLClassifierListItem::UMLClassifierListItem(const UMLObject *tqparent) : UMLObject(tqparent) { - UMLObject *tqparentObj = const_cast(tqparent); - UMLClassifier *pc = dynamic_cast(tqparentObj); + UMLObject *parentObj = const_cast(tqparent); + UMLClassifier *pc = dynamic_cast(parentObj); if (pc) UMLObject::setUMLPackage(pc); } diff --git a/umbrello/umbrello/clipboard/umldrag.cpp b/umbrello/umbrello/clipboard/umldrag.cpp index e7bd5d90..6fb0be93 100644 --- a/umbrello/umbrello/clipboard/umldrag.cpp +++ b/umbrello/umbrello/clipboard/umldrag.cpp @@ -539,7 +539,7 @@ bool UMLDrag::getClip3TypeAndID(const TQMimeSource* mimeSource, } bool UMLDrag::decodeClip3(const TQMimeSource* mimeSource, UMLListViewItemList& umlListViewItems, - const UMLListView* tqparentListView){ + const UMLListView* parentListView){ if ( !mimeSource->provides("application/x-uml-clip3") ) { return false; } @@ -584,7 +584,7 @@ bool UMLDrag::decodeClip3(const TQMimeSource* mimeSource, UMLListViewItemList& u continue; } Uml::ListView_Type t = (Uml::ListView_Type)(type.toInt()); - UMLListViewItem* tqparent = tqparentListView->determineParentItem(t); + UMLListViewItem* tqparent = parentListView->determineParentItem(t); UMLListViewItem* itemData = new UMLListViewItem(tqparent); if ( itemData->loadFromXMI(listItemElement) ) umlListViewItems.append(itemData); diff --git a/umbrello/umbrello/clipboard/umldrag.h b/umbrello/umbrello/clipboard/umldrag.h index 315e3c98..ad5e4f02 100644 --- a/umbrello/umbrello/clipboard/umldrag.h +++ b/umbrello/umbrello/clipboard/umldrag.h @@ -175,7 +175,7 @@ public: */ static bool decodeClip3(const TQMimeSource* mimeSource, UMLListViewItemList& umlListViewItems, - const UMLListView* tqparentListView=0); + const UMLListView* parentListView=0); struct LvTypeAndID { Uml::ListView_Type type; diff --git a/umbrello/umbrello/codeaccessormethod.cpp b/umbrello/umbrello/codeaccessormethod.cpp index fab32f7c..938aa88f 100644 --- a/umbrello/umbrello/codeaccessormethod.cpp +++ b/umbrello/umbrello/codeaccessormethod.cpp @@ -30,10 +30,10 @@ // Constructors/Destructors // -CodeAccessorMethod::CodeAccessorMethod ( CodeClassField * tqparentCF ) - : CodeMethodBlock ( tqparentCF->getParentDocument(), tqparentCF->getParentObject() ) +CodeAccessorMethod::CodeAccessorMethod ( CodeClassField * parentCF ) + : CodeMethodBlock ( parentCF->getParentDocument(), parentCF->getParentObject() ) { - initFields(tqparentCF); + initFields(parentCF); } CodeAccessorMethod::~CodeAccessorMethod ( ) { } @@ -54,8 +54,8 @@ CodeClassField * CodeAccessorMethod::getParentClassField ( ) { return m_parentclassfield; } -bool CodeAccessorMethod::tqparentIsAttribute( ) { - return getParentClassField()->tqparentIsAttribute(); +bool CodeAccessorMethod::parentIsAttribute( ) { + return getParentClassField()->parentIsAttribute(); } /** @@ -183,9 +183,9 @@ void CodeAccessorMethod::setAttributesFromObject(TextBlock * obj) } -void CodeAccessorMethod::initFields(CodeClassField * tqparentClassField ) { +void CodeAccessorMethod::initFields(CodeClassField * parentClassField ) { - m_parentclassfield = tqparentClassField; + m_parentclassfield = parentClassField; m_accessorType = GET; m_canDelete = false; // we cant delete these with the codeeditor, delete the UML operation instead. diff --git a/umbrello/umbrello/codeaccessormethod.h b/umbrello/umbrello/codeaccessormethod.h index b144c068..14289e74 100644 --- a/umbrello/umbrello/codeaccessormethod.h +++ b/umbrello/umbrello/codeaccessormethod.h @@ -70,7 +70,7 @@ public: */ // virtual UMLObject * getParentObject(); - bool tqparentIsAttribute(); + bool parentIsAttribute(); /** * Save the XMI representation of this object @@ -112,7 +112,7 @@ private: CodeClassField * m_parentclassfield; AccessorType m_accessorType; - void initFields(CodeClassField * tqparentCF ); + void initFields(CodeClassField * parentCF ); }; diff --git a/umbrello/umbrello/codeclassfield.cpp b/umbrello/umbrello/codeclassfield.cpp index 0a108a18..2e242664 100644 --- a/umbrello/umbrello/codeclassfield.cpp +++ b/umbrello/umbrello/codeclassfield.cpp @@ -82,8 +82,8 @@ CodeClassField::~CodeClassField ( ) { void CodeClassField::setParentUMLObject (UMLObject * obj) { UMLRole *role = dynamic_cast(obj); if(role) { - UMLAssociation * tqparentAssoc = role->getParentAssociation(); - Uml::Association_Type atype = tqparentAssoc->getAssocType(); + UMLAssociation * parentAssoc = role->getParentAssociation(); + Uml::Association_Type atype = parentAssoc->getAssocType(); m_parentIsAttribute = false; if ( atype == Uml::at_Association || atype == Uml::at_Association_Self) @@ -103,7 +103,7 @@ void CodeClassField::setParentUMLObject (UMLObject * obj) { TQString CodeClassField::getTypeName ( ) { - if (tqparentIsAttribute()) + if (parentIsAttribute()) { UMLAttribute * at = (UMLAttribute*) getParentObject(); return at->getTypeName(); @@ -121,7 +121,7 @@ TQString CodeClassField::getTypeName ( ) { // of objects (as per specification of associations) TQString CodeClassField::getListObjectType() { TQString type = TQString (""); - if (!tqparentIsAttribute()) + if (!parentIsAttribute()) { UMLRole * role = dynamic_cast(getParentObject()); type = getUMLObjectName(role->getObject()); @@ -133,7 +133,7 @@ TQString CodeClassField::getListObjectType() { * Get the value of m_isAbstract * @return the value of m_isAbstract */ -bool CodeClassField::tqparentIsAttribute ( ) { +bool CodeClassField::parentIsAttribute ( ) { return m_parentIsAttribute; // return (m_classFieldType == Attribute) ? true : false; } @@ -323,7 +323,7 @@ void CodeClassField::saveToXMI ( TQDomDocument & doc, TQDomElement & root ) { } int CodeClassField::minimumListOccurances( ) { - if (!tqparentIsAttribute()) + if (!parentIsAttribute()) { UMLRole * role = dynamic_cast(getParentObject()); TQString multi = role->getMultiplicity(); @@ -340,7 +340,7 @@ int CodeClassField::minimumListOccurances( ) { } int CodeClassField::maximumListOccurances( ) { - if (!tqparentIsAttribute()) + if (!parentIsAttribute()) { UMLRole * role = dynamic_cast(getParentObject()); TQString multi = role->getMultiplicity(); @@ -444,7 +444,7 @@ void CodeClassField::initAccessorMethods() // add in the add,remove and list methods for things which are role based. // (and only used if the role specifies a 'list' type object - if (!tqparentIsAttribute()) { + if (!parentIsAttribute()) { if(!findMethodByType(CodeAccessorMethod::ADD)) { @@ -485,7 +485,7 @@ void CodeClassField::updateContent() // I suppose this could be supported under individual accessor method synctotqparent // calls, but its going to happen again and again for many languages. Why not a catch // all here? -b.t. - if (tqparentIsAttribute()) + if (parentIsAttribute()) { for ( CodeAccessorMethod *method = m_methodVector.first(); method; method = m_methodVector.next() ) @@ -576,7 +576,7 @@ bool CodeClassField::fieldIsSingleValue ( ) { // For the time being, all attributes ARE single values (yes, // I know this isnt always true, but we have to start somewhere.) - if(tqparentIsAttribute()) + if(parentIsAttribute()) return true; UMLRole * role = dynamic_cast(getParentObject()); diff --git a/umbrello/umbrello/codeclassfield.h b/umbrello/umbrello/codeclassfield.h index 10efbbae..a1674318 100644 --- a/umbrello/umbrello/codeclassfield.h +++ b/umbrello/umbrello/codeclassfield.h @@ -51,8 +51,8 @@ public: /** * Constructors */ - CodeClassField ( ClassifierCodeDocument * tqparentDoc , UMLAttribute * attrib ); - CodeClassField ( ClassifierCodeDocument * tqparentDoc , UMLRole * role); + CodeClassField ( ClassifierCodeDocument * parentDoc , UMLAttribute * attrib ); + CodeClassField ( ClassifierCodeDocument * parentDoc , UMLRole * role); /** * Finish off initializations of the object. @@ -115,7 +115,7 @@ public: ClassFieldType getClassFieldType(); // quick utility call to figure out if tqparent is an attribute or not - bool tqparentIsAttribute ( ); + bool parentIsAttribute ( ); // get the type of object that will be added/removed from lists // of objects (as per specification of associations) diff --git a/umbrello/umbrello/codeclassfielddeclarationblock.cpp b/umbrello/umbrello/codeclassfielddeclarationblock.cpp index 5283cb38..7c4f5af6 100644 --- a/umbrello/umbrello/codeclassfielddeclarationblock.cpp +++ b/umbrello/umbrello/codeclassfielddeclarationblock.cpp @@ -14,7 +14,7 @@ */ /** basicially a class to allow for syncronization of the contents based on the - * values of the tqparentClassField's tqparentObject + * values of the parentClassField's parentObject */ #include "codeclassfielddeclarationblock.h" @@ -24,11 +24,11 @@ // Constructors/Destructors // -CodeClassFieldDeclarationBlock::CodeClassFieldDeclarationBlock ( CodeClassField * tqparentCF ) - : CodeBlockWithComments ( (CodeDocument*) tqparentCF->getParentDocument() ), - OwnedCodeBlock ((UMLObject*) tqparentCF->getParentObject()) +CodeClassFieldDeclarationBlock::CodeClassFieldDeclarationBlock ( CodeClassField * parentCF ) + : CodeBlockWithComments ( (CodeDocument*) parentCF->getParentDocument() ), + OwnedCodeBlock ((UMLObject*) parentCF->getParentObject()) { - init(tqparentCF); + init(parentCF); } CodeClassFieldDeclarationBlock::~CodeClassFieldDeclarationBlock ( ) { @@ -51,7 +51,7 @@ CodeClassField * CodeClassFieldDeclarationBlock::getParentClassField ( ) { return m_parentclassfield; } -/** Get the tqparent object of the tqparentCodeClassfield +/** Get the tqparent object of the parentCodeClassfield */ UMLObject * CodeClassFieldDeclarationBlock::getParentObject ( ) { return m_parentclassfield->getParentObject(); @@ -141,7 +141,7 @@ void CodeClassFieldDeclarationBlock::syncToParent () { // for role-based accessors, we DONT write ourselves out when // the name of the role is not defined. - if(!(getParentClassField()->tqparentIsAttribute())) + if(!(getParentClassField()->parentIsAttribute())) { UMLRole * tqparent = dynamic_cast(getParentObject()); if (tqparent == NULL) @@ -164,9 +164,9 @@ void CodeClassFieldDeclarationBlock::syncToParent () { } -void CodeClassFieldDeclarationBlock::init (CodeClassField * tqparentCF) +void CodeClassFieldDeclarationBlock::init (CodeClassField * parentCF) { - m_parentclassfield = tqparentCF; + m_parentclassfield = parentCF; m_canDelete = false; connect(m_parentclassfield,TQT_SIGNAL(modified()),this,TQT_SLOT(syncToParent())); } diff --git a/umbrello/umbrello/codeclassfielddeclarationblock.h b/umbrello/umbrello/codeclassfielddeclarationblock.h index 285416e3..add38fa8 100644 --- a/umbrello/umbrello/codeclassfielddeclarationblock.h +++ b/umbrello/umbrello/codeclassfielddeclarationblock.h @@ -57,7 +57,7 @@ public: */ CodeClassField * getParentClassField ( ); - /** A Utility method to get the tqparent object of the tqparentCodeClassfield + /** A Utility method to get the tqparent object of the parentCodeClassfield */ UMLObject * getParentObject ( ); diff --git a/umbrello/umbrello/codegenerators/adawriter.cpp b/umbrello/umbrello/codegenerators/adawriter.cpp index 475be180..d081ce0e 100644 --- a/umbrello/umbrello/codegenerators/adawriter.cpp +++ b/umbrello/umbrello/codegenerators/adawriter.cpp @@ -483,9 +483,9 @@ void AdaWriter::writeOperation(UMLOperation *op, TQTextStream &ada, bool is_comm ada << cleanName(op->getName()) << " "; if (! (op->getStatic() && atl.count() == 0)) ada << "("; - UMLClassifier *tqparentClassifier = static_cast(op->getUMLPackage()); + UMLClassifier *parentClassifier = static_cast(op->getUMLPackage()); if (! op->getStatic()) { - ada << "Self : access " << className(tqparentClassifier); + ada << "Self : access " << className(parentClassifier); if (atl.count()) ada << ";" << m_endl; } diff --git a/umbrello/umbrello/codegenerators/aswriter.cpp b/umbrello/umbrello/codegenerators/aswriter.cpp index e99559f2..20f9a4a4 100644 --- a/umbrello/umbrello/codegenerators/aswriter.cpp +++ b/umbrello/umbrello/codegenerators/aswriter.cpp @@ -602,7 +602,7 @@ const TQStringList ASWriter::reservedKeywords() const { << "or" << "ord" << "_parent" - << "tqparentNode" + << "parentNode" << "parseFloat" << "parseInt" << "parseXML" diff --git a/umbrello/umbrello/codegenerators/cppcodeclassfield.cpp b/umbrello/umbrello/codegenerators/cppcodeclassfield.cpp index 7c8f0ff3..1e0bf353 100644 --- a/umbrello/umbrello/codegenerators/cppcodeclassfield.cpp +++ b/umbrello/umbrello/codegenerators/cppcodeclassfield.cpp @@ -33,14 +33,14 @@ // Constructors/Destructors // -CPPCodeClassField::CPPCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLRole * role) - : CodeClassField(tqparentDoc, role) +CPPCodeClassField::CPPCodeClassField (ClassifierCodeDocument * parentDoc, UMLRole * role) + : CodeClassField(parentDoc, role) { } -CPPCodeClassField::CPPCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLAttribute * attrib) - : CodeClassField(tqparentDoc, attrib) +CPPCodeClassField::CPPCodeClassField (ClassifierCodeDocument * parentDoc, UMLAttribute * attrib) + : CodeClassField(parentDoc, attrib) { } @@ -55,7 +55,7 @@ CPPCodeClassField::~CPPCodeClassField ( ) { } // TQString CPPCodeClassField::getFieldName() { - if (tqparentIsAttribute()) + if (parentIsAttribute()) { UMLAttribute * at = (UMLAttribute*) getParentObject(); return cleanName(at->getName()); @@ -80,7 +80,7 @@ TQString CPPCodeClassField::getListFieldClassName () { TQString CPPCodeClassField::getInitialValue() { - if (tqparentIsAttribute()) + if (parentIsAttribute()) { UMLAttribute * at = dynamic_cast( getParentObject() ); if (at) { diff --git a/umbrello/umbrello/codegenerators/cppcodeclassfield.h b/umbrello/umbrello/codegenerators/cppcodeclassfield.h index 0b714b16..7a76c7cc 100644 --- a/umbrello/umbrello/codegenerators/cppcodeclassfield.h +++ b/umbrello/umbrello/codegenerators/cppcodeclassfield.h @@ -37,8 +37,8 @@ public: /** * Constructors */ - CPPCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLRole * role); - CPPCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLAttribute * attrib); + CPPCodeClassField (ClassifierCodeDocument * parentDoc, UMLRole * role); + CPPCodeClassField (ClassifierCodeDocument * parentDoc, UMLAttribute * attrib); /** * Empty Destructor diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui b/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui index f2bef81e..6ca8377b 100644 --- a/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui +++ b/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui @@ -473,7 +473,7 @@ browseClicked() - + klineedit.h klineedit.h diff --git a/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.cpp b/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.cpp index 57ae0172..868dea41 100644 --- a/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.cpp +++ b/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.cpp @@ -25,10 +25,10 @@ // CPPHeaderClassDeclarationBlock::CPPHeaderClassDeclarationBlock - ( CPPHeaderCodeDocument * tqparentDoc, const TQString &startText, const TQString &endText, const TQString &comment) - : OwnedHierarchicalCodeBlock(tqparentDoc->getParentClassifier(), tqparentDoc, startText, endText, comment) + ( CPPHeaderCodeDocument * parentDoc, const TQString &startText, const TQString &endText, const TQString &comment) + : OwnedHierarchicalCodeBlock(parentDoc->getParentClassifier(), parentDoc, startText, endText, comment) { - init(tqparentDoc, comment); + init(parentDoc, comment); } CPPHeaderClassDeclarationBlock::~CPPHeaderClassDeclarationBlock ( ) { } @@ -75,10 +75,10 @@ void CPPHeaderClassDeclarationBlock::saveToXMI ( TQDomDocument & doc, TQDomEleme void CPPHeaderClassDeclarationBlock::updateContent ( ) { - CPPHeaderCodeDocument *tqparentDoc = dynamic_cast(getParentDocument()); - UMLClassifier *c = tqparentDoc->getParentClassifier(); + CPPHeaderCodeDocument *parentDoc = dynamic_cast(getParentDocument()); + UMLClassifier *c = parentDoc->getParentClassifier(); TQString endLine = UMLApp::app()->getCommonPolicy()->getNewLineEndingChars(); - bool isInterface = tqparentDoc->tqparentIsInterface(); // a little shortcut + bool isInterface = parentDoc->parentIsInterface(); // a little shortcut TQString CPPHeaderClassName = CodeGenerator::cleanName(c->getName()); bool forceDoc = UMLApp::app()->getCommonPolicy()->getCodeVerboseDocumentComments(); @@ -112,7 +112,7 @@ void CPPHeaderClassDeclarationBlock::updateContent ( ) */ /* - if(tqparentDoc->tqparentIsInterface()) + if(parentDoc->parentIsInterface()) startText.append("interface "); else */ @@ -144,10 +144,10 @@ void CPPHeaderClassDeclarationBlock::updateContent ( ) } -void CPPHeaderClassDeclarationBlock::init (CPPHeaderCodeDocument *tqparentDoc, const TQString &comment) +void CPPHeaderClassDeclarationBlock::init (CPPHeaderCodeDocument *parentDoc, const TQString &comment) { - setComment(new CPPCodeDocumentation(tqparentDoc)); + setComment(new CPPCodeDocumentation(parentDoc)); getComment()->setText(comment); setEndText("};"); diff --git a/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.h b/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.h index b6eb68c7..84fc128a 100644 --- a/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.h +++ b/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.h @@ -34,7 +34,7 @@ public: /** * Empty Constructor */ - explicit CPPHeaderClassDeclarationBlock ( CPPHeaderCodeDocument * tqparentDoc, const TQString &start = "", const TQString &endText = "}", const TQString &comment = ""); + explicit CPPHeaderClassDeclarationBlock ( CPPHeaderCodeDocument * parentDoc, const TQString &start = "", const TQString &endText = "}", const TQString &comment = ""); /** * Empty Destructor diff --git a/umbrello/umbrello/codegenerators/cppheadercodeaccessormethod.cpp b/umbrello/umbrello/codegenerators/cppheadercodeaccessormethod.cpp index 2c983a15..d96ad398 100644 --- a/umbrello/umbrello/codegenerators/cppheadercodeaccessormethod.cpp +++ b/umbrello/umbrello/codegenerators/cppheadercodeaccessormethod.cpp @@ -56,12 +56,12 @@ CPPHeaderCodeAccessorMethod::~CPPHeaderCodeAccessorMethod ( ) { } // we basically want to update the body of this method void CPPHeaderCodeAccessorMethod::updateContent( ) { - CodeClassField * tqparentField = getParentClassField(); - CPPCodeClassField * cppfield = dynamic_cast(tqparentField); + CodeClassField * parentField = getParentClassField(); + CPPCodeClassField * cppfield = dynamic_cast(parentField); CodeGenPolicyExt *pe = UMLApp::app()->getPolicyExt(); CPPCodeGenerationPolicy * policy = dynamic_cast(pe); bool isInlineMethod = policy->getAccessorsAreInline( ); - Uml::Visibility scope = tqparentField->getVisibility(); + Uml::Visibility scope = parentField->getVisibility(); TQString variableName = cppfield->getFieldName(); TQString itemClassName = cppfield->getTypeName(); TQString text; @@ -92,11 +92,11 @@ void CPPHeaderCodeAccessorMethod::updateContent( ) void CPPHeaderCodeAccessorMethod::updateMethodDeclaration() { - CodeClassField * tqparentField = getParentClassField(); - ClassifierCodeDocument * doc = tqparentField->getParentDocument(); + CodeClassField * parentField = getParentClassField(); + ClassifierCodeDocument * doc = parentField->getParentDocument(); CodeGenPolicyExt *pe = UMLApp::app()->getPolicyExt(); CPPCodeGenerationPolicy * policy = dynamic_cast(pe); - CPPCodeClassField * cppfield = dynamic_cast(tqparentField); + CPPCodeClassField * cppfield = dynamic_cast(parentField); bool isInlineMethod = policy->getAccessorsAreInline( ); diff --git a/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.cpp b/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.cpp index d2dba95d..55edd167 100644 --- a/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.cpp +++ b/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.cpp @@ -64,7 +64,7 @@ void CPPHeaderCodeClassFieldDeclarationBlock::updateContent( ) TQString fieldName = hcppcf->getFieldName(); // Ugh. Sloppy exception. - if (!cf->tqparentIsAttribute() && !cf->fieldIsSingleValue()) + if (!cf->parentIsAttribute() && !cf->fieldIsSingleValue()) typeName = hcppcf->getListFieldClassName(); TQString body = staticValue + ' ' + typeName + ' ' + fieldName + ';'; diff --git a/umbrello/umbrello/codegenerators/cppheadercodedocument.cpp b/umbrello/umbrello/codegenerators/cppheadercodedocument.cpp index 92bafba1..1e1bab84 100644 --- a/umbrello/umbrello/codegenerators/cppheadercodedocument.cpp +++ b/umbrello/umbrello/codegenerators/cppheadercodedocument.cpp @@ -185,7 +185,7 @@ void CPPHeaderCodeDocument::loadChildTextBlocksFromNode ( TQDomElement & root) } else if( name == "codeoperation" ) { // find the code operation by id - TQString id = element.attribute("tqparent_id","-1"); + TQString id = element.attribute("parent_id","-1"); UMLObject * obj = UMLApp::app()->getDocument()->findObjectById(STR2ID(id)); UMLOperation * op = dynamic_cast(obj); if(op) { @@ -370,7 +370,7 @@ void CPPHeaderCodeDocument::updateContent( ) bool hasOperationMethods = c->getOpList().last() ? true : false; bool hasNamespace = false; bool isEnumeration = false; - bool isInterface = tqparentIsInterface(); + bool isInterface = parentIsInterface(); bool hasclassFields = hasClassFields(); bool forcedoc = UMLApp::app()->getCommonPolicy()->getCodeVerboseDocumentComments(); TQString endLine = UMLApp::app()->getCommonPolicy()->getNewLineEndingChars(); diff --git a/umbrello/umbrello/codegenerators/cppheadercodeoperation.cpp b/umbrello/umbrello/codegenerators/cppheadercodeoperation.cpp index c4ec5145..37951553 100644 --- a/umbrello/umbrello/codegenerators/cppheadercodeoperation.cpp +++ b/umbrello/umbrello/codegenerators/cppheadercodeoperation.cpp @@ -68,7 +68,7 @@ void CPPHeaderCodeOperation::updateContent( ) void CPPHeaderCodeOperation::updateMethodDeclaration() { ClassifierCodeDocument *ccd = dynamic_cast(getParentDocument()); - bool isInterface = ccd->tqparentIsInterface(); + bool isInterface = ccd->parentIsInterface(); UMLOperation * o = getParentOperation(); CodeGenPolicyExt *pe = UMLApp::app()->getPolicyExt(); @@ -134,7 +134,7 @@ void CPPHeaderCodeOperation::updateMethodDeclaration() int CPPHeaderCodeOperation::lastEditableLine() { ClassifierCodeDocument * doc = dynamic_cast(getParentDocument()); UMLOperation * o = getParentOperation(); - if(doc->tqparentIsInterface() || o->getAbstract()) + if(doc->parentIsInterface() || o->getAbstract()) return -1; // very last line is NOT editable as its a one-line declaration w/ no body in // an interface. return 0; diff --git a/umbrello/umbrello/codegenerators/cppsourcecodeaccessormethod.cpp b/umbrello/umbrello/codegenerators/cppsourcecodeaccessormethod.cpp index 2ff19637..c71f6d2a 100644 --- a/umbrello/umbrello/codegenerators/cppsourcecodeaccessormethod.cpp +++ b/umbrello/umbrello/codegenerators/cppsourcecodeaccessormethod.cpp @@ -56,8 +56,8 @@ CPPSourceCodeAccessorMethod::~CPPSourceCodeAccessorMethod ( ) { } // we basically want to update the body of this method void CPPSourceCodeAccessorMethod::updateContent( ) { - CodeClassField * tqparentField = getParentClassField(); - CPPCodeClassField * cppfield = dynamic_cast(tqparentField); + CodeClassField * parentField = getParentClassField(); + CPPCodeClassField * cppfield = dynamic_cast(parentField); CodeGenPolicyExt *pe = UMLApp::app()->getPolicyExt(); CPPCodeGenerationPolicy * policy = dynamic_cast(pe); bool isInlineMethod = policy->getAccessorsAreInline( ); @@ -92,11 +92,11 @@ void CPPSourceCodeAccessorMethod::updateContent( ) void CPPSourceCodeAccessorMethod::updateMethodDeclaration() { - CodeClassField * tqparentField = getParentClassField(); - ClassifierCodeDocument * doc = tqparentField->getParentDocument(); + CodeClassField * parentField = getParentClassField(); + ClassifierCodeDocument * doc = parentField->getParentDocument(); CodeGenPolicyExt *pe = UMLApp::app()->getPolicyExt(); CPPCodeGenerationPolicy * policy = dynamic_cast(pe); - CPPCodeClassField * cppfield = dynamic_cast(tqparentField); + CPPCodeClassField * cppfield = dynamic_cast(parentField); UMLClassifier * c = doc->getParentClassifier(); bool isInlineMethod = policy->getAccessorsAreInline( ); diff --git a/umbrello/umbrello/codegenerators/cppsourcecodeoperation.cpp b/umbrello/umbrello/codegenerators/cppsourcecodeoperation.cpp index 5c3d0a74..9409b207 100644 --- a/umbrello/umbrello/codegenerators/cppsourcecodeoperation.cpp +++ b/umbrello/umbrello/codegenerators/cppsourcecodeoperation.cpp @@ -41,7 +41,7 @@ CPPSourceCodeOperation::CPPSourceCodeOperation ( CPPSourceCodeDocument * doc, UM CPPCodeGenerationPolicy * policy = dynamic_cast(pe); UMLClassifier * c = doc->getParentClassifier(); UMLOperation * o = getParentOperation(); - bool isInterface = doc->tqparentIsInterface(); + bool isInterface = doc->parentIsInterface(); bool isInlineMethod = policy->getOperationsAreInline( ); // first, the comment on the operation @@ -131,7 +131,7 @@ void CPPSourceCodeOperation::updateMethodDeclaration() CPPCodeGenerationPolicy * policy = dynamic_cast(pe); UMLClassifier * c = doc->getParentClassifier(); UMLOperation * o = getParentOperation(); - bool isInterface = doc->tqparentIsInterface(); + bool isInterface = doc->parentIsInterface(); bool isInlineMethod = policy->getOperationsAreInline( ); // first, the comment on the operation diff --git a/umbrello/umbrello/codegenerators/csharpwriter.cpp b/umbrello/umbrello/codegenerators/csharpwriter.cpp index a6c64db4..601ca84b 100644 --- a/umbrello/umbrello/codegenerators/csharpwriter.cpp +++ b/umbrello/umbrello/codegenerators/csharpwriter.cpp @@ -434,9 +434,9 @@ void CSharpWriter::writeRealizationsRecursive(UMLClassifier *currentClass, UMLAs cs << m_container_indent << m_indentation << "#endregion" << m_endl << m_endl; // Recurse to tqparent realizations - UMLAssociationList tqparentReal = real->getRealizations(); - if (!tqparentReal.isEmpty()) { - writeRealizationsRecursive(real, &tqparentReal, cs); + UMLAssociationList parentReal = real->getRealizations(); + if (!parentReal.isEmpty()) { + writeRealizationsRecursive(real, &parentReal, cs); } } } diff --git a/umbrello/umbrello/codegenerators/javaantcodedocument.cpp b/umbrello/umbrello/codegenerators/javaantcodedocument.cpp index 1fd6fd69..99f0d862 100644 --- a/umbrello/umbrello/codegenerators/javaantcodedocument.cpp +++ b/umbrello/umbrello/codegenerators/javaantcodedocument.cpp @@ -146,7 +146,7 @@ void JavaANTCodeDocument::loadChildTextBlocksFromNode ( TQDomElement & root) } else if( name == "codeoperation" ) { // find the code operation by id - TQString id = element.attribute("tqparent_id","-1"); + TQString id = element.attribute("parent_id","-1"); UMLObject * obj = UMLApp::app()->getDocument()->findObjectById(STR2ID(id)); UMLOperation * op = dynamic_cast(obj); if(op) { diff --git a/umbrello/umbrello/codegenerators/javaclassdeclarationblock.cpp b/umbrello/umbrello/codegenerators/javaclassdeclarationblock.cpp index babc04a9..e1966001 100644 --- a/umbrello/umbrello/codegenerators/javaclassdeclarationblock.cpp +++ b/umbrello/umbrello/codegenerators/javaclassdeclarationblock.cpp @@ -23,10 +23,10 @@ // JavaClassDeclarationBlock::JavaClassDeclarationBlock - ( JavaClassifierCodeDocument * tqparentDoc, const TQString &startText, const TQString &endText, const TQString &comment) - : OwnedHierarchicalCodeBlock(tqparentDoc->getParentClassifier(), tqparentDoc, startText, endText, comment) + ( JavaClassifierCodeDocument * parentDoc, const TQString &startText, const TQString &endText, const TQString &comment) + : OwnedHierarchicalCodeBlock(parentDoc->getParentClassifier(), parentDoc, startText, endText, comment) { - init(tqparentDoc, comment); + init(parentDoc, comment); } JavaClassDeclarationBlock::~JavaClassDeclarationBlock ( ) { } @@ -66,12 +66,12 @@ void JavaClassDeclarationBlock::loadFromXMI ( TQDomElement & root ) void JavaClassDeclarationBlock::updateContent ( ) { - JavaClassifierCodeDocument *tqparentDoc = dynamic_cast(getParentDocument()); - UMLClassifier *c = tqparentDoc->getParentClassifier(); + JavaClassifierCodeDocument *parentDoc = dynamic_cast(getParentDocument()); + UMLClassifier *c = parentDoc->getParentClassifier(); CodeGenerationPolicy *commonPolicy = UMLApp::app()->getCommonPolicy(); TQString endLine = commonPolicy->getNewLineEndingChars(); - bool isInterface = tqparentDoc->tqparentIsInterface(); // a little shortcut - TQString JavaClassName = tqparentDoc->getJavaClassName(c->getName()); + bool isInterface = parentDoc->parentIsInterface(); // a little shortcut + TQString JavaClassName = parentDoc->getJavaClassName(c->getName()); // COMMENT if(isInterface) @@ -101,7 +101,7 @@ void JavaClassDeclarationBlock::updateContent ( ) } else startText.append("public "); - if(tqparentDoc->tqparentIsInterface()) + if(parentDoc->parentIsInterface()) startText.append("interface "); else startText.append("class "); @@ -122,7 +122,7 @@ void JavaClassDeclarationBlock::updateContent ( ) startText.append(" extends "); for (UMLClassifier * concept= superclasses.first(); concept; concept = superclasses.next()) { - startText.append(tqparentDoc->cleanName(concept->getName())); + startText.append(parentDoc->cleanName(concept->getName())); if(i != (nrof_superclasses-1)) startText.append(", "); i++; @@ -140,7 +140,7 @@ void JavaClassDeclarationBlock::updateContent ( ) } for (UMLClassifier * concept= superinterfaces.first(); concept; concept = superinterfaces.next()) { - startText.append(tqparentDoc->cleanName(concept->getName())); + startText.append(parentDoc->cleanName(concept->getName())); if(i != (nrof_superinterfaces-1)) startText.append(", "); i++; @@ -153,10 +153,10 @@ void JavaClassDeclarationBlock::updateContent ( ) } -void JavaClassDeclarationBlock::init (JavaClassifierCodeDocument *tqparentDoc, const TQString &comment) +void JavaClassDeclarationBlock::init (JavaClassifierCodeDocument *parentDoc, const TQString &comment) { - setComment(new JavaCodeDocumentation(tqparentDoc)); + setComment(new JavaCodeDocumentation(parentDoc)); getComment()->setText(comment); setEndText("}"); diff --git a/umbrello/umbrello/codegenerators/javaclassdeclarationblock.h b/umbrello/umbrello/codegenerators/javaclassdeclarationblock.h index caa07074..0c1709ba 100644 --- a/umbrello/umbrello/codegenerators/javaclassdeclarationblock.h +++ b/umbrello/umbrello/codegenerators/javaclassdeclarationblock.h @@ -34,7 +34,7 @@ public: /** * Empty Constructor */ - explicit JavaClassDeclarationBlock ( JavaClassifierCodeDocument * tqparentDoc, const TQString &start = "", const TQString &endText = "}", const TQString &comment = ""); + explicit JavaClassDeclarationBlock ( JavaClassifierCodeDocument * parentDoc, const TQString &start = "", const TQString &endText = "}", const TQString &comment = ""); /** * Empty Destructor diff --git a/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp b/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp index bcf46bb6..e386d01d 100644 --- a/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp +++ b/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp @@ -222,7 +222,7 @@ void JavaClassifierCodeDocument::loadChildTextBlocksFromNode ( TQDomElement & ro } else if( name == "codeoperation" ) { // find the code operation by id - TQString id = element.attribute("tqparent_id","-1"); + TQString id = element.attribute("parent_id","-1"); UMLObject * obj = UMLApp::app()->getDocument()->findObjectById(STR2ID(id)); UMLOperation * op = dynamic_cast(obj); if(op) { @@ -344,7 +344,7 @@ void JavaClassifierCodeDocument::updateContent( ) // This depends on whether or not we have attribute/association classes CodeClassFieldList * cfList = getCodeClassFieldList(); for(CodeClassField * field = cfList->first(); field; field = cfList->next()) - if(field->tqparentIsAttribute()) + if(field->parentIsAttribute()) field->setWriteOutMethods(policy->getAutoGenerateAttribAccessors()); else field->setWriteOutMethods(policy->getAutoGenerateAssocAccessors()); @@ -359,7 +359,7 @@ void JavaClassifierCodeDocument::updateContent( ) CodeClassFieldList aggregationClassFields = getSpecificClassFields ( CodeClassField::Aggregation ); CodeClassFieldList compositionClassFields = getSpecificClassFields ( CodeClassField::Composition ); - bool isInterface = tqparentIsInterface(); + bool isInterface = parentIsInterface(); bool hasOperationMethods = c->getOpList().last() ? true : false; TQString endLine = commonPolicy->getNewLineEndingChars(); // a shortcut..so we don't have to call this all the time @@ -532,7 +532,7 @@ void JavaClassifierCodeDocument::updateContent( ) constBlock->addOrUpdateTaggedCodeBlockWithComments("emptyconstructor", emptyConstStatement, "Empty Constructor", 1, false); // Now, as an additional condition we only show the empty constructor block // IF it was desired to be shown - if(tqparentIsClass() && pol->getAutoGenerateConstructors()) + if(parentIsClass() && pol->getAutoGenerateConstructors()) emptyConstBlock->setWriteOutText(true); else emptyConstBlock->setWriteOutText(false); diff --git a/umbrello/umbrello/codegenerators/javacodeaccessormethod.cpp b/umbrello/umbrello/codegenerators/javacodeaccessormethod.cpp index dde0ca31..c0b08396 100644 --- a/umbrello/umbrello/codegenerators/javacodeaccessormethod.cpp +++ b/umbrello/umbrello/codegenerators/javacodeaccessormethod.cpp @@ -74,8 +74,8 @@ void JavaCodeAccessorMethod::setAttributesFromNode( TQDomElement & root) void JavaCodeAccessorMethod::updateContent( ) { - CodeClassField * tqparentField = getParentClassField(); - JavaCodeClassField * javafield = dynamic_cast(tqparentField); + CodeClassField * parentField = getParentClassField(); + JavaCodeClassField * javafield = dynamic_cast(parentField); TQString fieldName = javafield->getFieldName(); TQString text = ""; @@ -150,7 +150,7 @@ void JavaCodeAccessorMethod::updateMethodDeclaration() // set scope of this accessor appropriately..if its an attribute, // we need to be more sophisticated - if(javafield->tqparentIsAttribute()) + if(javafield->parentIsAttribute()) switch (scopePolicy) { case CodeGenerationPolicy::Public: case CodeGenerationPolicy::Private: diff --git a/umbrello/umbrello/codegenerators/javacodeclassfield.cpp b/umbrello/umbrello/codegenerators/javacodeclassfield.cpp index c168ac35..200594e9 100644 --- a/umbrello/umbrello/codegenerators/javacodeclassfield.cpp +++ b/umbrello/umbrello/codegenerators/javacodeclassfield.cpp @@ -36,14 +36,14 @@ // Constructors/Destructors // -JavaCodeClassField::JavaCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLRole * role) - : CodeClassField(tqparentDoc, role) +JavaCodeClassField::JavaCodeClassField (ClassifierCodeDocument * parentDoc, UMLRole * role) + : CodeClassField(parentDoc, role) { } -JavaCodeClassField::JavaCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLAttribute * attrib) - : CodeClassField(tqparentDoc, attrib) +JavaCodeClassField::JavaCodeClassField (ClassifierCodeDocument * parentDoc, UMLAttribute * attrib) + : CodeClassField(parentDoc, attrib) { } @@ -58,7 +58,7 @@ JavaCodeClassField::~JavaCodeClassField ( ) { } // TQString JavaCodeClassField::getFieldName() { - if (tqparentIsAttribute()) + if (parentIsAttribute()) { UMLAttribute * at = (UMLAttribute*) getParentObject(); return cleanName(at->getName()); @@ -78,7 +78,7 @@ TQString JavaCodeClassField::getFieldName() { TQString JavaCodeClassField::getInitialValue() { - if (tqparentIsAttribute()) + if (parentIsAttribute()) { UMLAttribute * at = dynamic_cast( getParentObject() ); if (at) { diff --git a/umbrello/umbrello/codegenerators/javacodeclassfield.h b/umbrello/umbrello/codegenerators/javacodeclassfield.h index 0cad977b..325d0b3a 100644 --- a/umbrello/umbrello/codegenerators/javacodeclassfield.h +++ b/umbrello/umbrello/codegenerators/javacodeclassfield.h @@ -36,8 +36,8 @@ public: /** * Constructors */ - JavaCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLRole * role); - JavaCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLAttribute * attrib); + JavaCodeClassField (ClassifierCodeDocument * parentDoc, UMLRole * role); + JavaCodeClassField (ClassifierCodeDocument * parentDoc, UMLAttribute * attrib); /** * Empty Destructor diff --git a/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.cpp b/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.cpp index 6f6eb5ec..520f5611 100644 --- a/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.cpp +++ b/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.cpp @@ -67,7 +67,7 @@ void JavaCodeClassFieldDeclarationBlock::updateContent( ) TQString scopeStr = jdoc->scopeToJavaDecl(getParentObject()->getVisibility()); // IF this is from an association, then scope taken as appropriate to policy - if(!jcf->tqparentIsAttribute()) + if(!jcf->parentIsAttribute()) { switch (scopePolicy) { case CodeGenerationPolicy::Public: @@ -86,13 +86,13 @@ void JavaCodeClassFieldDeclarationBlock::updateContent( ) TQString fieldName = jcf->getFieldName(); TQString initialV = jcf->getInitialValue(); - if (!cf->tqparentIsAttribute() && !cf->fieldIsSingleValue()) + if (!cf->parentIsAttribute() && !cf->fieldIsSingleValue()) typeName = "List"; TQString body = staticValue+scopeStr+' '+typeName+' '+fieldName; if (!initialV.isEmpty()) body.append(" = " + initialV); - else if (!cf->tqparentIsAttribute()) + else if (!cf->parentIsAttribute()) { UMLRole * role = dynamic_cast(cf->getParentObject()); if (role->getObject()->getBaseType() == Uml::ot_Interface) diff --git a/umbrello/umbrello/codegenerators/javacodegenerationformbase.ui b/umbrello/umbrello/codegenerators/javacodegenerationformbase.ui index 5e0bbe29..a9ba6a89 100644 --- a/umbrello/umbrello/codegenerators/javacodegenerationformbase.ui +++ b/umbrello/umbrello/codegenerators/javacodegenerationformbase.ui @@ -273,5 +273,5 @@ - + diff --git a/umbrello/umbrello/codegenerators/javacodeoperation.cpp b/umbrello/umbrello/codegenerators/javacodeoperation.cpp index a788b215..54b34f46 100644 --- a/umbrello/umbrello/codegenerators/javacodeoperation.cpp +++ b/umbrello/umbrello/codegenerators/javacodeoperation.cpp @@ -123,7 +123,7 @@ void JavaCodeOperation::updateMethodDeclaration() int JavaCodeOperation::lastEditableLine() { ClassifierCodeDocument * doc = dynamic_cast(getParentDocument()); - if(doc->tqparentIsInterface()) + if(doc->parentIsInterface()) return -1; // very last line is NOT editable as its a one-line declaration w/ no body in // an interface. return 0; diff --git a/umbrello/umbrello/codegenerators/php5writer.cpp b/umbrello/umbrello/codegenerators/php5writer.cpp index d1eadb0b..c33ad3aa 100644 --- a/umbrello/umbrello/codegenerators/php5writer.cpp +++ b/umbrello/umbrello/codegenerators/php5writer.cpp @@ -2051,8 +2051,8 @@ static const char *php5words[] = "ovrimos_rollback", "owner_document", "pack", - "tqparent_node", - "tqparents", + "parent_node", + "parents", "parse_ini_file", "parse_str", "parse_url", diff --git a/umbrello/umbrello/codegenerators/phpwriter.cpp b/umbrello/umbrello/codegenerators/phpwriter.cpp index 5536c2c9..b68417c7 100644 --- a/umbrello/umbrello/codegenerators/phpwriter.cpp +++ b/umbrello/umbrello/codegenerators/phpwriter.cpp @@ -2047,8 +2047,8 @@ static const char *words[] = "ovrimos_rollback", "owner_document", "pack", - "tqparent_node", - "tqparents", + "parent_node", + "parents", "parse_ini_file", "parse_str", "parse_url", diff --git a/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.cpp b/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.cpp index 294175d5..89eb8bd2 100644 --- a/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.cpp +++ b/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.cpp @@ -26,10 +26,10 @@ // RubyClassDeclarationBlock::RubyClassDeclarationBlock - ( RubyClassifierCodeDocument * tqparentDoc, const TQString &startText, const TQString &endText, const TQString &comment) - : OwnedHierarchicalCodeBlock(tqparentDoc->getParentClassifier(), tqparentDoc, startText, endText, comment) + ( RubyClassifierCodeDocument * parentDoc, const TQString &startText, const TQString &endText, const TQString &comment) + : OwnedHierarchicalCodeBlock(parentDoc->getParentClassifier(), parentDoc, startText, endText, comment) { - init(tqparentDoc, comment); + init(parentDoc, comment); } RubyClassDeclarationBlock::~RubyClassDeclarationBlock ( ) { } @@ -69,12 +69,12 @@ void RubyClassDeclarationBlock::loadFromXMI ( TQDomElement & root ) void RubyClassDeclarationBlock::updateContent ( ) { - RubyClassifierCodeDocument *tqparentDoc = dynamic_cast(getParentDocument()); - UMLClassifier *c = tqparentDoc->getParentClassifier(); + RubyClassifierCodeDocument *parentDoc = dynamic_cast(getParentDocument()); + UMLClassifier *c = parentDoc->getParentClassifier(); CodeGenerationPolicy * p = UMLApp::app()->getCommonPolicy(); TQString endLine = p->getNewLineEndingChars(); - bool isInterface = tqparentDoc->tqparentIsInterface(); // a little shortcut - TQString RubyClassName = tqparentDoc->getRubyClassName(c->getName()); + bool isInterface = parentDoc->parentIsInterface(); // a little shortcut + TQString RubyClassName = parentDoc->getRubyClassName(c->getName()); bool forceDoc = p->getCodeVerboseDocumentComments(); // COMMENT @@ -98,7 +98,7 @@ void RubyClassDeclarationBlock::updateContent ( ) // Now set START/ENDING Text TQString startText = ""; - if (tqparentDoc->tqparentIsInterface()) { + if (parentDoc->parentIsInterface()) { startText.append("module "); } else { startText.append("class "); @@ -131,10 +131,10 @@ void RubyClassDeclarationBlock::updateContent ( ) setStartText(startText); } -void RubyClassDeclarationBlock::init (RubyClassifierCodeDocument *tqparentDoc, const TQString &comment) +void RubyClassDeclarationBlock::init (RubyClassifierCodeDocument *parentDoc, const TQString &comment) { - setComment(new RubyCodeDocumentation(tqparentDoc)); + setComment(new RubyCodeDocumentation(parentDoc)); getComment()->setText(comment); setEndText("end"); diff --git a/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.h b/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.h index 10b7f5bd..327516a3 100644 --- a/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.h +++ b/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.h @@ -42,7 +42,7 @@ public: /** * Empty Constructor */ - explicit RubyClassDeclarationBlock ( RubyClassifierCodeDocument * tqparentDoc, const TQString &start = "", const TQString &endText = "end", const TQString &comment = ""); + explicit RubyClassDeclarationBlock ( RubyClassifierCodeDocument * parentDoc, const TQString &start = "", const TQString &endText = "end", const TQString &comment = ""); /** * Empty Destructor diff --git a/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp b/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp index ecd5523b..b1a60755 100644 --- a/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp +++ b/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp @@ -252,7 +252,7 @@ void RubyClassifierCodeDocument::loadChildTextBlocksFromNode ( TQDomElement & ro } else if( name == "codeoperation" ) { // find the code operation by id - TQString id = element.attribute("tqparent_id","-1"); + TQString id = element.attribute("parent_id","-1"); UMLObject * obj = UMLApp::app()->getDocument()->findObjectById(STR2ID(id)); UMLOperation * op = dynamic_cast(obj); if(op) { @@ -371,7 +371,7 @@ void RubyClassifierCodeDocument::updateContent( ) // This depends on whether or not we have attribute/association classes CodeClassFieldList * cfList = getCodeClassFieldList(); for(CodeClassField * field = cfList->first(); field; field = cfList->next()) - if(field->tqparentIsAttribute()) + if(field->parentIsAttribute()) field->setWriteOutMethods(gen->getAutoGenerateAttribAccessors()); else field->setWriteOutMethods(gen->getAutoGenerateAssocAccessors()); @@ -399,7 +399,7 @@ void RubyClassifierCodeDocument::updateContent( ) CodeClassFieldList privAggregationClassFields = getSpecificClassFields ( CodeClassField::Aggregation, Uml::Visibility::Private); CodeClassFieldList privCompositionClassFields = getSpecificClassFields ( CodeClassField::Composition, Uml::Visibility::Private); - bool isInterface = tqparentIsInterface(); + bool isInterface = parentIsInterface(); bool hasOperationMethods = c->getOpList().last() ? true : false; CodeGenerationPolicy *pol = UMLApp::app()->getCommonPolicy(); TQString endLine = pol->getNewLineEndingChars(); // a shortcut..so we don't have to call this all the time diff --git a/umbrello/umbrello/codegenerators/rubycodeaccessormethod.cpp b/umbrello/umbrello/codegenerators/rubycodeaccessormethod.cpp index 8a4fd7bd..14d7ce70 100644 --- a/umbrello/umbrello/codegenerators/rubycodeaccessormethod.cpp +++ b/umbrello/umbrello/codegenerators/rubycodeaccessormethod.cpp @@ -78,8 +78,8 @@ void RubyCodeAccessorMethod::setAttributesFromNode( TQDomElement & root) void RubyCodeAccessorMethod::updateContent( ) { - CodeClassField * tqparentField = getParentClassField(); - RubyCodeClassField * rubyfield = dynamic_cast(tqparentField); + CodeClassField * parentField = getParentClassField(); + RubyCodeClassField * rubyfield = dynamic_cast(parentField); TQString fieldName = rubyfield->getFieldName(); TQString endLine = UMLApp::app()->getCommonPolicy()->getNewLineEndingChars(); @@ -159,7 +159,7 @@ void RubyCodeAccessorMethod::updateMethodDeclaration() // set scope of this accessor appropriately..if its an attribute, // we need to be more sophisticated - if(rubyfield->tqparentIsAttribute()) + if(rubyfield->parentIsAttribute()) switch (scopePolicy) { case CodeGenerationPolicy::Public: case CodeGenerationPolicy::Private: diff --git a/umbrello/umbrello/codegenerators/rubycodeclassfield.cpp b/umbrello/umbrello/codegenerators/rubycodeclassfield.cpp index e04d189a..4d24552a 100644 --- a/umbrello/umbrello/codegenerators/rubycodeclassfield.cpp +++ b/umbrello/umbrello/codegenerators/rubycodeclassfield.cpp @@ -38,14 +38,14 @@ // Constructors/Destructors // -RubyCodeClassField::RubyCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLRole * role) - : CodeClassField(tqparentDoc, role) +RubyCodeClassField::RubyCodeClassField (ClassifierCodeDocument * parentDoc, UMLRole * role) + : CodeClassField(parentDoc, role) { } -RubyCodeClassField::RubyCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLAttribute * attrib) - : CodeClassField(tqparentDoc, attrib) +RubyCodeClassField::RubyCodeClassField (ClassifierCodeDocument * parentDoc, UMLAttribute * attrib) + : CodeClassField(parentDoc, attrib) { } @@ -60,7 +60,7 @@ RubyCodeClassField::~RubyCodeClassField ( ) { } // TQString RubyCodeClassField::getFieldName() { - if (tqparentIsAttribute()) + if (parentIsAttribute()) { UMLAttribute * at = (UMLAttribute*) getParentObject(); return cleanName(at->getName()); @@ -80,7 +80,7 @@ TQString RubyCodeClassField::getFieldName() { TQString RubyCodeClassField::getInitialValue() { - if (tqparentIsAttribute()) + if (parentIsAttribute()) { UMLAttribute * at = dynamic_cast( getParentObject() ); if (at) { diff --git a/umbrello/umbrello/codegenerators/rubycodeclassfield.h b/umbrello/umbrello/codegenerators/rubycodeclassfield.h index 28e96b74..f6cb27fe 100644 --- a/umbrello/umbrello/codegenerators/rubycodeclassfield.h +++ b/umbrello/umbrello/codegenerators/rubycodeclassfield.h @@ -38,8 +38,8 @@ public: /** * Constructors */ - RubyCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLRole * role); - RubyCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLAttribute * attrib); + RubyCodeClassField (ClassifierCodeDocument * parentDoc, UMLRole * role); + RubyCodeClassField (ClassifierCodeDocument * parentDoc, UMLAttribute * attrib); /** * Empty Destructor diff --git a/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.cpp b/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.cpp index 2171bb28..da8eb00e 100644 --- a/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.cpp +++ b/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.cpp @@ -61,7 +61,7 @@ void RubyCodeClassFieldDeclarationBlock::updateContent( ) TQString scopeStr = rdoc->scopeToRubyDecl(getParentObject()->getVisibility()); // IF this is from an association, then scope taken as appropriate to policy - if(!rcf->tqparentIsAttribute()) + if(!rcf->parentIsAttribute()) { switch (scopePolicy) { case CodeGenerationPolicy::Public: @@ -80,13 +80,13 @@ void RubyCodeClassFieldDeclarationBlock::updateContent( ) TQString fieldName = rcf->getFieldName(); TQString initialV = rcf->getInitialValue(); - if (!cf->tqparentIsAttribute() && !cf->fieldIsSingleValue()) + if (!cf->parentIsAttribute() && !cf->fieldIsSingleValue()) typeName = "Array"; TQString body = staticValue+scopeStr+' '+typeName+' '+fieldName; if (!initialV.isEmpty()) body.append(" = " + initialV); - else if (!cf->tqparentIsAttribute()) + else if (!cf->parentIsAttribute()) { UMLRole * role = dynamic_cast(cf->getParentObject()); if (role->getObject()->getBaseType() == Uml::ot_Interface) diff --git a/umbrello/umbrello/codegenerators/rubycodegenerationformbase.ui b/umbrello/umbrello/codegenerators/rubycodegenerationformbase.ui index fe4573c2..c47dc97f 100644 --- a/umbrello/umbrello/codegenerators/rubycodegenerationformbase.ui +++ b/umbrello/umbrello/codegenerators/rubycodegenerationformbase.ui @@ -244,5 +244,5 @@ - + diff --git a/umbrello/umbrello/codegenerators/rubycodeoperation.cpp b/umbrello/umbrello/codegenerators/rubycodeoperation.cpp index bba8b462..caed59d8 100644 --- a/umbrello/umbrello/codegenerators/rubycodeoperation.cpp +++ b/umbrello/umbrello/codegenerators/rubycodeoperation.cpp @@ -217,7 +217,7 @@ void RubyCodeOperation::updateMethodDeclaration() int RubyCodeOperation::lastEditableLine() { ClassifierCodeDocument * doc = dynamic_cast(getParentDocument()); - if(doc->tqparentIsInterface()) + if(doc->parentIsInterface()) return -1; // very last line is NOT editable as its a one-line declaration w/ no body in // an interface. return 0; diff --git a/umbrello/umbrello/codegenerators/simplecodegenerator.cpp b/umbrello/umbrello/codegenerators/simplecodegenerator.cpp index d4f62cc3..ca118eb2 100644 --- a/umbrello/umbrello/codegenerators/simplecodegenerator.cpp +++ b/umbrello/umbrello/codegenerators/simplecodegenerator.cpp @@ -47,10 +47,10 @@ SimpleCodeGenerator::SimpleCodeGenerator (bool createDirHierarchyForPackages /* =true */) { m_indentLevel = 0; - UMLDoc * tqparentDoc = UMLApp::app()->getDocument(); - tqparentDoc->disconnect(this); // disconnect from UMLDoc.. we arent planning to be synced at all + UMLDoc * parentDoc = UMLApp::app()->getDocument(); + parentDoc->disconnect(this); // disconnect from UMLDoc.. we arent planning to be synced at all m_createDirHierarchyForPackages = createDirHierarchyForPackages; - initFields(tqparentDoc); + initFields(parentDoc); } SimpleCodeGenerator::~SimpleCodeGenerator ( ) { } @@ -256,14 +256,14 @@ void SimpleCodeGenerator::writeCodeToFile ( UMLClassifierList & concepts) { this->writeClass(c); // call the writer for each class. } -void SimpleCodeGenerator::initFields ( UMLDoc * tqparentDoc ) { +void SimpleCodeGenerator::initFields ( UMLDoc * parentDoc ) { // load Classifier documents from tqparent document // initFromParentDocument(); m_fileMap.clear(); m_applyToAllRemaining = true; - m_doc = tqparentDoc; + m_doc = parentDoc; // this really is just being used to sync the internal params // to the codegenpolicy as there are no code documents to really sync. diff --git a/umbrello/umbrello/codegenerators/xmlelementcodeblock.cpp b/umbrello/umbrello/codegenerators/xmlelementcodeblock.cpp index 21dd5230..6a068113 100644 --- a/umbrello/umbrello/codegenerators/xmlelementcodeblock.cpp +++ b/umbrello/umbrello/codegenerators/xmlelementcodeblock.cpp @@ -29,10 +29,10 @@ // Constructors/Destructors // -XMLElementCodeBlock::XMLElementCodeBlock ( CodeDocument * tqparentDoc, const TQString & nodeName, const TQString & comment) - : HierarchicalCodeBlock(tqparentDoc) +XMLElementCodeBlock::XMLElementCodeBlock ( CodeDocument * parentDoc, const TQString & nodeName, const TQString & comment) + : HierarchicalCodeBlock(parentDoc) { - init(tqparentDoc, nodeName, comment); + init(parentDoc, nodeName, comment); } XMLElementCodeBlock::~XMLElementCodeBlock ( ) { } @@ -150,10 +150,10 @@ void XMLElementCodeBlock::updateContent ( ) } -void XMLElementCodeBlock::init (CodeDocument *tqparentDoc, const TQString &nodeName, const TQString &comment) +void XMLElementCodeBlock::init (CodeDocument *parentDoc, const TQString &nodeName, const TQString &comment) { - setComment(new XMLCodeComment(tqparentDoc)); + setComment(new XMLCodeComment(parentDoc)); getComment()->setText(comment); m_nodeName = nodeName; diff --git a/umbrello/umbrello/codegenerators/xmlelementcodeblock.h b/umbrello/umbrello/codegenerators/xmlelementcodeblock.h index 21427df0..adbe39b7 100644 --- a/umbrello/umbrello/codegenerators/xmlelementcodeblock.h +++ b/umbrello/umbrello/codegenerators/xmlelementcodeblock.h @@ -37,7 +37,7 @@ public: /** * Empty Constructor */ - XMLElementCodeBlock ( CodeDocument * tqparentDoc, const TQString & nodeName, const TQString & comment = ""); + XMLElementCodeBlock ( CodeDocument * parentDoc, const TQString & nodeName, const TQString & comment = ""); /** * Empty Destructor diff --git a/umbrello/umbrello/codegenobjectwithtextblocks.cpp b/umbrello/umbrello/codegenobjectwithtextblocks.cpp index 99bbbf58..47cd27d3 100644 --- a/umbrello/umbrello/codegenobjectwithtextblocks.cpp +++ b/umbrello/umbrello/codegenobjectwithtextblocks.cpp @@ -87,10 +87,10 @@ bool CodeGenObjectWithTextBlocks::addTextBlock(TextBlock* add_object ) { // 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 - CodeDocument * tqparentDoc = add_object->getParentDocument(); - if(tqparentDoc) { + CodeDocument * parentDoc = add_object->getParentDocument(); + if(parentDoc) { - CodeGenObjectWithTextBlocks * oldParent = tqparentDoc->findParentObjectForTaggedTextBlock (tag); + CodeGenObjectWithTextBlocks * oldParent = parentDoc->findParentObjectForTaggedTextBlock (tag); if(oldParent && oldParent != this) oldParent->removeTextBlock(add_object); } @@ -460,7 +460,7 @@ void CodeGenObjectWithTextBlocks::loadChildTextBlocksFromNode ( TQDomElement & r } else if( name == "codeoperation" ) { // find the code operation by id - TQString id = element.attribute("tqparent_id","-1"); + TQString id = element.attribute("parent_id","-1"); UMLObject * obj = UMLApp::app()->getDocument()->findObjectById(STR2ID(id)); UMLOperation * op = dynamic_cast(obj); if(op) { diff --git a/umbrello/umbrello/codeimport/adaimport.cpp b/umbrello/umbrello/codeimport/adaimport.cpp index c9325b36..05dc2f68 100644 --- a/umbrello/umbrello/codeimport/adaimport.cpp +++ b/umbrello/umbrello/codeimport/adaimport.cpp @@ -198,9 +198,9 @@ bool AdaImport::parseStmt() { } if (keyword == "package") { const TQString& name = advance(); - TQStringList tqparentPkgs = TQStringList::split(".", name.lower()); - tqparentPkgs.pop_back(); // exclude the current package - parseStems(tqparentPkgs); + TQStringList parentPkgs = TQStringList::split(".", name.lower()); + parentPkgs.pop_back(); // exclude the current package + parseStems(parentPkgs); UMLObject *ns = NULL; if (advance() == "is") { ns = Import_Utils::createUMLObject(Uml::ot_Package, name, diff --git a/umbrello/umbrello/codeimport/import_utils.cpp b/umbrello/umbrello/codeimport/import_utils.cpp index 249ed865..44c8f380 100644 --- a/umbrello/umbrello/codeimport/import_utils.cpp +++ b/umbrello/umbrello/codeimport/import_utils.cpp @@ -126,19 +126,19 @@ UMLObject* findUMLObject(TQString name, UMLObject *createUMLObject(Uml::Object_Type type, const TQString& inName, - UMLPackage *tqparentPkg, + UMLPackage *parentPkg, const TQString& comment, const TQString& stereotype) { TQString name = inName; UMLDoc *umldoc = UMLApp::app()->getDocument(); UMLFolder *logicalView = umldoc->getRootFolder(Uml::mt_Logical); const Uml::Programming_Language pl = UMLApp::app()->getActiveLanguage(); - if (tqparentPkg == NULL) { + if (parentPkg == NULL) { // kDebug() << "Import_Utils::createUMLObject(" << name - // << "): tqparentPkg is NULL, assuming Logical View" << endl; - tqparentPkg = logicalView; + // << "): parentPkg is NULL, assuming Logical View" << endl; + parentPkg = logicalView; } - UMLObject * o = umldoc->findUMLObject(name, type, tqparentPkg); + UMLObject * o = umldoc->findUMLObject(name, type, parentPkg); bNewUMLObjectWasCreated = false; if (o == NULL) { // Strip possible adornments and look again. @@ -150,11 +150,11 @@ UMLObject *createUMLObject(Uml::Object_Type type, const int isRef = typeName.tqcontains('&'); typeName.remove(TQRegExp("[^\\w:\\. ].*$")); typeName = typeName.simplifyWhiteSpace(); - UMLObject *origType = umldoc->findUMLObject(typeName, Uml::ot_UMLObject, tqparentPkg); + UMLObject *origType = umldoc->findUMLObject(typeName, Uml::ot_UMLObject, parentPkg); if (origType == NULL) { // Still not found. Create the stripped down type. if (bPutAtGlobalScope) - tqparentPkg = logicalView; + parentPkg = logicalView; // Find, or create, the scopes. TQStringList components; if (typeName.tqcontains("::")) { @@ -168,9 +168,9 @@ UMLObject *createUMLObject(Uml::Object_Type type, while ( components.count() ) { TQString scopeName = components.front(); components.pop_front(); - o = umldoc->findUMLObject(scopeName, Uml::ot_UMLObject, tqparentPkg); + o = umldoc->findUMLObject(scopeName, Uml::ot_UMLObject, parentPkg); if (o) { - tqparentPkg = static_cast(o); + parentPkg = static_cast(o); continue; } int wantNamespace = KMessageBox::Yes; @@ -184,8 +184,8 @@ UMLObject *createUMLObject(Uml::Object_Type type, } } Uml::Object_Type ot = (wantNamespace == KMessageBox::Yes ? Uml::ot_Package : Uml::ot_Class); - o = Object_Factory::createUMLObject(ot, scopeName, tqparentPkg); - tqparentPkg = static_cast(o); + o = Object_Factory::createUMLObject(ot, scopeName, parentPkg); + parentPkg = static_cast(o); UMLListView *listView = UMLApp::app()->getListView(); UMLListViewItem *lvitem = listView->findUMLObject(o); listView->setCurrentItem(lvitem); @@ -196,7 +196,7 @@ UMLObject *createUMLObject(Uml::Object_Type type, Uml::Object_Type t = type; if (type == Uml::ot_UMLObject || isAdorned) t = Uml::ot_Class; - origType = Object_Factory::createUMLObject(t, typeName, tqparentPkg, false); + origType = Object_Factory::createUMLObject(t, typeName, parentPkg, false); bNewUMLObjectWasCreated = true; bPutAtGlobalScope = false; } @@ -228,7 +228,7 @@ UMLObject *createUMLObject(Uml::Object_Type type, } else { o = origType; } - } else if (tqparentPkg && !bPutAtGlobalScope) { + } else if (parentPkg && !bPutAtGlobalScope) { UMLPackage *existingPkg = o->getUMLPackage(); if (existingPkg != umldoc->getDatatypeFolder()) { if (existingPkg) @@ -236,8 +236,8 @@ UMLObject *createUMLObject(Uml::Object_Type type, else kError() << "createUMLObject(" << name << "): " << "o->getUMLPackage() was NULL" << endl; - o->setUMLPackage(tqparentPkg); - tqparentPkg->addObject(o); + o->setUMLPackage(parentPkg); + parentPkg->addObject(o); } } TQString strippedComment = formatComment(comment); @@ -260,7 +260,7 @@ UMLObject *createUMLObject(Uml::Object_Type type, return o; TQStringList::Iterator end(params.end()); for (TQStringList::Iterator it(params.begin()); it != end; ++it) { - UMLObject *p = umldoc->findUMLObject(*it, Uml::ot_UMLObject, tqparentPkg); + UMLObject *p = umldoc->findUMLObject(*it, Uml::ot_UMLObject, parentPkg); if (p == NULL || p->getBaseType() == Uml::ot_Datatype) continue; const Uml::Association_Type at = Uml::at_Dependency; @@ -433,9 +433,9 @@ void createGeneralization(UMLClassifier *child, UMLClassifier *tqparent) { umldoc->addAssociation(assoc); } -void createGeneralization(UMLClassifier *child, const TQString &tqparentName) { - UMLObject *tqparentObj = createUMLObject( Uml::ot_Class, tqparentName ); - UMLClassifier *tqparent = static_cast(tqparentObj); +void createGeneralization(UMLClassifier *child, const TQString &parentName) { + UMLObject *parentObj = createUMLObject( Uml::ot_Class, parentName ); + UMLClassifier *tqparent = static_cast(parentObj); createGeneralization(child, tqparent); } @@ -454,9 +454,9 @@ void addIncludePath(const TQString& path) { } -bool isDatatype(const TQString& name, UMLPackage *tqparentPkg) { +bool isDatatype(const TQString& name, UMLPackage *parentPkg) { UMLDoc *umldoc = UMLApp::app()->getDocument(); - UMLObject * o = umldoc->findUMLObject(name, Uml::ot_Datatype, tqparentPkg); + UMLObject * o = umldoc->findUMLObject(name, Uml::ot_Datatype, parentPkg); return (o!=NULL); } diff --git a/umbrello/umbrello/codeimport/import_utils.h b/umbrello/umbrello/codeimport/import_utils.h index 965361f6..bec9e0ff 100644 --- a/umbrello/umbrello/codeimport/import_utils.h +++ b/umbrello/umbrello/codeimport/import_utils.h @@ -35,7 +35,7 @@ namespace Import_Utils { */ UMLObject* createUMLObject(Uml::Object_Type type, const TQString& name, - UMLPackage *tqparentPkg = NULL, + UMLPackage *parentPkg = NULL, const TQString& comment = TQString(), const TQString& stereotype = TQString()); /** @@ -43,7 +43,7 @@ namespace Import_Utils { * is put at the global scope. * * @param yesno When set to false, the object is created at the scope - * given by the tqparentPkg argument of createUMLObject(). + * given by the parentPkg argument of createUMLObject(). */ void putAtGlobalScope(bool yesno); @@ -116,7 +116,7 @@ namespace Import_Utils { /** * Add an argument to a UMLOperation. - * The tqparentPkg arg is only used for resolving possible scope + * The parentPkg arg is only used for resolving possible scope * prefixes in the `type'. */ UMLAttribute* addMethodParameter(UMLOperation *method, @@ -139,7 +139,7 @@ namespace Import_Utils { * Create a generalization from the existing child UMLObject to the given * tqparent class name. */ - void createGeneralization(UMLClassifier *child, const TQString &tqparentName); + void createGeneralization(UMLClassifier *child, const TQString &parentName); /** * Strip comment lines of leading whitespace and stars. @@ -168,7 +168,7 @@ namespace Import_Utils { /** * Returns true if a type is an actual Datatype */ - bool isDatatype(const TQString& name, UMLPackage *tqparentPkg = NULL); + bool isDatatype(const TQString& name, UMLPackage *parentPkg = NULL); } // end namespace Import_Utils diff --git a/umbrello/umbrello/codeimport/javaimport.cpp b/umbrello/umbrello/codeimport/javaimport.cpp index f73f5586..ac37e066 100644 --- a/umbrello/umbrello/codeimport/javaimport.cpp +++ b/umbrello/umbrello/codeimport/javaimport.cpp @@ -100,9 +100,9 @@ void JavaImport::spawnImport( TQString file ) { ///returns the UML Object if found, or null otherwise -UMLObject* findObject( TQString name, UMLPackage *tqparentPkg ) { +UMLObject* findObject( TQString name, UMLPackage *parentPkg ) { UMLDoc *umldoc = UMLApp::app()->getDocument(); - UMLObject * o = umldoc->findUMLObject(name, Uml::ot_UMLObject , tqparentPkg); + UMLObject * o = umldoc->findUMLObject(name, Uml::ot_UMLObject , parentPkg); return o; } @@ -296,7 +296,7 @@ bool JavaImport::parseStmt() { if ( tqparent ) { Import_Utils::createGeneralization(m_klass, static_cast(tqparent)); } else { - kDebug() << "importJava tqparentClass " << baseName + kDebug() << "importJava parentClass " << baseName << " is not resolveable. Creating placeholder" << endl; Import_Utils::createGeneralization(m_klass, baseName); } diff --git a/umbrello/umbrello/codemethodblock.cpp b/umbrello/umbrello/codemethodblock.cpp index d4a3acc3..5a6bbc97 100644 --- a/umbrello/umbrello/codemethodblock.cpp +++ b/umbrello/umbrello/codemethodblock.cpp @@ -22,8 +22,8 @@ // Constructors/Destructors // -CodeMethodBlock::CodeMethodBlock ( ClassifierCodeDocument * doc, UMLObject * tqparentObj, const TQString & body, const TQString & comment) - : CodeBlockWithComments ((CodeDocument*)doc, body, comment), OwnedCodeBlock (tqparentObj) +CodeMethodBlock::CodeMethodBlock ( ClassifierCodeDocument * doc, UMLObject * parentObj, const TQString & body, const TQString & comment) + : CodeBlockWithComments ((CodeDocument*)doc, body, comment), OwnedCodeBlock (parentObj) { initFields(); } diff --git a/umbrello/umbrello/codemethodblock.h b/umbrello/umbrello/codemethodblock.h index a10a676c..1e7f7ea0 100644 --- a/umbrello/umbrello/codemethodblock.h +++ b/umbrello/umbrello/codemethodblock.h @@ -45,7 +45,7 @@ public: /** * Constructors */ - CodeMethodBlock ( ClassifierCodeDocument * doc, UMLObject * tqparentObj, + CodeMethodBlock ( ClassifierCodeDocument * doc, UMLObject * parentObj, const TQString & body = "", const TQString & comment = ""); /** diff --git a/umbrello/umbrello/codeoperation.cpp b/umbrello/umbrello/codeoperation.cpp index 5c8228d5..3fa716dc 100644 --- a/umbrello/umbrello/codeoperation.cpp +++ b/umbrello/umbrello/codeoperation.cpp @@ -32,10 +32,10 @@ // Constructors/Destructors // -CodeOperation::CodeOperation ( ClassifierCodeDocument * doc , UMLOperation * tqparentOp, const TQString & body, const TQString & comment) - : CodeMethodBlock ( doc, tqparentOp, body, comment) +CodeOperation::CodeOperation ( ClassifierCodeDocument * doc , UMLOperation * parentOp, const TQString & body, const TQString & comment) + : CodeMethodBlock ( doc, parentOp, body, comment) { - init(tqparentOp); + init(parentOp); } CodeOperation::~CodeOperation ( ) { } @@ -133,7 +133,7 @@ void CodeOperation::setAttributesFromNode ( TQDomElement & element) // we simply need to record the tqparent operation here // m_parentOperation->disconnect(this); // always disconnect from current tqparent - TQString idStr = element.attribute("tqparent_id","-1"); + TQString idStr = element.attribute("parent_id","-1"); Uml::IDType id = STR2ID(idStr); UMLObject * obj = UMLApp::app()->getDocument()->findObjectById(id); UMLOperation * op = dynamic_cast(obj); @@ -156,14 +156,14 @@ void CodeOperation::setAttributesFromObject(TextBlock * obj) } -void CodeOperation::init (UMLOperation * tqparentOp) +void CodeOperation::init (UMLOperation * parentOp) { m_canDelete = false; // we cant delete these with the codeeditor, delete the UML operation instead. - setTag(CodeOperation::findTag(tqparentOp)); + setTag(CodeOperation::findTag(parentOp)); // not needed.. done by tqparent "ownedcodeblock" class - // connect(tqparentOp,TQT_SIGNAL(modified()),this,TQT_SLOT(syncToParent())); + // connect(parentOp,TQT_SIGNAL(modified()),this,TQT_SLOT(syncToParent())); } diff --git a/umbrello/umbrello/codeoperation.h b/umbrello/umbrello/codeoperation.h index a0d8b693..5709f31a 100644 --- a/umbrello/umbrello/codeoperation.h +++ b/umbrello/umbrello/codeoperation.h @@ -88,7 +88,7 @@ protected: private: UMLOperation * m_parentOperation; - void init (UMLOperation * tqparentOp); + void init (UMLOperation * parentOp); }; diff --git a/umbrello/umbrello/codeparameter.cpp b/umbrello/umbrello/codeparameter.cpp index 1ca714fc..60f5d098 100644 --- a/umbrello/umbrello/codeparameter.cpp +++ b/umbrello/umbrello/codeparameter.cpp @@ -33,10 +33,10 @@ // Constructors/Destructors // -CodeParameter::CodeParameter ( ClassifierCodeDocument * tqparentDoc, UMLObject * tqparentObject ) - : TQObject ( (TQObject*) tqparentObject, "ACodeParam") +CodeParameter::CodeParameter ( ClassifierCodeDocument * parentDoc, UMLObject * parentObject ) + : TQObject ( (TQObject*) parentObject, "ACodeParam") { - initFields( tqparentDoc, tqparentObject ); + initFields( parentDoc, parentObject ); } CodeParameter::~CodeParameter ( ) { } @@ -162,7 +162,7 @@ void CodeParameter::setAttributesOnNode ( TQDomDocument & doc, TQDomElement & bl // set local attributes - blockElement.setAttribute("tqparent_id",getID()); + blockElement.setAttribute("parent_id",getID()); // setting ID's takes special treatment // as UMLRoles arent properly stored in the XMI right now. @@ -188,7 +188,7 @@ void CodeParameter::setAttributesOnNode ( TQDomDocument & doc, TQDomElement & bl void CodeParameter::setAttributesFromNode ( TQDomElement & root) { // set local attributes, tqparent object first - TQString idStr = root.attribute("tqparent_id","-1"); + TQString idStr = root.attribute("parent_id","-1"); Uml::IDType id = STR2ID(idStr); // always disconnect @@ -230,7 +230,7 @@ void CodeParameter::setAttributesFromNode ( TQDomElement & root) { initFields ( m_parentDocument, obj); // just the regular approach } else - kError() << "Cant load CodeParam: tqparentUMLObject w/id:" + kError() << "Cant load CodeParam: parentUMLObject w/id:" << ID2STR(id) << " not found, corrupt save file?" << endl; // other attribs now diff --git a/umbrello/umbrello/codeparameter.h b/umbrello/umbrello/codeparameter.h index 8b3f8ef6..dd86d05c 100644 --- a/umbrello/umbrello/codeparameter.h +++ b/umbrello/umbrello/codeparameter.h @@ -43,7 +43,7 @@ public: /** * Empty Constructor */ - CodeParameter ( ClassifierCodeDocument * doc, UMLObject * tqparentObj ); + CodeParameter ( ClassifierCodeDocument * doc, UMLObject * parentObj ); /** * Empty Destructor diff --git a/umbrello/umbrello/dialogs/codeeditor.cpp b/umbrello/umbrello/dialogs/codeeditor.cpp index b4533d83..934fc628 100644 --- a/umbrello/umbrello/dialogs/codeeditor.cpp +++ b/umbrello/umbrello/dialogs/codeeditor.cpp @@ -409,28 +409,28 @@ void CodeEditor::appendText (CodeClassFieldDeclarationBlock * db ) { TQString indent = db->getIndentationString(); TQString body = db->formatMultiLineText (db->getText(), indent, "\n"); - UMLObject * tqparentObj = db->getParentClassField()->getParentObject(); + UMLObject * parentObj = db->getParentClassField()->getParentObject(); TQColor bgcolor = getState().editBlockColor; TQString componentName = TQString(""); - if(tqparentObj) + if(parentObj) { - if(db->getParentClassField()->tqparentIsAttribute()) { - componentName = tqparentDocName + "::attribute_field(" + tqparentObj->getName() + ')'; + if(db->getParentClassField()->parentIsAttribute()) { + componentName = parentDocName + "::attribute_field(" + parentObj->getName() + ')'; } else { - UMLRole * role = dynamic_cast(tqparentObj); - componentName = tqparentDocName + "::association_field(" + role->getName() + ')'; + UMLRole * role = dynamic_cast(parentObj); + componentName = parentDocName + "::association_field(" + role->getName() + ')'; } bgcolor = getState().umlObjectColor; } - appendText(db->getComment(), db, tqparentObj,componentName); + appendText(db->getComment(), db, parentObj,componentName); if(!db->getWriteOutText() && m_showHiddenBlocks) bgcolor = getState().hiddenColor; if(!StringIsBlank(body)) - insert(body,db,false,getState().fontColor,bgcolor,tqparentObj); + insert(body,db,false,getState().fontColor,bgcolor,parentObj); } @@ -460,42 +460,42 @@ void CodeEditor::appendText (CodeMethodBlock * mb) { bgcolor = getState().hiddenColor; } - TQString componentName = TQString("tqparentless method\?"); + TQString componentName = TQString("parentless method\?"); // ugly, but we need to know if there is a tqparent object here. CodeOperation * op = dynamic_cast(mb); CodeAccessorMethod * accessor = dynamic_cast(mb); - UMLObject * tqparentObj = 0; + UMLObject * parentObj = 0; if(op) { - tqparentObj = op->getParentOperation(); - if(((UMLOperation*)tqparentObj)->isConstructorOperation()) - componentName = tqparentDocName + "::operation("+ tqparentObj->getName()+") constructor method"; + parentObj = op->getParentOperation(); + if(((UMLOperation*)parentObj)->isConstructorOperation()) + componentName = parentDocName + "::operation("+ parentObj->getName()+") constructor method"; else - componentName = tqparentDocName + "::operation("+ tqparentObj->getName()+") method"; + componentName = parentDocName + "::operation("+ parentObj->getName()+") method"; } if(accessor) { - tqparentObj = accessor->getParentObject(); - if(accessor->getParentClassField()->tqparentIsAttribute()) { - componentName = tqparentDocName + "::attribute_field(" + tqparentObj->getName() + ") accessor method"; + parentObj = accessor->getParentObject(); + if(accessor->getParentClassField()->parentIsAttribute()) { + componentName = parentDocName + "::attribute_field(" + parentObj->getName() + ") accessor method"; } else { - UMLRole * role = dynamic_cast(tqparentObj); - componentName = tqparentDocName + "::association_field(" + role->getName() + ") accessor method"; + UMLRole * role = dynamic_cast(parentObj); + componentName = parentDocName + "::association_field(" + role->getName() + ") accessor method"; } } - //appendText(mb->getComment(), mb, tqparentObj, componentName); - appendText(mb->getComment(), mb->getComment(), tqparentObj, componentName); + //appendText(mb->getComment(), mb, parentObj, componentName); + appendText(mb->getComment(), mb->getComment(), parentObj, componentName); if(!StringIsBlank(startText)) - insert(startText,mb,false,getState().fontColor,bgcolor,tqparentObj); + insert(startText,mb,false,getState().fontColor,bgcolor,parentObj); // always insert body for methods..IF we don't, we create a // situation where the user cant edit the body (!) - insert(body,mb,true,getState().fontColor,bgcolor,tqparentObj); + insert(body,mb,true,getState().fontColor,bgcolor,parentObj); if(!StringIsBlank(endText)) - insert(endText,mb,false,getState().fontColor,bgcolor,tqparentObj); + insert(endText,mb,false,getState().fontColor,bgcolor,parentObj); } @@ -520,22 +520,22 @@ void CodeEditor::appendText(HierarchicalCodeBlock * hblock) return; OwnedHierarchicalCodeBlock * test = dynamic_cast(hblock); - UMLObject * tqparentObj = 0; + UMLObject * parentObj = 0; TQString componentName = TQString(""); TQColor paperColor = getState().nonEditBlockColor; if(test) { - tqparentObj = test->getParentObject(); - UMLClassifier *c = dynamic_cast(tqparentObj); + parentObj = test->getParentObject(); + UMLClassifier *c = dynamic_cast(parentObj); if (c) { TQString typeStr; if (c->isInterface()) typeStr = "Interface"; else typeStr = "Class"; - componentName = tqparentDocName + "::" + typeStr + '(' + tqparentObj->getName() + ')'; + componentName = parentDocName + "::" + typeStr + '(' + parentObj->getName() + ')'; } else { - componentName = tqparentDocName + "::UNKNOWN(" + tqparentObj->getName() + ')'; + componentName = parentDocName + "::UNKNOWN(" + parentObj->getName() + ')'; } paperColor = getState().umlObjectColor; @@ -549,10 +549,10 @@ void CodeEditor::appendText(HierarchicalCodeBlock * hblock) TQString startText = hblock->formatMultiLineText ( hblock->getStartText(), indent, "\n"); TQString endText = hblock->formatMultiLineText( hblock->getEndText(), indent, "\n"); - appendText(hblock->getComment(), hblock, tqparentObj, componentName); + appendText(hblock->getComment(), hblock, parentObj, componentName); if(!StringIsBlank(startText)) - insert(startText,hblock,false,getState().fontColor,paperColor, tqparentObj); + insert(startText,hblock,false,getState().fontColor,paperColor, parentObj); appendText(items); if(!StringIsBlank(endText)) insert(endText,hblock,false,getState().fontColor,paperColor); @@ -774,13 +774,13 @@ void CodeEditor::slotRedrawText() { rebuildView(m_lastPara); } -void CodeEditor::init ( CodeViewerDialog * tqparentDlg, CodeDocument * tqparentDoc ) { +void CodeEditor::init ( CodeViewerDialog * parentDlg, CodeDocument * parentDoc ) { // safety to insure that we are up to date - tqparentDoc->synchronize(); + parentDoc->synchronize(); - m_parentDlg = tqparentDlg; - m_parentDoc = tqparentDoc; + m_parentDlg = parentDlg; + m_parentDoc = parentDoc; setUndoRedoEnabled( false ); setCursor( TQCursor( 0 ) ); @@ -801,9 +801,9 @@ void CodeEditor::init ( CodeViewerDialog * tqparentDlg, CodeDocument * tqparentD // set name of tqparent doc ClassifierCodeDocument * cdoc = dynamic_cast(m_parentDoc); if(cdoc) - tqparentDocName = cdoc->getParentClassifier()->getName(); + parentDocName = cdoc->getParentClassifier()->getName(); else - tqparentDocName = ""; + parentDocName = ""; // set some viewability parameters //int margin = fontMetrics().height(); @@ -832,7 +832,7 @@ void CodeEditor::updateTextBlockFromText (TextBlock * block) { TQString baseIndent = block->getIndentationString(block->getIndentationLevel()+(cmb ? 1 : 0)); TextBlockInfo *info = (*m_tbInfoMap)[block]; - UMLObject * tqparentObj = info->getParent(); + UMLObject * parentObj = info->getParent(); int pstart = m_textBlockList.tqfindRef(block); TQString content = ""; @@ -862,8 +862,8 @@ void CodeEditor::updateTextBlockFromText (TextBlock * block) { // if a tqparent for the block, try to set its documentation // as long as its NOT an accessor codeblock. - if(tqparentObj && !info->isCodeAccessorMethod) - tqparentObj->setDoc(content); + if(parentObj && !info->isCodeAccessorMethod) + parentObj->setDoc(content); // make note that its now user generated if(cmb) diff --git a/umbrello/umbrello/dialogs/codeeditor.h b/umbrello/umbrello/dialogs/codeeditor.h index b430b27d..5f72fc7a 100644 --- a/umbrello/umbrello/dialogs/codeeditor.h +++ b/umbrello/umbrello/dialogs/codeeditor.h @@ -91,7 +91,7 @@ protected: private: - TQString tqparentDocName; + TQString parentDocName; CodeDocument * m_parentDoc; CodeViewerDialog * m_parentDlg; @@ -124,7 +124,7 @@ private: void updateTextBlockFromText (TextBlock * block); void initText ( CodeDocument * doc ); - void init ( CodeViewerDialog * tqparentDlg, CodeDocument * tqparentDoc ); + void init ( CodeViewerDialog * parentDlg, CodeDocument * parentDoc ); void changeTextBlockHighlighting(TextBlock * tb, bool selected); bool isParaEditable (int para); diff --git a/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui b/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui index d58bf99f..601b5385 100644 --- a/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui +++ b/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui @@ -525,7 +525,7 @@ is empty browseClicked() activeLanguageChanged(int id) - + knuminput.h knuminput.h diff --git a/umbrello/umbrello/dialogs/codegenerationpolicybase.ui b/umbrello/umbrello/dialogs/codegenerationpolicybase.ui index 31476a8b..620af610 100644 --- a/umbrello/umbrello/dialogs/codegenerationpolicybase.ui +++ b/umbrello/umbrello/dialogs/codegenerationpolicybase.ui @@ -35,5 +35,5 @@ apply() - + diff --git a/umbrello/umbrello/dialogs/codegenerationwizardbase.ui b/umbrello/umbrello/dialogs/codegenerationwizardbase.ui index 32773a59..517df16e 100644 --- a/umbrello/umbrello/dialogs/codegenerationwizardbase.ui +++ b/umbrello/umbrello/dialogs/codegenerationwizardbase.ui @@ -305,5 +305,5 @@ for in the right hand side list deselectClass() classGenerated( UMLClassifier * /* c */ ) - + diff --git a/umbrello/umbrello/dialogs/codeviewerdialog.h b/umbrello/umbrello/dialogs/codeviewerdialog.h index 0f447d3a..2228dfae 100644 --- a/umbrello/umbrello/dialogs/codeviewerdialog.h +++ b/umbrello/umbrello/dialogs/codeviewerdialog.h @@ -52,7 +52,7 @@ public: /** return the code viewer state */ Settings::CodeViewerState getState( ); - TQString tqparentDocName; + TQString parentDocName; /** * Adds a code document to the tabbed output diff --git a/umbrello/umbrello/dialogs/codeviewerdialogbase.ui b/umbrello/umbrello/dialogs/codeviewerdialogbase.ui index d29b21a8..665d6ccf 100644 --- a/umbrello/umbrello/dialogs/codeviewerdialogbase.ui +++ b/umbrello/umbrello/dialogs/codeviewerdialogbase.ui @@ -109,5 +109,5 @@ changeHighlighting(int) - + diff --git a/umbrello/umbrello/dialogs/codevieweroptionsbase.ui b/umbrello/umbrello/dialogs/codevieweroptionsbase.ui index 57a43309..ed75ea9d 100644 --- a/umbrello/umbrello/dialogs/codevieweroptionsbase.ui +++ b/umbrello/umbrello/dialogs/codevieweroptionsbase.ui @@ -362,7 +362,7 @@ 789c9d97c76e24490e86effd1442f3d65870d2451a0ce6206f5adeb4cc620f8c34f2553225b5a4c1befb46927fe6a1d4c0ccac4287fa8a0c26834193f5dbb785b3fd9d856fbf7d799ec9ecba5ea8afe469e15bf3727ffffeeffffcf1e797af49b2d0ffc7d142f2f55f5fbe1ecc16ea85dde9a4ed81290045faa77ca49cf4ab67ba1e3953969173651ab9d4fdf1c8a27c3872ad7c3c72d3b32c2a67c3f3444636fbef23eb7e590267e68fcc4656395d8dacf6d938ef97eaef289781cddebdb2846fccff44b989ba58e3411f3dc75158e6df1d3889539517ca49bf54fe43398d1dec4f46567f685fd9c539f43fc025f80c1c3ce8d93f28e77185f8bf0c6cfae4c0b5f9c3c6e5c0542a4b5876fe13708df39d2bd7716372aa8c93c4e4723bb2f977aadc26ceec4bdb7310e6b0bfab9c2445ecd49f1370694cebca65d260ffa6711a41aef14d24e94cee6be3348e0ae5e9c8765f07ca3e8db17f0f9c825794eb3489351fe9bb7217e4969f29388bd51ee9fda5715a19730696b852fea95c6471647ca95cf64bcf43e0cef4657b647bfe6acf213d6bb32f9a9f5992b5a64f9a8f990b6cf9ecc15d6cf9acf6b2da55a8a75cb973dee4b2d1b38b5c05de02434e87e01aacfb351df5bebddea74b5c67f9c795711ea15e357e2ecde358fb87efc0a867df8cac728a074e62e527706afb59f3cf6583be5c28bb3c35f693812d1fbdc6dbe57966fec932d899ffa4f7e38adca17e34beaeca4b9c271a18f1d5fc739257b0d70d9c68be7bed7fcee7827ab91cd8e4740cf6b19d4ffb87ab07b9bf516e72d4a3ac821b9cef6e60d84f47367ded2fae1d9f7704f6163f79000ffde27660f387ed3c5dbf54dfeebb0bf6acbe6b706bfa5ef32f8f8b18f5bf0f463f20edb77956a4e68fbc80b3c4facd163847be6bfde72ec86dbeac82715fbc0286be683cf3bc081d44f7df80d344fb0b6b7de64581fb916765297263d6fccd9b7ee97e566e8b06cfdb1f59cf2bda2f8bbc2c11df0c5c41aefdb328ca22b1feb0012eedbce24736f91b18fb796d64eb87cb60817dcdafb07d906bfd14d22f659d8785ef97b2f6d7b2df6ef1d6fb2babaac6f92e8c25b27ecc1f239b7f3a5fca5a8678ea7c2d9bc0e6ef1238b3fca2c7814d5f4cbf9334b5f833384bed3c7a5f5514f4adbe2ec07962e7590457f06f6f649b977afe2a16f42f5e070bfc591e18f7a5f1a812a9e0df39d827da4fbd8c6ccfd7785569bf945f953371a9d5a3de67950bfa2d75c63eb2fb15bdcfaaf011e6c7263846bf8f4636f91618f3c7d3c0f047fb69550efab2074e12bd6fd27957553ec33c5b043bcc7f9d0795f818fdb501a3df8ae673e507ff69021eea37063bc45ffb73550736ff36c0a84f3e0317a86f8b5f139e6ffe1f821de6d9127898ff3be00a7c3ab2cd03e3d697560ff40016e47b3bb2e96bbd559d8f32bbff4b7065f193042c98873acf240af6adbf3c83c5f2954bb0c7bcd77c107d81d2fdebc63e33ff640aaecc9e1c8151df5c803dfaadc64b52dfa03ed64636ffb4ff4b2867f453ede7227586fcd3f9264ded91fffafe236d5da37fe83c91ceb7b9e5b7f6731ff92ed7f747d6fbf7e185cf58347e3e6932e47b3430fa893edf87d795c2fc3f003b67f5f902cec17abfde0dfa3c053b3c5ffb832fc2eb8fddcf233887fc195c801f46b6f3cdc02558fba72f7d2d1a7f7e321ee58fe0cad86bbff24dd3e2fe74fef836b0c6eb60d62fa6bf5e07b3419f853dd7dc70fb8bd5f1255fd90ed30f9f3c5ff30ddff21ddff384a7fcc08ffcc4cf61cdf8855ff9e79c7e1db4dff89d3f7891977899577895d7789d377893b7f83b6fcfe937bc13b477798ff7f9800ff928ac633ee11f7cca6761d7f99c7e1b3cb908da11c7413be1943376e153cc39175c72f549ff9e17c31744429e6a6aa8a58e2ee98aaee9866e7f617fc24b7417a4f734a1293dd0233dd133cd8285177aa5f9f3b63ca5377aa78f607b919668995682e62aadd17ab0b1419b9ff41f682b48bed336edd02eed05ed7d5ea3033a0cdf1ed1f127fd273ae123fa41a774a6b685cee982228a837e42e927fd47caf8985c38651eb40b2ac38e4a5842658a97fab33fd248cb87d2c9a55cc9b5dcc82d1fc99ddccb44a6f230af2f8ff224cf417f262ff22a3fe54ddee543166549966545567f617f4dd66523dc6b2c9bb225df655b7682f692ecca9eeccfe97772c09b722847722c27c1f3eb70f66bf9116c9fca999ccbc59cfe25bf4a143a5ef8992561324a78bd92522acf9ebc78efe7cf7b153276db37bef59dbff457fedadff85b7f27abfede4ffcd4cf9ff76faeff4fffefeff8c7f5fedfdfbffc0fa355c495 - + kcolorbutton.h diff --git a/umbrello/umbrello/dialogs/diagrampropertiespage.ui b/umbrello/umbrello/dialogs/diagrampropertiespage.ui index bfb00529..8dc7f029 100644 --- a/umbrello/umbrello/dialogs/diagrampropertiespage.ui +++ b/umbrello/umbrello/dialogs/diagrampropertiespage.ui @@ -406,5 +406,5 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on - + diff --git a/umbrello/umbrello/dialogs/exportallviewsdialogbase.ui b/umbrello/umbrello/dialogs/exportallviewsdialogbase.ui index 503181e4..e795d2c9 100644 --- a/umbrello/umbrello/dialogs/exportallviewsdialogbase.ui +++ b/umbrello/umbrello/dialogs/exportallviewsdialogbase.ui @@ -207,7 +207,7 @@ Only the folders made by the user are created in the base directory (Logical vie reject() - + kurlrequester.h klineedit.h diff --git a/umbrello/umbrello/dialogs/settingsdlg.cpp b/umbrello/umbrello/dialogs/settingsdlg.cpp index f051925a..a227572d 100644 --- a/umbrello/umbrello/dialogs/settingsdlg.cpp +++ b/umbrello/umbrello/dialogs/settingsdlg.cpp @@ -343,7 +343,7 @@ void SettingsDlg::slotDefault() { break; case Settings::page_font: - m_FontWidgets.chooser -> setFont( tqparentWidget() -> font() ); + m_FontWidgets.chooser -> setFont( parentWidget() -> font() ); break; case Settings::page_UI: diff --git a/umbrello/umbrello/dialogs/umlrolepropertiesbase.ui b/umbrello/umbrello/dialogs/umlrolepropertiesbase.ui index 22a24023..ecaa98ae 100644 --- a/umbrello/umbrello/dialogs/umlrolepropertiesbase.ui +++ b/umbrello/umbrello/dialogs/umlrolepropertiesbase.ui @@ -199,5 +199,5 @@ - + diff --git a/umbrello/umbrello/folder.cpp b/umbrello/umbrello/folder.cpp index 2ba73694..7a4d11ab 100644 --- a/umbrello/umbrello/folder.cpp +++ b/umbrello/umbrello/folder.cpp @@ -248,7 +248,7 @@ void UMLFolder::saveToXMI(TQDomDocument& qDoc, TQDomElement& qElement) { folderRoot.setAttribute("name", m_Name); folderRoot.setAttribute("filename", m_folderFile); folderRoot.setAttribute("mainModel", umldoc->URL().fileName()); - folderRoot.setAttribute("tqparentId", ID2STR(m_pUMLPackage->getID())); + folderRoot.setAttribute("parentId", ID2STR(m_pUMLPackage->getID())); folderRoot.setAttribute("tqparent", m_pUMLPackage->getFullyQualifiedName("::", true)); saveContents(folderDoc, folderRoot); folderDoc.appendChild(folderRoot); diff --git a/umbrello/umbrello/import_rose.cpp b/umbrello/umbrello/import_rose.cpp index a04dfc43..54201a06 100644 --- a/umbrello/umbrello/import_rose.cpp +++ b/umbrello/umbrello/import_rose.cpp @@ -31,12 +31,12 @@ namespace Import_Rose { typedef TQPtrList PetalNodeList; -uint nClosures; // Multiple closing tqparentheses may appear on a single +uint nClosures; // Multiple closing parentheses may appear on a single // line. The parsing is done line-by-line and using // recursive descent. This means that we can only handle - // _one_ closing tqparenthesis at a time, i.e. the closing + // _one_ closing parenthesis at a time, i.e. the closing // of the currently parsed node. Since we may see more - // closing tqparentheses than we can handle, we need a + // closing parentheses than we can handle, we need a // counter indicating how many additional node closings // have been seen. @@ -106,8 +106,8 @@ bool checkClosing(TQStringList& tokens) { if (tokens.count() == 0) return false; if (tokens.last() == ")") { - // For a single closing tqparenthesis, we just return true. - // But if there are more closing tqparentheses, we need to increment + // For a single closing parenthesis, we just return true. + // But if there are more closing parentheses, we need to increment // nClosures for each scope. tokens.pop_back(); while (tokens.count() && tokens.last() == ")") { @@ -133,7 +133,7 @@ bool isImmediateValue(TQString s) { * Examples of immediate value lists: * number list: ( 123 , 456 ) * string list: ( "SomeText" 888 ) - * Any enclosing tqparentheses are removed. + * Any enclosing parentheses are removed. * All extracted items are also removed from `l'. * For the example given above the following is returned: * "123 456" @@ -236,7 +236,7 @@ TQString extractValue(TQStringList& l, TQTextStream& stream) { } else { result = shift(l); if (l.first() != ")") { - kError() << loc() << "expecting closing tqparenthesis" << endl; + kError() << loc() << "expecting closing parenthesis" << endl; return result; } l.pop_front(); @@ -301,7 +301,7 @@ PetalNode *readAttributes(TQStringList initialArgs, TQTextStream& stream) { // Decrement nClosures exactly once, namely for the own scope. // Each recursion of readAttributes() is only responsible for // its own scope. I.e. each further scope closing is handled by - // an outer recursion in case of multiple closing tqparentheses. + // an outer recursion in case of multiple closing parentheses. nClosures--; break; } @@ -339,7 +339,7 @@ PetalNode *readAttributes(TQStringList initialArgs, TQTextStream& stream) { // Decrement nClosures exactly once, namely for the own scope. // Each recursion of readAttributes() is only responsible for // its own scope. I.e. each further scope closing is handled by - // an outer recursion in case of multiple closing tqparentheses. + // an outer recursion in case of multiple closing parentheses. nClosures--; break; } @@ -376,7 +376,7 @@ bool loadFromMDL(TQIODevice& file) { if (line.tqcontains(objectRx)) { nClosures = 0; TQStringList initialArgs = scan(line); - initialArgs.pop_front(); // remove opening tqparenthesis + initialArgs.pop_front(); // remove opening parenthesis root = readAttributes(initialArgs, stream); } } diff --git a/umbrello/umbrello/kplayerslideraction.cpp b/umbrello/umbrello/kplayerslideraction.cpp index e7614daf..a4969b4b 100644 --- a/umbrello/umbrello/kplayerslideraction.cpp +++ b/umbrello/umbrello/kplayerslideraction.cpp @@ -201,8 +201,8 @@ int KPlayerSliderAction::plug (TQWidget* widget, int index) orientationChanged (toolbar -> orientation()); connect (toolbar, TQT_SIGNAL (orientationChanged (Qt::Orientation)), this, TQT_SLOT (orientationChanged (Qt::Orientation))); //connect (toolbar, TQT_SIGNAL (destroyed()), this, TQT_SLOT (toolbarDestroyed())); - //if ( tqparentCollection() ) - // tqparentCollection() -> connectHighlight (toolbar, this); + //if ( parentCollection() ) + // parentCollection() -> connectHighlight (toolbar, this); //return containerCount() - 1; return result; } diff --git a/umbrello/umbrello/kplayerslideraction.h b/umbrello/umbrello/kplayerslideraction.h index 9ffd1a3a..ea4d290d 100644 --- a/umbrello/umbrello/kplayerslideraction.h +++ b/umbrello/umbrello/kplayerslideraction.h @@ -144,9 +144,9 @@ public: KPlayerSlider* slider (void) { return m_slider; } - /** Plugs the action into the toolbar. Retqparents the slider into the toolbar. */ + /** Plugs the action into the toolbar. Reparents the slider into the toolbar. */ //virtual int plug (TQWidget*, int = -1); - /** Unplugs the action from the toolbar. Retqparents the slider out of the toolbar. */ + /** Unplugs the action from the toolbar. Reparents the slider out of the toolbar. */ //virtual void unplug (TQWidget*); protected slots: diff --git a/umbrello/umbrello/model_utils.cpp b/umbrello/umbrello/model_utils.cpp index 95a93f6b..9c6cfbc2 100644 --- a/umbrello/umbrello/model_utils.cpp +++ b/umbrello/umbrello/model_utils.cpp @@ -235,7 +235,7 @@ UMLObject* findUMLObject(const UMLObjectList& inList, return NULL; } -TQString uniqObjectName(Uml::Object_Type type, UMLPackage *tqparentPkg, TQString prefix) { +TQString uniqObjectName(Uml::Object_Type type, UMLPackage *parentPkg, TQString prefix) { TQString currentName = prefix; if (currentName.isEmpty()) { if(type == Uml::ot_Class) @@ -271,7 +271,7 @@ TQString uniqObjectName(Uml::Object_Type type, UMLPackage *tqparentPkg, TQString } UMLDoc *doc = UMLApp::app()->getDocument(); TQString name = currentName; - for (int number = 1; !doc->isUnique(name, tqparentPkg); number++) { + for (int number = 1; !doc->isUnique(name, parentPkg); number++) { name = currentName + '_' + TQString::number(number); } return name; @@ -501,12 +501,12 @@ Parse_tqStatus parseOperation(TQString m, OpDescriptor& desc, UMLClassifier *own if (m.isEmpty()) return PS_Empty; if (m.tqcontains(TQRegExp("operator *()"))) { - // C++ special case: two sets of tqparentheses + // C++ special case: two sets of parentheses desc.m_name = "operator()"; m.remove(TQRegExp("operator *()")); } else { /** - * The search pattern includes everything up to the opening tqparenthesis + * The search pattern includes everything up to the opening parenthesis * because UML also permits non programming-language oriented designs * using narrative names, for example "check water temperature". */ @@ -532,7 +532,7 @@ Parse_tqStatus parseOperation(TQString m, OpDescriptor& desc, UMLClassifier *own desc.m_pReturnType = pRetType; } } - // Remove possible empty tqparentheses () + // Remove possible empty parentheses () m.remove( TQRegExp("\\s*\\(\\s*\\)") ); desc.m_args.clear(); pat = TQRegExp( "\\((.*)\\)" ); diff --git a/umbrello/umbrello/model_utils.h b/umbrello/umbrello/model_utils.h index 771d6f86..600e841c 100644 --- a/umbrello/umbrello/model_utils.h +++ b/umbrello/umbrello/model_utils.h @@ -75,13 +75,13 @@ UMLObject* findUMLObject( const UMLObjectList& inList, * if the default name is taken e.g. new_actor, new_actor_1 * etc. * @param type The object type. - * @param tqparentPkg The package in which to compare the name. + * @param parentPkg The package in which to compare the name. * @param prefix The prefix to use (optional.) * If no prefix is given then a type related * prefix will be chosen internally. */ TQString uniqObjectName(Uml::Object_Type type, - UMLPackage *tqparentPkg, + UMLPackage *parentPkg, TQString prefix = TQString()); /** diff --git a/umbrello/umbrello/object_factory.cpp b/umbrello/umbrello/object_factory.cpp index a87ff2c3..cf49a1e1 100644 --- a/umbrello/umbrello/object_factory.cpp +++ b/umbrello/umbrello/object_factory.cpp @@ -60,10 +60,10 @@ bool assignUniqueIdOnCreation() { } UMLObject* createNewUMLObject(Uml::Object_Type type, const TQString &name, - UMLPackage *tqparentPkg) { - if (tqparentPkg == NULL) { + UMLPackage *parentPkg) { + if (parentPkg == NULL) { kError() << "Object_Factory::createNewUMLObject(" << name - << "): tqparentPkg is NULL" << endl; + << "): parentPkg is NULL" << endl; return NULL; } UMLObject *o = NULL; @@ -114,40 +114,40 @@ UMLObject* createNewUMLObject(Uml::Object_Type type, const TQString &name, kWarning() << "createNewUMLObject error unknown type: " << type << endl; return NULL; } - o->setUMLPackage(tqparentPkg); + o->setUMLPackage(parentPkg); UMLDoc *doc = UMLApp::app()->getDocument(); - tqparentPkg->addObject(o); + parentPkg->addObject(o); doc->signalUMLObjectCreated(o); kapp->processEvents(); return o; } UMLObject* createUMLObject(Uml::Object_Type type, const TQString &n, - UMLPackage *tqparentPkg /* = NULL */, + UMLPackage *parentPkg /* = NULL */, bool solicitNewName /* = true */) { UMLDoc *doc = UMLApp::app()->getDocument(); - if (tqparentPkg == NULL) { + if (parentPkg == NULL) { if (type == Uml::ot_Datatype) { - tqparentPkg = doc->getDatatypeFolder(); + parentPkg = doc->getDatatypeFolder(); } else { Uml::Model_Type mt = Model_Utils::convert_OT_MT(type); kDebug() << "Object_Factory::createUMLObject(" << n << "): " - << "tqparentPkg is not set, assuming Model_Type " << mt << endl; - tqparentPkg = doc->getRootFolder(mt); + << "parentPkg is not set, assuming Model_Type " << mt << endl; + parentPkg = doc->getRootFolder(mt); } } if (!n.isEmpty()) { - UMLObject *o = doc->findUMLObject(n, type, tqparentPkg); + UMLObject *o = doc->findUMLObject(n, type, parentPkg); if (o) { if (!solicitNewName) return o; } else { - o = createNewUMLObject(type, n, tqparentPkg); + o = createNewUMLObject(type, n, parentPkg); return o; } } bool ok = false; - TQString name = Model_Utils::uniqObjectName(type, tqparentPkg, n); + TQString name = Model_Utils::uniqObjectName(type, parentPkg, n); bool bValidNameEntered = false; do { name = KInputDialog::getText(i18n("Name"), i18n("Enter name:"), name, &ok, (TQWidget*)UMLApp::app()); @@ -165,14 +165,14 @@ UMLObject* createUMLObject(Uml::Object_Type type, const TQString &n, i18n("Reserved Keyword")); continue; } - if (! doc->isUnique(name, tqparentPkg)) { + if (! doc->isUnique(name, parentPkg)) { KMessageBox::error(0, i18n("That name is already being used."), i18n("Not a Unique Name")); continue; } bValidNameEntered = true; } while (bValidNameEntered == false); - UMLObject *o = createNewUMLObject(type, name, tqparentPkg); + UMLObject *o = createNewUMLObject(type, name, parentPkg); return o; } diff --git a/umbrello/umbrello/object_factory.h b/umbrello/umbrello/object_factory.h index 541975c0..69338203 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 tqparentPkg The object's tqparent package. + * @param parentPkg The object's tqparent 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 @@ -40,7 +40,7 @@ namespace Object_Factory { */ UMLObject* createUMLObject(Uml::Object_Type type, const TQString &n = TQString(), - UMLPackage *tqparentPkg = 0, + UMLPackage *parentPkg = 0, bool solicitNewName = true); /** diff --git a/umbrello/umbrello/ownedcodeblock.cpp b/umbrello/umbrello/ownedcodeblock.cpp index 22ceeed1..3b141500 100644 --- a/umbrello/umbrello/ownedcodeblock.cpp +++ b/umbrello/umbrello/ownedcodeblock.cpp @@ -90,7 +90,7 @@ void OwnedCodeBlock::setAttributesOnNode(TQDomDocument& /*doc*/, TQDomElement& e UMLRole * role = dynamic_cast(m_parentObject); if(role) { - elem.setAttribute("tqparent_id",ID2STR(role->getParentAssociation()->getID())); + elem.setAttribute("parent_id",ID2STR(role->getParentAssociation()->getID())); // CAUTION: role_id here is numerically inverted wrt Uml::Role_Type, // i.e. role A is 1 and role B is 0. // I'll resist the temptation to change this - @@ -99,7 +99,7 @@ void OwnedCodeBlock::setAttributesOnNode(TQDomDocument& /*doc*/, TQDomElement& e } else { - elem.setAttribute("tqparent_id",ID2STR(m_parentObject->getID())); + elem.setAttribute("parent_id",ID2STR(m_parentObject->getID())); //elem.setAttribute("role_id","-1"); } @@ -111,7 +111,7 @@ void OwnedCodeBlock::setAttributesOnNode(TQDomDocument& /*doc*/, TQDomElement& e void OwnedCodeBlock::setAttributesFromNode ( TQDomElement & elem) { // set local attributes, tqparent object first - TQString idStr = elem.attribute("tqparent_id","-1"); + TQString idStr = elem.attribute("parent_id","-1"); Uml::IDType id = STR2ID(idStr); // always disconnect from current tqparent @@ -154,7 +154,7 @@ void OwnedCodeBlock::setAttributesFromNode ( TQDomElement & elem) { } else - kError() << "ERROR: can't load ownedcodeblock: tqparentUMLObject w/id:" + kError() << "ERROR: can't load ownedcodeblock: parentUMLObject w/id:" << ID2STR(id) << " not found, corrupt save file?" << endl; } diff --git a/umbrello/umbrello/ownedhierarchicalcodeblock.cpp b/umbrello/umbrello/ownedhierarchicalcodeblock.cpp index 45e41875..bb2e4990 100644 --- a/umbrello/umbrello/ownedhierarchicalcodeblock.cpp +++ b/umbrello/umbrello/ownedhierarchicalcodeblock.cpp @@ -68,7 +68,7 @@ void OwnedHierarchicalCodeBlock::setAttributesOnNode (TQDomDocument & doc, TQDom OwnedCodeBlock::setAttributesOnNode(doc, elem); // set local class attributes - elem.setAttribute("tqparent_id",ID2STR(getParentObject()->getID())); + elem.setAttribute("parent_id",ID2STR(getParentObject()->getID())); // setting ID's takes special treatment // as UMLRoles arent properly stored in the XMI right now. diff --git a/umbrello/umbrello/ownedhierarchicalcodeblock.h b/umbrello/umbrello/ownedhierarchicalcodeblock.h index 7a99fe65..0999b02f 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 * tqparentDoc, const TQString &start="", const TQString &end="", const TQString &comment="" ); + OwnedHierarchicalCodeBlock ( UMLObject * tqparent, CodeDocument * parentDoc, const TQString &start="", const TQString &end="", const TQString &comment="" ); /** * Empty Destructor diff --git a/umbrello/umbrello/petaltree2uml.cpp b/umbrello/umbrello/petaltree2uml.cpp index dc650a5d..42fa038d 100644 --- a/umbrello/umbrello/petaltree2uml.cpp +++ b/umbrello/umbrello/petaltree2uml.cpp @@ -310,10 +310,10 @@ 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 tqparentPkg Pointer to the current tqparent UMLPackage. + * @param parentPkg Pointer to the current tqparent UMLPackage. * @return True if the node actually contained a controlled unit. */ -bool handleControlledUnit(PetalNode *node, const TQString& name, Uml::IDType id, UMLPackage *tqparentPkg) { +bool handleControlledUnit(PetalNode *node, const TQString& name, Uml::IDType id, UMLPackage *parentPkg) { if (node->findAttribute("is_unit").string != "TRUE") return false; bool is_loaded = (node->findAttribute("is_loaded").string != "FALSE"); @@ -335,7 +335,7 @@ bool handleControlledUnit(PetalNode *node, const TQString& name, Uml::IDType id, * 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, UMLPackage *tqparentPkg = NULL) { +bool umbrellify(PetalNode *node, UMLPackage *parentPkg = NULL) { if (node == NULL) { kError() << "umbrellify: node is NULL" << endl; return false; @@ -346,7 +346,7 @@ bool umbrellify(PetalNode *node, UMLPackage *tqparentPkg = NULL) { Uml::IDType id = quid(node); if (objType == "Class_Category") { - UMLObject *o = Import_Utils::createUMLObject(Uml::ot_Package, name, tqparentPkg); + UMLObject *o = Import_Utils::createUMLObject(Uml::ot_Package, name, parentPkg); o->setID(id); PetalNode *logical_models = node->findAttribute("logical_models").node; if (logical_models) { @@ -355,13 +355,13 @@ bool umbrellify(PetalNode *node, UMLPackage *tqparentPkg = NULL) { for (uint i = 0; i < atts.count(); i++) { umbrellify(atts[i].second.node, localParent); } - } else if (!handleControlledUnit(node, name, id, tqparentPkg)) { + } else if (!handleControlledUnit(node, name, id, parentPkg)) { kDebug() << "umbrellify: handling of " << objType << " " << name << " is not yet implemented" << endl; } } else if (objType == "Class") { - UMLObject *o = Import_Utils::createUMLObject(Uml::ot_Class, name, tqparentPkg); + UMLObject *o = Import_Utils::createUMLObject(Uml::ot_Class, name, parentPkg); o->setID(id); UMLClassifier *c = static_cast(o); // set stereotype diff --git a/umbrello/umbrello/refactoring/refactoringassistant.cpp b/umbrello/umbrello/refactoring/refactoringassistant.cpp index ef96f5b3..3c0cb32c 100644 --- a/umbrello/umbrello/refactoring/refactoringassistant.cpp +++ b/umbrello/umbrello/refactoring/refactoringassistant.cpp @@ -505,7 +505,7 @@ void RefactoringAssistant::addClassifier( UMLClassifier *classifier, TQListViewI operationAdded( op ); } - //if add tqparents + //if add parents if(addSuper) { TQListViewItem *superFolder = new KListViewItem( classifierItem, i18n("Base Classifiers") ); @@ -558,14 +558,14 @@ bool RefactoringAssistant::acceptDrag(TQDropEvent *event) const RefactoringAssistant *me = const_cast(this); //ok, check if the move is valid - TQListViewItem *movingItem = 0, *afterme = 0, *tqparentItem = 0; - me->findDrop(event->pos(), tqparentItem, afterme); + TQListViewItem *movingItem = 0, *afterme = 0, *parentItem = 0; + me->findDrop(event->pos(), parentItem, afterme); for( movingItem = firstChild(); movingItem != 0; movingItem = movingItem->itemBelow() ) { if( movingItem->isSelected() ) break; } - if(!movingItem || !tqparentItem) + if(!movingItem || !parentItem) { kDebug()<<"moving/tqparent items not found - can't accept drag!"<text(0)<findUMLObject(tqparentItem); - if( tqparentObject && dynamic_cast(tqparentObject) ) + kDebug()<<"tqparent item is "<text(0)<findUMLObject(parentItem); + if( parentObject && dynamic_cast(parentObject) ) { //droping to a classifier, ok } else {//tqparent is not a classifier, so maybe it's a folder.. check types - if( (tqparentItem->text(1) == "operations" && t == Uml::ot_Operation) - || (tqparentItem->text(1) == "attributes" && t == Uml::ot_Attribute)) + if( (parentItem->text(1) == "operations" && t == Uml::ot_Operation) + || (parentItem->text(1) == "attributes" && t == Uml::ot_Attribute)) { - tqparentObject = me->findUMLObject( tqparentItem->tqparent() ); + parentObject = me->findUMLObject( parentItem->tqparent() ); } else { - kDebug()<<"moving to item "<text(0)<<" -- "<text(1)<<" not valid"<text(0)<<" -- "<text(1)<<" not valid"<(tqparentObject) && + if (dynamic_cast(parentObject) && (t == Uml::ot_Attribute || t == Uml::ot_Operation)) { return true; @@ -613,7 +613,7 @@ bool RefactoringAssistant::acceptDrag(TQDropEvent *event) const } -void RefactoringAssistant::movableDropEvent (TQListViewItem* tqparentItem, TQListViewItem* afterme) +void RefactoringAssistant::movableDropEvent (TQListViewItem* parentItem, TQListViewItem* afterme) { //when dropping on a class, we have to put the item in the appropriate folder! UMLObject *movingObject; @@ -631,13 +631,13 @@ void RefactoringAssistant::movableDropEvent (TQListViewItem* tqparentItem, TQLis return; } Uml::Object_Type t = movingObject->getBaseType(); - newClassifier = dynamic_cast( findUMLObject( tqparentItem ) ); + newClassifier = dynamic_cast( findUMLObject( parentItem ) ); if(!newClassifier) { - if ((tqparentItem->text(1) == "operations" && t == Uml::ot_Operation) - || (tqparentItem->text(1) == "attributes" && t == Uml::ot_Attribute)) + if ((parentItem->text(1) == "operations" && t == Uml::ot_Operation) + || (parentItem->text(1) == "attributes" && t == Uml::ot_Attribute)) { - newClassifier = dynamic_cast( findUMLObject( tqparentItem->tqparent() ) ); + newClassifier = dynamic_cast( findUMLObject( parentItem->tqparent() ) ); } if(!newClassifier) { diff --git a/umbrello/umbrello/uml.cpp b/umbrello/umbrello/uml.cpp index 13608f3c..6f4d65f5 100644 --- a/umbrello/umbrello/uml.cpp +++ b/umbrello/umbrello/uml.cpp @@ -55,7 +55,7 @@ #include "umlviewlist.h" #include "worktoolbar.h" #ifdef HAVE_DOT -# include "autotqlayout/autotqlayoutdlg.h" //dimitri +# include "autotqlayout/autolayoutdlg.h" //dimitri #endif #include "model_utils.h" #include "clipboard/umlclipboard.h" @@ -1682,7 +1682,7 @@ void UMLApp::slotMoveTabRight() { void UMLApp::slotAutotqlayout(){ #ifdef HAVE_DOT /* - TQDialog* d = new AutotqlayoutDlg(getCurrentView()); + TQDialog* d = new AutolayoutDlg(getCurrentView()); d->show(); */ #endif diff --git a/umbrello/umbrello/uml.h b/umbrello/umbrello/uml.h index 13cbce16..93cd981e 100644 --- a/umbrello/umbrello/uml.h +++ b/umbrello/umbrello/uml.h @@ -533,7 +533,7 @@ public slots: void slotViewStatusBar(); /** - * Autotqlayouts the current class diagram + * Autolayouts the current class diagram */ void slotAutotqlayout(); diff --git a/umbrello/umbrello/umldoc.cpp b/umbrello/umbrello/umldoc.cpp index acc77eee..de6fc9af 100644 --- a/umbrello/umbrello/umldoc.cpp +++ b/umbrello/umbrello/umldoc.cpp @@ -769,7 +769,7 @@ bool UMLDoc::isUnique(const TQString &name) { UMLListView *listView = UMLApp::app()->getListView(); UMLListViewItem *currentItem = (UMLListViewItem*)listView->currentItem(); - UMLListViewItem *tqparentItem = 0; + 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 @@ -780,13 +780,13 @@ bool UMLDoc::isUnique(const TQString &name) // do check now if (Model_Utils::typeIsContainer(currentItem->getType())) return isUnique (name, (UMLPackage*) currentItem->getUMLObject()); - tqparentItem = (UMLListViewItem*)currentItem->tqparent(); + parentItem = (UMLListViewItem*)currentItem->tqparent(); } // item is in a package so do check only in that - if (tqparentItem != NULL && Model_Utils::typeIsContainer(tqparentItem->getType())) { - UMLPackage *tqparentPkg = static_cast(tqparentItem->getUMLObject()); - return isUnique(name, tqparentPkg); + if (parentItem != NULL && Model_Utils::typeIsContainer(parentItem->getType())) { + UMLPackage *parentPkg = static_cast(parentItem->getUMLObject()); + return isUnique(name, parentPkg); } kError() << "UMLDoc::isUnique(" << name << "): Not currently in a package" @@ -1524,8 +1524,8 @@ bool UMLDoc::loadFromXMI( TQIODevice & file, short encode ) tagEq(tag, "Interface")) { // These tests are only for foreign XMI files that // are missing the tag (e.g. NSUML) - TQDomElement tqparentElem = node.toElement(); - if( !loadUMLObjectsFromXMI( tqparentElem ) ) { + TQDomElement parentElem = node.toElement(); + if( !loadUMLObjectsFromXMI( parentElem ) ) { kWarning() << "failed load on model objects" << endl; return false; } diff --git a/umbrello/umbrello/umllistview.cpp b/umbrello/umbrello/umllistview.cpp index b9644aa9..7b570eab 100644 --- a/umbrello/umbrello/umllistview.cpp +++ b/umbrello/umbrello/umllistview.cpp @@ -573,7 +573,7 @@ void UMLListView::slotDiagramCreated( Uml::IDType id ) { } UMLListViewItem* UMLListView::determineParentItem(UMLObject* object) const { - UMLListViewItem* tqparentItem = NULL; + UMLListViewItem* parentItem = NULL; UMLListViewItem* current = (UMLListViewItem*) currentItem(); Uml::ListView_Type lvt = Uml::lvt_Unknown; if (current) @@ -603,23 +603,23 @@ UMLListViewItem* UMLListView::determineParentItem(UMLObject* object) const { kError() << "UMLListView::determineParentItem: could not tqfind " << "tqparent package " << pkg->getName() << endl; else - tqparentItem = pkgItem; + parentItem = pkgItem; } else if ((lvt == Uml::lvt_UseCase_Folder && (t == Uml::ot_Actor || t == Uml::ot_UseCase)) || (lvt == Uml::lvt_Component_Folder && t == Uml::ot_Component) || (lvt == Uml::lvt_Deployment_Folder && t == Uml::ot_Node) || (lvt == Uml::lvt_EntityRelationship_Folder && t == Uml::ot_Entity)) { - tqparentItem = current; + parentItem = current; } else if (t == Uml::ot_Datatype) { - tqparentItem = m_datatypeFolder; + parentItem = m_datatypeFolder; } else { Uml::Model_Type guess = Model_Utils::guessContainer(object); - tqparentItem = m_lv[guess]; + parentItem = m_lv[guess]; } } break; } - return tqparentItem; + return parentItem; } bool UMLListView::mayHaveChildItems(Uml::Object_Type type) { @@ -653,8 +653,8 @@ void UMLListView::slotObjectCreated(UMLObject* object) { newItem->setIcon(icon); return; } - UMLListViewItem* tqparentItem = determineParentItem(object); - if (tqparentItem == NULL) + UMLListViewItem* parentItem = determineParentItem(object); + if (parentItem == NULL) return; Uml::Object_Type type = object->getBaseType(); @@ -667,7 +667,7 @@ void UMLListView::slotObjectCreated(UMLObject* object) { if (!folderFile.isEmpty()) name.append(" (" + folderFile + ')'); } - newItem = new UMLListViewItem(tqparentItem, name, lvt, object); + newItem = new UMLListViewItem(parentItem, name, lvt, object); if (mayHaveChildItems(type)) { UMLClassifier *c = static_cast(object); UMLClassifierListItemList cListItems = c->getFilteredList(Uml::ot_UMLObject); @@ -773,21 +773,21 @@ void UMLListView::childObjectAdded(UMLClassifierListItem* child, UMLClassifier* return; const TQString text = child->toString(Uml::st_SigNoVis); UMLListViewItem *childItem = NULL; - UMLListViewItem *tqparentItem = findUMLObject(tqparent); - if (tqparentItem == NULL) { + UMLListViewItem *parentItem = findUMLObject(tqparent); + if (parentItem == NULL) { kDebug() << "UMLListView::childObjectAdded(" << child->getName() << "): tqparent " << tqparent->getName() << " does not yet exist, creating it now." << endl; const Uml::ListView_Type lvt = Model_Utils::convert_OT_LVT(tqparent); - tqparentItem = new UMLListViewItem(m_lv[Uml::mt_Logical], tqparent->getName(), lvt, tqparent); + parentItem = new UMLListViewItem(m_lv[Uml::mt_Logical], tqparent->getName(), lvt, tqparent); } else { - childItem = tqparentItem->findChildObject(child); + childItem = parentItem->findChildObject(child); } if (childItem) { childItem->setText(text); } else { const Uml::ListView_Type lvt = Model_Utils::convert_OT_LVT(child); - childItem = new UMLListViewItem(tqparentItem, text, lvt, child); + childItem = new UMLListViewItem(parentItem, text, lvt, child); if (! m_doc->loading()) { ensureItemVisible(childItem); clearSelection(); @@ -799,13 +799,13 @@ void UMLListView::childObjectAdded(UMLClassifierListItem* child, UMLClassifier* void UMLListView::childObjectRemoved(UMLClassifierListItem* obj) { UMLClassifier *tqparent = const_cast(dynamic_cast(sender())); - UMLListViewItem *tqparentItem = findUMLObject(tqparent); - if (tqparentItem == NULL) { + UMLListViewItem *parentItem = findUMLObject(tqparent); + if (parentItem == NULL) { kError() << "UMLListView::childObjectRemoved(" << obj->getName() << "): cannot find tqparent UMLListViewItem" << endl; return; } - tqparentItem->deleteChildItem(obj); + parentItem->deleteChildItem(obj); } void UMLListView::slotDiagramRenamed(Uml::IDType id) { @@ -1842,13 +1842,13 @@ void UMLListView::slotCutSuccessful() { } } -void UMLListView::addNewItem(UMLListViewItem *tqparentItem, Uml::ListView_Type type) { +void UMLListView::addNewItem(UMLListViewItem *parentItem, Uml::ListView_Type type) { if (type == Uml::lvt_Datatype) { - tqparentItem = m_datatypeFolder; + parentItem = m_datatypeFolder; } UMLListViewItem * newItem = NULL; - tqparentItem->setOpen( true ); + parentItem->setOpen( true ); Uml::Icon_Type icon = Model_Utils::convert_LVT_IT(type); @@ -1856,7 +1856,7 @@ void UMLListView::addNewItem(UMLListViewItem *tqparentItem, Uml::ListView_Type t if (Model_Utils::typeIsDiagram(type)) { Uml::Diagram_Type dt = Model_Utils::convert_LVT_DT(type); name = getUniqueDiagramName(dt); - newItem = new UMLListViewItem(tqparentItem, name, type, Uml::id_None); + newItem = new UMLListViewItem(parentItem, name, type, Uml::id_None); } else { Uml::Object_Type ot = Model_Utils::convert_LVT_OT(type); if (ot == Uml::ot_UMLObject) { @@ -1864,20 +1864,20 @@ void UMLListView::addNewItem(UMLListViewItem *tqparentItem, Uml::ListView_Type t << type << endl; return; } - UMLPackage *tqparentPkg = - dynamic_cast(tqparentItem->getUMLObject()); - if (tqparentPkg == NULL) { + UMLPackage *parentPkg = + dynamic_cast(parentItem->getUMLObject()); + if (parentPkg == NULL) { kError() << "UMLListView::addNewItem(type " << type - << "): tqparentPkg is NULL" << endl; + << "): parentPkg is NULL" << endl; return; } if (Model_Utils::typeIsClassifierList(type)) { - UMLClassifier *tqparent = static_cast(tqparentPkg); + UMLClassifier *tqparent = static_cast(parentPkg); name = tqparent->uniqChildName(ot); } else { - name = Model_Utils::uniqObjectName(ot, tqparentPkg); + name = Model_Utils::uniqObjectName(ot, parentPkg); } - newItem = new UMLListViewItem(tqparentItem, name, type, (UMLObject*)0); + newItem = new UMLListViewItem(parentItem, name, type, (UMLObject*)0); } m_bIgnoreCancelRename = false; newItem->setIcon( icon ); @@ -2073,15 +2073,15 @@ UMLObject *UMLListView::createUMLObject( UMLListViewItem * item, Uml::Object_Typ return NULL; } - UMLListViewItem * tqparentItem = static_cast(item->tqparent()); - const Uml::ListView_Type lvt = tqparentItem->getType(); + UMLListViewItem * parentItem = static_cast(item->tqparent()); + const Uml::ListView_Type lvt = parentItem->getType(); if (! Model_Utils::typeIsContainer(lvt)) { kError() << "UMLListView::createUMLObject(" << object->getName() - << "): tqparentItem (" << lvt << " is not a container" << endl; + << "): parentItem (" << lvt << " is not a container" << endl; delete object; return NULL; } - UMLPackage *pkg = static_cast(tqparentItem->getUMLObject()); + UMLPackage *pkg = static_cast(parentItem->getUMLObject()); object->setUMLPackage(pkg); pkg->addObject(object); connectNewObjectsSlots(object); @@ -2198,15 +2198,15 @@ void UMLListView::createDiagram( UMLListViewItem * item, Uml::Diagram_Type type delete item; return; } - UMLListViewItem *tqparentItem = static_cast(item->tqparent()); - UMLFolder *tqparentFolder = dynamic_cast(tqparentItem->getUMLObject()); - if (tqparentFolder == NULL) { + UMLListViewItem *parentItem = static_cast(item->tqparent()); + UMLFolder *parentFolder = dynamic_cast(parentItem->getUMLObject()); + if (parentFolder == NULL) { kError() << "UMLListView::createDiagram(" << name << "): tqparent UMLObject is not a UMLFolder" << endl; delete item; return; } - view = new UMLView(tqparentFolder); + view = new UMLView(parentFolder); view->setName( name ); view->setType( type ); view->setID( UniqueID::gen() ); @@ -2223,7 +2223,7 @@ TQString UMLListView::getUniqueDiagramName(Uml::Diagram_Type type) { } bool UMLListView::isUnique( UMLListViewItem * item, const TQString &name ) { - UMLListViewItem * tqparentItem = static_cast( item -> tqparent() ); + UMLListViewItem * parentItem = static_cast( item -> tqparent() ); Uml::ListView_Type type = item -> getType(); switch( type ) { case Uml::lvt_Class_Diagram: @@ -2283,10 +2283,10 @@ bool UMLListView::isUnique( UMLListViewItem * item, const TQString &name ) { case Uml::lvt_Deployment_Folder: case Uml::lvt_EntityRelationship_Folder: { - Uml::ListView_Type lvt = tqparentItem->getType(); + Uml::ListView_Type lvt = parentItem->getType(); if (!Model_Utils::typeIsContainer(lvt)) return (m_doc->findUMLObject(name) == NULL); - UMLPackage *pkg = static_cast(tqparentItem->getUMLObject()); + UMLPackage *pkg = static_cast(parentItem->getUMLObject()); if (pkg == NULL) { kError() << "UMLListView::isUnique: internal error - " << "tqparent listviewitem is package but has no UMLObject" << endl; @@ -2302,7 +2302,7 @@ bool UMLListView::isUnique( UMLListViewItem * item, const TQString &name ) { case Uml::lvt_Operation: case Uml::lvt_EnumLiteral: { - UMLClassifier *tqparent = static_cast(tqparentItem->getUMLObject()); + UMLClassifier *tqparent = static_cast(parentItem->getUMLObject()); return (tqparent->findChildObject(name) == NULL); break; } @@ -2401,16 +2401,16 @@ bool UMLListView::loadChildrenFromXMI( UMLListViewItem * tqparent, TQDomElement } else if (Model_Utils::typeIsFolder(lvType)) { // Synthesize the UMLFolder here UMLObject *umlParent = tqparent->getUMLObject(); - UMLPackage *tqparentPkg = dynamic_cast(umlParent); - if (tqparentPkg == NULL) { + UMLPackage *parentPkg = dynamic_cast(umlParent); + if (parentPkg == NULL) { kError() << pfx << "umlParent(" << umlParent << ") is not a UMLPackage" << endl; domElement = node.toElement(); continue; } UMLFolder *f = new UMLFolder(label, nID); - f->setUMLPackage(tqparentPkg); - tqparentPkg->addObject(f); + f->setUMLPackage(parentPkg); + parentPkg->addObject(f); pObject = f; item = new UMLListViewItem(tqparent, label, lvType, pObject); // Moving all relevant UMLObjects to the new UMLFolder is done below, @@ -2490,7 +2490,7 @@ bool UMLListView::loadChildrenFromXMI( UMLListViewItem * tqparent, TQDomElement << tqparent->getText() << " (" << tqparent << ") != " << itmParent->getText() << " (" << itmParent << ")" << endl; if (item == m_datatypeFolder && itmParent == m_lv[Uml::mt_Logical]) { - kDebug() << pfx << "Retqparenting the Datatypes folder is prohibited" << endl; + kDebug() << pfx << "Reparenting the Datatypes folder is prohibited" << endl; } else { UMLListViewItem *newItem = moveObject(nID, lvType, tqparent); item = newItem; diff --git a/umbrello/umbrello/umlobject.cpp b/umbrello/umbrello/umlobject.cpp index 776847d4..a1896839 100644 --- a/umbrello/umbrello/umlobject.cpp +++ b/umbrello/umbrello/umlobject.cpp @@ -723,13 +723,13 @@ bool UMLObject::loadFromXMI( TQDomElement & element) { if (m_bInPaste) { m_pUMLPackage = NULL; // forget any old tqparent UMLListView *listView = UMLApp::app()->getListView(); - UMLListViewItem *tqparentItem = (UMLListViewItem*)listView->currentItem(); - if (tqparentItem) { - Uml::ListView_Type lvt = tqparentItem->getType(); + UMLListViewItem *parentItem = (UMLListViewItem*)listView->currentItem(); + if (parentItem) { + Uml::ListView_Type lvt = parentItem->getType(); if (Model_Utils::typeIsContainer(lvt) || lvt == Uml::lvt_Class || lvt == Uml::lvt_Interface) { - UMLObject *o = tqparentItem->getUMLObject(); + UMLObject *o = parentItem->getUMLObject(); m_pUMLPackage = static_cast( o ); } } diff --git a/umbrello/umbrello/umlrole.cpp b/umbrello/umbrello/umlrole.cpp index 5543415f..939b7167 100644 --- a/umbrello/umbrello/umlrole.cpp +++ b/umbrello/umbrello/umlrole.cpp @@ -23,10 +23,10 @@ // constructor -UMLRole::UMLRole(UMLAssociation * tqparent, UMLObject * tqparentObj, Uml::Role_Type role) +UMLRole::UMLRole(UMLAssociation * tqparent, UMLObject * parentObj, Uml::Role_Type role) : UMLObject(const_cast(tqparent)) { - init(tqparent, tqparentObj, role); + init(tqparent, parentObj, role); } UMLRole::~UMLRole() { } @@ -88,11 +88,11 @@ Uml::Role_Type UMLRole::getRole() { return m_role; } -void UMLRole::init(UMLAssociation * tqparent, UMLObject * tqparentObj, Uml::Role_Type r) { +void UMLRole::init(UMLAssociation * tqparent, UMLObject * parentObj, Uml::Role_Type r) { m_BaseType = Uml::ot_Role; m_role = r; m_pAssoc = tqparent; - m_pSecondary = tqparentObj; + m_pSecondary = parentObj; m_Multi = ""; m_Name = ""; m_Changeability = Uml::chg_Changeable; diff --git a/umbrello/umbrello/umlrole.h b/umbrello/umbrello/umlrole.h index 4d750751..464e264e 100644 --- a/umbrello/umbrello/umlrole.h +++ b/umbrello/umbrello/umlrole.h @@ -31,10 +31,10 @@ public: * Sets up an association. * * @param tqparent The tqparent (association) of this UMLRole. - * @param tqparentUMLObject The Parent UML Object 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 * tqparentUMLObject, Uml::Role_Type role); + UMLRole (UMLAssociation * tqparent, UMLObject * parentUMLObject, Uml::Role_Type role); /** * Overloaded '==' operator @@ -118,7 +118,7 @@ protected: private: /** do some initialization at construction time */ - void init (UMLAssociation * tqparent, UMLObject * tqparentObj, Uml::Role_Type r); + void init (UMLAssociation * tqparent, 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 c7b76087..17c3bb27 100644 --- a/umbrello/umbrello/umlview.cpp +++ b/umbrello/umbrello/umlview.cpp @@ -107,10 +107,10 @@ using namespace Uml; // constructor -UMLView::UMLView(UMLFolder *tqparentFolder) : TQCanvasView(UMLApp::app()->getMainViewWidget()) { +UMLView::UMLView(UMLFolder *parentFolder) : TQCanvasView(UMLApp::app()->getMainViewWidget()) { init(); m_pDoc = UMLApp::app()->getDocument(); - m_pFolder = tqparentFolder; + m_pFolder = parentFolder; } void UMLView::init() { @@ -1149,16 +1149,16 @@ bool UMLView::isSavedInSeparateFile() { << "listView->findUMLObject(this) returns false" << endl; return false; } - UMLListViewItem *tqparentItem = dynamic_cast( lvItem->tqparent() ); - if (tqparentItem == NULL) { + UMLListViewItem *parentItem = dynamic_cast( lvItem->tqparent() ); + if (parentItem == NULL) { kError() << msgPrefix << "tqparent item in listview is not a UMLListViewItem (?)" << endl; return false; } - const Uml::ListView_Type lvt = tqparentItem->getType(); + const Uml::ListView_Type lvt = parentItem->getType(); if (! Model_Utils::typeIsFolder(lvt)) return false; - UMLFolder *modelFolder = dynamic_cast(tqparentItem->getUMLObject()); + UMLFolder *modelFolder = dynamic_cast(parentItem->getUMLObject()); if (modelFolder == NULL) { kError() << msgPrefix << "tqparent model object is not a UMLFolder (?)" << endl; @@ -1955,8 +1955,8 @@ void UMLView::createAutoAssociations( UMLWidget * widget ) { // end if // end loop // end if - // if the UMLCanvasObject has a tqparentPackage then - // if the tqparentPackage has a widget representation on this view then + // if the UMLCanvasObject has a parentPackage then + // if the parentPackage has a widget representation on this view then // create the containment AssocWidget // end if // end if @@ -2072,11 +2072,11 @@ void UMLView::createAutoAssociations( UMLWidget * widget ) { } } } - // if the UMLCanvasObject has a tqparentPackage then + // if the UMLCanvasObject has a parentPackage then UMLPackage *tqparent = umlObj->getUMLPackage(); if (tqparent == NULL) return; - // if the tqparentPackage has a widget representation on this view then + // if the parentPackage has a widget representation on this view then Uml::IDType pkgID = tqparent->getID(); UMLWidget *pWidget; UMLWidgetListIt wit(m_WidgetList); diff --git a/umbrello/umbrello/umlview.h b/umbrello/umbrello/umlview.h index b6dad4fe..4cf51b7f 100644 --- a/umbrello/umbrello/umlview.h +++ b/umbrello/umbrello/umlview.h @@ -66,7 +66,7 @@ public: /** * Constructor */ - UMLView(UMLFolder *tqparentFolder); + UMLView(UMLFolder *parentFolder); /** * Destructor diff --git a/umbrello/umbrello/widget_factory.cpp b/umbrello/umbrello/widget_factory.cpp index 5b068aa5..ea58e128 100644 --- a/umbrello/umbrello/widget_factory.cpp +++ b/umbrello/umbrello/widget_factory.cpp @@ -148,8 +148,8 @@ bool validateObjType(Uml::Object_Type expected, UMLObject* &o, Uml::IDType id) { if (o == NULL) return false; o->setID(id); - UMLPackage *tqparentPkg = o->getUMLPackage(); - tqparentPkg->addObject(o); + UMLPackage *parentPkg = o->getUMLPackage(); + parentPkg->addObject(o); return true; } Uml::Object_Type actual = o->getBaseType(); diff --git a/umbrello/umbrello/worktoolbar.cpp b/umbrello/umbrello/worktoolbar.cpp index a60c67de..4b64f575 100644 --- a/umbrello/umbrello/worktoolbar.cpp +++ b/umbrello/umbrello/worktoolbar.cpp @@ -26,8 +26,8 @@ #include "worktoolbar.h" -WorkToolBar::WorkToolBar(TQMainWindow *tqparentWindow, const char*name) - : KToolBar(tqparentWindow,TQt::DockRight,false,name) { +WorkToolBar::WorkToolBar(TQMainWindow *parentWindow, const char*name) + : KToolBar(parentWindow,TQt::DockRight,false,name) { m_CurrentButtonID = tbb_Undefined; loadPixmaps(); m_Type = Uml::dt_Class; /* first time in just want it to load arrow, diff --git a/umbrello/umbrello/worktoolbar.h b/umbrello/umbrello/worktoolbar.h index 01b7c9a3..410644d2 100644 --- a/umbrello/umbrello/worktoolbar.h +++ b/umbrello/umbrello/worktoolbar.h @@ -47,9 +47,9 @@ public: /** * Creates a work tool bar. * - * @param tqparentWindow The tqparent of the toolbar. + * @param parentWindow The tqparent of the toolbar. */ - WorkToolBar(TQMainWindow *tqparentWindow, const char *name); + WorkToolBar(TQMainWindow *parentWindow, const char *name); /** * Standard deconstructor.