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

This reverts commit d6331f1b56eb6dca7a1950658b2932f208015da0.

1 files changed, 25 insertions, 25 deletions

diff --git a/kompare/libdialogpages/viewpage.cpp b/kompare/libdialogpages/viewpage.cpp
index ab80506c..827e8a4d 100644
--- a/kompare/libdialogpages/viewpage.cpp
+++ b/kompare/libdialogpages/viewpage.cpp
@@ -21,7 +21,7 @@
 #include <tqgroupbox.h>
 #include <tqhgroupbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqspinbox.h>
 
 #include <kapplication.h>
@@ -36,45 +36,45 @@
 ViewPage::ViewPage( TQWidget* parent ) : PageBase( parent )
 {
 	TQWidget*     page;
-	TQVBoxLayout* layout;
-	TQGroupBox*   colorGroupBox;
+	TQVBoxLayout* tqlayout;
+	TQGroupBox*   tqcolorGroupBox;
 	TQHGroupBox*  snolGroupBox;
 	TQHGroupBox*  tabGroupBox;
 	TQLabel*      label;
 
 	page   = new TQWidget( this );
-	layout = new TQVBoxLayout( page );
-	layout->setSpacing( KDialog::spacingHint() );
-	layout->setMargin( KDialog::marginHint() );
+	tqlayout = new TQVBoxLayout( page );
+	tqlayout->setSpacing( KDialog::spacingHint() );
+	tqlayout->setMargin( KDialog::marginHint() );
 
 	// add a groupbox
-	colorGroupBox = new TQGroupBox( 2, Qt::Horizontal, i18n( "Colors" ), page );
-	layout->addWidget( colorGroupBox );
-	colorGroupBox->setMargin( KDialog::marginHint() );
+	tqcolorGroupBox = new TQGroupBox( 2, Qt::Horizontal, i18n( "Colors" ), page );
+	tqlayout->addWidget( tqcolorGroupBox );
+	tqcolorGroupBox->setMargin( KDialog::marginHint() );
 
 	// add the removeColor
-	label = new TQLabel( i18n( "Removed color:" ), colorGroupBox );
-	m_removedColorButton = new KColorButton( colorGroupBox );
+	label = new TQLabel( i18n( "Removed color:" ), tqcolorGroupBox );
+	m_removedColorButton = new KColorButton( tqcolorGroupBox );
 	label->setBuddy( m_removedColorButton );
 
 	// add the changeColor
-	label = new TQLabel( i18n( "Changed color:" ), colorGroupBox );
-	m_changedColorButton = new KColorButton( colorGroupBox );
+	label = new TQLabel( i18n( "Changed color:" ), tqcolorGroupBox );
+	m_changedColorButton = new KColorButton( tqcolorGroupBox );
 	label->setBuddy( m_changedColorButton );
 
 	// add the addColor
-	label = new TQLabel( i18n( "Added color:" ), colorGroupBox );
-	m_addedColorButton = new KColorButton( colorGroupBox );
+	label = new TQLabel( i18n( "Added color:" ), tqcolorGroupBox );
+	m_addedColorButton = new KColorButton( tqcolorGroupBox );
 	label->setBuddy( m_addedColorButton );
 
 	// add the appliedColor
-	label = new TQLabel( i18n( "Applied color:" ), colorGroupBox );
-	m_appliedColorButton = new KColorButton( colorGroupBox );
+	label = new TQLabel( i18n( "Applied color:" ), tqcolorGroupBox );
+	m_appliedColorButton = new KColorButton( tqcolorGroupBox );
 	label->setBuddy( m_appliedColorButton );
 
 	// scroll number of lines (snol)
 	snolGroupBox = new TQHGroupBox( i18n( "Mouse Wheel" ), page );
-	layout->addWidget( snolGroupBox );
+	tqlayout->addWidget( snolGroupBox );
 	snolGroupBox->setMargin( KDialog::marginHint() );
 
 	label            = new TQLabel( i18n( "Number of lines:" ), snolGroupBox );
@@ -84,25 +84,25 @@ ViewPage::ViewPage( TQWidget* parent ) : PageBase( parent )
 	// Temporarily here for testing...
 	// number of spaces for a tab character stuff
 	tabGroupBox = new TQHGroupBox( i18n( "Tabs to Spaces" ), page );
-	layout->addWidget( tabGroupBox );
+	tqlayout->addWidget( tabGroupBox );
 	tabGroupBox->setMargin( KDialog::marginHint() );
 
 	label = new TQLabel( i18n( "Number of spaces to convert a tab character to:" ), tabGroupBox );
 	m_tabSpinBox = new TQSpinBox( 1, 16, 1, tabGroupBox );
 	label->setBuddy( m_tabSpinBox );
 
-	layout->addStretch( 1 );
+	tqlayout->addStretch( 1 );
 	page->setMinimumSize( sizeHintForWidget( page ) );
 
 	addTab( page, i18n( "A&ppearance" ) );
 
 	page   = new TQWidget( this );
-	layout = new TQVBoxLayout( page );
-	layout->setSpacing( KDialog::spacingHint() );
-	layout->setMargin( KDialog::marginHint() );
+	tqlayout = new TQVBoxLayout( page );
+	tqlayout->setSpacing( KDialog::spacingHint() );
+	tqlayout->setMargin( KDialog::marginHint() );
 
 	TQHGroupBox* gb = new TQHGroupBox( i18n( "Text Font" ), page );
-	layout->addWidget( gb );
+	tqlayout->addWidget( gb );
 	gb->setMargin( KDialog::marginHint() );
 
 	label = new TQLabel( i18n( "Font:" ), gb );
@@ -113,7 +113,7 @@ ViewPage::ViewPage( TQWidget* parent ) : PageBase( parent )
 	m_fontSizeSpinBox = new TQSpinBox( 6, 24, 1, gb, "fontsize" );
 	label->setBuddy( m_fontSizeSpinBox );
 
-	layout->addStretch( 1 );
+	tqlayout->addStretch( 1 );
 	page->setMinimumSize( sizeHintForWidget( page ) );
 
 	addTab( page, i18n( "&Fonts" ) );