rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/ktechlab@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 9 insertions, 9 deletions

diff --git a/src/itemdocumentdata.cpp b/src/itemdocumentdata.cpp
index a28f93e..f9085b8 100644
--- a/src/itemdocumentdata.cpp
+++ b/src/itemdocumentdata.cpp
@@ -424,7 +424,7 @@ TQDomElement ItemDocumentData::itemDataToElement( TQDomDocument &doc, const Item
 	}
 	
 	if ( !itemData.parentId.isEmpty() )
-		node.setAttribute( "tqparent", itemData.parentId );
+		node.setAttribute( "parent", itemData.parentId );
 	
 	const TQStringMap::const_iterator stringEnd = itemData.dataString.end();
 	for ( TQStringMap::const_iterator it = itemData.dataString.begin(); it != stringEnd; ++it )
@@ -528,7 +528,7 @@ void ItemDocumentData::elementToItemData( TQDomElement element )
 	itemData.angleDegrees = element.attribute( "angle", "0" ).toInt();
 	itemData.flipped = element.attribute( "flip", "0" ).toInt();
 	itemData.orientation = element.attribute( "orientation", "-1" ).toInt();
-	itemData.parentId = element.attribute( "tqparent", TQString() );
+	itemData.parentId = element.attribute( "parent", TQString() );
 	
 	m_itemDataMap[id] = itemData;
 	
@@ -544,7 +544,7 @@ void ItemDocumentData::elementToItemData( TQDomElement element )
 			{
 				// We're reading in a file saved in the older format, with
 				// child items nestled, so we must specify that the new item
-				// has the currently parsed item as its tqparent.
+				// has the currently parsed item as its parent.
 				elementToItemData(childElement);
 				TQString childId = childElement.attribute( "id", TQString() );
 				if ( !childId.isNull() )
@@ -645,7 +645,7 @@ TQDomElement ItemDocumentData::connectorDataToElement( TQDomDocument &doc, const
 	{
 		node.setAttribute( "start-node-is-child", 1 );
 		node.setAttribute( "start-node-cid", connectorData.startNodeCId );
-		node.setAttribute( "start-node-tqparent", connectorData.startNodeParent );
+		node.setAttribute( "start-node-parent", connectorData.startNodeParent );
 	}
 	else
 	{
@@ -658,7 +658,7 @@ TQDomElement ItemDocumentData::connectorDataToElement( TQDomDocument &doc, const
 	{
 		node.setAttribute( "end-node-is-child", 1 );
 		node.setAttribute( "end-node-cid", connectorData.endNodeCId );
-		node.setAttribute( "end-node-tqparent", connectorData.endNodeParent );
+		node.setAttribute( "end-node-parent", connectorData.endNodeParent );
 	}
 	else
 	{
@@ -701,7 +701,7 @@ void ItemDocumentData::elementToConnectorData( TQDomElement element )
 	if ( connectorData.startNodeIsChild )
 	{
 		connectorData.startNodeCId = element.attribute( "start-node-cid", TQString() );
-		connectorData.startNodeParent = element.attribute( "start-node-tqparent", TQString() );
+		connectorData.startNodeParent = element.attribute( "start-node-parent", TQString() );
 	}
 	else
 		connectorData.startNodeId = element.attribute( "start-node-id", TQString() );
@@ -711,7 +711,7 @@ void ItemDocumentData::elementToConnectorData( TQDomElement element )
 	if ( connectorData.endNodeIsChild )
 	{
 		connectorData.endNodeCId = element.attribute( "end-node-cid", TQString() );
-		connectorData.endNodeParent = element.attribute( "end-node-tqparent", TQString() );
+		connectorData.endNodeParent = element.attribute( "end-node-parent", TQString() );
 	}
 	else
 		connectorData.endNodeId = element.attribute( "end-node-id", TQString() );
@@ -1037,7 +1037,7 @@ void ItemDocumentData::mergeWithDocument( ItemDocument *itemDocument, bool selec
 			{
 				CNItem *item = icnd->cnItemWithID( it.data().startNodeParent );
 				if (!item)
-					kdError() << k_funcinfo << "Unable to find node tqparent with id: "<<it.data().startNodeParent<<endl;
+					kdError() << k_funcinfo << "Unable to find node parent with id: "<<it.data().startNodeParent<<endl;
 				else
 					startNode = item->childNode( it.data().startNodeCId );
 			}
@@ -1048,7 +1048,7 @@ void ItemDocumentData::mergeWithDocument( ItemDocument *itemDocument, bool selec
 			{
 				CNItem *item = icnd->cnItemWithID( it.data().endNodeParent );
 				if (!item)
-					kdError() << k_funcinfo << "Unable to find node tqparent with id: "<<it.data().endNodeParent<<endl;
+					kdError() << k_funcinfo << "Unable to find node parent with id: "<<it.data().endNodeParent<<endl;
 				else
 					endNode = item->childNode( it.data().endNodeCId );
 			}