Remove additional unneeded tq method conversions

2 files changed, 22 insertions, 22 deletions

diff --git a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
index e89f6a65..94642d38 100644
--- a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
@@ -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() );
diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
index 5dd04ed9..69942a79 100644
--- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
@@ -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
@@ -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") );
 	}
 }