diff options
Diffstat (limited to 'umbrello/umbrello/umllistviewitem.cpp')
-rw-r--r-- | umbrello/umbrello/umllistviewitem.cpp | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/umbrello/umbrello/umllistviewitem.cpp b/umbrello/umbrello/umllistviewitem.cpp index e6b7e569..01680fde 100644 --- a/umbrello/umbrello/umllistviewitem.cpp +++ b/umbrello/umbrello/umllistviewitem.cpp @@ -39,10 +39,10 @@ UMLListView* UMLListViewItem::s_pListView = 0; -UMLListViewItem::UMLListViewItem( UMLListView * tqparent, const TQString &name, +UMLListViewItem::UMLListViewItem( UMLListView * parent, const TQString &name, Uml::ListView_Type t, UMLObject* o) - : TQListViewItem(tqparent, name) { - init(tqparent); + : TQListViewItem(parent, name) { + init(parent); m_Type = t; m_pObject = o; if (o) @@ -52,20 +52,20 @@ UMLListViewItem::UMLListViewItem( UMLListView * tqparent, const TQString &name, setRenameEnabled( 0, false ); } -UMLListViewItem::UMLListViewItem(UMLListView * tqparent) - : TQListViewItem(tqparent) { - init(tqparent); - if (tqparent == NULL) - kDebug() << "UMLListViewItem constructor called with a NULL listview tqparent" << endl; +UMLListViewItem::UMLListViewItem(UMLListView * parent) + : TQListViewItem(parent) { + init(parent); + if (parent == NULL) + kDebug() << "UMLListViewItem constructor called with a NULL listview parent" << endl; } -UMLListViewItem::UMLListViewItem(UMLListViewItem * tqparent) - : TQListViewItem(tqparent) { +UMLListViewItem::UMLListViewItem(UMLListViewItem * parent) + : TQListViewItem(parent) { init(); } -UMLListViewItem::UMLListViewItem(UMLListViewItem * tqparent, const TQString &name, Uml::ListView_Type t,UMLObject*o) - : TQListViewItem(tqparent, name) { +UMLListViewItem::UMLListViewItem(UMLListViewItem * parent, const TQString &name, Uml::ListView_Type t,UMLObject*o) + : TQListViewItem(parent, name) { init(); m_Type = t; m_pObject = o; @@ -75,7 +75,7 @@ UMLListViewItem::UMLListViewItem(UMLListViewItem * tqparent, const TQString &nam } else { UMLClassifierListItem *umlchild = dynamic_cast<UMLClassifierListItem*>(o); if (umlchild) - tqparent->addClassifierListItem(umlchild, this); + parent->addClassifierListItem(umlchild, this); updateObject(); m_nId = o->getID(); } @@ -83,8 +83,8 @@ UMLListViewItem::UMLListViewItem(UMLListViewItem * tqparent, const TQString &nam setText( name ); } -UMLListViewItem::UMLListViewItem(UMLListViewItem * tqparent, const TQString &name, Uml::ListView_Type t,Uml::IDType id) - : TQListViewItem(tqparent, name) { +UMLListViewItem::UMLListViewItem(UMLListViewItem * parent, const TQString &name, Uml::ListView_Type t,Uml::IDType id) + : TQListViewItem(parent, name) { init(); m_Type = t; m_nId = id; @@ -127,16 +127,16 @@ UMLListViewItem::UMLListViewItem(UMLListViewItem * tqparent, const TQString &nam UMLListViewItem::~UMLListViewItem() {} -void UMLListViewItem::init(UMLListView * tqparent) { +void UMLListViewItem::init(UMLListView * parent) { m_Type = Uml::lvt_Unknown; m_bCreating = false; m_pObject = NULL; m_nId = Uml::id_None; m_nChildren = 0; - if (s_pListView == NULL && tqparent != NULL) { + if (s_pListView == NULL && parent != NULL) { kDebug() << "UMLListViewItem::init: s_pListView still NULL, setting it now " << endl; - s_pListView = tqparent; + s_pListView = parent; } } @@ -182,7 +182,7 @@ bool UMLListViewItem::isOwnParent(Uml::IDType listViewItemID) { << ID2STR(listViewItemID) << ") returns NULL" << endl; return true; } - for (TQListViewItem *self = (TQListViewItem*)this; self; self = self->tqparent()) { + for (TQListViewItem *self = (TQListViewItem*)this; self; self = self->parent()) { if (lvi == self) return true; } @@ -331,9 +331,9 @@ void UMLListViewItem::okRename( int col ) { return; } UMLOperation *op = static_cast<UMLOperation*>(m_pObject); - UMLClassifier *tqparent = static_cast<UMLClassifier *>( op -> tqparent() ); + UMLClassifier *parent = static_cast<UMLClassifier *>( op -> parent() ); Model_Utils::OpDescriptor od; - Model_Utils::Parse_tqStatus st = Model_Utils::parseOperation(newText, od, tqparent); + Model_Utils::Parse_tqStatus st = Model_Utils::parseOperation(newText, od, parent); if (st == Model_Utils::PS_OK) { // TODO: Check that no operation with the exact same profile exists. op->setName( od.m_name ); @@ -382,13 +382,13 @@ void UMLListViewItem::okRename( int col ) { cancelRenameWithMsg(); return; } - UMLClassifier *tqparent = static_cast<UMLClassifier*>(m_pObject->tqparent()); + UMLClassifier *parent = static_cast<UMLClassifier*>(m_pObject->parent()); Model_Utils::NameAndType nt; Uml::Visibility vis; Model_Utils::Parse_tqStatus st; - st = Model_Utils::parseAttribute(newText, nt, tqparent, &vis); + st = Model_Utils::parseAttribute(newText, nt, parent, &vis); if (st == Model_Utils::PS_OK) { - UMLObject *exists = tqparent->findChildObject(newText); + UMLObject *exists = parent->findChildObject(newText); if (exists) { cancelRenameWithMsg(); return; @@ -415,11 +415,11 @@ void UMLListViewItem::okRename( int col ) { cancelRenameWithMsg(); return; } - UMLClassifier *tqparent = static_cast<UMLClassifier*>(m_pObject->tqparent()); + UMLClassifier *parent = static_cast<UMLClassifier*>(m_pObject->parent()); Model_Utils::NameAndType nt; - Model_Utils::Parse_tqStatus st = Model_Utils::parseTemplate(newText, nt, tqparent); + Model_Utils::Parse_tqStatus st = Model_Utils::parseTemplate(newText, nt, parent); if (st == Model_Utils::PS_OK) { - UMLObject *exists = tqparent->findChildObject(newText); + UMLObject *exists = parent->findChildObject(newText); if (exists) { cancelRenameWithMsg(); return; @@ -521,8 +521,8 @@ int UMLListViewItem::compare(TQListViewItem *other, int col, bool ascending) con #endif return retval; } - UMLClassifier *ourParent = dynamic_cast<UMLClassifier*>(m_pObject->tqparent()); - UMLClassifier *otherParent = dynamic_cast<UMLClassifier*>(otherObj->tqparent()); + UMLClassifier *ourParent = dynamic_cast<UMLClassifier*>(m_pObject->parent()); + UMLClassifier *otherParent = dynamic_cast<UMLClassifier*>(otherObj->parent()); if (ourParent == NULL) { retval = (subItem ? 1 : alphaOrder); #ifdef DEBUG_LVITEM_INSERTION_ORDER |