TDE
/
kpilot
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kpilot
0
0
Fork 0
Code Issues Releases Wiki Activity

Remove additional unneeded tq method conversions

Browse Source
pull/2/head
Timothy Pearson 13 years ago
parent e2574db445
commit 46d967c53b
51 changed files with 244 additions and 244 deletions
Show Stats Download Patch File Download Diff File

4
conduits/abbrowserconduit/KPilotCustomFieldEditor.ui
Unescape View File

@ -141,7 +141,7 @@
<property name="text"> <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> <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>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
</widget> </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. <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> Do NOT change these values: doing so will almost certainly result in data loss when you next do a sync.</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
</widget> </widget>

4
conduits/abbrowserconduit/abbrowser-conduit.cc
Unescape View File

@ -291,7 +291,7 @@ bool AbbrowserConduit::_loadAddressBook()
emit logError(i18n("You chose to sync with the file \"%1\", which " emit logError(i18n("You chose to sync with the file \"%1\", which "
"cannot be opened. Please make sure to supply a " "cannot be opened. Please make sure to supply a "
"valid file name in the conduit's configuration dialog. " "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); KIO::NetAccess::removeTempFile(fABookFile);
stopTickle(); stopTickle();
return false; return false;
@ -395,7 +395,7 @@ bool AbbrowserConduit::_saveAddressBook()
if(!KIO::NetAccess::upload(fABookFile, AbbrowserSettings::fileName(), 0L)) { if(!KIO::NetAccess::upload(fABookFile, AbbrowserSettings::fileName(), 0L)) {
emit logError(i18n("An error occurred while uploading \"%1\". You can try to upload " emit logError(i18n("An error occurred while uploading \"%1\". You can try to upload "
"the temporary local file \"%2\" manually") "the temporary local file \"%2\" manually")
.tqarg(AbbrowserSettings::fileName()).tqarg(fABookFile)); .arg(AbbrowserSettings::fileName()).arg(fABookFile));
} }
else { else {
KIO::NetAccess::removeTempFile(fABookFile); KIO::NetAccess::removeTempFile(fABookFile);

2
conduits/abbrowserconduit/kaddressbookConduit.ui
Unescape View File

@ -225,7 +225,7 @@
<property name="text"> <property name="text">
<string>&lt;p&gt;Select the default action if an event was modified on both sides here. &lt;/p&gt;</string> <string>&lt;p&gt;Select the default action if an event was modified on both sides here. &lt;/p&gt;</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignJustify|AlignVCenter</set> <set>WordBreak|AlignJustify|AlignVCenter</set>
</property> </property>
</widget> </widget>

2
conduits/abbrowserconduit/resolutionDialog.cc
Unescape View File

@ -159,7 +159,7 @@ void ResolutionCheckListItem::setCaption(TQString caption)
void ResolutionCheckListItem::updateText() 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")), newText.replace(TQRegExp(CSL1("\n")),
i18n("Denoting newlines in Address entries. No need to translate", " | ")); i18n("Denoting newlines in Address entries. No need to translate", " | "));
setText(0, newText); setText(0, newText);

4
conduits/abbrowserconduit/resolutionDialog_base.ui
Unescape View File

@ -26,7 +26,7 @@
<property name="text"> <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> <string>The following record was edited both on the handheld and on the PC. Please choose which values shall be synced:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
</widget> </widget>
@ -62,7 +62,7 @@
<property name="text"> <property name="text">
<string>Line breaks in any of the entries are denoted by a " | " (without the quotes).</string> <string>Line breaks in any of the entries are denoted by a " | " (without the quotes).</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
</widget> </widget>

18
conduits/docconduit/DOC-converter.cc
Unescape View File

@ -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) // TODO: use the subexpressions from the regexp for the bmk name ($1..$9) (given as separate regexp)
TQString bmkText(bmkName); TQString bmkText(bmkName);
for (int i=0; i<=rx.numCaptures(); ++i) { for (int i=0; i<=rx.numCaptures(); ++i) {
bmkText.replace(CSL1("$%1").tqarg(i), rx.cap(i)); bmkText.replace(CSL1("$%1").arg(i), rx.cap(i));
bmkText.replace(CSL1("\\%1").tqarg(i), rx.cap(i)); bmkText.replace(CSL1("\\%1").arg(i), rx.cap(i));
} }
fBookmarks.append(new docBookmark(bmkText.left(16), pos)); fBookmarks.append(new docBookmark(bmkText.left(16), pos));
} }
@ -195,7 +195,7 @@ TQString DOCConverter::readText() {
TQFile docfile(txtfilename); TQFile docfile(txtfilename);
if (!docfile.open(IO_ReadOnly)) 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(); return TQString();
} }
@ -437,7 +437,7 @@ bool DOCConverter::convertTXTtoPDB() {
#endif #endif
if (!docdb->isOpen()) { 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; return false;
} }
@ -520,7 +520,7 @@ bool DOCConverter::convertPDBtoTXT()
PilotRecord*headerRec = docdb->readRecordByIndex(0); PilotRecord*headerRec = docdb->readRecordByIndex(0);
if (!headerRec) 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); KPILOT_DELETE(docdb);
return false; return false;
} }
@ -540,7 +540,7 @@ bool DOCConverter::convertPDBtoTXT()
TQFile docfile(txtfilename); TQFile docfile(txtfilename);
if (!docfile.open(IO_WriteOnly)) 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); KPILOT_DELETE(docdb);
return false; return false;
} }
@ -555,7 +555,7 @@ bool DOCConverter::convertPDBtoTXT()
DEBUGKPILOT<<"Record "<<i<<endl; DEBUGKPILOT<<"Record "<<i<<endl;
KPILOT_DELETE(rec); KPILOT_DELETE(rec);
} else { } 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); bmks.append(bmk);
KPILOT_DELETE(rec); KPILOT_DELETE(rec);
} else { } 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 // TODO: Sort the list of bookmarks according to their position
@ -592,7 +592,7 @@ bool DOCConverter::convertPDBtoTXT()
if (!bmkfile.open(IO_WriteOnly)) if (!bmkfile.open(IO_WriteOnly))
{ {
emit logError(i18n("Unable to open file %1 for the bookmarks of %2.") emit logError(i18n("Unable to open file %1 for the bookmarks of %2.")
.tqarg(bmkfilename).tqarg(docdb ->dbPathName())); .arg(bmkfilename).arg(docdb ->dbPathName()));
} }
else else
{ {

8
conduits/docconduit/doc-conduit.cc
Unescape View File

@ -378,10 +378,10 @@ bool DOCConduit::doSync(docSyncInfo &sinfo)
if (!postSyncAction(database, sinfo, res)) if (!postSyncAction(database, sinfo, res))
emit logError(i18n("Unable to install the locally created PalmDOC %1 to the handheld.") 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) if (!res)
emit logError(i18n("Conversion of PalmDOC \"%1\" failed.") 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(logError(const TQString &)), TQT_SIGNAL(logError(const TQString &)));
// disconnect(&docconverter, TQT_SIGNAL(logMessage(const TQString &)), TQT_SIGNAL(logMessage(const TQString &))); // disconnect(&docconverter, TQT_SIGNAL(logMessage(const TQString &)), TQT_SIGNAL(logMessage(const TQString &)));
// KPILOT_DELETE(database); // KPILOT_DELETE(database);
@ -389,7 +389,7 @@ bool DOCConduit::doSync(docSyncInfo &sinfo)
else else
{ {
emit logError(i18n("Unable to open or create the database %1.") 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; return res;
} }
@ -665,7 +665,7 @@ void DOCConduit::syncDatabases() {
case eSyncDelete: case eSyncDelete:
case eSyncPDAToPC: case eSyncPDAToPC:
case eSyncPCToPDA: case eSyncPCToPDA:
emit logMessage(i18n("Synchronizing text \"%1\"").tqarg(sinfo.handheldDB)); emit logMessage(i18n("Synchronizing text \"%1\"").arg(sinfo.handheldDB));
if (!doSync(sinfo)) { if (!doSync(sinfo)) {
// The sync could not be done, so inform the user (the error message should probably issued inside doSync) // The sync could not be done, so inform the user (the error message should probably issued inside doSync)
#ifdef DEBUG #ifdef DEBUG

6
conduits/docconduit/doc-conflictdialog.cc
Unescape View File

@ -168,9 +168,9 @@ void ResolutionDialog::slotInfo(int index) {
int ix=cE.index; int ix=cE.index;
if (!syncInfo) return; if (!syncInfo) return;
docSyncInfo si=(*syncInfo)[ix]; docSyncInfo si=(*syncInfo)[ix];
TQString text=i18n("Status of the database %1:\n\n").tqarg(si.handheldDB); TQString text=i18n("Status of the database %1:\n\n").arg(si.handheldDB);
text+=i18n("Handheld: %1\n").tqarg(eTexStatusToString(si.fPalmStatus)); text+=i18n("Handheld: %1\n").arg(eTexStatusToString(si.fPalmStatus));
text+=i18n("Desktop: %1\n").tqarg(eTexStatusToString(si.fPCStatus)); text+=i18n("Desktop: %1\n").arg(eTexStatusToString(si.fPCStatus));
KMessageBox::information(this, text, i18n("Database information")); KMessageBox::information(this, text, i18n("Database information"));
} }

44
conduits/docconduit/kpalmdoc_dlg.cc
Unescape View File

@ -175,8 +175,8 @@ void ConverterDlg::slotToText()
int res=KMessageBox::questionYesNo(this, int res=KMessageBox::questionYesNo(this,
i18n("<qt>You selected to sync folders, " i18n("<qt>You selected to sync folders, "
"but gave a filename instead (<em>%1</em>)." "but gave a filename instead (<em>%1</em>)."
"<br>Use folder <em>%2</em> instead?</qt>").tqarg(pdburl) "<br>Use folder <em>%2</em> instead?</qt>").arg(pdburl)
.tqarg(pdbinfo.dirPath(true)), TQString(), i18n("Use Folder"), KStdGuiItem::cancel()); .arg(pdbinfo.dirPath(true)), TQString(), i18n("Use Folder"), KStdGuiItem::cancel());
if (res==KMessageBox::Yes) if (res==KMessageBox::Yes)
{ {
pdburl=pdbinfo.dirPath(true); pdburl=pdbinfo.dirPath(true);
@ -191,7 +191,7 @@ void ConverterDlg::slotToText()
KMessageBox::sorry(this, KMessageBox::sorry(this,
i18n("<qt>The folder <em>%1</em> for " i18n("<qt>The folder <em>%1</em> for "
"the handheld database files is not a valid " "the handheld database files is not a valid "
"folder.</qt>").tqarg(pdburl)); "folder.</qt>").arg(pdburl));
return; return;
} }
@ -200,7 +200,7 @@ void ConverterDlg::slotToText()
KMessageBox::sorry(this, KMessageBox::sorry(this,
i18n("<qt>The folder <em>%1</em> for " i18n("<qt>The folder <em>%1</em> for "
"the handheld database files is not a " "the handheld database files is not a "
"valid directory.</qt>").tqarg(pdburl)); "valid directory.</qt>").arg(pdburl));
return; return;
} }
@ -211,8 +211,8 @@ void ConverterDlg::slotToText()
int res=KMessageBox::questionYesNo(this, int res=KMessageBox::questionYesNo(this,
i18n("<qt>You selected to sync folders, " i18n("<qt>You selected to sync folders, "
"but gave a filename instead (<em>%1</em>)." "but gave a filename instead (<em>%1</em>)."
"<br>Use folder <em>%2</em> instead?</qt>").tqarg(txturl) "<br>Use folder <em>%2</em> instead?</qt>").arg(txturl)
.tqarg(txtinfo.dirPath(true)), TQString(), i18n("Use Folder"), KStdGuiItem::cancel()); .arg(txtinfo.dirPath(true)), TQString(), i18n("Use Folder"), KStdGuiItem::cancel());
if (res==KMessageBox::Yes) { if (res==KMessageBox::Yes) {
txturl=txtinfo.dirPath(true); txturl=txtinfo.dirPath(true);
txtinfo.setFile(txturl); txtinfo.setFile(txturl);
@ -227,7 +227,7 @@ void ConverterDlg::slotToText()
if (!txtinfo.isDir()) { if (!txtinfo.isDir()) {
KMessageBox::sorry(this, KMessageBox::sorry(this,
i18n("<qt>The folder <em>%1</em> for " 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; return;
} }
@ -265,7 +265,7 @@ void ConverterDlg::slotToText()
if (!pdbinfo.isFile() || !pdbinfo.exists()) if (!pdbinfo.isFile() || !pdbinfo.exists())
{ {
KMessageBox::sorry(this, i18n("<qt>The file <em>%1</em> does not " KMessageBox::sorry(this, i18n("<qt>The file <em>%1</em> does not "
"exist.</qt>").tqarg(pdburl)); "exist.</qt>").arg(pdburl));
return; return;
} }
@ -274,13 +274,13 @@ void ConverterDlg::slotToText()
if (!txtinfo.isFile()) if (!txtinfo.isFile())
{ {
KMessageBox::sorry(this, i18n("<qt>The filename <em>%1</em> for the " 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; return;
}*/ }*/
if (convertPDBtoTXT(pdbinfo.dirPath(true), pdbinfo.fileName(), if (convertPDBtoTXT(pdbinfo.dirPath(true), pdbinfo.fileName(),
txtinfo.dirPath(true), txtinfo.fileName(), &conv) ) 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, int res=KMessageBox::questionYesNo(this,
i18n("<qt>You selected to sync folders, " i18n("<qt>You selected to sync folders, "
"but gave a filename instead (<em>%1</em>)." "but gave a filename instead (<em>%1</em>)."
"<br>Use folder <em>%2</em> instead?</qt>").tqarg(txturl) "<br>Use folder <em>%2</em> instead?</qt>").arg(txturl)
.tqarg(txtinfo.dirPath(true)), TQString(), i18n("Use Folder"), KStdGuiItem::cancel()); .arg(txtinfo.dirPath(true)), TQString(), i18n("Use Folder"), KStdGuiItem::cancel());
if (res==KMessageBox::Yes) if (res==KMessageBox::Yes)
{ {
txturl=txtinfo.dirPath(true); txturl=txtinfo.dirPath(true);
@ -338,7 +338,7 @@ void ConverterDlg::slotToPDB()
{ {
KMessageBox::sorry(this, KMessageBox::sorry(this,
i18n("<qt>The folder <em>%1</em> for " 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; return;
} }
@ -350,8 +350,8 @@ void ConverterDlg::slotToPDB()
i18n("<qt>You selected to sync folders, " i18n("<qt>You selected to sync folders, "
"but gave a filename instead (<em>%1</em>)." "but gave a filename instead (<em>%1</em>)."
"<br>Use folder <em>%2</em> instead?</qt>") "<br>Use folder <em>%2</em> instead?</qt>")
.tqarg(pdburl) .arg(pdburl)
.tqarg(pdbinfo.dirPath(true)), TQString(), i18n("Use Folder"), KStdGuiItem::cancel()); .arg(pdbinfo.dirPath(true)), TQString(), i18n("Use Folder"), KStdGuiItem::cancel());
if (res==KMessageBox::Yes) { if (res==KMessageBox::Yes) {
pdburl=pdbinfo.dirPath(true); pdburl=pdbinfo.dirPath(true);
pdbinfo.setFile(pdburl); pdbinfo.setFile(pdburl);
@ -365,7 +365,7 @@ void ConverterDlg::slotToPDB()
} }
if (!pdbinfo.isDir()) { if (!pdbinfo.isDir()) {
KMessageBox::sorry(this, i18n("<qt>The folder <em>%1</em> for " 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; return;
} }
@ -403,14 +403,14 @@ void ConverterDlg::slotToPDB()
if (!txtinfo.isFile() || !txtinfo.exists()) if (!txtinfo.isFile() || !txtinfo.exists())
{ {
KMessageBox::sorry(this, i18n("<qt>The file <em>%1</em> does not " KMessageBox::sorry(this, i18n("<qt>The file <em>%1</em> does not "
"exist.</qt>").tqarg(txturl)); "exist.</qt>").arg(txturl));
return; return;
} }
if (convertTXTtoPDB(txtinfo.dirPath(true), txtinfo.fileName(), if (convertTXTtoPDB(txtinfo.dirPath(true), txtinfo.fileName(),
pdbinfo.dirPath(true), pdbinfo.fileName(), &conv) ) 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 || if (!dbfileinfo.exists() || !askOverwrite ||
(KMessageBox::Yes==KMessageBox::questionYesNo(this, (KMessageBox::Yes==KMessageBox::questionYesNo(this,
i18n("<qt>The database file <em>%1</em> already exists. Overwrite it?</qt>") 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); PilotLocalDatabase*pdbdb=new PilotLocalDatabase(pdbdir, TQFileInfo(pdbfile).baseName(), false);
if (pdbdb) if (pdbdb)
@ -479,7 +479,7 @@ bool ConverterDlg::convertTXTtoPDB(TQString txtdir, TQString txtfile,
} }
if ( !res && verbose ) 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 else
@ -499,7 +499,7 @@ bool ConverterDlg::convertPDBtoTXT(TQString pdbdir, TQString pdbfile,
if (!txtfileinfo.exists() || !askOverwrite || if (!txtfileinfo.exists() || !askOverwrite ||
(KMessageBox::Yes==KMessageBox::questionYesNo(this, (KMessageBox::Yes==KMessageBox::questionYesNo(this,
i18n("<qt>The text file <em>%1</em> already exists. Overwrite it?</qt>") 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); PilotLocalDatabase*pdbdb=new PilotLocalDatabase(pdbdir, TQFileInfo(pdbfile).baseName(), false);
if (pdbdb) if (pdbdb)
@ -515,7 +515,7 @@ bool ConverterDlg::convertPDBtoTXT(TQString pdbdir, TQString pdbfile,
} }
if ( !res && verbose ) 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 else

12
conduits/knotes/knotes-action.cc
Unescape View File

@ -79,7 +79,7 @@ public:
int memo() const { return memoId; } ; int memo() const { return memoId; } ;
KNoteID_t note() const { return noteId; } ; KNoteID_t note() const { return noteId; } ;
inline bool valid() const { return (memoId>0) && (!noteId.isEmpty()) ; } ; 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 findNote(const TQValueList<NoteAndMemo> &,KNoteID_pt note);
static NoteAndMemo findMemo(const TQValueList<NoteAndMemo> &,int memo); static NoteAndMemo findMemo(const TQValueList<NoteAndMemo> &,int memo);
@ -269,7 +269,7 @@ bool KNotesAction::openKNotesResource()
} }
else 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; return false;
} }
} }
@ -853,18 +853,18 @@ void KNotesAction::cleanupMemos()
case Init : return CSL1("Init"); case Init : return CSL1("Init");
case NewNotesToPilot : case NewNotesToPilot :
return CSL1("NewNotesToPilot key=%1"); return CSL1("NewNotesToPilot key=%1");
// TODO DCOP_REMOVAL .tqarg(fP->fIndex.key()); // TODO DCOP_REMOVAL .arg(fP->fIndex.key());
case ModifiedNotesToPilot : case ModifiedNotesToPilot :
return CSL1("ModifiedNotesToPilot key=%1"); return CSL1("ModifiedNotesToPilot key=%1");
//TODO DCOP_REMOVAL .tqarg(fP->fIndex.key()); //TODO DCOP_REMOVAL .arg(fP->fIndex.key());
case MemosToKNotes : case MemosToKNotes :
return CSL1("MemosToKNotes rec=%1") return CSL1("MemosToKNotes rec=%1")
.tqarg(fP->fRecordIndex); .arg(fP->fRecordIndex);
case Cleanup : return CSL1("Cleanup"); case Cleanup : return CSL1("Cleanup");
case Done : case Done :
return CSL1("Done"); return CSL1("Done");
default : default :
return CSL1("Unknown (%1)").tqarg(fActionStatus); return CSL1("Unknown (%1)").arg(fActionStatus);
} }
} }

4
conduits/malconduit/mal-conduit.cc
Unescape View File

@ -217,7 +217,7 @@ bool MALConduit::skip()
syncMessage = i18n("No proxy server is set."); syncMessage = i18n("No proxy server is set.");
break; break;
} }
syncMessage = i18n("Using proxy server: %1").tqarg(proxyServer); syncMessage = i18n("Using proxy server: %1").arg(proxyServer);
#ifdef DEBUG #ifdef DEBUG
DEBUGKPILOT<<" Using HTTP proxy server \""<<proxyServer<< DEBUGKPILOT<<" Using HTTP proxy server \""<<proxyServer<<
@ -259,7 +259,7 @@ bool MALConduit::skip()
syncMessage = i18n("No SOCKS proxy is set."); syncMessage = i18n("No SOCKS proxy is set.");
break; break;
} }
syncMessage = i18n("Using SOCKS proxy: %1").tqarg(proxyServer); syncMessage = i18n("Using SOCKS proxy: %1").arg(proxyServer);
#ifdef DEBUG #ifdef DEBUG
DEBUGKPILOT<<" Using SOCKS proxy server \""<<proxyServer<<"\", Port "<<proxyPort<<", User "<<MALConduitSettings::proxyUser()<<", Password "<<( (MALConduitSettings::proxyPassword().isEmpty())?TQString("not "):TQString() )<<"set"<<endl; DEBUGKPILOT<<" Using SOCKS proxy server \""<<proxyServer<<"\", Port "<<proxyPort<<", User "<<MALConduitSettings::proxyUser()<<", Password "<<( (MALConduitSettings::proxyPassword().isEmpty())?TQString("not "):TQString() )<<"set"<<endl;
#endif #endif

2
conduits/memofileconduit/memofile-conduit.cc
Unescape View File

@ -120,7 +120,7 @@ MemofileConduit::~MemofileConduit()
fCtrPC->setStartCount(_memofiles->count()); fCtrPC->setStartCount(_memofiles->count());
setFirstSync( _memofiles->isFirstSync() ); 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() ) { if ( (syncMode() == SyncAction::SyncMode::eCopyHHToPC) || _memofiles->isFirstSync() ) {
addSyncLogEntry(i18n(" Copying Pilot to PC...")); addSyncLogEntry(i18n(" Copying Pilot to PC..."));

4
conduits/notepadconduit/notepad-conduit.cc
Unescape View File

@ -76,7 +76,7 @@ NotepadConduit::~NotepadConduit()
TQDir dir(NotepadConduitSettings::outputDirectory()); TQDir dir(NotepadConduitSettings::outputDirectory());
if(!dir.exists() && !dir.mkdir(dir.path())) { 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(); delayDone();
return false; return false;
} }
@ -251,7 +251,7 @@ void NotepadActionThread::saveImage(struct NotePad *n)
n->changeDate.min, n->changeDate.min,
n->changeDate.sec); 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 #ifdef DEBUG

48
conduits/sysinfoconduit/sysinfo-conduit.cc
Unescape View File

@ -299,10 +299,10 @@ void SysInfoConduit::storageInfo()
const KPilotCard *device = fHandle->getCardInfo(1); const KPilotCard *device = fHandle->getCardInfo(1);
if (device) { if (device) {
fValues[CSL1("cards")] = CSL1("%1 (%2, %3 kB of %3 kB free)") fValues[CSL1("cards")] = CSL1("%1 (%2, %3 kB of %3 kB free)")
.tqarg(TQString::fromLatin1(device->getCardName())) .arg(TQString::fromLatin1(device->getCardName()))
.tqarg(TQString::fromLatin1(device->getCardManufacturer())) .arg(TQString::fromLatin1(device->getCardManufacturer()))
.tqarg(device->getRamFree()/1024) .arg(device->getRamFree()/1024)
.tqarg(device->getRamSize()/1024); .arg(device->getRamSize()/1024);
KPILOT_DELETE(device); KPILOT_DELETE(device);
} else { } else {
fValues[CSL1("cards")] = i18n("No Cards available via pilot-link"); fValues[CSL1("cards")] = i18n("No Cards available via pilot-link");
@ -408,10 +408,10 @@ void SysInfoConduit::pcVersionInfo()
struct utsname name; struct utsname name;
if (uname (&name) >= 0) { if (uname (&name) >= 0) {
fValues[CSL1("os")] = CSL1("%1 %3, %5") fValues[CSL1("os")] = CSL1("%1 %3, %5")
.tqarg(TQString::fromLatin1(name.sysname)) .arg(TQString::fromLatin1(name.sysname))
.tqarg(TQString::fromLatin1(name.release)) .arg(TQString::fromLatin1(name.release))
.tqarg(TQString::fromLatin1(name.machine)); .arg(TQString::fromLatin1(name.machine));
fValues[CSL1("hostname")] = CSL1("%2").tqarg(TQString::fromLatin1(name.nodename)); fValues[CSL1("hostname")] = CSL1("%2").arg(TQString::fromLatin1(name.nodename));
} }
#ifdef TDE_VERSION_STRING #ifdef TDE_VERSION_STRING
fValues[CSL1("kde")] = TQString::fromLatin1(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); fValues[CSL1("qt")] = TQString::fromLatin1(TQT_VERSION_STR);
#endif #endif
fValues[CSL1("pilotlink")] = CSL1("%1.%2.%3%4") fValues[CSL1("pilotlink")] = CSL1("%1.%2.%3%4")
.tqarg(PILOT_LINK_VERSION) .arg(PILOT_LINK_VERSION)
.tqarg(PILOT_LINK_MAJOR) .arg(PILOT_LINK_MAJOR)
.tqarg(PILOT_LINK_MINOR) .arg(PILOT_LINK_MINOR)
#ifdef PILOT_LINK_PATCH #ifdef PILOT_LINK_PATCH
.tqarg(TQString::fromLatin1(PILOT_LINK_PATCH)); .arg(TQString::fromLatin1(PILOT_LINK_PATCH));
#else #else
.tqarg(TQString()); .arg(TQString());
#endif #endif
keepParts.append(CSL1("pcversion")); keepParts.append(CSL1("pcversion"));
} else removeParts.append(CSL1("pcversion")); } else removeParts.append(CSL1("pcversion"));
@ -441,12 +441,12 @@ void SysInfoConduit::palmVersionInfo()
* - #palmos# * - #palmos#
*/ */
/* fValues["palmos"] = TQString("PalmOS %1.%2 (compat %3.%4)") /* fValues["palmos"] = TQString("PalmOS %1.%2 (compat %3.%4)")
.tqarg(fHandle->getSysInfo()->getMajorVersion()) .arg(fHandle->getSysInfo()->getMajorVersion())
.tqarg(fHandle->getSysInfo()->getMinorVersion()) .arg(fHandle->getSysInfo()->getMinorVersion())
.tqarg(fHandle->getSysInfo()->getCompatMajorVersion()) .arg(fHandle->getSysInfo()->getCompatMajorVersion())
.tqarg(fHandle->getSysInfo()->getCompatMinorVersion());*/ .arg(fHandle->getSysInfo()->getCompatMinorVersion());*/
KPilotSysInfo i = deviceLink()->getSysInfo(); 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")); keepParts.append(CSL1("palmversion"));
} else removeParts.append(CSL1("palmversion")); } else removeParts.append(CSL1("palmversion"));
@ -513,12 +513,12 @@ void SysInfoConduit::writeFile()
// Remove all parts not extracted // Remove all parts not extracted
for ( TQStringList::Iterator it = removeParts.begin(); it != removeParts.end(); ++it ) { 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); re.setMinimal(true);
output.remove(re); output.remove(re);
} }
for ( TQStringList::Iterator it = keepParts.begin(); it != keepParts.end(); ++it ) { 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); re.setMinimal(true);
output.replace(re, CSL1("\\1")); output.replace(re, CSL1("\\1"));
} }
@ -526,7 +526,7 @@ void SysInfoConduit::writeFile()
// Do a loop through all keys in fValues // Do a loop through all keys in fValues
TQMap<TQString,TQString>::Iterator it; TQMap<TQString,TQString>::Iterator it;
for ( it = fValues.begin(); it != fValues.end(); ++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 // Insert the list of databases
@ -584,11 +584,11 @@ void SysInfoConduit::writeFile()
TQFileInfo fi(TQDir::home(), CSL1("KPilotSysInfo.")+TQFileInfo(templatefile).extension() ); TQFileInfo fi(TQDir::home(), CSL1("KPilotSysInfo.")+TQFileInfo(templatefile).extension() );
fOutputFile=fi.absFilePath(); fOutputFile=fi.absFilePath();
WARNINGKPILOT << "Unable to open output file, using " << fOutputFile << " instead." << endl; 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); outfile.setName(fOutputFile);
if (!outfile.open(IO_WriteOnly)) { if (!outfile.open(IO_WriteOnly)) {
WARNINGKPILOT<< "Unable to open " << fOutputFile << endl; 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())); TQTimer::singleShot(0, this, TQT_SLOT(cleanup()));
return; return;
} }
@ -599,7 +599,7 @@ void SysInfoConduit::writeFile()
outstream<<output; outstream<<output;
outfile.close(); 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())); TQTimer::singleShot(0, this, TQT_SLOT(cleanup()));
} }

2
conduits/vcalconduit/cleanupstate.cc
Unescape View File

@ -91,7 +91,7 @@ void CleanUpState::startSync( ConduitAction *ca )
vccb->addLogError( i18n( "An error occurred while uploading" vccb->addLogError( i18n( "An error occurred while uploading"
" \"%1\". You can try to upload " " \"%1\". You can try to upload "
"the temporary local file \"%2\" manually.") "the temporary local file \"%2\" manually.")
.tqarg(vccb->config()->calendarFile()).tqarg(fCalendarFile)); .arg(vccb->config()->calendarFile()).arg(fCalendarFile));
} }
else { else {
KIO::NetAccess::removeTempFile( fCalendarFile ); KIO::NetAccess::removeTempFile( fCalendarFile );

2
conduits/vcalconduit/vcal-conduit.cc
Unescape View File

@ -219,7 +219,7 @@ PilotRecord *VCalConduit::recordFromIncidence(PilotRecordBase *de, const KCal::I
(e->recurrenceType() == KCal::Recurrence::rYearlyPos) ) (e->recurrenceType() == KCal::Recurrence::rYearlyPos) )
{ {
// Warn ahead of time // 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); PilotDateEntry *dateEntry = dynamic_cast<PilotDateEntry*>(de);

14
conduits/vcalconduit/vcal-conduitbase.cc
Unescape View File

@ -288,8 +288,8 @@ static void listResources( KCal::CalendarResources *p )
<< fCalendar->isLocalTime() << endl; << fCalendar->isLocalTime() << endl;
emit logMessage( fCalendar->isLocalTime() ? emit logMessage( fCalendar->isLocalTime() ?
i18n( "Using local time zone: %1" ).tqarg( tz ) : i18n( "Using local time zone: %1" ).arg( tz ) :
i18n( "Using non-local time zone: %1" ).tqarg( tz ) ); i18n( "Using non-local time zone: %1" ).arg( tz ) );
KURL kurl( config()->calendarFile() ); KURL kurl( config()->calendarFile() );
if( !KIO::NetAccess::download( 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 " emit logError(i18n( "You chose to sync with the file \"%1\", which "
"cannot be opened. Please make sure to supply a " "cannot be opened. Please make sure to supply a "
"valid file name in the conduit's configuration dialog. " "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 ); KIO::NetAccess::removeTempFile( fCalendarFile );
return false; return false;
} }
@ -321,14 +321,14 @@ static void listResources( KCal::CalendarResources *p )
emit logError( i18n( "You chose to sync with the file \"%1\", which " emit logError( i18n( "You chose to sync with the file \"%1\", which "
"cannot be opened or created. Please make sure to supply a " "cannot be opened or created. Please make sure to supply a "
"valid file name in the conduit's configuration dialog. " "valid file name in the conduit's configuration dialog. "
"Aborting the conduit." ).tqarg( config()->calendarFile() ) ); "Aborting the conduit." ).arg( config()->calendarFile() ) );
return false; return false;
} }
fl.close(); fl.close();
setFirstSync( true ); setFirstSync( true );
} }
addSyncLogEntry( i18n( "Syncing with file \"%1\"" ) addSyncLogEntry( i18n( "Syncing with file \"%1\"" )
.tqarg( config()->calendarFile() ) ); .arg( config()->calendarFile() ) );
break; break;
} }
@ -353,8 +353,8 @@ static void listResources( KCal::CalendarResources *p )
#endif #endif
addSyncLogEntry( i18n( "Syncing with standard calendar resource." ) ); addSyncLogEntry( i18n( "Syncing with standard calendar resource." ) );
emit logMessage( fCalendar->isLocalTime() ? emit logMessage( fCalendar->isLocalTime() ?
i18n( "Using local time zone: %1" ).tqarg( tz ) : i18n( "Using local time zone: %1" ).arg( tz ) :
i18n( "Using non-local time zone: %1" ).tqarg( tz ) ); i18n( "Using non-local time zone: %1" ).arg( tz ) );
break; break;
default: default:
break; break;

8
kpilot/addressWidget.cc
Unescape View File

@ -185,7 +185,7 @@ void AddressWidget::hideComponent()
#if TDE_VERSION<220 #if TDE_VERSION<220
s = i18n("There are still %1 address editing windows open.") s = i18n("There are still %1 address editing windows open.")
.tqarg(TQString::number(fPendingAddresses)); .arg(TQString::number(fPendingAddresses));
#else #else
s = i18n("There is still an address editing window open.", s = i18n("There is still an address editing window open.",
"There are still %n address editing windows open.", "There are still %n address editing windows open.",
@ -675,7 +675,7 @@ void AddressWidget::slotExport()
TQString prompt = (currentCatID==-1) ? TQString prompt = (currentCatID==-1) ?
i18n("Export All Addresses") : i18n("Export All Addresses") :
i18n("Export Address Category %1").tqarg(fAddressAppInfo->categoryName(currentCatID)) ; i18n("Export Address Category %1").arg(fAddressAppInfo->categoryName(currentCatID)) ;
TQString saveFile = KFileDialog::getSaveFileName( TQString saveFile = KFileDialog::getSaveFileName(
@ -693,7 +693,7 @@ void AddressWidget::slotExport()
} }
if (TQFile::exists(saveFile) && if (TQFile::exists(saveFile) &&
KMessageBox::warningContinueCancel(this, KMessageBox::warningContinueCancel(this,
i18n("The file <i>%1</i> exists. Overwrite?").tqarg(saveFile), i18n("The file <i>%1</i> exists. Overwrite?").arg(saveFile),
i18n("Overwrite File?"), i18n("Overwrite File?"),
i18n("Overwrite"))!=KMessageBox::Continue) i18n("Overwrite"))!=KMessageBox::Continue)
{ {
@ -707,7 +707,7 @@ void AddressWidget::slotExport()
if (!f) if (!f)
{ {
KMessageBox::sorry(this, KMessageBox::sorry(this,
i18n("The file <i>%1</i> could not be opened for writing.").tqarg(saveFile)); i18n("The file <i>%1</i> could not be opened for writing.").arg(saveFile));
return; return;
} }
fAddressList.first(); fAddressList.first();

6
kpilot/conduitConfigDialog.cc
Unescape View File

@ -542,7 +542,7 @@ void ConduitConfigWidget::loadAndConfigure(TQListViewItem *p) // ,bool exec)
i18n("<qt>This is an internal action which has no " i18n("<qt>This is an internal action which has no "
"configuration options. " "configuration options. "
"The action's description is: <i>%1</i> " "The action's description is: <i>%1</i> "
"</qt>").tqarg(p->text(CONDUIT_COMMENT))); "</qt>").arg(p->text(CONDUIT_COMMENT)));
return; return;
} }
@ -735,7 +735,7 @@ void ConduitConfigWidget::warnNoExec(const TQListViewItem * p)
TQString msg = i18n("<qt>No library could be " TQString msg = i18n("<qt>No library could be "
"found for the conduit %1. This means that the " "found for the conduit %1. This means that the "
"conduit was not installed properly.</qt>") "conduit was not installed properly.</qt>")
.tqarg(p->text(CONDUIT_NAME)); .arg(p->text(CONDUIT_NAME));
#ifdef DEBUG #ifdef DEBUG
DEBUGKPILOT << fname << ": No library for " DEBUGKPILOT << fname << ": No library for "
@ -752,7 +752,7 @@ void ConduitConfigWidget::warnNoLibrary(const TQListViewItem *p)
TQString msg = i18n("<qt>There was a problem loading the library " TQString msg = i18n("<qt>There was a problem loading the library "
"for the conduit %1. This means that the " "for the conduit %1. This means that the "
"conduit was not installed properly.</qt>") "conduit was not installed properly.</qt>")
.tqarg(p->text(CONDUIT_NAME)); .arg(p->text(CONDUIT_NAME));
#ifdef DEBUG #ifdef DEBUG
DEBUGKPILOT << fname << ": Can't load library for " DEBUGKPILOT << fname << ": Can't load library for "

18
kpilot/dbviewerWidget.cc
Unescape View File

@ -187,12 +187,12 @@ void GenericDBWidget::slotSelected(const TQString &dbname)
if (!fDB || !fDB->isOpen()) if (!fDB || !fDB->isOpen())
{ {
fDBInfo->setText(i18n("<B>Warning:</B> Cannot read " fDBInfo->setText(i18n("<B>Warning:</B> Cannot read "
"database file %1.").tqarg(currentDB)); "database file %1.").arg(currentDB));
return; return;
} }
dbinfo=fDB->getDBInfo(); dbinfo=fDB->getDBInfo();
display.append(i18n("<B>Database:</B> %1, %2 records<BR>") display.append(i18n("<B>Database:</B> %1, %2 records<BR>")
.tqarg(TQString::fromLatin1(dbinfo.name)).tqarg(fDB->recordCount())); .arg(TQString::fromLatin1(dbinfo.name)).arg(fDB->recordCount()));
char buff[5]; char buff[5];
set_long(buff, dbinfo.type); set_long(buff, dbinfo.type);
buff[4]='\0'; buff[4]='\0';
@ -200,7 +200,7 @@ void GenericDBWidget::slotSelected(const TQString &dbname)
set_long(buff, dbinfo.creator); set_long(buff, dbinfo.creator);
buff[4]='\0'; buff[4]='\0';
TQString cr = TQString::fromLatin1(buff); TQString cr = TQString::fromLatin1(buff);
display.append(i18n("<B>Type:</B> %1, <B>Creator:</B> %2<br><br>").tqarg(tp).tqarg(cr)); display.append(i18n("<B>Type:</B> %1, <B>Creator:</B> %2<br><br>").arg(tp).arg(cr));
int currentRecord = 0; int currentRecord = 0;
PilotRecord *pilotRec; PilotRecord *pilotRec;
@ -244,33 +244,33 @@ void GenericDBWidget::slotSelected(const TQString &dbname)
if (!pf) if (!pf)
{ {
fDBInfo->setText(i18n("<B>Warning:</B> Cannot read " fDBInfo->setText(i18n("<B>Warning:</B> Cannot read "
"application file %1.").tqarg(dbname)); "application file %1.").arg(dbname));
return; return;
} }
#if PILOT_LINK_NUMBER < PILOT_LINK_0_12_0 #if PILOT_LINK_NUMBER < PILOT_LINK_0_12_0
if (pi_file_get_info(pf,&dbinfo)) if (pi_file_get_info(pf,&dbinfo))
{ {
fDBInfo->setText(i18n("<B>Warning:</B> Cannot read " fDBInfo->setText(i18n("<B>Warning:</B> Cannot read "
"application file %1.").tqarg(dbname)); "application file %1.").arg(dbname));
return; return;
} }
#else #else
pi_file_get_info(pf,&dbinfo); pi_file_get_info(pf,&dbinfo);
#endif #endif
display.append(i18n("<B>Application:</B> %1<BR><BR>").tqarg(dbname)); display.append(i18n("<B>Application:</B> %1<BR><BR>").arg(dbname));
} }
enableWidgets(currentDBtype==eDatabase); enableWidgets(currentDBtype==eDatabase);
TQDateTime ttime; TQDateTime ttime;
ttime.setTime_t(dbinfo.createDate); ttime.setTime_t(dbinfo.createDate);
display.append(i18n("Created: %1<BR>").tqarg(ttime.toString())); display.append(i18n("Created: %1<BR>").arg(ttime.toString()));
ttime.setTime_t(dbinfo.modifyDate); ttime.setTime_t(dbinfo.modifyDate);
display.append(i18n("Modified: %1<BR>").tqarg(ttime.toString())); display.append(i18n("Modified: %1<BR>").arg(ttime.toString()));
ttime.setTime_t(dbinfo.backupDate); ttime.setTime_t(dbinfo.backupDate);
display.append(i18n("Backed up: %1<BR>").tqarg(ttime.toString())); display.append(i18n("Backed up: %1<BR>").arg(ttime.toString()));
fDBInfo->setText(display); fDBInfo->setText(display);
} }

2
kpilot/fileInstaller.cc
Unescape View File

@ -106,7 +106,7 @@ void FileInstaller::deleteFiles(const TQStringList &files)
FUNCTIONSETUP; FUNCTIONSETUP;
if(!(s.endsWith(CSL1(".pdb"), false) || s.endsWith(CSL1(".prc"), false))) { if(!(s.endsWith(CSL1(".pdb"), false) || s.endsWith(CSL1(".prc"), false))) {
KMessageBox::detailedSorry(w, i18n("Cannot install %1").tqarg(s), KMessageBox::detailedSorry(w, i18n("Cannot install %1").arg(s),
i18n("Only PalmOS database files (like *.pdb and *.prc) can be installed by the file installer.")); i18n("Only PalmOS database files (like *.pdb and *.prc) can be installed by the file installer."));
return false; return false;
} }

28
kpilot/hotSync.cc
Unescape View File

@ -270,7 +270,7 @@ static inline void initNoBackup(TQStringList &dbnames,
unsigned long tag = *i; unsigned long tag = *i;
pi_untag(buf,tag); pi_untag(buf,tag);
buf[4]=0; buf[4]=0;
creatorids.append(CSL1("[%1]").tqarg(buf)); creatorids.append(CSL1("[%1]").arg(buf));
} }
DEBUGKPILOT << fname << ": Will skip creators " << creatorids << endl; DEBUGKPILOT << fname << ": Will skip creators " << creatorids << endl;
} }
@ -336,7 +336,7 @@ static inline bool checkBackupDirectory( const TQString &backupDir )
fP->fBackupDir = fP->fPreferBackupDir; fP->fBackupDir = fP->fPreferBackupDir;
} }
logMessage(i18n("Backup directory: %1.").tqarg(fP->fBackupDir)); logMessage(i18n("Backup directory: %1.").arg(fP->fBackupDir));
DEBUGKPILOT << fname DEBUGKPILOT << fname
<< ": This Pilot user's name is \"" << ": This Pilot user's name is \""
@ -416,7 +416,7 @@ static inline bool checkBackupDirectory( const TQString &backupDir )
// only backup data, not applications. // only backup data, not applications.
if ( (fP->fFullBackup) || !PilotDatabase::isResource(&info) ) if ( (fP->fFullBackup) || !PilotDatabase::isResource(&info) )
{ {
addSyncLogEntry(i18n("Backing up: %1").tqarg(Pilot::fromPilot(info.name))); addSyncLogEntry(i18n("Backing up: %1").arg(Pilot::fromPilot(info.name)));
if (!startBackupThread(&info)) if (!startBackupThread(&info))
{ {
@ -445,7 +445,7 @@ static inline bool checkBackupDirectory( const TQString &backupDir )
DEBUGKPILOT << fname << ": Skipping database <" << info.name DEBUGKPILOT << fname << ": Skipping database <" << info.name
<< "> (no-backup list)" << endl; << "> (no-backup list)" << endl;
TQString s = i18n("Skipping %1") TQString s = i18n("Skipping %1")
.tqarg(Pilot::fromPilot(info.name)); .arg(Pilot::fromPilot(info.name));
addSyncLogEntry(s); addSyncLogEntry(s);
} }
TQTimer::singleShot(0,this,TQT_SLOT(backupOneDB())); TQTimer::singleShot(0,this,TQT_SLOT(backupOneDB()));
@ -480,7 +480,7 @@ bool BackupAction::startBackupThread(DBInfo *info)
WARNINGKPILOT << "Unable to open database <" << info->name << ">" << endl; WARNINGKPILOT << "Unable to open database <" << info->name << ">" << endl;
KPILOT_DELETE(serial); KPILOT_DELETE(serial);
addSyncLogEntry(i18n("Backup of %1 failed.\n") addSyncLogEntry(i18n("Backup of %1 failed.\n")
.tqarg(Pilot::fromPilot(info->name))); .arg(Pilot::fromPilot(info->name)));
return false; return false;
} }
@ -660,7 +660,7 @@ FileInstallAction::~FileInstallAction()
DEBUGKPILOT << fname << ": Installing file " << filePath << endl; DEBUGKPILOT << fname << ": Installing file " << filePath << endl;
#endif #endif
TQString m = i18n("Installing %1").tqarg(fileName); TQString m = i18n("Installing %1").arg(fileName);
emit logProgress(m,(100 * fDBIndex) / (fList.count()+1)); emit logProgress(m,(100 * fDBIndex) / (fList.count()+1));
m+=CSL1("\n"); m+=CSL1("\n");
emit addSyncLogEntry(m,false /* Don't print in KPilot's log. */ ); emit addSyncLogEntry(m,false /* Don't print in KPilot's log. */ );
@ -748,7 +748,7 @@ bool FileInstallAction::resourceOK(const TQString &fileName, const TQString &fil
emit logError(i18n("The database in &quot;%1&quot; has a " emit logError(i18n("The database in &quot;%1&quot; has a "
"resource name that is longer than 31 characters. " "resource name that is longer than 31 characters. "
"This suggests a bug in the tool used to create the database. " "This suggests a bug in the tool used to create the database. "
"KPilot cannot install this database.").tqarg(fileName)); "KPilot cannot install this database.").arg(fileName));
} }
return r; return r;
@ -769,7 +769,7 @@ bool FileInstallAction::resourceOK(const TQString &fileName, const TQString &fil
} }
else else
{ {
return TQString(CSL1("Installing %1")).tqarg(fList[fDBIndex]); return TQString(CSL1("Installing %1")).arg(fList[fDBIndex]);
} }
} }
} }
@ -809,7 +809,7 @@ CheckUser::~CheckUser()
"handheld have a username set. " "handheld have a username set. "
"They <i>should</i> be set. " "They <i>should</i> be set. "
"Should KPilot set them to a default value " "Should KPilot set them to a default value "
"(<i>%1</i>)?</qt>").tqarg(defaultUserName); "(<i>%1</i>)?</qt>").arg(defaultUserName);
if (questionYesNo(q, i18n("User Unknown") /* ,"askUserNone" */) == if (questionYesNo(q, i18n("User Unknown") /* ,"askUserNone" */) ==
KMessageBox::Yes) KMessageBox::Yes)
@ -844,7 +844,7 @@ CheckUser::~CheckUser()
q += i18n("KPilot has a username set " q += i18n("KPilot has a username set "
"(<i>%1</i>) but the handheld does not. " "(<i>%1</i>) but the handheld does not. "
"Should KPilot's username be set in the " "Should KPilot's username be set in the "
"handheld as well?").tqarg(guiUserName); "handheld as well?").arg(guiUserName);
q += i18n("<br/>(<i>Note:</i> If your handheld " q += i18n("<br/>(<i>Note:</i> If your handheld "
"has been reset to factory defaults, you " "has been reset to factory defaults, you "
"should use <i>Restore</i> instead of a " "should use <i>Restore</i> instead of a "
@ -1021,7 +1021,7 @@ void RestoreAction::setDirectory( const TQString &path )
} }
emit logProgress(i18n("Restoring %1...").tqarg(TQString()),1); emit logProgress(i18n("Restoring %1...").arg(TQString()),1);
for (unsigned int i = 0; i < dir.count(); i++) for (unsigned int i = 0; i < dir.count(); i++)
{ {
@ -1041,7 +1041,7 @@ void RestoreAction::setDirectory( const TQString &path )
else else
{ {
WARNINGKPILOT << "Can't open " << s << endl; WARNINGKPILOT << "Can't open " << s << endl;
logMessage(i18n("File '%1' cannot be read.").tqarg(s)); logMessage(i18n("File '%1' cannot be read.").arg(s));
} }
} }
@ -1091,14 +1091,14 @@ void RestoreAction::setDirectory( const TQString &path )
TQFileInfo databaseInfo(dbi.path); TQFileInfo databaseInfo(dbi.path);
addSyncLogEntry(databaseInfo.fileName()); addSyncLogEntry(databaseInfo.fileName());
emit logProgress(i18n("Restoring %1...").tqarg(databaseInfo.fileName()), emit logProgress(i18n("Restoring %1...").arg(databaseInfo.fileName()),
(100*fP->fDBIndex) / (fP->fDBList.count()+1)) ; (100*fP->fDBIndex) / (fP->fDBList.count()+1)) ;
if ( !deviceLink()->installFiles( dbi.path, false /* don't delete */ ) ) if ( !deviceLink()->installFiles( dbi.path, false /* don't delete */ ) )
{ {
WARNINGKPILOT << "Couldn't restore " << dbi.path << endl; WARNINGKPILOT << "Couldn't restore " << dbi.path << endl;
logError(i18n("Cannot restore file `%1'.") logError(i18n("Cannot restore file `%1'.")
.tqarg(databaseInfo.fileName())); .arg(databaseInfo.fileName()));
} }
} }

12
kpilot/internalEditorAction.cc
Unescape View File

@ -73,7 +73,7 @@ void InternalEditorAction::syncDirtyDB()
{ {
fInternalEditorSyncStatus=eSyncDirtyDB; fInternalEditorSyncStatus=eSyncDirtyDB;
dirtyDBs=KPilotSettings::dirtyDatabases(); dirtyDBs=KPilotSettings::dirtyDatabases();
emit logMessage(i18n("Databases with changed records: %1").tqarg(dirtyDBs.join(CSL1(", ")))); emit logMessage(i18n("Databases with changed records: %1").arg(dirtyDBs.join(CSL1(", "))));
dbIter=dirtyDBs.begin(); dbIter=dirtyDBs.begin();
} }
else else
@ -99,7 +99,7 @@ void InternalEditorAction::syncDirtyDB()
if (!localDB->isOpen() || !serialDB->isOpen()) if (!localDB->isOpen() || !serialDB->isOpen())
{ {
emit logError(i18n("Unable to open the serial or local database for %1. " emit logError(i18n("Unable to open the serial or local database for %1. "
"Skipping it.").tqarg(*dbIter)); "Skipping it.").arg(*dbIter));
goto nextDB; goto nextDB;
} }
while ( (rec=localDB->readNextModifiedRec()) ) while ( (rec=localDB->readNextModifiedRec()) )
@ -203,10 +203,10 @@ bool InternalEditorAction::queryUseKPilotChanges(TQString dbName, recordid_t id,
TQString dialogText(i18n("The %1 with ID %2 of the database \"%3\" was changed " TQString dialogText(i18n("The %1 with ID %2 of the database \"%3\" was changed "
"on the handheld and in the internal editor. Shall the changes in KPilot be copied to the handheld, and so override the changes there?"). "on the handheld and in the internal editor. Shall the changes in KPilot be copied to the handheld, and so override the changes there?").
tqarg(recType).tqarg(id).tqarg(dbName)); arg(recType).arg(id).arg(dbName));
KDialogBase*resdlg=new KDialogBase(0L, "internalresolutiondialog", true, KDialogBase*resdlg=new KDialogBase(0L, "internalresolutiondialog", true,
i18n("Conflict in database %1").tqarg(*dbIter), i18n("Conflict in database %1").arg(*dbIter),
KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true, KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true,
i18n("Use KPilot"), i18n("Use Handheld") ); i18n("Use KPilot"), i18n("Use Handheld") );
resdlg->setButtonText(KDialogBase::Ok, i18n("Use &KPilot")); resdlg->setButtonText(KDialogBase::Ok, i18n("Use &KPilot"));
@ -312,7 +312,7 @@ void InternalEditorAction::syncFlagsChangedDB()
{ {
fInternalEditorSyncStatus=eSyncFlagsChangedDB; fInternalEditorSyncStatus=eSyncFlagsChangedDB;
dirtyDBs=KPilotSettings::flagsChangedDatabases(); dirtyDBs=KPilotSettings::flagsChangedDatabases();
emit logMessage(i18n("Databases with changed flags: %1").tqarg(dirtyDBs.join(CSL1(", ")))); emit logMessage(i18n("Databases with changed flags: %1").arg(dirtyDBs.join(CSL1(", "))));
dbIter=dirtyDBs.begin(); dbIter=dirtyDBs.begin();
} }
else else
@ -353,7 +353,7 @@ void InternalEditorAction::syncAppBlockChangedDB()
{ {
fInternalEditorSyncStatus=eSyncAppBlockChangedDB; fInternalEditorSyncStatus=eSyncAppBlockChangedDB;
dirtyDBs=KPilotSettings::appBlockChangedDatabases(); dirtyDBs=KPilotSettings::appBlockChangedDatabases();
emit logMessage(i18n("Databases with changed AppBlock: %1").tqarg(dirtyDBs.join(CSL1(", ")))); emit logMessage(i18n("Databases with changed AppBlock: %1").arg(dirtyDBs.join(CSL1(", "))));
dbIter=dirtyDBs.begin(); dbIter=dirtyDBs.begin();
} }
else else

10
kpilot/kpilot.cc
Unescape View File

@ -178,7 +178,7 @@ void KPilotInstaller::startDaemonIfNeeded()
{ {
fLogWidget->addMessage(i18n("Could not start the " fLogWidget->addMessage(i18n("Could not start the "
"KPilot daemon. The system error message " "KPilot daemon. The system error message "
"was: &quot;%1&quot;").tqarg(daemonError)); "was: &quot;%1&quot;").arg(daemonError));
} }
fAppStatus=Error; fAppStatus=Error;
} }
@ -194,7 +194,7 @@ void KPilotInstaller::startDaemonIfNeeded()
fLogWidget->addMessage( fLogWidget->addMessage(
i18n("Daemon status is `%1'") i18n("Daemon status is `%1'")
.tqarg(s.isEmpty() ? i18n("not running") : s )); .arg(s.isEmpty() ? i18n("not running") : s ));
} }
fAppStatus=Normal; fAppStatus=Normal;
} }
@ -213,7 +213,7 @@ void KPilotInstaller::readConfig()
{ {
fLogWidget->addMessage(i18n("Using character set %1 on " fLogWidget->addMessage(i18n("Using character set %1 on "
"the handheld.") "the handheld.")
.tqarg(Pilot::codecName())); .arg(Pilot::codecName()));
} }
} }
@ -459,7 +459,7 @@ bool KPilotInstaller::componentPreSync()
if (!reason.isNull()) if (!reason.isNull())
{ {
KMessageBox::sorry(this, KMessageBox::sorry(this,
rprefix.tqarg(reason), rprefix.arg(reason),
i18n("Cannot start Sync")); i18n("Cannot start Sync"));
return false; return false;
} }
@ -896,7 +896,7 @@ void KPilotInstaller::componentUpdate()
if (fLogWidget) if (fLogWidget)
{ {
fLogWidget->logMessage(i18n("Changed username to `%1'.") fLogWidget->logMessage(i18n("Changed username to `%1'.")
.tqarg(KPilotSettings::userName())); .arg(KPilotSettings::userName()));
fManagingWidget->showPage(0); fManagingWidget->showPage(0);
slotAboutToShowComponent(fLogWidget); slotAboutToShowComponent(fLogWidget);
} }

6
kpilot/kpilotConfig.cc
Unescape View File

@ -163,7 +163,7 @@ void KPilotConfig::addFlagsChangedDatabase(TQString db)
s += i18n("The configuration file is outdated."); s += i18n("The configuration file is outdated.");
s += ' '; s += ' ';
s += i18n("The configuration file has version %1, while KPilot " s += i18n("The configuration file has version %1, while KPilot "
"needs version %2.").tqarg(fileversion).tqarg(ConfigurationVersion); "needs version %2.").arg(fileversion).arg(ConfigurationVersion);
if (run) if (run)
{ {
s += ' '; s += ' ';
@ -234,7 +234,7 @@ static void update440()
const char **s = oldconduits; const char **s = oldconduits;
while (*s) while (*s)
{ {
TQString libname = CSL1("trinity/lib%1conduit.so").tqarg(TQString::fromLatin1(*s)); TQString libname = CSL1("trinity/lib%1conduit.so").arg(TQString::fromLatin1(*s));
TQString foundlib = ::locate("lib",libname); TQString foundlib = ::locate("lib",libname);
if (!foundlib.isEmpty()) if (!foundlib.isEmpty())
{ {
@ -270,7 +270,7 @@ static void update443()
{ {
if ((*i).length()==4) if ((*i).length()==4)
{ {
fixSkip.append(CSL1("[%1]").tqarg(*i)); fixSkip.append(CSL1("[%1]").arg(*i));
fixedSome = true; fixedSome = true;
} }
else else

4
kpilot/kpilotConfigDialog.cc
Unescape View File

@ -66,7 +66,7 @@
/* virtual */ TQString ConfigPage::maybeSaveText() const /* virtual */ TQString ConfigPage::maybeSaveText() const
{ {
return i18n("<qt>The settings for configuration page <i>%1</i> have been changed. Do you " return i18n("<qt>The settings for configuration page <i>%1</i> have been changed. Do you "
"want to save the changes before continuing?</qt>").tqarg(this->conduitName()); "want to save the changes before continuing?</qt>").arg(this->conduitName());
} }
DeviceConfigPage::DeviceConfigPage(TQWidget * w, const char *n ) : ConfigPage( w, n ) DeviceConfigPage::DeviceConfigPage(TQWidget * w, const char *n ) : ConfigPage( w, n )
@ -146,7 +146,7 @@ void DeviceConfigPage::load()
"is longer than 13 characters. This is " "is longer than 13 characters. This is "
"probably unsupported and can cause problems. " "probably unsupported and can cause problems. "
"Are you sure you want to use this device name?</qt>") "Are you sure you want to use this device name?</qt>")
.tqarg(d), .arg(d),
i18n("Device Name too Long"), i18n("Use"), i18n("Do Not Use") i18n("Device Name too Long"), i18n("Use"), i18n("Do Not Use")
) ; ) ;
} }

2
kpilot/kpilotConfigWizard.cc
Unescape View File

@ -197,7 +197,7 @@ void ConfigWizard::accept()
KPilotSettings::setInstalledConduits( conduits ); KPilotSettings::setInstalledConduits( conduits );
#undef APPEND_CONDUIT #undef APPEND_CONDUIT
TQString finishMessage = i18n("KPilot is now configured to sync with %1.").tqarg(applicationName); TQString finishMessage = i18n("KPilot is now configured to sync with %1.").arg(applicationName);
if (fMode == InDialog) if (fMode == InDialog)
{ {
finishMessage.append(CSL1("\n")); finishMessage.append(CSL1("\n"));

2
kpilot/kpilotConfigWizard_app.ui
Unescape View File

@ -25,7 +25,7 @@
Press "Finish" to setup KPilot according to the settings in this configuration Wizard.</string> Press "Finish" to setup KPilot according to the settings in this configuration Wizard.</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
</widget> </widget>

4
kpilot/kpilotConfigWizard_user.ui
Unescape View File

@ -23,7 +23,7 @@
<property name="text"> <property name="text">
<string>This wizard will help you configure KPilot.</string> <string>This wizard will help you configure KPilot.</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
</widget> </widget>
@ -34,7 +34,7 @@
<property name="text"> <property name="text">
<string>As a first step, we need to determine the user name and how the handheld is connected to the computer.</string> <string>As a first step, we need to determine the user name and how the handheld is connected to the computer.</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
</widget> </widget>

2
kpilot/kpilotProbeDialog.cc
Unescape View File

@ -285,7 +285,7 @@ void ProbeDialog::connection( KPilotDeviceLink*lnk)
mUserName = usr.name(); mUserName = usr.name();
mDevice = mActiveLink->pilotPath(); mDevice = mActiveLink->pilotPath();
fStatus->setText( i18n("Found a connected device on %1").tqarg(mDevice) ); fStatus->setText( i18n("Found a connected device on %1").arg(mDevice) );
fUser->setText( mUserName ); fUser->setText( mUserName );
fDevice->setText( mDevice ); fDevice->setText( mDevice );
mDetected = true; mDetected = true;

4
kpilot/listCat.cc
Unescape View File

@ -247,13 +247,13 @@ void RichListViewItem::computeHeight(int c)
const TQColorGroup &gc, const TQColorGroup &gc,
int column, int column,
int width, int width,
int tqalignment) int alignment)
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
if ((!column) || (!fIsRich[column])) if ((!column) || (!fIsRich[column]))
{ {
TQListViewItem::paintCell(p,gc,column,width,tqalignment); TQListViewItem::paintCell(p,gc,column,width,alignment);
return; return;
} }

2
kpilot/listCat.h
Unescape View File

@ -210,7 +210,7 @@ public:
const TQColorGroup &, const TQColorGroup &,
int column, int column,
int width, int width,
int tqalignment); int alignment);
virtual void setup(); virtual void setup();

14
kpilot/logFile.cc
Unescape View File

@ -70,21 +70,21 @@ LogFile::LogFile() : DCOPObject("LogIface"), TQObject(), fOutfile(0L), fSyncing(
fSyncing = true; fSyncing = true;
fLogStream.setDevice(TQT_TQIODEVICE(fOutfile)); fLogStream.setDevice(TQT_TQIODEVICE(fOutfile));
fLogStream<<(CSL1("KPilot HotSync log, %1").tqarg(TQDateTime::currentDateTime().toString()))<<endl<<endl<<endl; fLogStream<<(CSL1("KPilot HotSync log, %1").arg(TQDateTime::currentDateTime().toString()))<<endl<<endl<<endl;
fLogStream<<(CSL1("Version: KPilot %1").tqarg(TQString::fromLatin1(KPILOT_VERSION)))<<endl; fLogStream<<(CSL1("Version: KPilot %1").arg(TQString::fromLatin1(KPILOT_VERSION)))<<endl;
fLogStream<<(CSL1("Version: pilot-link %1.%2.%3%4" ) fLogStream<<(CSL1("Version: pilot-link %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 #ifdef PILOT_LINK_PATCH
.tqarg(TQString::fromLatin1(PILOT_LINK_PATCH)) .arg(TQString::fromLatin1(PILOT_LINK_PATCH))
#else #else
.tqarg(TQString()) .arg(TQString())
#endif #endif
)<<endl; )<<endl;
#ifdef TDE_VERSION_STRING #ifdef TDE_VERSION_STRING
fLogStream<<(CSL1("Version: KDE %1" ).tqarg(TQString::fromLatin1(TDE_VERSION_STRING)) )<<endl; fLogStream<<(CSL1("Version: KDE %1" ).arg(TQString::fromLatin1(TDE_VERSION_STRING)) )<<endl;
#endif #endif
#ifdef TQT_VERSION_STR #ifdef TQT_VERSION_STR
fLogStream<<(CSL1("Version: TQt %1" ).tqarg(TQString::fromLatin1(TQT_VERSION_STR)) )<<endl; fLogStream<<(CSL1("Version: TQt %1" ).arg(TQString::fromLatin1(TQT_VERSION_STR)) )<<endl;
#endif #endif
fLogStream<<endl<<endl; fLogStream<<endl<<endl;

16
kpilot/logWidget.cc
Unescape View File

@ -95,24 +95,24 @@ LogWidget::LogWidget(TQWidget * parent) :
TQString initialText ; TQString initialText ;
initialText.append(CSL1("<b>Version:</b> KPilot %1" TE_EOL) initialText.append(CSL1("<b>Version:</b> KPilot %1" TE_EOL)
.tqarg(TQString::fromLatin1(KPILOT_VERSION))); .arg(TQString::fromLatin1(KPILOT_VERSION)));
initialText.append(CSL1("<b>Version:</b> pilot-link %1.%2.%3%4" TE_EOL) initialText.append(CSL1("<b>Version:</b> pilot-link %1.%2.%3%4" TE_EOL)
.tqarg(PILOT_LINK_VERSION) .arg(PILOT_LINK_VERSION)
.tqarg(PILOT_LINK_MAJOR) .arg(PILOT_LINK_MAJOR)
.tqarg(PILOT_LINK_MINOR) .arg(PILOT_LINK_MINOR)
#ifdef PILOT_LINK_PATCH #ifdef PILOT_LINK_PATCH
.tqarg(TQString::fromLatin1(PILOT_LINK_PATCH)) .arg(TQString::fromLatin1(PILOT_LINK_PATCH))
#else #else
.tqarg(TQString()) .arg(TQString())
#endif #endif
); );
#ifdef TDE_VERSION_STRING #ifdef TDE_VERSION_STRING
initialText.append(CSL1("<b>Version:</b> KDE %1" TE_EOL) initialText.append(CSL1("<b>Version:</b> KDE %1" TE_EOL)
.tqarg(TQString::fromLatin1(TDE_VERSION_STRING))); .arg(TQString::fromLatin1(TDE_VERSION_STRING)));
#endif #endif
#ifdef TQT_VERSION_STR #ifdef TQT_VERSION_STR
initialText.append(CSL1("<b>Version:</b> TQt %1" TE_EOL) initialText.append(CSL1("<b>Version:</b> TQt %1" TE_EOL)
.tqarg(TQString::fromLatin1(TQT_VERSION_STR))); .arg(TQString::fromLatin1(TQT_VERSION_STR)));
#endif #endif
initialText.append(CSL1(TE_EOL)); initialText.append(CSL1(TE_EOL));

2
kpilot/memoWidget.cc
Unescape View File

@ -84,7 +84,7 @@ MemoWidget::MemoWidget(TQWidget * parent,
FUNCTIONSETUP; FUNCTIONSETUP;
setGeometry(0, 0, setGeometry(0, 0,
parent->tqgeometry().width(), parent->tqgeometry().height()); parent->geometry().width(), parent->geometry().height());
setupWidget(); setupWidget();
d->fMemoList.setAutoDelete(true); d->fMemoList.setAutoDelete(true);
slotUpdateButtons(); slotUpdateButtons();

4
kpilot/pilotComponent.cc
Unescape View File

@ -57,8 +57,8 @@ PilotComponent::PilotComponent(TQWidget * parent,
if (parent) if (parent)
{ {
resize(parent->tqgeometry().width(), resize(parent->geometry().width(),
parent->tqgeometry().height()); parent->geometry().height());
} }
} }

6
kpilot/pilotDaemon.cc
Unescape View File

@ -166,7 +166,7 @@ void PilotDaemonTray::setupWidget()
SyncAction::SyncMode::name(SyncAction::SyncMode::a) + once, \ SyncAction::SyncMode::name(SyncAction::SyncMode::a) + once, \
(int)(SyncAction::SyncMode::a)); (int)(SyncAction::SyncMode::a));
fSyncTypeMenu->insertItem(i18n("Default (%1)") fSyncTypeMenu->insertItem(i18n("Default (%1)")
.tqarg(SyncAction::SyncMode::name((SyncAction::SyncMode::Mode)KPilotSettings::syncType())), .arg(SyncAction::SyncMode::name((SyncAction::SyncMode::Mode)KPilotSettings::syncType())),
0); 0);
fSyncTypeMenu->insertSeparator(); fSyncTypeMenu->insertSeparator();
@ -667,7 +667,7 @@ bool PilotDaemon::setupPilotLink()
} }
} }
getLogger().logMessage(i18n("Next HotSync will be: %1. ").tqarg(fNextSyncType.name()) + getLogger().logMessage(i18n("Next HotSync will be: %1. ").arg(fNextSyncType.name()) +
i18n("Please press the HotSync button.")); i18n("Please press the HotSync button."));
} }
@ -1272,7 +1272,7 @@ void PilotDaemon::updateTrayStatus(const TQString &s)
tipText.append( s ); tipText.append( s );
tipText.append( CSL1(" ") ); tipText.append( CSL1(" ") );
tipText.append( i18n("Next sync is %1.") tipText.append( i18n("Next sync is %1.")
.tqarg( fNextSyncType.name() ) ); .arg( fNextSyncType.name() ) );
tipText.append( CSL1("</qt>") ); tipText.append( CSL1("</qt>") );
TQToolTip::remove(fTray); TQToolTip::remove(fTray);

4
kpilot/todoEditor_base.ui
Unescape View File

@ -31,7 +31,7 @@
<property name="text"> <property name="text">
<string>&amp;Description:</string> <string>&amp;Description:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignTop</set> <set>AlignTop</set>
</property> </property>
<property name="buddy" stdset="0"> <property name="buddy" stdset="0">
@ -53,7 +53,7 @@
<property name="text"> <property name="text">
<string>&amp;Note:</string> <string>&amp;Note:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignTop</set> <set>AlignTop</set>
</property> </property>
<property name="buddy" stdset="0"> <property name="buddy" stdset="0">

2
kpilot/todoWidget.cc
Unescape View File

@ -172,7 +172,7 @@ void TodoWidget::showComponent()
#if TDE_VERSION<220 #if TDE_VERSION<220
s = i18n("There are still %1 to-do editing windows open.") s = i18n("There are still %1 to-do editing windows open.")
.tqarg(TQString::number(fPendingTodos)); .arg(TQString::number(fPendingTodos));
#else #else
s = i18n("There is still a to-do editing window open.", s = i18n("There is still a to-do editing window open.",
"There are still %n to-do editing windows open.", "There are still %n to-do editing windows open.",

6
lib/actions.cc
Unescape View File

@ -52,8 +52,8 @@ WelcomeAction::WelcomeAction(KPilotLink *p) :
FUNCTIONSETUP; FUNCTIONSETUP;
addSyncLogEntry(i18n("KPilot %1 HotSync starting...\n") addSyncLogEntry(i18n("KPilot %1 HotSync starting...\n")
.tqarg(TQString::fromLatin1(KPILOT_VERSION))); .arg(TQString::fromLatin1(KPILOT_VERSION)));
emit logMessage( i18n("Using encoding %1 on the handheld.").tqarg(Pilot::codecName()) ); emit logMessage( i18n("Using encoding %1 on the handheld.").arg(Pilot::codecName()) );
emit syncDone(this); emit syncDone(this);
return true; return true;
} }
@ -128,7 +128,7 @@ TestLink::TestLink(KPilotLink * p) :
// Let the KDE User know what's happening // Let the KDE User know what's happening
// Pretty sure all database names are in latin1. // Pretty sure all database names are in latin1.
emit logMessage(i18n("Syncing database %1...") emit logMessage(i18n("Syncing database %1...")
.tqarg(Pilot::fromPilot(db.name))); .arg(Pilot::fromPilot(db.name)));
} }
emit logMessage(i18n("HotSync finished.")); emit logMessage(i18n("HotSync finished."));

16
lib/kpilotdevicelink.cc
Unescape View File

@ -146,7 +146,7 @@ void DeviceCommThread::reset()
{ {
TQApplication::postEvent(link(), new DeviceCommEvent(EventLogMessage, TQApplication::postEvent(link(), new DeviceCommEvent(EventLogMessage,
i18n("Could not open device: %1 (will retry)") i18n("Could not open device: %1 (will retry)")
.tqarg(link()->pilotPath() ))); .arg(link()->pilotPath() )));
} }
link()->fMessages->reset(); link()->fMessages->reset();
@ -185,7 +185,7 @@ void DeviceCommThread::openDevice()
{ {
TQApplication::postEvent(link(), new DeviceCommEvent(EventLogMessage, TQApplication::postEvent(link(), new DeviceCommEvent(EventLogMessage,
i18n("Trying to open device %1...") i18n("Trying to open device %1...")
.tqarg(link()->fPilotPath))); .arg(link()->fPilotPath)));
} }
// if we're not supposed to be done, try to open the main pilot // if we're not supposed to be done, try to open the main pilot
@ -259,7 +259,7 @@ bool DeviceCommThread::open(const TQString &device)
{ {
e = errno; e = errno;
msg = i18n("Cannot create socket for communicating " msg = i18n("Cannot create socket for communicating "
"with the Pilot (%1)").tqarg(errorMessage(e)); "with the Pilot (%1)").arg(errorMessage(e));
DEBUGKPILOT << msg << endl; DEBUGKPILOT << msg << endl;
DEBUGKPILOT << "(" << strerror(e) << ")" << endl; DEBUGKPILOT << "(" << strerror(e) << ")" << endl;
@ -286,7 +286,7 @@ bool DeviceCommThread::open(const TQString &device)
<< strerror(errno) << "]" << endl; << strerror(errno) << "]" << endl;
e = errno; e = errno;
msg = i18n("Cannot open Pilot port \"%1\". ").tqarg(link()->fRealPilotPath); msg = i18n("Cannot open Pilot port \"%1\". ").arg(link()->fRealPilotPath);
DEBUGKPILOT << msg << endl; DEBUGKPILOT << msg << endl;
DEBUGKPILOT << "(" << strerror(e) << ")" << endl; DEBUGKPILOT << "(" << strerror(e) << ")" << endl;
@ -409,7 +409,7 @@ void DeviceCommThread::acceptDevice()
WARNINGKPILOT << "pi_accept returned: [" << s << "]" << endl; WARNINGKPILOT << "pi_accept returned: [" << s << "]" << endl;
TQApplication::postEvent(link(), new DeviceCommEvent(EventLogError, i18n("Cannot accept Pilot (%1)") TQApplication::postEvent(link(), new DeviceCommEvent(EventLogError, i18n("Cannot accept Pilot (%1)")
.tqarg(TQString::fromLocal8Bit(s)))); .arg(TQString::fromLocal8Bit(s))));
link()->fLinkStatus = PilotLinkError; link()->fLinkStatus = PilotLinkError;
reset(); reset();
@ -424,7 +424,7 @@ void DeviceCommThread::acceptDevice()
WARNINGKPILOT << "Already connected or unable to connect!" << endl; WARNINGKPILOT << "Already connected or unable to connect!" << endl;
TQApplication::postEvent(link(), new DeviceCommEvent(EventLogError, i18n("Cannot accept Pilot (%1)") TQApplication::postEvent(link(), new DeviceCommEvent(EventLogError, i18n("Cannot accept Pilot (%1)")
.tqarg(i18n("already connected")))); .arg(i18n("already connected"))));
reset(); reset();
return; return;
@ -707,7 +707,7 @@ void KPilotDeviceLink::checkDevice()
if (!(fi.isReadable() && fi.isWritable())) if (!(fi.isReadable() && fi.isWritable()))
{ {
emit logError(i18n("Pilot device %1 is not read-write.") emit logError(i18n("Pilot device %1 is not read-write.")
.tqarg(fPilotPath)); .arg(fPilotPath));
} }
} }
else else
@ -718,7 +718,7 @@ void KPilotDeviceLink::checkDevice()
emit emit
logError(i18n("Pilot device %1 does not exist. " logError(i18n("Pilot device %1 does not exist. "
"Probably it is a USB device and will appear during a HotSync.") "Probably it is a USB device and will appear during a HotSync.")
.tqarg(fPilotPath)); .arg(fPilotPath));
// Suppress all normal and error messages about opening the device. // Suppress all normal and error messages about opening the device.
fMessages->block(Messages::OpenMessage | Messages::OpenFailMessage, fMessages->block(Messages::OpenMessage | Messages::OpenFailMessage,
true); true);

14
lib/pilotAddress.cc
Unescape View File

@ -171,7 +171,7 @@ unsigned int PhoneSlot::toField() const
PhoneSlot::operator TQString() const PhoneSlot::operator TQString() const
{ {
return TQString("%1,%2").tqarg(toOffset()).tqarg(toField()); return TQString("%1,%2").arg(toOffset()).arg(toField());
} }
#define MAXFIELDS 19 #define MAXFIELDS 19
@ -294,13 +294,13 @@ TQString PilotAddress::getTextRepresentation(const PilotAddressInfo *info, TQt::
if (firstName.isEmpty()) if (firstName.isEmpty())
{ {
// So replace placeholder for first name (%1) with empty // So replace placeholder for first name (%1) with empty
tmp = tmp.tqarg(TQString()); tmp = tmp.arg(TQString());
} }
else else
{ {
tmp = tmp.tqarg(rtExpand(firstName,richText)); tmp = tmp.arg(rtExpand(firstName,richText));
} }
tmp=tmp.tqarg(rtExpand(getField(entryLastname), richText)); tmp=tmp.arg(rtExpand(getField(entryLastname), richText));
text += tmp; text += tmp;
text += ps; text += ps;
@ -335,13 +335,13 @@ TQString PilotAddress::getTextRepresentation(const PilotAddressInfo *info, TQt::
} }
if (info) if (info)
{ {
tmp=tmp.tqarg(info->phoneLabel( getPhoneType( i ) )); tmp=tmp.arg(info->phoneLabel( getPhoneType( i ) ));
} }
else else
{ {
tmp=tmp.tqarg(CSL1("Contact: ")); tmp=tmp.arg(CSL1("Contact: "));
} }
tmp=tmp.tqarg(rtExpand(getField(i.toField()), richText)); tmp=tmp.arg(rtExpand(getField(i.toField()), richText));
text += tmp; text += tmp;
text += br; text += br;
} }

30
lib/pilotDateEntry.cc
Unescape View File

@ -170,13 +170,13 @@ TQString PilotDateEntry::getTextRepresentation(TQt::TextFormat richText)
// title + name // title + name
text += par; text += par;
tmp=richText?CSL1("<b><big>%1</big></b>"):CSL1("%1"); tmp=richText?CSL1("<b><big>%1</big></b>"):CSL1("%1");
text += tmp.tqarg(rtExpand(getDescription(), richText)); text += tmp.arg(rtExpand(getDescription(), richText));
text += ps; text += ps;
TQDateTime dt(readTm(getEventStart())); TQDateTime dt(readTm(getEventStart()));
TQString startDate(dt.toString(Qt::LocalDate)); TQString startDate(dt.toString(Qt::LocalDate));
text+=par; text+=par;
text+=i18n("Start date: %1").tqarg(startDate); text+=i18n("Start date: %1").arg(startDate);
text+=ps; text+=ps;
if (isEvent()) if (isEvent())
@ -190,7 +190,7 @@ TQString PilotDateEntry::getTextRepresentation(TQt::TextFormat richText)
dt=readTm(getEventEnd()); dt=readTm(getEventEnd());
TQString endDate(dt.toString(Qt::LocalDate)); TQString endDate(dt.toString(Qt::LocalDate));
text+=par; text+=par;
text+=i18n("End date: %1").tqarg(endDate); text+=i18n("End date: %1").arg(endDate);
text+=ps; text+=ps;
} }
@ -201,10 +201,10 @@ TQString PilotDateEntry::getTextRepresentation(TQt::TextFormat richText)
arg(getAdvance()); arg(getAdvance());
switch (getAdvanceUnits()) switch (getAdvanceUnits())
{ {
case advMinutes: tmp=tmp.tqarg(i18n("minutes")); break; case advMinutes: tmp=tmp.arg(i18n("minutes")); break;
case advHours: tmp=tmp.tqarg(i18n("hours")); break; case advHours: tmp=tmp.arg(i18n("hours")); break;
case advDays: tmp=tmp.tqarg(i18n("days")); break; case advDays: tmp=tmp.arg(i18n("days")); break;
default: tmp=tmp.tqarg(TQString()); break;; default: tmp=tmp.arg(TQString()); break;;
} }
text+=tmp; text+=tmp;
text+=ps; text+=ps;
@ -215,16 +215,16 @@ TQString PilotDateEntry::getTextRepresentation(TQt::TextFormat richText)
text+=par; text+=par;
tmp=i18n("Recurrence: every %1 %2"); tmp=i18n("Recurrence: every %1 %2");
int freq = getRepeatFrequency(); int freq = getRepeatFrequency();
tmp=tmp.tqarg(freq); tmp=tmp.arg(freq);
switch(getRepeatType()) switch(getRepeatType())
{ {
case repeatDaily: tmp=tmp.tqarg(i18n("day(s)")); break; case repeatDaily: tmp=tmp.arg(i18n("day(s)")); break;
case repeatWeekly: tmp=tmp.tqarg(i18n("week(s)")); break; case repeatWeekly: tmp=tmp.arg(i18n("week(s)")); break;
case repeatMonthlyByDay: case repeatMonthlyByDay:
case repeatMonthlyByDate: tmp=tmp.tqarg(i18n("month(s)")); break; case repeatMonthlyByDate: tmp=tmp.arg(i18n("month(s)")); break;
case repeatYearly: tmp=tmp.tqarg(i18n("year(s)")); break; case repeatYearly: tmp=tmp.arg(i18n("year(s)")); break;
default: tmp=tmp.tqarg(TQString()); break; default: tmp=tmp.arg(TQString()); break;
} }
text+=tmp; text+=tmp;
text+=br; text+=br;
@ -237,7 +237,7 @@ TQString PilotDateEntry::getTextRepresentation(TQt::TextFormat richText)
else else
{ {
dt = readTm(getRepeatEnd()).date(); dt = readTm(getRepeatEnd()).date();
text+=i18n("Until %1").tqarg(dt.toString(Qt::LocalDate)); text+=i18n("Until %1").arg(dt.toString(Qt::LocalDate));
} }
text+=br; text+=br;
@ -245,7 +245,7 @@ TQString PilotDateEntry::getTextRepresentation(TQt::TextFormat richText)
if (getRepeatType()==repeatMonthlyByDate) text+=i18n("Repeating on the n-th day of the month")+br; if (getRepeatType()==repeatMonthlyByDate) text+=i18n("Repeating on the n-th day of the month")+br;
// TODO: show the dayArray when repeating weekly // TODO: show the dayArray when repeating weekly
/*TQBitArray dayArray(7); /*TQBitArray dayArray(7);
if (getRepeatType()==repeatWeekly) text+=i18n("Repeat day flags: %1").tqarg(getRepeatDays if (getRepeatType()==repeatWeekly) text+=i18n("Repeat day flags: %1").arg(getRepeatDays
const int *days = dateEntry->getRepeatDays(); const int *days = dateEntry->getRepeatDays();
// Rotate the days of the week, since day numbers on the Pilot and // Rotate the days of the week, since day numbers on the Pilot and
// in vCal / Events are different. // in vCal / Events are different.

4
lib/pilotMemo.cc
Unescape View File

@ -79,11 +79,11 @@ TQString PilotMemo::getTextRepresentation(TQt::TextFormat richText)
if (richText==TQt::RichText) if (richText==TQt::RichText)
{ {
return i18n("<i>Title:</i> %1<br>\n<i>MemoText:</i><br>%2"). return i18n("<i>Title:</i> %1<br>\n<i>MemoText:</i><br>%2").
tqarg(rtExpand(getTitle(), richText)).tqarg(rtExpand(text(), richText)); arg(rtExpand(getTitle(), richText)).arg(rtExpand(text(), richText));
} }
else else
{ {
return i18n("Title: %1\nMemoText:\n%2").tqarg(getTitle()).tqarg(text()); return i18n("Title: %1\nMemoText:\n%2").arg(getTitle()).arg(text());
} }
} }

4
lib/pilotRecord.cc
Unescape View File

@ -54,8 +54,8 @@
/* virtual */ TQString PilotRecord::textRepresentation() const /* virtual */ TQString PilotRecord::textRepresentation() const
{ {
return CSL1("[ %1,%2 ]") return CSL1("[ %1,%2 ]")
.tqarg(PilotRecordBase::textRepresentation()) .arg(PilotRecordBase::textRepresentation())
.tqarg(size()); .arg(size());
} }

6
lib/pilotTodoEntry.cc
Unescape View File

@ -125,7 +125,7 @@ TQString PilotTodoEntry::getTextRepresentation(TQt::TextFormat richText)
// title + name // title + name
text += par; text += par;
tmp= (richText==TQt::RichText) ?CSL1("<b><big>%1</big></b>"):CSL1("%1"); tmp= (richText==TQt::RichText) ?CSL1("<b><big>%1</big></b>"):CSL1("%1");
text += tmp.tqarg(rtExpand(getDescription(), richText)); text += tmp.arg(rtExpand(getDescription(), richText));
text += ps; text += ps;
text += par; text += par;
@ -140,7 +140,7 @@ TQString PilotTodoEntry::getTextRepresentation(TQt::TextFormat richText)
TQDate dt(readTm(getDueDate()).date()); TQDate dt(readTm(getDueDate()).date());
TQString dueDate(dt.toString(Qt::LocalDate)); TQString dueDate(dt.toString(Qt::LocalDate));
text+=par; text+=par;
text+=i18n("Due date: %1").tqarg(dueDate); text+=i18n("Due date: %1").arg(dueDate);
text+=ps; text+=ps;
} }
@ -148,7 +148,7 @@ TQString PilotTodoEntry::getTextRepresentation(TQt::TextFormat richText)
text+=ps; text+=ps;
text+=par; text+=par;
text+=i18n("Priority: %1").tqarg(getPriority()); text+=i18n("Priority: %1").arg(getPriority());
text+=ps; text+=ps;
if (!getNote().isEmpty()) if (!getNote().isEmpty())

52
lib/plugin.cc
Unescape View File

@ -91,7 +91,7 @@ ConduitConfigBase::~ConduitConfigBase()
FUNCTIONSETUP; FUNCTIONSETUP;
return i18n("<qt>The <i>%1</i> conduit's settings have been changed. Do you " return i18n("<qt>The <i>%1</i> conduit's settings have been changed. Do you "
"want to save the changes before continuing?</qt>").tqarg(this->conduitName()); "want to save the changes before continuing?</qt>").arg(this->conduitName());
} }
/* virtual */ bool ConduitConfigBase::maybeSave() /* virtual */ bool ConduitConfigBase::maybeSave()
@ -102,7 +102,7 @@ ConduitConfigBase::~ConduitConfigBase()
int r = KMessageBox::questionYesNoCancel(fWidget, int r = KMessageBox::questionYesNoCancel(fWidget,
maybeSaveText(), maybeSaveText(),
i18n("%1 Conduit").tqarg(this->conduitName()), KStdGuiItem::save(), KStdGuiItem::discard()); i18n("%1 Conduit").arg(this->conduitName()), KStdGuiItem::save(), KStdGuiItem::discard());
if (r == KMessageBox::Cancel) return false; if (r == KMessageBox::Cancel) return false;
if (r == KMessageBox::Yes) commit(); if (r == KMessageBox::Yes) commit();
return true; return true;
@ -184,7 +184,7 @@ TQWidget *ConduitConfigBase::aboutPage(TQWidget *parent, KAboutData *ad)
if (!p->homepage().isEmpty()) if (!p->homepage().isEmpty())
{ {
s = TQString(); s = TQString();
s += CSL1("<a href=\"%1\">").tqarg(p->homepage()); s += CSL1("<a href=\"%1\">").arg(p->homepage());
s += p->homepage(); s += p->homepage();
s += CSL1("</a><br>"); s += CSL1("</a><br>");
linktext->append(s); linktext->append(s);
@ -192,12 +192,12 @@ TQWidget *ConduitConfigBase::aboutPage(TQWidget *parent, KAboutData *ad)
s = TQString(); s = TQString();
s += i18n("Send questions and comments to <a href=\"mailto:%1\">%2</a>.") s += i18n("Send questions and comments to <a href=\"mailto:%1\">%2</a>.")
.tqarg( CSL1("tdepim-users@kde.org") ) .arg( CSL1("tdepim-users@kde.org") )
.tqarg( CSL1("tdepim-users@kde.org") ); .arg( CSL1("tdepim-users@kde.org") );
s += ' '; s += ' ';
s += i18n("Send bug reports to <a href=\"mailto:%1\">%2</a>.") s += i18n("Send bug reports to <a href=\"mailto:%1\">%2</a>.")
.tqarg(p->bugAddress()) .arg(p->bugAddress())
.tqarg(p->bugAddress()); .arg(p->bugAddress());
s += ' '; s += ' ';
s += i18n("For trademark information, see the " s += i18n("For trademark information, see the "
"<a href=\"help:/kpilot/trademarks.html\">KPilot User's Guide</a>."); "<a href=\"help:/kpilot/trademarks.html\">KPilot User's Guide</a>.");
@ -218,9 +218,9 @@ TQWidget *ConduitConfigBase::aboutPage(TQWidget *parent, KAboutData *ad)
for (i=pl.begin(); i!=pl.end(); ++i) for (i=pl.begin(); i!=pl.end(); ++i)
{ {
s.append(CSL1("%1 (<i>%2</i>)%3") s.append(CSL1("%1 (<i>%2</i>)%3")
.tqarg((*i).name()) .arg((*i).name())
.tqarg((*i).task()) .arg((*i).task())
.tqarg(count<pl.count() ? comma : TQString()) .arg(count<pl.count() ? comma : TQString())
); );
count++; count++;
} }
@ -235,9 +235,9 @@ TQWidget *ConduitConfigBase::aboutPage(TQWidget *parent, KAboutData *ad)
for (i=pl.begin(); i!=pl.end(); ++i) for (i=pl.begin(); i!=pl.end(); ++i)
{ {
s.append(CSL1("%1 (<i>%2</i>)%3") s.append(CSL1("%1 (<i>%2</i>)%3")
.tqarg((*i).name()) .arg((*i).name())
.tqarg((*i).task()) .arg((*i).task())
.tqarg(count<pl.count() ? comma : TQString()) .arg(count<pl.count() ? comma : TQString())
); );
count++; count++;
} }
@ -485,8 +485,8 @@ void ConduitAction::finished()
if (hhVolatility > allowedVolatility) if (hhVolatility > allowedVolatility)
{ {
query = query.tqarg(fConduitName) query = query.arg(fConduitName)
.tqarg(fCtrHH->type()).tqarg(fCtrHH->moo()); .arg(fCtrHH->type()).arg(fCtrHH->moo());
DEBUGKPILOT << fname << ": Yikes, lots of volatility " DEBUGKPILOT << fname << ": Yikes, lots of volatility "
<< "caught. Check with user: [" << query << "caught. Check with user: [" << query
@ -533,7 +533,7 @@ ConduitProxy::ConduitProxy(KPilotLink *p,
WARNINGKPILOT << "Can't find desktop file for conduit " WARNINGKPILOT << "Can't find desktop file for conduit "
<< fDesktopName << fDesktopName
<< endl; << endl;
addSyncLogEntry(i18n("Could not find conduit %1.").tqarg(fDesktopName)); addSyncLogEntry(i18n("Could not find conduit %1.").arg(fDesktopName));
return false; return false;
} }
@ -556,7 +556,7 @@ ConduitProxy::ConduitProxy(KPilotLink *p,
<< " - " << " - "
<< KLibLoader::self()->lastErrorMessage() << KLibLoader::self()->lastErrorMessage()
<< endl; << endl;
addSyncLogEntry(i18n("Could not load conduit %1.").tqarg(fDesktopName)); addSyncLogEntry(i18n("Could not load conduit %1.").arg(fDesktopName));
return false; return false;
} }
@ -568,7 +568,7 @@ ConduitProxy::ConduitProxy(KPilotLink *p,
<< " has version " << " has version "
<< version << version
<< endl; << endl;
addSyncLogEntry(i18n("Conduit %1 has wrong version (%2).").tqarg(fDesktopName).tqarg(version)); addSyncLogEntry(i18n("Conduit %1 has wrong version (%2).").arg(fDesktopName).arg(version));
return false; return false;
} }
@ -578,7 +578,7 @@ ConduitProxy::ConduitProxy(KPilotLink *p,
WARNINGKPILOT << "Can't find factory in library " WARNINGKPILOT << "Can't find factory in library "
<< fLibraryName << fLibraryName
<< endl; << endl;
addSyncLogEntry(i18n("Could not initialize conduit %1.").tqarg(fDesktopName)); addSyncLogEntry(i18n("Could not initialize conduit %1.").arg(fDesktopName));
return false; return false;
} }
@ -591,7 +591,7 @@ ConduitProxy::ConduitProxy(KPilotLink *p,
if (!object) if (!object)
{ {
WARNINGKPILOT << "Can't create SyncAction." << endl; WARNINGKPILOT << "Can't create SyncAction." << endl;
addSyncLogEntry(i18n("Could not create conduit %1.").tqarg(fDesktopName)); addSyncLogEntry(i18n("Could not create conduit %1.").arg(fDesktopName));
return false; return false;
} }
@ -600,11 +600,11 @@ ConduitProxy::ConduitProxy(KPilotLink *p,
if (!fConduit) if (!fConduit)
{ {
WARNINGKPILOT << "Can't cast to ConduitAction." << endl; WARNINGKPILOT << "Can't cast to ConduitAction." << endl;
addSyncLogEntry(i18n("Could not create conduit %1.").tqarg(fDesktopName)); addSyncLogEntry(i18n("Could not create conduit %1.").arg(fDesktopName));
return false; return false;
} }
addSyncLogEntry(i18n("[Conduit %1]").tqarg(fDesktopName)); addSyncLogEntry(i18n("[Conduit %1]").arg(fDesktopName));
// Handle the syncDone signal properly & unload the conduit. // Handle the syncDone signal properly & unload the conduit.
TQObject::connect(fConduit,TQT_SIGNAL(syncDone(SyncAction *)), TQObject::connect(fConduit,TQT_SIGNAL(syncDone(SyncAction *)),
@ -746,11 +746,11 @@ void CUDCounter::setEndCount(unsigned int t)
TQString CUDCounter::moo() const TQString CUDCounter::moo() const
{ {
TQString result = fType + ": " + TQString result = fType + ": " +
i18n("Start: %1. End: %2. ").tqarg(fStart).tqarg(fEnd); i18n("Start: %1. End: %2. ").arg(fStart).arg(fEnd);
if (fC > 0) result += i18n("%1 new. ").tqarg(fC); if (fC > 0) result += i18n("%1 new. ").arg(fC);
if (fU > 0) result += i18n("%1 changed. ").tqarg(fU); if (fU > 0) result += i18n("%1 changed. ").arg(fU);
if (fD > 0) result += i18n("%1 deleted. ").tqarg(fD); if (fD > 0) result += i18n("%1 deleted. ").arg(fD);
if ( (fC+fU+fD) <= 0) result += i18n("No changes made. "); if ( (fC+fU+fD) <= 0) result += i18n("No changes made. ");

6
lib/recordConduit.cc
Unescape View File

@ -66,7 +66,7 @@ long version_record_conduit = Pilot::PLUGIN_API;
bool retrieved = false; bool retrieved = false;
if (!openDatabases( fDBName, &retrieved)) if (!openDatabases( fDBName, &retrieved))
{ {
emit logError(i18n("Unable to open the %1 database on the handheld.").tqarg( fDBName ) ); emit logError(i18n("Unable to open the %1 database on the handheld.").arg( fDBName ) );
return false; return false;
} }
if (retrieved) setFirstSync(true); if (retrieved) setFirstSync(true);
@ -286,13 +286,13 @@ RecordConduit::~RecordConduit()
// Database names probably in latin1. // Database names probably in latin1.
if( !openDatabases( dbName(), &fFirstSync ) ) if( !openDatabases( dbName(), &fFirstSync ) )
{ {
emit logError(i18n("Unable to open the %1 database on the handheld.").tqarg( dbName() ) ); emit logError(i18n("Unable to open the %1 database on the handheld.").arg( dbName() ) );
return false; return false;
} }
_getAppInfo(); _getAppInfo();
if( !mPCData->loadData() ) if( !mPCData->loadData() )
{ {
emit logError( i18n("Unable to open %1.").tqarg( mPCData->description() ) ); emit logError( i18n("Unable to open %1.").arg( mPCData->description() ) );
return false; return false;
} }
// get the addresseMap which maps Pilot unique record(address) id's to // get the addresseMap which maps Pilot unique record(address) id's to

6
lib/syncAction.cc
Unescape View File

@ -101,7 +101,7 @@ SyncAction::~SyncAction()
if (!r) if (!r)
{ {
emit logError(i18n("The conduit %1 could not be executed.") emit logError(i18n("The conduit %1 could not be executed.")
.tqarg(TQString::fromLatin1(name()))); .arg(TQString::fromLatin1(name())));
delayDone(); delayDone();
} }
} }
@ -217,11 +217,11 @@ TQString SyncAction::SyncMode::name() const
if (isTest()) if (isTest())
{ {
s.append(CSL1(" [%1]").tqarg(i18n("Test Sync"))); s.append(CSL1(" [%1]").arg(i18n("Test Sync")));
} }
if (isLocal()) if (isLocal())
{ {
s.append(CSL1(" [%1]").tqarg(i18n("Local Sync"))); s.append(CSL1(" [%1]").arg(i18n("Local Sync")));
} }
return s; return s;
} }

4
tests/mergecalendars.cc
Unescape View File

@ -84,8 +84,8 @@ int main(int argc, char **argv)
return 1; return 1;
} }
TQString korgsave = TQString("%1.updated").tqarg(korgfile); TQString korgsave = TQString("%1.updated").arg(korgfile);
TQString newfilesave = TQString("%1.updated").tqarg(newfile); TQString newfilesave = TQString("%1.updated").arg(newfile);
DEBUGKPILOT << "Using korgfile: [" << korgfile DEBUGKPILOT << "Using korgfile: [" << korgfile
<< "]" << endl; << "]" << endl;

2
tests/testcategories.cc
Unescape View File

@ -53,7 +53,7 @@ TQStringList categories( const PilotAppInfoBase *appinfo )
TQString cat = appinfo->categoryName(i); TQString cat = appinfo->categoryName(i);
if (!cat.isEmpty()) if (!cat.isEmpty())
{ {
TQString s = CSL1("(%1:%2)").tqarg(i).tqarg(cat); TQString s = CSL1("(%1:%2)").arg(i).arg(cat);
cats.append(s); cats.append(s);
} }
} }

Write Preview
Loading…
Cancel
Save