4 files changed, 6 insertions, 6 deletions
diff --git a/src/electronics/ecnode.cpp b/src/electronics/ecnode.cpp
index b4079e8..385b98e 100644
--- a/src/electronics/ecnode.cpp
+++ b/src/electronics/ecnode.cpp
@@ -132,11 +132,11 @@ void ECNode::setNodeChanged()
 }
 
 
-void ECNode::setParentItem( CNItem * tqparentItem )
+void ECNode::setParentItem( CNItem * parentItem )
 {
-	Node::setParentItem(tqparentItem);
+	Node::setParentItem(parentItem);
 	
-	if ( Component * component = dynamic_cast<Component*>(tqparentItem) )
+	if ( Component * component = dynamic_cast<Component*>(parentItem) )
 	{
 		connect( component, TQT_SIGNAL(elementDestroyed(Element* )), this, TQT_SLOT(removeElement(Element* )) );
 		connect( component, TQT_SIGNAL(switchDestroyed( Switch* )), this, TQT_SLOT(removeSwitch( Switch* )) );
diff --git a/src/electronics/ecnode.h b/src/electronics/ecnode.h
index 24d34e4..b75e945 100644
--- a/src/electronics/ecnode.h
+++ b/src/electronics/ecnode.h
@@ -37,7 +37,7 @@ class ECNode : public Node
 		ECNode( ICNDocument *icnDocument, Node::node_type type, node_dir dir, const TQPoint &pos, TQString *id = 0L );
 		~ECNode();
 	
-		virtual void setParentItem( CNItem *tqparentItem );
+		virtual void setParentItem( CNItem *parentItem );
 		virtual void drawShape( TQPainter &p );
 		/**
 		 * Set the number of pins "contained" in this node.
diff --git a/src/electronics/pin.h b/src/electronics/pin.h
index 95aad7c..77a9e80 100644
--- a/src/electronics/pin.h
+++ b/src/electronics/pin.h
@@ -56,7 +56,7 @@ class Pin : public TQObject
 		Pin( ECNode * tqparent );
 		~Pin();
 		
-		ECNode * tqparentECNode() const { return m_pECNode; }
+		ECNode * parentECNode() const { return m_pECNode; }
 		/**
 		 * This function returns the pins that are directly connected to this pins:
 		 * either at the ends of connected wires, or via switches.
diff --git a/src/electronics/simulation/circuit.h b/src/electronics/simulation/circuit.h
index c8c53cd..82c1f34 100644
--- a/src/electronics/simulation/circuit.h
+++ b/src/electronics/simulation/circuit.h
@@ -70,7 +70,7 @@ class Circuit
 		 */
 		void initCache();
 		/**
-		 * Marks all cached results as tqinvalidated and removes them.
+		 * Marks all cached results as invalidated and removes them.
 		 */
 		void setCacheInvalidated();
 		/**