Rename old tq methods that no longer need a unique name

4 files changed, 26 insertions, 26 deletions

diff --git a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
index 6e985901..e89f6a65 100644
--- a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
@@ -137,12 +137,12 @@ KexiCSVExportWizard::KexiCSVExportWizard( const KexiCSVExport::Options& options,
 		m_exportOptionsPage);
 	connect(m_showOptionsButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotShowOptionsButtonClicked()));
 	exportOptionsLyr->addMultiCellWidget(m_showOptionsButton, 2, 2, 0, 0);
-	m_showOptionsButton->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+	m_showOptionsButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
 
 	// -<options section>
 	m_exportOptionsSection = new TQGroupBox(1,Qt::Vertical, i18n("Options"), m_exportOptionsPage,
 		"m_exportOptionsSection");
-	m_exportOptionsSection->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+	m_exportOptionsSection->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
 	exportOptionsLyr->addMultiCellWidget(m_exportOptionsSection, 3, 3, 0, 1);
 	TQWidget *exportOptionsSectionWidget
 		= new TQWidget(m_exportOptionsSection, "exportOptionsSectionWidget");
@@ -170,7 +170,7 @@ KexiCSVExportWizard::KexiCSVExportWizard( const KexiCSVExport::Options& options,
 
 	// - character encoding
 	m_characterEncodingCombo = new KexiCharacterEncodingComboBox( exportOptionsSectionWidget );
-	m_characterEncodingCombo->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+	m_characterEncodingCombo->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
 	exportOptionsSectionLyr->addWidget( m_characterEncodingCombo, 2, 1 );
 	TQLabel *characterEncodingLabel = new TQLabel(m_characterEncodingCombo, i18n("Text encoding:"),
 		exportOptionsSectionWidget);
@@ -222,8 +222,8 @@ KexiCSVExportWizard::KexiCSVExportWizard( const KexiCSVExport::Options& options,
 	updateGeometry();
 
 	// -keep widths equal on page #2:
-	int width = TQMAX( m_infoLblFrom->leftLabel()->tqsizeHint().width(),
-		m_infoLblTo->leftLabel()->tqsizeHint().width());
+	int width = TQMAX( m_infoLblFrom->leftLabel()->sizeHint().width(),
+		m_infoLblTo->leftLabel()->sizeHint().width());
 	m_infoLblFrom->leftLabel()->setFixedWidth(width);
 	m_infoLblTo->leftLabel()->setFixedWidth(width);
 }
@@ -376,7 +376,7 @@ void KexiCSVExportWizard::slotDefaultsButtonClicked()
 
 static TQString convertKey(const char *key, KexiCSVExport::Mode mode)
 {
-	TQString _key(TQString::tqfromLatin1(key));
+	TQString _key(TQString::fromLatin1(key));
 	if (mode == KexiCSVExport::Clipboard) {
 		_key.replace("Exporting", "Copying");
 		_key.replace("Export", "Copy");
diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
index 18398d39..5dd04ed9 100644
--- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
@@ -192,7 +192,7 @@ KexiCSVImportDialog::KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin,
 	setIcon(DesktopIcon(_IMPORT_ICON));
 	setSizeGripEnabled( TRUE );
 
-//	m_encoding = TQString::tqfromLatin1(KGlobal::locale()->encoding());
+//	m_encoding = TQString::fromLatin1(KGlobal::locale()->encoding());
 //	m_stripWhiteSpaceInTextValuesChecked = true;
 	m_file = 0;
 	m_inputStream = 0;
@@ -216,7 +216,7 @@ KexiCSVImportDialog::KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin,
 	glyr->addMultiCellWidget( m_delimiterWidget, 1, 2, 0, 0 );
 
 	TQLabel *delimiterLabel = new TQLabel(m_delimiterWidget, i18n("Delimiter:"), page);
-	delimiterLabel->tqsetAlignment(TQt::AlignAuto | TQt::AlignBottom);
+	delimiterLabel->setAlignment(TQt::AlignAuto | TQt::AlignBottom);
 	glyr->addMultiCellWidget( delimiterLabel, 0, 0, 0, 0 );
 
 	// Format: number, text, currency,
@@ -230,7 +230,7 @@ KexiCSVImportDialog::KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin,
 	glyr->addMultiCellWidget( m_formatCombo, 1, 1, 1, 1 );
 
 	m_formatLabel = new TQLabel(m_formatCombo, "", page);
-	m_formatLabel->tqsetAlignment(TQt::AlignAuto | TQt::AlignBottom);
+	m_formatLabel->setAlignment(TQt::AlignAuto | TQt::AlignBottom);
 	glyr->addWidget( m_formatLabel, 0, 1 );
 
 	m_primaryKeyField = new TQCheckBox( i18n( "Primary key" ), page, "m_primaryKeyField" );
@@ -241,20 +241,20 @@ KexiCSVImportDialog::KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin,
 	glyr->addWidget( m_comboQuote, 1, 2 );
 
 	TextLabel2 = new TQLabel( m_comboQuote, i18n( "Text quote:" ), page, "TextLabel2" );
-	TextLabel2->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Preferred );
-	TextLabel2->tqsetAlignment(TQt::AlignAuto | TQt::AlignBottom);
+	TextLabel2->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Preferred );
+	TextLabel2->setAlignment(TQt::AlignAuto | TQt::AlignBottom);
 	glyr->addWidget( TextLabel2, 0, 2 );
 
 	m_startAtLineSpinBox = new KIntSpinBox( page, "m_startAtLineSpinBox" );
 	m_startAtLineSpinBox->setMinValue(1);
-	m_startAtLineSpinBox->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
+	m_startAtLineSpinBox->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
 	m_startAtLineSpinBox->setMinimumWidth(TQFontMetrics(m_startAtLineSpinBox->font()).width("8888888"));
 	glyr->addWidget( m_startAtLineSpinBox, 1, 3 );
 
 	m_startAtLineLabel = new TQLabel( m_startAtLineSpinBox, "", 
 		page, "TextLabel3" );
-	m_startAtLineLabel->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Preferred );
-	m_startAtLineLabel->tqsetAlignment(TQt::AlignAuto | TQt::AlignBottom);
+	m_startAtLineLabel->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Preferred );
+	m_startAtLineLabel->setAlignment(TQt::AlignAuto | TQt::AlignBottom);
 	glyr->addWidget( m_startAtLineLabel, 0, 3 );
 
 	TQSpacerItem* spacer_2 = new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Preferred );
@@ -271,7 +271,7 @@ KexiCSVImportDialog::KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin,
 	m_table = new KexiCSVImportDialogTable( plainPage(), "m_table" );
 	lyr->addWidget( m_table );
 
-	m_table->tqsetSizePolicy( TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding, 1, 1) );
+	m_table->setSizePolicy( TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding, 1, 1) );
 	m_table->setNumRows( 0 );
 	m_table->setNumCols( 0 );
 
@@ -294,7 +294,7 @@ if ( m_mode == Clipboard )
 	  m_cancelled = true;
 	  return;
 	}
-	m_fileArray = TQByteArray(mime->tqencodedData( "text/plain" ) );
+	m_fileArray = TQByteArray(mime->encodedData( "text/plain" ) );
   }
   else if ( mode == File )
   {*/
diff --git a/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp b/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp
index ed1a5b30..49b72323 100644
--- a/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp
@@ -37,7 +37,7 @@ KexiCSVImportOptions::KexiCSVImportOptions()
 	kapp->config()->setGroup("ImportExport");
 	encoding = kapp->config()->readEntry("DefaultEncodingForImportingCSVFiles");
 	if (encoding.isEmpty()) {
-		encoding = TQString::tqfromLatin1(KGlobal::locale()->encoding());
+		encoding = TQString::fromLatin1(KGlobal::locale()->encoding());
 		defaultEncodingExplicitySet = false;
 	}
 	else
diff --git a/kexi/plugins/importexport/csv/kexicsvwidgets.cpp b/kexi/plugins/importexport/csv/kexicsvwidgets.cpp
index 48d907b9..aaa96908 100644
--- a/kexi/plugins/importexport/csv/kexicsvwidgets.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvwidgets.cpp
@@ -57,7 +57,7 @@ KexiCSVDelimiterWidget::KexiCSVDelimiterWidget( bool lineEditOnBottom, TQWidget
 	setFocusProxy(m_combo);
 
 	m_delimiterEdit = new KLineEdit( this, "m_delimiterEdit" );
-//  m_delimiterEdit->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, m_delimiterEdit->sizePolicy().hasHeightForWidth() ) );
+//  m_delimiterEdit->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, m_delimiterEdit->sizePolicy().hasHeightForWidth() ) );
 	m_delimiterEdit->setMaximumSize( TQSize( 30, 32767 ) );
 	m_delimiterEdit->setMaxLength(1);
 	lyr->addWidget( m_delimiterEdit );
@@ -162,19 +162,19 @@ KexiCSVInfoLabel::KexiCSVInfoLabel( const TQString& labelText, TQWidget* parent
 	vbox->addLayout(hbox);
 	m_leftLabel = new TQLabel(labelText, this);
 	m_leftLabel->setMinimumWidth(130);
-	m_leftLabel->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred);
-	m_leftLabel->tqsetAlignment(TQt::AlignVCenter | TQt::AlignLeft | TQt::WordBreak);
+	m_leftLabel->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred);
+	m_leftLabel->setAlignment(TQt::AlignVCenter | TQt::AlignLeft | TQt::WordBreak);
 	hbox->addWidget(m_leftLabel);
 	m_iconLbl = new TQLabel(this);
-	m_iconLbl->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred);
-	m_iconLbl->tqsetAlignment(TQt::AlignVCenter | TQt::AlignLeft);
+	m_iconLbl->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred);
+	m_iconLbl->setAlignment(TQt::AlignVCenter | TQt::AlignLeft);
 	m_fnameLbl = new KActiveLabel(this);
 	m_fnameLbl->setFocusPolicy(TQ_NoFocus);
 	m_fnameLbl->setTextFormat(TQt::PlainText);
-	m_fnameLbl->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding,1,0));
+	m_fnameLbl->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding,1,0));
 	m_fnameLbl->setLineWidth(1);
 	m_fnameLbl->setFrameStyle(TQFrame::Box);
-	m_fnameLbl->tqsetAlignment(TQt::AlignVCenter | TQt::AlignLeft | TQt::WordBreak);
+	m_fnameLbl->setAlignment(TQt::AlignVCenter | TQt::AlignLeft | TQt::WordBreak);
 	hbox->addSpacing(5);
 	hbox->addWidget(m_iconLbl);
 	hbox->addWidget(m_fnameLbl, 1, TQt::AlignVCenter | TQt::AlignLeft | TQt::WordBreak);
@@ -182,10 +182,10 @@ KexiCSVInfoLabel::KexiCSVInfoLabel( const TQString& labelText, TQWidget* parent
 	m_commentLbl = new KActiveLabel(this);
 	m_commentLbl->setFocusPolicy(TQ_NoFocus);
 	m_commentLbl->setTextFormat(TQt::PlainText);
-	m_commentLbl->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+	m_commentLbl->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
 	m_commentLbl->setLineWidth(1);
 	m_commentLbl->setFrameStyle(TQFrame::Box);
-	m_commentLbl->tqsetAlignment(TQt::AlignVCenter | TQt::AlignLeft | TQt::WordBreak);
+	m_commentLbl->setAlignment(TQt::AlignVCenter | TQt::AlignLeft | TQt::WordBreak);
 	hbox->addWidget(m_commentLbl, 0, TQt::AlignVCenter | TQt::AlignRight | TQt::WordBreak);
 
 	m_separator = new TQFrame(this);