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

This reverts commit 94844816550ad672ccfcdc25659c625546239998.

1 files changed, 32 insertions, 32 deletions

diff --git a/kspread/dialogs/kspread_dlg_sort.cc b/kspread/dialogs/kspread_dlg_sort.cc
index 4ce0d91e..1e58ccf5 100644
--- a/kspread/dialogs/kspread_dlg_sort.cc
+++ b/kspread/dialogs/kspread_dlg_sort.cc
@@ -32,7 +32,7 @@
 #include <tqcombobox.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
@@ -85,7 +85,7 @@ SortDialog::SortDialog( View * parent,  const char * name,
   TQHButtonGroup * orientationGroup = new TQHButtonGroup( layoutGroup, "orientationGroup" );
   orientationGroup->setLineWidth(0);
   orientationGroup->setMargin(0);
-  orientationGroup->layout()->setMargin(0);
+  orientationGroup->tqlayout()->setMargin(0);
 
   m_sortColumn = new TQRadioButton( orientationGroup, "m_sortColumn" );
   m_sortColumn->setText( i18n( "Sort &Rows" ) );
@@ -108,10 +108,10 @@ SortDialog::SortDialog( View * parent,  const char * name,
   sort1Box->setTitle( i18n( "Sort By" ) );
   sort1Box->setFlat(true);
   sort1Box->setColumnLayout(0, Qt::Vertical );
-  sort1Box->layout()->setSpacing( KDialog::spacingHint() );
-  sort1Box->layout()->setMargin( KDialog::marginHint() );
-  TQHBoxLayout * sort1BoxLayout = new TQHBoxLayout( sort1Box->layout() );
-  sort1BoxLayout->setAlignment( TQt::AlignTop );
+  sort1Box->tqlayout()->setSpacing( KDialog::spacingHint() );
+  sort1Box->tqlayout()->setMargin( KDialog::marginHint() );
+  TQHBoxLayout * sort1BoxLayout = new TQHBoxLayout( sort1Box->tqlayout() );
+  sort1BoxLayout->tqsetAlignment( TQt::AlignTop );
 
   m_sortKey1 = new TQComboBox( false, sort1Box, "m_sortKey1" );
   sort1BoxLayout->addWidget( m_sortKey1 );
@@ -127,10 +127,10 @@ SortDialog::SortDialog( View * parent,  const char * name,
   sort2Box->setTitle( i18n( "Then By" ) );
   sort2Box->setFlat(true);
   sort2Box->setColumnLayout(0, Qt::Vertical );
-  sort2Box->layout()->setSpacing( KDialog::spacingHint() );
-  sort2Box->layout()->setMargin( KDialog::marginHint() );
-  TQHBoxLayout * sort2BoxLayout = new TQHBoxLayout( sort2Box->layout() );
-  sort2BoxLayout->setAlignment( TQt::AlignTop );
+  sort2Box->tqlayout()->setSpacing( KDialog::spacingHint() );
+  sort2Box->tqlayout()->setMargin( KDialog::marginHint() );
+  TQHBoxLayout * sort2BoxLayout = new TQHBoxLayout( sort2Box->tqlayout() );
+  sort2BoxLayout->tqsetAlignment( TQt::AlignTop );
 
   m_sortKey2 = new TQComboBox( false, sort2Box, "m_sortKey2" );
   m_sortKey2->insertItem( i18n( "None" ) );
@@ -147,10 +147,10 @@ SortDialog::SortDialog( View * parent,  const char * name,
   sort3Box->setTitle( i18n( "Then By" ) );
   sort3Box->setFlat(true);
   sort3Box->setColumnLayout(0, Qt::Vertical );
-  sort3Box->layout()->setSpacing( KDialog::spacingHint() );
-  sort3Box->layout()->setMargin( KDialog::marginHint() );
-  TQHBoxLayout * sort3BoxLayout = new TQHBoxLayout( sort3Box->layout() );
-  sort3BoxLayout->setAlignment( TQt::AlignTop );
+  sort3Box->tqlayout()->setSpacing( KDialog::spacingHint() );
+  sort3Box->tqlayout()->setMargin( KDialog::marginHint() );
+  TQHBoxLayout * sort3BoxLayout = new TQHBoxLayout( sort3Box->tqlayout() );
+  sort3BoxLayout->tqsetAlignment( TQt::AlignTop );
 
   m_sortKey3 = new TQComboBox( false, sort3Box, "m_sortKey3" );
   m_sortKey3->insertItem( i18n( "None" ) );
@@ -171,15 +171,15 @@ SortDialog::SortDialog( View * parent,  const char * name,
 
   m_page2 = new TQWidget( m_tabWidget, "m_page2" );
   TQGridLayout * page2Layout = new TQGridLayout( m_page2, 1, 1, 11, 6, "page2Layout");
-  page2Layout->setAlignment(TQt::AlignTop);
+  page2Layout->tqsetAlignment(TQt::AlignTop);
 
   TQGroupBox * firstKeyBox = new TQGroupBox( m_page2, "firstKeyBox" );
   firstKeyBox->setTitle( i18n( "First Key" ) );
   firstKeyBox->setColumnLayout(0, Qt::Vertical );
-  firstKeyBox->layout()->setSpacing( KDialog::spacingHint() );
-  firstKeyBox->layout()->setMargin( KDialog::marginHint() );
-  TQVBoxLayout * firstKeyBoxLayout = new TQVBoxLayout( firstKeyBox->layout() );
-  firstKeyBoxLayout->setAlignment( TQt::AlignTop );
+  firstKeyBox->tqlayout()->setSpacing( KDialog::spacingHint() );
+  firstKeyBox->tqlayout()->setMargin( KDialog::marginHint() );
+  TQVBoxLayout * firstKeyBoxLayout = new TQVBoxLayout( firstKeyBox->tqlayout() );
+  firstKeyBoxLayout->tqsetAlignment( TQt::AlignTop );
 
   m_useCustomLists = new TQCheckBox( firstKeyBox, "m_useCustomLists_2" );
   m_useCustomLists->setText( i18n( "&Use custom list" ) );
@@ -201,12 +201,12 @@ SortDialog::SortDialog( View * parent,  const char * name,
   TQGroupBox * resultToBox = new TQGroupBox( m_page2, "resultToBox" );
   resultToBox->setTitle( i18n( "Location to Store Sort Results" ) );
   resultToBox->setColumnLayout(0, Qt::Vertical );
-  resultToBox->layout()->setSpacing( KDialog::spacingHint() );
-  resultToBox->layout()->setMargin( KDialog::marginHint() );
+  resultToBox->tqlayout()->setSpacing( KDialog::spacingHint() );
+  resultToBox->tqlayout()->setMargin( KDialog::marginHint() );
   
   
-  TQHBoxLayout * resultToBoxLayout = new TQHBoxLayout( resultToBox->layout() );
-  resultToBoxLayout->setAlignment( TQt::AlignTop );
+  TQHBoxLayout * resultToBoxLayout = new TQHBoxLayout( resultToBox->tqlayout() );
+  resultToBoxLayout->tqsetAlignment( TQt::AlignTop );
 
   TQLabel * destinationSheet=new TQLabel(resultToBox,"destinationSheet");
   destinationSheet->setText("Destination Sheet:");
@@ -351,7 +351,7 @@ void SortDialog::init()
     for (int i = r.left(); i <= right; ++i)
     {  
 	    TQString guessName=m_pView->activeSheet()->guessColumnTitle(r,i);
-	    TQString colName=i18n(" (Column %1)").arg(Cell::columnName(i));
+	    TQString colName=i18n(" (Column %1)").tqarg(Cell::columnName(i));
 	    
 	    if (!guessName.isEmpty())
 	    {
@@ -359,13 +359,13 @@ void SortDialog::init()
 	    }
 	    else
 	    {
-		m_listColumn += i18n("Column %1").arg(Cell::columnName(i));
+		m_listColumn += i18n("Column %1").tqarg(Cell::columnName(i));
 		
 		if ( i == r.left() )
 		  selectionMayHaveHeader=false;
             }
     }
-     // m_listColumn += i18n("Column %1").arg(Cell::columnName(i));
+     // m_listColumn += i18n("Column %1").tqarg(Cell::columnName(i));
   }
   // Entire rows selected ?
   else if ( util_isRowSelected(r) )
@@ -377,7 +377,7 @@ void SortDialog::init()
     for (int i = r.top(); i <= bottom; ++i)
     {
 	    TQString guessName=m_pView->activeSheet()->guessRowTitle(r,i);
-	    TQString rowName=i18n(" (Row %1)").arg(i);
+	    TQString rowName=i18n(" (Row %1)").tqarg(i);
 	    
 	    if (!guessName.isEmpty())
 	    {
@@ -385,7 +385,7 @@ void SortDialog::init()
 	    }
 	    else
 	    {
-		m_listRow += i18n("Row %1").arg(i);
+		m_listRow += i18n("Row %1").tqarg(i);
 		
 		if ( i == r.top() )
 		  selectionMayHaveHeader=false;
@@ -419,13 +419,13 @@ void SortDialog::init()
     for (int i = r.left(); i <= right; ++i)
     {  
 	    TQString guessName=m_pView->activeSheet()->guessColumnTitle(r,i);
-	    TQString colName=i18n(" (Column %1)").arg(Cell::columnName(i));
+	    TQString colName=i18n(" (Column %1)").tqarg(Cell::columnName(i));
 	    
 	    if (!guessName.isEmpty())
 		    m_listColumn += guessName + colName;
 	    else
 	    {
-		    m_listColumn += i18n("Column %1").arg(Cell::columnName(i));
+		    m_listColumn += i18n("Column %1").tqarg(Cell::columnName(i));
 		    
 		    if (i == r.left())
 		      selectionMayHaveHeader=false;
@@ -435,13 +435,13 @@ void SortDialog::init()
     for (int i = r.top(); i <= bottom; ++i) 
     {
 	    TQString guessName=m_pView->activeSheet()->guessRowTitle(r,i);
-	    TQString rowName=i18n(" (Row %1)").arg(i);
+	    TQString rowName=i18n(" (Row %1)").tqarg(i);
 	    
 	    if (!guessName.isEmpty())
 		    m_listRow += guessName + rowName;
 	    else
 	    {
-		    m_listRow += i18n("Row %1").arg(i);
+		    m_listRow += i18n("Row %1").tqarg(i);
 		    
 		    if (i == r.top())
 		      selectionMayHaveHeader=false;