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, 9 insertions, 8 deletions

diff --git a/src/gui/oscilloscope.h b/src/gui/oscilloscope.h
index 79e0dbd..1d1503e 100644
--- a/src/gui/oscilloscope.h
+++ b/src/gui/oscilloscope.h
@@ -20,7 +20,7 @@
 #endif
 
 #include "simulator.h"
-#include <qmap.h>
+#include <tqmap.h>
 
 class FloatingProbeData;
 class LogicProbe;
@@ -30,12 +30,12 @@ class Oscilloscope;
 class Probe;
 class ProbeData;
 class VoltageProbe;
-class QTimer;
+class TQTimer;
 namespace KateMDI { class ToolView; }
 
-typedef QMap< int, ProbeData * > ProbeDataMap;
-typedef QMap< int, LogicProbeData * > LogicProbeDataMap;
-typedef QMap< int, FloatingProbeData * > FloatingProbeDataMap;
+typedef TQMap< int, ProbeData * > ProbeDataMap;
+typedef TQMap< int, LogicProbeData * > LogicProbeDataMap;
+typedef TQMap< int, FloatingProbeData * > FloatingProbeDataMap;
 
 typedef unsigned long long ullong;
 typedef long long llong;
@@ -76,9 +76,10 @@ void addOscilloscopeAsToolView( KTechlab *ktechlab );
 class Oscilloscope : public OscilloscopeWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 	public:
-		static Oscilloscope * self( KateMDI::ToolView * parent = 0l );
-		static QString toolViewIdentifier() { return "Oscilloscope"; }
+		static Oscilloscope * self( KateMDI::ToolView * tqparent = 0l );
+		static TQString toolViewIdentifier() { return "Oscilloscope"; }
 		virtual ~Oscilloscope();
 		
 		/**
@@ -176,7 +177,7 @@ class Oscilloscope : public OscilloscopeWidget
 		void updateScrollbars();
 		
 	private:
-		Oscilloscope( KateMDI::ToolView * parent );
+		Oscilloscope( KateMDI::ToolView * tqparent );
 		
 		static Oscilloscope * m_pSelf;
 		double m_zoomLevel;