1 files changed, 20 insertions, 19 deletions

diff --git a/src/circuitdocument.h b/src/circuitdocument.h
index 581438b..76db48c 100644
--- a/src/circuitdocument.h
+++ b/src/circuitdocument.h
@@ -21,31 +21,31 @@ class Element;
 class ICNDocument;
 class KTechlab;
 class Pin;
-class QTimer;
+class TQTimer;
 class Switch;
 class Wire;
 
 class KActionMenu;
 
-typedef QValueList<Circuit*> CircuitList;
-typedef QValueList<Component*> ComponentList;
-typedef QValueList<QGuardedPtr<Connector> > ConnectorList;
-typedef QValueList<ECNode*> ECNodeList;
-typedef QValueList<Element*> ElementList;
-typedef QValueList<QGuardedPtr<Pin> > PinList;
-typedef QValueList<Switch*> SwitchList;
-typedef QValueList<QGuardedPtr<Wire> > WireList;
+typedef TQValueList<Circuit*> CircuitList;
+typedef TQValueList<Component*> ComponentList;
+typedef TQValueList<TQGuardedPtr<Connector> > ConnectorList;
+typedef TQValueList<ECNode*> ECNodeList;
+typedef TQValueList<Element*> ElementList;
+typedef TQValueList<TQGuardedPtr<Pin> > PinList;
+typedef TQValueList<Switch*> SwitchList;
+typedef TQValueList<TQGuardedPtr<Wire> > WireList;
 
 class Circuitoid
 {
 public:
-	bool contains( Pin *node ) { return pinList.contains(node); }
-	bool contains( Wire *con ) { return wireList.contains(con); }
-	bool contains( Element *ele ) { return elementList.contains(ele); }
+	bool tqcontains( Pin *node ) { return pinList.tqcontains(node); }
+	bool tqcontains( Wire *con ) { return wireList.tqcontains(con); }
+	bool tqcontains( Element *ele ) { return elementList.tqcontains(ele); }
 	
-	void addPin( Pin *node ) { if (node && !contains(node)) pinList += node; }
-	void addWire( Wire *con ) { if (con && !contains(con)) wireList += con; }
-	void addElement( Element *ele ) { if (ele && !contains(ele)) elementList += ele; }
+	void addPin( Pin *node ) { if (node && !tqcontains(node)) pinList += node; }
+	void addWire( Wire *con ) { if (con && !tqcontains(con)) wireList += con; }
+	void addElement( Element *ele ) { if (ele && !tqcontains(ele)) elementList += ele; }
 
 	WireList wireList;
 	PinList pinList;
@@ -62,8 +62,9 @@ information from those simulations back on the ICNDocument
 class CircuitDocument : public ICNDocument
 {
 	Q_OBJECT
+  TQ_OBJECT
 	public:
-		CircuitDocument( const QString &caption, KTechlab *ktechlab, const char *name = 0L );
+		CircuitDocument( const TQString &caption, KTechlab *ktechlab, const char *name = 0L );
 		~CircuitDocument();
 	
 		virtual View *createView( ViewContainer *viewContainer, uint viewAreaId, const char *name = 0l );
@@ -103,9 +104,9 @@ class CircuitDocument : public ICNDocument
 	
 	protected:
 		virtual void itemAdded( Item * item );
-		virtual void fillContextMenu( const QPoint &pos );
+		virtual void fillContextMenu( const TQPoint &pos );
 		virtual bool isValidItem( Item *item );
-		virtual bool isValidItem( const QString &itemId );
+		virtual bool isValidItem( const TQString &itemId );
 		
 		KActionMenu * m_pOrientationAction;
 	
@@ -144,7 +145,7 @@ class CircuitDocument : public ICNDocument
 		void recursivePinAdd( Pin * pin, Circuitoid *circuitoid, PinList * unassignedPins );
 		void deleteCircuits();
 	
-		QTimer *m_updateCircuitsTmr;
+		TQTimer *m_updateCircuitsTmr;
 		CircuitList m_circuitList;
 		ComponentList m_toSimulateList;
 		ComponentList m_componentList; // List is built up during call to assignCircuits