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

This reverts commit 83fbc82a101309e171089f0d5ed080f82a367345.

1 files changed, 13 insertions, 13 deletions

diff --git a/arts/gui/kde/kpopupbox_private.h b/arts/gui/kde/kpopupbox_private.h
index f702f4db..b9b38e7f 100644
--- a/arts/gui/kde/kpopupbox_private.h
+++ b/arts/gui/kde/kpopupbox_private.h
@@ -54,7 +54,7 @@ private:
 	TQBoxLayout *_layout;
 
 	TQFrame *_titlebar;
-	TQBoxLayout *_titlebarlayout;
+	TQBoxLayout *_titlebartqlayout;
 	HandleDrag *_drag;
 	ShowButton *_showbutton;
 	OwnButton *_ownbutton;
@@ -88,7 +88,7 @@ public:
 		TQPainter p( this );
 		TQStyle::SFlags flags = TQStyle::Style_Default;
 		if( width() < height() ) flags |= TQStyle::Style_Horizontal;
-		tqstyle().tqdrawPrimitive( TQStyle::PE_DockWindowHandle, &p, rect(), colorGroup(), flags );
+		tqstyle().tqdrawPrimitive( TQStyle::PE_DockWindowHandle, &p, rect(), tqcolorGroup(), flags );
 	}
 signals:
 	void clicked();
@@ -107,7 +107,7 @@ static const char* const inside_xpm[] = { "5 5 2 1", "# c black", ". c None", "#
 static const char* const own_xpm[]    = { "5 5 2 1", "# c black", ". c None", "###..", "#.###", "###.#", ".#..#", ".####"};
 
 #include <tqpushbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 class ShowButton : public TQPushButton {
    Q_OBJECT
@@ -151,17 +151,17 @@ public slots:
 		}
 	}
 public:
-	TQSize minimumSizeHint() const {
-		int wh = tqstyle().pixelMetric( TQStyle::PM_DockWindowHandleExtent, this );
+	TQSize tqminimumSizeHint() const {
+		int wh = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent, this );
 		return TQSize( wh, wh );
 	}
 	TQSizePolicy sizePolicy() const { return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); }
-	TQSize minimumSize() const { return minimumSizeHint(); }
-	TQSize sizeHint() const { return minimumSize(); }
+	TQSize tqminimumSize() const { return tqminimumSizeHint(); }
+	TQSize tqsizeHint() const { return tqminimumSize(); }
 
 	void drawButton(  TQPainter * p )
 	{
-		p->fillRect( 0,0, width(), height(), TQBrush( colorGroup().brush( TQColorGroup::Background ) ) );
+		p->fillRect( 0,0, width(), height(), TQBrush( tqcolorGroup().brush( TQColorGroup::Background ) ) );
 		p->drawPixmap( ( width() - pixmap()->width() ) / 2, ( height() - pixmap()->height() ) / 2, *pixmap() );
 	}
 };
@@ -187,17 +187,17 @@ public slots:
 			else setPixmap(  _pmown );
 	}
 public:
-	TQSize minimumSizeHint() const {
-		int wh = tqstyle().pixelMetric( TQStyle::PM_DockWindowHandleExtent, this );
+	TQSize tqminimumSizeHint() const {
+		int wh = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent, this );
 		return TQSize( wh, wh );
 	}
 	TQSizePolicy sizePolicy() const { return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); }
-	TQSize minimumSize() const { return minimumSizeHint(); }
-	TQSize sizeHint() const { return minimumSize(); }
+	TQSize tqminimumSize() const { return tqminimumSizeHint(); }
+	TQSize tqsizeHint() const { return tqminimumSize(); }
 
 	void drawButton( TQPainter * p )
 	{
-		p->fillRect( 0,0, width(), height(), TQBrush( colorGroup().brush( TQColorGroup::Background ) ) );
+		p->fillRect( 0,0, width(), height(), TQBrush( tqcolorGroup().brush( TQColorGroup::Background ) ) );
 		p->drawPixmap( ( width() - pixmap()->width() ) / 2, ( height() - pixmap()->height() ) / 2, *pixmap() );
 	}
 };