diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-09 02:23:29 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-09 02:23:29 +0000 |
commit | 9150603ad32928e9c514c0492a8518b742d82ac3 (patch) | |
tree | 6e3f83e2b94146bb42eed57eb6dd8f2fb0369e6f /umbrello/umbrello/refactoring/refactoringassistant.cpp | |
parent | 6b126a99d5eecef5cb96589ed5c2e522bcb06ca9 (diff) | |
download | tdesdk-9150603ad32928e9c514c0492a8518b742d82ac3.tar.gz tdesdk-9150603ad32928e9c514c0492a8518b742d82ac3.zip |
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
Diffstat (limited to 'umbrello/umbrello/refactoring/refactoringassistant.cpp')
-rw-r--r-- | umbrello/umbrello/refactoring/refactoringassistant.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
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<RefactoringAssistant*>(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!"<<endl; return false; } @@ -583,26 +583,26 @@ bool RefactoringAssistant::acceptDrag(TQDropEvent *event) const return false; } - kDebug()<<"tqparent item is "<<tqparentItem->text(0)<<endl; - UMLObject *tqparentObject = me->findUMLObject(tqparentItem); - if( tqparentObject && dynamic_cast<UMLClassifier*>(tqparentObject) ) + kDebug()<<"tqparent item is "<<parentItem->text(0)<<endl; + UMLObject *parentObject = me->findUMLObject(parentItem); + if( parentObject && dynamic_cast<UMLClassifier*>(parentObject) ) { //droping to a classifier, ok } else {//tqparent is not a classifier, so maybe it's a folder.. check types - 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 "<<tqparentItem->text(0)<<" -- "<<tqparentItem->text(1)<<" not valid"<<endl; + kDebug()<<"moving to item "<<parentItem->text(0)<<" -- "<<parentItem->text(1)<<" not valid"<<endl; return false; } } - if (dynamic_cast<UMLClassifier*>(tqparentObject) && + if (dynamic_cast<UMLClassifier*>(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<UMLClassifier*>( findUMLObject( tqparentItem ) ); + newClassifier = dynamic_cast<UMLClassifier*>( 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<UMLClassifier*>( findUMLObject( tqparentItem->tqparent() ) ); + newClassifier = dynamic_cast<UMLClassifier*>( findUMLObject( parentItem->tqparent() ) ); } if(!newClassifier) { |