TQt4 port ktechlab

This enables compilation under both Qt3 and Qt4


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

1 files changed, 23 insertions, 22 deletions

diff --git a/src/flowparts/flowpart.h b/src/flowparts/flowpart.h
index d689ebf..afa20c8 100644
--- a/src/flowparts/flowpart.h
+++ b/src/flowparts/flowpart.h
@@ -19,10 +19,10 @@ class FlowCode;
 class FlowCodeDocument;
 class FlowPart;
 class FPNode;
-class QPixmap;
-class QSize;
+class TQPixmap;
+class TQSize;
 
-typedef QValueList<FlowPart*> FlowPartList;
+typedef TQValueList<FlowPart*> FlowPartList;
 
 /**
 All flow parts (eg 'CallSub', 'Read from Port' ,etc) should inherit from this class.
@@ -34,6 +34,7 @@ that you should reinherit for generating the assembly code.
 class FlowPart : public CNItem
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
 	enum FlowSymbol
 	{
@@ -41,10 +42,10 @@ public:
 		ps_call, // Call - Rectangular box with double vertical lines at either end
 		ps_io, // I/O - Slanter rectangular box
 		ps_round, // Start/End - Rounded rectangular box
-		ps_decision, // Decision - Diamond shape
-		ps_other // Custom shape, which is ignored by FlowPart
+		ps_decision, // Decision - Diamond tqshape
+		ps_other // Custom tqshape, which is ignored by FlowPart
 	};
-	FlowPart( ICNDocument *icnDocument, bool newItem, const QString &id );
+	FlowPart( ICNDocument *icnDocument, bool newItem, const TQString &id );
 	virtual ~FlowPart();
 	
 	virtual void generateMicrobe( FlowCode */*code*/ ) = 0;
@@ -62,7 +63,7 @@ public:
 	/**
 	 * Sets the caption displayed in the flowpart, resizes the item as necessary
 	 */
-	virtual void setCaption( const QString &caption );
+	virtual void setCaption( const TQString &caption );
 	/**
 	 * Traces the FlowCode document route from the nodes with the given internal
 	 * ids, and returns the FlowPart to which:
@@ -73,7 +74,7 @@ public:
 	 * @param previousParts A list of parts in the calling tree. This avoids infinite recursion.
 	 * @returns The first FlowPart satisfying these conditions, or NULL if no such part exists
 	 */
-	FlowPart* endPart( QStringList ids, FlowPartList *previousParts = 0l );
+	FlowPart* endPart( TQStringList ids, FlowPartList *previousParts = 0l );
 	/**
 	 * Handles the addition of a if-else statement to the given FlowCode. This will
 	 * order the code as necessary, adding the branches in the appropriate places
@@ -84,18 +85,18 @@ public:
 	 * @param case1 The internal node id for case1
 	 * @param case2 The internal node id for case2
 	 */
-	void handleIfElse( FlowCode *code, const QString &case1Statement, const QString &case2Statement,
-					   const QString &case1, const QString &case2 );
+	void handleIfElse( FlowCode *code, const TQString &case1Statement, const TQString &case2Statement,
+					   const TQString &case1, const TQString &case2 );
 	/**
 	 * Returns a pointer to the FlowPart that is connected to the node with the
 	 * given internal id, or NULL if no such node / no connected part
 	 */
-	FlowPart* outputPart( const QString& internalNodeId );
+	FlowPart* outputPart( const TQString& internalNodeId );
 	/**
 	 * Returns the FlowParts connected to the given node
 	 * @see outputPart
 	 */
-	FlowPartList inputParts( const QString& id );
+	FlowPartList inputParts( const TQString& id );
 	/**
 	 * Returns a list of parts that are connected to *all* input parts
 	 */
@@ -109,8 +110,8 @@ public:
 	/**
 	 * Draw the picture of the flowpart in the given orientation onto the pixmap
 	 */
-	void orientationPixmap( uint orientation, QPixmap & pm ) const;
-	virtual Variant * createProperty( const QString & id, Variant::Type::Value type );
+	void orientationPixmap( uint orientation, TQPixmap & pm ) const;
+	virtual Variant * createProperty( const TQString & id, Variant::Type::Value type );
 	
 public slots:
 	/**
@@ -121,7 +122,7 @@ public slots:
 	/**
 	 * Called when a variable name has changed (from an entry box)
 	 */
-	void varNameChanged( QVariant newValue, QVariant oldValue );
+	void varNameChanged( TQVariant newValue, TQVariant oldValue );
 	/**
 	 * Called when some of the FlowPart-specific variables (e.g. Pin or
 	 * SevenSegment) requiring updating, such as when the PIC type changes
@@ -134,19 +135,19 @@ protected:
 	/**
 	 * Removes the node ids that shouldn't be used for finding the end part
 	 */
-	virtual void filterEndPartIDs( QStringList *ids ) { Q_UNUSED(ids); }
+	virtual void filterEndPartIDs( TQStringList *ids ) { Q_UNUSED(ids); }
 	/**
 	 * Normally just passes the paint request onto CNItem::drawShape,
 	 * although in the case of some FlowSymbols (e.g. decision), it will handle
 	 * the drawing itself
 	 */
-	virtual void drawShape( QPainter &p );
+	virtual void drawShape( TQPainter &p );
 	/**
 	 * Returns the goto instruction that will goto the FlowPart that is connected
 	 * to the node with the given internal id.
 	 * For example, gotoCode("stdOutput") might return "goto delay__13"
 	 */
-	QString gotoCode( const QString& internalNodeId );
+	TQString gotoCode( const TQString& internalNodeId );
 	/**
 	 * Creates a FPNode with an internal id of "stdinput".
 	 * The node is positioned half-way along the top of the FlowPart,
@@ -166,7 +167,7 @@ protected:
 	 */
 	void createAltOutput();
 	/**
-	 * Initialises a symbol, by calling setItemPoints with the shape
+	 * Initialises a symbol, by calling setItemPoints with the tqshape
 	 */
 	void initSymbol( FlowPart::FlowSymbol symbol, int width = 48 );
 	
@@ -176,12 +177,12 @@ protected:
 	void initRoundedRectSymbol() { initSymbol( FlowPart::ps_round ); }
 	void initDecisionSymbol() { initSymbol( FlowPart::ps_decision ); }
 
-	QString m_caption;
+	TQString m_caption;
 	uint m_orientation;
 	FPNode *m_stdInput;
 	FPNode *m_stdOutput;
 	FPNode *m_altOutput;
-	QGuardedPtr<FlowCodeDocument> m_pFlowCodeDocument;
+	TQGuardedPtr<FlowCodeDocument> m_pFlowCodeDocument;
 	
 	virtual void postResize();
 	void updateNodePositions();
@@ -189,7 +190,7 @@ protected:
 private:
 	FlowSymbol m_flowSymbol;
 };
-typedef QValueList<FlowPart*> FlowPartList;
+typedef TQValueList<FlowPart*> FlowPartList;
 
 #endif