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

This reverts commit 94844816550ad672ccfcdc25659c625546239998.

1 files changed, 21 insertions, 21 deletions

diff --git a/kspread/dialogs/kspread_dlg_csv.cc b/kspread/dialogs/kspread_dlg_csv.cc
index 7008de4e..c8ce2671 100644
--- a/kspread/dialogs/kspread_dlg_csv.cc
+++ b/kspread/dialogs/kspread_dlg_csv.cc
@@ -22,7 +22,7 @@
 
 #include <tqbuttongroup.h>
 #include <tqcheckbox.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqcombobox.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
@@ -30,7 +30,7 @@
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
 #include <tqtable.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kapplication.h>
 #include <kdebug.h>
@@ -78,7 +78,7 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod
       m_targetRect.setBottom( lastCell->row() );
 
   m_sheet = new TQTable( page, "m_table" );
-  //m_sheet->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)7, 0, 0, m_sheet->sizePolicy().hasHeightForWidth() ) );
+  //m_sheet->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)7, 0, 0, m_sheet->sizePolicy().hasHeightForWidth() ) );
   m_sheet->setNumRows( 0 );
   m_sheet->setNumCols( 0 );
 
@@ -86,13 +86,13 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod
 
   // Delimiter: comma, semicolon, tab, space, other
   m_delimiterBox = new TQButtonGroup( page, "m_delimiterBox" );
-  m_delimiterBox->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, m_delimiterBox->sizePolicy().hasHeightForWidth() ) );
+  m_delimiterBox->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, m_delimiterBox->sizePolicy().hasHeightForWidth() ) );
   m_delimiterBox->setTitle( i18n( "Delimiter" ) );
   m_delimiterBox->setColumnLayout(0, Qt::Vertical );
-  m_delimiterBox->layout()->setSpacing( KDialog::spacingHint() );
-  m_delimiterBox->layout()->setMargin( KDialog::marginHint() );
-  m_delimiterBoxLayout = new TQGridLayout( m_delimiterBox->layout() );
-  m_delimiterBoxLayout->setAlignment( TQt::AlignTop );
+  m_delimiterBox->tqlayout()->setSpacing( KDialog::spacingHint() );
+  m_delimiterBox->tqlayout()->setMargin( KDialog::marginHint() );
+  m_delimiterBoxLayout = new TQGridLayout( m_delimiterBox->tqlayout() );
+  m_delimiterBoxLayout->tqsetAlignment( TQt::AlignTop );
   MyDialogLayout->addMultiCellWidget( m_delimiterBox, 0, 2, 0, 0 );
 
   m_ignoreDuplicates = new TQCheckBox( page, "m_ignoreDuplicates" );
@@ -122,20 +122,20 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod
   m_delimiterBoxLayout->addWidget( m_radioOther, 0, 2 );
 
   m_delimiterEdit = new TQLineEdit( m_delimiterBox, "m_delimiterEdit" );
-  m_delimiterEdit->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, m_delimiterEdit->sizePolicy().hasHeightForWidth() ) );
+  m_delimiterEdit->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, m_delimiterEdit->sizePolicy().hasHeightForWidth() ) );
   m_delimiterEdit->setMaximumSize( TQSize( 30, 32767 ) );
   m_delimiterBoxLayout->addWidget( m_delimiterEdit, 1, 2 );
 
 
   // Format: number, text, currency,
   m_formatBox = new TQButtonGroup( page, "m_formatBox" );
-  m_formatBox->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, m_formatBox->sizePolicy().hasHeightForWidth() ) );
+  m_formatBox->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, m_formatBox->sizePolicy().hasHeightForWidth() ) );
   m_formatBox->setTitle( i18n( "Format" ) );
   m_formatBox->setColumnLayout(0, Qt::Vertical );
-  m_formatBox->layout()->setSpacing( KDialog::spacingHint() );
-  m_formatBox->layout()->setMargin( KDialog::marginHint() );
-  m_formatBoxLayout = new TQGridLayout( m_formatBox->layout() );
-  m_formatBoxLayout->setAlignment( TQt::AlignTop );
+  m_formatBox->tqlayout()->setSpacing( KDialog::spacingHint() );
+  m_formatBox->tqlayout()->setMargin( KDialog::marginHint() );
+  m_formatBoxLayout = new TQGridLayout( m_formatBox->tqlayout() );
+  m_formatBoxLayout->tqsetAlignment( TQt::AlignTop );
   MyDialogLayout->addMultiCellWidget( m_formatBox, 0, 2, 1, 1 );
 
   m_radioNumber = new TQRadioButton( m_formatBox, "m_radioNumber" );
@@ -157,7 +157,7 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod
 
   m_comboLine = new TQComboBox( FALSE, page, "m_comboLine" );
   m_comboLine->insertItem( i18n( "1" ) );
-  m_comboLine->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, m_comboLine->sizePolicy().hasHeightForWidth() ) );
+  m_comboLine->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, m_comboLine->sizePolicy().hasHeightForWidth() ) );
 
   MyDialogLayout->addWidget( m_comboLine, 1, 3 );
 
@@ -165,20 +165,20 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod
   m_comboQuote->insertItem( i18n( "\"" ) );
   m_comboQuote->insertItem( i18n( "'" ) );
   m_comboQuote->insertItem( i18n( "None" ) );
-  m_comboQuote->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, m_comboQuote->sizePolicy().hasHeightForWidth() ) );
+  m_comboQuote->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, m_comboQuote->sizePolicy().hasHeightForWidth() ) );
 
   MyDialogLayout->addWidget( m_comboQuote, 1, 2 );
   TQSpacerItem* spacer_2 = new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Preferred );
   MyDialogLayout->addItem( spacer_2, 2, 3 );
 
   TextLabel3 = new TQLabel( page, "TextLabel3" );
-  TextLabel3->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) );
+  TextLabel3->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) );
   TextLabel3->setText( i18n( "Start at line:" ) );
 
   MyDialogLayout->addWidget( TextLabel3, 0, 3 );
 
   TextLabel2 = new TQLabel( page, "TextLabel2" );
-  TextLabel2->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) );
+  TextLabel2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) );
   TextLabel2->setText( i18n( "Textquote:" ) );
 
   MyDialogLayout->addWidget( TextLabel2, 0, 2 );
@@ -186,7 +186,7 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod
   if ( m_mode == Clipboard )
   {
     setCaption( i18n( "Inserting From Clipboard" ) );
-    TQMimeSource * mime = TQApplication::clipboard()->data();
+    TQMimeSource * mime = TQApplication::tqclipboard()->data();
     if ( !mime )
     {
       KMessageBox::information( this, i18n("There is no data in the clipboard.") );
@@ -200,7 +200,7 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod
       m_cancelled = true;
       return;
     }
-    m_fileArray = TQByteArray(mime->encodedData( "text/plain" ) );
+    m_fileArray = TQByteArray(mime->tqencodedData( "text/plain" ) );
   }
   else if ( mode == File )
   {
@@ -249,7 +249,7 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod
   fillSheet();
   fillComboBox();
 
-  resize(sizeHint());
+  resize(tqsizeHint());
 
   m_sheet->setSelectionMode(TQTable::NoSelection);