Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit f61f056943a68ecc5fa7e7789a7b9c82901a9157.

8 files changed, 17 insertions, 17 deletions

diff --git a/src/kbfxbutton.cpp b/src/kbfxbutton.cpp
index d4903d7..a3a0f87 100644
--- a/src/kbfxbutton.cpp
+++ b/src/kbfxbutton.cpp
@@ -93,7 +93,7 @@ void KbfxButton::loadSkins()
 	m_pressed_skin = TQPixmap ( _tmpPressed );
 	m_current_skin = m_normal_skin;
 	this->resize ( m_current_skin.width(),m_current_skin.height() );
-	this->repaint();
+	this->tqrepaint();
 }
 
 TQCString KbfxButton::findPanel()
@@ -344,7 +344,7 @@ void KbfxButton::paintEvent ( TQPaintEvent * pe )
 		m_buffer->resize ( r.size() );
 		m_buffer->fill ( this, r.topLeft() );
 
-		p.begin ( m_buffer,this );
+		p.tqbegin ( m_buffer,this );
 		p.translate ( -r.x(), -r.y() );
 		p.drawPixmap ( r,m_current_skin );
 		p.end ();
diff --git a/src/kbfxplasmacanvasview.cpp b/src/kbfxplasmacanvasview.cpp
index 10dde65..57b3106 100644
--- a/src/kbfxplasmacanvasview.cpp
+++ b/src/kbfxplasmacanvasview.cpp
@@ -331,7 +331,7 @@ KbfxPlasmaCanvasView::setKbfxCanvas ( TQCanvas * cnv )
 		TQImage img = pixmap->convertToImage();
 		img = img.smoothScale ( this->width(),pixmap->height(),TQ_ScaleFree );
 		pixmap->convertFromImage ( img );
-		this->canvas ()->setBackgroundPixmap ( *pixmap );
+		this->canvas ()->tqsetBackgroundPixmap ( *pixmap );
 	}
 }
 
@@ -393,7 +393,7 @@ KbfxPlasmaCanvasView::handleLoadRequest ( KbfxSignal signal )
 		else
 			canvas ()->resize ( v_stack->width (), this->visibleHeight () );
 		canvas()->update();
-		repaint();
+		tqrepaint();
 	//	return;
 	}
 	else
@@ -410,7 +410,7 @@ KbfxPlasmaCanvasView::handleLoadRequest ( KbfxSignal signal )
 			canvas ()->resize ( m_appletMap[signal.name () ]->width (),
 			                    this->visibleHeight () );
 		canvas()->update();
-		repaint();
+		tqrepaint();
 	}
 
 }
@@ -465,7 +465,7 @@ KbfxPlasmaCanvasView::search_R ( const TQString name )
 		TQImage img = pixmap->convertToImage();
 		img = img.smoothScale ( this->width(),pixmap->height(),TQ_ScaleFree );
 		pixmap->convertFromImage ( img );
-		this->canvas ()->setBackgroundPixmap ( *pixmap );
+		this->canvas ()->tqsetBackgroundPixmap ( *pixmap );
 	}
 
 	this->setCursor ( TQCursor ( TQt::BusyCursor ) );
diff --git a/src/kbfxplasmaindexview.cpp b/src/kbfxplasmaindexview.cpp
index becf108..d7f8d12 100644
--- a/src/kbfxplasmaindexview.cpp
+++ b/src/kbfxplasmaindexview.cpp
@@ -262,7 +262,7 @@ KbfxPlasmaIndexView::setKbfxCanvas ( TQCanvas * cnv )
 {
 	setCanvas ( cnv );
 
-	canvas ()->setBackgroundPixmap ( ( *KbfxPlasmaPixmapProvider::pixmap ( "listboxbg" )) );
+	canvas ()->tqsetBackgroundPixmap ( ( *KbfxPlasmaPixmapProvider::pixmap ( "listboxbg" )) );
 
 	canvas ()->update ();
 }
diff --git a/src/kbfxspinx.cpp b/src/kbfxspinx.cpp
index e69a980..4510f38 100644
--- a/src/kbfxspinx.cpp
+++ b/src/kbfxspinx.cpp
@@ -55,7 +55,7 @@ void KbfxSpinx::createKbfx()
 	if ( ConfigInit ().m_KbfxMenuType == "kmenu" )
 	{
 		kbfxBtn->show();
-		kbfxBtn->repaint();
+		kbfxBtn->tqrepaint();
 	}
 	else
 	{
@@ -128,7 +128,7 @@ void KbfxSpinx::createRMenu()
 	m_menuWidget = new KbfxSpinxMenuWidget ( m_menu,"KbfxSpinxMenu" );
 	m_menu->addItem ( m_menuWidget,0 );
 	kbfxBtn->show();
-	kbfxBtn->repaint();
+	kbfxBtn->tqrepaint();
 	menuPosition();
 }
 
@@ -201,7 +201,7 @@ void KbfxSpinx::showKmenu()
 		}
 		else
 		{
-			TQCursor::setPos ( this->mapToGlobal ( this->geometry ().bottomLeft () ) );
+			TQCursor::setPos ( this->mapToGlobal ( this->tqgeometry ().bottomLeft () ) );
 		}
 	}
 	else
@@ -212,7 +212,7 @@ void KbfxSpinx::showKmenu()
 		}
 		else
 		{
-			TQCursor::setPos ( this->mapToGlobal ( this->geometry ().topRight () ) );
+			TQCursor::setPos ( this->mapToGlobal ( this->tqgeometry ().topRight () ) );
 		}
 	}
 
diff --git a/src/kbfxspinxmenu.h b/src/kbfxspinxmenu.h
index 6029b23..93dcada 100644
--- a/src/kbfxspinxmenu.h
+++ b/src/kbfxspinxmenu.h
@@ -29,7 +29,7 @@
 #include <tqhbox.h>
 #include <tqimage.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqpixmap.h>
 #include <tqstringlist.h>
diff --git a/src/kbfxspinxtoolbutton.cpp b/src/kbfxspinxtoolbutton.cpp
index 37fcf53..9f90102 100644
--- a/src/kbfxspinxtoolbutton.cpp
+++ b/src/kbfxspinxtoolbutton.cpp
@@ -92,7 +92,7 @@ KbfxSpinxToolButton::setPixmaps ( TQPixmap normal, TQPixmap hover )
 	m_current = m_normal;
 
 	resize ( m_current.size () );
-	this->repaint();
+	this->tqrepaint();
 	this->update();
 }
 
diff --git a/src/kbfxspinxtop.cpp b/src/kbfxspinxtop.cpp
index 03e0234..d2a651a 100644
--- a/src/kbfxspinxtop.cpp
+++ b/src/kbfxspinxtop.cpp
@@ -94,7 +94,7 @@ KbfxSpinxTop::paintEvent ( TQPaintEvent * pe )
 	m_pixmapbuff->fill ( this, r->topLeft() );
 
 	TQPainter p;
-	p.begin ( m_pixmapbuff,this );
+	p.tqbegin ( m_pixmapbuff,this );
 // Draw commands are here
 	p.drawPixmap ( *r,m_background );
 	p.setPen ( TQColor ( ConfigInit().m_userNameColor ) );
diff --git a/src/kbfxtooltip.cpp b/src/kbfxtooltip.cpp
index 20c1d9d..d09c927 100644
--- a/src/kbfxtooltip.cpp
+++ b/src/kbfxtooltip.cpp
@@ -118,7 +118,7 @@ KbfxToolTip::setAnimationImage ( TQString path )
 	_agent->setBackgroundPixmap ( agent_mask );
 	if ( agent_mask.mask () )
 		_agent->setMask ( *agent_mask.mask () );
-	_agent->repaint ();
+	_agent->tqrepaint ();
 
 	/*FIXME:Need to remove Hard Coded Values */
 	_agent->move ( 200, 0 );
@@ -181,7 +181,7 @@ KbfxToolTip::logoMove ()
 	if ( _logo_move_x < _bg.width () - 68 )
 	{
 		_logo_move_x += 1;
-		_window->repaint ();
+		_window->tqrepaint ();
 
 		p.begin ( _window );
 		p.drawPixmap ( TQRect ( _logo_move_x, 0, logo.width (), logo.height () ),
@@ -200,7 +200,7 @@ KbfxToolTip::logoMove ()
 	_agent->setBackgroundPixmap ( agent_mask );
 	if ( agent_mask.mask () )
 		_agent->setMask ( *agent_mask.mask () );
-	_agent->repaint ();
+	_agent->tqrepaint ();
 }
 
 void