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

This reverts commit d6331f1b56eb6dca7a1950658b2932f208015da0.

4 files changed, 65 insertions, 65 deletions

diff --git a/kompare/libdialogpages/diffpage.cpp b/kompare/libdialogpages/diffpage.cpp
index e8ad94fe..8e6d55e5 100644
--- a/kompare/libdialogpages/diffpage.cpp
+++ b/kompare/libdialogpages/diffpage.cpp
@@ -18,7 +18,7 @@
 #include <tqcheckbox.h>
 #include <tqhgroupbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqradiobutton.h>
 #include <tqspinbox.h>
 #include <tqtooltip.h>
@@ -203,19 +203,19 @@ void DiffPage::slotExcludeFileToggled( bool on )
 void DiffPage::addDiffTab()
 {
 	TQWidget* page   = new TQWidget( this );
-	TQVBoxLayout* layout = new TQVBoxLayout( page );
-	layout->setSpacing( KDialog::spacingHint() );
-	layout->setMargin( KDialog::marginHint() );
+	TQVBoxLayout* tqlayout = new TQVBoxLayout( page );
+	tqlayout->setSpacing( KDialog::spacingHint() );
+	tqlayout->setMargin( KDialog::marginHint() );
 
 	// add diff program selector
 	m_diffProgramGroup = new TQVButtonGroup( i18n( "Diff Program" ), page );
-	layout->addWidget( m_diffProgramGroup );
+	tqlayout->addWidget( m_diffProgramGroup );
 	m_diffProgramGroup->setMargin( KDialog::marginHint() );
 
 	m_diffURLRequester = new KURLRequester( m_diffProgramGroup, "diffURLRequester" );
 	TQWhatsThis::add( m_diffURLRequester, i18n( "You can select a different diff program here. On Solaris the standard diff program does not support all the options that the GNU version does. This way you can select that version." ) );
 
-	layout->addStretch( 1 );
+	tqlayout->addStretch( 1 );
 	page->setMinimumSize( sizeHintForWidget( page ) );
 
 	addTab( page, i18n( "&Diff" ) );
@@ -224,14 +224,14 @@ void DiffPage::addDiffTab()
 void DiffPage::addFormatTab()
 {
 	TQWidget* page   = new TQWidget( this );
-	TQVBoxLayout* layout = new TQVBoxLayout( page );
-	layout->setSpacing( KDialog::spacingHint() );
-	layout->setMargin( KDialog::marginHint() );
+	TQVBoxLayout* tqlayout = new TQVBoxLayout( page );
+	tqlayout->setSpacing( KDialog::spacingHint() );
+	tqlayout->setMargin( KDialog::marginHint() );
 
 	// add diff modes
 	m_modeButtonGroup = new TQVButtonGroup( i18n( "Output Format" ), page );
 	TQWhatsThis::add( m_modeButtonGroup, i18n( "Select the format of the output generated by diff. Unified is the one that is used most frequently because it is very readable. The KDE developers like this format the best so use it for sending patches." ) );
-	layout->addWidget( m_modeButtonGroup );
+	tqlayout->addWidget( m_modeButtonGroup );
 	m_modeButtonGroup->setMargin( KDialog::marginHint() );
 
 	TQRadioButton* radioButton;
@@ -245,7 +245,7 @@ void DiffPage::addFormatTab()
 
 	// #lines of context (loc)
 	TQHGroupBox* groupBox = new TQHGroupBox( i18n( "Lines of Context" ), page );
-	layout->addWidget( groupBox );
+	tqlayout->addWidget( groupBox );
 	groupBox->setMargin( KDialog::marginHint() );
 
 	TQLabel* label = new TQLabel( i18n( "Number of context lines:" ), groupBox );
@@ -253,7 +253,7 @@ void DiffPage::addFormatTab()
 	TQWhatsThis::add( m_locSpinBox, i18n( "The number of context lines is normally 2 or 3. This makes the diff readable and applicable in most cases. More than 3 lines will only bloat the diff unnecessarily." ) );
 	label->setBuddy( m_locSpinBox );
 
-	layout->addStretch( 1 );
+	tqlayout->addStretch( 1 );
 	page->setMinimumSize( sizeHintForWidget( page ) );
 
 	addTab( page, i18n( "&Format" ) );
@@ -262,13 +262,13 @@ void DiffPage::addFormatTab()
 void DiffPage::addOptionsTab()
 {
 	TQWidget* page   = new TQWidget( this );
-	TQVBoxLayout* layout = new TQVBoxLayout( page );
-	layout->setSpacing( KDialog::spacingHint() );
-	layout->setMargin( KDialog::marginHint() );
+	TQVBoxLayout* tqlayout = new TQVBoxLayout( page );
+	tqlayout->setSpacing( KDialog::spacingHint() );
+	tqlayout->setMargin( KDialog::marginHint() );
 
 	// add diff options
 	TQVButtonGroup* optionButtonGroup     = new TQVButtonGroup( i18n( "General" ), page );
-	layout->addWidget( optionButtonGroup );
+	tqlayout->addWidget( optionButtonGroup );
 	optionButtonGroup->setMargin( KDialog::marginHint() );
 
 	m_smallerCheckBox     = new TQCheckBox( i18n( "&Look for smaller changes" ), optionButtonGroup );
@@ -278,7 +278,7 @@ void DiffPage::addOptionsTab()
 	m_caseCheckBox        = new TQCheckBox( i18n( "&Ignore changes in case" ), optionButtonGroup );
 	TQToolTip::add( m_caseCheckBox, i18n( "This corresponds to the -i diff option." ) );
 
-	TQHBoxLayout* groupLayout = new TQHBoxLayout( layout, -1, "regexp_horizontal_layout" );
+	TQHBoxLayout* groupLayout = new TQHBoxLayout( tqlayout, -1, "regexp_horizontal_layout" );
 	groupLayout->setMargin( KDialog::marginHint() );
 
 	m_ignoreRegExpCheckBox = new TQCheckBox( i18n( "Ignore regexp:" ), page );
@@ -298,7 +298,7 @@ void DiffPage::addOptionsTab()
 	}
 
 	TQVButtonGroup* moreOptionButtonGroup = new TQVButtonGroup( i18n( "Whitespace" ), page );
-	layout->addWidget( moreOptionButtonGroup );
+	tqlayout->addWidget( moreOptionButtonGroup );
 	moreOptionButtonGroup->setMargin( KDialog::marginHint() );
 
 	m_tabsCheckBox        = new TQCheckBox( i18n( "E&xpand tabs to spaces in output" ), moreOptionButtonGroup );
@@ -312,7 +312,7 @@ void DiffPage::addOptionsTab()
 	m_ignoreTabExpansionCheckBox = new TQCheckBox( i18n( "Igno&re changes due to tab expansion" ), moreOptionButtonGroup );
 	TQToolTip::add( m_ignoreTabExpansionCheckBox, i18n( "This option corresponds to the -E diff option." ) );
 
-	layout->addStretch( 1 );
+	tqlayout->addStretch( 1 );
 	page->setMinimumSize( sizeHintForWidget( page ) );
 
 	addTab( page, i18n( "O&ptions" ) );
@@ -321,16 +321,16 @@ void DiffPage::addOptionsTab()
 void DiffPage::addExcludeTab()
 {
 	TQWidget* page = new TQWidget( this );
-	TQVBoxLayout* layout = new TQVBoxLayout( page );
-	layout->setSpacing( KDialog::spacingHint() );
-	layout->setMargin( KDialog::marginHint() );
+	TQVBoxLayout* tqlayout = new TQVBoxLayout( page );
+	tqlayout->setSpacing( KDialog::spacingHint() );
+	tqlayout->setMargin( KDialog::marginHint() );
 
 	TQHGroupBox* excludeFilePatternGroupBox = new TQHGroupBox( i18n( "File Pattern to Exclude" ), page );
 	m_excludeFilePatternCheckBox = new TQCheckBox( "", excludeFilePatternGroupBox );
 	TQToolTip::add( m_excludeFilePatternCheckBox, i18n( "If this is checked you can enter a shell pattern in the text box on the right or select entries from the list." ) );
 	m_excludeFilePatternEditListBox = new KEditListBox( excludeFilePatternGroupBox, "exclude_file_pattern_editlistbox", false, KEditListBox::Add|KEditListBox::Remove );
 	TQToolTip::add( m_excludeFilePatternEditListBox, i18n( "Here you can enter or remove a shell pattern or select one or more entries from the list." ) );
-	layout->addWidget( excludeFilePatternGroupBox );
+	tqlayout->addWidget( excludeFilePatternGroupBox );
 
 
 	connect( m_excludeFilePatternCheckBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotExcludeFilePatternToggled(bool)));
@@ -342,11 +342,11 @@ void DiffPage::addExcludeTab()
 	TQToolTip::add( m_excludeFileURLComboBox, i18n( "Here you can enter the URL of a file with shell patterns to ignore during the comparison of the folders." ) );
 	m_excludeFileURLRequester = new KURLRequester( m_excludeFileURLComboBox, excludeFileNameGroupBox, "exclude_file_name_urlrequester" );
 	TQToolTip::add( m_excludeFileURLRequester, i18n( "Any file you select in the dialog that pops up when you click it will be put in the dialog to the left of this button." ) );
-	layout->addWidget( excludeFileNameGroupBox );
+	tqlayout->addWidget( excludeFileNameGroupBox );
 
 	connect( m_excludeFileCheckBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotExcludeFileToggled(bool)));
 
-	layout->addStretch( 1 );
+	tqlayout->addStretch( 1 );
 	page->setMinimumSize( sizeHintForWidget( page ) );
 
 	addTab( page, i18n( "&Exclude" ) );
diff --git a/kompare/libdialogpages/filespage.cpp b/kompare/libdialogpages/filespage.cpp
index 82276439..0bbc87fe 100644
--- a/kompare/libdialogpages/filespage.cpp
+++ b/kompare/libdialogpages/filespage.cpp
@@ -16,7 +16,7 @@
 **
 ***************************************************************************/
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqgroupbox.h>
 
 #include <kapplication.h>
@@ -34,9 +34,9 @@
 FilesPage::FilesPage( TQWidget* parent ) : PageBase( parent ), m_URLChanged( false )
 {
 	TQWidget* page = new TQWidget( this );
-	TQVBoxLayout* layout = new TQVBoxLayout( page );
-	layout->setSpacing( KDialog::spacingHint() );
-	layout->setMargin( KDialog::marginHint() );
+	TQVBoxLayout* tqlayout = new TQVBoxLayout( page );
+	tqlayout->setSpacing( KDialog::spacingHint() );
+	tqlayout->setMargin( KDialog::marginHint() );
 
 	m_firstGB = new TQGroupBox( 1, Qt::Vertical, "You have to set this moron :)", page );
 	m_firstURLComboBox = new KURLComboBox( KURLComboBox::Both, true, m_firstGB, "SourceURLComboBox" );
@@ -54,11 +54,11 @@ FilesPage::FilesPage( TQWidget* parent ) : PageBase( parent ), m_URLChanged( fal
 	m_encodingComboBox = new TQComboBox( false, m_thirdGB, "encoding_combobox" );
 	m_encodingComboBox->insertStringList( KGlobal::charsets()->availableEncodingNames() );
 
-	layout->addWidget( m_firstGB );
-	layout->addWidget( m_secondGB );
-	layout->addWidget( m_thirdGB );
+	tqlayout->addWidget( m_firstGB );
+	tqlayout->addWidget( m_secondGB );
+	tqlayout->addWidget( m_thirdGB );
 
-	layout->addStretch( 1 );
+	tqlayout->addStretch( 1 );
 	page->setMinimumSize( sizeHintForWidget( page ) );
 
 	addTab( page, i18n( "&Files" ) );
diff --git a/kompare/libdialogpages/pagebase.cpp b/kompare/libdialogpages/pagebase.cpp
index 3a35e479..33c45dba 100644
--- a/kompare/libdialogpages/pagebase.cpp
+++ b/kompare/libdialogpages/pagebase.cpp
@@ -17,7 +17,7 @@
 **
 ***************************************************************************/
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqobjectlist.h>
 
 #include "pagebase.h"
@@ -36,9 +36,9 @@ PageBase::~PageBase()
 TQSize PageBase::sizeHintForWidget( TQWidget* widget )
 {
 	//
-	// The size is computed by adding the sizeHint().height() of all
-	// widget children and taking the width of the widest child and adding
-	// layout()->margin() and layout()->spacing()
+	// The size is computed by adding the tqsizeHint().height() of all
+	// widget tqchildren and taking the width of the widest child and adding
+	// tqlayout()->margin() and tqlayout()->spacing()
 	//
 
 	// this code in this method has been ripped out of a file in kbabel
@@ -57,7 +57,7 @@ TQSize PageBase::sizeHintForWidget( TQWidget* widget )
 			numChild += 1;
 			TQWidget *w=((TQWidget*)o);
 
-			TQSize s = w->sizeHint();
+			TQSize s = w->tqsizeHint();
 			if( s.isEmpty() == true )
 			{
 				s = TQSize( 50, 100 ); // Default size
@@ -72,8 +72,8 @@ TQSize PageBase::sizeHintForWidget( TQWidget* widget )
 
 	if( numChild > 0 )
 	{
-		size.setHeight( size.height() + widget->layout()->spacing()*(numChild-1) );
-		size += TQSize( widget->layout()->margin()*2, widget->layout()->margin()*2 + 1 );
+		size.setHeight( size.height() + widget->tqlayout()->spacing()*(numChild-1) );
+		size += TQSize( widget->tqlayout()->margin()*2, widget->tqlayout()->margin()*2 + 1 );
 	}
 	else
 	{
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" ) );