Remove additional unneeded tq method conversions

4 files changed, 38 insertions, 38 deletions

diff --git a/conduits/docconduit/DOC-converter.cc b/conduits/docconduit/DOC-converter.cc
index d983b1c..6502fe5 100644
--- a/conduits/docconduit/DOC-converter.cc
+++ b/conduits/docconduit/DOC-converter.cc
@@ -120,8 +120,8 @@ int docRegExpBookmark::findMatches(TQString doctext, bmkList &fBookmarks)
 					// TODO: use the subexpressions from the regexp for the bmk name ($1..$9) (given as separate regexp)
 					TQString bmkText(bmkName);
 					for (int i=0; i<=rx.numCaptures(); ++i) {
-						bmkText.replace(CSL1("$%1").tqarg(i), rx.cap(i));
-						bmkText.replace(CSL1("\\%1").tqarg(i), rx.cap(i));
+						bmkText.replace(CSL1("$%1").arg(i), rx.cap(i));
+						bmkText.replace(CSL1("\\%1").arg(i), rx.cap(i));
 					}
 					fBookmarks.append(new docBookmark(bmkText.left(16), pos));
 				}
@@ -195,7 +195,7 @@ TQString DOCConverter::readText() {
 	TQFile docfile(txtfilename);
 	if (!docfile.open(IO_ReadOnly))
 	{
-		emit logError(i18n("Unable to open text file %1 for reading.").tqarg(txtfilename));
+		emit logError(i18n("Unable to open text file %1 for reading.").arg(txtfilename));
 		return TQString();
 	}
 
@@ -437,7 +437,7 @@ bool DOCConverter::convertTXTtoPDB() {
 #endif
 
 	if (!docdb->isOpen()) {
-		emit logError(i18n("Unable to open palm doc database %1").tqarg(docdb->dbPathName()) );
+		emit logError(i18n("Unable to open palm doc database %1").arg(docdb->dbPathName()) );
 		return false;
 	}
 
@@ -520,7 +520,7 @@ bool DOCConverter::convertPDBtoTXT()
 	PilotRecord*headerRec = docdb->readRecordByIndex(0);
 	if (!headerRec)
 	{
-		emit logError(i18n("Unable to read database header for database %1.").tqarg(docdb->dbPathName()));
+		emit logError(i18n("Unable to read database header for database %1.").arg(docdb->dbPathName()));
 		KPILOT_DELETE(docdb);
 		return false;
 	}
@@ -540,7 +540,7 @@ bool DOCConverter::convertPDBtoTXT()
 	TQFile docfile(txtfilename);
 	if (!docfile.open(IO_WriteOnly))
 	{
-		emit logError(i18n("Unable to open output file %1.").tqarg(txtfilename));
+		emit logError(i18n("Unable to open output file %1.").arg(txtfilename));
 		KPILOT_DELETE(docdb);
 		return false;
 	}
@@ -555,7 +555,7 @@ bool DOCConverter::convertPDBtoTXT()
 			DEBUGKPILOT<<"Record "<<i<<endl;
 			KPILOT_DELETE(rec);
 		} else {
-			emit logMessage(i18n("Could not read text record #%1 from Database %2").tqarg(i).tqarg(docdb->dbPathName()));
+			emit logMessage(i18n("Could not read text record #%1 from Database %2").arg(i).arg(docdb->dbPathName()));
 		}
 	}
 
@@ -574,7 +574,7 @@ bool DOCConverter::convertPDBtoTXT()
 			bmks.append(bmk);
 			KPILOT_DELETE(rec);
 		} else {
-			emit logMessage(i18n("Could not read bookmark record #%1 from Database %2").tqarg(i).tqarg(docdb->dbPathName()));
+			emit logMessage(i18n("Could not read bookmark record #%1 from Database %2").arg(i).arg(docdb->dbPathName()));
 		}
 	}
 	// TODO: Sort the list of bookmarks according to their position
@@ -592,7 +592,7 @@ bool DOCConverter::convertPDBtoTXT()
 		if (!bmkfile.open(IO_WriteOnly))
 		{
 			emit logError(i18n("Unable to open file %1 for the bookmarks of %2.")
-				.tqarg(bmkfilename).tqarg(docdb ->dbPathName()));
+				.arg(bmkfilename).arg(docdb ->dbPathName()));
 		}
 		else
 		{
diff --git a/conduits/docconduit/doc-conduit.cc b/conduits/docconduit/doc-conduit.cc
index 287b443..31a075b 100644
--- a/conduits/docconduit/doc-conduit.cc
+++ b/conduits/docconduit/doc-conduit.cc
@@ -378,10 +378,10 @@ bool DOCConduit::doSync(docSyncInfo &sinfo)
 
 		if (!postSyncAction(database, sinfo, res))
 			emit logError(i18n("Unable to install the locally created PalmDOC %1 to the handheld.")
-				.tqarg(TQString::fromLatin1(sinfo.dbinfo.name)));
+				.arg(TQString::fromLatin1(sinfo.dbinfo.name)));
 		if (!res)
 			emit logError(i18n("Conversion of PalmDOC \"%1\" failed.")
-				.tqarg(TQString::fromLatin1(sinfo.dbinfo.name)));
+				.arg(TQString::fromLatin1(sinfo.dbinfo.name)));
 //		disconnect(&docconverter, TQT_SIGNAL(logError(const TQString &)), TQT_SIGNAL(logError(const TQString &)));
 //		disconnect(&docconverter, TQT_SIGNAL(logMessage(const TQString &)), TQT_SIGNAL(logMessage(const TQString &)));
 //		KPILOT_DELETE(database);
@@ -389,7 +389,7 @@ bool DOCConduit::doSync(docSyncInfo &sinfo)
 	else
 	{
 		emit logError(i18n("Unable to open or create the database %1.")
-			.tqarg(TQString::fromLatin1(sinfo.dbinfo.name)));
+			.arg(TQString::fromLatin1(sinfo.dbinfo.name)));
 	}
 	return res;
 }
@@ -665,7 +665,7 @@ void DOCConduit::syncDatabases() {
 		case eSyncDelete:
 		case eSyncPDAToPC:
 		case eSyncPCToPDA:
-			emit logMessage(i18n("Synchronizing text \"%1\"").tqarg(sinfo.handheldDB));
+			emit logMessage(i18n("Synchronizing text \"%1\"").arg(sinfo.handheldDB));
 			if (!doSync(sinfo)) {
 				// The sync could not be done, so inform the user (the error message should probably issued inside doSync)
 #ifdef DEBUG
diff --git a/conduits/docconduit/doc-conflictdialog.cc b/conduits/docconduit/doc-conflictdialog.cc
index beb6749..9c9e034 100644
--- a/conduits/docconduit/doc-conflictdialog.cc
+++ b/conduits/docconduit/doc-conflictdialog.cc
@@ -168,9 +168,9 @@ void ResolutionDialog::slotInfo(int index) {
 	int ix=cE.index;
 	if (!syncInfo) return;
 	docSyncInfo si=(*syncInfo)[ix];
-	TQString text=i18n("Status of the database %1:\n\n").tqarg(si.handheldDB);
-	text+=i18n("Handheld: %1\n").tqarg(eTexStatusToString(si.fPalmStatus));
-	text+=i18n("Desktop: %1\n").tqarg(eTexStatusToString(si.fPCStatus));
+	TQString text=i18n("Status of the database %1:\n\n").arg(si.handheldDB);
+	text+=i18n("Handheld: %1\n").arg(eTexStatusToString(si.fPalmStatus));
+	text+=i18n("Desktop: %1\n").arg(eTexStatusToString(si.fPCStatus));
 
 	KMessageBox::information(this, text, i18n("Database information"));
 }
diff --git a/conduits/docconduit/kpalmdoc_dlg.cc b/conduits/docconduit/kpalmdoc_dlg.cc
index 728c2c3..20e8d2f 100644
--- a/conduits/docconduit/kpalmdoc_dlg.cc
+++ b/conduits/docconduit/kpalmdoc_dlg.cc
@@ -175,8 +175,8 @@ void ConverterDlg::slotToText()
 			int res=KMessageBox::questionYesNo(this,
 				i18n("<qt>You selected to sync folders, "
 				"but gave a filename instead (<em>%1</em>)."
-				"<br>Use folder <em>%2</em> instead?</qt>").tqarg(pdburl)
-				.tqarg(pdbinfo.dirPath(true)), TQString(), i18n("Use Folder"), KStdGuiItem::cancel());
+				"<br>Use folder <em>%2</em> instead?</qt>").arg(pdburl)
+				.arg(pdbinfo.dirPath(true)), TQString(), i18n("Use Folder"), KStdGuiItem::cancel());
 			if (res==KMessageBox::Yes)
 			{
 				pdburl=pdbinfo.dirPath(true);
@@ -191,7 +191,7 @@ void ConverterDlg::slotToText()
 			KMessageBox::sorry(this,
 				i18n("<qt>The folder <em>%1</em> for "
 				"the handheld database files is not a valid "
-				"folder.</qt>").tqarg(pdburl));
+				"folder.</qt>").arg(pdburl));
 			return;
 		}
 
@@ -200,7 +200,7 @@ void ConverterDlg::slotToText()
 			KMessageBox::sorry(this,
 				i18n("<qt>The folder <em>%1</em> for "
 				"the handheld database files is not a "
-				"valid directory.</qt>").tqarg(pdburl));
+				"valid directory.</qt>").arg(pdburl));
 			return;
 		}
 
@@ -211,8 +211,8 @@ void ConverterDlg::slotToText()
 			int res=KMessageBox::questionYesNo(this,
 				i18n("<qt>You selected to sync folders, "
 				"but gave a filename instead (<em>%1</em>)."
-				"<br>Use folder <em>%2</em> instead?</qt>").tqarg(txturl)
-				.tqarg(txtinfo.dirPath(true)), TQString(), i18n("Use Folder"), KStdGuiItem::cancel());
+				"<br>Use folder <em>%2</em> instead?</qt>").arg(txturl)
+				.arg(txtinfo.dirPath(true)), TQString(), i18n("Use Folder"), KStdGuiItem::cancel());
 			if (res==KMessageBox::Yes) {
 				txturl=txtinfo.dirPath(true);
 				txtinfo.setFile(txturl);
@@ -227,7 +227,7 @@ void ConverterDlg::slotToText()
 		if (!txtinfo.isDir()) {
 			KMessageBox::sorry(this,
 				i18n("<qt>The folder <em>%1</em> for "
-				"the text files could not be created.</qt>").tqarg(txturl));
+				"the text files could not be created.</qt>").arg(txturl));
 			return;
 		}
 
@@ -265,7 +265,7 @@ void ConverterDlg::slotToText()
 		if (!pdbinfo.isFile() || !pdbinfo.exists())
 		{
 			KMessageBox::sorry(this, i18n("<qt>The file <em>%1</em> does not "
-				"exist.</qt>").tqarg(pdburl));
+				"exist.</qt>").arg(pdburl));
 			return;
 		}
 
@@ -274,13 +274,13 @@ void ConverterDlg::slotToText()
 		if (!txtinfo.isFile())
 		{
 			KMessageBox::sorry(this, i18n("<qt>The filename <em>%1</em> for the "
-				"text is not a valid filename.</qt>").tqarg(txturl));
+				"text is not a valid filename.</qt>").arg(txturl));
 			return;
 		}*/
 		if (convertPDBtoTXT(pdbinfo.dirPath(true), pdbinfo.fileName(),
 				txtinfo.dirPath(true), txtinfo.fileName(), &conv) )
 		{
-			KMessageBox::information(this, i18n("Conversion of file %1 successful.").tqarg(pdburl));
+			KMessageBox::information(this, i18n("Conversion of file %1 successful.").arg(pdburl));
 		}
 
 	}
@@ -324,8 +324,8 @@ void ConverterDlg::slotToPDB()
 			int res=KMessageBox::questionYesNo(this,
 				i18n("<qt>You selected to sync folders, "
 				"but gave a filename instead (<em>%1</em>)."
-				"<br>Use folder <em>%2</em> instead?</qt>").tqarg(txturl)
-				.tqarg(txtinfo.dirPath(true)), TQString(), i18n("Use Folder"), KStdGuiItem::cancel());
+				"<br>Use folder <em>%2</em> instead?</qt>").arg(txturl)
+				.arg(txtinfo.dirPath(true)), TQString(), i18n("Use Folder"), KStdGuiItem::cancel());
 			if (res==KMessageBox::Yes)
 			{
 				txturl=txtinfo.dirPath(true);
@@ -338,7 +338,7 @@ void ConverterDlg::slotToPDB()
 		{
 			KMessageBox::sorry(this,
 				i18n("<qt>The folder <em>%1</em> for "
-				"the text files is not a valid folder.</qt>").tqarg(txturl));
+				"the text files is not a valid folder.</qt>").arg(txturl));
 			return;
 		}
 
@@ -350,8 +350,8 @@ void ConverterDlg::slotToPDB()
 				i18n("<qt>You selected to sync folders, "
 				"but gave a filename instead (<em>%1</em>)."
 				"<br>Use folder <em>%2</em> instead?</qt>")
-				.tqarg(pdburl)
-				.tqarg(pdbinfo.dirPath(true)), TQString(), i18n("Use Folder"), KStdGuiItem::cancel());
+				.arg(pdburl)
+				.arg(pdbinfo.dirPath(true)), TQString(), i18n("Use Folder"), KStdGuiItem::cancel());
 			if (res==KMessageBox::Yes) {
 				pdburl=pdbinfo.dirPath(true);
 				pdbinfo.setFile(pdburl);
@@ -365,7 +365,7 @@ void ConverterDlg::slotToPDB()
 		}
 		if (!pdbinfo.isDir()) {
 			KMessageBox::sorry(this, i18n("<qt>The folder <em>%1</em> for "
-				"the PalmDOC files could not be created.</qt>").tqarg(pdburl));
+				"the PalmDOC files could not be created.</qt>").arg(pdburl));
 			return;
 		}
 
@@ -403,14 +403,14 @@ void ConverterDlg::slotToPDB()
 		if (!txtinfo.isFile() || !txtinfo.exists())
 		{
 			KMessageBox::sorry(this, i18n("<qt>The file <em>%1</em> does not "
-				"exist.</qt>").tqarg(txturl));
+				"exist.</qt>").arg(txturl));
 			return;
 		}
 
 		if (convertTXTtoPDB(txtinfo.dirPath(true), txtinfo.fileName(),
 				pdbinfo.dirPath(true), pdbinfo.fileName(), &conv) )
 		{
-			KMessageBox::information(this, i18n("Conversion of file %1 successful.").tqarg(txturl));
+			KMessageBox::information(this, i18n("Conversion of file %1 successful.").arg(txturl));
 		}
 
 	}
@@ -454,7 +454,7 @@ bool ConverterDlg::convertTXTtoPDB(TQString txtdir, TQString txtfile,
 	if (!dbfileinfo.exists() || !askOverwrite ||
 			(KMessageBox::Yes==KMessageBox::questionYesNo(this,
 			i18n("<qt>The database file <em>%1</em> already exists. Overwrite it?</qt>")
-			.tqarg(dbfileinfo.filePath()), TQString(), i18n("Overwrite"), KStdGuiItem::cancel() ) ))
+			.arg(dbfileinfo.filePath()), TQString(), i18n("Overwrite"), KStdGuiItem::cancel() ) ))
 	{
 		PilotLocalDatabase*pdbdb=new PilotLocalDatabase(pdbdir, TQFileInfo(pdbfile).baseName(), false);
 		if (pdbdb)
@@ -479,7 +479,7 @@ bool ConverterDlg::convertTXTtoPDB(TQString txtdir, TQString txtfile,
 		}
 		if ( !res && verbose )
 		{
-			KMessageBox::sorry(this, i18n("<qt>Error while converting the text %1.</qt>").tqarg(txtfile));
+			KMessageBox::sorry(this, i18n("<qt>Error while converting the text %1.</qt>").arg(txtfile));
 		}
 	}
 	else
@@ -499,7 +499,7 @@ bool ConverterDlg::convertPDBtoTXT(TQString pdbdir, TQString pdbfile,
 	if (!txtfileinfo.exists() || !askOverwrite ||
 			(KMessageBox::Yes==KMessageBox::questionYesNo(this,
 			i18n("<qt>The text file <em>%1</em> already exists. Overwrite it?</qt>")
-			.tqarg(txtfileinfo.filePath()), TQString(), i18n("Overwrite"), KStdGuiItem::cancel() ) ))
+			.arg(txtfileinfo.filePath()), TQString(), i18n("Overwrite"), KStdGuiItem::cancel() ) ))
 	{
 		PilotLocalDatabase*pdbdb=new PilotLocalDatabase(pdbdir, TQFileInfo(pdbfile).baseName(), false);
 		if (pdbdb)
@@ -515,7 +515,7 @@ bool ConverterDlg::convertPDBtoTXT(TQString pdbdir, TQString pdbfile,
 		}
 		if ( !res && verbose )
 		{
-			KMessageBox::sorry(this, i18n("<qt>Error while converting the text %1.</qt>").tqarg(pdbfile));
+			KMessageBox::sorry(this, i18n("<qt>Error while converting the text %1.</qt>").arg(pdbfile));
 		}
 	}
 	else