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

diff --git a/src/gui/oscilloscope.cpp b/src/gui/oscilloscope.cpp
index e969f72..50d1346 100644
--- a/src/gui/oscilloscope.cpp
+++ b/src/gui/oscilloscope.cpp
@@ -24,42 +24,42 @@
 #include <kiconloader.h>
 #include <klocale.h> 
 #include <knuminput.h>
-#include <qbutton.h>
-#include <qlabel.h>
-#include <qscrollbar.h>
-#include <qslider.h>
-#include <qtimer.h>
-#include <qtoolbutton.h>
+#include <tqbutton.h>
+#include <tqlabel.h>
+#include <tqscrollbar.h>
+#include <tqslider.h>
+#include <tqtimer.h>
+#include <tqtoolbutton.h>
 
 #include <assert.h>
 
 //BEGIN Oscilloscope Class
-QColor probeColors[9] = {
-	QColor( 0x52, 0x22, 0x00 ),
-	QColor( 0xB5, 0x00, 0x2F ),
-	QColor( 0xF9, 0xBA, 0x07 ),
-	QColor( 0x53, 0x93, 0x16 ),
-	QColor( 0x00, 0x66, 0x2F ), 
-	QColor( 0x00, 0x41, 0x88 ),
-	QColor( 0x1B, 0x2D, 0x83 ),
-	QColor( 0x55, 0x12, 0x7B ),
-	QColor( 0x7B, 0x0C, 0x82 ) };
+TQColor probeColors[9] = {
+	TQColor( 0x52, 0x22, 0x00 ),
+	TQColor( 0xB5, 0x00, 0x2F ),
+	TQColor( 0xF9, 0xBA, 0x07 ),
+	TQColor( 0x53, 0x93, 0x16 ),
+	TQColor( 0x00, 0x66, 0x2F ), 
+	TQColor( 0x00, 0x41, 0x88 ),
+	TQColor( 0x1B, 0x2D, 0x83 ),
+	TQColor( 0x55, 0x12, 0x7B ),
+	TQColor( 0x7B, 0x0C, 0x82 ) };
 
 Oscilloscope * Oscilloscope::m_pSelf = 0l;
 
-Oscilloscope * Oscilloscope::self( KateMDI::ToolView * parent )
+Oscilloscope * Oscilloscope::self( KateMDI::ToolView * tqparent )
 {
 	if ( !m_pSelf )
 	{
-		assert(parent);
-		m_pSelf = new Oscilloscope(parent);
+		assert(tqparent);
+		m_pSelf = new Oscilloscope(tqparent);
 	}
 	return m_pSelf;
 }
 
 
-Oscilloscope::Oscilloscope( KateMDI::ToolView * parent )
-	: OscilloscopeWidget(parent)
+Oscilloscope::Oscilloscope( KateMDI::ToolView * tqparent )
+	: OscilloscopeWidget(tqparent)
 {
 	m_nextColor = 0;
 	m_nextId = 1;
@@ -72,21 +72,21 @@ Oscilloscope::Oscilloscope( KateMDI::ToolView * parent )
 	horizontalScroll->setLineStep(32);
 	horizontalScroll->setPageStep( oscilloscopeView->width() );
 	
-	connect( resetBtn, SIGNAL(clicked()), this, SLOT(reset()) );
-	connect( zoomSlider, SIGNAL(valueChanged(int)), this, SLOT(slotZoomSliderChanged(int)) );
-	connect( horizontalScroll, SIGNAL(valueChanged(int )), this, SLOT(slotSliderValueChanged(int )) );
+	connect( resetBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(reset()) );
+	connect( zoomSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotZoomSliderChanged(int)) );
+	connect( horizontalScroll, TQT_SIGNAL(valueChanged(int )), this, TQT_SLOT(slotSliderValueChanged(int )) );
 	
-// 	connect( pauseBtn, SIGNAL(clicked()), this, SLOT(slotTogglePause()) );
+// 	connect( pauseBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotTogglePause()) );
 	
-	QTimer * updateScrollTmr = new QTimer(this);
-	connect( updateScrollTmr, SIGNAL(timeout()), this, SLOT(updateScrollbars()) );
+	TQTimer * updateScrollTmr = new TQTimer(this);
+	connect( updateScrollTmr, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateScrollbars()) );
 	updateScrollTmr->start(20);
 	
 	KGlobal::config()->setGroup("Oscilloscope");
 	setZoomLevel( KGlobal::config()->readDoubleNumEntry( "ZoomLevel", 0.5 ) );
 	
-	connect( this, SIGNAL(probeRegistered(int, ProbeData *)), probePositioner, SLOT(slotProbeDataRegistered(int, ProbeData *)) );
-	connect( this, SIGNAL(probeUnregistered(int )), probePositioner, SLOT(slotProbeDataUnregistered(int )) );
+	connect( this, TQT_SIGNAL(probeRegistered(int, ProbeData *)), probePositioner, TQT_SLOT(slotProbeDataRegistered(int, ProbeData *)) );
+	connect( this, TQT_SIGNAL(probeUnregistered(int )), probePositioner, TQT_SLOT(slotProbeDataUnregistered(int )) );
 }
 
 
@@ -189,7 +189,7 @@ ProbeData * Oscilloscope::registerProbe( Probe * probe )
 
 void Oscilloscope::unregisterProbe( int id )
 {
-	ProbeDataMap::iterator it = m_probeDataMap.find(id);
+	ProbeDataMap::iterator it = m_probeDataMap.tqfind(id);
 	
 	if ( it == m_probeDataMap.end() )
 		return;
@@ -211,7 +211,7 @@ void Oscilloscope::unregisterProbe( int id )
 
 ProbeData * Oscilloscope::probeData( int id ) const
 {
-	const ProbeDataMap::const_iterator bit = m_probeDataMap.find(id);
+	const ProbeDataMap::const_iterator bit = m_probeDataMap.tqfind(id);
 	if ( bit != m_probeDataMap.end() )
 		return bit.data();