diff options
Diffstat (limited to 'conduits')
39 files changed, 225 insertions, 225 deletions
diff --git a/conduits/abbrowserconduit/KPilotCustomFieldEditor.ui b/conduits/abbrowserconduit/KPilotCustomFieldEditor.ui index ba3b204..4a1b81f 100644 --- a/conduits/abbrowserconduit/KPilotCustomFieldEditor.ui +++ b/conduits/abbrowserconduit/KPilotCustomFieldEditor.ui @@ -141,7 +141,7 @@ <property name="text"> <string>If you let KPilot sync the handheld's custom fields as custom fields on the PC, you can change the values here. Note, however, that for all other settings the values entered here will have no effect.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -193,7 +193,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>41</width> <height>20</height> @@ -210,7 +210,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>31</width> <height>20</height> @@ -225,7 +225,7 @@ <string>These values indicate the state of the record for KPilot, and connect an entry on the handheld with an entry on the PC. Do NOT change these values: doing so will almost certainly result in data loss when you next do a sync.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -263,7 +263,7 @@ Do NOT change these values: doing so will almost certainly result in data loss w <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>210</height> diff --git a/conduits/abbrowserconduit/abbrowser-conduit.cc b/conduits/abbrowserconduit/abbrowser-conduit.cc index 0c7b6f0..59dc242 100644 --- a/conduits/abbrowserconduit/abbrowser-conduit.cc +++ b/conduits/abbrowserconduit/abbrowser-conduit.cc @@ -34,7 +34,7 @@ #include "options.h" #include <tqtimer.h> -#include <textcodec.h> +#include <tqtextcodec.h> #include <tqfile.h> #include <tqregexp.h> @@ -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.").arg(AbbrowserSettings::fileName())); + "Aborting the conduit.").tqarg(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") - .arg(AbbrowserSettings::fileName()).arg(fABookFile)); + .tqarg(AbbrowserSettings::fileName()).tqarg(fABookFile)); } else { KIO::NetAccess::removeTempFile(fABookFile); diff --git a/conduits/abbrowserconduit/kaddressbookConduit.ui b/conduits/abbrowserconduit/kaddressbookConduit.ui index e942d8e..d2b42b7 100644 --- a/conduits/abbrowserconduit/kaddressbookConduit.ui +++ b/conduits/abbrowserconduit/kaddressbookConduit.ui @@ -51,7 +51,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>50</height> @@ -225,7 +225,7 @@ <property name="text"> <string><p>Select the default action if an event was modified on both sides here. </p></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignJustify|AlignVCenter</set> </property> </widget> @@ -241,7 +241,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>41</height> @@ -402,7 +402,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>20</height> @@ -710,7 +710,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>31</width> <height>30</height> diff --git a/conduits/abbrowserconduit/resolutionDialog.cc b/conduits/abbrowserconduit/resolutionDialog.cc index 89b18f4..34e1fb4 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").arg(fCaption).arg(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").tqarg(fCaption).tqarg(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 b756a41..c76ca26 100644 --- a/conduits/abbrowserconduit/resolutionDialog_base.ui +++ b/conduits/abbrowserconduit/resolutionDialog_base.ui @@ -26,7 +26,7 @@ <property name="text"> <string>The following record was edited both on the handheld and on the PC. Please choose which values shall be synced:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -62,7 +62,7 @@ <property name="text"> <string>Line breaks in any of the entries are denoted by a " | " (without the quotes).</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> diff --git a/conduits/docconduit/DOC-converter.cc b/conduits/docconduit/DOC-converter.cc index 6502fe5..cff8f19 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").arg(i), rx.cap(i)); - bmkText.replace(CSL1("\\%1").arg(i), rx.cap(i)); + bmkText.replace(CSL1("$%1").tqarg(i), rx.cap(i)); + bmkText.replace(CSL1("\\%1").tqarg(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.").arg(txtfilename)); + emit logError(i18n("Unable to open text file %1 for reading.").tqarg(txtfilename)); return TQString(); } @@ -437,7 +437,7 @@ bool DOCConverter::convertTXTtoPDB() { #endif if (!docdb->isOpen()) { - emit logError(i18n("Unable to open palm doc database %1").arg(docdb->dbPathName()) ); + emit logError(i18n("Unable to open palm doc database %1").tqarg(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.").arg(docdb->dbPathName())); + emit logError(i18n("Unable to read database header for database %1.").tqarg(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.").arg(txtfilename)); + emit logError(i18n("Unable to open output file %1.").tqarg(txtfilename)); KPILOT_DELETE(docdb); return false; } @@ -555,7 +555,7 @@ bool DOCConverter::convertPDBtoTXT() DEBUGKPILOT<<"Record "<<i<<endl; KPILOT_DELETE(rec); } else { - emit logMessage(i18n("Could not read text record #%1 from Database %2").arg(i).arg(docdb->dbPathName())); + emit logMessage(i18n("Could not read text record #%1 from Database %2").tqarg(i).tqarg(docdb->dbPathName())); } } @@ -570,11 +570,11 @@ bool DOCConverter::convertPDBtoTXT() if (rec) { PilotDOCBookmark bookie(rec); - docBookmark*bmk=new docBookmark(TQString::fromLatin1(bookie.bookmarkName), bookie.pos); + docBookmark*bmk=new docBookmark(TQString::tqfromLatin1(bookie.bookmarkName), bookie.pos); bmks.append(bmk); KPILOT_DELETE(rec); } else { - emit logMessage(i18n("Could not read bookmark record #%1 from Database %2").arg(i).arg(docdb->dbPathName())); + emit logMessage(i18n("Could not read bookmark record #%1 from Database %2").tqarg(i).tqarg(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.") - .arg(bmkfilename).arg(docdb ->dbPathName())); + .tqarg(bmkfilename).tqarg(docdb ->dbPathName())); } else { diff --git a/conduits/docconduit/doc-conduit.cc b/conduits/docconduit/doc-conduit.cc index 31a075b..0ac14f1 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::fromLatin1(sinfo.dbinfo.name), false); + TQString::tqfromLatin1(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.") - .arg(TQString::fromLatin1(sinfo.dbinfo.name))); + .tqarg(TQString::tqfromLatin1(sinfo.dbinfo.name))); if (!res) emit logError(i18n("Conversion of PalmDOC \"%1\" failed.") - .arg(TQString::fromLatin1(sinfo.dbinfo.name))); + .tqarg(TQString::tqfromLatin1(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.") - .arg(TQString::fromLatin1(sinfo.dbinfo.name))); + .tqarg(TQString::tqfromLatin1(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::fromLatin1(dbinfo.name))) + fDBNames.contains(TQString::tqfromLatin1(dbinfo.name))) { TQTimer::singleShot(0, this, TQT_SLOT(syncNextDB())); return; } - TQString txtfilename=constructTXTFileName(TQString::fromLatin1(dbinfo.name)); - TQString pdbfilename=constructPDBFileName(TQString::fromLatin1(dbinfo.name)); + TQString txtfilename=constructTXTFileName(TQString::tqfromLatin1(dbinfo.name)); + TQString pdbfilename=constructPDBFileName(TQString::tqfromLatin1(dbinfo.name)); - docSyncInfo syncInfo(TQString::fromLatin1(dbinfo.name), + docSyncInfo syncInfo(TQString::tqfromLatin1(dbinfo.name), txtfilename, pdbfilename, eSyncNone); syncInfo.dbinfo=dbinfo; needsSync(syncInfo); fSyncInfoList.append(syncInfo); - fDBNames.append(TQString::fromLatin1(dbinfo.name)); + fDBNames.append(TQString::tqfromLatin1(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::fromLatin1(dbinfo.name), + docSyncInfo syncInfo(TQString::tqfromLatin1(dbinfo.name), txtfilename, pdbfilename, eSyncNone); syncInfo.dbinfo=dbinfo; needsSync(syncInfo); fSyncInfoList.append(syncInfo); - fDBNames.append(TQString::fromLatin1(dbinfo.name)); + fDBNames.append(TQString::tqfromLatin1(dbinfo.name)); } else { #ifdef DEBUG DEBUGKPILOT<<txtfilename<<" has already been synced, skipping it."<<endl; @@ -665,7 +665,7 @@ void DOCConduit::syncDatabases() { case eSyncDelete: case eSyncPDAToPC: case eSyncPCToPDA: - emit logMessage(i18n("Synchronizing text \"%1\"").arg(sinfo.handheldDB)); + emit logMessage(i18n("Synchronizing text \"%1\"").tqarg(sinfo.handheldDB)); if (!doSync(sinfo)) { // The sync could not be done, so inform the user (the error message should probably issued inside doSync) #ifdef DEBUG @@ -701,7 +701,7 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo) FUNCTIONSETUP; sinfo.direction = eSyncNone; - PilotDatabase*docdb=openDOCDatabase(TQString::fromLatin1(sinfo.dbinfo.name)); + PilotDatabase*docdb=openDOCDatabase(TQString::tqfromLatin1(sinfo.dbinfo.name)); if (!fDBListSynced.contains(sinfo.handheldDB)) { // the database wasn't included on last sync, so it has to be new. #ifdef DEBUG @@ -716,29 +716,29 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo) N N | C P H */ - if (TQFile::exists(sinfo.txtfilename)) sinfo.fPCStatus=eStatNew; - else sinfo.fPCStatus=eStatDoesntExist; - if (docdb && docdb->isOpen()) sinfo.fPalmStatus=eStatNew; - else sinfo.fPalmStatus=eStatDoesntExist; + if (TQFile::exists(sinfo.txtfilename)) sinfo.fPCtqStatus=eStatNew; + else sinfo.fPCtqStatus=eStatDoesntExist; + if (docdb && docdb->isOpen()) sinfo.fPalmtqStatus=eStatNew; + else sinfo.fPalmtqStatus=eStatDoesntExist; KPILOT_DELETE(docdb); switch (eSyncDirection) { case eSyncPDAToPC: - if (sinfo.fPalmStatus==eStatDoesntExist) + if (sinfo.fPalmtqStatus==eStatDoesntExist) sinfo.direction=eSyncDelete; else sinfo.direction=eSyncPDAToPC; break; case eSyncPCToPDA: - if (sinfo.fPCStatus==eStatDoesntExist) + if (sinfo.fPCtqStatus==eStatDoesntExist) sinfo.direction=eSyncDelete; else sinfo.direction=eSyncPCToPDA; break; case eSyncNone: // means actually both directions! - if (sinfo.fPCStatus==eStatNew) { - if (sinfo.fPalmStatus==eStatNew) sinfo.direction=eSyncConflict; + if (sinfo.fPCtqStatus==eStatNew) { + if (sinfo.fPalmtqStatus==eStatNew) sinfo.direction=eSyncConflict; else sinfo.direction=eSyncPCToPDA; } else { - if (sinfo.fPalmStatus==eStatNew) sinfo.direction=eSyncPDAToPC; + if (sinfo.fPalmtqStatus==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.fPCStatus=eStatDeleted; + if (!TQFile::exists(sinfo.txtfilename)) sinfo.fPCtqStatus=eStatDeleted; else if(pcTextChanged(sinfo.txtfilename)) { - sinfo.fPCStatus=eStatChanged; + sinfo.fPCtqStatus=eStatChanged; #ifdef DEBUG DEBUGKPILOT<<"PC side has changed!"<<endl; #endif @@ -769,12 +769,12 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo) #endif } - if (!docdb || !docdb->isOpen()) sinfo.fPalmStatus=eStatDeleted; + if (!docdb || !docdb->isOpen()) sinfo.fPalmtqStatus=eStatDeleted; else if (hhTextChanged(docdb)) { #ifdef DEBUG DEBUGKPILOT<<"Handheld side has changed!"<<endl; #endif - sinfo.fPalmStatus=eStatChanged; + sinfo.fPalmtqStatus=eStatChanged; #ifdef DEBUG } else { DEBUGKPILOT<<"Handheld side has NOT changed!"<<endl; @@ -800,7 +800,7 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo) */ - if (sinfo.fPCStatus == eStatNone && sinfo.fPalmStatus==eStatNone) { + if (sinfo.fPCtqStatus == eStatNone && sinfo.fPalmtqStatus==eStatNone) { #ifdef DEBUG DEBUGKPILOT<<"Nothing has changed, not need for a sync."<<endl; #endif @@ -813,12 +813,12 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo) // to sync that direction if (eSyncDirection==eSyncPCToPDA) { - if (sinfo.fPCStatus==eStatDeleted) sinfo.direction=eSyncDelete; + if (sinfo.fPCtqStatus==eStatDeleted) sinfo.direction=eSyncDelete; else sinfo.direction=eSyncPCToPDA; return true; } if (eSyncDirection==eSyncPDAToPC) { - if (sinfo.fPalmStatus==eStatDeleted) sinfo.direction=eSyncDelete; + if (sinfo.fPalmtqStatus==eStatDeleted) sinfo.direction=eSyncDelete; else sinfo.direction=eSyncPDAToPC; return true; } @@ -830,8 +830,8 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo) // if either is deleted, and the other is not changed, delete - if ( ((sinfo.fPCStatus==eStatDeleted) && (sinfo.fPalmStatus!=eStatChanged)) || - ((sinfo.fPalmStatus==eStatDeleted) && (sinfo.fPCStatus!=eStatChanged)) ) + if ( ((sinfo.fPCtqStatus==eStatDeleted) && (sinfo.fPalmtqStatus!=eStatChanged)) || + ((sinfo.fPalmtqStatus==eStatDeleted) && (sinfo.fPCtqStatus!=eStatChanged)) ) { #ifdef DEBUG DEBUGKPILOT<<"DB was deleted on one side and not changed on " @@ -843,7 +843,7 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo) // eStatDeleted (and both not changed) have already been treated, for all // other values in combination with eStatNone, just copy the texts. - if (sinfo.fPCStatus==eStatNone) { + if (sinfo.fPCtqStatus==eStatNone) { #ifdef DEBUG DEBUGKPILOT<<"PC side has changed!"<<endl; #endif @@ -851,7 +851,7 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo) return true; } - if (sinfo.fPalmStatus==eStatNone) { + if (sinfo.fPalmtqStatus==eStatNone) { sinfo.direction=eSyncPCToPDA; return true; } @@ -922,11 +922,11 @@ PilotDatabase *DOCConduit::preSyncAction(docSyncInfo &sinfo) const if (DOCConduitSettings::keepPDBsLocally()) { return new PilotLocalDatabase(DOCConduitSettings::pDBDirectory(), - TQString::fromLatin1(dbinfo.name), false); + TQString::tqfromLatin1(dbinfo.name), false); } else { - return deviceLink()->database(TQString::fromLatin1(dbinfo.name)); + return deviceLink()->database(TQString::tqfromLatin1(dbinfo.name)); } } @@ -950,7 +950,7 @@ bool DOCConduit::postSyncAction(PilotDatabase * database, if (DOCConduitSettings::keepPDBsLocally() && !DOCConduitSettings::localSync()) { PilotDatabase*db=deviceLink()->database( - TQString::fromLatin1(sinfo.dbinfo.name)); + TQString::tqfromLatin1(sinfo.dbinfo.name)); #ifdef DEBUG DEBUGKPILOT<<"Middle 1 Resetting sync flags for database " <<sinfo.dbinfo.name<<endl; diff --git a/conduits/docconduit/doc-conduit.h b/conduits/docconduit/doc-conduit.h index a7e7a44..7b50adc 100644 --- a/conduits/docconduit/doc-conduit.h +++ b/conduits/docconduit/doc-conduit.h @@ -41,7 +41,7 @@ typedef enum eSyncDirectionEnum { eSyncDelete, eSyncConflict }; -typedef enum eTexStatus { +typedef enum eTextqStatus { eStatNone=0, eStatNew=1, eStatChanged=2, @@ -139,14 +139,14 @@ public: txtfilename=txtfn; pdbfilename=pdbfn; direction=dir; - fPCStatus=eStatNone; - fPalmStatus=eStatNone; + fPCtqStatus=eStatNone; + fPalmtqStatus=eStatNone; }; ~docSyncInfo(){}; TQString handheldDB, txtfilename, pdbfilename; DBInfo dbinfo; eSyncDirectionEnum direction; - eTexStatus fPCStatus, fPalmStatus; + eTextqStatus fPCtqStatus, fPalmtqStatus; }; diff --git a/conduits/docconduit/doc-conflictdialog.cc b/conduits/docconduit/doc-conflictdialog.cc index bf2610a..32af25f 100644 --- a/conduits/docconduit/doc-conflictdialog.cc +++ b/conduits/docconduit/doc-conflictdialog.cc @@ -30,7 +30,7 @@ #include <tqlabel.h> #include <tqpushbutton.h> -#include <layout.h> +#include <tqlayout.h> #include <tqbuttongroup.h> #include <kmessagebox.h> #include <tqtimer.h> @@ -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->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); + textLabel1->tqsetAlignment( 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->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); + textLabel2->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); topLayout->addWidget(textLabel2); resolutionGroupBox = new TQGroupBox(i18n("DOC Databases"), page ); - TQVBoxLayout*playout = new TQVBoxLayout(resolutionGroupBox); + TQVBoxLayout*ptqlayout = new TQVBoxLayout(resolutionGroupBox); TQScrollView* sv = new TQScrollView(resolutionGroupBox); - playout->addWidget(sv); + ptqlayout->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->setAlignment( TQt::AlignTop ); + resolutionGroupBoxLayout->tqsetAlignment( 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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, + cE.resolution->tqsetSizePolicy( 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(minimumSizeHint()) ); + resize( TQSize(600, 480).expandedTo(tqminimumSizeHint()) ); if (fHandle) tickleTimer=new TQTimer(this, "TickleTimer"); if (tickleTimer) { @@ -150,7 +150,7 @@ ResolutionDialog::~ResolutionDialog() KDialogBase::slotOk(); } -TQString eTexStatusToString(eTexStatus stat) { +TQString eTexStatusToString(eTextqStatus 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").arg(si.handheldDB); - text+=i18n("Handheld: %1\n").arg(eTexStatusToString(si.fPalmStatus)); - text+=i18n("Desktop: %1\n").arg(eTexStatusToString(si.fPCStatus)); + 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)); KMessageBox::information(this, text, i18n("Database information")); } diff --git a/conduits/docconduit/doc-setupdialog.ui b/conduits/docconduit/doc-setupdialog.ui index e04be16..e59025e 100644 --- a/conduits/docconduit/doc-setupdialog.ui +++ b/conduits/docconduit/doc-setupdialog.ui @@ -153,7 +153,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -222,7 +222,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -304,7 +304,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -492,7 +492,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/conduits/docconduit/kpalmdoc_dlg.cc b/conduits/docconduit/kpalmdoc_dlg.cc index 20e8d2f..58ca0aa 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(minimumSize()); + resize(tqminimumSize()); } ConverterDlg::~ConverterDlg() @@ -175,8 +175,8 @@ void ConverterDlg::slotToText() int res=KMessageBox::questionYesNo(this, i18n("<qt>You selected to sync folders, " "but gave a filename instead (<em>%1</em>)." - "<br>Use folder <em>%2</em> instead?</qt>").arg(pdburl) - .arg(pdbinfo.dirPath(true)), TQString(), i18n("Use Folder"), KStdGuiItem::cancel()); + "<br>Use folder <em>%2</em> instead?</qt>").tqarg(pdburl) + .tqarg(pdbinfo.dirPath(true)), TQString(), i18n("Use Folder"), KStdGuiItem::cancel()); if (res==KMessageBox::Yes) { pdburl=pdbinfo.dirPath(true); @@ -191,7 +191,7 @@ void ConverterDlg::slotToText() KMessageBox::sorry(this, i18n("<qt>The folder <em>%1</em> for " "the handheld database files is not a valid " - "folder.</qt>").arg(pdburl)); + "folder.</qt>").tqarg(pdburl)); return; } @@ -200,7 +200,7 @@ void ConverterDlg::slotToText() KMessageBox::sorry(this, i18n("<qt>The folder <em>%1</em> for " "the handheld database files is not a " - "valid directory.</qt>").arg(pdburl)); + "valid directory.</qt>").tqarg(pdburl)); return; } @@ -211,8 +211,8 @@ void ConverterDlg::slotToText() int res=KMessageBox::questionYesNo(this, i18n("<qt>You selected to sync folders, " "but gave a filename instead (<em>%1</em>)." - "<br>Use folder <em>%2</em> instead?</qt>").arg(txturl) - .arg(txtinfo.dirPath(true)), TQString(), i18n("Use Folder"), KStdGuiItem::cancel()); + "<br>Use folder <em>%2</em> instead?</qt>").tqarg(txturl) + .tqarg(txtinfo.dirPath(true)), TQString(), i18n("Use Folder"), KStdGuiItem::cancel()); if (res==KMessageBox::Yes) { txturl=txtinfo.dirPath(true); txtinfo.setFile(txturl); @@ -227,7 +227,7 @@ void ConverterDlg::slotToText() if (!txtinfo.isDir()) { KMessageBox::sorry(this, i18n("<qt>The folder <em>%1</em> for " - "the text files could not be created.</qt>").arg(txturl)); + "the text files could not be created.</qt>").tqarg(txturl)); return; } @@ -265,7 +265,7 @@ void ConverterDlg::slotToText() if (!pdbinfo.isFile() || !pdbinfo.exists()) { KMessageBox::sorry(this, i18n("<qt>The file <em>%1</em> does not " - "exist.</qt>").arg(pdburl)); + "exist.</qt>").tqarg(pdburl)); return; } @@ -274,13 +274,13 @@ void ConverterDlg::slotToText() if (!txtinfo.isFile()) { KMessageBox::sorry(this, i18n("<qt>The filename <em>%1</em> for the " - "text is not a valid filename.</qt>").arg(txturl)); + "text is not a valid filename.</qt>").tqarg(txturl)); return; }*/ if (convertPDBtoTXT(pdbinfo.dirPath(true), pdbinfo.fileName(), txtinfo.dirPath(true), txtinfo.fileName(), &conv) ) { - KMessageBox::information(this, i18n("Conversion of file %1 successful.").arg(pdburl)); + KMessageBox::information(this, i18n("Conversion of file %1 successful.").tqarg(pdburl)); } } @@ -324,8 +324,8 @@ void ConverterDlg::slotToPDB() int res=KMessageBox::questionYesNo(this, i18n("<qt>You selected to sync folders, " "but gave a filename instead (<em>%1</em>)." - "<br>Use folder <em>%2</em> instead?</qt>").arg(txturl) - .arg(txtinfo.dirPath(true)), TQString(), i18n("Use Folder"), KStdGuiItem::cancel()); + "<br>Use folder <em>%2</em> instead?</qt>").tqarg(txturl) + .tqarg(txtinfo.dirPath(true)), TQString(), i18n("Use Folder"), KStdGuiItem::cancel()); if (res==KMessageBox::Yes) { txturl=txtinfo.dirPath(true); @@ -338,7 +338,7 @@ void ConverterDlg::slotToPDB() { KMessageBox::sorry(this, i18n("<qt>The folder <em>%1</em> for " - "the text files is not a valid folder.</qt>").arg(txturl)); + "the text files is not a valid folder.</qt>").tqarg(txturl)); return; } @@ -350,8 +350,8 @@ void ConverterDlg::slotToPDB() i18n("<qt>You selected to sync folders, " "but gave a filename instead (<em>%1</em>)." "<br>Use folder <em>%2</em> instead?</qt>") - .arg(pdburl) - .arg(pdbinfo.dirPath(true)), TQString(), i18n("Use Folder"), KStdGuiItem::cancel()); + .tqarg(pdburl) + .tqarg(pdbinfo.dirPath(true)), TQString(), i18n("Use Folder"), KStdGuiItem::cancel()); if (res==KMessageBox::Yes) { pdburl=pdbinfo.dirPath(true); pdbinfo.setFile(pdburl); @@ -365,7 +365,7 @@ void ConverterDlg::slotToPDB() } if (!pdbinfo.isDir()) { KMessageBox::sorry(this, i18n("<qt>The folder <em>%1</em> for " - "the PalmDOC files could not be created.</qt>").arg(pdburl)); + "the PalmDOC files could not be created.</qt>").tqarg(pdburl)); return; } @@ -403,14 +403,14 @@ void ConverterDlg::slotToPDB() if (!txtinfo.isFile() || !txtinfo.exists()) { KMessageBox::sorry(this, i18n("<qt>The file <em>%1</em> does not " - "exist.</qt>").arg(txturl)); + "exist.</qt>").tqarg(txturl)); return; } if (convertTXTtoPDB(txtinfo.dirPath(true), txtinfo.fileName(), pdbinfo.dirPath(true), pdbinfo.fileName(), &conv) ) { - KMessageBox::information(this, i18n("Conversion of file %1 successful.").arg(txturl)); + KMessageBox::information(this, i18n("Conversion of file %1 successful.").tqarg(txturl)); } } @@ -454,7 +454,7 @@ bool ConverterDlg::convertTXTtoPDB(TQString txtdir, TQString txtfile, if (!dbfileinfo.exists() || !askOverwrite || (KMessageBox::Yes==KMessageBox::questionYesNo(this, i18n("<qt>The database file <em>%1</em> already exists. Overwrite it?</qt>") - .arg(dbfileinfo.filePath()), TQString(), i18n("Overwrite"), KStdGuiItem::cancel() ) )) + .tqarg(dbfileinfo.filePath()), TQString(), i18n("Overwrite"), KStdGuiItem::cancel() ) )) { PilotLocalDatabase*pdbdb=new PilotLocalDatabase(pdbdir, TQFileInfo(pdbfile).baseName(), false); if (pdbdb) @@ -479,7 +479,7 @@ bool ConverterDlg::convertTXTtoPDB(TQString txtdir, TQString txtfile, } if ( !res && verbose ) { - KMessageBox::sorry(this, i18n("<qt>Error while converting the text %1.</qt>").arg(txtfile)); + KMessageBox::sorry(this, i18n("<qt>Error while converting the text %1.</qt>").tqarg(txtfile)); } } else @@ -499,7 +499,7 @@ bool ConverterDlg::convertPDBtoTXT(TQString pdbdir, TQString pdbfile, if (!txtfileinfo.exists() || !askOverwrite || (KMessageBox::Yes==KMessageBox::questionYesNo(this, i18n("<qt>The text file <em>%1</em> already exists. Overwrite it?</qt>") - .arg(txtfileinfo.filePath()), TQString(), i18n("Overwrite"), KStdGuiItem::cancel() ) )) + .tqarg(txtfileinfo.filePath()), TQString(), i18n("Overwrite"), KStdGuiItem::cancel() ) )) { PilotLocalDatabase*pdbdb=new PilotLocalDatabase(pdbdir, TQFileInfo(pdbfile).baseName(), false); if (pdbdb) @@ -515,7 +515,7 @@ bool ConverterDlg::convertPDBtoTXT(TQString pdbdir, TQString pdbfile, } if ( !res && verbose ) { - KMessageBox::sorry(this, i18n("<qt>Error while converting the text %1.</qt>").arg(pdbfile)); + KMessageBox::sorry(this, i18n("<qt>Error while converting the text %1.</qt>").tqarg(pdbfile)); } } else diff --git a/conduits/docconduit/kpalmdoc_dlgbase.ui b/conduits/docconduit/kpalmdoc_dlgbase.ui index c693e90..9b92d8d 100644 --- a/conduits/docconduit/kpalmdoc_dlgbase.ui +++ b/conduits/docconduit/kpalmdoc_dlgbase.ui @@ -127,7 +127,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -181,7 +181,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -198,7 +198,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -215,7 +215,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -299,7 +299,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>200</height> @@ -329,7 +329,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>190</height> diff --git a/conduits/docconduit/pilotDOCEntry.h b/conduits/docconduit/pilotDOCEntry.h index 4ecaf19..679f35a 100644 --- a/conduits/docconduit/pilotDOCEntry.h +++ b/conduits/docconduit/pilotDOCEntry.h @@ -50,7 +50,7 @@ public: TQString getText() { fText.Decompress(); - return TQString::fromLatin1((const char *) fText.text()); + return TQString::tqfromLatin1((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 ca32913..7664f46 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>").arg(noteId).arg(memoId); } ; + TQString toString() const { return CSL1("<%1,%2>").tqarg(noteId).tqarg(memoId); } ; static NoteAndMemo findNote(const TQValueList<NoteAndMemo> &,KNoteID_pt note); static NoteAndMemo findMemo(const TQValueList<NoteAndMemo> &,int memo); @@ -234,7 +234,7 @@ KNotesAction::KNotesAction(KPilotLink *o, } fP->fTimer = new TQTimer(this); - fActionStatus = Init; + fActiontqStatus = 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").arg(mURL.path()) ); + emit logError( i18n("Could not load the resource at: %1").tqarg(mURL.path()) ); return false; } } @@ -308,9 +308,9 @@ void KNotesAction::listNotes() { FUNCTIONSETUP; - DEBUGKPILOT << fname << ": Now in state " << fActionStatus << endl; + DEBUGKPILOT << fname << ": Now in state " << fActiontqStatus << endl; - switch(fActionStatus) + switch(fActiontqStatus) { case Init: resetIndexes(); @@ -321,16 +321,16 @@ void KNotesAction::listNotes() case SyncAction::SyncMode::eBackup: case SyncAction::SyncMode::eRestore: // Impossible! - fActionStatus = Done; + fActiontqStatus = Done; break; case SyncAction::SyncMode::eCopyHHToPC : listNotes(); // Debugging - fActionStatus = MemosToKNotes; + fActiontqStatus = MemosToKNotes; break; case SyncAction::SyncMode::eHotSync: case SyncAction::SyncMode::eFullSync: case SyncAction::SyncMode::eCopyPCToHH: - fActionStatus = ModifiedNotesToPilot; + fActiontqStatus = ModifiedNotesToPilot; break; } break; @@ -338,14 +338,14 @@ void KNotesAction::listNotes() if (modifyNoteOnPilot()) { resetIndexes(); - fActionStatus = DeleteNotesOnPilot; + fActiontqStatus = DeleteNotesOnPilot; } break; case DeleteNotesOnPilot: if (deleteNoteOnPilot()) { resetIndexes(); - fActionStatus = NewNotesToPilot; + fActiontqStatus = NewNotesToPilot; } break; case NewNotesToPilot : @@ -359,14 +359,14 @@ void KNotesAction::listNotes() case SyncAction::SyncMode::eRestore: case SyncAction::SyncMode::eCopyHHToPC : // Impossible! - fActionStatus = Done; + fActiontqStatus = Done; break; case SyncAction::SyncMode::eHotSync: case SyncAction::SyncMode::eFullSync: - fActionStatus = MemosToKNotes; + fActiontqStatus = MemosToKNotes; break; case SyncAction::SyncMode::eCopyPCToHH: - fActionStatus = Cleanup; + fActiontqStatus = Cleanup; break; } } @@ -374,7 +374,7 @@ void KNotesAction::listNotes() case MemosToKNotes : if (syncMemoToKNotes()) { - fActionStatus=Cleanup; + fActiontqStatus=Cleanup; } break; case Cleanup : @@ -791,7 +791,7 @@ void KNotesAction::cleanupMemos() KNotesConduitSettings::setMemoIds(memos); KNotesConduitSettings::self()->writeConfig(); - fActionStatus=Done; + fActiontqStatus=Done; fDatabase->cleanup(); fDatabase->resetSyncFlags(); fLocalDatabase->cleanup(); @@ -848,23 +848,23 @@ void KNotesAction::cleanupMemos() /* virtual */ TQString KNotesAction::statusString() const { - switch(fActionStatus) + switch(fActiontqStatus) { case Init : return CSL1("Init"); case NewNotesToPilot : return CSL1("NewNotesToPilot key=%1"); - // TODO DCOP_REMOVAL .arg(fP->fIndex.key()); + // TODO DCOP_REMOVAL .tqarg(fP->fIndex.key()); case ModifiedNotesToPilot : return CSL1("ModifiedNotesToPilot key=%1"); - //TODO DCOP_REMOVAL .arg(fP->fIndex.key()); + //TODO DCOP_REMOVAL .tqarg(fP->fIndex.key()); case MemosToKNotes : return CSL1("MemosToKNotes rec=%1") - .arg(fP->fRecordIndex); + .tqarg(fP->fRecordIndex); case Cleanup : return CSL1("Cleanup"); case Done : return CSL1("Done"); default : - return CSL1("Unknown (%1)").arg(fActionStatus); + return CSL1("Unknown (%1)").tqarg(fActiontqStatus); } } diff --git a/conduits/knotes/knotes-action.h b/conduits/knotes/knotes-action.h index bd057b7..223dfe2 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 Status { Init, + enum tqStatus { Init, ModifiedNotesToPilot, DeleteNotesOnPilot, NewNotesToPilot, diff --git a/conduits/knotes/setup_base.ui b/conduits/knotes/setup_base.ui index 1757b88..15d902f 100644 --- a/conduits/knotes/setup_base.ui +++ b/conduits/knotes/setup_base.ui @@ -72,7 +72,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>101</height> diff --git a/conduits/malconduit/mal-conduit.cc b/conduits/malconduit/mal-conduit.cc index 5aa5883..69a3f19 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::currentDateTime() ); + MALConduitSettings::setLastMALSync( TQDateTime::tqcurrentDateTime() ); MALConduitSettings::self()->writeConfig(); } @@ -152,7 +152,7 @@ void MALConduit::saveConfig() bool MALConduit::skip() { - TQDateTime now=TQDateTime::currentDateTime(); + TQDateTime now=TQDateTime::tqcurrentDateTime(); 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").arg(proxyServer); + syncMessage = i18n("Using proxy server: %1").tqarg(proxyServer); #ifdef DEBUG DEBUGKPILOT<<" Using HTTP proxy server \""<<proxyServer<< @@ -259,7 +259,7 @@ bool MALConduit::skip() syncMessage = i18n("No SOCKS proxy is set."); break; } - syncMessage = i18n("Using SOCKS proxy: %1").arg(proxyServer); + syncMessage = i18n("Using SOCKS proxy: %1").tqarg(proxyServer); #ifdef DEBUG DEBUGKPILOT<<" Using SOCKS proxy server \""<<proxyServer<<"\", Port "<<proxyPort<<", User "<<MALConduitSettings::proxyUser()<<", Password "<<( (MALConduitSettings::proxyPassword().isEmpty())?TQString("not "):TQString() )<<"set"<<endl; #endif diff --git a/conduits/malconduit/mal-setup_dialog.ui b/conduits/malconduit/mal-setup_dialog.ui index b6cf743..ff78fd3 100644 --- a/conduits/malconduit/mal-setup_dialog.ui +++ b/conduits/malconduit/mal-setup_dialog.ui @@ -137,7 +137,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -245,7 +245,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -397,7 +397,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>70</height> @@ -489,7 +489,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -559,7 +559,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/conduits/memofileconduit/memofile-conduit.cc b/conduits/memofileconduit/memofile-conduit.cc index 1c65d12..42461f5 100644 --- a/conduits/memofileconduit/memofile-conduit.cc +++ b/conduits/memofileconduit/memofile-conduit.cc @@ -43,7 +43,7 @@ #include <tqfile.h> #include <tqdir.h> -#include <textcodec.h> +#include <tqtextcodec.h> #include <kconfig.h> #include <kdebug.h> @@ -120,7 +120,7 @@ MemofileConduit::~MemofileConduit() fCtrPC->setStartCount(_memofiles->count()); setFirstSync( _memofiles->isFirstSync() ); - addSyncLogEntry(i18n(" Syncing with %1.").arg(_memo_directory)); + addSyncLogEntry(i18n(" Syncing with %1.").tqarg(_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 " << fActionStatus << endl; + DEBUGKPILOT << fname << ": Now in state " << fActiontqStatus << endl; } diff --git a/conduits/memofileconduit/memofile.h b/conduits/memofileconduit/memofile.h index 3ba9114..1308e98 100644 --- a/conduits/memofileconduit/memofile.h +++ b/conduits/memofileconduit/memofile.h @@ -42,8 +42,8 @@ #include <tqfile.h> #include <tqdir.h> -#include <textstream.h> -#include <textcodec.h> +#include <tqtextstream.h> +#include <tqtextcodec.h> #include "pilotMemo.h" diff --git a/conduits/memofileconduit/setup_base.ui b/conduits/memofileconduit/setup_base.ui index fba82af..d3bf795 100644 --- a/conduits/memofileconduit/setup_base.ui +++ b/conduits/memofileconduit/setup_base.ui @@ -81,7 +81,7 @@ the Memofile-conduit settings.</comment> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>180</height> diff --git a/conduits/notepadconduit/notepad-conduit.cc b/conduits/notepadconduit/notepad-conduit.cc index 10d9bf7..942dbd3 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").arg(dir.path())); + emit logError(i18n("Unable to open %1").tqarg(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").arg(NotepadConduitSettings::outputDirectory()).arg(filename); + TQString imgname = TQString("%1/%2.png").tqarg(NotepadConduitSettings::outputDirectory()).tqarg(filename); #ifdef DEBUG diff --git a/conduits/notepadconduit/notepad-setup.ui b/conduits/notepadconduit/notepad-setup.ui index ac74d9d..02aec75 100644 --- a/conduits/notepadconduit/notepad-setup.ui +++ b/conduits/notepadconduit/notepad-setup.ui @@ -45,7 +45,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>250</height> diff --git a/conduits/null/setup_base.ui b/conduits/null/setup_base.ui index 7cfcbe4..f64d05c 100644 --- a/conduits/null/setup_base.ui +++ b/conduits/null/setup_base.ui @@ -109,7 +109,7 @@ the Null-conduit settings.</comment> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/conduits/popmail/popmail-conduit.cc b/conduits/popmail/popmail-conduit.cc index d328173..15441e5 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 <pi-mail.h> #include <tqdir.h> -#include <textstream.h> -#include <textcodec.h> +#include <tqtextstream.h> +#include <tqtextcodec.h> #include <kapplication.h> #include <kmessagebox.h> @@ -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::currentDateTime(); + TQDateTime date = TQDateTime::tqcurrentDateTime(); if (theMail.dated) { date = readTm(theMail.date); @@ -377,7 +377,7 @@ void PopMailConduit::writeMessageToFile(FILE* sendf, struct Mail& theMail) << outbox << endl; - TQDateTime date = TQDateTime::currentDateTime(); + TQDateTime date = TQDateTime::tqcurrentDateTime(); 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 5d0566d..38b0c27 100644 --- a/conduits/popmail/setup-dialog.ui +++ b/conduits/popmail/setup-dialog.ui @@ -47,7 +47,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> diff --git a/conduits/recordconduit/setup_base.ui b/conduits/recordconduit/setup_base.ui index 448a099..3608371 100644 --- a/conduits/recordconduit/setup_base.ui +++ b/conduits/recordconduit/setup_base.ui @@ -128,7 +128,7 @@ the Record-conduit settings.</comment> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/conduits/sysinfoconduit/sysinfo-conduit.cc b/conduits/sysinfoconduit/sysinfo-conduit.cc index 5ed758f..4d1a35f 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::fromLatin1(sysinfo.getProductID()); + fValues[CSL1("deviceid")] = TQString::tqfromLatin1(sysinfo.getProductID()); const KPilotCard *device = fHandle->getCardInfo(); if (device) { - fValues[CSL1("devicename")] = TQString::fromLatin1(device->getCardName()); + fValues[CSL1("devicename")] = TQString::tqfromLatin1(device->getCardName()); fValues[CSL1("devicemodel")] = unknown; // TODO - fValues[CSL1("manufacturer")] = TQString::fromLatin1(device->getCardManufacturer()); + fValues[CSL1("manufacturer")] = TQString::tqfromLatin1(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)") - .arg(TQString::fromLatin1(device->getCardName())) - .arg(TQString::fromLatin1(device->getCardManufacturer())) - .arg(device->getRamFree()/1024) - .arg(device->getRamSize()/1024); + .tqarg(TQString::tqfromLatin1(device->getCardName())) + .tqarg(TQString::tqfromLatin1(device->getCardManufacturer())) + .tqarg(device->getRamFree()/1024) + .tqarg(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::fromLatin1(KPILOT_VERSION); + fValues[CSL1("kpilot")] = TQString::tqfromLatin1(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") - .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)); + .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)); } #ifdef TDE_VERSION_STRING - fValues[CSL1("kde")] = TQString::fromLatin1(TDE_VERSION_STRING); + fValues[CSL1("kde")] = TQString::tqfromLatin1(TDE_VERSION_STRING); #endif #ifdef TQT_VERSION_STR - fValues[CSL1("qt")] = TQString::fromLatin1(TQT_VERSION_STR); + fValues[CSL1("qt")] = TQString::tqfromLatin1(TQT_VERSION_STR); #endif fValues[CSL1("pilotlink")] = CSL1("%1.%2.%3%4") - .arg(PILOT_LINK_VERSION) - .arg(PILOT_LINK_MAJOR) - .arg(PILOT_LINK_MINOR) + .tqarg(PILOT_LINK_VERSION) + .tqarg(PILOT_LINK_MAJOR) + .tqarg(PILOT_LINK_MINOR) #ifdef PILOT_LINK_PATCH - .arg(TQString::fromLatin1(PILOT_LINK_PATCH)); + .tqarg(TQString::tqfromLatin1(PILOT_LINK_PATCH)); #else - .arg(TQString()); + .tqarg(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)") - .arg(fHandle->getSysInfo()->getMajorVersion()) - .arg(fHandle->getSysInfo()->getMinorVersion()) - .arg(fHandle->getSysInfo()->getCompatMajorVersion()) - .arg(fHandle->getSysInfo()->getCompatMinorVersion());*/ + .tqarg(fHandle->getSysInfo()->getMajorVersion()) + .tqarg(fHandle->getSysInfo()->getMinorVersion()) + .tqarg(fHandle->getSysInfo()->getCompatMajorVersion()) + .tqarg(fHandle->getSysInfo()->getCompatMinorVersion());*/ KPilotSysInfo i = deviceLink()->getSysInfo(); - fValues[CSL1("palmos")] = CSL1("PalmOS %1.%2").arg(i.getMajorVersion()).arg(i.getMinorVersion()); + fValues[CSL1("palmos")] = CSL1("PalmOS %1.%2").tqarg(i.getMajorVersion()).tqarg(i.getMinorVersion()); keepParts.append(CSL1("palmversion")); } else removeParts.append(CSL1("palmversion")); @@ -470,7 +470,7 @@ void SysInfoConduit::writeFile() { FUNCTIONSETUP; - fValues[CSL1("date")] = TQDateTime::currentDateTime().toString(Qt::LocalDate); + fValues[CSL1("date")] = TQDateTime::tqcurrentDateTime().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("<!--#if%1#.*#endif%1#-->").arg(*it).arg(*it)); + TQRegExp re(CSL1("<!--#if%1#.*#endif%1#-->").tqarg(*it).tqarg(*it)); re.setMinimal(true); output.remove(re); } for ( TQStringList::Iterator it = keepParts.begin(); it != keepParts.end(); ++it ) { - TQRegExp re(CSL1("<!--#if%1#(.*)#endif%1#-->").arg(*it).arg(*it)); + TQRegExp re(CSL1("<!--#if%1#(.*)#endif%1#-->").tqarg(*it).tqarg(*it)); re.setMinimal(true); output.replace(re, CSL1("\\1")); } @@ -526,7 +526,7 @@ void SysInfoConduit::writeFile() // Do a loop through all keys in fValues TQMap<TQString,TQString>::Iterator it; for ( it = fValues.begin(); it != fValues.end(); ++it ) { - output.replace(CSL1("#%1#").arg(it.key()), it.data()); + output.replace(CSL1("#%1#").tqarg(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::fromLatin1(dbi.name)); + newpatt.replace(CSL1("%0"), TQString::tqfromLatin1(dbi.name)); set_long(&tmpchr[0],dbi.type); - newpatt.replace(CSL1("%1"), TQString::fromLatin1(tmpchr)); + newpatt.replace(CSL1("%1"), TQString::tqfromLatin1(tmpchr)); set_long(&tmpchr[0],dbi.creator); - newpatt.replace(CSL1("%2"), TQString::fromLatin1(tmpchr)); + newpatt.replace(CSL1("%2"), TQString::tqfromLatin1(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.").arg(fOutputFile)); + emit logMessage(i18n("Unable to open output file, using %1 instead.").tqarg(fOutputFile)); outfile.setName(fOutputFile); if (!outfile.open(IO_WriteOnly)) { WARNINGKPILOT<< "Unable to open " << fOutputFile << endl; - emit logError(i18n("Unable to open %1").arg(fOutputFile)); + emit logError(i18n("Unable to open %1").tqarg(fOutputFile)); TQTimer::singleShot(0, this, TQT_SLOT(cleanup())); return; } @@ -599,7 +599,7 @@ void SysInfoConduit::writeFile() outstream<<output; outfile.close(); - emit logMessage(i18n("Handheld system information written to the file %1").arg(fOutputFile)); + emit logMessage(i18n("Handheld system information written to the file %1").tqarg(fOutputFile)); TQTimer::singleShot(0, this, TQT_SLOT(cleanup())); } diff --git a/conduits/sysinfoconduit/sysinfo-setup_dialog.ui b/conduits/sysinfoconduit/sysinfo-setup_dialog.ui index d23be0e..7e5fbc1 100644 --- a/conduits/sysinfoconduit/sysinfo-setup_dialog.ui +++ b/conduits/sysinfoconduit/sysinfo-setup_dialog.ui @@ -48,7 +48,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>51</height> @@ -160,7 +160,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>20</height> diff --git a/conduits/timeconduit/time-conduit.cc b/conduits/timeconduit/time-conduit.cc index 76798db..20000e5 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::currentDateTime().toString() << endl; + << TQDateTime::tqcurrentDateTime().toString() << endl; #endif return delayDone(); } diff --git a/conduits/vcalconduit/cleanupstate.cc b/conduits/vcalconduit/cleanupstate.cc index 209a0e9..76d756d 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.") - .arg(vccb->config()->calendarFile()).arg(fCalendarFile)); + .tqarg(vccb->config()->calendarFile()).tqarg(fCalendarFile)); } else { KIO::NetAccess::removeTempFile( fCalendarFile ); diff --git a/conduits/vcalconduit/hhtopcstate.cc b/conduits/vcalconduit/hhtopcstate.cc index 82024f1..4fa12af 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->setSyncStatus( KCal::Incidence::SYNCDEL ); + e->setSynctqStatus( KCal::Incidence::SYNCDEL ); } } } @@ -218,7 +218,7 @@ void VCalConduitBase::slotPalmRecToPC() { KCal::Incidence*e=addRecord(r); if (config()->syncArchived() && archiveRecord) { - e->setSyncStatus(KCal::Incidence::SYNCDEL); + e->setSynctqStatus(KCal::Incidence::SYNCDEL); } } } diff --git a/conduits/vcalconduit/korganizerConduit.ui b/conduits/vcalconduit/korganizerConduit.ui index 7fa4491..52904b4 100644 --- a/conduits/vcalconduit/korganizerConduit.ui +++ b/conduits/vcalconduit/korganizerConduit.ui @@ -79,7 +79,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -243,7 +243,7 @@ be saved in the calendar on the PC.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>31</height> diff --git a/conduits/vcalconduit/pctohhstate.cc b/conduits/vcalconduit/pctohhstate.cc index d2866fd..84d50ed 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->syncStatus() == KCal::Incidence::SYNCDEL ) + if( e->synctqStatus() == KCal::Incidence::SYNCDEL ) { vccb->deletePalmRecord( e, s ); } diff --git a/conduits/vcalconduit/todo-conduit.cc b/conduits/vcalconduit/todo-conduit.cc index 4eee4b4..8a04f15 100644 --- a/conduits/vcalconduit/todo-conduit.cc +++ b/conduits/vcalconduit/todo-conduit.cc @@ -35,7 +35,7 @@ #include "options.h" #include <tqdatetime.h> -#include <textcodec.h> +#include <tqtextcodec.h> #include <libkcal/calendar.h> #include <libkcal/todo.h> @@ -154,13 +154,13 @@ KCal::Incidence *TodoConduitPrivate::getNextModifiedIncidence() } if ( fAllTodosIterator != fAllTodos.end() ) e=*fAllTodosIterator; while (fAllTodosIterator != fAllTodos.end() && - e && e->syncStatus()!=KCal::Incidence::SYNCMOD && e->pilotId()) + e && e->synctqStatus()!=KCal::Incidence::SYNCMOD && e->pilotId()) { e = (++fAllTodosIterator != fAllTodos.end()) ? *fAllTodosIterator : 0L; #ifdef DEBUG if(e) - DEBUGKPILOT<< e->summary()<<" had SyncStatus="<<e->syncStatus()<<endl; + DEBUGKPILOT<< e->summary()<<" had SyncStatus="<<e->synctqStatus()<<endl; #endif } diff --git a/conduits/vcalconduit/todoRecord.cc b/conduits/vcalconduit/todoRecord.cc index 7618df3..f3baaeb 100644 --- a/conduits/vcalconduit/todoRecord.cc +++ b/conduits/vcalconduit/todoRecord.cc @@ -126,7 +126,7 @@ bool KCalSync::setTodo(KCal::Todo *e, // COMPLETED? // e->setCompleted(de->getComplete()); if ( de->getComplete() && !e->hasCompletedDate() ) { - e->setCompleted( TQDateTime::currentDateTime() ); + e->setCompleted( TQDateTime::tqcurrentDateTime() ); } 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 - // setSyncStatus(SYNCMOD)!!! - e->setSyncStatus(KCal::Incidence::SYNCNONE); + // setSynctqStatus(SYNCMOD)!!! + e->setSynctqStatus(KCal::Incidence::SYNCNONE); return true; } diff --git a/conduits/vcalconduit/vcal-conduit.cc b/conduits/vcalconduit/vcal-conduit.cc index 2cdc5d3..52bd759 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->syncStatus()!=KCal::Incidence::SYNCMOD && e->pilotId() > 0) + e && e->synctqStatus()!=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.").arg(e->summary())); + 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())); } PilotDateEntry *dateEntry = dynamic_cast<PilotDateEntry*>(de); diff --git a/conduits/vcalconduit/vcal-conduitbase.cc b/conduits/vcalconduit/vcal-conduitbase.cc index 19b6790..33ae4f1 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" ).arg( tz ) : - i18n( "Using non-local time zone: %1" ).arg( tz ) ); + i18n( "Using local time zone: %1" ).tqarg( tz ) : + i18n( "Using non-local time zone: %1" ).tqarg( 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." ).arg( config()->calendarFile() ) ); + "Aborting the conduit." ).tqarg( 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." ).arg( config()->calendarFile() ) ); + "Aborting the conduit." ).tqarg( config()->calendarFile() ) ); return false; } fl.close(); setFirstSync( true ); } addSyncLogEntry( i18n( "Syncing with file \"%1\"" ) - .arg( config()->calendarFile() ) ); + .tqarg( 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" ).arg( tz ) : - i18n( "Using non-local time zone: %1" ).arg( tz ) ); + i18n( "Using local time zone: %1" ).tqarg( tz ) : + i18n( "Using non-local time zone: %1" ).tqarg( 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->syncStatus() != KCal::Incidence::SYNCNONE ) + if ( ( e->synctqStatus() != 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 - // setSyncStatus(SYNCMOD)!!! - e->setSyncStatus(KCal::Incidence::SYNCNONE); + // setSynctqStatus(SYNCMOD)!!! + e->setSynctqStatus(KCal::Incidence::SYNCNONE); fLocalDatabase->writeRecord( r ); } else @@ -552,7 +552,7 @@ void VCalConduitBase::updateIncidenceOnPalm( KCal::Incidence *e, return; } - if ( e->syncStatus() == KCal::Incidence::SYNCDEL ) + if ( e->synctqStatus() == 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 - // setSyncStatus(SYNCMOD)!!! - e->setSyncStatus(KCal::Incidence::SYNCNONE); + // setSynctqStatus(SYNCMOD)!!! + e->setSynctqStatus(KCal::Incidence::SYNCNONE); KPILOT_DELETE( r ); } } diff --git a/conduits/vcalconduit/vcalRecord.cc b/conduits/vcalconduit/vcalRecord.cc index 898bc79..fc274b1 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 - // setSyncStatus(SYNCMOD)!!! - e->setSyncStatus(KCal::Incidence::SYNCNONE); + // setSynctqStatus(SYNCMOD)!!! + e->setSynctqStatus(KCal::Incidence::SYNCNONE); return true; } |