From 99a2774ca6f1cab334de5d43fe36fc44ae889a4c Mon Sep 17 00:00:00 2001 From: tpearson Date: Sun, 12 Jun 2011 01:36:19 +0000 Subject: TQt4 convert kdesdk This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1236185 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- umbrello/umbrello/operation.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'umbrello/umbrello/operation.cpp') diff --git a/umbrello/umbrello/operation.cpp b/umbrello/umbrello/operation.cpp index dce9b41e..28cd1d11 100644 --- a/umbrello/umbrello/operation.cpp +++ b/umbrello/umbrello/operation.cpp @@ -25,9 +25,9 @@ #include "uniqueid.h" #include "dialogs/umloperationdialog.h" -UMLOperation::UMLOperation(const UMLClassifier *parent, const TQString& name, +UMLOperation::UMLOperation(const UMLClassifier *tqparent, const TQString& name, Uml::IDType id, Uml::Visibility s, UMLObject *rt) - : UMLClassifierListItem(parent, name, id) + : UMLClassifierListItem(tqparent, name, id) { if (rt) m_returnId = UniqueID::gen(); @@ -39,8 +39,8 @@ UMLOperation::UMLOperation(const UMLClassifier *parent, const TQString& name, m_bConst = false; } -UMLOperation::UMLOperation(const UMLClassifier * parent) - : UMLClassifierListItem (parent) +UMLOperation::UMLOperation(const UMLClassifier * tqparent) + : UMLClassifierListItem (tqparent) { m_BaseType = Uml::ot_Operation; m_bConst = false; @@ -65,7 +65,7 @@ void UMLOperation::moveParmLeft(UMLAttribute * a) { << endl; disconnect(a,TQT_SIGNAL(modified()),this,TQT_SIGNAL(modified())); int idx; - if ( (idx=m_List.find( a )) == -1 ) { + if ( (idx=m_List.tqfind( a )) == -1 ) { kDebug() << "Error move parm left " << a->getName() << endl; return; } @@ -85,7 +85,7 @@ void UMLOperation::moveParmRight(UMLAttribute * a) { << endl; disconnect(a,TQT_SIGNAL(modified()),this,TQT_SIGNAL(modified())); int idx; - if ( (idx=m_List.find( a )) == -1 ) { + if ( (idx=m_List.tqfind( a )) == -1 ) { kDebug() << "Error move parm right " << a->getName() << endl; return; } @@ -150,7 +150,7 @@ TQString UMLOperation::toString(Uml::Signature_Type sig) { } else if (parameterlessOpNeedsParentheses) { s.append("()"); } - UMLClassifier *ownParent = static_cast(parent()); + UMLClassifier *ownParent = static_cast(tqparent()); TQString returnType; UMLClassifier *retType = UMLClassifierListItem::getType(); if (retType) { @@ -218,8 +218,8 @@ void UMLOperation::copyInto(UMLOperation *rhs) const UMLObject* UMLOperation::clone() const { - //FIXME: The new operation should be slaved to the NEW parent not the old. - UMLOperation *clone = new UMLOperation( static_cast(parent()) ); + //FIXME: The new operation should be slaved to the NEW tqparent not the old. + UMLOperation *clone = new UMLOperation( static_cast(tqparent()) ); copyInto(clone); return clone; @@ -243,24 +243,24 @@ bool UMLOperation::isConstructorOperation() { if (getStereotype() == strConstructor) return true; - UMLClassifier * c = static_cast(this->parent()); + UMLClassifier * c = static_cast(this->tqparent()); TQString cName = c->getName(); TQString opName = getName(); // It's a constructor operation if the operation name - // matches that of the parent classifier. + // matches that of the tqparent classifier. return (cName == opName); } bool UMLOperation::isDestructorOperation() { if (getStereotype() == "destructor") return true; - UMLClassifier * c = static_cast(this->parent()); + UMLClassifier * c = static_cast(this->tqparent()); TQString cName = c->getName(); TQString opName = getName(); // Special support for C++ syntax: // It's a destructor operation if the operation name begins - // with "~" followed by the name of the parent classifier. + // with "~" followed by the name of the tqparent classifier. if (! opName.startsWith("~")) return false; opName.remove( TQRegExp("^~\\s*") ); @@ -279,8 +279,8 @@ bool UMLOperation::getConst() const { return m_bConst; } -bool UMLOperation::showPropertiesDialog(TQWidget* parent) { - UMLOperationDialog dialog(parent, this); +bool UMLOperation::showPropertiesDialog(TQWidget* tqparent) { + UMLOperationDialog dialog(tqparent, this); return dialog.exec(); } -- cgit v1.2.3