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

7 files changed, 70 insertions, 70 deletions

diff --git a/kexi/plugins/importexport/csv/kexicsvexport.cpp b/kexi/plugins/importexport/csv/kexicsvexport.cpp
index f3347676..bbd678cc 100644
--- a/kexi/plugins/importexport/csv/kexicsvexport.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvexport.cpp
@@ -32,7 +32,7 @@
 
 #include <tqcheckbox.h>
 #include <tqgroupbox.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <kapplication.h>
 #include <klocale.h>
 #include <kiconloader.h>
@@ -252,7 +252,7 @@ bool KexiCSVExport::exportData(KexiDB::TableOrQuerySchema& tableOrQuery,
 	}
 
 	if (copyToClipboard)
-		kapp->tqclipboard()->setText(buffer, TQClipboard::Clipboard);
+		kapp->clipboard()->setText(buffer, TQClipboard::Clipboard);
 
 	delete [] isText;
 	delete [] isDateTime;
diff --git a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
index 6e985901..bd5ad814 100644
--- a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
@@ -32,7 +32,7 @@
 
 #include <tqcheckbox.h>
 #include <tqgroupbox.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <kapplication.h>
 #include <klocale.h>
 #include <kiconloader.h>
@@ -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);
 }
@@ -255,9 +255,9 @@ void KexiCSVExportWizard::showPage ( TQWidget * page )
 		int columns = KexiDB::fieldCount(*m_tableOrQuery);
 		text += "\n";
 		if (m_rowCount>0)
-			text += i18n("(rows: %1, columns: %2)").tqarg(m_rowCount).tqarg(columns);
+			text += i18n("(rows: %1, columns: %2)").arg(m_rowCount).arg(columns);
 		else
-			text += i18n("(columns: %1)").tqarg(columns);
+			text += i18n("(columns: %1)").arg(columns);
 		m_infoLblFrom->setLabelText(text);
 		TQFontMetrics fm(m_infoLblFrom->fileNameLabel()->font());
 		m_infoLblFrom->fileNameLabel()->setFixedHeight( fm.height() * 2 + fm.lineSpacing() );
@@ -346,14 +346,14 @@ void KexiCSVExportWizard::slotShowOptionsButtonClicked()
 	}
 }
 
-void KexiCSVExportWizard::layOutButtonRow( TQHBoxLayout * tqlayout )
+void KexiCSVExportWizard::layOutButtonRow( TQHBoxLayout * layout )
 {
-	TQWizard::layOutButtonRow( tqlayout );
+	TQWizard::layOutButtonRow( layout );
 
-	//find the last subtqlayout
+	//find the last sublayout
 	TQLayout *l = 0;
-	for (TQLayoutIterator lit( tqlayout->iterator() ); lit.current(); ++lit)
-		l = lit.current()->tqlayout();
+	for (TQLayoutIterator lit( layout->iterator() ); lit.current(); ++lit)
+		l = lit.current()->layout();
 	if (dynamic_cast<TQBoxLayout*>(l)) {
 		if (!m_defaultsBtn) {
 			m_defaultsBtn = new KPushButton(i18n("Defaults"), this);
@@ -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/kexicsvexportwizard.h b/kexi/plugins/importexport/csv/kexicsvexportwizard.h
index 27213159..7ef7020d 100644
--- a/kexi/plugins/importexport/csv/kexicsvexportwizard.h
+++ b/kexi/plugins/importexport/csv/kexicsvexportwizard.h
@@ -62,7 +62,7 @@ class KexiCSVExportWizard : public KWizard
 
 	protected:
 		//! reimplemented to add "Defaults" button on the left hand
-		virtual void layOutButtonRow( TQHBoxLayout * tqlayout );
+		virtual void layOutButtonRow( TQHBoxLayout * layout );
 
 		//! \return default delimiter depending on mode.
 		TQString defaultDelimiter() const;
diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
index 18398d39..54890c0b 100644
--- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
@@ -27,17 +27,17 @@
 
 #include <tqbuttongroup.h>
 #include <tqcheckbox.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
 #include <tqmime.h>
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
 #include <tqtable.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqfiledialog.h>
 #include <tqpainter.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 #include <tqtimer.h>
 #include <tqfontmetrics.h>
 #include <tqtooltip.h>
@@ -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 );
 
@@ -280,7 +280,7 @@ KexiCSVImportDialog::KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin,
 if ( m_mode == Clipboard )
   {
 	setCaption( i18n( "Inserting From Clipboard" ) );
-	TQMimeSource * mime = TQApplication::tqclipboard()->data();
+	TQMimeSource * mime = TQApplication::clipboard()->data();
 	if ( !mime )
 	{
 	  KMessageBox::information( this, i18n("There is no data in the clipboard.") );
@@ -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 )
   {*/
@@ -336,11 +336,11 @@ if ( m_mode == Clipboard )
 	}
 	else if (m_mode == Clipboard) {
 		TQCString subtype("plain");
-		m_clipboardData = TQApplication::tqclipboard()->text(subtype, TQClipboard::Clipboard);
+		m_clipboardData = TQApplication::clipboard()->text(subtype, TQClipboard::Clipboard);
 /* debug
-		for (int i=0;TQApplication::tqclipboard()->data(TQClipboard::Clipboard)->format(i);i++)
+		for (int i=0;TQApplication::clipboard()->data(TQClipboard::Clipboard)->format(i);i++)
 			kdDebug() << i << ": " 
-				<< TQApplication::tqclipboard()->data(TQClipboard::Clipboard)->format(i) << endl;
+				<< TQApplication::clipboard()->data(TQClipboard::Clipboard)->format(i) << endl;
 */
 	}
 	else {
@@ -352,7 +352,7 @@ if ( m_mode == Clipboard )
 	if (m_mode == File) {
 		m_loadingProgressDlg = new KProgressDialog(
 			this, "m_loadingProgressDlg", i18n("Loading CSV Data"), i18n("Loading CSV Data from \"%1\"...")
-			.tqarg(TQDir::convertSeparators(m_fname)), true);
+			.arg(TQDir::convertSeparators(m_fname)), true);
 		m_loadingProgressDlg->progressBar()->setTotalSteps( m_maximumRowsForPreview+1 );
 		m_loadingProgressDlg->show();
 	}
@@ -440,7 +440,7 @@ bool KexiCSVImportDialog::openData()
 		delete m_file;
 		m_file = 0;
 		KMessageBox::sorry( this, i18n("Cannot open input file <nobr>\"%1\"</nobr>.")
-			.tqarg(TQDir::convertSeparators(m_fname)) );
+			.arg(TQDir::convertSeparators(m_fname)) );
 		actionButton( Ok )->setEnabled( false );
 		m_cancelled = true;
 		if (parentWidget())
@@ -458,7 +458,7 @@ bool KexiCSVImportDialog::cancelled() const
 void KexiCSVImportDialog::fillTable()
 {
 	KexiUtils::WaitCursor wc(true);
-	tqrepaint();
+	repaint();
 	m_blockUserEvents = true;
 	TQPushButton *pb = actionButton(KDialogBase::Cancel);
 	if (pb)
@@ -530,16 +530,16 @@ void KexiCSVImportDialog::fillTable()
 		m_startAtLineSpinBox->setMaxValue(count);
 		m_startAtLineSpinBox->setValue(m_startline+1);
 	}
-	m_startAtLineLabel->setText(i18n( "Start at line%1:").tqarg(
-			m_allRowsLoadedInPreview ? TQString(" (1-%1)").tqarg(count)
+	m_startAtLineLabel->setText(i18n( "Start at line%1:").arg(
+			m_allRowsLoadedInPreview ? TQString(" (1-%1)").arg(count)
 			: TQString() //we do not know what's real count
 	));
 	updateRowCountInfo();
 
 	m_blockUserEvents = false;
-	tqrepaint();
-	m_table->verticalScrollBar()->tqrepaint();//avoid missing tqrepaint
-	m_table->horizontalScrollBar()->tqrepaint();//avoid missing tqrepaint
+	repaint();
+	m_table->verticalScrollBar()->repaint();//avoid missing repaint
+	m_table->horizontalScrollBar()->repaint();//avoid missing repaint
 }
 
 TQString KexiCSVImportDialog::detectDelimiterByLookingAtFirstBytesOfFile(TQTextStream& inputStream)
@@ -548,7 +548,7 @@ TQString KexiCSVImportDialog::detectDelimiterByLookingAtFirstBytesOfFile(TQTextS
 
 	// try to detect delimiter
 	// \t has priority, then ; then ,
-	const TQIODevice::Offset origOffset = inputStream.tqdevice()->at();
+	const TQIODevice::Offset origOffset = inputStream.device()->at();
 	TQChar c, prevChar=0;
 	int detectedDelimiter = 0;
 	bool insideQuote = false;
@@ -601,7 +601,7 @@ TQString KexiCSVImportDialog::detectDelimiterByLookingAtFirstBytesOfFile(TQTextS
 		prevChar = c;
 	}
 
-	inputStream.tqdevice()->at(origOffset); //restore orig. offset
+	inputStream.device()->at(origOffset); //restore orig. offset
 
 	//now, try to find a delimiter character that exists the same number of times in all the checked lines
 	//this detection method has priority over others
@@ -705,9 +705,9 @@ tristate KexiCSVImportDialog::loadRows(TQString &field, int &row, int &column, i
 		if (x == '\r') {
 			continue; // eat '\r', to handle RFC-compliant files
 		}
-		if (offset==0 && x.tqunicode()==0xfeff) {
+		if (offset==0 && x.unicode()==0xfeff) {
 			// Ignore BOM, the "Byte Order Mark" 
-			// (http://en.wikipedia.org/wiki/Byte_Order_Mark, // http://www.tqunicode.org/charts/PDF/UFFF0.pdf)
+			// (http://en.wikipedia.org/wiki/Byte_Order_Mark, // http://www.unicode.org/charts/PDF/UFFF0.pdf)
 			// Probably fixed in TQt4.
 			continue;
 		}
@@ -882,7 +882,7 @@ tristate KexiCSVImportDialog::loadRows(TQString &field, int &row, int &column, i
 			m_1stRowForFieldNames->setChecked(true); //this will reload table
 			//slot1stRowForFieldNamesChanged(1);
 			m_blockUserEvents = false;
-			tqrepaint();
+			repaint();
 			return false;
 		}
 
@@ -926,7 +926,7 @@ void KexiCSVImportDialog::updateColumnText(int col)
 	if (col<(int)m_columnNames.count() && (m_1stRowForFieldNames->isChecked() || m_changedColumnNames[col]))
 		colName = m_columnNames[ col ];
 	if (colName.isEmpty()) {
-		colName = i18n("Column %1").tqarg(col+1); //will be changed to a valid identifier on import
+		colName = i18n("Column %1").arg(col+1); //will be changed to a valid identifier on import
 		m_changedColumnNames[ col ] = false;
 	}
 	int detectedType = m_detectedTypes[col];
@@ -937,7 +937,7 @@ void KexiCSVImportDialog::updateColumnText(int col)
 		detectedType=_TEXT_TYPE;
 	}
 	m_table->horizontalHeader()->setLabel(col, 
-		i18n("Column %1").tqarg(col+1) + "  \n(" + m_typeNames[ detectedType ] + ")  ");
+		i18n("Column %1").arg(col+1) + "  \n(" + m_typeNames[ detectedType ] + ")  ");
 	m_table->setText(0, col, colName);
 	m_table->horizontalHeader()->adjustHeaderSize();
 
@@ -1108,8 +1108,8 @@ void KexiCSVImportDialog::setText(int row, int col, const TQString& text, bool i
 			TQCString t(text.latin1());
 			const int textLen = t.length();
 			for (int i=0; i<textLen; i++) {
-				if (t.tqat(i)==',') {
-					t.tqat(i) = '.';
+				if (t.at(i)==',') {
+					t.at(i) = '.';
 					break;
 				}
 			}
@@ -1295,7 +1295,7 @@ void KexiCSVImportDialog::currentCellChanged(int, int col)
 		type=_NUMBER_TYPE; //we're simplifying that for now
 
 	m_formatCombo->setCurrentItem( type );
-	m_formatLabel->setText( m_formatComboText.tqarg(col+1) );
+	m_formatLabel->setText( m_formatComboText.arg(col+1) );
 	m_primaryKeyField->setEnabled( _NUMBER_TYPE == m_detectedTypes[col]);
 	m_primaryKeyField->blockSignals(true); //block to disable executing slotPrimaryKeyFieldToggled()
 	 m_primaryKeyField->setChecked( m_primaryKeyColumn == col );
@@ -1522,7 +1522,7 @@ void KexiCSVImportDialog::accept()
 		}
 		m_importingProgressDlg->setLabel(
 			i18n("Importing CSV Data from <nobr>\"%1\"</nobr> into \"%2\" table...")
-			.tqarg(TQDir::convertSeparators(m_fname)).tqarg(m_destinationTableSchema->name()) );
+			.arg(TQDir::convertSeparators(m_fname)).arg(m_destinationTableSchema->name()) );
 		m_importingProgressDlg->progressBar()->setTotalSteps( TQFileInfo(*m_file).size() );
 		m_importingProgressDlg->show();
 	}
@@ -1569,7 +1569,7 @@ void KexiCSVImportDialog::accept()
 
 	TQDialog::accept();
 	KMessageBox::information(this, i18n("Data has been successfully imported to table \"%1\".")
-		.tqarg(m_destinationTableSchema->name()));
+		.arg(m_destinationTableSchema->name()));
 	parentWidget()->raise();
 	m_conn = 0;
 }
@@ -1651,12 +1651,12 @@ void KexiCSVImportDialog::updateRowCountInfo()
 	m_infoLbl->setFileName( m_fname );
 	if (m_allRowsLoadedInPreview) {
 		m_infoLbl->setCommentText( 
-			i18n("row count", "(rows: %1)").tqarg( m_table->numRows()-1+m_startline ) );
+			i18n("row count", "(rows: %1)").arg( m_table->numRows()-1+m_startline ) );
 		TQToolTip::remove( m_infoLbl );
 	}
 	else {
 		m_infoLbl->setCommentText( 
-			i18n("row count", "(rows: more than %1)").tqarg( m_table->numRows()-1+m_startline ) );
+			i18n("row count", "(rows: more than %1)").arg( m_table->numRows()-1+m_startline ) );
 		TQToolTip::add( m_infoLbl->commentLabel(), i18n("Not all rows are visible on this preview") );
 	}
 }
diff --git a/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp b/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp
index ed1a5b30..bf64aad5 100644
--- a/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp
@@ -21,8 +21,8 @@
 #include <widget/kexicharencodingcombobox.h>
 
 #include <tqlabel.h>
-#include <tqlayout.h>
-#include <tqtextcodec.h>
+#include <layout.h>
+#include <textcodec.h>
 #include <tqcheckbox.h>
 
 #include <kapplication.h>
@@ -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..53ba28c3 100644
--- a/kexi/plugins/importexport/csv/kexicsvwidgets.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvwidgets.cpp
@@ -21,7 +21,7 @@
 
 #include <tqdir.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <klocale.h>
 #include <klineedit.h>
@@ -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);
diff --git a/kexi/plugins/importexport/csv/kexicsvwidgets.h b/kexi/plugins/importexport/csv/kexicsvwidgets.h
index 3c420c7a..76f76d31 100644
--- a/kexi/plugins/importexport/csv/kexicsvwidgets.h
+++ b/kexi/plugins/importexport/csv/kexicsvwidgets.h
@@ -46,7 +46,7 @@ class KexiCSVInfoLabel : public TQWidget
 		 setFileName() can be used to display filename and setCommentAfterFileName() to display 
 		 additional comment.
 
-		 The widget's tqlayout can look like this:
+		 The widget's layout can look like this:
 
 		 \pre [icon] [labeltext] [filename] [comment]
 		*/