1 files changed, 16 insertions, 16 deletions

diff --git a/umbrello/umbrello/clipboard/umldrag.cpp b/umbrello/umbrello/clipboard/umldrag.cpp
index 27f8dde2..e7bd5d90 100644
--- a/umbrello/umbrello/clipboard/umldrag.cpp
+++ b/umbrello/umbrello/clipboard/umldrag.cpp
@@ -108,11 +108,11 @@ void UMLDrag::setSubType(const TQCString& string, int index) {
     data->setSubType(string, index);
 }
 
-void UMLDrag::setEncodedData(const TQByteArray& encodedData, int index) {
-    data->enc[index] = encodedData.copy();
+void UMLDrag::setEncodedData(const TQByteArray& tqencodedData, int index) {
+    data->enc[index] = tqencodedData.copy();
 }
 
-TQByteArray UMLDrag::encodedData(const char* dataName) const {
+TQByteArray UMLDrag::tqencodedData(const char* dataName) const {
     TQString str(dataName);
     for (int i = 0; i < 4; i++) {
         if ( !qstricmp(dataName,data->fmt[i]) ) {
@@ -286,7 +286,7 @@ bool UMLDrag::decodeClip1(const TQMimeSource* mimeSource, UMLObjectList& objects
     if ( !mimeSource->provides("application/x-uml-clip1") ) {
         return false;
     }
-    TQByteArray payload = mimeSource->encodedData("application/x-uml-clip1");
+    TQByteArray payload = mimeSource->tqencodedData("application/x-uml-clip1");
     if ( !payload.size() ) {
         return false;
     }
@@ -376,7 +376,7 @@ bool UMLDrag::decodeClip2(const TQMimeSource* mimeSource, UMLObjectList& objects
     if ( !mimeSource->provides("application/x-uml-clip2") ) {
         return false;
     }
-    TQByteArray payload = mimeSource->encodedData("application/x-uml-clip2");
+    TQByteArray payload = mimeSource->tqencodedData("application/x-uml-clip2");
     if ( !payload.size() ) {
         return false;
     }
@@ -439,12 +439,12 @@ bool UMLDrag::decodeClip2(const TQMimeSource* mimeSource, UMLObjectList& objects
     while ( !diagramElement.isNull() ) {
         TQString type = diagramElement.attribute("type", "0");
         Uml::Diagram_Type dt = (Uml::Diagram_Type)type.toInt();
-        UMLListViewItem *parent = listView->findFolderForDiagram(dt);
-        if (parent == NULL)
+        UMLListViewItem *tqparent = listView->findFolderForDiagram(dt);
+        if (tqparent == NULL)
             return false;
-        UMLObject *po = parent->getUMLObject();
+        UMLObject *po = tqparent->getUMLObject();
         if (po == NULL || po->getBaseType() != Uml::ot_Folder) {
-            kError() << "UMLDrag::decodeClip2: bad parent for view" << endl;
+            kError() << "UMLDrag::decodeClip2: bad tqparent for view" << endl;
             return false;
         }
         UMLFolder *f = static_cast<UMLFolder*>(po);
@@ -486,7 +486,7 @@ bool UMLDrag::getClip3TypeAndID(const TQMimeSource* mimeSource,
     if ( !mimeSource->provides("application/x-uml-clip3") ) {
         return false;
     }
-    TQByteArray payload = mimeSource->encodedData("application/x-uml-clip3");
+    TQByteArray payload = mimeSource->tqencodedData("application/x-uml-clip3");
     if ( !payload.size() ) {
         return false;
     }
@@ -539,11 +539,11 @@ bool UMLDrag::getClip3TypeAndID(const TQMimeSource* mimeSource,
 }
 
 bool UMLDrag::decodeClip3(const TQMimeSource* mimeSource, UMLListViewItemList& umlListViewItems,
-                            const UMLListView* parentListView){
+                            const UMLListView* tqparentListView){
     if ( !mimeSource->provides("application/x-uml-clip3") ) {
         return false;
     }
-    TQByteArray payload = mimeSource->encodedData("application/x-uml-clip3");
+    TQByteArray payload = mimeSource->tqencodedData("application/x-uml-clip3");
     if ( !payload.size() ) {
         return false;
     }
@@ -584,8 +584,8 @@ bool UMLDrag::decodeClip3(const TQMimeSource* mimeSource, UMLListViewItemList& u
             continue;
         }
         Uml::ListView_Type t = (Uml::ListView_Type)(type.toInt());
-        UMLListViewItem* parent = parentListView->determineParentItem(t);
-        UMLListViewItem* itemData = new UMLListViewItem(parent);
+        UMLListViewItem* tqparent = tqparentListView->determineParentItem(t);
+        UMLListViewItem* itemData = new UMLListViewItem(tqparent);
         if ( itemData->loadFromXMI(listItemElement) )
             umlListViewItems.append(itemData);
         else
@@ -602,7 +602,7 @@ bool UMLDrag::decodeClip4(const TQMimeSource* mimeSource, UMLObjectList& objects
     if ( !mimeSource->provides("application/x-uml-clip4") ) {
         return false;
     }
-    TQByteArray payload = mimeSource->encodedData("application/x-uml-clip4");
+    TQByteArray payload = mimeSource->tqencodedData("application/x-uml-clip4");
     if ( !payload.size() ) {
         return false;
     }
@@ -699,7 +699,7 @@ bool UMLDrag::decodeClip5(const TQMimeSource* mimeSource, UMLObjectList& objects
     if ( !mimeSource->provides("application/x-uml-clip5") ) {
         return false;
     }
-    TQByteArray payload = mimeSource->encodedData("application/x-uml-clip5");
+    TQByteArray payload = mimeSource->tqencodedData("application/x-uml-clip5");
     if ( !payload.size() ) {
         return false;
     }