From 631a19d8c5c5f69dc0d941c1997806fb422c79a6 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:32:24 -0600 Subject: [PATCH] Rename a number of old tq methods that are no longer tq specific --- .../KPilotCustomFieldEditor.ui | 10 +-- .../abbrowserconduit/abbrowser-conduit.cc | 6 +- .../abbrowserconduit/kaddressbookConduit.ui | 10 +-- conduits/abbrowserconduit/resolutionDialog.cc | 2 +- .../abbrowserconduit/resolutionDialog_base.ui | 4 +- conduits/docconduit/DOC-converter.cc | 20 +++--- conduits/docconduit/doc-conduit.cc | 72 +++++++++---------- conduits/docconduit/doc-conduit.h | 8 +-- conduits/docconduit/doc-conflictdialog.cc | 24 +++---- conduits/docconduit/doc-setupdialog.ui | 8 +-- conduits/docconduit/kpalmdoc_dlg.cc | 46 ++++++------ conduits/docconduit/kpalmdoc_dlgbase.ui | 12 ++-- conduits/docconduit/pilotDOCEntry.h | 2 +- conduits/knotes/knotes-action.cc | 40 +++++------ conduits/knotes/knotes-action.h | 2 +- conduits/knotes/setup_base.ui | 2 +- conduits/malconduit/mal-conduit.cc | 8 +-- conduits/malconduit/mal-setup_dialog.ui | 10 +-- conduits/memofileconduit/memofile-conduit.cc | 6 +- conduits/memofileconduit/memofile.h | 4 +- conduits/memofileconduit/setup_base.ui | 2 +- conduits/notepadconduit/notepad-conduit.cc | 4 +- conduits/notepadconduit/notepad-setup.ui | 2 +- conduits/null/setup_base.ui | 2 +- conduits/popmail/popmail-conduit.cc | 8 +-- conduits/popmail/setup-dialog.ui | 2 +- conduits/recordconduit/setup_base.ui | 2 +- conduits/sysinfoconduit/sysinfo-conduit.cc | 68 +++++++++--------- .../sysinfoconduit/sysinfo-setup_dialog.ui | 4 +- conduits/timeconduit/time-conduit.cc | 2 +- conduits/vcalconduit/cleanupstate.cc | 2 +- conduits/vcalconduit/hhtopcstate.cc | 4 +- conduits/vcalconduit/korganizerConduit.ui | 4 +- conduits/vcalconduit/pctohhstate.cc | 2 +- conduits/vcalconduit/todo-conduit.cc | 6 +- conduits/vcalconduit/todoRecord.cc | 6 +- conduits/vcalconduit/vcal-conduit.cc | 4 +- conduits/vcalconduit/vcal-conduitbase.cc | 26 +++---- conduits/vcalconduit/vcalRecord.cc | 4 +- kpilot/addressEditor.cc | 2 +- kpilot/addressWidget.cc | 18 ++--- kpilot/conduitConfigDialog.cc | 26 +++---- kpilot/datebookWidget.cc | 6 +- kpilot/dbAppInfoEditor.cc | 4 +- kpilot/dbFlagsEditor.cc | 6 +- kpilot/dbFlagsEditor_base.ui | 8 +-- kpilot/dbRecordEditor.cc | 16 ++--- kpilot/dbviewerWidget.cc | 28 ++++---- kpilot/fileInstallWidget.cc | 4 +- kpilot/fileInstaller.cc | 4 +- kpilot/hotSync.cc | 52 +++++++------- kpilot/hotSync.h | 4 +- kpilot/internalEditorAction.cc | 58 +++++++-------- kpilot/internalEditorAction.h | 4 +- kpilot/kpilot.cc | 48 ++++++------- kpilot/kpilot.h | 8 +-- kpilot/kpilotConfig.cc | 6 +- kpilot/kpilotConfigDialog.cc | 4 +- kpilot/kpilotConfigDialog_backup.ui | 8 +-- kpilot/kpilotConfigDialog_device.ui | 2 +- kpilot/kpilotConfigDialog_startup.ui | 2 +- kpilot/kpilotConfigDialog_sync.ui | 2 +- kpilot/kpilotConfigDialog_viewers.ui | 2 +- kpilot/kpilotConfigWizard.cc | 2 +- kpilot/kpilotConfigWizard_app.ui | 6 +- kpilot/kpilotConfigWizard_user.ui | 6 +- kpilot/kpilotDCOP.h | 6 +- kpilot/kpilotProbeDialog.cc | 30 ++++---- kpilot/kpilotProbeDialog.h | 2 +- kpilot/listCat.cc | 4 +- kpilot/listCat.h | 2 +- kpilot/logFile.cc | 16 ++--- kpilot/logWidget.cc | 28 ++++---- kpilot/memoWidget.cc | 8 +-- kpilot/pilotComponent.cc | 4 +- kpilot/pilotDaemon.cc | 56 +++++++-------- kpilot/pilotDaemon.h | 8 +-- kpilot/todoEditor.cc | 4 +- kpilot/todoEditor_base.ui | 6 +- kpilot/todoWidget.cc | 10 +-- lib/actions.cc | 6 +- lib/kpilotdevicelink.cc | 54 +++++++------- lib/kpilotdevicelink.h | 12 ++-- lib/options.h | 6 +- lib/pilot.cc | 4 +- lib/pilotAddress.cc | 14 ++-- lib/pilotAddress.h | 2 +- lib/pilotDateEntry.cc | 30 ++++---- lib/pilotLocalDatabase.cc | 6 +- lib/pilotMemo.cc | 4 +- lib/pilotRecord.cc | 4 +- lib/pilotTodoEntry.cc | 6 +- lib/plugin.cc | 62 ++++++++-------- lib/plugin.h | 4 +- lib/recordConduit.cc | 6 +- lib/syncAction.cc | 18 ++--- lib/syncAction.h | 6 +- tests/exportdatebook.cc | 2 +- tests/importdatebook.cc | 2 +- tests/mergecalendars.cc | 10 +-- tests/testcategories.cc | 4 +- tests/testdatabase.cc | 4 +- 102 files changed, 618 insertions(+), 618 deletions(-) diff --git a/conduits/abbrowserconduit/KPilotCustomFieldEditor.ui b/conduits/abbrowserconduit/KPilotCustomFieldEditor.ui index 4a1b81f..ba3b204 100644 --- a/conduits/abbrowserconduit/KPilotCustomFieldEditor.ui +++ b/conduits/abbrowserconduit/KPilotCustomFieldEditor.ui @@ -141,7 +141,7 @@ 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. - + WordBreak|AlignVCenter @@ -193,7 +193,7 @@ Expanding - + 41 20 @@ -210,7 +210,7 @@ Expanding - + 31 20 @@ -225,7 +225,7 @@ 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. - + WordBreak|AlignVCenter @@ -263,7 +263,7 @@ Do NOT change these values: doing so will almost certainly result in data loss w Expanding - + 20 210 diff --git a/conduits/abbrowserconduit/abbrowser-conduit.cc b/conduits/abbrowserconduit/abbrowser-conduit.cc index 59dc242..0c7b6f0 100644 --- a/conduits/abbrowserconduit/abbrowser-conduit.cc +++ b/conduits/abbrowserconduit/abbrowser-conduit.cc @@ -34,7 +34,7 @@ #include "options.h" #include -#include +#include #include #include @@ -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 d2b42b7..e942d8e 100644 --- a/conduits/abbrowserconduit/kaddressbookConduit.ui +++ b/conduits/abbrowserconduit/kaddressbookConduit.ui @@ -51,7 +51,7 @@ Expanding - + 20 50 @@ -225,7 +225,7 @@ <p>Select the default action if an event was modified on both sides here. </p> - + WordBreak|AlignJustify|AlignVCenter @@ -241,7 +241,7 @@ Expanding - + 20 41 @@ -402,7 +402,7 @@ Expanding - + 0 20 @@ -710,7 +710,7 @@ Expanding - + 31 30 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 @@ The following record was edited both on the handheld and on the PC. Please choose which values shall be synced: - + WordBreak|AlignVCenter @@ -62,7 +62,7 @@ Line breaks in any of the entries are denoted by a " | " (without the quotes). - + WordBreak|AlignVCenter diff --git a/conduits/docconduit/DOC-converter.cc b/conduits/docconduit/DOC-converter.cc index cff8f19..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 "<dbPathName())); + emit logMessage(i18n("Could not read text record #%1 from Database %2").arg(i).arg(docdb->dbPathName())); } } @@ -570,11 +570,11 @@ bool DOCConverter::convertPDBtoTXT() if (rec) { PilotDOCBookmark bookie(rec); - docBookmark*bmk=new docBookmark(TQString::tqfromLatin1(bookie.bookmarkName), bookie.pos); + docBookmark*bmk=new docBookmark(TQString::fromLatin1(bookie.bookmarkName), bookie.pos); 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 0ac14f1..31a075b 100644 --- a/conduits/docconduit/doc-conduit.cc +++ b/conduits/docconduit/doc-conduit.cc @@ -300,7 +300,7 @@ bool DOCConduit::doSync(docSyncInfo &sinfo) } if (!sinfo.pdbfilename.isEmpty() && DOCConduitSettings::keepPDBsLocally() ) { PilotLocalDatabase*database=new PilotLocalDatabase(DOCConduitSettings::pDBDirectory(), - TQString::tqfromLatin1(sinfo.dbinfo.name), false); + TQString::fromLatin1(sinfo.dbinfo.name), false); if (database) { if ( database->deleteDatabase() !=0 ) { WARNINGKPILOT << "Unable to delete database " << sinfo.dbinfo.name << " on the PC" << endl; @@ -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::tqfromLatin1(sinfo.dbinfo.name))); + .arg(TQString::fromLatin1(sinfo.dbinfo.name))); if (!res) emit logError(i18n("Conversion of PalmDOC \"%1\" failed.") - .tqarg(TQString::tqfromLatin1(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::tqfromLatin1(sinfo.dbinfo.name))); + .arg(TQString::fromLatin1(sinfo.dbinfo.name))); } return res; } @@ -414,21 +414,21 @@ void DOCConduit::syncNextDB() { // if creator and/or type don't match, go to next db if (!isCorrectDBTypeCreator(dbinfo) || - fDBNames.contains(TQString::tqfromLatin1(dbinfo.name))) + fDBNames.contains(TQString::fromLatin1(dbinfo.name))) { TQTimer::singleShot(0, this, TQT_SLOT(syncNextDB())); return; } - TQString txtfilename=constructTXTFileName(TQString::tqfromLatin1(dbinfo.name)); - TQString pdbfilename=constructPDBFileName(TQString::tqfromLatin1(dbinfo.name)); + TQString txtfilename=constructTXTFileName(TQString::fromLatin1(dbinfo.name)); + TQString pdbfilename=constructPDBFileName(TQString::fromLatin1(dbinfo.name)); - docSyncInfo syncInfo(TQString::tqfromLatin1(dbinfo.name), + docSyncInfo syncInfo(TQString::fromLatin1(dbinfo.name), txtfilename, pdbfilename, eSyncNone); syncInfo.dbinfo=dbinfo; needsSync(syncInfo); fSyncInfoList.append(syncInfo); - fDBNames.append(TQString::tqfromLatin1(dbinfo.name)); + fDBNames.append(TQString::fromLatin1(dbinfo.name)); TQTimer::singleShot(0, this, TQT_SLOT(syncNextDB())); return; @@ -476,12 +476,12 @@ void DOCConduit::syncNextTXT() bool alreadySynced=fDBNames.contains(fl.baseName(TRUE)); if (!alreadySynced) { - docSyncInfo syncInfo(TQString::tqfromLatin1(dbinfo.name), + docSyncInfo syncInfo(TQString::fromLatin1(dbinfo.name), txtfilename, pdbfilename, eSyncNone); syncInfo.dbinfo=dbinfo; needsSync(syncInfo); fSyncInfoList.append(syncInfo); - fDBNames.append(TQString::tqfromLatin1(dbinfo.name)); + fDBNames.append(TQString::fromLatin1(dbinfo.name)); } else { #ifdef DEBUG DEBUGKPILOT<isOpen()) sinfo.fPalmtqStatus=eStatNew; - else sinfo.fPalmtqStatus=eStatDoesntExist; + if (TQFile::exists(sinfo.txtfilename)) sinfo.fPCStatus=eStatNew; + else sinfo.fPCStatus=eStatDoesntExist; + if (docdb && docdb->isOpen()) sinfo.fPalmStatus=eStatNew; + else sinfo.fPalmStatus=eStatDoesntExist; KPILOT_DELETE(docdb); switch (eSyncDirection) { case eSyncPDAToPC: - if (sinfo.fPalmtqStatus==eStatDoesntExist) + if (sinfo.fPalmStatus==eStatDoesntExist) sinfo.direction=eSyncDelete; else sinfo.direction=eSyncPDAToPC; break; case eSyncPCToPDA: - if (sinfo.fPCtqStatus==eStatDoesntExist) + if (sinfo.fPCStatus==eStatDoesntExist) sinfo.direction=eSyncDelete; else sinfo.direction=eSyncPCToPDA; break; case eSyncNone: // means actually both directions! - if (sinfo.fPCtqStatus==eStatNew) { - if (sinfo.fPalmtqStatus==eStatNew) sinfo.direction=eSyncConflict; + if (sinfo.fPCStatus==eStatNew) { + if (sinfo.fPalmStatus==eStatNew) sinfo.direction=eSyncConflict; else sinfo.direction=eSyncPCToPDA; } else { - if (sinfo.fPalmtqStatus==eStatNew) sinfo.direction=eSyncPDAToPC; + if (sinfo.fPalmStatus==eStatNew) sinfo.direction=eSyncPDAToPC; else { sinfo.direction=eSyncNone; #ifdef DEBUG @@ -756,9 +756,9 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo) } // Text was included in the last sync - if (!TQFile::exists(sinfo.txtfilename)) sinfo.fPCtqStatus=eStatDeleted; + if (!TQFile::exists(sinfo.txtfilename)) sinfo.fPCStatus=eStatDeleted; else if(pcTextChanged(sinfo.txtfilename)) { - sinfo.fPCtqStatus=eStatChanged; + sinfo.fPCStatus=eStatChanged; #ifdef DEBUG DEBUGKPILOT<<"PC side has changed!"<isOpen()) sinfo.fPalmtqStatus=eStatDeleted; + if (!docdb || !docdb->isOpen()) sinfo.fPalmStatus=eStatDeleted; else if (hhTextChanged(docdb)) { #ifdef DEBUG DEBUGKPILOT<<"Handheld side has changed!"<database(TQString::tqfromLatin1(dbinfo.name)); + return deviceLink()->database(TQString::fromLatin1(dbinfo.name)); } } @@ -950,7 +950,7 @@ bool DOCConduit::postSyncAction(PilotDatabase * database, if (DOCConduitSettings::keepPDBsLocally() && !DOCConduitSettings::localSync()) { PilotDatabase*db=deviceLink()->database( - TQString::tqfromLatin1(sinfo.dbinfo.name)); + TQString::fromLatin1(sinfo.dbinfo.name)); #ifdef DEBUG DEBUGKPILOT<<"Middle 1 Resetting sync flags for database " < #include -#include +#include #include #include #include @@ -51,17 +51,17 @@ ResolutionDialog::ResolutionDialog( TQWidget* parent, const TQString& caption, s // First, insert the texts on top: textLabel1 = new TQLabel(i18n("Here is a list of all text files and DOC databases the conduit found. The conduit tried to determine the correct sync direction, but for databases in bold red letters a conflict occurred (i.e. the text was changed both on the desktop and on the handheld). For these databases please specify which version is the current one."), page); - textLabel1->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); + textLabel1->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); topLayout->addWidget(textLabel1); textLabel2 = new TQLabel(i18n("You can also change the sync direction for databases without a conflict." ), page ); - textLabel2->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); + textLabel2->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); topLayout->addWidget(textLabel2); resolutionGroupBox = new TQGroupBox(i18n("DOC Databases"), page ); - TQVBoxLayout*ptqlayout = new TQVBoxLayout(resolutionGroupBox); + TQVBoxLayout*playout = new TQVBoxLayout(resolutionGroupBox); TQScrollView* sv = new TQScrollView(resolutionGroupBox); - ptqlayout->addWidget(sv); + playout->addWidget(sv); sv->setResizePolicy(TQScrollView::AutoOneFit); sv->setHScrollBarMode(TQScrollView::AlwaysOff); sv->setMargin(5); @@ -70,7 +70,7 @@ ResolutionDialog::ResolutionDialog( TQWidget* parent, const TQString& caption, s resolutionGroupBoxLayout = new TQGridLayout( big_box, syncInfo->size(), 3 ); - resolutionGroupBoxLayout->tqsetAlignment( TQt::AlignTop ); + resolutionGroupBoxLayout->setAlignment( TQt::AlignTop ); // Invisible button group for the information buttons to use the same slot for all of them (see Dallheimer's book, page 309f) TQButtonGroup *bgroup = new TQButtonGroup( this ); @@ -99,7 +99,7 @@ ResolutionDialog::ResolutionDialog( TQWidget* parent, const TQString& caption, s resolutionGroupBoxLayout->addWidget( cE.dbname, cE.index, 0 ); cE.resolution=new TQComboBox( FALSE, big_box); - cE.resolution->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, + cE.resolution->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, 0, 0, cE.resolution->sizePolicy().hasHeightForWidth() ) ); cE.resolution->clear(); @@ -123,7 +123,7 @@ ResolutionDialog::ResolutionDialog( TQWidget* parent, const TQString& caption, s topLayout->addWidget( resolutionGroupBox ); - resize( TQSize(600, 480).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(600, 480).expandedTo(minimumSizeHint()) ); if (fHandle) tickleTimer=new TQTimer(this, "TickleTimer"); if (tickleTimer) { @@ -150,7 +150,7 @@ ResolutionDialog::~ResolutionDialog() KDialogBase::slotOk(); } -TQString eTexStatusToString(eTextqStatus stat) { +TQString eTexStatusToString(eTexStatus stat) { switch(stat) { case eStatNone: return i18n("unchanged"); case eStatNew: return i18n("new"); @@ -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.fPalmtqStatus)); - text+=i18n("Desktop: %1\n").tqarg(eTexStatusToString(si.fPCtqStatus)); + 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/doc-setupdialog.ui b/conduits/docconduit/doc-setupdialog.ui index e59025e..e04be16 100644 --- a/conduits/docconduit/doc-setupdialog.ui +++ b/conduits/docconduit/doc-setupdialog.ui @@ -153,7 +153,7 @@ Expanding - + 20 20 @@ -222,7 +222,7 @@ Expanding - + 20 20 @@ -304,7 +304,7 @@ Expanding - + 20 20 @@ -492,7 +492,7 @@ Expanding - + 20 20 diff --git a/conduits/docconduit/kpalmdoc_dlg.cc b/conduits/docconduit/kpalmdoc_dlg.cc index 58ca0aa..20e8d2f 100644 --- a/conduits/docconduit/kpalmdoc_dlg.cc +++ b/conduits/docconduit/kpalmdoc_dlg.cc @@ -73,7 +73,7 @@ ConverterDlg::ConverterDlg( TQWidget *parent, const TQString& caption) connect(dlg->fTextToPDB, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotToPDB())); connect(dlg->fPDBToText, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotToText())); - resize(tqminimumSize()); + resize(minimumSize()); } ConverterDlg::~ConverterDlg() @@ -175,8 +175,8 @@ void ConverterDlg::slotToText() int res=KMessageBox::questionYesNo(this, i18n("You selected to sync folders, " "but gave a filename instead (%1)." - "
Use folder %2 instead?").tqarg(pdburl) - .tqarg(pdbinfo.dirPath(true)), TQString(), i18n("Use Folder"), KStdGuiItem::cancel()); + "
Use folder %2 instead?").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("The folder %1 for " "the handheld database files is not a valid " - "folder.").tqarg(pdburl)); + "folder.").arg(pdburl)); return; } @@ -200,7 +200,7 @@ void ConverterDlg::slotToText() KMessageBox::sorry(this, i18n("The folder %1 for " "the handheld database files is not a " - "valid directory.").tqarg(pdburl)); + "valid directory.").arg(pdburl)); return; } @@ -211,8 +211,8 @@ void ConverterDlg::slotToText() int res=KMessageBox::questionYesNo(this, i18n("You selected to sync folders, " "but gave a filename instead (%1)." - "
Use folder %2 instead?").tqarg(txturl) - .tqarg(txtinfo.dirPath(true)), TQString(), i18n("Use Folder"), KStdGuiItem::cancel()); + "
Use folder %2 instead?").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("The folder %1 for " - "the text files could not be created.").tqarg(txturl)); + "the text files could not be created.").arg(txturl)); return; } @@ -265,7 +265,7 @@ void ConverterDlg::slotToText() if (!pdbinfo.isFile() || !pdbinfo.exists()) { KMessageBox::sorry(this, i18n("The file %1 does not " - "exist.").tqarg(pdburl)); + "exist.").arg(pdburl)); return; } @@ -274,13 +274,13 @@ void ConverterDlg::slotToText() if (!txtinfo.isFile()) { KMessageBox::sorry(this, i18n("The filename %1 for the " - "text is not a valid filename.").tqarg(txturl)); + "text is not a valid filename.").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("You selected to sync folders, " "but gave a filename instead (%1)." - "
Use folder %2 instead?").tqarg(txturl) - .tqarg(txtinfo.dirPath(true)), TQString(), i18n("Use Folder"), KStdGuiItem::cancel()); + "
Use folder %2 instead?").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("The folder %1 for " - "the text files is not a valid folder.").tqarg(txturl)); + "the text files is not a valid folder.").arg(txturl)); return; } @@ -350,8 +350,8 @@ void ConverterDlg::slotToPDB() i18n("You selected to sync folders, " "but gave a filename instead (%1)." "
Use folder %2 instead?") - .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("The folder %1 for " - "the PalmDOC files could not be created.").tqarg(pdburl)); + "the PalmDOC files could not be created.").arg(pdburl)); return; } @@ -403,14 +403,14 @@ void ConverterDlg::slotToPDB() if (!txtinfo.isFile() || !txtinfo.exists()) { KMessageBox::sorry(this, i18n("The file %1 does not " - "exist.").tqarg(txturl)); + "exist.").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("The database file %1 already exists. Overwrite it?") - .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("Error while converting the text %1.").tqarg(txtfile)); + KMessageBox::sorry(this, i18n("Error while converting the text %1.").arg(txtfile)); } } else @@ -499,7 +499,7 @@ bool ConverterDlg::convertPDBtoTXT(TQString pdbdir, TQString pdbfile, if (!txtfileinfo.exists() || !askOverwrite || (KMessageBox::Yes==KMessageBox::questionYesNo(this, i18n("The text file %1 already exists. Overwrite it?") - .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("Error while converting the text %1.").tqarg(pdbfile)); + KMessageBox::sorry(this, i18n("Error while converting the text %1.").arg(pdbfile)); } } else diff --git a/conduits/docconduit/kpalmdoc_dlgbase.ui b/conduits/docconduit/kpalmdoc_dlgbase.ui index 9b92d8d..c693e90 100644 --- a/conduits/docconduit/kpalmdoc_dlgbase.ui +++ b/conduits/docconduit/kpalmdoc_dlgbase.ui @@ -127,7 +127,7 @@ Expanding - + 20 16 @@ -181,7 +181,7 @@ Fixed - + 20 16 @@ -198,7 +198,7 @@ Fixed - + 20 16 @@ -215,7 +215,7 @@ Fixed - + 20 16 @@ -299,7 +299,7 @@ Expanding - + 21 200 @@ -329,7 +329,7 @@ Expanding - + 21 190 diff --git a/conduits/docconduit/pilotDOCEntry.h b/conduits/docconduit/pilotDOCEntry.h index 679f35a..4ecaf19 100644 --- a/conduits/docconduit/pilotDOCEntry.h +++ b/conduits/docconduit/pilotDOCEntry.h @@ -50,7 +50,7 @@ public: TQString getText() { fText.Decompress(); - return TQString::tqfromLatin1((const char *) fText.text()); + return TQString::fromLatin1((const char *) fText.text()); }; void setText(TQString newtext, bool compressed = false) { fText.setText((const unsigned char *) newtext.latin1(), diff --git a/conduits/knotes/knotes-action.cc b/conduits/knotes/knotes-action.cc index 7664f46..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 &,KNoteID_pt note); static NoteAndMemo findMemo(const TQValueList &,int memo); @@ -234,7 +234,7 @@ KNotesAction::KNotesAction(KPilotLink *o, } fP->fTimer = new TQTimer(this); - fActiontqStatus = Init; + fActionStatus = Init; // this is not needed. As it is done in the initstate in process(); // resetIndexes(); @@ -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; } } @@ -308,9 +308,9 @@ void KNotesAction::listNotes() { FUNCTIONSETUP; - DEBUGKPILOT << fname << ": Now in state " << fActiontqStatus << endl; + DEBUGKPILOT << fname << ": Now in state " << fActionStatus << endl; - switch(fActiontqStatus) + switch(fActionStatus) { case Init: resetIndexes(); @@ -321,16 +321,16 @@ void KNotesAction::listNotes() case SyncAction::SyncMode::eBackup: case SyncAction::SyncMode::eRestore: // Impossible! - fActiontqStatus = Done; + fActionStatus = Done; break; case SyncAction::SyncMode::eCopyHHToPC : listNotes(); // Debugging - fActiontqStatus = MemosToKNotes; + fActionStatus = MemosToKNotes; break; case SyncAction::SyncMode::eHotSync: case SyncAction::SyncMode::eFullSync: case SyncAction::SyncMode::eCopyPCToHH: - fActiontqStatus = ModifiedNotesToPilot; + fActionStatus = ModifiedNotesToPilot; break; } break; @@ -338,14 +338,14 @@ void KNotesAction::listNotes() if (modifyNoteOnPilot()) { resetIndexes(); - fActiontqStatus = DeleteNotesOnPilot; + fActionStatus = DeleteNotesOnPilot; } break; case DeleteNotesOnPilot: if (deleteNoteOnPilot()) { resetIndexes(); - fActiontqStatus = NewNotesToPilot; + fActionStatus = NewNotesToPilot; } break; case NewNotesToPilot : @@ -359,14 +359,14 @@ void KNotesAction::listNotes() case SyncAction::SyncMode::eRestore: case SyncAction::SyncMode::eCopyHHToPC : // Impossible! - fActiontqStatus = Done; + fActionStatus = Done; break; case SyncAction::SyncMode::eHotSync: case SyncAction::SyncMode::eFullSync: - fActiontqStatus = MemosToKNotes; + fActionStatus = MemosToKNotes; break; case SyncAction::SyncMode::eCopyPCToHH: - fActiontqStatus = Cleanup; + fActionStatus = Cleanup; break; } } @@ -374,7 +374,7 @@ void KNotesAction::listNotes() case MemosToKNotes : if (syncMemoToKNotes()) { - fActiontqStatus=Cleanup; + fActionStatus=Cleanup; } break; case Cleanup : @@ -791,7 +791,7 @@ void KNotesAction::cleanupMemos() KNotesConduitSettings::setMemoIds(memos); KNotesConduitSettings::self()->writeConfig(); - fActiontqStatus=Done; + fActionStatus=Done; fDatabase->cleanup(); fDatabase->resetSyncFlags(); fLocalDatabase->cleanup(); @@ -848,23 +848,23 @@ void KNotesAction::cleanupMemos() /* virtual */ TQString KNotesAction::statusString() const { - switch(fActiontqStatus) + switch(fActionStatus) { 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(fActiontqStatus); + return CSL1("Unknown (%1)").arg(fActionStatus); } } diff --git a/conduits/knotes/knotes-action.h b/conduits/knotes/knotes-action.h index 223dfe2..bd057b7 100644 --- a/conduits/knotes/knotes-action.h +++ b/conduits/knotes/knotes-action.h @@ -45,7 +45,7 @@ public: const TQStringList &a = TQStringList() ); virtual ~KNotesAction(); - enum tqStatus { Init, + enum Status { Init, ModifiedNotesToPilot, DeleteNotesOnPilot, NewNotesToPilot, diff --git a/conduits/knotes/setup_base.ui b/conduits/knotes/setup_base.ui index 15d902f..1757b88 100644 --- a/conduits/knotes/setup_base.ui +++ b/conduits/knotes/setup_base.ui @@ -72,7 +72,7 @@ Expanding - + 20 101 diff --git a/conduits/malconduit/mal-conduit.cc b/conduits/malconduit/mal-conduit.cc index 69a3f19..5aa5883 100644 --- a/conduits/malconduit/mal-conduit.cc +++ b/conduits/malconduit/mal-conduit.cc @@ -144,7 +144,7 @@ void MALConduit::readConfig() void MALConduit::saveConfig() { FUNCTIONSETUP; - MALConduitSettings::setLastMALSync( TQDateTime::tqcurrentDateTime() ); + MALConduitSettings::setLastMALSync( TQDateTime::currentDateTime() ); MALConduitSettings::self()->writeConfig(); } @@ -152,7 +152,7 @@ void MALConduit::saveConfig() bool MALConduit::skip() { - TQDateTime now=TQDateTime::tqcurrentDateTime(); + TQDateTime now=TQDateTime::currentDateTime(); TQDateTime lastSync=MALConduitSettings::lastMALSync(); if (!lastSync.isValid() || !now.isValid()) return false; @@ -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 \""< Expanding - + 20 20 @@ -245,7 +245,7 @@ Expanding - + 20 20 @@ -397,7 +397,7 @@ Expanding - + 20 70 @@ -489,7 +489,7 @@ Expanding - + 20 20 @@ -559,7 +559,7 @@ Expanding - + 20 20 diff --git a/conduits/memofileconduit/memofile-conduit.cc b/conduits/memofileconduit/memofile-conduit.cc index 42461f5..1c65d12 100644 --- a/conduits/memofileconduit/memofile-conduit.cc +++ b/conduits/memofileconduit/memofile-conduit.cc @@ -43,7 +43,7 @@ #include #include -#include +#include #include #include @@ -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...")); @@ -368,7 +368,7 @@ void MemofileConduit::getModifiedFromPilot() { FUNCTIONSETUP; - DEBUGKPILOT << fname << ": Now in state " << fActiontqStatus << endl; + DEBUGKPILOT << fname << ": Now in state " << fActionStatus << endl; } diff --git a/conduits/memofileconduit/memofile.h b/conduits/memofileconduit/memofile.h index 1308e98..3ba9114 100644 --- a/conduits/memofileconduit/memofile.h +++ b/conduits/memofileconduit/memofile.h @@ -42,8 +42,8 @@ #include #include -#include -#include +#include +#include #include "pilotMemo.h" diff --git a/conduits/memofileconduit/setup_base.ui b/conduits/memofileconduit/setup_base.ui index d3bf795..fba82af 100644 --- a/conduits/memofileconduit/setup_base.ui +++ b/conduits/memofileconduit/setup_base.ui @@ -81,7 +81,7 @@ the Memofile-conduit settings. Expanding - + 20 180 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/notepadconduit/notepad-setup.ui b/conduits/notepadconduit/notepad-setup.ui index 02aec75..ac74d9d 100644 --- a/conduits/notepadconduit/notepad-setup.ui +++ b/conduits/notepadconduit/notepad-setup.ui @@ -45,7 +45,7 @@ Expanding - + 20 250 diff --git a/conduits/null/setup_base.ui b/conduits/null/setup_base.ui index f64d05c..7cfcbe4 100644 --- a/conduits/null/setup_base.ui +++ b/conduits/null/setup_base.ui @@ -109,7 +109,7 @@ the Null-conduit settings. Expanding - + 20 20 diff --git a/conduits/popmail/popmail-conduit.cc b/conduits/popmail/popmail-conduit.cc index 15441e5..d328173 100644 --- a/conduits/popmail/popmail-conduit.cc +++ b/conduits/popmail/popmail-conduit.cc @@ -61,8 +61,8 @@ unsigned long version_conduit_popmail = Pilot::PLUGIN_API; #include #include -#include -#include +#include +#include #include #include @@ -319,7 +319,7 @@ void PopMailConduit::writeMessageToFile(FILE* sendf, struct Mail& theMail) // if our struct indicates that it's dated, then use the date it // holds. otherwise, provide current date. either way, we need to // have a date... - TQDateTime date = TQDateTime::tqcurrentDateTime(); + TQDateTime date = TQDateTime::currentDateTime(); if (theMail.dated) { date = readTm(theMail.date); @@ -377,7 +377,7 @@ void PopMailConduit::writeMessageToFile(FILE* sendf, struct Mail& theMail) << outbox << endl; - TQDateTime date = TQDateTime::tqcurrentDateTime(); + TQDateTime date = TQDateTime::currentDateTime(); TQString dateString = date.toString(DATE_FORMAT); DEBUGKPILOT << fname << ": Date format example: [" << dateString diff --git a/conduits/popmail/setup-dialog.ui b/conduits/popmail/setup-dialog.ui index 38b0c27..5d0566d 100644 --- a/conduits/popmail/setup-dialog.ui +++ b/conduits/popmail/setup-dialog.ui @@ -47,7 +47,7 @@ Expanding - + 20 16 diff --git a/conduits/recordconduit/setup_base.ui b/conduits/recordconduit/setup_base.ui index 3608371..448a099 100644 --- a/conduits/recordconduit/setup_base.ui +++ b/conduits/recordconduit/setup_base.ui @@ -128,7 +128,7 @@ the Record-conduit settings. Expanding - + 20 20 diff --git a/conduits/sysinfoconduit/sysinfo-conduit.cc b/conduits/sysinfoconduit/sysinfo-conduit.cc index 4d1a35f..5ed758f 100644 --- a/conduits/sysinfoconduit/sysinfo-conduit.cc +++ b/conduits/sysinfoconduit/sysinfo-conduit.cc @@ -214,14 +214,14 @@ void SysInfoConduit::hardwareInfo() * - #devicetype# */ KPilotSysInfo sysinfo = fHandle->getSysInfo(); - fValues[CSL1("deviceid")] = TQString::tqfromLatin1(sysinfo.getProductID()); + fValues[CSL1("deviceid")] = TQString::fromLatin1(sysinfo.getProductID()); const KPilotCard *device = fHandle->getCardInfo(); if (device) { - fValues[CSL1("devicename")] = TQString::tqfromLatin1(device->getCardName()); + fValues[CSL1("devicename")] = TQString::fromLatin1(device->getCardName()); fValues[CSL1("devicemodel")] = unknown; // TODO - fValues[CSL1("manufacturer")] = TQString::tqfromLatin1(device->getCardManufacturer()); + fValues[CSL1("manufacturer")] = TQString::fromLatin1(device->getCardManufacturer()); } else { @@ -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::tqfromLatin1(device->getCardName())) - .tqarg(TQString::tqfromLatin1(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"); @@ -400,7 +400,7 @@ void SysInfoConduit::pcVersionInfo() * - #kpilot# * - #pilotlink# */ - fValues[CSL1("kpilot")] = TQString::tqfromLatin1(KPILOT_VERSION); + fValues[CSL1("kpilot")] = TQString::fromLatin1(KPILOT_VERSION); fValues[CSL1("kde")] = i18n("unknown"); fValues[CSL1("qt")] = i18n("unknown"); fValues[CSL1("os")] = i18n("unknown"); @@ -408,25 +408,25 @@ void SysInfoConduit::pcVersionInfo() struct utsname name; if (uname (&name) >= 0) { fValues[CSL1("os")] = CSL1("%1 %3, %5") - .tqarg(TQString::tqfromLatin1(name.sysname)) - .tqarg(TQString::tqfromLatin1(name.release)) - .tqarg(TQString::tqfromLatin1(name.machine)); - fValues[CSL1("hostname")] = CSL1("%2").tqarg(TQString::tqfromLatin1(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::tqfromLatin1(TDE_VERSION_STRING); + fValues[CSL1("kde")] = TQString::fromLatin1(TDE_VERSION_STRING); #endif #ifdef TQT_VERSION_STR - fValues[CSL1("qt")] = TQString::tqfromLatin1(TQT_VERSION_STR); + 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::tqfromLatin1(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")); @@ -470,7 +470,7 @@ void SysInfoConduit::writeFile() { FUNCTIONSETUP; - fValues[CSL1("date")] = TQDateTime::tqcurrentDateTime().toString(Qt::LocalDate); + fValues[CSL1("date")] = TQDateTime::currentDateTime().toString(Qt::LocalDate); TQString output; // Open the template file @@ -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("").tqarg(*it).tqarg(*it)); + TQRegExp re(CSL1("").arg(*it).arg(*it)); re.setMinimal(true); output.remove(re); } for ( TQStringList::Iterator it = keepParts.begin(); it != keepParts.end(); ++it ) { - TQRegExp re(CSL1("").tqarg(*it).tqarg(*it)); + TQRegExp re(CSL1("").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::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 @@ -552,11 +552,11 @@ void SysInfoConduit::writeFile() * %8 .. modifyDate * %9 .. backupDate */ - newpatt.replace(CSL1("%0"), TQString::tqfromLatin1(dbi.name)); + newpatt.replace(CSL1("%0"), TQString::fromLatin1(dbi.name)); set_long(&tmpchr[0],dbi.type); - newpatt.replace(CSL1("%1"), TQString::tqfromLatin1(tmpchr)); + newpatt.replace(CSL1("%1"), TQString::fromLatin1(tmpchr)); set_long(&tmpchr[0],dbi.creator); - newpatt.replace(CSL1("%2"), TQString::tqfromLatin1(tmpchr)); + newpatt.replace(CSL1("%2"), TQString::fromLatin1(tmpchr)); newpatt.replace(CSL1("%3"), TQString::number(dbi.index)); newpatt.replace(CSL1("%4"), TQString::number(dbi.flags)); newpatt.replace(CSL1("%5"), TQString::number(dbi.miscFlags)); @@ -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< Expanding - + 20 51 @@ -160,7 +160,7 @@ Expanding - + 21 20 diff --git a/conduits/timeconduit/time-conduit.cc b/conduits/timeconduit/time-conduit.cc index 20000e5..76798db 100644 --- a/conduits/timeconduit/time-conduit.cc +++ b/conduits/timeconduit/time-conduit.cc @@ -83,7 +83,7 @@ void TimeConduit::readConfig() { #ifdef DEBUG DEBUGKPILOT << fname << ": Would have set time to " - << TQDateTime::tqcurrentDateTime().toString() << endl; + << TQDateTime::currentDateTime().toString() << endl; #endif return delayDone(); } 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/hhtopcstate.cc b/conduits/vcalconduit/hhtopcstate.cc index 4fa12af..82024f1 100644 --- a/conduits/vcalconduit/hhtopcstate.cc +++ b/conduits/vcalconduit/hhtopcstate.cc @@ -123,7 +123,7 @@ void HHToPCState::handleRecord( ConduitAction *ca ) { KCal::Incidence *e = vccb->addRecord( r ); if ( vccb->config()->syncArchived() && archiveRecord ) { - e->setSynctqStatus( KCal::Incidence::SYNCDEL ); + e->setSyncStatus( KCal::Incidence::SYNCDEL ); } } } @@ -218,7 +218,7 @@ void VCalConduitBase::slotPalmRecToPC() { KCal::Incidence*e=addRecord(r); if (config()->syncArchived() && archiveRecord) { - e->setSynctqStatus(KCal::Incidence::SYNCDEL); + e->setSyncStatus(KCal::Incidence::SYNCDEL); } } } diff --git a/conduits/vcalconduit/korganizerConduit.ui b/conduits/vcalconduit/korganizerConduit.ui index 52904b4..7fa4491 100644 --- a/conduits/vcalconduit/korganizerConduit.ui +++ b/conduits/vcalconduit/korganizerConduit.ui @@ -79,7 +79,7 @@ Expanding - + 20 20 @@ -243,7 +243,7 @@ be saved in the calendar on the PC. Expanding - + 20 31 diff --git a/conduits/vcalconduit/pctohhstate.cc b/conduits/vcalconduit/pctohhstate.cc index 84d50ed..d2866fd 100644 --- a/conduits/vcalconduit/pctohhstate.cc +++ b/conduits/vcalconduit/pctohhstate.cc @@ -120,7 +120,7 @@ void PCToHHState::handleRecord( ConduitAction *ca ) if( id > 0 && ( s = vccb->database()->readRecordById( id ) ) ) { - if( e->synctqStatus() == KCal::Incidence::SYNCDEL ) + if( e->syncStatus() == KCal::Incidence::SYNCDEL ) { vccb->deletePalmRecord( e, s ); } diff --git a/conduits/vcalconduit/todo-conduit.cc b/conduits/vcalconduit/todo-conduit.cc index 8a04f15..4eee4b4 100644 --- a/conduits/vcalconduit/todo-conduit.cc +++ b/conduits/vcalconduit/todo-conduit.cc @@ -35,7 +35,7 @@ #include "options.h" #include -#include +#include #include #include @@ -154,13 +154,13 @@ KCal::Incidence *TodoConduitPrivate::getNextModifiedIncidence() } if ( fAllTodosIterator != fAllTodos.end() ) e=*fAllTodosIterator; while (fAllTodosIterator != fAllTodos.end() && - e && e->synctqStatus()!=KCal::Incidence::SYNCMOD && e->pilotId()) + e && e->syncStatus()!=KCal::Incidence::SYNCMOD && e->pilotId()) { e = (++fAllTodosIterator != fAllTodos.end()) ? *fAllTodosIterator : 0L; #ifdef DEBUG if(e) - DEBUGKPILOT<< e->summary()<<" had SyncStatus="<synctqStatus()<summary()<<" had SyncStatus="<syncStatus()<setCompleted(de->getComplete()); if ( de->getComplete() && !e->hasCompletedDate() ) { - e->setCompleted( TQDateTime::tqcurrentDateTime() ); + e->setCompleted( TQDateTime::currentDateTime() ); } e->setSummary(de->getDescription()); @@ -134,8 +134,8 @@ bool KCalSync::setTodo(KCal::Todo *e, // NOTE: This MUST be done last, since every other set* call // calls updated(), which will trigger an - // setSynctqStatus(SYNCMOD)!!! - e->setSynctqStatus(KCal::Incidence::SYNCNONE); + // setSyncStatus(SYNCMOD)!!! + e->setSyncStatus(KCal::Incidence::SYNCNONE); return true; } diff --git a/conduits/vcalconduit/vcal-conduit.cc b/conduits/vcalconduit/vcal-conduit.cc index 52bd759..2cdc5d3 100644 --- a/conduits/vcalconduit/vcal-conduit.cc +++ b/conduits/vcalconduit/vcal-conduit.cc @@ -155,7 +155,7 @@ KCal::Incidence *VCalConduitPrivate::getNextModifiedIncidence() if ( fAllEventsIterator != fAllEvents.end() ) e = *fAllEventsIterator; // Then walk the list until we find an unsynced entry while ( fAllEventsIterator != fAllEvents.end() && - e && e->synctqStatus()!=KCal::Incidence::SYNCMOD && e->pilotId() > 0) + e && e->syncStatus()!=KCal::Incidence::SYNCMOD && e->pilotId() > 0) { e = (++fAllEventsIterator != fAllEvents.end()) ? *fAllEventsIterator : 0L; } @@ -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(de); diff --git a/conduits/vcalconduit/vcal-conduitbase.cc b/conduits/vcalconduit/vcal-conduitbase.cc index 33ae4f1..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; @@ -452,7 +452,7 @@ KCal::Incidence*VCalConduitBase::changeRecord(PilotRecord *r,PilotRecord *) if ( e && de ) { // TODO: check for conflict, and if there is one, ask for resolution - if ( ( e->synctqStatus() != KCal::Incidence::SYNCNONE ) + if ( ( e->syncStatus() != KCal::Incidence::SYNCNONE ) && r->isModified() ) { // TODO: I have not yet found a way to complete ignore an item @@ -468,8 +468,8 @@ KCal::Incidence*VCalConduitBase::changeRecord(PilotRecord *r,PilotRecord *) // NOTE: This MUST be done last, since every other set* call // calls updated(), which will trigger an - // setSynctqStatus(SYNCMOD)!!! - e->setSynctqStatus(KCal::Incidence::SYNCNONE); + // setSyncStatus(SYNCMOD)!!! + e->setSyncStatus(KCal::Incidence::SYNCNONE); fLocalDatabase->writeRecord( r ); } else @@ -552,7 +552,7 @@ void VCalConduitBase::updateIncidenceOnPalm( KCal::Incidence *e, return; } - if ( e->synctqStatus() == KCal::Incidence::SYNCDEL ) + if ( e->syncStatus() == KCal::Incidence::SYNCDEL ) { DEBUGKPILOT << fname << ": don't write deleted incidence " << e->summary() << " to the palm" << endl; @@ -573,8 +573,8 @@ void VCalConduitBase::updateIncidenceOnPalm( KCal::Incidence *e, // NOTE: This MUST be done last, since every other set* call // calls updated(), which will trigger an - // setSynctqStatus(SYNCMOD)!!! - e->setSynctqStatus(KCal::Incidence::SYNCNONE); + // setSyncStatus(SYNCMOD)!!! + e->setSyncStatus(KCal::Incidence::SYNCNONE); KPILOT_DELETE( r ); } } diff --git a/conduits/vcalconduit/vcalRecord.cc b/conduits/vcalconduit/vcalRecord.cc index fc274b1..898bc79 100644 --- a/conduits/vcalconduit/vcalRecord.cc +++ b/conduits/vcalconduit/vcalRecord.cc @@ -512,8 +512,8 @@ bool KCalSync::setEvent(KCal::Event *e, // NOTE: This MUST be done last, since every other set* call // calls updated(), which will trigger an - // setSynctqStatus(SYNCMOD)!!! - e->setSynctqStatus(KCal::Incidence::SYNCNONE); + // setSyncStatus(SYNCMOD)!!! + e->setSyncStatus(KCal::Incidence::SYNCNONE); return true; } diff --git a/kpilot/addressEditor.cc b/kpilot/addressEditor.cc index 47f9a3a..2c450bc 100644 --- a/kpilot/addressEditor.cc +++ b/kpilot/addressEditor.cc @@ -36,7 +36,7 @@ #include #endif #ifndef TQLAYOUT_H -#include +#include #endif #ifndef TQLABEL_H #include diff --git a/kpilot/addressWidget.cc b/kpilot/addressWidget.cc index fd3c54f..2a791cd 100644 --- a/kpilot/addressWidget.cc +++ b/kpilot/addressWidget.cc @@ -42,14 +42,14 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include -#include -#include +#include +#include #include #include @@ -185,7 +185,7 @@ void AddressWidget::hideComponent() #if TDE_VERSION<220 s = i18n("There are still %1 address editing windows open.") - .tqarg(TQString::number(fPendingAddresses)); + .arg(TQString::number(fPendingAddresses)); #else s = i18n("There is still an address editing window open.", "There are still %n address editing windows open.", @@ -479,7 +479,7 @@ void AddressWidget::slotCreateNewRecord() KMessageBox::sorry(this, i18n("You cannot add addresses to the address book " "until you have done a HotSync at least once " - "to retrieve the database tqlayout from your Pilot."), + "to retrieve the database layout from your Pilot."), i18n("Cannot Add New Address")); if (myDB) @@ -675,7 +675,7 @@ void AddressWidget::slotExport() TQString prompt = (currentCatID==-1) ? 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( @@ -693,7 +693,7 @@ void AddressWidget::slotExport() } if (TQFile::exists(saveFile) && KMessageBox::warningContinueCancel(this, - i18n("The file %1 exists. Overwrite?").tqarg(saveFile), + i18n("The file %1 exists. Overwrite?").arg(saveFile), i18n("Overwrite File?"), i18n("Overwrite"))!=KMessageBox::Continue) { @@ -707,7 +707,7 @@ void AddressWidget::slotExport() if (!f) { KMessageBox::sorry(this, - i18n("The file %1 could not be opened for writing.").tqarg(saveFile)); + i18n("The file %1 could not be opened for writing.").arg(saveFile)); return; } fAddressList.first(); diff --git a/kpilot/conduitConfigDialog.cc b/kpilot/conduitConfigDialog.cc index 8f47a8a..afbdad3 100644 --- a/kpilot/conduitConfigDialog.cc +++ b/kpilot/conduitConfigDialog.cc @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include #include @@ -139,7 +139,7 @@ ConduitTip::~ConduitTip() s.append(CSL1("")); } - tip(fListView->tqitemRect(l),s); + tip(fListView->itemRect(l),s); } // implement our own check list items so we can detect if a given item was checked/unchecked. We need @@ -192,7 +192,7 @@ static void addDescriptionPage(TQWidgetStack *parent, l = new TQLabel(v); l->setText(text); - l->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter | TQt::ExpandTabs | TQt::WordBreak); + l->setAlignment(TQt::AlignLeft | TQt::AlignVCenter | TQt::ExpandTabs | TQt::WordBreak); if (label) { *label = l; } @@ -227,7 +227,7 @@ ConduitConfigWidgetBase::ConduitConfigWidgetBase(TQWidget *parent, const char *n fConduitList = new TQListView(this ,"ConduitList"); fConduitList->addColumn(TQString()); fConduitList->header()->hide(); - fConduitList->tqsetSizePolicy( + fConduitList->setSizePolicy( TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred)); mainLayout->addWidget(fConduitList); @@ -252,7 +252,7 @@ ConduitConfigWidgetBase::ConduitConfigWidgetBase(TQWidget *parent, const char *n i18n("This conduit appears to be broken and cannot " "be configured.")); - // Second page, now with tqlayout in a single column + // Second page, now with layout in a single column // // Probably deprecated. // @@ -316,13 +316,13 @@ ConduitConfigWidget::ConduitConfigWidget(TQWidget *parent, const char *n, // fConduitList->removeColumn(CONDUIT_COMMENT); fillLists(); - fConduitList->resize(fConduitList->tqsizeHint()); - fConduitList->setMinimumSize(fConduitList->tqsizeHint()); - fConduitList->setColumnWidth(0, fConduitList->tqsizeHint().width()); + fConduitList->resize(fConduitList->sizeHint()); + fConduitList->setMinimumSize(fConduitList->sizeHint()); + fConduitList->setColumnWidth(0, fConduitList->sizeHint().width()); fConduitList->setResizeMode(TQListView::AllColumns); - fStack->resize(fStack->tqsizeHint()+TQSize(10,40)); - fStack->setMinimumSize(fStack->tqsizeHint()+TQSize(10,40)); + fStack->resize(fStack->sizeHint()+TQSize(10,40)); + fStack->setMinimumSize(fStack->sizeHint()+TQSize(10,40)); TQObject::connect(fConduitList, TQT_SIGNAL(selectionChanged(TQListViewItem *)), @@ -542,7 +542,7 @@ void ConduitConfigWidget::loadAndConfigure(TQListViewItem *p) // ,bool exec) i18n("This is an internal action which has no " "configuration options. " "The action's description is: %1 " - "").tqarg(p->text(CONDUIT_COMMENT))); + "").arg(p->text(CONDUIT_COMMENT))); return; } @@ -735,7 +735,7 @@ void ConduitConfigWidget::warnNoExec(const TQListViewItem * p) TQString msg = i18n("No library could be " "found for the conduit %1. This means that the " "conduit was not installed properly.") - .tqarg(p->text(CONDUIT_NAME)); + .arg(p->text(CONDUIT_NAME)); #ifdef DEBUG DEBUGKPILOT << fname << ": No library for " @@ -752,7 +752,7 @@ void ConduitConfigWidget::warnNoLibrary(const TQListViewItem *p) TQString msg = i18n("There was a problem loading the library " "for the conduit %1. This means that the " "conduit was not installed properly.") - .tqarg(p->text(CONDUIT_NAME)); + .arg(p->text(CONDUIT_NAME)); #ifdef DEBUG DEBUGKPILOT << fname << ": Can't load library for " diff --git a/kpilot/datebookWidget.cc b/kpilot/datebookWidget.cc index 8b76942..7678af5 100644 --- a/kpilot/datebookWidget.cc +++ b/kpilot/datebookWidget.cc @@ -31,7 +31,7 @@ #include "options.h" -#include +#include #include #include @@ -49,7 +49,7 @@ DatebookWidget::DatebookWidget(TQWidget *parent, const TQString &dbpath) : TQGridLayout *g = new TQGridLayout(this,1,1,SPACING); fDatePicker = new KDatePicker( this, "fDatePicker" ); - fDatePicker->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)4, (TQSizePolicy::SizeType)5, 0, 0, fDatePicker->sizePolicy().hasHeightForWidth() ) ); + fDatePicker->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)4, (TQSizePolicy::SizeType)5, 0, 0, fDatePicker->sizePolicy().hasHeightForWidth() ) ); g->addMultiCellWidget(fDatePicker,0,0,0,2); TQSpacerItem* spacer = new TQSpacerItem( 20, 180, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); @@ -69,7 +69,7 @@ DatebookWidget::DatebookWidget(TQWidget *parent, const TQString &dbpath) : fEventList->addColumn( i18n( "Al" ) ); fEventList->addColumn( i18n( "Rec" ) ); fEventList->addColumn( i18n( "Description" ) ); -// fEventList->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, fEventList->sizePolicy().hasHeightForWidth() ) ); +// fEventList->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, fEventList->sizePolicy().hasHeightForWidth() ) ); fEventList->setAllColumnsShowFocus( TRUE ); fEventList->setShowSortIndicator( TRUE ); fEventList->setResizeMode( KListView::/*LastColumn*/AllColumns ); diff --git a/kpilot/dbAppInfoEditor.cc b/kpilot/dbAppInfoEditor.cc index bfedb45..3519baf 100644 --- a/kpilot/dbAppInfoEditor.cc +++ b/kpilot/dbAppInfoEditor.cc @@ -27,7 +27,7 @@ #include "options.h" -#include +#include #include #include #include @@ -67,7 +67,7 @@ DBAppInfoEditor::DBAppInfoEditor(char*appInfoData, int l, TQWidget *parent) : { TQLabel*tmpW = new TQLabel( i18n("To view the Application info block data, please install a hex editor (e.g. khexedit from tdeutils)."), this ); tmpW->setBackgroundMode( TQt::PaletteMid ); - tmpW->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter | TQt::WordBreak); + tmpW->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter | TQt::WordBreak); tmpW->setFrameShape( TQFrame::Panel ); tmpW->setFrameShadow( TQFrame::Sunken ); fAppInfoEdit = tmpW; diff --git a/kpilot/dbFlagsEditor.cc b/kpilot/dbFlagsEditor.cc index eafbe58..89f14d0 100644 --- a/kpilot/dbFlagsEditor.cc +++ b/kpilot/dbFlagsEditor.cc @@ -115,15 +115,15 @@ void DBFlagsEditor::fillWidgets() { // FUNCTIONSETUP - widget->fDBName->setText(TQString::tqfromLatin1(dbi->name)); + widget->fDBName->setText(TQString::fromLatin1(dbi->name)); char buff[5]; set_long(buff, dbi->type); buff[4]='\0'; - widget->fType->setText(TQString::tqfromLatin1(buff)); + widget->fType->setText(TQString::fromLatin1(buff)); set_long(buff, dbi->creator); buff[4]='\0'; - widget->fCreator->setText(TQString::tqfromLatin1(buff)); + widget->fCreator->setText(TQString::fromLatin1(buff)); widget->fRessourceDB->setChecked(dbi->flags & dlpDBFlagResource); widget->fReadOnly->setChecked(dbi->flags & dlpDBFlagReadOnly); diff --git a/kpilot/dbFlagsEditor_base.ui b/kpilot/dbFlagsEditor_base.ui index 6ea18ca..a89aabd 100644 --- a/kpilot/dbFlagsEditor_base.ui +++ b/kpilot/dbFlagsEditor_base.ui @@ -142,7 +142,7 @@ Expanding - + 20 20 @@ -172,7 +172,7 @@ Expanding - + 21 60 @@ -317,7 +317,7 @@ Expanding - + 180 21 @@ -342,7 +342,7 @@ Expanding - + 31 70 diff --git a/kpilot/dbRecordEditor.cc b/kpilot/dbRecordEditor.cc index 16385a7..873699f 100644 --- a/kpilot/dbRecordEditor.cc +++ b/kpilot/dbRecordEditor.cc @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include @@ -138,13 +138,13 @@ void DBRecordEditor::initWidgets() DBRecordEditorBaseLayout->addWidget( fRecordID, 0, 3 ); fFlagsGroup = new TQButtonGroup( fWidget, "fFlagsGroup" ); - fFlagsGroup->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, + fFlagsGroup->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)4, 0, 0, fFlagsGroup->sizePolicy().hasHeightForWidth() ) ); fFlagsGroup->setColumnLayout(0, Qt::Vertical ); - fFlagsGroup->tqlayout()->setSpacing( 6 ); - fFlagsGroup->tqlayout()->setMargin( 11 ); - fFlagsGroupLayout = new TQGridLayout( fFlagsGroup->tqlayout() ); - fFlagsGroupLayout->tqsetAlignment( TQt::AlignTop ); + fFlagsGroup->layout()->setSpacing( 6 ); + fFlagsGroup->layout()->setMargin( 11 ); + fFlagsGroupLayout = new TQGridLayout( fFlagsGroup->layout() ); + fFlagsGroupLayout->setAlignment( TQt::AlignTop ); fDirty = new TQCheckBox( fFlagsGroup, "fDirty" ); fFlagsGroupLayout->addWidget( fDirty, 0, 0 ); @@ -192,7 +192,7 @@ void DBRecordEditor::initWidgets() { TQLabel*tmpW = new TQLabel( i18n("To view and edit the record data, please install a hex editor (e.g. kbytesedit from tdeutils)."), fWidget ); tmpW->setBackgroundMode( TQt::PaletteMid ); - tmpW->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter | TQt::WordBreak); + tmpW->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter | TQt::WordBreak); tmpW->setFrameShape( TQFrame::Panel ); tmpW->setFrameShadow( TQFrame::Sunken ); fRecordData = tmpW; @@ -202,7 +202,7 @@ void DBRecordEditor::initWidgets() DBRecordEditorBaseLayout->addMultiCellWidget( fRecordData, 2, 2, 0, 3 ); languageChange(); - resize( TQSize(600, 561).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(600, 561).expandedTo(minimumSizeHint()) ); } void DBRecordEditor::fillWidgets() diff --git a/kpilot/dbviewerWidget.cc b/kpilot/dbviewerWidget.cc index 6332760..0891fab 100644 --- a/kpilot/dbviewerWidget.cc +++ b/kpilot/dbviewerWidget.cc @@ -37,7 +37,7 @@ #include #include -#include +#include #include #include #include @@ -87,7 +87,7 @@ void GenericDBWidget::setupWidget() TQGridLayout *g1 = new TQGridLayout( 0, 1, 1); fDBInfo = new KTextEdit( this ); - fDBInfo->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)0, 0, 0, fDBInfo->sizePolicy().hasHeightForWidth() ) ); + fDBInfo->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)0, 0, 0, fDBInfo->sizePolicy().hasHeightForWidth() ) ); fDBInfo->setReadOnly( TRUE ); g1->addWidget( fDBInfo, 0, 0 ); fDBInfoButton = new KPushButton( i18n( "General Database &Information" ), this ); @@ -117,7 +117,7 @@ void GenericDBWidget::setupWidget() g->addMultiCellLayout( g1, 0, 1, 1, 1 ); - resize( TQSize(682, 661).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(682, 661).expandedTo(minimumSizeHint()) ); connect(fDBList, TQT_SIGNAL(highlighted(const TQString &)), this, TQT_SLOT(slotSelected(const TQString &))); @@ -187,20 +187,20 @@ void GenericDBWidget::slotSelected(const TQString &dbname) if (!fDB || !fDB->isOpen()) { fDBInfo->setText(i18n("Warning: Cannot read " - "database file %1.").tqarg(currentDB)); + "database file %1.").arg(currentDB)); return; } dbinfo=fDB->getDBInfo(); display.append(i18n("Database: %1, %2 records
") - .tqarg(TQString::tqfromLatin1(dbinfo.name)).tqarg(fDB->recordCount())); + .arg(TQString::fromLatin1(dbinfo.name)).arg(fDB->recordCount())); char buff[5]; set_long(buff, dbinfo.type); buff[4]='\0'; - TQString tp = TQString::tqfromLatin1(buff); + TQString tp = TQString::fromLatin1(buff); set_long(buff, dbinfo.creator); buff[4]='\0'; - TQString cr = TQString::tqfromLatin1(buff); - display.append(i18n("Type: %1, Creator: %2

").tqarg(tp).tqarg(cr)); + TQString cr = TQString::fromLatin1(buff); + display.append(i18n("Type: %1, Creator: %2

").arg(tp).arg(cr)); int currentRecord = 0; PilotRecord *pilotRec; @@ -244,33 +244,33 @@ void GenericDBWidget::slotSelected(const TQString &dbname) if (!pf) { fDBInfo->setText(i18n("Warning: Cannot read " - "application file %1.").tqarg(dbname)); + "application file %1.").arg(dbname)); return; } #if PILOT_LINK_NUMBER < PILOT_LINK_0_12_0 if (pi_file_get_info(pf,&dbinfo)) { fDBInfo->setText(i18n("Warning: Cannot read " - "application file %1.").tqarg(dbname)); + "application file %1.").arg(dbname)); return; } #else pi_file_get_info(pf,&dbinfo); #endif - display.append(i18n("Application: %1

").tqarg(dbname)); + display.append(i18n("Application: %1

").arg(dbname)); } enableWidgets(currentDBtype==eDatabase); TQDateTime ttime; ttime.setTime_t(dbinfo.createDate); - display.append(i18n("Created: %1
").tqarg(ttime.toString())); + display.append(i18n("Created: %1
").arg(ttime.toString())); ttime.setTime_t(dbinfo.modifyDate); - display.append(i18n("Modified: %1
").tqarg(ttime.toString())); + display.append(i18n("Modified: %1
").arg(ttime.toString())); ttime.setTime_t(dbinfo.backupDate); - display.append(i18n("Backed up: %1
").tqarg(ttime.toString())); + display.append(i18n("Backed up: %1
").arg(ttime.toString())); fDBInfo->setText(display); } diff --git a/kpilot/fileInstallWidget.cc b/kpilot/fileInstallWidget.cc index 5e11c46..99aad64 100644 --- a/kpilot/fileInstallWidget.cc +++ b/kpilot/fileInstallWidget.cc @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include #include @@ -116,7 +116,7 @@ FileInstallWidget::~FileInstallWidget() static inline bool pdbOrPrc(const TQString &s) { - return s.tqendsWith(CSL1(".pdb"),false) || s.tqendsWith(CSL1(".prc"),false) ; + return s.endsWith(CSL1(".pdb"),false) || s.endsWith(CSL1(".prc"),false) ; } void FileInstallWidget::dragEnterEvent(TQDragEnterEvent *event) diff --git a/kpilot/fileInstaller.cc b/kpilot/fileInstaller.cc index d02858e..d46c67d 100644 --- a/kpilot/fileInstaller.cc +++ b/kpilot/fileInstaller.cc @@ -105,8 +105,8 @@ void FileInstaller::deleteFiles(const TQStringList &files) { FUNCTIONSETUP; - if(!(s.tqendsWith(CSL1(".pdb"), false) || s.tqendsWith(CSL1(".prc"), false))) { - KMessageBox::detailedSorry(w, i18n("Cannot install %1").tqarg(s), + if(!(s.endsWith(CSL1(".pdb"), false) || s.endsWith(CSL1(".prc"), false))) { + 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.")); return false; } diff --git a/kpilot/hotSync.cc b/kpilot/hotSync.cc index 7689f32..49212bf 100644 --- a/kpilot/hotSync.cc +++ b/kpilot/hotSync.cc @@ -117,7 +117,7 @@ public: set_long( &buff[1], info->creator ); buff[5] = ']'; buff[6] = '\0'; - TQString creator = TQString::tqfromLatin1( buff ); + TQString creator = TQString::fromLatin1( buff ); TQString dbname = Pilot::fromPilot( info->name, 32 ); @@ -270,7 +270,7 @@ static inline void initNoBackup(TQStringList &dbnames, unsigned long tag = *i; pi_untag(buf,tag); buf[4]=0; - creatorids.append(CSL1("[%1]").tqarg(buf)); + creatorids.append(CSL1("[%1]").arg(buf)); } DEBUGKPILOT << fname << ": Will skip creators " << creatorids << endl; } @@ -336,7 +336,7 @@ static inline bool checkBackupDirectory( const TQString &backupDir ) fP->fBackupDir = fP->fPreferBackupDir; } - logMessage(i18n("Backup directory: %1.").tqarg(fP->fBackupDir)); + logMessage(i18n("Backup directory: %1.").arg(fP->fBackupDir)); DEBUGKPILOT << fname << ": This Pilot user's name is \"" @@ -349,18 +349,18 @@ static inline bool checkBackupDirectory( const TQString &backupDir ) if (fP->fFullBackup) { - fActiontqStatus = FullBackup; + fActionStatus = FullBackup; addSyncLogEntry(i18n("Full backup started.")); } else { - fActiontqStatus = FastBackup; + fActionStatus = FastBackup; addSyncLogEntry(i18n("Fast backup started")); } if (!checkBackupDirectory(fP->fBackupDir)) { - fActiontqStatus=BackupIncomplete; + fActionStatus=BackupIncomplete; // Don't issue an error message, checkBackupDirectory // did this already... return false; @@ -386,7 +386,7 @@ static inline bool checkBackupDirectory( const TQString &backupDir ) { addSyncLogEntry(i18n("Exiting on cancel.")); endBackup(); - fActiontqStatus = BackupIncomplete; + fActionStatus = BackupIncomplete; return; } @@ -403,7 +403,7 @@ static inline bool checkBackupDirectory( const TQString &backupDir ) addSyncLogEntry( i18n("Fast backup complete.") ); } endBackup(); - fActiontqStatus = BackupComplete; + fActionStatus = BackupComplete; return; } @@ -416,7 +416,7 @@ static inline bool checkBackupDirectory( const TQString &backupDir ) // only backup data, not applications. 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)) { @@ -445,7 +445,7 @@ static inline bool checkBackupDirectory( const TQString &backupDir ) DEBUGKPILOT << fname << ": Skipping database <" << info.name << "> (no-backup list)" << endl; TQString s = i18n("Skipping %1") - .tqarg(Pilot::fromPilot(info.name)); + .arg(Pilot::fromPilot(info.name)); addSyncLogEntry(s); } TQTimer::singleShot(0,this,TQT_SLOT(backupOneDB())); @@ -480,7 +480,7 @@ bool BackupAction::startBackupThread(DBInfo *info) WARNINGKPILOT << "Unable to open database <" << info->name << ">" << endl; KPILOT_DELETE(serial); addSyncLogEntry(i18n("Backup of %1 failed.\n") - .tqarg(Pilot::fromPilot(info->name))); + .arg(Pilot::fromPilot(info->name))); return false; } @@ -557,7 +557,7 @@ void BackupAction::endBackup() FUNCTIONSETUP; fP->fDBIndex = (-1); - fActiontqStatus = BackupEnded; + fActionStatus = BackupEnded; fP->fDeviceDBs.sort(); TQString old( TQString::null ); TQStringList::Iterator itr = fP->fDeviceDBs.begin(); @@ -660,7 +660,7 @@ FileInstallAction::~FileInstallAction() DEBUGKPILOT << fname << ": Installing file " << filePath << endl; #endif - TQString m = i18n("Installing %1").tqarg(fileName); + TQString m = i18n("Installing %1").arg(fileName); emit logProgress(m,(100 * fDBIndex) / (fList.count()+1)); m+=CSL1("\n"); 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 "%1" has a " "resource name that is longer than 31 characters. " "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; @@ -769,7 +769,7 @@ bool FileInstallAction::resourceOK(const TQString &fileName, const TQString &fil } 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. " "They should be set. " "Should KPilot set them to a default value " - "(%1)?").tqarg(defaultUserName); + "(%1)?").arg(defaultUserName); if (questionYesNo(q, i18n("User Unknown") /* ,"askUserNone" */) == KMessageBox::Yes) @@ -844,7 +844,7 @@ CheckUser::~CheckUser() q += i18n("KPilot has a username set " "(%1) but the handheld does not. " "Should KPilot's username be set in the " - "handheld as well?").tqarg(guiUserName); + "handheld as well?").arg(guiUserName); q += i18n("
(Note: If your handheld " "has been reset to factory defaults, you " "should use Restore instead of a " @@ -993,7 +993,7 @@ void RestoreAction::setDirectory( const TQString &path ) { WARNINGKPILOT << "Restore directory " << dirname << " does not exist." << endl; - fActiontqStatus = Error; + fActionStatus = Error; addSyncLogEntry(i18n("Restore directory does not exist.") + CSL1(" ") + i18n("Restore not performed.")); return false; @@ -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++) { @@ -1041,13 +1041,13 @@ void RestoreAction::setDirectory( const TQString &path ) else { WARNINGKPILOT << "Can't open " << s << endl; - logMessage(i18n("File '%1' cannot be read.").tqarg(s)); + logMessage(i18n("File '%1' cannot be read.").arg(s)); } } fP->fDBIndex = 0; fP->fDBIterator = fP->fDBList.begin(); - fActiontqStatus = InstallingFiles; + fActionStatus = InstallingFiles; TQObject::connect(&(fP->fTimer), TQT_SIGNAL(timeout()), this, TQT_SLOT(installNextFile())); @@ -1060,14 +1060,14 @@ void RestoreAction::setDirectory( const TQString &path ) { FUNCTIONSETUP; - Q_ASSERT(fActiontqStatus == InstallingFiles); + Q_ASSERT(fActionStatus == InstallingFiles); if (fP->fDBIterator == fP->fDBList.end()) { fP->fTimer.stop(); - fActiontqStatus = Done; + fActionStatus = Done; addSyncLogEntry(i18n("OK.")); delayDone(); return; @@ -1083,7 +1083,7 @@ void RestoreAction::setDirectory( const TQString &path ) { WARNINGKPILOT << "Restore apparently canceled." << endl; logMessage(i18n("Restore incomplete.")); - fActiontqStatus = Done; + fActionStatus = Done; emit syncDone(this); return; @@ -1091,14 +1091,14 @@ void RestoreAction::setDirectory( const TQString &path ) TQFileInfo databaseInfo(dbi.path); 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)) ; if ( !deviceLink()->installFiles( dbi.path, false /* don't delete */ ) ) { WARNINGKPILOT << "Couldn't restore " << dbi.path << endl; logError(i18n("Cannot restore file `%1'.") - .tqarg(databaseInfo.fileName())); + .arg(databaseInfo.fileName())); } } diff --git a/kpilot/hotSync.h b/kpilot/hotSync.h index eb10e75..b81dbff 100644 --- a/kpilot/hotSync.h +++ b/kpilot/hotSync.h @@ -65,7 +65,7 @@ public: */ BackupAction(KPilotLink *, bool full); - enum tqStatus { Init, + enum Status { Init, Error, FastBackup, FullBackup, @@ -150,7 +150,7 @@ Q_OBJECT public: RestoreAction(KPilotLink *,TQWidget *w=0L); - typedef enum { InstallingFiles, GettingFileInfo,Done } tqStatus; + typedef enum { InstallingFiles, GettingFileInfo,Done } Status; virtual TQString statusString() const; /** By default, a path based on the user name (either diff --git a/kpilot/internalEditorAction.cc b/kpilot/internalEditorAction.cc index a83d68f..c3f5379 100644 --- a/kpilot/internalEditorAction.cc +++ b/kpilot/internalEditorAction.cc @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include #include @@ -60,7 +60,7 @@ bool InternalEditorAction::exec() { FUNCTIONSETUP; emit logMessage(i18n("[Internal Editors]")); - fInternalEditorSynctqStatus=eSyncStarted; + fInternalEditorSyncStatus=eSyncStarted; TQTimer::singleShot(0, this, TQT_SLOT(syncDirtyDB())); return true; } @@ -69,11 +69,11 @@ void InternalEditorAction::syncDirtyDB() { FUNCTIONSETUP; - if (fInternalEditorSynctqStatus!=eSyncDirtyDB) + if (fInternalEditorSyncStatus!=eSyncDirtyDB) { - fInternalEditorSynctqStatus=eSyncDirtyDB; + fInternalEditorSyncStatus=eSyncDirtyDB; 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(); } else @@ -99,7 +99,7 @@ void InternalEditorAction::syncDirtyDB() if (!localDB->isOpen() || !serialDB->isOpen()) { emit logError(i18n("Unable to open the serial or local database for %1. " - "Skipping it.").tqarg(*dbIter)); + "Skipping it.").arg(*dbIter)); goto nextDB; } 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 " "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, - i18n("Conflict in database %1").tqarg(*dbIter), + i18n("Conflict in database %1").arg(*dbIter), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true, i18n("Use KPilot"), i18n("Use Handheld") ); resdlg->setButtonText(KDialogBase::Ok, i18n("Use &KPilot")); @@ -214,35 +214,35 @@ bool InternalEditorAction::queryUseKPilotChanges(TQString dbName, recordid_t id, TQWidget*page=new TQWidget(resdlg); resdlg->setMainWidget(page); - TQGridLayout*tqlayout = new TQGridLayout( page, 1, 1); + TQGridLayout*layout = new TQGridLayout( page, 1, 1); TQLabel *label=new TQLabel(dialogText, page); - label->tqsetAlignment( TQLabel::WordBreak ); - tqlayout->addMultiCellWidget( label, 0,0, 0,1 ); + label->setAlignment( TQLabel::WordBreak ); + layout->addMultiCellWidget( label, 0,0, 0,1 ); - tqlayout->addItem( new TQSpacerItem( 20, 10, TQSizePolicy::Minimum, + layout->addItem( new TQSpacerItem( 20, 10, TQSizePolicy::Minimum, TQSizePolicy::Fixed ), 1, 0 ); if (knownDB) { label=new TQLabel(i18n("Entry in KPilot"), page); - tqlayout->addWidget( label, 2,0); + layout->addWidget( label, 2,0); KTextEdit*textBrowser = new KTextEdit(CSL1("")+localEntry+CSL1(""), TQString(), page); textBrowser->setReadOnly(true); - tqlayout->addWidget( textBrowser, 3,0); + layout->addWidget( textBrowser, 3,0); label=new TQLabel(i18n("Entry on Handheld"), page); - tqlayout->addWidget( label, 2,1); + layout->addWidget( label, 2,1); textBrowser = new KTextEdit(CSL1("")+serialEntry+CSL1(""), TQString(), page); textBrowser->setReadOnly(true); - tqlayout->addWidget( textBrowser, 3,1); + layout->addWidget( textBrowser, 3,1); } else { label=new TQLabel(i18n("Entry in KPilot"), page); - tqlayout->addMultiCellWidget( label, 2,2,0,1); + layout->addMultiCellWidget( label, 2,2,0,1); // directly display the record's data: TQWidget *hexEdit = KHE::createBytesEditWidget( page, "LocalBufferEdit" ); @@ -262,15 +262,15 @@ bool InternalEditorAction::queryUseKPilotChanges(TQString dbName, recordid_t id, { TQLabel*tmpW = new TQLabel( i18n("To view and edit the record data, please install a hex editor (e.g. khexedit from tdeutils)."), page ); tmpW->setBackgroundMode( TQt::PaletteMid ); - tmpW->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter | TQt::WordBreak); + tmpW->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter | TQt::WordBreak); tmpW->setFrameShape( TQFrame::Panel ); tmpW->setFrameShadow( TQFrame::Sunken ); hexEdit = tmpW; } - tqlayout->addMultiCellWidget( hexEdit, 3,3,0,1); + layout->addMultiCellWidget( hexEdit, 3,3,0,1); label=new TQLabel(i18n("Entry on Handheld"), page); - tqlayout->addMultiCellWidget( label, 4,4,0,1); + layout->addMultiCellWidget( label, 4,4,0,1); // directly display the record's data: hexEdit = KHE::createBytesEditWidget( page, "SerialBufferEdit" ); @@ -290,12 +290,12 @@ bool InternalEditorAction::queryUseKPilotChanges(TQString dbName, recordid_t id, { TQLabel*tmpW = new TQLabel( i18n("To view and edit the record data, please install a hex editor (e.g. khexedit from tdeutils)."), page ); tmpW->setBackgroundMode( TQt::PaletteMid ); - tmpW->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter | TQt::WordBreak); + tmpW->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter | TQt::WordBreak); tmpW->setFrameShape( TQFrame::Panel ); tmpW->setFrameShadow( TQFrame::Sunken ); hexEdit = tmpW; } - tqlayout->addMultiCellWidget( hexEdit, 5,5,0,1); + layout->addMultiCellWidget( hexEdit, 5,5,0,1); } int res=resdlg->exec(); @@ -308,11 +308,11 @@ bool InternalEditorAction::queryUseKPilotChanges(TQString dbName, recordid_t id, void InternalEditorAction::syncFlagsChangedDB() { FUNCTIONSETUP; - if (fInternalEditorSynctqStatus!=eSyncFlagsChangedDB) + if (fInternalEditorSyncStatus!=eSyncFlagsChangedDB) { - fInternalEditorSynctqStatus=eSyncFlagsChangedDB; + fInternalEditorSyncStatus=eSyncFlagsChangedDB; 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(); } else @@ -349,11 +349,11 @@ return; void InternalEditorAction::syncAppBlockChangedDB() { FUNCTIONSETUP; - if (fInternalEditorSynctqStatus!=eSyncAppBlockChangedDB) + if (fInternalEditorSyncStatus!=eSyncAppBlockChangedDB) { - fInternalEditorSynctqStatus=eSyncAppBlockChangedDB; + fInternalEditorSyncStatus=eSyncAppBlockChangedDB; 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(); } else @@ -387,7 +387,7 @@ void InternalEditorAction::syncAppBlockChangedDB() void InternalEditorAction::cleanup() { FUNCTIONSETUP; - fInternalEditorSynctqStatus=eSyncFinished; + fInternalEditorSyncStatus=eSyncFinished; emit syncDone(this); } diff --git a/kpilot/internalEditorAction.h b/kpilot/internalEditorAction.h index db78eb2..b43f408 100644 --- a/kpilot/internalEditorAction.h +++ b/kpilot/internalEditorAction.h @@ -57,13 +57,13 @@ private: PilotRecord*localrec, PilotRecord*serialrec, PilotDatabase*db); TQStringList dirtyDBs; TQStringList::Iterator dbIter; - enum eInternalEditorSynctqStatus { + enum eInternalEditorSyncStatus { eSyncStarted, eSyncDirtyDB, eSyncFlagsChangedDB, eSyncAppBlockChangedDB, eSyncFinished - } fInternalEditorSynctqStatus; + } fInternalEditorSyncStatus; } ; #endif diff --git a/kpilot/kpilot.cc b/kpilot/kpilot.cc index f0618ea..3f9d603 100644 --- a/kpilot/kpilot.cc +++ b/kpilot/kpilot.cc @@ -104,7 +104,7 @@ KPilotInstaller::KPilotInstaller() : fQuitAfterCopyComplete(false), fManagingWidget(0L), fDaemonWasRunning(true), - fApptqStatus(Startup), + fAppStatus(Startup), fFileInstallWidget(0L), fLogWidget(0L) { @@ -143,7 +143,7 @@ void KPilotInstaller::startDaemonIfNeeded() { FUNCTIONSETUP; - fApptqStatus=WaitingForDaemon; + fAppStatus=WaitingForDaemon; TQString daemonError; TQCString daemonDCOP; @@ -178,9 +178,9 @@ void KPilotInstaller::startDaemonIfNeeded() { fLogWidget->addMessage(i18n("Could not start the " "KPilot daemon. The system error message " - "was: "%1"").tqarg(daemonError)); + "was: "%1"").arg(daemonError)); } - fApptqStatus=Error; + fAppStatus=Error; } else { @@ -194,9 +194,9 @@ void KPilotInstaller::startDaemonIfNeeded() fLogWidget->addMessage( i18n("Daemon status is `%1'") - .tqarg(s.isEmpty() ? i18n("not running") : s )); + .arg(s.isEmpty() ? i18n("not running") : s )); } - fApptqStatus=Normal; + fAppStatus=Normal; } } @@ -213,7 +213,7 @@ void KPilotInstaller::readConfig() { fLogWidget->addMessage(i18n("Using character set %1 on " "the handheld.") - .tqarg(Pilot::codecName())); + .arg(Pilot::codecName())); } } @@ -228,7 +228,7 @@ void KPilotInstaller::setupWidget() fManagingWidget = new KJanusWidget(this,"mainWidget", KJanusWidget::IconList); - fManagingWidget->setMinimumSize(fManagingWidget->tqsizeHint()); + fManagingWidget->setMinimumSize(fManagingWidget->sizeHint()); fManagingWidget->show(); setCentralWidget(fManagingWidget); connect( fManagingWidget, TQT_SIGNAL( aboutToShowPage ( TQWidget* ) ), @@ -238,7 +238,7 @@ void KPilotInstaller::setupWidget() initMenu(); initComponents(); - setMinimumSize(tqsizeHint() + TQSize(10,60)); + setMinimumSize(sizeHint() + TQSize(10,60)); createGUI(CSL1("kpilotui.rc"), false); setAutoSaveSettings(); @@ -401,7 +401,7 @@ void KPilotInstaller::slotPCtoHHRequested() i18n("Please press the HotSync button.")); } -/* virtual DCOP */ ASYNC KPilotInstaller::daemontqStatus(int i) +/* virtual DCOP */ ASYNC KPilotInstaller::daemonStatus(int i) { FUNCTIONSETUP; DEBUGKPILOT << fname << ": Received daemon message " << i << endl; @@ -409,17 +409,17 @@ void KPilotInstaller::slotPCtoHHRequested() switch(i) { case KPilotDCOP::StartOfHotSync : - if (fApptqStatus==Normal) + if (fAppStatus==Normal) { - fApptqStatus=WaitingForDaemon; + fAppStatus=WaitingForDaemon; componentPreSync(); } break; case KPilotDCOP::EndOfHotSync : - if (fApptqStatus==WaitingForDaemon) + if (fAppStatus==WaitingForDaemon) { componentPostSync(); - fApptqStatus=Normal; + fAppStatus=Normal; } break; case KPilotDCOP::DaemonQuit : @@ -429,7 +429,7 @@ void KPilotInstaller::slotPCtoHHRequested() fLogWidget->logMessage(i18n("No further HotSyncs are possible.")); fLogWidget->logMessage(i18n("Restart the daemon to HotSync again.")); } - fApptqStatus=WaitingForDaemon; + fAppStatus=WaitingForDaemon; break; case KPilotDCOP::None : WARNINGKPILOT << "Unhandled status message " << i << endl; @@ -437,7 +437,7 @@ void KPilotInstaller::slotPCtoHHRequested() } } -/* virtual DCOP*/ int KPilotInstaller::kpilotqStatus() +/* virtual DCOP*/ int KPilotInstaller::kpiloStatus() { return status(); } @@ -459,7 +459,7 @@ bool KPilotInstaller::componentPreSync() if (!reason.isNull()) { KMessageBox::sorry(this, - rprefix.tqarg(reason), + rprefix.arg(reason), i18n("Cannot start Sync")); return false; } @@ -896,7 +896,7 @@ void KPilotInstaller::componentUpdate() if (fLogWidget) { fLogWidget->logMessage(i18n("Changed username to `%1'.") - .tqarg(KPilotSettings::userName())); + .arg(KPilotSettings::userName())); fManagingWidget->showPage(0); slotAboutToShowComponent(fLogWidget); } @@ -920,7 +920,7 @@ void KPilotInstaller::componentUpdate() { FUNCTIONSETUP; - if ( fApptqStatus!=Normal || fConfigureKPilotDialogInUse ) + if ( fAppStatus!=Normal || fConfigureKPilotDialogInUse ) { if (fLogWidget) { @@ -928,7 +928,7 @@ void KPilotInstaller::componentUpdate() } return; } - fApptqStatus=UIBusy; + fAppStatus=UIBusy; fConfigureKPilotDialogInUse = true; if (runWizard(getDaemon(),this) == OK) @@ -937,14 +937,14 @@ void KPilotInstaller::componentUpdate() } fConfigureKPilotDialogInUse = false; - fApptqStatus=Normal; + fAppStatus=Normal; } /* virtual DCOP */ ASYNC KPilotInstaller::configure() { FUNCTIONSETUP; - if ( fApptqStatus!=Normal || fConfigureKPilotDialogInUse ) + if ( fAppStatus!=Normal || fConfigureKPilotDialogInUse ) { if (fLogWidget) { @@ -952,7 +952,7 @@ void KPilotInstaller::componentUpdate() } return; } - fApptqStatus=UIBusy; + fAppStatus=UIBusy; fConfigureKPilotDialogInUse = true; if (runConfigure(getDaemon(),this)) { @@ -960,7 +960,7 @@ void KPilotInstaller::componentUpdate() } fConfigureKPilotDialogInUse = false; - fApptqStatus=Normal; + fAppStatus=Normal; } diff --git a/kpilot/kpilot.h b/kpilot/kpilot.h index 0510322..e86f6e2 100644 --- a/kpilot/kpilot.h +++ b/kpilot/kpilot.h @@ -70,7 +70,7 @@ public: void addComponentPage(PilotComponent *, const TQString &name); - KPilotqStatus status() const { return fApptqStatus; } ; + KPiloStatus status() const { return fAppStatus; } ; protected: @@ -122,8 +122,8 @@ public: /** * This is the DCOP interface from the daemon to KPilot. */ - virtual ASYNC daemontqStatus(int); - virtual int kpilotqStatus(); + virtual ASYNC daemonStatus(int); + virtual int kpiloStatus(); public slots: /** @@ -175,7 +175,7 @@ private: KJanusWidget *fManagingWidget; bool fDaemonWasRunning; - KPilotqStatus fApptqStatus; + KPiloStatus fAppStatus; FileInstallWidget *fFileInstallWidget; LogWidget *fLogWidget; diff --git a/kpilot/kpilotConfig.cc b/kpilot/kpilotConfig.cc index 4c96258..ec7bd80 100644 --- a/kpilot/kpilotConfig.cc +++ b/kpilot/kpilotConfig.cc @@ -163,7 +163,7 @@ void KPilotConfig::addFlagsChangedDatabase(TQString db) s += i18n("The configuration file is outdated."); s += ' '; 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) { s += ' '; @@ -234,7 +234,7 @@ static void update440() const char **s = oldconduits; while (*s) { - TQString libname = CSL1("trinity/lib%1conduit.so").tqarg(TQString::tqfromLatin1(*s)); + TQString libname = CSL1("trinity/lib%1conduit.so").arg(TQString::fromLatin1(*s)); TQString foundlib = ::locate("lib",libname); if (!foundlib.isEmpty()) { @@ -270,7 +270,7 @@ static void update443() { if ((*i).length()==4) { - fixSkip.append(CSL1("[%1]").tqarg(*i)); + fixSkip.append(CSL1("[%1]").arg(*i)); fixedSome = true; } else diff --git a/kpilot/kpilotConfigDialog.cc b/kpilot/kpilotConfigDialog.cc index 1bd3b40..34cf824 100644 --- a/kpilot/kpilotConfigDialog.cc +++ b/kpilot/kpilotConfigDialog.cc @@ -66,7 +66,7 @@ /* virtual */ TQString ConfigPage::maybeSaveText() const { return i18n("The settings for configuration page %1 have been changed. Do you " - "want to save the changes before continuing?").tqarg(this->conduitName()); + "want to save the changes before continuing?").arg(this->conduitName()); } DeviceConfigPage::DeviceConfigPage(TQWidget * w, const char *n ) : ConfigPage( w, n ) @@ -146,7 +146,7 @@ void DeviceConfigPage::load() "is longer than 13 characters. This is " "probably unsupported and can cause problems. " "Are you sure you want to use this device name?") - .tqarg(d), + .arg(d), i18n("Device Name too Long"), i18n("Use"), i18n("Do Not Use") ) ; } diff --git a/kpilot/kpilotConfigDialog_backup.ui b/kpilot/kpilotConfigDialog_backup.ui index 1a59aef..73f6262 100644 --- a/kpilot/kpilotConfigDialog_backup.ui +++ b/kpilot/kpilotConfigDialog_backup.ui @@ -44,7 +44,7 @@ 0 - + 100 0 @@ -97,7 +97,7 @@ TextLabel5 - + 100 0 @@ -117,7 +117,7 @@ TextLabel6 - + 100 0 @@ -194,7 +194,7 @@ Expanding - + 20 41 diff --git a/kpilot/kpilotConfigDialog_device.ui b/kpilot/kpilotConfigDialog_device.ui index 29a4fe8..da3244f 100644 --- a/kpilot/kpilotConfigDialog_device.ui +++ b/kpilot/kpilotConfigDialog_device.ui @@ -75,7 +75,7 @@ Expanding - + 20 90 diff --git a/kpilot/kpilotConfigDialog_startup.ui b/kpilot/kpilotConfigDialog_startup.ui index 984689d..e505303 100644 --- a/kpilot/kpilotConfigDialog_startup.ui +++ b/kpilot/kpilotConfigDialog_startup.ui @@ -105,7 +105,7 @@ KPilot's settings. Expanding - + 20 31 diff --git a/kpilot/kpilotConfigDialog_sync.ui b/kpilot/kpilotConfigDialog_sync.ui index 0afc66d..24193a4 100644 --- a/kpilot/kpilotConfigDialog_sync.ui +++ b/kpilot/kpilotConfigDialog_sync.ui @@ -87,7 +87,7 @@ Expanding - + 20 170 diff --git a/kpilot/kpilotConfigDialog_viewers.ui b/kpilot/kpilotConfigDialog_viewers.ui index 8f70950..fd73774 100644 --- a/kpilot/kpilotConfigDialog_viewers.ui +++ b/kpilot/kpilotConfigDialog_viewers.ui @@ -136,7 +136,7 @@ KPilot's settings. Expanding - + 20 41 diff --git a/kpilot/kpilotConfigWizard.cc b/kpilot/kpilotConfigWizard.cc index 0b5b881..9df81b4 100644 --- a/kpilot/kpilotConfigWizard.cc +++ b/kpilot/kpilotConfigWizard.cc @@ -197,7 +197,7 @@ void ConfigWizard::accept() KPilotSettings::setInstalledConduits( conduits ); #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) { finishMessage.append(CSL1("\n")); diff --git a/kpilot/kpilotConfigWizard_app.ui b/kpilot/kpilotConfigWizard_app.ui index d774df1..efc72ac 100644 --- a/kpilot/kpilotConfigWizard_app.ui +++ b/kpilot/kpilotConfigWizard_app.ui @@ -25,7 +25,7 @@ Press "Finish" to setup KPilot according to the settings in this configuration Wizard. - + WordBreak|AlignVCenter @@ -79,7 +79,7 @@ Press "Finish" to setup KPilot according to the settings in this configuration W Expanding - + 20 120 @@ -96,7 +96,7 @@ Press "Finish" to setup KPilot according to the settings in this configuration W Minimum - + 20 12 diff --git a/kpilot/kpilotConfigWizard_user.ui b/kpilot/kpilotConfigWizard_user.ui index 0bb6744..057eb0d 100644 --- a/kpilot/kpilotConfigWizard_user.ui +++ b/kpilot/kpilotConfigWizard_user.ui @@ -23,7 +23,7 @@ This wizard will help you configure KPilot. - + WordBreak|AlignVCenter @@ -34,7 +34,7 @@ As a first step, we need to determine the user name and how the handheld is connected to the computer. - + WordBreak|AlignVCenter @@ -149,7 +149,7 @@ Network: This has not been tested by any of the KPilot developers themselves (ha Expanding - + 20 70 diff --git a/kpilot/kpilotDCOP.h b/kpilot/kpilotDCOP.h index 045d9f9..fe4bc8b 100644 --- a/kpilot/kpilotDCOP.h +++ b/kpilot/kpilotDCOP.h @@ -43,7 +43,7 @@ public: StartOfHotSync=1, EndOfHotSync=2, DaemonQuit=4 } ; - enum KPilotqStatus { + enum KPiloStatus { Startup=1, WaitingForDaemon=2, Normal=10, @@ -55,7 +55,7 @@ k_dcop: * This is the method the daemon uses to report * changes in its state. */ - virtual ASYNC daemontqStatus(int) = 0; + virtual ASYNC daemonStatus(int) = 0; /** * This is the method the daemon uses to popup @@ -67,7 +67,7 @@ k_dcop: /** * Report KPilot's state back to the daemon. */ - virtual int kpilotqStatus() = 0; + virtual int kpiloStatus() = 0; } ; diff --git a/kpilot/kpilotProbeDialog.cc b/kpilot/kpilotProbeDialog.cc index bdec59e..3ca43b2 100644 --- a/kpilot/kpilotProbeDialog.cc +++ b/kpilot/kpilotProbeDialog.cc @@ -28,7 +28,7 @@ #include "options.h" -#include +#include #include #include #include @@ -95,15 +95,15 @@ ProbeDialog::ProbeDialog(TQWidget *parent, const char *n) : TQVBox *mainWidget = makeVBoxMainWidget(); fInfoText = new TQLabel( i18n( "KPilot is now trying to automatically detect the device of your handheld. Please press the hotsync button if you have not done so already." ), mainWidget, "fInfoText" ); - fInfoText->tqsetAlignment( TQLabel::WordBreak ); + fInfoText->setAlignment( TQLabel::WordBreak ); fStatusGroup = new TQGroupBox( i18n("Status"), mainWidget, "fStatusGroup" ); fStatusGroup->setColumnLayout(0, Qt::Vertical ); - fStatusGroupLayout = new TQGridLayout( fStatusGroup->tqlayout() ); + fStatusGroupLayout = new TQGridLayout( fStatusGroup->layout() ); - ftqStatus = new TQLabel( i18n("Autodetection not yet started..."), fStatusGroup, "fStatus" ); - ftqStatus->tqsetAlignment( TQLabel::WordBreak ); - fStatusGroupLayout->addWidget( ftqStatus, 0, 0 ); + fStatus = new TQLabel( i18n("Autodetection not yet started..."), fStatusGroup, "fStatus" ); + fStatus->setAlignment( TQLabel::WordBreak ); + fStatusGroupLayout->addWidget( fStatus, 0, 0 ); fProgress = new KProgress( 100, fStatusGroup, "fProgress" ); fStatusGroupLayout->addWidget( fProgress, 1, 0 ); @@ -113,11 +113,11 @@ ProbeDialog::ProbeDialog(TQWidget *parent, const char *n) : fResultsGroup = new TQGroupBox( i18n( "Detected Values" ), mainWidget, "fResultsGroup" ); fResultsGroup->setEnabled( FALSE ); fResultsGroup->setColumnLayout(0, Qt::Vertical ); - fResultsGroupLayout = new TQGridLayout( fResultsGroup->tqlayout() ); - fResultsGroupLayout->tqsetAlignment( TQt::AlignTop ); + fResultsGroupLayout = new TQGridLayout( fResultsGroup->layout() ); + fResultsGroupLayout->setAlignment( TQt::AlignTop ); fUserLabel = new TQLabel( i18n( "Handheld user:" ), fResultsGroup, "fUserLabel" ); - fUserLabel->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)4, (TQSizePolicy::SizeType)5, 0, 0, fUserLabel->sizePolicy().hasHeightForWidth() ) ); + fUserLabel->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)4, (TQSizePolicy::SizeType)5, 0, 0, fUserLabel->sizePolicy().hasHeightForWidth() ) ); fResultsGroupLayout->addWidget( fUserLabel, 0, 0 ); fDeviceLabel = new TQLabel( i18n( "Device:" ), fResultsGroup, "fDeviceLabel" ); @@ -130,7 +130,7 @@ ProbeDialog::ProbeDialog(TQWidget *parent, const char *n) : fResultsGroupLayout->addWidget( fDevice, 1, 1 ); - resize( TQSize(459, 298).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(459, 298).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); enableButtonOK(false); @@ -192,7 +192,7 @@ void ProbeDialog::startDetection() disconnectDevices(); fProgress->setProgress(0); - ftqStatus->setText( i18n("Starting detection...") ); + fStatus->setText( i18n("Starting detection...") ); TQTimer::singleShot(0, this, TQT_SLOT(processEvents()) ); processEvents(); PilotDaemonDCOP_stub *daemonStub = new PilotDaemonDCOP_stub("kpilotDaemon", "KPilotDaemonIface"); @@ -230,7 +230,7 @@ void ProbeDialog::startDetection() processEvents(); } } - ftqStatus->setText( i18n("Waiting for handheld to connect...") ); + fStatus->setText( i18n("Waiting for handheld to connect...") ); mProbeDevicesIndex=0; detect(); @@ -263,7 +263,7 @@ void ProbeDialog::timeout() { disconnectDevices(); if (!mDetected) { - ftqStatus->setText( i18n("Timeout reached, could not detect a handheld.") ); + fStatus->setText( i18n("Timeout reached, could not detect a handheld.") ); KMessageBox::information ( this, i18n("A handheld could not be detected. Possible check the following things:

" "
  • Have you pressed the hotsync button on the handheld?\n" "
  • Make sure the device sits in the cradle correctly.\n" @@ -285,7 +285,7 @@ void ProbeDialog::connection( KPilotDeviceLink*lnk) mUserName = usr.name(); mDevice = mActiveLink->pilotPath(); - ftqStatus->setText( i18n("Found a connected device on %1").tqarg(mDevice) ); + fStatus->setText( i18n("Found a connected device on %1").arg(mDevice) ); fUser->setText( mUserName ); fDevice->setText( mDevice ); mDetected = true; @@ -335,7 +335,7 @@ void ProbeDialog::disconnectDevices() { FUNCTIONSETUP; - if (!mDetected) ftqStatus->setText( i18n("Disconnected from all devices") ); + if (!mDetected) fStatus->setText( i18n("Disconnected from all devices") ); fProcessEventsTimer->stop( ); fTimeoutTimer->stop(); fProgressTimer->stop(); diff --git a/kpilot/kpilotProbeDialog.h b/kpilot/kpilotProbeDialog.h index 997138a..c32e557 100644 --- a/kpilot/kpilotProbeDialog.h +++ b/kpilot/kpilotProbeDialog.h @@ -78,7 +78,7 @@ protected: TQLabel* fUser; TQLabel* fDevice; TQGroupBox* fStatusGroup; - TQLabel* ftqStatus; + TQLabel* fStatus; KProgress* fProgress; TQTimer* fProcessEventsTimer; diff --git a/kpilot/listCat.cc b/kpilot/listCat.cc index a5bf4f2..64088c5 100644 --- a/kpilot/listCat.cc +++ b/kpilot/listCat.cc @@ -247,13 +247,13 @@ void RichListViewItem::computeHeight(int c) const TQColorGroup &gc, int column, int width, - int tqalignment) + int alignment) { FUNCTIONSETUP; if ((!column) || (!fIsRich[column])) { - TQListViewItem::paintCell(p,gc,column,width,tqalignment); + TQListViewItem::paintCell(p,gc,column,width,alignment); return; } diff --git a/kpilot/listCat.h b/kpilot/listCat.h index b90a5e6..c0dae94 100644 --- a/kpilot/listCat.h +++ b/kpilot/listCat.h @@ -210,7 +210,7 @@ public: const TQColorGroup &, int column, int width, - int tqalignment); + int alignment); virtual void setup(); diff --git a/kpilot/logFile.cc b/kpilot/logFile.cc index b6fab0c..ad2f0f0 100644 --- a/kpilot/logFile.cc +++ b/kpilot/logFile.cc @@ -31,7 +31,7 @@ #include "options.h" #include -#include +#include #include #include @@ -70,21 +70,21 @@ LogFile::LogFile() : DCOPObject("LogIface"), TQObject(), fOutfile(0L), fSyncing( fSyncing = true; fLogStream.setDevice(TQT_TQIODEVICE(fOutfile)); - fLogStream<<(CSL1("KPilot HotSync log, %1").tqarg(TQDateTime::tqcurrentDateTime().toString()))< -#include -#include +#include +#include #include #include #include @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include @@ -95,24 +95,24 @@ LogWidget::LogWidget(TQWidget * parent) : TQString initialText ; initialText.append(CSL1("Version: KPilot %1" TE_EOL) - .tqarg(TQString::tqfromLatin1(KPILOT_VERSION))); + .arg(TQString::fromLatin1(KPILOT_VERSION))); initialText.append(CSL1("Version: pilot-link %1.%2.%3%4" TE_EOL) - .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::tqfromLatin1(PILOT_LINK_PATCH)) + .arg(TQString::fromLatin1(PILOT_LINK_PATCH)) #else - .tqarg(TQString()) + .arg(TQString()) #endif ); #ifdef TDE_VERSION_STRING initialText.append(CSL1("Version: KDE %1" TE_EOL) - .tqarg(TQString::tqfromLatin1(TDE_VERSION_STRING))); + .arg(TQString::fromLatin1(TDE_VERSION_STRING))); #endif #ifdef TQT_VERSION_STR initialText.append(CSL1("Version: TQt %1" TE_EOL) - .tqarg(TQString::tqfromLatin1(TQT_VERSION_STR))); + .arg(TQString::fromLatin1(TQT_VERSION_STR))); #endif initialText.append(CSL1(TE_EOL)); @@ -172,7 +172,7 @@ LogWidget::LogWidget(TQWidget * parent) : // This latin1() is ok; KPILOT_VERSION is a #define // of a constant string. int textWidth =fontMetrics().width( - TQString::tqfromLatin1(KPILOT_VERSION)) ; + TQString::fromLatin1(KPILOT_VERSION)) ; int textHeight = fontMetrics().height(); #ifdef DEBUG @@ -189,10 +189,10 @@ LogWidget::LogWidget(TQWidget * parent) : black); painter.drawText(splash.width() - 25 - textWidth, splash.height() - 8, - TQString::tqfromLatin1(KPILOT_VERSION)); + TQString::fromLatin1(KPILOT_VERSION)); fSplash = new TQLabel(this); fSplash->setPixmap(splash); - fSplash->tqsetAlignment(AlignCenter); + fSplash->setAlignment(AlignCenter); TQTimer::singleShot(3000,this,TQT_SLOT(hideSplash())); grid->addMultiCellWidget(fSplash,1,3,1,2); grid->addColSpacing(0,10); diff --git a/kpilot/memoWidget.cc b/kpilot/memoWidget.cc index 53b220e..7d6ca7f 100644 --- a/kpilot/memoWidget.cc +++ b/kpilot/memoWidget.cc @@ -40,9 +40,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include #include @@ -84,7 +84,7 @@ MemoWidget::MemoWidget(TQWidget * parent, FUNCTIONSETUP; setGeometry(0, 0, - parent->tqgeometry().width(), parent->tqgeometry().height()); + parent->geometry().width(), parent->geometry().height()); setupWidget(); d->fMemoList.setAutoDelete(true); slotUpdateButtons(); @@ -591,7 +591,7 @@ void MemoWidget::slotAddMemo() FUNCTIONSETUP; int currentCatID = findSelectedCategory(fCatList, d->fMemoAppInfo->categoryInfo(), true); - addMemo(TQDateTime::tqcurrentDateTime().toString(), currentCatID); + addMemo(TQDateTime::currentDateTime().toString(), currentCatID); } void MemoWidget::slotImportMemo() diff --git a/kpilot/pilotComponent.cc b/kpilot/pilotComponent.cc index 5908479..0172a44 100644 --- a/kpilot/pilotComponent.cc +++ b/kpilot/pilotComponent.cc @@ -57,8 +57,8 @@ PilotComponent::PilotComponent(TQWidget * parent, if (parent) { - resize(parent->tqgeometry().width(), - parent->tqgeometry().height()); + resize(parent->geometry().width(), + parent->geometry().height()); } } diff --git a/kpilot/pilotDaemon.cc b/kpilot/pilotDaemon.cc index bbd8233..f3158bd 100644 --- a/kpilot/pilotDaemon.cc +++ b/kpilot/pilotDaemon.cc @@ -166,7 +166,7 @@ void PilotDaemonTray::setupWidget() SyncAction::SyncMode::name(SyncAction::SyncMode::a) + once, \ (int)(SyncAction::SyncMode::a)); fSyncTypeMenu->insertItem(i18n("Default (%1)") - .tqarg(SyncAction::SyncMode::name((SyncAction::SyncMode::Mode)KPilotSettings::syncType())), + .arg(SyncAction::SyncMode::name((SyncAction::SyncMode::Mode)KPilotSettings::syncType())), 0); fSyncTypeMenu->insertSeparator(); @@ -279,7 +279,7 @@ void PilotDaemonTray::endHotSync() PilotDaemon::PilotDaemon() : DCOPObject("KPilotDaemonIface"), - fDaemontqStatus(INIT), + fDaemonStatus(INIT), fPostSyncAction(None), fPilotLink(0L), fNextSyncType(SyncAction::SyncMode::eHotSync,true), @@ -297,7 +297,7 @@ PilotDaemon::PilotDaemon() : setupPilotLink(); reloadSettings(); - if (fDaemontqStatus == ERROR) + if (fDaemonStatus == ERROR) { WARNINGKPILOT << "Connecting to device failed." << endl; return; @@ -403,7 +403,7 @@ void PilotDaemon::showTray() DEBUGKPILOT << fname << ": Tray icon displayed." << endl; #endif - updateTraytqStatus(); + updateTrayStatus(); } /* DCOP ASYNC */ void PilotDaemon::setTempDevice(TQString d) @@ -420,7 +420,7 @@ void PilotDaemon::showTray() { FUNCTIONSETUP; - switch (fDaemontqStatus) + switch (fDaemonStatus) { case INIT: case HOTSYNC_END: @@ -508,7 +508,7 @@ void PilotDaemon::showTray() } } - updateTraytqStatus(); + updateTrayStatus(); logProgress(TQString(),0); } @@ -516,7 +516,7 @@ void PilotDaemon::showTray() { fIsListening=false; fTray->changeIcon(PilotDaemonTray::NotListening); - fDaemontqStatus=NOT_LISTENING; + fDaemonStatus=NOT_LISTENING; fPilotLink->close(); } @@ -524,7 +524,7 @@ void PilotDaemon::showTray() { fIsListening=true; fTray->changeIcon(PilotDaemonTray::Normal); - fDaemontqStatus=INIT; + fDaemonStatus=INIT; fPilotLink->reset(); } @@ -616,13 +616,13 @@ bool PilotDaemon::setupPilotLink() // Using switch to make sure we cover all the cases. // // - switch (fDaemontqStatus) + switch (fDaemonStatus) { case INIT: case HOTSYNC_END: case ERROR: case NOT_LISTENING: - getKPilot().daemontqStatus(KPilotDCOP::DaemonQuit); + getKPilot().daemonStatus(KPilotDCOP::DaemonQuit); kapp->quit(); break; case READY: @@ -655,7 +655,7 @@ bool PilotDaemon::setupPilotLink() return; } - updateTraytqStatus(); + updateTrayStatus(); if (fTray && (fTray->fSyncTypeMenu)) { @@ -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.")); } @@ -799,8 +799,8 @@ bool PilotDaemon::killDaemonOnExit() return KPilotSettings::killDaemonAtExit(); } -typedef enum { NotLocked=0, Locked=1, DCOPError=2 } KDesktopLocktqStatus; -static KDesktopLocktqStatus isKDesktopLockRunning() +typedef enum { NotLocked=0, Locked=1, DCOPError=2 } KDesktopLockStatus; +static KDesktopLockStatus isKDesktopLockRunning() { if (!KPilotSettings::screenlockSecure()) return NotLocked; @@ -847,7 +847,7 @@ static void informOthers(KPilotDCOP_stub &kpilot, LoggerDCOP_stub &log, LoggerDCOP_stub &filelog) { - kpilot.daemontqStatus(KPilotDCOP::StartOfHotSync); + kpilot.daemonStatus(KPilotDCOP::StartOfHotSync); log.logStartSync(); filelog.logStartSync(); } @@ -864,7 +864,7 @@ static bool isSyncPossible(ActionQueue *fSyncStack, * just tell the user that the sync couldn't run because * of that. */ - int kpilotstatus = kpilot.kpilotqStatus(); + int kpilotstatus = kpilot.kpiloStatus(); DCOPStub::Status callstatus = kpilot.status(); #ifdef DEBUG @@ -1003,7 +1003,7 @@ bool PilotDaemon::shouldBackup() (void) PilotDatabase::instanceCount(); #endif - fDaemontqStatus = HOTSYNC_START ; + fDaemonStatus = HOTSYNC_START ; if (fTray) { fTray->startHotSync(); @@ -1120,7 +1120,7 @@ launch: TQTimer::singleShot(0,fSyncStack,TQT_SLOT(execConduit())); - updateTraytqStatus(); + updateTrayStatus(); } /* slot */ void PilotDaemon::logMessage(const TQString & s) @@ -1129,7 +1129,7 @@ launch: getLogger().logMessage(s); getFileLogger().logMessage(s); - updateTraytqStatus(s); + updateTrayStatus(s); } /* slot */ void PilotDaemon::logError(const TQString & s) @@ -1138,7 +1138,7 @@ launch: getLogger().logError(s); getFileLogger().logError(s); - updateTraytqStatus(s); + updateTrayStatus(s); } /* slot */ void PilotDaemon::logProgress(const TQString & s, int i) @@ -1147,7 +1147,7 @@ launch: getLogger().logProgress(s, i); getFileLogger().logProgress(s, i); - if (!s.isEmpty()) updateTraytqStatus(s); + if (!s.isEmpty()) updateTrayStatus(s); } /* slot */ void PilotDaemon::endHotSync() @@ -1166,15 +1166,15 @@ launch: getFileLogger().logProgress(i18n("HotSync Completed.
    "), 100); getLogger().logEndSync(); getFileLogger().logEndSync(); - getKPilot().daemontqStatus(KPilotDCOP::EndOfHotSync); - KPilotSettings::setLastSyncTime(TQDateTime::tqcurrentDateTime()); + getKPilot().daemonStatus(KPilotDCOP::EndOfHotSync); + KPilotSettings::setLastSyncTime(TQDateTime::currentDateTime()); KPilotSettings::self()->writeConfig(); - fDaemontqStatus = HOTSYNC_END; + fDaemonStatus = HOTSYNC_END; if (fPostSyncAction & Quit) { - getKPilot().daemontqStatus(KPilotDCOP::DaemonQuit); + getKPilot().daemonStatus(KPilotDCOP::DaemonQuit); kapp->quit(); } if (fPostSyncAction & ReloadSettings) @@ -1191,7 +1191,7 @@ launch: (void) PilotDatabase::instanceCount(); - updateTraytqStatus(); + updateTrayStatus(); } @@ -1264,7 +1264,7 @@ void PilotDaemon::slotRunConfig() } } -void PilotDaemon::updateTraytqStatus(const TQString &s) +void PilotDaemon::updateTrayStatus(const TQString &s) { if (!fTray) return; @@ -1272,7 +1272,7 @@ void PilotDaemon::updateTraytqStatus(const TQString &s) tipText.append( s ); tipText.append( CSL1(" ") ); tipText.append( i18n("Next sync is %1.") - .tqarg( fNextSyncType.name() ) ); + .arg( fNextSyncType.name() ) ); tipText.append( CSL1("") ); TQToolTip::remove(fTray); diff --git a/kpilot/pilotDaemon.h b/kpilot/pilotDaemon.h index bfae7bc..9e03360 100644 --- a/kpilot/pilotDaemon.h +++ b/kpilot/pilotDaemon.h @@ -138,7 +138,7 @@ public: PilotDaemon(); ~PilotDaemon(); - enum DaemontqStatus + enum DaemonStatus { HOTSYNC_START, // Hotsync is running HOTSYNC_END, // Hotsync is cleaning up @@ -149,7 +149,7 @@ public: NOT_LISTENING }; - DaemontqStatus status() const { return fDaemontqStatus; } ; + DaemonStatus status() const { return fDaemonStatus; } ; /* DCOP */ virtual TQString statusString(); /* DCOP */ virtual TQString shorStatusString(); @@ -198,7 +198,7 @@ public: virtual bool killDaemonOnExit(); protected: - DaemontqStatus fDaemontqStatus; + DaemonStatus fDaemonStatus; enum postSyncActions { None=0, @@ -244,7 +244,7 @@ private: /** * Set or change the tooltip displayed by the tray icon. */ - void updateTraytqStatus(const TQString &s=TQString()); + void updateTrayStatus(const TQString &s=TQString()); FileInstaller *fInstaller; diff --git a/kpilot/todoEditor.cc b/kpilot/todoEditor.cc index d7017bb..16bd49a 100644 --- a/kpilot/todoEditor.cc +++ b/kpilot/todoEditor.cc @@ -32,9 +32,9 @@ #include "options.h" #include -#include +#include #include -#include +#include #include #include diff --git a/kpilot/todoEditor_base.ui b/kpilot/todoEditor_base.ui index fbe6a1c..f9e3e54 100644 --- a/kpilot/todoEditor_base.ui +++ b/kpilot/todoEditor_base.ui @@ -31,7 +31,7 @@ &Description: - + AlignTop @@ -53,7 +53,7 @@ &Note: - + AlignTop @@ -127,7 +127,7 @@ fDescription - + 32767 80 diff --git a/kpilot/todoWidget.cc b/kpilot/todoWidget.cc index 4632e69..9e8c40e 100644 --- a/kpilot/todoWidget.cc +++ b/kpilot/todoWidget.cc @@ -32,12 +32,12 @@ #include #include #include -#include +#include #include -#include +#include #include #include -#include +#include #include @@ -172,7 +172,7 @@ void TodoWidget::showComponent() #if TDE_VERSION<220 s = i18n("There are still %1 to-do editing windows open.") - .tqarg(TQString::number(fPendingTodos)); + .arg(TQString::number(fPendingTodos)); #else s = i18n("There is still a to-do editing window open.", "There are still %n to-do editing windows open.", @@ -407,7 +407,7 @@ void TodoWidget::slotCreateNewRecord() KMessageBox::sorry(this, i18n("You cannot add to-dos to the to-do list " "until you have done a HotSync at least once " - "to retrieve the database tqlayout from your Pilot."), + "to retrieve the database layout from your Pilot."), i18n("Cannot Add New To-do")); if (myDB) diff --git a/lib/actions.cc b/lib/actions.cc index 03138a6..212540f 100644 --- a/lib/actions.cc +++ b/lib/actions.cc @@ -52,8 +52,8 @@ WelcomeAction::WelcomeAction(KPilotLink *p) : FUNCTIONSETUP; addSyncLogEntry(i18n("KPilot %1 HotSync starting...\n") - .tqarg(TQString::tqfromLatin1(KPILOT_VERSION))); - emit logMessage( i18n("Using encoding %1 on the handheld.").tqarg(Pilot::codecName()) ); + .arg(TQString::fromLatin1(KPILOT_VERSION))); + emit logMessage( i18n("Using encoding %1 on the handheld.").arg(Pilot::codecName()) ); emit syncDone(this); return true; } @@ -128,7 +128,7 @@ TestLink::TestLink(KPilotLink * p) : // Let the KDE User know what's happening // Pretty sure all database names are in latin1. emit logMessage(i18n("Syncing database %1...") - .tqarg(Pilot::fromPilot(db.name))); + .arg(Pilot::fromPilot(db.name))); } emit logMessage(i18n("HotSync finished.")); diff --git a/lib/kpilotdevicelink.cc b/lib/kpilotdevicelink.cc index 0cea610..84e26da 100644 --- a/lib/kpilotdevicelink.cc +++ b/lib/kpilotdevicelink.cc @@ -146,7 +146,7 @@ void DeviceCommThread::reset() { TQApplication::postEvent(link(), new DeviceCommEvent(EventLogMessage, i18n("Could not open device: %1 (will retry)") - .tqarg(link()->pilotPath() ))); + .arg(link()->pilotPath() ))); } link()->fMessages->reset(); @@ -155,7 +155,7 @@ void DeviceCommThread::reset() // Timer already deleted by close() call. startOpenTimer(this,fOpenTimer); - link()->fLinktqStatus = WaitingForDevice; + link()->fLinkStatus = WaitingForDevice; } /** @@ -176,16 +176,16 @@ void DeviceCommThread::openDevice() // This transition (from Waiting to Found) can only be // taken once. // - if (link()->fLinktqStatus == WaitingForDevice) + if (link()->fLinkStatus == WaitingForDevice) { - link()->fLinktqStatus = FoundDevice; + link()->fLinkStatus = FoundDevice; } if (link()->fMessages->shouldPrint(Messages::OpenMessage)) { TQApplication::postEvent(link(), new DeviceCommEvent(EventLogMessage, 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 @@ -244,7 +244,7 @@ bool DeviceCommThread::open(const TQString &device) << link()->fRealPilotPath << "] already connected." << endl; WARNINGKPILOT << msg << endl; - link()->fLinktqStatus = PilotLinkError; + link()->fLinkStatus = PilotLinkError; TQApplication::postEvent(link(), new DeviceCommEvent(EventLogError, msg)); @@ -259,11 +259,11 @@ bool DeviceCommThread::open(const TQString &device) { e = errno; 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 << "(" << strerror(e) << ")" << endl; - link()->fLinktqStatus = PilotLinkError; + link()->fLinkStatus = PilotLinkError; TQApplication::postEvent(link(), new DeviceCommEvent(EventLogError, msg)); @@ -272,7 +272,7 @@ bool DeviceCommThread::open(const TQString &device) DEBUGKPILOT << fname << ": Got socket: [" << fTempSocket << "]" << endl; - link()->fLinktqStatus = CreatedSocket; + link()->fLinkStatus = CreatedSocket; DEBUGKPILOT << fname << ": Binding to path: [" << link()->fRealPilotPath << "]" << endl; @@ -286,12 +286,12 @@ bool DeviceCommThread::open(const TQString &device) << strerror(errno) << "]" << endl; 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 << "(" << strerror(e) << ")" << endl; - link()->fLinktqStatus = PilotLinkError; + link()->fLinkStatus = PilotLinkError; if (link()->fMessages->shouldPrint(Messages::OpenFailMessage)) { @@ -301,7 +301,7 @@ bool DeviceCommThread::open(const TQString &device) return false; } - link()->fLinktqStatus = DeviceOpen; + link()->fLinkStatus = DeviceOpen; DeviceMap::self()->bindDevice(link()->fRealPilotPath); fSocketNotifier = new TQSocketNotifier(fTempSocket, @@ -409,22 +409,22 @@ void DeviceCommThread::acceptDevice() WARNINGKPILOT << "pi_accept returned: [" << s << "]" << endl; TQApplication::postEvent(link(), new DeviceCommEvent(EventLogError, i18n("Cannot accept Pilot (%1)") - .tqarg(TQString::fromLocal8Bit(s)))); + .arg(TQString::fromLocal8Bit(s)))); - link()->fLinktqStatus = PilotLinkError; + link()->fLinkStatus = PilotLinkError; reset(); return; } DEBUGKPILOT << fname << ": Link accept done." << endl; - if ((link()->fLinktqStatus != DeviceOpen) || (fPilotSocket == -1)) + if ((link()->fLinkStatus != DeviceOpen) || (fPilotSocket == -1)) { - link()->fLinktqStatus = PilotLinkError; + link()->fLinkStatus = PilotLinkError; WARNINGKPILOT << "Already connected or unable to connect!" << endl; TQApplication::postEvent(link(), new DeviceCommEvent(EventLogError, i18n("Cannot accept Pilot (%1)") - .tqarg(i18n("already connected")))); + .arg(i18n("already connected")))); reset(); return; @@ -440,7 +440,7 @@ void DeviceCommThread::acceptDevice() TQApplication::postEvent(link(), new DeviceCommEvent(EventLogError, i18n("Unable to read system information from Pilot"))); - link()->fLinktqStatus=PilotLinkError; + link()->fLinkStatus=PilotLinkError; reset(); return; } @@ -488,7 +488,7 @@ void DeviceCommThread::acceptDevice() "Perhaps you have a password set on the device?"))); } - link()->fLinktqStatus = AcceptedDevice; + link()->fLinkStatus = AcceptedDevice; TQApplication::postEvent(link(), new DeviceCommEvent(EventLogProgress, TQString(), 100)); @@ -529,7 +529,7 @@ void DeviceCommThread::run() KPilotDeviceLink::KPilotDeviceLink(TQObject * parent, const char *name, const TQString &tempDevice) : - KPilotLink(parent, name), fLinktqStatus(Init), fWorkaroundUSB(false), + KPilotLink(parent, name), fLinkStatus(Init), fWorkaroundUSB(false), fPilotSocket(-1), fTempDevice(tempDevice), fMessages(new Messages(this)), fDeviceCommThread(0L) { FUNCTIONSETUP; @@ -550,7 +550,7 @@ KPilotDeviceLink::~KPilotDeviceLink() /* virtual */bool KPilotDeviceLink::isConnected() const { - return fLinktqStatus == AcceptedDevice; + return fLinkStatus == AcceptedDevice; } /* virtual */bool KPilotDeviceLink::event(TQEvent *e) @@ -640,7 +640,7 @@ void KPilotDeviceLink::reset(const TQString & dP) { FUNCTIONSETUP; - fLinktqStatus = Init; + fLinkStatus = Init; // Release all resources // @@ -670,7 +670,7 @@ void KPilotDeviceLink::startCommThread() TQString msg = i18n("The Pilot device is not configured yet."); WARNINGKPILOT << msg << endl; - fLinktqStatus = PilotLinkError; + fLinkStatus = PilotLinkError; emit logError(msg); return; @@ -689,7 +689,7 @@ void KPilotDeviceLink::reset() checkDevice(); - fLinktqStatus = WaitingForDevice; + fLinkStatus = WaitingForDevice; startCommThread(); } @@ -707,7 +707,7 @@ void KPilotDeviceLink::checkDevice() if (!(fi.isReadable() && fi.isWritable())) { emit logError(i18n("Pilot device %1 is not read-write.") - .tqarg(fPilotPath)); + .arg(fPilotPath)); } } else @@ -718,7 +718,7 @@ void KPilotDeviceLink::checkDevice() emit logError(i18n("Pilot device %1 does not exist. " "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. fMessages->block(Messages::OpenMessage | Messages::OpenFailMessage, true); @@ -788,7 +788,7 @@ int KPilotDeviceLink::openConduit() return dlp_OpenConduit(fPilotSocket); } -TQString KPilotDeviceLink::statusString(LinktqStatus l) +TQString KPilotDeviceLink::statusString(LinkStatus l) { TQString s= CSL1("KPilotDeviceLink="); diff --git a/lib/kpilotdevicelink.h b/lib/kpilotdevicelink.h index c4fb9f3..6fe02ef 100644 --- a/lib/kpilotdevicelink.h +++ b/lib/kpilotdevicelink.h @@ -42,7 +42,7 @@ class DeviceCommThread; ///< Thread for doing all palm device communications * it waits for the actual device to become available, and * then becomes ready to handle syncing. */ -enum LinktqStatus { +enum LinkStatus { Init, WaitingForDevice, FoundDevice, @@ -100,15 +100,15 @@ public: /** * Get the status (state enum) of this link. - * @return The LinktqStatus enum for the link's current state. + * @return The LinkStatus enum for the link's current state. */ - LinktqStatus status() const + LinkStatus status() const { - return fLinktqStatus; + return fLinkStatus; } /** Get a human-readable string for the given status @p l. */ - static TQString statusString(LinktqStatus l); + static TQString statusString(LinkStatus l); // The following API is the actual implementation of // the KPilotLink API, for documentation see that file. @@ -141,7 +141,7 @@ protected: private: - LinktqStatus fLinktqStatus; + LinkStatus fLinkStatus; public: diff --git a/lib/options.h b/lib/options.h index ae2c4be..d8dcc0c 100644 --- a/lib/options.h +++ b/lib/options.h @@ -155,7 +155,7 @@ KDE_EXPORT struct tm writeTm(const TQDateTime &dt); KDE_EXPORT struct tm writeTm(const TQDate &dt); -// Some tqlayout macros +// Some layout macros // // SPACING is a generic distance between visual elements; // 10 seems reasonably good even at high resolutions. @@ -176,7 +176,7 @@ KDE_EXPORT struct tm writeTm(const TQDate &dt); // variant is to handle plurals and is wrong, but unavoidable. // // -#define TODO_I18N(a) TQString::tqfromLatin1(a) +#define TODO_I18N(a) TQString::fromLatin1(a) #define TODO_I18N_P(a,b,c) ((c>1) ? a : b) // Handle some cases for TQT_NO_CAST_ASCII and NO_ASCII_CAST. @@ -190,6 +190,6 @@ KDE_EXPORT struct tm writeTm(const TQDate &dt); // with constant strings. // // -#define CSL1(a) TQString::tqfromLatin1(a "") +#define CSL1(a) TQString::fromLatin1(a "") #endif diff --git a/lib/pilot.cc b/lib/pilot.cc index 18e61f6..23a8511 100644 --- a/lib/pilot.cc +++ b/lib/pilot.cc @@ -31,7 +31,7 @@ #include "options.h" -#include +#include #include #include #include @@ -137,7 +137,7 @@ bool setupPilotCodec(const TQString &s) TQString codecName() { - return TQString::tqfromLatin1(codec->name()); + return TQString::fromLatin1(codec->name()); } TQString category(const struct CategoryAppInfo *info, unsigned int i) diff --git a/lib/pilotAddress.cc b/lib/pilotAddress.cc index 11fdd12..8865c93 100644 --- a/lib/pilotAddress.cc +++ b/lib/pilotAddress.cc @@ -171,7 +171,7 @@ unsigned int PhoneSlot::toField() const PhoneSlot::operator TQString() const { - return TQString("%1,%2").tqarg(toOffset()).tqarg(toField()); + return TQString("%1,%2").arg(toOffset()).arg(toField()); } #define MAXFIELDS 19 @@ -294,13 +294,13 @@ TQString PilotAddress::getTextRepresentation(const PilotAddressInfo *info, TQt:: if (firstName.isEmpty()) { // So replace placeholder for first name (%1) with empty - tmp = tmp.tqarg(TQString()); + tmp = tmp.arg(TQString()); } 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 += ps; @@ -335,13 +335,13 @@ TQString PilotAddress::getTextRepresentation(const PilotAddressInfo *info, TQt:: } if (info) { - tmp=tmp.tqarg(info->phoneLabel( getPhoneType( i ) )); + tmp=tmp.arg(info->phoneLabel( getPhoneType( i ) )); } 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 += br; } diff --git a/lib/pilotAddress.h b/lib/pilotAddress.h index 40b5630..db0f18c 100644 --- a/lib/pilotAddress.h +++ b/lib/pilotAddress.h @@ -314,7 +314,7 @@ public: protected: // Get the pointers in cases where no conversion to - // tqunicode is desired. + // unicode is desired. // const char *getFieldP(int field) const { diff --git a/lib/pilotDateEntry.cc b/lib/pilotDateEntry.cc index 4a5fd3d..b11c057 100644 --- a/lib/pilotDateEntry.cc +++ b/lib/pilotDateEntry.cc @@ -170,13 +170,13 @@ TQString PilotDateEntry::getTextRepresentation(TQt::TextFormat richText) // title + name text += par; tmp=richText?CSL1("%1"):CSL1("%1"); - text += tmp.tqarg(rtExpand(getDescription(), richText)); + text += tmp.arg(rtExpand(getDescription(), richText)); text += ps; TQDateTime dt(readTm(getEventStart())); TQString startDate(dt.toString(Qt::LocalDate)); text+=par; - text+=i18n("Start date: %1").tqarg(startDate); + text+=i18n("Start date: %1").arg(startDate); text+=ps; if (isEvent()) @@ -190,7 +190,7 @@ TQString PilotDateEntry::getTextRepresentation(TQt::TextFormat richText) dt=readTm(getEventEnd()); TQString endDate(dt.toString(Qt::LocalDate)); text+=par; - text+=i18n("End date: %1").tqarg(endDate); + text+=i18n("End date: %1").arg(endDate); text+=ps; } @@ -201,10 +201,10 @@ TQString PilotDateEntry::getTextRepresentation(TQt::TextFormat richText) arg(getAdvance()); switch (getAdvanceUnits()) { - case advMinutes: tmp=tmp.tqarg(i18n("minutes")); break; - case advHours: tmp=tmp.tqarg(i18n("hours")); break; - case advDays: tmp=tmp.tqarg(i18n("days")); break; - default: tmp=tmp.tqarg(TQString()); break;; + case advMinutes: tmp=tmp.arg(i18n("minutes")); break; + case advHours: tmp=tmp.arg(i18n("hours")); break; + case advDays: tmp=tmp.arg(i18n("days")); break; + default: tmp=tmp.arg(TQString()); break;; } text+=tmp; text+=ps; @@ -215,16 +215,16 @@ TQString PilotDateEntry::getTextRepresentation(TQt::TextFormat richText) text+=par; tmp=i18n("Recurrence: every %1 %2"); int freq = getRepeatFrequency(); - tmp=tmp.tqarg(freq); + tmp=tmp.arg(freq); switch(getRepeatType()) { - case repeatDaily: tmp=tmp.tqarg(i18n("day(s)")); break; - case repeatWeekly: tmp=tmp.tqarg(i18n("week(s)")); break; + case repeatDaily: tmp=tmp.arg(i18n("day(s)")); break; + case repeatWeekly: tmp=tmp.arg(i18n("week(s)")); break; case repeatMonthlyByDay: - case repeatMonthlyByDate: tmp=tmp.tqarg(i18n("month(s)")); break; - case repeatYearly: tmp=tmp.tqarg(i18n("year(s)")); break; - default: tmp=tmp.tqarg(TQString()); break; + case repeatMonthlyByDate: tmp=tmp.arg(i18n("month(s)")); break; + case repeatYearly: tmp=tmp.arg(i18n("year(s)")); break; + default: tmp=tmp.arg(TQString()); break; } text+=tmp; text+=br; @@ -237,7 +237,7 @@ TQString PilotDateEntry::getTextRepresentation(TQt::TextFormat richText) else { dt = readTm(getRepeatEnd()).date(); - text+=i18n("Until %1").tqarg(dt.toString(Qt::LocalDate)); + text+=i18n("Until %1").arg(dt.toString(Qt::LocalDate)); } 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; // TODO: show the dayArray when repeating weekly /*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(); // Rotate the days of the week, since day numbers on the Pilot and // in vCal / Events are different. diff --git a/lib/pilotLocalDatabase.cc b/lib/pilotLocalDatabase.cc index 9c3bbc0..91e0047 100644 --- a/lib/pilotLocalDatabase.cc +++ b/lib/pilotLocalDatabase.cc @@ -182,9 +182,9 @@ bool PilotLocalDatabase::createDatabase(long creator, long type, int, int flags, fDBInfo.version=version; fDBInfo.modnum=0; fDBInfo.index=0; - fDBInfo.createDate=(TQDateTime::tqcurrentDateTime()).toTime_t(); - fDBInfo.modifyDate=(TQDateTime::tqcurrentDateTime()).toTime_t(); - fDBInfo.backupDate=(TQDateTime::tqcurrentDateTime()).toTime_t(); + fDBInfo.createDate=(TQDateTime::currentDateTime()).toTime_t(); + fDBInfo.modifyDate=(TQDateTime::currentDateTime()).toTime_t(); + fDBInfo.backupDate=(TQDateTime::currentDateTime()).toTime_t(); delete[] fAppInfo; fAppInfo=0L; diff --git a/lib/pilotMemo.cc b/lib/pilotMemo.cc index c5d4c09..c163e46 100644 --- a/lib/pilotMemo.cc +++ b/lib/pilotMemo.cc @@ -79,11 +79,11 @@ TQString PilotMemo::getTextRepresentation(TQt::TextFormat richText) if (richText==TQt::RichText) { return i18n("Title: %1
    \nMemoText:
    %2"). - tqarg(rtExpand(getTitle(), richText)).tqarg(rtExpand(text(), richText)); + arg(rtExpand(getTitle(), richText)).arg(rtExpand(text(), richText)); } else { - return i18n("Title: %1\nMemoText:\n%2").tqarg(getTitle()).tqarg(text()); + return i18n("Title: %1\nMemoText:\n%2").arg(getTitle()).arg(text()); } } diff --git a/lib/pilotRecord.cc b/lib/pilotRecord.cc index 5abeaaf..59f055c 100644 --- a/lib/pilotRecord.cc +++ b/lib/pilotRecord.cc @@ -54,8 +54,8 @@ /* virtual */ TQString PilotRecord::textRepresentation() const { return CSL1("[ %1,%2 ]") - .tqarg(PilotRecordBase::textRepresentation()) - .tqarg(size()); + .arg(PilotRecordBase::textRepresentation()) + .arg(size()); } diff --git a/lib/pilotTodoEntry.cc b/lib/pilotTodoEntry.cc index 8aa17ec..f91b6d5 100644 --- a/lib/pilotTodoEntry.cc +++ b/lib/pilotTodoEntry.cc @@ -125,7 +125,7 @@ TQString PilotTodoEntry::getTextRepresentation(TQt::TextFormat richText) // title + name text += par; tmp= (richText==TQt::RichText) ?CSL1("%1"):CSL1("%1"); - text += tmp.tqarg(rtExpand(getDescription(), richText)); + text += tmp.arg(rtExpand(getDescription(), richText)); text += ps; text += par; @@ -140,7 +140,7 @@ TQString PilotTodoEntry::getTextRepresentation(TQt::TextFormat richText) TQDate dt(readTm(getDueDate()).date()); TQString dueDate(dt.toString(Qt::LocalDate)); text+=par; - text+=i18n("Due date: %1").tqarg(dueDate); + text+=i18n("Due date: %1").arg(dueDate); text+=ps; } @@ -148,7 +148,7 @@ TQString PilotTodoEntry::getTextRepresentation(TQt::TextFormat richText) text+=ps; text+=par; - text+=i18n("Priority: %1").tqarg(getPriority()); + text+=i18n("Priority: %1").arg(getPriority()); text+=ps; if (!getNote().isEmpty()) diff --git a/lib/plugin.cc b/lib/plugin.cc index fc24e9f..49c17e7 100644 --- a/lib/plugin.cc +++ b/lib/plugin.cc @@ -39,12 +39,12 @@ #include #include #include -#include +#include #include #include #include #include -#include +#include #include #include @@ -91,7 +91,7 @@ ConduitConfigBase::~ConduitConfigBase() FUNCTIONSETUP; return i18n("The %1 conduit's settings have been changed. Do you " - "want to save the changes before continuing?").tqarg(this->conduitName()); + "want to save the changes before continuing?").arg(this->conduitName()); } /* virtual */ bool ConduitConfigBase::maybeSave() @@ -102,7 +102,7 @@ ConduitConfigBase::~ConduitConfigBase() int r = KMessageBox::questionYesNoCancel(fWidget, 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::Yes) commit(); return true; @@ -126,14 +126,14 @@ TQWidget *ConduitConfigBase::aboutPage(TQWidget *parent, KAboutData *ad) TQPixmap applicationIcon = - l->loadIcon(TQString::tqfromLatin1(p->appName()), + l->loadIcon(TQString::fromLatin1(p->appName()), KIcon::Desktop, 64, KIcon::DefaultState, 0L, true); if (applicationIcon.isNull()) { - applicationIcon = l->loadIcon(TQString::tqfromLatin1("kpilot"), + applicationIcon = l->loadIcon(TQString::fromLatin1("kpilot"), KIcon::Desktop); } @@ -184,7 +184,7 @@ TQWidget *ConduitConfigBase::aboutPage(TQWidget *parent, KAboutData *ad) if (!p->homepage().isEmpty()) { s = TQString(); - s += CSL1("").tqarg(p->homepage()); + s += CSL1("").arg(p->homepage()); s += p->homepage(); s += CSL1("
    "); linktext->append(s); @@ -192,12 +192,12 @@ TQWidget *ConduitConfigBase::aboutPage(TQWidget *parent, KAboutData *ad) s = TQString(); s += i18n("Send questions and comments to %2.") - .tqarg( CSL1("tdepim-users@kde.org") ) - .tqarg( CSL1("tdepim-users@kde.org") ); + .arg( CSL1("tdepim-users@kde.org") ) + .arg( CSL1("tdepim-users@kde.org") ); s += ' '; s += i18n("Send bug reports to %2.") - .tqarg(p->bugAddress()) - .tqarg(p->bugAddress()); + .arg(p->bugAddress()) + .arg(p->bugAddress()); s += ' '; s += i18n("For trademark information, see the " "KPilot User's Guide."); @@ -218,9 +218,9 @@ TQWidget *ConduitConfigBase::aboutPage(TQWidget *parent, KAboutData *ad) for (i=pl.begin(); i!=pl.end(); ++i) { s.append(CSL1("%1 (%2)%3") - .tqarg((*i).name()) - .tqarg((*i).task()) - .tqarg(count%2)%3") - .tqarg((*i).name()) - .tqarg((*i).task()) - .tqarg(count allowedVolatility) { - query = query.tqarg(fConduitName) - .tqarg(fCtrHH->type()).tqarg(fCtrHH->moo()); + query = query.arg(fConduitName) + .arg(fCtrHH->type()).arg(fCtrHH->moo()); DEBUGKPILOT << fname << ": Yikes, lots of volatility " << "caught. Check with user: [" << query @@ -533,7 +533,7 @@ ConduitProxy::ConduitProxy(KPilotLink *p, WARNINGKPILOT << "Can't find desktop file for conduit " << fDesktopName << endl; - addSyncLogEntry(i18n("Could not find conduit %1.").tqarg(fDesktopName)); + addSyncLogEntry(i18n("Could not find conduit %1.").arg(fDesktopName)); return false; } @@ -556,7 +556,7 @@ ConduitProxy::ConduitProxy(KPilotLink *p, << " - " << KLibLoader::self()->lastErrorMessage() << endl; - addSyncLogEntry(i18n("Could not load conduit %1.").tqarg(fDesktopName)); + addSyncLogEntry(i18n("Could not load conduit %1.").arg(fDesktopName)); return false; } @@ -568,7 +568,7 @@ ConduitProxy::ConduitProxy(KPilotLink *p, << " has version " << version << 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; } @@ -578,7 +578,7 @@ ConduitProxy::ConduitProxy(KPilotLink *p, WARNINGKPILOT << "Can't find factory in library " << fLibraryName << endl; - addSyncLogEntry(i18n("Could not initialize conduit %1.").tqarg(fDesktopName)); + addSyncLogEntry(i18n("Could not initialize conduit %1.").arg(fDesktopName)); return false; } @@ -591,7 +591,7 @@ ConduitProxy::ConduitProxy(KPilotLink *p, if (!object) { 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; } @@ -600,11 +600,11 @@ ConduitProxy::ConduitProxy(KPilotLink *p, if (!fConduit) { 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; } - addSyncLogEntry(i18n("[Conduit %1]").tqarg(fDesktopName)); + addSyncLogEntry(i18n("[Conduit %1]").arg(fDesktopName)); // Handle the syncDone signal properly & unload the conduit. TQObject::connect(fConduit,TQT_SIGNAL(syncDone(SyncAction *)), @@ -706,7 +706,7 @@ TQString findArgument(const TQStringList &a, const TQString &arg) if (!lib->hasSymbol(symbol.latin1())) return TQString(); - return TQString::tqfromLatin1(*((const char **)(lib->symbol(symbol.latin1())))); + return TQString::fromLatin1(*((const char **)(lib->symbol(symbol.latin1())))); } @@ -746,11 +746,11 @@ void CUDCounter::setEndCount(unsigned int t) TQString CUDCounter::moo() const { 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 (fU > 0) result += i18n("%1 changed. ").tqarg(fU); - if (fD > 0) result += i18n("%1 deleted. ").tqarg(fD); + if (fC > 0) result += i18n("%1 new. ").arg(fC); + if (fU > 0) result += i18n("%1 changed. ").arg(fU); + if (fD > 0) result += i18n("%1 deleted. ").arg(fD); if ( (fC+fU+fD) <= 0) result += i18n("No changes made. "); diff --git a/lib/plugin.h b/lib/plugin.h index b4eb59f..f1dbec8 100644 --- a/lib/plugin.h +++ b/lib/plugin.h @@ -70,8 +70,8 @@ namespace Pilot * NB. The reason that this is a TQObject which needs to create a * separate widget - instead of a TQWidget subclass - has to do with * layouting. If you make the widget with designer then the easiest -* thing to do is to use a grid tqlayout there. Making ConduitConfigBase -* a TQWidget subclass would require an additional tqlayout here, which +* thing to do is to use a grid layout there. Making ConduitConfigBase +* a TQWidget subclass would require an additional layout here, which * seems a little foolish. * */ diff --git a/lib/recordConduit.cc b/lib/recordConduit.cc index 89dfac6..7c92152 100644 --- a/lib/recordConduit.cc +++ b/lib/recordConduit.cc @@ -66,7 +66,7 @@ long version_record_conduit = Pilot::PLUGIN_API; bool retrieved = false; 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; } if (retrieved) setFirstSync(true); @@ -286,13 +286,13 @@ RecordConduit::~RecordConduit() // Database names probably in latin1. 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; } _getAppInfo(); 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; } // get the addresseMap which maps Pilot unique record(address) id's to diff --git a/lib/syncAction.cc b/lib/syncAction.cc index 55278a1..a527a12 100644 --- a/lib/syncAction.cc +++ b/lib/syncAction.cc @@ -36,7 +36,7 @@ #include #include -#include +#include #include #include #include @@ -101,7 +101,7 @@ SyncAction::~SyncAction() if (!r) { emit logError(i18n("The conduit %1 could not be executed.") - .tqarg(TQString::tqfromLatin1(name()))); + .arg(TQString::fromLatin1(name()))); delayDone(); } } @@ -142,7 +142,7 @@ SyncAction::SyncMode::SyncMode(const TQStringList &args) : int i = 0; while(maps[i].name) { - if (args.contains(TQString::tqfromLatin1(maps[i].name))) + if (args.contains(TQString::fromLatin1(maps[i].name))) { fMode = maps[i].mode; break; @@ -181,7 +181,7 @@ TQStringList SyncAction::SyncMode::list() const { if ( fMode == maps[i].mode ) { - l.append(TQString::tqfromLatin1(maps[i].name)); + l.append(TQString::fromLatin1(maps[i].name)); break; } i++; @@ -189,7 +189,7 @@ TQStringList SyncAction::SyncMode::list() const if ( !maps[i].name ) { WARNINGKPILOT << "Mode " << fMode << " does not have a name." << endl; - l.append(TQString::tqfromLatin1(maps[0].name)); + l.append(TQString::fromLatin1(maps[0].name)); } if (isTest()) l.append(CSL1("--test")); @@ -217,11 +217,11 @@ TQString SyncAction::SyncMode::name() const if (isTest()) { - s.append(CSL1(" [%1]").tqarg(i18n("Test Sync"))); + s.append(CSL1(" [%1]").arg(i18n("Test Sync"))); } if (isLocal()) { - s.append(CSL1(" [%1]").tqarg(i18n("Local Sync"))); + s.append(CSL1(" [%1]").arg(i18n("Local Sync"))); } return s; } @@ -357,7 +357,7 @@ int SyncAction::questionYesNo(const TQString & text, label1->setPixmap(TQMessageBox::standardIcon(TQMessageBox::Information)); lay->add( label1 ); TQLabel *label2 = new TQLabel( text, contents); - label2->setMinimumSize(label2->tqsizeHint()); + label2->setMinimumSize(label2->sizeHint()); lay->add(label2); lay->addStretch(1); @@ -469,7 +469,7 @@ int SyncAction::questionYesNoCancel(const TQString & text, label1->setPixmap(TQMessageBox::standardIcon(TQMessageBox::Information)); lay->add( label1 ); TQLabel *label2 = new TQLabel( text, contents); - label2->setMinimumSize(label2->tqsizeHint()); + label2->setMinimumSize(label2->sizeHint()); lay->add(label2); lay->addStretch(1); diff --git a/lib/syncAction.h b/lib/syncAction.h index 42b1854..8636731 100644 --- a/lib/syncAction.h +++ b/lib/syncAction.h @@ -60,7 +60,7 @@ public: const char *name=0L); ~SyncAction(); - typedef enum { Error=-1 } tqStatus; + typedef enum { Error=-1 } Status; /** A syncaction has a status, which can be expressed as an * integer. Subclasses are expected to define their own status @@ -68,7 +68,7 @@ public: */ int status() const { - return fActiontqStatus; + return fActionStatus; } /** Return a human-readable representation of the status. */ virtual TQString statusString() const; @@ -156,7 +156,7 @@ public: protected: /** Connection to the device. @todo make private. */ KPilotLink *fHandle; - int fActiontqStatus; + int fActionStatus; /** Returns a pointer to the connection to the device. */ inline KPilotLink *deviceLink() const diff --git a/tests/exportdatebook.cc b/tests/exportdatebook.cc index 18bbf34..d4cf8c5 100644 --- a/tests/exportdatebook.cc +++ b/tests/exportdatebook.cc @@ -123,7 +123,7 @@ int main(int argc, char **argv) KCalSync::setEvent(event, d,*fAppointmentAppInfo->categoryInfo()); - event->setSynctqStatus( KCal::Incidence::SYNCNONE ); + event->setSyncStatus( KCal::Incidence::SYNCNONE ); calendar->addEvent(event); diff --git a/tests/importdatebook.cc b/tests/importdatebook.cc index 979794f..ebbb701 100644 --- a/tests/importdatebook.cc +++ b/tests/importdatebook.cc @@ -87,7 +87,7 @@ int main(int argc, char **argv) << "], creating DatebookDB in: [" << datadir << "]" << endl; - KCal::CalendarLocal *calendar = new KCal::CalendarLocal( TQString::tqfromLatin1("UTC") ); + KCal::CalendarLocal *calendar = new KCal::CalendarLocal( TQString::fromLatin1("UTC") ); if (!calendar || !calendar->load( vcalfile )) { return 1; diff --git a/tests/mergecalendars.cc b/tests/mergecalendars.cc index 2fc1e78..898eb8c 100644 --- a/tests/mergecalendars.cc +++ b/tests/mergecalendars.cc @@ -84,8 +84,8 @@ int main(int argc, char **argv) return 1; } - TQString korgsave = TQString("%1.updated").tqarg(korgfile); - TQString newfilesave = TQString("%1.updated").tqarg(newfile); + TQString korgsave = TQString("%1.updated").arg(korgfile); + TQString newfilesave = TQString("%1.updated").arg(newfile); DEBUGKPILOT << "Using korgfile: [" << korgfile << "]" << endl; @@ -96,8 +96,8 @@ int main(int argc, char **argv) DEBUGKPILOT << "Will save newfile to: [" << newfilesave << "]" << endl << endl; - KCal::CalendarLocal *calkorg = new KCal::CalendarLocal( TQString::tqfromLatin1("UTC") ); - KCal::CalendarLocal *calnew = new KCal::CalendarLocal( TQString::tqfromLatin1("UTC") ); + KCal::CalendarLocal *calkorg = new KCal::CalendarLocal( TQString::fromLatin1("UTC") ); + KCal::CalendarLocal *calnew = new KCal::CalendarLocal( TQString::fromLatin1("UTC") ); if (!calkorg || !calnew) { WARNINGKPILOT << "Unable to create base calendar objects." << endl; @@ -154,7 +154,7 @@ int main(int argc, char **argv) << pilotId << "]" << endl; ev->setPilotId(pilotId); - ev->setSynctqStatus(KCal::Incidence::SYNCMOD); + ev->setSyncStatus(KCal::Incidence::SYNCMOD); ++numkorgpilotids; } diff --git a/tests/testcategories.cc b/tests/testcategories.cc index a29a307..aefb8b9 100644 --- a/tests/testcategories.cc +++ b/tests/testcategories.cc @@ -53,7 +53,7 @@ TQStringList categories( const PilotAppInfoBase *appinfo ) TQString cat = appinfo->categoryName(i); if (!cat.isEmpty()) { - TQString s = CSL1("(%1:%2)").tqarg(i).tqarg(cat); + TQString s = CSL1("(%1:%2)").arg(i).arg(cat); cats.append(s); } } @@ -123,7 +123,7 @@ void categoryNames( const TQString &dir ) DEBUGKPILOT << "# Expect three truncation errors and two bad category numbers." << endl; for (unsigned int i=0; isetCategoryName(i,name)) { WARNINGKPILOT << "Failed to set category " << i << " name to <" << name << ">" << endl; diff --git a/tests/testdatabase.cc b/tests/testdatabase.cc index 7a88089..02b43c6 100644 --- a/tests/testdatabase.cc +++ b/tests/testdatabase.cc @@ -105,7 +105,7 @@ int checkDatabase(const char *path, recordInfo *info) { FUNCTIONSETUP; - PilotLocalDatabase db(TQString::tqfromLatin1(path)); + PilotLocalDatabase db(TQString::fromLatin1(path)); if (!db.isOpen()) { kdDebug() << "No database " << path << endl; @@ -191,7 +191,7 @@ TQStringList listCategories() cats.append(s); /* if (i<((sizeof(categoryNames) / sizeof(categoryNames[0])))) - m->setCategoryName(i,TQString::tqfromLatin1(categoryNames[i])); + m->setCategoryName(i,TQString::fromLatin1(categoryNames[i])); */ }