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

This reverts commit c2637a0da6d9a1c8626ca39f8451ab3b7cda487a.

1 files changed, 17 insertions, 17 deletions

diff --git a/kghostview/viewcontrol.cpp b/kghostview/viewcontrol.cpp
index a0ec7fba..8f1c8f0c 100644
--- a/kghostview/viewcontrol.cpp
+++ b/kghostview/viewcontrol.cpp
@@ -14,7 +14,7 @@
 #include <tqgroupbox.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 
 #include "viewcontrol.h"
@@ -36,7 +36,7 @@ ViewControl::ViewControl( TQWidget *parent, const char *name )
 	vcGroupBox = new TQGroupBox(  this );
 	vcGroupBox->setFrameStyle( TQFrame::NoFrame );
 	//vcGroupBox->setTitle( i18n("Force Changes To") );
-	//vcGroupBox->setAlignment( 1 );
+	//vcGroupBox->tqsetAlignment( 1 );
 
 	topLayout->addWidget( vcGroupBox, 10 );
 
@@ -51,7 +51,7 @@ ViewControl::ViewControl( TQWidget *parent, const char *name )
 
 
 	magComboBox = new TQComboBox( FALSE, vcGroupBox );
-	magComboBox->setFixedHeight( magComboBox->sizeHint().height() );
+	magComboBox->setFixedHeight( magComboBox->tqsizeHint().height() );
 
 
 	//magComboBox->hide();
@@ -63,7 +63,7 @@ ViewControl::ViewControl( TQWidget *parent, const char *name )
 
 
 	mediaComboBox = new TQComboBox( FALSE, vcGroupBox );
-	mediaComboBox->setFixedHeight( magComboBox->sizeHint().height() );
+	mediaComboBox->setFixedHeight( magComboBox->tqsizeHint().height() );
 
 	connect ( mediaComboBox, TQT_SIGNAL (activated (int)),
 		  this, TQT_SLOT (slotMediaSelection (int)) );
@@ -75,7 +75,7 @@ ViewControl::ViewControl( TQWidget *parent, const char *name )
 	orientComboBox->insertItem(i18n("Landscape"));
 	orientComboBox->insertItem(i18n("Seascape"));
 	orientComboBox->insertItem(i18n("Upside Down"));
-	orientComboBox->setFixedHeight( magComboBox->sizeHint().height() );
+	orientComboBox->setFixedHeight( magComboBox->tqsizeHint().height() );
 
 	connect ( orientComboBox, TQT_SIGNAL (activated (int)),
 		  this, TQT_SLOT (slotOrientSelection (int)) );
@@ -85,9 +85,9 @@ ViewControl::ViewControl( TQWidget *parent, const char *name )
 
 	TQLabel* vcLabel;
 	vcLabel = new TQLabel( magComboBox, i18n("&Magnification"), vcGroupBox );
-	vcLabel->setAlignment( AlignRight | AlignVCenter | ShowPrefix );
-	if ( vcLabel->sizeHint().width() > labelWidth )
-		labelWidth = vcLabel->sizeHint().width();
+	vcLabel->tqsetAlignment( AlignRight | AlignVCenter | ShowPrefix );
+	if ( vcLabel->tqsizeHint().width() > labelWidth )
+		labelWidth = vcLabel->tqsizeHint().width();
 	vcLabel->setMinimumWidth( labelWidth );
 
 	vcLabel->hide();
@@ -96,24 +96,24 @@ ViewControl::ViewControl( TQWidget *parent, const char *name )
 
 
 	vcLabel = new TQLabel( mediaComboBox, i18n("M&edia"), vcGroupBox );
-	vcLabel->setAlignment( AlignRight | AlignVCenter | ShowPrefix );
-	if ( vcLabel->sizeHint().width() > labelWidth )
-		labelWidth = vcLabel->sizeHint().width();
+	vcLabel->tqsetAlignment( AlignRight | AlignVCenter | ShowPrefix );
+	if ( vcLabel->tqsizeHint().width() > labelWidth )
+		labelWidth = vcLabel->tqsizeHint().width();
 	vcLabel->setMinimumWidth( labelWidth );
 
 	grid->addWidget( vcLabel, 1, 0 );
 
 	vcLabel = new TQLabel( orientComboBox, i18n("&Orientation"), vcGroupBox );
-	vcLabel->setAlignment( AlignRight | AlignVCenter | ShowPrefix );
-	if ( vcLabel->sizeHint().width() > labelWidth )
-		labelWidth = vcLabel->sizeHint().width();
+	vcLabel->tqsetAlignment( AlignRight | AlignVCenter | ShowPrefix );
+	if ( vcLabel->tqsizeHint().width() > labelWidth )
+		labelWidth = vcLabel->tqsizeHint().width();
 	vcLabel->setMinimumWidth( labelWidth );
 
 	grid->addWidget( vcLabel, 2, 0 );
 
-	vcGroupBox->setMinimumHeight( 2*orientComboBox->sizeHint().height()+20 );
+	vcGroupBox->setMinimumHeight( 2*orientComboBox->tqsizeHint().height()+20 );
 	vcGroupBox->setMinimumWidth(
-		40 + labelWidth + orientComboBox->sizeHint().width() );
+		40 + labelWidth + orientComboBox->tqsizeHint().width() );
 
         KSeparator* sep = new KSeparator( KSeparator::HLine, this);
 	topLayout->addWidget( sep );
@@ -130,7 +130,7 @@ ViewControl::ViewControl( TQWidget *parent, const char *name )
 	connect( closebtn, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) );
 
 
-	bbox->layout();
+	bbox->tqlayout();
 	topLayout->addWidget( bbox );
 
 	topLayout->activate();