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

diff --git a/src/ciwidgetmgr.cpp b/src/ciwidgetmgr.cpp
index 6e32423..e12caac 100644
--- a/src/ciwidgetmgr.cpp
+++ b/src/ciwidgetmgr.cpp
@@ -14,7 +14,7 @@
 
 #include <kdebug.h>
 
-CIWidgetMgr::CIWidgetMgr( QCanvas *canvas, CNItem *item )
+CIWidgetMgr::CIWidgetMgr( TQCanvas *canvas, CNItem *item )
 {
 	p_cnItem = item;
 	p_canvas = canvas;
@@ -23,9 +23,9 @@ CIWidgetMgr::CIWidgetMgr( QCanvas *canvas, CNItem *item )
 
 CIWidgetMgr::~CIWidgetMgr()
 {
-	// QCanvas deletes our items for us. Actually, it pretty much insists on deleting them,
+	// TQCanvas deletes our items for us. Actually, it pretty much insists on deleting them,
 	// despite me telling it not to, so if I delete them then it gets confused and crashes.
-	// Naughty QCanvas!
+	// Naughty TQCanvas!
 	const WidgetMap::iterator widgetMapEnd = m_widgetMap.end();
 	for ( WidgetMap::iterator it = m_widgetMap.begin(); it != widgetMapEnd; ++it )
 	{
@@ -35,7 +35,7 @@ CIWidgetMgr::~CIWidgetMgr()
 }
 
 
-void CIWidgetMgr::setWidgetsPos( const QPoint &pos )
+void CIWidgetMgr::setWidgetsPos( const TQPoint &pos )
 {
 	m_pos = pos;
 }
@@ -51,28 +51,28 @@ void CIWidgetMgr::setDrawWidgets( bool draw )
 }
 
 
-Widget *CIWidgetMgr::widgetWithID( const QString &id ) const
+Widget *CIWidgetMgr::widgetWithID( const TQString &id ) const
 {
-	WidgetMap::const_iterator it = m_widgetMap.find(id);
+	WidgetMap::const_iterator it = m_widgetMap.tqfind(id);
 	if ( it == m_widgetMap.end() )
 		return 0l;
 	else return it.data();
 }
 
 
-Button *CIWidgetMgr::button( const QString &id ) const
+Button *CIWidgetMgr::button( const TQString &id ) const
 {
 	return dynamic_cast<Button*>(widgetWithID(id));
 }
 
-Slider *CIWidgetMgr::slider( const QString &id ) const
+Slider *CIWidgetMgr::slider( const TQString &id ) const
 {
 	return dynamic_cast<Slider*>(widgetWithID(id));
 }
 
 
 
-void CIWidgetMgr::setButtonState( const QString &id, int state )
+void CIWidgetMgr::setButtonState( const TQString &id, int state )
 {
 	Button *b = button(id);
 	if (!b)
@@ -88,7 +88,7 @@ void CIWidgetMgr::setButtonState( const QString &id, int state )
 }
 
 
-void CIWidgetMgr::drawWidgets( QPainter &p )
+void CIWidgetMgr::drawWidgets( TQPainter &p )
 {
 	const WidgetMap::iterator widgetMapEnd = m_widgetMap.end();
 	for ( WidgetMap::iterator it = m_widgetMap.begin(); it != widgetMapEnd; ++it )
@@ -98,9 +98,9 @@ void CIWidgetMgr::drawWidgets( QPainter &p )
 }
 
 
-void CIWidgetMgr::removeWidget( const QString & id )
+void CIWidgetMgr::removeWidget( const TQString & id )
 {
-	if ( !m_widgetMap.contains(id) )
+	if ( !m_widgetMap.tqcontains(id) )
 		return;
 	
 	delete m_widgetMap[id];
@@ -108,14 +108,14 @@ void CIWidgetMgr::removeWidget( const QString & id )
 }
 
 
-Button* CIWidgetMgr::addButton( const QString &id, const QRect & pos, const QString &display, bool toggle )
+Button* CIWidgetMgr::addButton( const TQString &id, const TQRect & pos, const TQString &display, bool toggle )
 {
 	WidgetMap::iterator it;
 	
 	Button *button = new Button( id, p_cnItem, toggle, pos, p_canvas );
-	(dynamic_cast<QButton*>(button->widget()))->setText(display);
+	(dynamic_cast<TQButton*>(button->widget()))->setText(display);
 	
-	it = m_widgetMap.find(id);
+	it = m_widgetMap.tqfind(id);
 	if ( it == m_widgetMap.end() )
 	{
 		m_widgetMap[id] = button;
@@ -132,14 +132,14 @@ Button* CIWidgetMgr::addButton( const QString &id, const QRect & pos, const QStr
 }
 
 
-Button* CIWidgetMgr::addButton( const QString &id, const QRect & pos, QPixmap pixmap, bool toggle )
+Button* CIWidgetMgr::addButton( const TQString &id, const TQRect & pos, TQPixmap pixmap, bool toggle )
 {
 	WidgetMap::iterator it;
 	
 	Button *button = new Button( id, p_cnItem, toggle, pos, p_canvas );
 	button->setPixmap(pixmap);
 	
-	it = m_widgetMap.find(id);
+	it = m_widgetMap.tqfind(id);
 	if ( it == m_widgetMap.end() )
 	{
 		m_widgetMap[id] = button;
@@ -156,10 +156,10 @@ Button* CIWidgetMgr::addButton( const QString &id, const QRect & pos, QPixmap pi
 }
 
 
-Slider* CIWidgetMgr::addSlider( const QString &id, int minValue, int maxValue, int pageStep, int value, Qt::Orientation orientation, const QRect & pos )
+Slider* CIWidgetMgr::addSlider( const TQString &id, int minValue, int maxValue, int pageStep, int value, Qt::Orientation orientation, const TQRect & pos )
 {
 	Slider *slider = new Slider( id, p_cnItem, pos, p_canvas );
-	QSlider *qslider = dynamic_cast<QSlider*>(slider->widget());
+	TQSlider *qslider = dynamic_cast<TQSlider*>(slider->widget());
 	
 	qslider->setMinValue(minValue);
 	qslider->setMaxValue(maxValue);
@@ -167,7 +167,7 @@ Slider* CIWidgetMgr::addSlider( const QString &id, int minValue, int maxValue, i
 	qslider->setValue(value);
 	slider->setOrientation(orientation);
 	
-	WidgetMap::iterator it = m_widgetMap.find(id);
+	WidgetMap::iterator it = m_widgetMap.tqfind(id);
 	if ( it == m_widgetMap.end() )
 	{
 		m_widgetMap[id] = slider;
@@ -186,12 +186,12 @@ Slider* CIWidgetMgr::addSlider( const QString &id, int minValue, int maxValue, i
 
 bool CIWidgetMgr::mousePressEvent( const EventInfo &info )
 {
-	QMouseEvent *e = info.mousePressEvent( 0, 0 );
+	TQMouseEvent *e = info.mousePressEvent( 0, 0 );
 	
 	const WidgetMap::iterator widgetMapEnd = m_widgetMap.end();
 	for ( WidgetMap::iterator it = m_widgetMap.begin(); it != widgetMapEnd; ++it )
 	{
-		if ( it.data()->rect().contains(info.pos) )
+		if ( it.data()->rect().tqcontains(info.pos) )
 		{
 			it.data()->mousePressEvent(e);
 			if (e->isAccepted())
@@ -208,7 +208,7 @@ bool CIWidgetMgr::mousePressEvent( const EventInfo &info )
 
 bool CIWidgetMgr::mouseReleaseEvent( const EventInfo &info )
 {
-	QMouseEvent *e = info.mouseReleaseEvent( 0, 0 );
+	TQMouseEvent *e = info.mouseReleaseEvent( 0, 0 );
 	
 	const WidgetMap::iterator widgetMapEnd = m_widgetMap.end();
 	for ( WidgetMap::iterator it = m_widgetMap.begin(); it != widgetMapEnd; ++it )
@@ -224,12 +224,12 @@ bool CIWidgetMgr::mouseReleaseEvent( const EventInfo &info )
 
 bool CIWidgetMgr::mouseDoubleClickEvent( const EventInfo &info )
 {
-	QMouseEvent *e = info.mouseDoubleClickEvent( 0, 0 );
+	TQMouseEvent *e = info.mouseDoubleClickEvent( 0, 0 );
 	
 	const WidgetMap::iterator widgetMapEnd = m_widgetMap.end();
 	for ( WidgetMap::iterator it = m_widgetMap.begin(); it != widgetMapEnd; ++it )
 	{
-		if ( it.data()->rect().contains(info.pos) )
+		if ( it.data()->rect().tqcontains(info.pos) )
 		{
 			it.data()->mouseDoubleClickEvent(e);
 			if (e->isAccepted())
@@ -246,7 +246,7 @@ bool CIWidgetMgr::mouseDoubleClickEvent( const EventInfo &info )
 
 bool CIWidgetMgr::mouseMoveEvent( const EventInfo &info )
 {
-	QMouseEvent *e = info.mouseMoveEvent( 0, 0 );
+	TQMouseEvent *e = info.mouseMoveEvent( 0, 0 );
 	
 	const WidgetMap::iterator widgetMapEnd = m_widgetMap.end();
 	for ( WidgetMap::iterator it = m_widgetMap.begin(); it != widgetMapEnd; ++it )
@@ -265,12 +265,12 @@ bool CIWidgetMgr::mouseMoveEvent( const EventInfo &info )
 
 bool CIWidgetMgr::wheelEvent( const EventInfo &info )
 {
-	QWheelEvent *e = info.wheelEvent( 0, 0 );
+	TQWheelEvent *e = info.wheelEvent( 0, 0 );
 	
 	const WidgetMap::iterator widgetMapEnd = m_widgetMap.end();
 	for ( WidgetMap::iterator it = m_widgetMap.begin(); it != widgetMapEnd; ++it )
 	{
-		if ( it.data()->rect().contains(info.pos) )
+		if ( it.data()->rect().tqcontains(info.pos) )
 		{
 			it.data()->wheelEvent(e);
 			if (e->isAccepted())