Remove additional unneeded tq method conversions

17 files changed, 90 insertions, 90 deletions

diff --git a/conduits/abbrowserconduit/KPilotCustomFieldEditor.ui b/conduits/abbrowserconduit/KPilotCustomFieldEditor.ui
index 50a2b14..ba3b204 100644
--- a/conduits/abbrowserconduit/KPilotCustomFieldEditor.ui
+++ b/conduits/abbrowserconduit/KPilotCustomFieldEditor.ui
@@ -141,7 +141,7 @@
                     <property name="text">
                         <string>If you let KPilot sync the handheld's custom fields as custom fields on the PC, you can change the values here. Note, however, that for all other settings the values entered here will have no effect.</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>WordBreak|AlignVCenter</set>
                     </property>
                 </widget>
@@ -225,7 +225,7 @@
                         <string>These values indicate the state of the record for KPilot, and connect an entry on the handheld with an entry on the PC.
 Do NOT change these values: doing so will almost certainly result in data loss when you next do a sync.</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>WordBreak|AlignVCenter</set>
                     </property>
                 </widget>
diff --git a/conduits/abbrowserconduit/abbrowser-conduit.cc b/conduits/abbrowserconduit/abbrowser-conduit.cc
index 59dc242..8ccb9a2 100644
--- a/conduits/abbrowserconduit/abbrowser-conduit.cc
+++ b/conduits/abbrowserconduit/abbrowser-conduit.cc
@@ -291,7 +291,7 @@ bool AbbrowserConduit::_loadAddressBook()
 				emit logError(i18n("You chose to sync with the file \"%1\", which "
 							"cannot be opened. Please make sure to supply a "
 							"valid file name in the conduit's configuration dialog. "
-							"Aborting the conduit.").tqarg(AbbrowserSettings::fileName()));
+							"Aborting the conduit.").arg(AbbrowserSettings::fileName()));
 				KIO::NetAccess::removeTempFile(fABookFile);
 				stopTickle();
 				return false;
@@ -395,7 +395,7 @@ bool AbbrowserConduit::_saveAddressBook()
 			if(!KIO::NetAccess::upload(fABookFile, AbbrowserSettings::fileName(), 0L)) {
 				emit logError(i18n("An error occurred while uploading \"%1\". You can try to upload "
 					"the temporary local file \"%2\" manually")
-					.tqarg(AbbrowserSettings::fileName()).tqarg(fABookFile));
+					.arg(AbbrowserSettings::fileName()).arg(fABookFile));
 			}
 			else {
 				KIO::NetAccess::removeTempFile(fABookFile);
diff --git a/conduits/abbrowserconduit/kaddressbookConduit.ui b/conduits/abbrowserconduit/kaddressbookConduit.ui
index 7227cc7..e942d8e 100644
--- a/conduits/abbrowserconduit/kaddressbookConduit.ui
+++ b/conduits/abbrowserconduit/kaddressbookConduit.ui
@@ -225,7 +225,7 @@
                                 <property name="text">
                                     <string>&lt;p&gt;Select the default action if an event was modified on both sides here. &lt;/p&gt;</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>WordBreak|AlignJustify|AlignVCenter</set>
                                 </property>
                             </widget>
diff --git a/conduits/abbrowserconduit/resolutionDialog.cc b/conduits/abbrowserconduit/resolutionDialog.cc
index 34e1fb4..89b18f4 100644
--- a/conduits/abbrowserconduit/resolutionDialog.cc
+++ b/conduits/abbrowserconduit/resolutionDialog.cc
@@ -159,7 +159,7 @@ void ResolutionCheckListItem::setCaption(TQString caption)
 
 void ResolutionCheckListItem::updateText()
 {
-	TQString newText(i18n("Entries in the resolution dialog. First the name of the field, then the entry from the Handheld or PC after the colon", "%1: %2").tqarg(fCaption).tqarg(fText));
+	TQString newText(i18n("Entries in the resolution dialog. First the name of the field, then the entry from the Handheld or PC after the colon", "%1: %2").arg(fCaption).arg(fText));
 	newText.replace(TQRegExp(CSL1("\n")),
 		i18n("Denoting newlines in Address entries. No need to translate", " | "));
 	setText(0, newText);
diff --git a/conduits/abbrowserconduit/resolutionDialog_base.ui b/conduits/abbrowserconduit/resolutionDialog_base.ui
index c76ca26..b756a41 100644
--- a/conduits/abbrowserconduit/resolutionDialog_base.ui
+++ b/conduits/abbrowserconduit/resolutionDialog_base.ui
@@ -26,7 +26,7 @@
             <property name="text">
                 <string>The following record was edited both on the handheld and on the PC. Please choose which values shall be synced:</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>
@@ -62,7 +62,7 @@
             <property name="text">
                 <string>Line breaks in any of the entries are denoted by a " | " (without the quotes).</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>
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
diff --git a/conduits/knotes/knotes-action.cc b/conduits/knotes/knotes-action.cc
index 08acbac..ca32913 100644
--- a/conduits/knotes/knotes-action.cc
+++ b/conduits/knotes/knotes-action.cc
@@ -79,7 +79,7 @@ public:
 	int memo() const { return memoId; } ;
 	KNoteID_t note() const { return noteId; } ;
 	inline bool valid() const { return (memoId>0) && (!noteId.isEmpty()) ; } ;
-	TQString toString() const { return CSL1("<%1,%2>").tqarg(noteId).tqarg(memoId); } ;
+	TQString toString() const { return CSL1("<%1,%2>").arg(noteId).arg(memoId); } ;
 
 	static NoteAndMemo findNote(const TQValueList<NoteAndMemo> &,KNoteID_pt note);
 	static NoteAndMemo findMemo(const TQValueList<NoteAndMemo> &,int memo);
@@ -269,7 +269,7 @@ bool KNotesAction::openKNotesResource()
 	}
 	else
 	{
-		emit logError( i18n("Could not load the resource at: %1").tqarg(mURL.path()) );
+		emit logError( i18n("Could not load the resource at: %1").arg(mURL.path()) );
 		return false;
 	}
 }
@@ -853,18 +853,18 @@ void KNotesAction::cleanupMemos()
 	case Init : return CSL1("Init");
 	case NewNotesToPilot :
 		return CSL1("NewNotesToPilot key=%1");
-			// TODO DCOP_REMOVAL .tqarg(fP->fIndex.key());
+			// TODO DCOP_REMOVAL .arg(fP->fIndex.key());
 	case ModifiedNotesToPilot :
 		return CSL1("ModifiedNotesToPilot key=%1");
-			//TODO DCOP_REMOVAL .tqarg(fP->fIndex.key());
+			//TODO DCOP_REMOVAL .arg(fP->fIndex.key());
 	case MemosToKNotes :
 		return CSL1("MemosToKNotes rec=%1")
-			.tqarg(fP->fRecordIndex);
+			.arg(fP->fRecordIndex);
 	case Cleanup : return CSL1("Cleanup");
 	case Done :
 		return CSL1("Done");
 	default :
-		return CSL1("Unknown (%1)").tqarg(fActionStatus);
+		return CSL1("Unknown (%1)").arg(fActionStatus);
 	}
 }
 
diff --git a/conduits/malconduit/mal-conduit.cc b/conduits/malconduit/mal-conduit.cc
index a8d9dec..5aa5883 100644
--- a/conduits/malconduit/mal-conduit.cc
+++ b/conduits/malconduit/mal-conduit.cc
@@ -217,7 +217,7 @@ bool MALConduit::skip()
 				syncMessage = i18n("No proxy server is set.");
 				break;
 			}
-			syncMessage = i18n("Using proxy server: %1").tqarg(proxyServer);
+			syncMessage = i18n("Using proxy server: %1").arg(proxyServer);
 
 #ifdef DEBUG
 			DEBUGKPILOT<<" Using HTTP proxy server \""<<proxyServer<<
@@ -259,7 +259,7 @@ bool MALConduit::skip()
 				syncMessage = i18n("No SOCKS proxy is set.");
 				break;
 			}
-			syncMessage = i18n("Using SOCKS proxy: %1").tqarg(proxyServer);
+			syncMessage = i18n("Using SOCKS proxy: %1").arg(proxyServer);
 #ifdef DEBUG
 			DEBUGKPILOT<<" Using SOCKS proxy server \""<<proxyServer<<"\",  Port "<<proxyPort<<", User "<<MALConduitSettings::proxyUser()<<", Password "<<( (MALConduitSettings::proxyPassword().isEmpty())?TQString("not "):TQString() )<<"set"<<endl;
 #endif
diff --git a/conduits/memofileconduit/memofile-conduit.cc b/conduits/memofileconduit/memofile-conduit.cc
index 5a26ee7..1334b10 100644
--- a/conduits/memofileconduit/memofile-conduit.cc
+++ b/conduits/memofileconduit/memofile-conduit.cc
@@ -120,7 +120,7 @@ MemofileConduit::~MemofileConduit()
 	fCtrPC->setStartCount(_memofiles->count());
 
 	setFirstSync( _memofiles->isFirstSync() );
-	addSyncLogEntry(i18n(" Syncing with %1.").tqarg(_memo_directory));
+	addSyncLogEntry(i18n(" Syncing with %1.").arg(_memo_directory));
 
 	if ( (syncMode() == SyncAction::SyncMode::eCopyHHToPC) || _memofiles->isFirstSync() ) {
 		addSyncLogEntry(i18n(" Copying Pilot to PC..."));
diff --git a/conduits/notepadconduit/notepad-conduit.cc b/conduits/notepadconduit/notepad-conduit.cc
index 942dbd3..10d9bf7 100644
--- a/conduits/notepadconduit/notepad-conduit.cc
+++ b/conduits/notepadconduit/notepad-conduit.cc
@@ -76,7 +76,7 @@ NotepadConduit::~NotepadConduit()
 
 	TQDir dir(NotepadConduitSettings::outputDirectory());
 	if(!dir.exists() && !dir.mkdir(dir.path())) {
-		emit logError(i18n("Unable to open %1").tqarg(dir.path()));
+		emit logError(i18n("Unable to open %1").arg(dir.path()));
 		delayDone();
 		return false;
 	}
@@ -251,7 +251,7 @@ void NotepadActionThread::saveImage(struct NotePad *n)
 			n->changeDate.min,
 			n->changeDate.sec);
 	}
-	TQString imgname = TQString("%1/%2.png").tqarg(NotepadConduitSettings::outputDirectory()).tqarg(filename);
+	TQString imgname = TQString("%1/%2.png").arg(NotepadConduitSettings::outputDirectory()).arg(filename);
 
 
 #ifdef DEBUG
diff --git a/conduits/sysinfoconduit/sysinfo-conduit.cc b/conduits/sysinfoconduit/sysinfo-conduit.cc
index 372fbd2..5ed758f 100644
--- a/conduits/sysinfoconduit/sysinfo-conduit.cc
+++ b/conduits/sysinfoconduit/sysinfo-conduit.cc
@@ -299,10 +299,10 @@ void SysInfoConduit::storageInfo()
 		const KPilotCard *device = fHandle->getCardInfo(1);
 		if (device) {
 			fValues[CSL1("cards")] = CSL1("%1 (%2, %3 kB of %3 kB free)")
-				.tqarg(TQString::fromLatin1(device->getCardName()))
-				.tqarg(TQString::fromLatin1(device->getCardManufacturer()))
-				.tqarg(device->getRamFree()/1024)
-				.tqarg(device->getRamSize()/1024);
+				.arg(TQString::fromLatin1(device->getCardName()))
+				.arg(TQString::fromLatin1(device->getCardManufacturer()))
+				.arg(device->getRamFree()/1024)
+				.arg(device->getRamSize()/1024);
 			KPILOT_DELETE(device);
 		} else {
 			fValues[CSL1("cards")] = i18n("No Cards available via pilot-link");
@@ -408,10 +408,10 @@ void SysInfoConduit::pcVersionInfo()
 		struct utsname name;
 		if (uname (&name) >= 0) {
 			fValues[CSL1("os")] = CSL1("%1 %3, %5")
-				.tqarg(TQString::fromLatin1(name.sysname))
-				.tqarg(TQString::fromLatin1(name.release))
-				.tqarg(TQString::fromLatin1(name.machine));
-			fValues[CSL1("hostname")] = CSL1("%2").tqarg(TQString::fromLatin1(name.nodename));
+				.arg(TQString::fromLatin1(name.sysname))
+				.arg(TQString::fromLatin1(name.release))
+				.arg(TQString::fromLatin1(name.machine));
+			fValues[CSL1("hostname")] = CSL1("%2").arg(TQString::fromLatin1(name.nodename));
 		}
 #ifdef TDE_VERSION_STRING
 		fValues[CSL1("kde")] = TQString::fromLatin1(TDE_VERSION_STRING);
@@ -420,13 +420,13 @@ void SysInfoConduit::pcVersionInfo()
 		fValues[CSL1("qt")] = TQString::fromLatin1(TQT_VERSION_STR);
 #endif
 		fValues[CSL1("pilotlink")] = CSL1("%1.%2.%3%4")
-			.tqarg(PILOT_LINK_VERSION)
-			.tqarg(PILOT_LINK_MAJOR)
-			.tqarg(PILOT_LINK_MINOR)
+			.arg(PILOT_LINK_VERSION)
+			.arg(PILOT_LINK_MAJOR)
+			.arg(PILOT_LINK_MINOR)
 #ifdef PILOT_LINK_PATCH
-			.tqarg(TQString::fromLatin1(PILOT_LINK_PATCH));
+			.arg(TQString::fromLatin1(PILOT_LINK_PATCH));
 #else
-			.tqarg(TQString());
+			.arg(TQString());
 #endif
 		keepParts.append(CSL1("pcversion"));
 	} else removeParts.append(CSL1("pcversion"));
@@ -441,12 +441,12 @@ void SysInfoConduit::palmVersionInfo()
 		 * - #palmos#
 		 */
 /*		fValues["palmos"] = TQString("PalmOS %1.%2 (compat %3.%4)")
-			.tqarg(fHandle->getSysInfo()->getMajorVersion())
-			.tqarg(fHandle->getSysInfo()->getMinorVersion())
-			.tqarg(fHandle->getSysInfo()->getCompatMajorVersion())
-			.tqarg(fHandle->getSysInfo()->getCompatMinorVersion());*/
+			.arg(fHandle->getSysInfo()->getMajorVersion())
+			.arg(fHandle->getSysInfo()->getMinorVersion())
+			.arg(fHandle->getSysInfo()->getCompatMajorVersion())
+			.arg(fHandle->getSysInfo()->getCompatMinorVersion());*/
 		KPilotSysInfo i = deviceLink()->getSysInfo();
-		fValues[CSL1("palmos")] = CSL1("PalmOS %1.%2").tqarg(i.getMajorVersion()).tqarg(i.getMinorVersion());
+		fValues[CSL1("palmos")] = CSL1("PalmOS %1.%2").arg(i.getMajorVersion()).arg(i.getMinorVersion());
 
 		keepParts.append(CSL1("palmversion"));
 	} else removeParts.append(CSL1("palmversion"));
@@ -513,12 +513,12 @@ void SysInfoConduit::writeFile()
 
 	// Remove all parts not extracted
 	for ( TQStringList::Iterator it = removeParts.begin(); it != removeParts.end(); ++it ) {
-		TQRegExp re(CSL1("<!--#if%1#.*#endif%1#-->").tqarg(*it).tqarg(*it));
+		TQRegExp re(CSL1("<!--#if%1#.*#endif%1#-->").arg(*it).arg(*it));
 		re.setMinimal(true);
 		output.remove(re);
 	}
 	for ( TQStringList::Iterator it = keepParts.begin(); it != keepParts.end(); ++it ) {
-		TQRegExp re(CSL1("<!--#if%1#(.*)#endif%1#-->").tqarg(*it).tqarg(*it));
+		TQRegExp re(CSL1("<!--#if%1#(.*)#endif%1#-->").arg(*it).arg(*it));
 		re.setMinimal(true);
 		output.replace(re, CSL1("\\1"));
 	}
@@ -526,7 +526,7 @@ void SysInfoConduit::writeFile()
 	// Do a loop through all keys in fValues
 	TQMap<TQString,TQString>::Iterator it;
 	for ( it = fValues.begin(); it != fValues.end(); ++it ) {
-		output.replace(CSL1("#%1#").tqarg(it.key()), it.data());
+		output.replace(CSL1("#%1#").arg(it.key()), it.data());
 	}
 
 	// Insert the list of databases
@@ -584,11 +584,11 @@ void SysInfoConduit::writeFile()
 		TQFileInfo fi(TQDir::home(), CSL1("KPilotSysInfo.")+TQFileInfo(templatefile).extension() );
 		fOutputFile=fi.absFilePath();
 		WARNINGKPILOT << "Unable to open output file, using " << fOutputFile << " instead." << endl;
-		emit logMessage(i18n("Unable to open output file, using %1 instead.").tqarg(fOutputFile));
+		emit logMessage(i18n("Unable to open output file, using %1 instead.").arg(fOutputFile));
 		outfile.setName(fOutputFile);
 		if (!outfile.open(IO_WriteOnly)) {
 			WARNINGKPILOT<< "Unable to open " << fOutputFile << endl;
-			emit logError(i18n("Unable to open %1").tqarg(fOutputFile));
+			emit logError(i18n("Unable to open %1").arg(fOutputFile));
 			TQTimer::singleShot(0, this, TQT_SLOT(cleanup()));
 			return;
 		}
@@ -599,7 +599,7 @@ void SysInfoConduit::writeFile()
 	outstream<<output;
 	outfile.close();
 
-	emit logMessage(i18n("Handheld system information written to the file %1").tqarg(fOutputFile));
+	emit logMessage(i18n("Handheld system information written to the file %1").arg(fOutputFile));
 	TQTimer::singleShot(0, this, TQT_SLOT(cleanup()));
 }
 
diff --git a/conduits/vcalconduit/cleanupstate.cc b/conduits/vcalconduit/cleanupstate.cc
index 76d756d..209a0e9 100644
--- a/conduits/vcalconduit/cleanupstate.cc
+++ b/conduits/vcalconduit/cleanupstate.cc
@@ -91,7 +91,7 @@ void CleanUpState::startSync( ConduitAction *ca )
 					vccb->addLogError( i18n( "An error occurred while uploading"
 						" \"%1\". You can try to upload "
 						"the temporary local file \"%2\" manually.")
-						.tqarg(vccb->config()->calendarFile()).tqarg(fCalendarFile));
+						.arg(vccb->config()->calendarFile()).arg(fCalendarFile));
 				}
 				else {
 					KIO::NetAccess::removeTempFile( fCalendarFile );
diff --git a/conduits/vcalconduit/vcal-conduit.cc b/conduits/vcalconduit/vcal-conduit.cc
index 4b82f16..2cdc5d3 100644
--- a/conduits/vcalconduit/vcal-conduit.cc
+++ b/conduits/vcalconduit/vcal-conduit.cc
@@ -219,7 +219,7 @@ PilotRecord *VCalConduit::recordFromIncidence(PilotRecordBase *de, const KCal::I
 		(e->recurrenceType() ==  KCal::Recurrence::rYearlyPos) )
 	{
 		// Warn ahead of time
-		emit logMessage(i18n("Event \"%1\" has a yearly recurrence other than by month, will change this to recurrence by month on handheld.").tqarg(e->summary()));
+		emit logMessage(i18n("Event \"%1\" has a yearly recurrence other than by month, will change this to recurrence by month on handheld.").arg(e->summary()));
 	}
 
 	PilotDateEntry *dateEntry = dynamic_cast<PilotDateEntry*>(de);
diff --git a/conduits/vcalconduit/vcal-conduitbase.cc b/conduits/vcalconduit/vcal-conduitbase.cc
index 59351ac..19b6790 100644
--- a/conduits/vcalconduit/vcal-conduitbase.cc
+++ b/conduits/vcalconduit/vcal-conduitbase.cc
@@ -288,8 +288,8 @@ static void listResources( KCal::CalendarResources *p )
 				<< fCalendar->isLocalTime() << endl;
 
 			emit logMessage( fCalendar->isLocalTime() ?
-				i18n( "Using local time zone: %1" ).tqarg( tz ) :
-				i18n( "Using non-local time zone: %1" ).tqarg( tz ) );
+				i18n( "Using local time zone: %1" ).arg( tz ) :
+				i18n( "Using non-local time zone: %1" ).arg( tz ) );
 
 			KURL kurl( config()->calendarFile() );
 			if( !KIO::NetAccess::download( config()->calendarFile(),
@@ -298,7 +298,7 @@ static void listResources( KCal::CalendarResources *p )
 				emit logError(i18n( "You chose to sync with the file \"%1\", which "
 					"cannot be opened. Please make sure to supply a "
 					"valid file name in the conduit's configuration dialog. "
-					"Aborting the conduit." ).tqarg( config()->calendarFile() ) );
+					"Aborting the conduit." ).arg( config()->calendarFile() ) );
 				KIO::NetAccess::removeTempFile( fCalendarFile );
 				return false;
 			}
@@ -321,14 +321,14 @@ static void listResources( KCal::CalendarResources *p )
 					emit logError( i18n( "You chose to sync with the file \"%1\", which "
 						"cannot be opened or created. Please make sure to supply a "
 						"valid file name in the conduit's configuration dialog. "
-						"Aborting the conduit." ).tqarg( config()->calendarFile() ) );
+						"Aborting the conduit." ).arg( config()->calendarFile() ) );
 					return false;
 				}
 				fl.close();
 				setFirstSync( true );
 			}
 			addSyncLogEntry( i18n( "Syncing with file \"%1\"" )
-				.tqarg( config()->calendarFile() ) );
+				.arg( config()->calendarFile() ) );
 			break;
 		}
 
@@ -353,8 +353,8 @@ static void listResources( KCal::CalendarResources *p )
 #endif
 			addSyncLogEntry( i18n( "Syncing with standard calendar resource." ) );
 			emit logMessage( fCalendar->isLocalTime() ?
-				i18n( "Using local time zone: %1" ).tqarg( tz ) :
-				i18n( "Using non-local time zone: %1" ).tqarg( tz ) );
+				i18n( "Using local time zone: %1" ).arg( tz ) :
+				i18n( "Using non-local time zone: %1" ).arg( tz ) );
 			break;
 		default:
 			break;