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

This reverts commit 5c194e6e7059ddcc96b0e0166ce6157c35fc183e.

2 files changed, 31 insertions, 31 deletions

diff --git a/twin-styles/icewm/icewm.cpp b/twin-styles/icewm/icewm.cpp
index c41c7a58..4b9a064b 100644
--- a/twin-styles/icewm/icewm.cpp
+++ b/twin-styles/icewm/icewm.cpp
@@ -772,7 +772,7 @@ IceWMButton::IceWMButton(IceWMClient *parent, const char *name, TQPixmap* (*p)[2
 	setBackgroundMode( TQWidget::NoBackground );
 	client = parent;
 	usePixmap( p );
-	setFixedSize( sizeHint() );
+	setFixedSize( tqsizeHint() );
 	setToggleButton( isToggle );
 }
 
@@ -785,7 +785,7 @@ void IceWMButton::setTipText(const TQString &tip) {
 }
 
 
-TQSize IceWMButton::sizeHint() const
+TQSize IceWMButton::tqsizeHint() const
 {
 	// Check for invalid data
 	if ( validPixmaps( (TQPixmap**) (*pix) ) )  // Cast to avoid dumb warning
@@ -802,7 +802,7 @@ void IceWMButton::usePixmap( TQPixmap* (*p)[2] )
 	if (validPixmaps( *p )) {
 		pix = p;
 		setFixedSize( (*pix)[Active]->width(), titleBarHeight );
-		repaint( false );
+		tqrepaint( false );
 	} else
 		pix = NULL;
 }
@@ -892,7 +892,7 @@ void IceWMClient::init()
 	// No flicker thanks
 	widget()->setBackgroundMode( NoBackground );
 
-	// Pack the windowWrapper() window within a grid layout
+	// Pack the windowWrapper() window within a grid tqlayout
 	grid = new TQGridLayout(widget(), 0, 0, 0);
 	grid->setResizeMode(TQLayout::FreeResize);
 	grid->addRowSpacing(0, borderSizeY);	// Top grab bar
@@ -956,7 +956,7 @@ void IceWMClient::init()
 }
 
 
-// Adds the buttons to the hbox layout as per the buttons specified
+// Adds the buttons to the hbox tqlayout as per the buttons specified
 // in the button string 's'
 void IceWMClient::addClientButtons( const TQString& s )
 {
@@ -1057,7 +1057,7 @@ void IceWMClient::addClientButtons( const TQString& s )
 }
 
 
-// Adds a pixmap to the titlebar layout via the use of a nice TQSpacerItem
+// Adds a pixmap to the titlebar tqlayout via the use of a nice TQSpacerItem
 TQSpacerItem* IceWMClient::addPixmapSpacer( TQPixmap* p[], TQSizePolicy::SizeType s, int hsize )
 {
 	TQSpacerItem* sp;
@@ -1157,9 +1157,9 @@ void IceWMClient::resize( const TQSize& s )
 }
 
 
-TQSize IceWMClient::minimumSize() const
+TQSize IceWMClient::tqminimumSize() const
 {
-	return widget()->minimumSize();
+	return widget()->tqminimumSize();
 }
 
 
@@ -1186,9 +1186,9 @@ void IceWMClient::resizeEvent( TQResizeEvent* e )
 		if ( dx )
 		{
 			widget()->update( width() - dx + 1, 0, dx, height() );
-			widget()->update( TQRect( TQPoint(4,4), titlebar->geometry().bottomLeft() - TQPoint(1,0) ) );
-			widget()->update( TQRect( titlebar->geometry().topRight(), TQPoint( width() - 4, titlebar->geometry().bottom() ) ) );
-			widget()->repaint(titlebar->geometry(), false);
+			widget()->update( TQRect( TQPoint(4,4), titlebar->tqgeometry().bottomLeft() - TQPoint(1,0) ) );
+			widget()->update( TQRect( titlebar->tqgeometry().topRight(), TQPoint( width() - 4, titlebar->tqgeometry().bottom() ) ) );
+			widget()->tqrepaint(titlebar->tqgeometry(), false);
 		}
 	}
 }
@@ -1377,46 +1377,46 @@ void IceWMClient::paintEvent( TQPaintEvent* )
 		TQPainter p2( titleBuffer, this );
 		titleBuffer->fill( act ? *colorActiveTitleBar : *colorInActiveTitleBar );
 
-		r = titleSpacerJ->geometry();
+		r = titleSpacerJ->tqgeometry();
 		if (!r.isEmpty() && titleJ[ act ])
 			p2.drawPixmap( r.x()-borderSizeX, 0, *titleJ[ act ]);
 
-		r = titleSpacerL->geometry();
+		r = titleSpacerL->tqgeometry();
 		if (!r.isEmpty() && titleL[ act ])
 			p2.drawPixmap( r.x()-borderSizeX, 0, *titleL[ act ]);
 
-		r = titleSpacerS->geometry();
+		r = titleSpacerS->tqgeometry();
 		if (!r.isEmpty() && titleS[ act ])
 			p2.drawTiledPixmap( r.x()-borderSizeX, 0, r.width(), titleBarHeight, *titleS[ act ]);
 
-		r = titleSpacerP->geometry();
+		r = titleSpacerP->tqgeometry();
 		if (!r.isEmpty() && titleP[ act ])
 			p2.drawPixmap( r.x()-borderSizeX, 0, *titleP[ act ]);
 
-		r = titlebar->geometry();
+		r = titlebar->tqgeometry();
 		if (!r.isEmpty() && titleT[ act ] )
 			p2.drawTiledPixmap( r.x()-borderSizeX, 0, r.width(), titleBarHeight, *titleT[ act ]);
 
-		r = titleSpacerM->geometry();
+		r = titleSpacerM->tqgeometry();
 		if (!r.isEmpty() && titleM[ act ])
 			p2.drawPixmap( r.x()-borderSizeX, 0, *titleM[ act ], 0, 0, r.width(), r.height());
 
-		r = titleSpacerB->geometry();
+		r = titleSpacerB->tqgeometry();
 		if (!r.isEmpty() && titleB[ act ])
 			p2.drawTiledPixmap( r.x()-borderSizeX, 0, r.width(), titleBarHeight, *titleB[ act ]);
 
-		r = titleSpacerR->geometry();
+		r = titleSpacerR->tqgeometry();
 		if (!r.isEmpty() && titleR[ act ])
 			p2.drawPixmap( r.x()-borderSizeX, 0, *titleR[ act ], 0, 0, r.width(), r.height());
 
-		r = titleSpacerQ->geometry();
+		r = titleSpacerQ->tqgeometry();
 		if (!r.isEmpty() && titleQ[ act ])
 			p2.drawPixmap( r.x()-borderSizeX, 0, *titleQ[ act ], 0, 0, r.width(), r.height());
 
 		p2.setFont( options()->font(true) );
 
 		// Pre-compute as much as possible
-		r = titlebar->geometry();
+		r = titlebar->tqgeometry();
 		rx = r.x() - borderSizeX;
 		rw = width()-(2*borderSizeX)-r.x();
 
@@ -1432,7 +1432,7 @@ void IceWMClient::paintEvent( TQPaintEvent* )
 		p2.drawText(rx, 0, rw, titleBarHeight, AlignLeft|AlignVCenter, caption());
 		p2.end();
 
-		bitBlt( widget(), borderSizeX, hb->geometry().y(), titleBuffer );
+		bitBlt( widget(), borderSizeX, hb->tqgeometry().y(), titleBuffer );
 
 		delete titleBuffer;
 	}
@@ -1486,7 +1486,7 @@ void IceWMClient::iconChange()
 			renderMenuIcons();
 			button[BtnSysMenu]->usePixmap( &menuButtonWithIconPix );
 			if (button[BtnSysMenu]->isVisible())
-				button[BtnSysMenu]->repaint(false);
+				button[BtnSysMenu]->tqrepaint(false);
 		}
 	}
 }
@@ -1497,13 +1497,13 @@ void IceWMClient::desktopChange()
 	if (button[BtnDepth])
 	{
 		button[BtnDepth]->turnOn( isOnAllDesktops() );
-		button[BtnDepth]->repaint(false);
+		button[BtnDepth]->tqrepaint(false);
 		button[BtnDepth]->setTipText(isOnAllDesktops() ? i18n("Not on all desktops") : i18n("On all desktops"));
 	}
 }
 
 
-// Please don't modify the following unless you want layout problems
+// Please don't modify the following unless you want tqlayout problems
 void IceWMClient::captionChange()
 {
 	TQRect r( 0, borderSizeY, geometry().width(), titleBarHeight);
@@ -1512,7 +1512,7 @@ void IceWMClient::captionChange()
 						  TQSizePolicy::Preferred, TQSizePolicy::Fixed );
 	titlebar->invalidate();
     grid->activate();
-    widget()->repaint( r, false );
+    widget()->tqrepaint( r, false );
 }
 
 
@@ -1541,12 +1541,12 @@ void IceWMClient::shadeChange()
 
 void IceWMClient::activeChange()
 {
-	widget()->repaint(false);
+	widget()->tqrepaint(false);
 
     // Reset the button pixmaps.
 	for(int i= IceWMClient::BtnSysMenu; i < IceWMClient::BtnCount; i++)
 		if(button[i])
-			button[i]->repaint( false );
+			button[i]->tqrepaint( false );
 }
 
 
diff --git a/twin-styles/icewm/icewm.h b/twin-styles/icewm/icewm.h
index bab6e919..f343912c 100644
--- a/twin-styles/icewm/icewm.h
+++ b/twin-styles/icewm/icewm.h
@@ -43,7 +43,7 @@
 #define __KDEGALLIUM_ICEWM_H
 
 #include <tqbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <kpixmap.h>
 #include <kdecoration.h>
 #include <kdecorationfactory.h>
@@ -104,7 +104,7 @@ class IceWMButton : public TQButton
 					 const TQString& tip=NULL, const int realizeBtns = Qt::LeftButton );
 		void setTipText(const TQString &tip);
 		void  usePixmap( TQPixmap* (*p)[2] );
-		TQSize sizeHint() const;
+		TQSize tqsizeHint() const;
 		void  turnOn( bool isOn );
 		ButtonState   last_button;
 
@@ -150,7 +150,7 @@ class IceWMClient : public KDecoration
 		void iconChange();
 		virtual void desktopChange( );
 		virtual void borders(int&, int&, int&, int&) const;
-		virtual TQSize minimumSize() const;
+		virtual TQSize tqminimumSize() const;
 
 	protected slots:
 	    void slotMaximize();