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, 33 insertions, 31 deletions

diff --git a/src/itemview.h b/src/itemview.h
index 2bca8fd..e847ed0 100644
--- a/src/itemview.h
+++ b/src/itemview.h
@@ -13,12 +13,12 @@
 
 #include <view.h>
 
-#include <qcanvas.h>
-#include <qguardedptr.h>
+#include <tqcanvas.h>
+#include <tqguardedptr.h>
 
 class CVBEditor;
 class ItemDocument;
-class QTimer;
+class TQTimer;
 
 /**
 @author David Saxton
@@ -26,6 +26,7 @@ class QTimer;
 class ItemView : public View
 {
 	Q_OBJECT
+  TQ_OBJECT
 	public:
 		ItemView( ItemDocument *itemDocument, ViewContainer *viewContainer, uint viewAreaId, const char *name = 0 );
 		~ItemView();
@@ -42,39 +43,39 @@ class ItemView : public View
 		void actualSize();
 		void zoomIn();
 		void zoomOut();
-		void scrollToMouse( const QPoint &pos );
-		virtual void updateStatus();
+		void scrollToMouse( const TQPoint &pos );
+		virtual void updatetqStatus();
 
 	protected slots:
 		/**
 		 * Called when the user changes the configuration.
 		 */
 		virtual void slotUpdateConfiguration();
-		void startUpdatingStatus();
-		void stopUpdatingStatus();
+		void startUpdatingtqStatus();
+		void stopUpdatingtqStatus();
 
 	protected:
 		void updateZoomActions();
 		/**
 		 * Attempts to create a new CNItem if one was dragged onto the canvas
 		 */
-		void dropEvent( QDropEvent* );
+		void dropEvent( TQDropEvent* );
 		/**
 		 * Reinherit to allow different types of items to be dragged in.
 		 */
-		virtual void dragEnterEvent( QDragEnterEvent* );
-		void contentsMousePressEvent( QMouseEvent *e );
-		void contentsMouseReleaseEvent( QMouseEvent *e );
-		void contentsMouseDoubleClickEvent( QMouseEvent *e );
-		void contentsMouseMoveEvent( QMouseEvent *e );
-		void contentsWheelEvent( QWheelEvent *e );
-		void enterEvent( QEvent * e );
-		void leaveEvent( QEvent * e );
-
-		QGuardedPtr<ItemDocument> p_itemDocument;
+		virtual void dragEnterEvent( TQDragEnterEvent* );
+		void contentsMousePressEvent( TQMouseEvent *e );
+		void contentsMouseReleaseEvent( TQMouseEvent *e );
+		void contentsMouseDoubleClickEvent( TQMouseEvent *e );
+		void contentsMouseMoveEvent( TQMouseEvent *e );
+		void contentsWheelEvent( TQWheelEvent *e );
+		void enterEvent( TQEvent * e );
+		void leaveEvent( TQEvent * e );
+
+		TQGuardedPtr<ItemDocument> p_itemDocument;
 		CVBEditor *m_CVBEditor;
 		double m_zoomLevel;
-		QTimer * m_pUpdateStatusTmr;
+		TQTimer * m_pUpdateStatusTmr;
 	
 		friend class CVBEditor;
 };
@@ -83,26 +84,27 @@ class ItemView : public View
 /**
 @author David Saxton
 */
-class CVBEditor : public QCanvasView
+class CVBEditor : public TQCanvasView
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    CVBEditor( QCanvas *canvas, ItemView *itemView, const char *name );
+    CVBEditor( TQCanvas *canvas, ItemView *itemView, const char *name );
 	
 	void setPassEventsToView( bool pass ) { b_passEventsToView = pass; }
 
-	virtual void contentsMousePressEvent( QMouseEvent* e );
-	virtual void contentsMouseReleaseEvent( QMouseEvent* e );
-	virtual void contentsMouseDoubleClickEvent( QMouseEvent* e );
-	virtual void contentsMouseMoveEvent( QMouseEvent* e );
-	virtual void dragEnterEvent( QDragEnterEvent* e );
-	virtual void dropEvent( QDropEvent* e );
-	virtual void contentsWheelEvent( QWheelEvent *e );
-	virtual void enterEvent( QEvent * e );
-	virtual void leaveEvent( QEvent * e );
+	virtual void contentsMousePressEvent( TQMouseEvent* e );
+	virtual void contentsMouseReleaseEvent( TQMouseEvent* e );
+	virtual void contentsMouseDoubleClickEvent( TQMouseEvent* e );
+	virtual void contentsMouseMoveEvent( TQMouseEvent* e );
+	virtual void dragEnterEvent( TQDragEnterEvent* e );
+	virtual void dropEvent( TQDropEvent* e );
+	virtual void contentsWheelEvent( TQWheelEvent *e );
+	virtual void enterEvent( TQEvent * e );
+	virtual void leaveEvent( TQEvent * e );
 
 protected:
-	virtual void viewportResizeEvent( QResizeEvent * );
+	virtual void viewportResizeEvent( TQResizeEvent * );
 	ItemView *p_itemView;
 	bool b_passEventsToView;
 	bool b_ignoreEvents;