From f6f9c296c3f9d39a8c3d0ee64a542a47f450be28 Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 1 Jul 2011 00:37:32 +0000 Subject: [PATCH] TQt4 port kpilot This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kpilot@1238903 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- .../KPilotCustomFieldEditor.ui | 34 +++--- conduits/abbrowserconduit/Makefile.am | 2 +- .../abbrowserconduit/abbrowser-conduit.cc | 24 ++-- conduits/abbrowserconduit/abbrowser-conduit.h | 1 + conduits/abbrowserconduit/abbrowser-setup.cc | 2 +- conduits/abbrowserconduit/kabcRecord.cc | 4 +- .../abbrowserconduit/kaddressbookConduit.ui | 60 +++++----- conduits/abbrowserconduit/resolutionDialog.cc | 28 ++--- conduits/abbrowserconduit/resolutionDialog.h | 3 +- .../abbrowserconduit/resolutionDialog_base.ui | 18 +-- conduits/docconduit/DOC-converter.cc | 22 ++-- conduits/docconduit/DOC-converter.h | 3 +- conduits/docconduit/Makefile.am | 2 +- conduits/docconduit/doc-conduit.cc | 52 ++++---- conduits/docconduit/doc-conduit.h | 9 +- conduits/docconduit/doc-conflictdialog.cc | 16 +-- conduits/docconduit/doc-conflictdialog.h | 3 +- conduits/docconduit/doc-factory.cc | 4 +- conduits/docconduit/doc-factory.h | 10 +- conduits/docconduit/doc-setupdialog.ui | 60 +++++----- conduits/docconduit/kpalmdoc_dlg.cc | 50 ++++---- conduits/docconduit/kpalmdoc_dlg.h | 3 +- conduits/docconduit/kpalmdoc_dlgbase.ui | 44 +++---- conduits/knotes/Makefile.am | 2 +- conduits/knotes/knotes-action.cc | 40 +++---- conduits/knotes/knotes-action.h | 3 +- conduits/knotes/knotes-factory.cc | 2 +- conduits/knotes/knotes-factory.h | 5 +- conduits/knotes/knotes-setup.h | 2 +- conduits/knotes/setup_base.ui | 10 +- conduits/malconduit/Makefile.am | 2 +- conduits/malconduit/mal-conduit.cc | 4 +- conduits/malconduit/mal-conduit.h | 1 + conduits/malconduit/mal-factory.cc | 4 +- conduits/malconduit/mal-factory.h | 5 +- conduits/malconduit/mal-setup.cc | 2 +- conduits/malconduit/mal-setup.h | 1 + conduits/malconduit/mal-setup_dialog.ui | 60 +++++----- conduits/memofileconduit/Makefile.am | 2 +- conduits/memofileconduit/memofile-conduit.cc | 8 +- conduits/memofileconduit/memofile-conduit.h | 5 +- conduits/memofileconduit/memofile-factory.cc | 2 +- conduits/memofileconduit/memofile.h | 2 +- conduits/memofileconduit/memofileconduit.xmi | 36 +++--- conduits/memofileconduit/memofiles.cc | 16 +-- conduits/memofileconduit/memofiles.h | 4 +- conduits/memofileconduit/setup_base.ui | 12 +- conduits/notepadconduit/Makefile.am | 2 +- conduits/notepadconduit/notepad-conduit.cc | 8 +- conduits/notepadconduit/notepad-conduit.h | 4 +- conduits/notepadconduit/notepad-factory.cc | 2 +- conduits/notepadconduit/notepad-setup.ui | 8 +- conduits/null/Makefile.am | 2 +- conduits/null/null-conduit.cc | 2 +- conduits/null/null-factory.cc | 2 +- conduits/null/setup_base.ui | 10 +- conduits/popmail/Makefile.am | 2 +- conduits/popmail/setup-dialog.ui | 18 +-- conduits/popmail/setupDialog.h | 1 + conduits/recordconduit/Makefile.am | 2 +- conduits/recordconduit/factory.cc | 2 +- conduits/recordconduit/setup_base.ui | 16 +-- conduits/sysinfoconduit/Makefile.am | 2 +- conduits/sysinfoconduit/Template.html | 2 +- conduits/sysinfoconduit/sysinfo-conduit.cc | 56 ++++----- conduits/sysinfoconduit/sysinfo-conduit.h | 1 + conduits/sysinfoconduit/sysinfo-setup.cc | 4 +- conduits/sysinfoconduit/sysinfo-setup.h | 2 +- .../sysinfoconduit/sysinfo-setup_dialog.ui | 20 ++-- conduits/timeconduit/Makefile.am | 2 +- conduits/timeconduit/time-setup.h | 3 +- conduits/timeconduit/time-setup_dialog.ui | 14 +-- conduits/vcalconduit/Makefile.am | 6 +- conduits/vcalconduit/cleanupstate.cc | 2 +- conduits/vcalconduit/hhtopcstate.cc | 4 +- conduits/vcalconduit/korganizerConduit.ui | 20 ++-- conduits/vcalconduit/pctohhstate.cc | 2 +- conduits/vcalconduit/teststate.cc | 2 +- conduits/vcalconduit/todo-conduit.cc | 6 +- conduits/vcalconduit/todo-conduit.h | 1 + conduits/vcalconduit/todoRecord.cc | 4 +- conduits/vcalconduit/vcal-conduit.cc | 6 +- conduits/vcalconduit/vcal-conduit.h | 1 + conduits/vcalconduit/vcal-conduitbase.cc | 30 ++--- conduits/vcalconduit/vcal-conduitbase.h | 1 + conduits/vcalconduit/vcalRecord.cc | 4 +- configure.in.in | 6 + kpilot/addressEditor.cc | 12 +- kpilot/addressEditor.h | 3 +- kpilot/addressWidget.cc | 16 +-- kpilot/addressWidget.h | 7 +- kpilot/conduitConfigDialog.cc | 60 +++++----- kpilot/conduitConfigDialog.h | 2 + kpilot/datebookWidget.cc | 4 +- kpilot/datebookWidget.h | 3 +- kpilot/dbAppInfoEditor.cc | 8 +- kpilot/dbAppInfoEditor.h | 3 +- kpilot/dbFlagsEditor.cc | 4 +- kpilot/dbFlagsEditor.h | 3 +- kpilot/dbFlagsEditor_base.ui | 38 +++--- kpilot/dbFlagsEditor_base.ui.h | 4 +- kpilot/dbRecordEditor.cc | 10 +- kpilot/dbRecordEditor.h | 12 +- kpilot/dbRecordEditor_base.ui | 22 ++-- kpilot/dbSelectionDialog.cc | 2 +- kpilot/dbSelectionDialog.h | 1 + kpilot/dbSelection_base.ui | 2 +- kpilot/dbviewerWidget.cc | 30 ++--- kpilot/dbviewerWidget.h | 3 +- kpilot/fileInstallWidget.cc | 14 +-- kpilot/fileInstallWidget.h | 3 +- kpilot/fileInstaller.cc | 4 +- kpilot/fileInstaller.h | 3 +- kpilot/hotSync.cc | 68 +++++------ kpilot/hotSync.h | 7 +- kpilot/internalEditorAction.cc | 56 ++++----- kpilot/internalEditorAction.h | 5 +- kpilot/kpilot.cc | 112 +++++++++--------- kpilot/kpilot.h | 21 +++- kpilot/kpilotConfig.cc | 8 +- kpilot/kpilotConfigDialog.cc | 4 +- kpilot/kpilotConfigDialog.h | 2 + kpilot/kpilotConfigDialog_backup.ui | 24 ++-- kpilot/kpilotConfigDialog_device.ui | 22 ++-- kpilot/kpilotConfigDialog_startup.ui | 14 +-- kpilot/kpilotConfigDialog_sync.ui | 14 +-- kpilot/kpilotConfigDialog_viewers.ui | 16 +-- kpilot/kpilotConfigWizard.cc | 6 +- kpilot/kpilotConfigWizard.h | 1 + kpilot/kpilotConfigWizard_app.ui | 12 +- kpilot/kpilotConfigWizard_user.ui | 20 ++-- kpilot/kpilotDCOP.h | 6 +- kpilot/kpilotProbeDialog.cc | 24 ++-- kpilot/kpilotProbeDialog.h | 3 +- kpilot/kroupware.cc | 2 +- kpilot/listCat.cc | 14 +-- kpilot/listCat.h | 19 +-- kpilot/listItems.cc | 10 +- kpilot/listItems.h | 14 +-- kpilot/logFile.cc | 18 +-- kpilot/logFile.h | 1 + kpilot/logWidget.cc | 43 +++---- kpilot/logWidget.h | 1 + kpilot/memoWidget.cc | 12 +- kpilot/memoWidget.h | 3 +- kpilot/pilotComponent.cc | 10 +- kpilot/pilotComponent.h | 7 +- kpilot/pilotDaemon.cc | 80 ++++++------- kpilot/pilotDaemon.h | 20 +++- kpilot/syncCalendar.cc | 2 +- kpilot/todoEditor.cc | 6 +- kpilot/todoEditor.h | 3 +- kpilot/todoEditor_base.ui | 22 ++-- kpilot/todoWidget.cc | 12 +- kpilot/todoWidget.h | 16 +-- lib/actionQueue.h | 5 +- lib/actions.cc | 6 +- lib/actions.h | 2 +- lib/idmapperxml.h | 2 +- lib/kpilotdevicelink.cc | 66 +++++------ lib/kpilotdevicelink.h | 19 +-- lib/kpilotdevicelinkPrivate.h | 15 +-- lib/kpilotlink.cc | 12 +- lib/kpilotlink.h | 7 +- lib/kpilotlocallink.cc | 8 +- lib/kpilotlocallink.h | 3 +- lib/options.cc | 4 +- lib/options.h | 10 +- lib/pilot.cc | 2 +- lib/pilot.h | 10 +- lib/pilotAddress.cc | 24 ++-- lib/pilotAddress.h | 10 +- lib/pilotAppInfo.h | 2 +- lib/pilotDatabase.h | 2 +- lib/pilotDateEntry.cc | 42 +++---- lib/pilotDateEntry.h | 2 +- lib/pilotLocalDatabase.cc | 4 +- lib/pilotMemo.cc | 14 +-- lib/pilotMemo.h | 2 +- lib/pilotRecord.cc | 4 +- lib/pilotSerialDatabase.cc | 6 +- lib/pilotTodoEntry.cc | 20 ++-- lib/pilotTodoEntry.h | 2 +- lib/plugin.cc | 78 ++++++------ lib/plugin.h | 20 ++-- lib/pluginfactory.h | 20 ++-- lib/recordConduit.cc | 18 +-- lib/recordConduit.h | 1 + lib/syncAction.cc | 14 +-- lib/syncAction.h | 29 ++--- tests/exportdatebook.cc | 2 +- tests/mergecalendars.cc | 6 +- tests/testaddress.cc | 2 +- tests/testcategories.cc | 2 +- tests/testdatebook.cc | 2 +- 195 files changed, 1281 insertions(+), 1217 deletions(-) diff --git a/conduits/abbrowserconduit/KPilotCustomFieldEditor.ui b/conduits/abbrowserconduit/KPilotCustomFieldEditor.ui index 54782b8..63f6897 100644 --- a/conduits/abbrowserconduit/KPilotCustomFieldEditor.ui +++ b/conduits/abbrowserconduit/KPilotCustomFieldEditor.ui @@ -2,7 +2,7 @@ KPilotCustomFields This form lets you edit the custom fields synced from PalmOS handhelds by the addressbook conduit of KPilot. Reinhold Kainhofer <reinhold@kainhofer.com> - + KPILOT @@ -24,7 +24,7 @@ 0 - + mCustomFieldsGroups @@ -38,7 +38,7 @@ unnamed - + mCustom3Label @@ -52,7 +52,7 @@ <qt>Edit or enter the value of the third custom field here. Using KPilot, you can synchronize these values with the handheld's Address application custom fields.</qt> - + mCustom4Label @@ -66,7 +66,7 @@ <qt>Edit or enter the value of the fourth custom field here. Using KPilot, you can synchronize these values with the handheld's Address application custom fields.</qt> - + X_CUSTOM2 @@ -74,7 +74,7 @@ <qt>Edit or enter the value of the third custom field here. Using KPilot, you can synchronize these values with the handheld's Address application custom fields.</qt> - + X_CUSTOM1 @@ -82,7 +82,7 @@ <qt>Edit or enter the value of the second custom field here. Using KPilot, you can synchronize these values with the handheld's Address application custom fields.</qt> - + X_CUSTOM3 @@ -90,7 +90,7 @@ <qt>Edit or enter the value of the fourth custom field here. Using KPilot, you can synchronize these values with the handheld's Address application custom fields.</qt> - + mCustom2Label @@ -104,7 +104,7 @@ <qt>Edit or enter the value of the second custom field here. Using KPilot, you can synchronize these values with the handheld's Address application custom fields.</qt> - + mCustom1Label @@ -118,7 +118,7 @@ <qt>Edit or enter the value of the first custom field here. Using KPilot, you can synchronize these values with the handheld's Address application custom fields.</qt> - + X_CUSTOM0 @@ -134,7 +134,7 @@ <qt>Edit or enter the value of the first custom field here. Using KPilot, you can synchronize these values with the handheld's Address application custom fields.</qt> - + mCustomFieldsExplanation @@ -147,7 +147,7 @@ - + mMetaSyncGroup @@ -161,7 +161,7 @@ unnamed - + mRecordIDLabel @@ -172,7 +172,7 @@ X_RecordID - + mSyncFlagLabel @@ -217,7 +217,7 @@ - + mMetaSyncSettingsWarning @@ -229,7 +229,7 @@ Do NOT change these values: doing so will almost certainly result in data loss w WordBreak|AlignVCenter - + X_RecordID @@ -240,7 +240,7 @@ Do NOT change these values: doing so will almost certainly result in data loss w 2147483647 - + X_Flag diff --git a/conduits/abbrowserconduit/Makefile.am b/conduits/abbrowserconduit/Makefile.am index 6985522..40c739a 100644 --- a/conduits/abbrowserconduit/Makefile.am +++ b/conduits/abbrowserconduit/Makefile.am @@ -11,7 +11,7 @@ conduit_address_la_SOURCES = \ abbrowser-setup.cc \ kabcRecord.cc \ abbrowser-conduit.cc -conduit_address_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lkdecore -lkio -lkdeui +conduit_address_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -lkdecore -lkio -lkdeui conduit_address_la_LIBADD = ../../lib/libkpilot.la -lkabc -lkabc_file servicedir = $(kde_servicesdir) diff --git a/conduits/abbrowserconduit/abbrowser-conduit.cc b/conduits/abbrowserconduit/abbrowser-conduit.cc index e4f674a..7de5582 100644 --- a/conduits/abbrowserconduit/abbrowser-conduit.cc +++ b/conduits/abbrowserconduit/abbrowser-conduit.cc @@ -291,7 +291,7 @@ bool AbbrowserConduit::_loadAddressBook() emit logError(i18n("You chose to sync with the file \"%1\", which " "cannot be opened. Please make sure to supply a " "valid file name in the conduit's configuration dialog. " - "Aborting the conduit.").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); @@ -476,7 +476,7 @@ void AbbrowserConduit::showPilotAddress(const PilotAddress *pilotAddress) } DEBUGKPILOT << fname << "\n" << pilotAddress->getTextRepresentation( - fAddressAppInfo,Qt::PlainText) << endl; + fAddressAppInfo,TQt::PlainText) << endl; } @@ -762,7 +762,7 @@ void AbbrowserConduit::slotDeletedRecord() recordid_t id = backupRec->id(); TQString uid = addresseeMap[id]; - Addressee e = aBook->tqfindByUid(uid); + Addressee e = aBook->findByUid(uid); DEBUGKPILOT << fname << ": now looking at palm id: [" << id << "], kabc uid: [" << uid << "]." << endl; @@ -779,7 +779,7 @@ void AbbrowserConduit::slotDeletedRecord() DEBUGKPILOT << fname << ": no Addressee found for this id." << endl; DEBUGKPILOT << fname << "\n" << backupAddr->getTextRepresentation( - fAddressAppInfo,Qt::PlainText) << endl; + fAddressAppInfo,TQt::PlainText) << endl; if (palmRec) { DEBUGKPILOT << fname << ": deleting from database on palm." << endl; @@ -1493,7 +1493,7 @@ TQString AbbrowserConduit::_smartMergeString(const TQString &pc, const TQString // If this is a first sync, we don't have a backup record, so if(isFirstSync() || backup.isEmpty()) { - if (pc.isEmpty() && palm.isEmpty() ) return TQString::null; + if (pc.isEmpty() && palm.isEmpty() ) return TQString(); if(pc.isEmpty()) return palm; if(palm.isEmpty()) return pc; } else { @@ -1512,7 +1512,7 @@ TQString AbbrowserConduit::_smartMergeString(const TQString &pc, const TQString case SyncAction::ePreviousSyncOverrides: return backup; break; default: break; } - return TQString::null; + return TQString(); } @@ -1535,9 +1535,9 @@ bool AbbrowserConduit::_buildResolutionTable(ResolutionTable*tab, const Addresse #define appendGen(desc, abfield, palmfield) \ tab->append(new ResolutionItem(desc, tab->fExistItems, \ - (!pcAddr.isEmpty())?(abfield):(TQString::null), \ - (palmAddr)?(palmAddr->palmfield):(TQString::null), \ - (backupAddr)?(backupAddr->palmfield):(TQString::null) )) + (!pcAddr.isEmpty())?(abfield):(TQString()), \ + (palmAddr)?(palmAddr->palmfield):(TQString()), \ + (backupAddr)?(backupAddr->palmfield):(TQString()) )) #define appendAddr(desc, abfield, palmfield) \ appendGen(desc, abfield, getField(palmfield)) #define appendGenPhone(desc, abfield, palmfield) \ @@ -1588,7 +1588,7 @@ bool AbbrowserConduit::_buildResolutionTable(ResolutionTable*tab, const Addresse tab->fExistItems, !pcAddr.isEmpty() ? KABCSync::bestMatchedCategoryName(pcAddr.categories(), *fAddressAppInfo, category) : - TQString::null, + TQString(), palmAddrCategoryLabel, backupAddrCategoryLabel)); #undef appendGen @@ -1843,7 +1843,7 @@ Addressee AbbrowserConduit::_findMatch(const PilotAddress & pilotAddress) const DEBUGKPILOT << fname << ": PilotRecord has id " << pilotAddress.id() << ", mapped to " << id << endl; if(!id.isEmpty()) { - Addressee res(aBook->tqfindByUid(id)); + Addressee res(aBook->findByUid(id)); if(!res.isEmpty()) return res; DEBUGKPILOT << fname << ": PilotRecord has id " << pilotAddress.id() << ", but could not be found in the addressbook" << endl; } diff --git a/conduits/abbrowserconduit/abbrowser-conduit.h b/conduits/abbrowserconduit/abbrowser-conduit.h index 22e9446..464378f 100644 --- a/conduits/abbrowserconduit/abbrowser-conduit.h +++ b/conduits/abbrowserconduit/abbrowser-conduit.h @@ -54,6 +54,7 @@ typedef TQValueList RecordIDList; class AbbrowserConduit : public ConduitAction { Q_OBJECT + TQ_OBJECT public: AbbrowserConduit(KPilotLink *o,const char *n = 0L, const TQStringList &a = TQStringList() ); diff --git a/conduits/abbrowserconduit/abbrowser-setup.cc b/conduits/abbrowserconduit/abbrowser-setup.cc index f4d80d2..b275d3b 100644 --- a/conduits/abbrowserconduit/abbrowser-setup.cc +++ b/conduits/abbrowserconduit/abbrowser-setup.cc @@ -132,7 +132,7 @@ AbbrowserWidgetSetup::~AbbrowserWidgetSetup() #endif int fmtindex=fConfigWidget->fCustomDate->currentItem(); AbbrowserSettings::setCustomDateFormat( - (fmtindex==0)?(TQString::null):fConfigWidget->fCustomDate->currentText() ); + (fmtindex==0)?(TQString()):fConfigWidget->fCustomDate->currentText() ); AbbrowserSettings::self()->writeConfig(); unmodified(); diff --git a/conduits/abbrowserconduit/kabcRecord.cc b/conduits/abbrowserconduit/kabcRecord.cc index b713b84..b503031 100644 --- a/conduits/abbrowserconduit/kabcRecord.cc +++ b/conduits/abbrowserconduit/kabcRecord.cc @@ -362,7 +362,7 @@ void KABCSync::setFieldFromHHCustom( bdate = KGlobal::locale()->readDate(value, format, &ok); } DEBUGKPILOT << "Birthdate from " << index << "-th custom field: " - << bdate.toString() << endl; + << TQString(bdate.toString()) << endl; DEBUGKPILOT << "Is Valid: " << bdate.isValid() << endl; if (bdate.isValid()) { @@ -437,7 +437,7 @@ TQString KABCSync::getFieldForHHOtherPhone(const KABC::Addressee & abEntry, cons case eTTYTTDPhone: return abEntry.phoneNumber(KABC::PhoneNumber::Pcs).number(); default: - return TQString::null; + return TQString(); } } diff --git a/conduits/abbrowserconduit/kaddressbookConduit.ui b/conduits/abbrowserconduit/kaddressbookConduit.ui index 169311f..81e5202 100644 --- a/conduits/abbrowserconduit/kaddressbookConduit.ui +++ b/conduits/abbrowserconduit/kaddressbookConduit.ui @@ -1,7 +1,7 @@ AbbrowserWidget Adriaan de Groot and David Bishop - + Form2 @@ -23,14 +23,14 @@ 6 - + tabWidget true - + tab @@ -58,7 +58,7 @@ - + fSyncDestination @@ -69,7 +69,7 @@ unnamed - + fSyncStdAbook @@ -80,7 +80,7 @@ <qt>Select this option to synchronize with KDE's standard addressbook (i.e. the addressbook that you edit in KAddressBook, and which you use in KMail)</qt> - + fSyncFile @@ -115,7 +115,7 @@ - + fArchive @@ -128,7 +128,7 @@ - + tab @@ -139,7 +139,7 @@ unnamed - + groupBox4 @@ -150,7 +150,7 @@ unnamed - + textLabel1_2_2 @@ -172,7 +172,7 @@ <qt>Select in this list how conflicting entries (entries which were edited both on your handheld and on the PC) are resolved. Possibly values are "Use KPilot's Global Setting" to use the settings defined in KPilot HotSync configuration, "Ask User" to let you decide case by case, "Do Nothing" to allow the entries to be different, "PC overrides", "Handheld overrides", "Use values from last sync" and "Use both entries" to create a new entry on both the PC and handheld.</qt> - + Use KPilot's Global Setting @@ -218,7 +218,7 @@ <qt>Select in this list how conflicting entries (entries which were edited both on your handheld and on the PC) are resolved. Possibly values are "Use KPilot's Global Setting" to use the settings defined in KPilot HotSync configuration, "Ask User" to let you decide case by case, "Do Nothing" to allow the entries to be different, "PC overrides", "Handheld overrides", "Use values from last sync" and "Use both entries" to create a new entry on both the PC and handheld.</qt> - + textLabel1_7 @@ -250,7 +250,7 @@ - + tab @@ -267,7 +267,7 @@ 6 - + TextLabel2 @@ -278,7 +278,7 @@ <qt>Select which KAddressBook field should be used to store the Pilot's &quot;Other&quot; phone here.</qt> - + Other Phone @@ -334,7 +334,7 @@ <qt>Select which KAddressBook field should be used to store the Pilot's &quot;Other&quot; phone here.</qt> - + TextLabel4 @@ -345,7 +345,7 @@ <qt>Select which KAddressBook field should be used to store the Pilot's Street Address here.</qt> - + Preferred, then Home Address @@ -363,7 +363,7 @@ <qt>Select which KAddressBook field should be used to store the Pilot's Street Address here.</qt> - + TextLabel5 @@ -374,7 +374,7 @@ <qt>Select which KAddressBook field should be used to store the Fax number from the Pilot here.</qt> - + Home Fax @@ -411,7 +411,7 @@ - + tab @@ -422,7 +422,7 @@ unnamed - + textLabel1 @@ -441,7 +441,7 @@ <qt>Select the field from this list that represents best the meaning given by your use of the first custom field on your handheld.</qt> - + textLabel1_2 @@ -452,7 +452,7 @@ <qt>Select the field from this list that represents best the meaning given by your use of the second custom field on your handheld.</qt> - + textLabel1_3 @@ -463,7 +463,7 @@ <qt>Select the field from this list that represents best the meaning given by your use of the third custom field on your handheld.</qt> - + textLabel1_4 @@ -474,7 +474,7 @@ <qt>Select the field from this list that represents best the meaning given by your use of the fourth custom field on your handheld.</qt> - + Store as Custom Field @@ -510,7 +510,7 @@ <qt>Select the field from this list that represents best the meaning given by your use of the first custom field on your handheld.</qt> - + Store as Custom Field @@ -546,7 +546,7 @@ <qt>Select the field from this list that represents best the meaning given by your use of the second custom field on your handheld.</qt> - + Store as Custom Field @@ -582,7 +582,7 @@ <qt>Select the field from this list that represents best the meaning given by your use of the third custom field on your handheld.</qt> - + Store as Custom Field @@ -632,7 +632,7 @@ Horizontal - + textLabel1_5 @@ -646,7 +646,7 @@ <qt>Select the birthdate format here, if you selected "birthdate" for any of the custom fields above. Possible placeholders are:<br> %d for the day, %m for the month, %y for the two-digit year, %Y for the four-digit year. For example, %d.%m.%Y would generate a date like 27.3.1952, while %m/%d/%y would write the same date as 03/27/52. </qt> - + Locale Settings diff --git a/conduits/abbrowserconduit/resolutionDialog.cc b/conduits/abbrowserconduit/resolutionDialog.cc index d9b7089..0064a68 100644 --- a/conduits/abbrowserconduit/resolutionDialog.cc +++ b/conduits/abbrowserconduit/resolutionDialog.cc @@ -43,15 +43,15 @@ * as well as its child radio buttons. There are two different constructors * for them. * Each controller has three child radio buttons, and if any of them is - * activated (stateChange), it sets the text of its parent (which is the + * activated (stateChange), it sets the text of its tqparent (which is the * controller, which is an instance of ResolutionCheckListItem, too). **/ class ResolutionCheckListItem : TQCheckListItem { public: ResolutionCheckListItem(ResolutionItem*it, ResolutionTable*tb, - TQListView*parent); + TQListView*tqparent); ResolutionCheckListItem(TQString header, TQString text, - ResolutionCheckListItem*parent); + ResolutionCheckListItem*tqparent); ~ResolutionCheckListItem() {}; virtual void stateChange(bool newstate); virtual void setValue(TQString text); @@ -73,12 +73,12 @@ protected: ResolutionCheckListItem::ResolutionCheckListItem(ResolutionItem*it, - ResolutionTable*tb, TQListView*parent) : - TQCheckListItem(parent, TQString::null, TQCheckListItem::Controller), + ResolutionTable*tb, TQListView*tqparent) : + TQCheckListItem(tqparent, TQString(), TQCheckListItem::Controller), fResItem(it), isController(true), - fCaption(it?(it->fName):(TQString::null)), - fText(it?(it->fResolved):(TQString::null)) + fCaption(it?(it->fName):(TQString())), + fText(it?(it->fResolved):(TQString())) { FUNCTIONSETUP; if (it && tb) @@ -119,8 +119,8 @@ ResolutionCheckListItem::ResolutionCheckListItem(ResolutionItem*it, } ResolutionCheckListItem::ResolutionCheckListItem(TQString text, TQString header, - ResolutionCheckListItem*parent) : - TQCheckListItem(parent, TQString(), TQCheckListItem::RadioButton), + ResolutionCheckListItem*tqparent) : + TQCheckListItem(tqparent, TQString(), TQCheckListItem::RadioButton), fResItem(0L), isController(false), fCaption(header), @@ -133,7 +133,7 @@ void ResolutionCheckListItem::stateChange(bool newstate) { if (newstate && !isController) { - ResolutionCheckListItem*par=static_cast(parent()); + ResolutionCheckListItem*par=static_cast(tqparent()); { par->setValue(fText); } @@ -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.tqreplace(TQRegExp(CSL1("\n")), i18n("Denoting newlines in Address entries. No need to translate", " | ")); setText(0, newText); @@ -171,9 +171,9 @@ void ResolutionCheckListItem::updateText() * *****************************************************************/ -ResolutionDlg::ResolutionDlg( TQWidget* parent, KPilotLink*fH, +ResolutionDlg::ResolutionDlg( TQWidget* tqparent, KPilotLink*fH, const TQString &caption, const TQString &helpText, ResolutionTable*tab) : - KDialogBase( parent, "ResolutionDlg", false, caption, Apply|Cancel, Apply), + KDialogBase( tqparent, "ResolutionDlg", false, caption, Apply|Cancel, Apply), tickleTimer(0L), fHandle(fH), fTable(tab) @@ -319,5 +319,5 @@ void ResolutionDlg::_tickle() */ ResolutionDlg::~ResolutionDlg() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } diff --git a/conduits/abbrowserconduit/resolutionDialog.h b/conduits/abbrowserconduit/resolutionDialog.h index 2c7a8b0..68a1d58 100644 --- a/conduits/abbrowserconduit/resolutionDialog.h +++ b/conduits/abbrowserconduit/resolutionDialog.h @@ -40,9 +40,10 @@ class ResolutionTable; class ResolutionDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ResolutionDlg( TQWidget* parent=0, + ResolutionDlg( TQWidget* tqparent=0, KPilotLink*fH=0L, const TQString &caption=TQString(), const TQString &helpText=TQString(), diff --git a/conduits/abbrowserconduit/resolutionDialog_base.ui b/conduits/abbrowserconduit/resolutionDialog_base.ui index c561599..5f5442f 100644 --- a/conduits/abbrowserconduit/resolutionDialog_base.ui +++ b/conduits/abbrowserconduit/resolutionDialog_base.ui @@ -1,6 +1,6 @@ ResolutionDialogBase - + widget2 @@ -19,7 +19,7 @@ unnamed - + fIntroText @@ -30,7 +30,7 @@ WordBreak|AlignVCenter - + Field @@ -55,7 +55,7 @@ <qt>Use this list to resolve, field by field, the conflicts created when a record was edited both on the handheld and on the PC. For each record, the different values from the last sync, the handheld and PC are displayed for each field, allowing you to choose the desired value.</qt> - + textLabel1 @@ -66,7 +66,7 @@ WordBreak|AlignVCenter - + frame3 @@ -77,7 +77,7 @@ unnamed - + fKeepBoth @@ -88,7 +88,7 @@ <qt>Click this button to use both values, resulting in the duplication of the record.</qt> - + fPCValues @@ -99,7 +99,7 @@ <qt>Click this button to use the PC values for synchronizing all conflicting fields in this record.</qt> - + fBackupValues @@ -110,7 +110,7 @@ <qt>Click this button to use the last sync values (old values) for synchronizing all conflicting fields in this record.</qt> - + fPalmValues diff --git a/conduits/docconduit/DOC-converter.cc b/conduits/docconduit/DOC-converter.cc index cb097d8..06f45b7 100644 --- a/conduits/docconduit/DOC-converter.cc +++ b/conduits/docconduit/DOC-converter.cc @@ -79,7 +79,7 @@ int docMatchBookmark::findMatches(TQString doctext, bmkList &fBookmarks) { #endif while (pos >= 0 && foundisOpen()) { - 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 "<dbPathName())); + emit logMessage(i18n("Could not read text record #%1 from Database %2").tqarg(i).tqarg(docdb->dbPathName())); } } @@ -574,7 +574,7 @@ bool DOCConverter::convertPDBtoTXT() bmks.append(bmk); KPILOT_DELETE(rec); } else { - emit logMessage(i18n("Could not read bookmark record #%1 from Database %2").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-converter.h b/conduits/docconduit/DOC-converter.h index 802d60f..27198cb 100644 --- a/conduits/docconduit/DOC-converter.h +++ b/conduits/docconduit/DOC-converter.h @@ -105,6 +105,7 @@ class docRegExpBookmark:public docMatchBookmark { class DOCConverter:public TQObject { Q_OBJECT + TQ_OBJECT private: PilotDatabase * docdb; TQString txtfilename; @@ -121,7 +122,7 @@ public: } eSortBookmarks; public: - DOCConverter(TQObject *parent=0L, const char *name=0L); + DOCConverter(TQObject *tqparent=0L, const char *name=0L); virtual ~ DOCConverter(); TQString readText(); diff --git a/conduits/docconduit/Makefile.am b/conduits/docconduit/Makefile.am index ade1c66..03b83ad 100644 --- a/conduits/docconduit/Makefile.am +++ b/conduits/docconduit/Makefile.am @@ -19,7 +19,7 @@ bin_PROGRAMS = kpalmdoc libpalmdoc_shared_la_SOURCES = makedoc9.cc pilotDOCHead.cc pilotDOCEntry.cc pilotDOCBookmark.cc DOC-converter.cc conduit_doc_la_SOURCES = docconduitSettings.kcfgc doc-factory.cc doc-setup.cc doc-conduit.cc doc-setupdialog.ui doc-conflictdialog.cc -conduit_doc_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) +conduit_doc_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -lkdecore -lkio -lkdeui conduit_doc_la_LIBADD = ../../lib/libkpilot.la libpalmdoc_shared.la \ $(LIB_KDEUI) $(LIB_KFILE) diff --git a/conduits/docconduit/doc-conduit.cc b/conduits/docconduit/doc-conduit.cc index 54f1ab4..0bce0fe 100644 --- a/conduits/docconduit/doc-conduit.cc +++ b/conduits/docconduit/doc-conduit.cc @@ -163,7 +163,7 @@ bool DOCConduit::pcTextChanged(TQString txtfn) KMD5 docmd5; TQFile txtfile(txtfn); if (txtfile.open(IO_ReadOnly)){ - docmd5.update(txtfile); + docmd5.update(*TQT_TQIODEVICE(&txtfile)); TQString thisDigest(docmd5.hexDigest() /* .data() */); #ifdef DEBUG DEBUGKPILOT<<"New digest is "<config()->writeEntry(docconverter.txtFilename(), thisDigest); DOCConduitSettings::self()->config()->sync(); @@ -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::tqfromLatin1(sinfo.dbinfo.name))); + .tqarg(TQString::tqfromLatin1(sinfo.dbinfo.name))); if (!res) emit logError(i18n("Conversion of PalmDOC \"%1\" failed.") - .arg(TQString::tqfromLatin1(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::tqfromLatin1(sinfo.dbinfo.name))); + .tqarg(TQString::tqfromLatin1(sinfo.dbinfo.name))); } return res; } @@ -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 @@ -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!"<isOpen()) sinfo.fPalmStatus=eStatDeleted; + if (!docdb || !docdb->isOpen()) sinfo.fPalmtqStatus=eStatDeleted; else if (hhTextChanged(docdb)) { #ifdef DEBUG DEBUGKPILOT<<"Handheld side has changed!"< -ResolutionDialog::ResolutionDialog( TQWidget* parent, const TQString& caption, syncInfoList*sinfo, KPilotLink*lnk ) - : KDialogBase( parent, "resolutionDialog", true, caption, KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true), tickleTimer(0L), fHandle(lnk) { +ResolutionDialog::ResolutionDialog( TQWidget* tqparent, const TQString& caption, syncInfoList*sinfo, KPilotLink*lnk ) + : KDialogBase( tqparent, "resolutionDialog", true, caption, KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true), tickleTimer(0L), fHandle(lnk) { FUNCTIONSETUP; syncInfo=sinfo; hasConflicts=false; @@ -70,7 +70,7 @@ ResolutionDialog::ResolutionDialog( TQWidget* parent, const TQString& caption, s resolutionGroupBoxLayout = new TQGridLayout( big_box, syncInfo->size(), 3 ); - resolutionGroupBoxLayout->tqsetAlignment( Qt::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 ); @@ -138,7 +138,7 @@ ResolutionDialog::ResolutionDialog( TQWidget* parent, const TQString& caption, s */ ResolutionDialog::~ResolutionDialog() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* virtual slot */ void ResolutionDialog::slotOk() { @@ -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("tqStatus 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-conflictdialog.h b/conduits/docconduit/doc-conflictdialog.h index f0c8b21..83cb8d4 100644 --- a/conduits/docconduit/doc-conflictdialog.h +++ b/conduits/docconduit/doc-conflictdialog.h @@ -54,9 +54,10 @@ typedef struct conflictEntry { class ResolutionDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ResolutionDialog( TQWidget* parent=0, const TQString& caption=i18n("Resolution Dialog"), syncInfoList*sinfo=0L, KPilotLink*lnk=0L); + ResolutionDialog( TQWidget* tqparent=0, const TQString& caption=i18n("Resolution Dialog"), syncInfoList*sinfo=0L, KPilotLink*lnk=0L); ~ResolutionDialog(); bool hasConflicts; diff --git a/conduits/docconduit/doc-factory.cc b/conduits/docconduit/doc-factory.cc index cfab20f4d..47e1d40 100644 --- a/conduits/docconduit/doc-factory.cc +++ b/conduits/docconduit/doc-factory.cc @@ -94,7 +94,7 @@ DOCConduitFactory::~DOCConduitFactory() } else { - WARNINGKPILOT << "Couldn't cast parent to widget." << endl; + WARNINGKPILOT << "Couldn't cast tqparent to widget." << endl; return 0L; } } @@ -107,7 +107,7 @@ DOCConduitFactory::~DOCConduitFactory() } else { - WARNINGKPILOT << "Couldn't cast parent to KPilotLink" < DOCWidget Reinhold Kainhofer - + Form2 @@ -31,11 +31,11 @@ 6 - + tabWidget - + tab @@ -46,7 +46,7 @@ unnamed - + TextLabel1 @@ -60,7 +60,7 @@ <qt>Enter here, or select clicking the file picker button, the name and location of the folder used to find and synchronize text files. All files with extension .txt located in this folder will be synced to Palm DOC databases in your handheld.</qt> - + fkeepPDBLocally @@ -82,7 +82,7 @@ <qt>Enter here, or select clicking the file picker button, the name and location of the folder used to find and synchronize text files. All files with extension .txt located in this folder will be synced to Palm DOC databases in your handheld.</qt> - + fSyncDirection @@ -99,7 +99,7 @@ 6 - + RadioButton3 @@ -113,7 +113,7 @@ <qt>Select this option to synchronize texts changed in your PC to Palm DOC databases in your handheld. Palm DOC databases modified in the handheld will not be converted to text files, but texts changed in the PC will be converted to the Palm DOC databases.</qt> - + RadioButton2 @@ -124,7 +124,7 @@ <qt>Select this option to synchronize the changes made to Palm DOC databases in your handheld to the PC text files. Palm DOC databases modified in the handheld will be converted to text files, but texts changed in the PC will not be converted to the Palm DOC databases.</qt> - + RadioButton1 @@ -170,7 +170,7 @@ - + tab @@ -181,7 +181,7 @@ unnamed - + fCompress @@ -198,7 +198,7 @@ <qt>The Palm DOC format supports compressing the text to save memory. Check this box to enable text compression, so the resulting Palm DOC database will consume about 50% less memory than in uncompressed state. Almost all DOC readers on the Palm support compressed texts.</qt> - + fConvertBookmarks @@ -229,7 +229,7 @@ - + fBookmarksInline @@ -243,7 +243,7 @@ Check this box to create bookmarks from inline tags in the text. The inline tag consist of tags in the form <* bookmarktext *>. The bookmark location is set using the location of the inline tag in the text, and the name is the text between the <* and the *>. The inline tag (<*...*>) will be removed from the text. - + textLabel1 @@ -254,7 +254,7 @@ fEncoding - + fBookmarksEndtags @@ -265,7 +265,7 @@ Check this box to convert tags of the form <bookmarkname> at the end of the text to bookmarks. The text inside the tag ("bookmarkname") will be searched in the text, and whenever found, a bookmark will be set there. The endtags <...> will then be removed from the end of the text. - + fBookmarksBmk @@ -276,14 +276,14 @@ <qt>Check this box to use regular expressions in a file to search the text for bookmarks. The file should have the same name as the text file, but should end in .bmk instead of .txt (for instance, the regular expression file for textname.txt should be textname.bmk). See the documentation for a description of the format of the bmk file.</qt> - + fEncoding - + tab @@ -311,7 +311,7 @@ - + fNoConversionOfBmksOnly @@ -322,7 +322,7 @@ <qt>Check this box to avoid syncing the text on the handheld to the PC if you only changed the bookmarks on the handheld (but not the text).</qt> - + fPCBookmarks @@ -333,7 +333,7 @@ unnamed - + radioButton8 @@ -347,7 +347,7 @@ <qt>Check this box to avoid converting Palm DOC bookmarks to inline tags or to a bookmark file.</qt> - + radioButton11 @@ -364,7 +364,7 @@ <qt>Check this box to convert the Palm DOC database bookmarks to a separate file, in the bmk format (see more about this format in the documentation). The resulting bookmark file shares the same filename as the resulting .txt file, but ends in .bmk instead. This approach creates a clean text file and a bookmark file.</qt> - + radioButton9 @@ -382,7 +382,7 @@ - + tab @@ -393,7 +393,7 @@ unnamed - + fConflictResolution @@ -410,7 +410,7 @@ unnamed - + radioButton12 @@ -424,7 +424,7 @@ <qt>The Palm DOC conduit does not feature merging the modifications when a text is changed both in the handheld and in the computer. Therefore, when conflicts appear, the choice is between working with the files out of sync, or discarding the changes in one of them. Select this option to prevent KPilot from overwriting your modifications.</qt> - + RadioButton5 @@ -438,7 +438,7 @@ <qt>The Palm DOC conduit does not feature merging the modifications when a text is changed both in the handheld and in the computer. Therefore, when conflicts appear, the choice is between working with the files out of sync, or discarding the changes in one of them. Select this option to make the PDA version overwrite the PC version in case of conflict.</qt> - + RadioButton4 @@ -452,7 +452,7 @@ <qt>The Palm DOC conduit does not feature merging the modifications when a text is changed both in the handheld and in the computer. Therefore, when conflicts appear, the choice is between working with the files out of sync, or discarding the changes in one of them. Select this option to make the PC version overwrite the PDA version in case of conflict.</qt> - + RadioButton7 @@ -471,7 +471,7 @@ - + fAlwaysUseResolution diff --git a/conduits/docconduit/kpalmdoc_dlg.cc b/conduits/docconduit/kpalmdoc_dlg.cc index f73e392..0958c17 100644 --- a/conduits/docconduit/kpalmdoc_dlg.cc +++ b/conduits/docconduit/kpalmdoc_dlg.cc @@ -54,8 +54,8 @@ #include "kpalmdocSettings.h" -ConverterDlg::ConverterDlg( TQWidget *parent, const TQString& caption) - : KDialogBase( parent, "converterdialog", false, caption, KDialogBase::Close|KDialogBase::Help|KDialogBase::User1, +ConverterDlg::ConverterDlg( TQWidget *tqparent, const TQString& caption) + : KDialogBase( tqparent, "converterdialog", false, caption, KDialogBase::Close|KDialogBase::Help|KDialogBase::User1, KDialogBase::Close, true, i18n("&About")) { TQWidget *page = makeHBoxMainWidget(); @@ -78,7 +78,7 @@ ConverterDlg::ConverterDlg( TQWidget *parent, const TQString& caption) ConverterDlg::~ConverterDlg() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } void ConverterDlg::writeSettings() { @@ -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?").arg(pdburl) - .arg(pdbinfo.dirPath(true)), TQString::null, i18n("Use Folder"), KStdGuiItem::cancel()); + "
Use folder %2 instead?").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("The folder %1 for " "the handheld database files is not a valid " - "folder.").arg(pdburl)); + "folder.").tqarg(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.").arg(pdburl)); + "valid directory.").tqarg(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?").arg(txturl) - .arg(txtinfo.dirPath(true)), TQString::null, i18n("Use Folder"), KStdGuiItem::cancel()); + "
Use folder %2 instead?").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("The folder %1 for " - "the text files could not be created.").arg(txturl)); + "the text files could not be created.").tqarg(txturl)); return; } @@ -265,7 +265,7 @@ void ConverterDlg::slotToText() if (!pdbinfo.isFile() || !pdbinfo.exists()) { KMessageBox::sorry(this, i18n("The file %1 does not " - "exist.").arg(pdburl)); + "exist.").tqarg(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.").arg(txturl)); + "text is not a valid filename.").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("You selected to sync folders, " "but gave a filename instead (%1)." - "
Use folder %2 instead?").arg(txturl) - .arg(txtinfo.dirPath(true)), TQString::null, i18n("Use Folder"), KStdGuiItem::cancel()); + "
Use folder %2 instead?").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("The folder %1 for " - "the text files is not a valid folder.").arg(txturl)); + "the text files is not a valid folder.").tqarg(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?") - .arg(pdburl) - .arg(pdbinfo.dirPath(true)), TQString::null, 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("The folder %1 for " - "the PalmDOC files could not be created.").arg(pdburl)); + "the PalmDOC files could not be created.").tqarg(pdburl)); return; } @@ -403,14 +403,14 @@ void ConverterDlg::slotToPDB() if (!txtinfo.isFile() || !txtinfo.exists()) { KMessageBox::sorry(this, i18n("The file %1 does not " - "exist.").arg(txturl)); + "exist.").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("The database file %1 already exists. Overwrite it?") - .arg(dbfileinfo.filePath()), TQString::null, 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("Error while converting the text %1.").arg(txtfile)); + KMessageBox::sorry(this, i18n("Error while converting the text %1.").tqarg(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?") - .arg(txtfileinfo.filePath()), TQString::null, 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("Error while converting the text %1.").arg(pdbfile)); + KMessageBox::sorry(this, i18n("Error while converting the text %1.").tqarg(pdbfile)); } } else diff --git a/conduits/docconduit/kpalmdoc_dlg.h b/conduits/docconduit/kpalmdoc_dlg.h index 5e9202b..6fe6e57 100644 --- a/conduits/docconduit/kpalmdoc_dlg.h +++ b/conduits/docconduit/kpalmdoc_dlg.h @@ -35,9 +35,10 @@ class DOCConverter; class ConverterDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ConverterDlg( TQWidget *parent=0, const TQString& caption=0); + ConverterDlg( TQWidget *tqparent=0, const TQString& caption=0); ~ConverterDlg(); protected slots: diff --git a/conduits/docconduit/kpalmdoc_dlgbase.ui b/conduits/docconduit/kpalmdoc_dlgbase.ui index ee2bd2a..2b5b581 100644 --- a/conduits/docconduit/kpalmdoc_dlgbase.ui +++ b/conduits/docconduit/kpalmdoc_dlgbase.ui @@ -1,6 +1,6 @@ ConverterDlgBase - + ConverterDlgBase @@ -16,11 +16,11 @@ unnamed - + tabWidget - + tab @@ -31,7 +31,7 @@ unnamed - + fPdbLabel @@ -50,7 +50,7 @@ fPDBDir - + fTextLabel @@ -69,7 +69,7 @@ fTXTDir - + fDirectories @@ -85,7 +85,7 @@ Folder where copies of the handheld databases are kept. You can install them to any PalmOS handheld, and distribute these copies to other people (but beware of copyright infringement). - + fAskOverwrite @@ -93,7 +93,7 @@ &Ask before overwriting files - + fVerbose @@ -142,12 +142,12 @@ Enter the name of the folder where the text files reside on the PC. All files with extension .txt will be synced to the handheld. - + fEncoding - + textLabel1 @@ -160,7 +160,7 @@ - + tab @@ -222,7 +222,7 @@ - + fBookmarksInline @@ -236,7 +236,7 @@ When a <* bookmarktext *> appears somewhere in the text, a bookmark will be set at this position, and the text between the <* and the *> will be used as bookmark name. The <*...*> will be removed from the text. - + fBookmarksEndtags @@ -247,7 +247,7 @@ Tags of the form <bookmarkname> at the end of the text will be used to search the text for the pattern between the < and >. Whenever "bookmarkname" appears in the text, a bookmark will be set there. The endtags <...> will then be removed from the end of the text. - + fCompress @@ -264,7 +264,7 @@ The Palm doc format supports compressing the text to save memory. If you check this box, the text will consume about 50% less memory than in uncompressed state. Almost all DOC readers on the Palm support compressed texts. - + fConvertBookmarks @@ -278,7 +278,7 @@ Do you want to convert bookmarks? Most doc readers support bookmarks. You have to provide some information about where the bookmarks should be set and their titles. Check at least one of the bookmark types below. - + fBookmarksBmk @@ -308,7 +308,7 @@ - + tab @@ -336,7 +336,7 @@ - + fPCBookmarks @@ -347,7 +347,7 @@ unnamed - + radioButton9 @@ -361,7 +361,7 @@ 1 - + radioButton8 @@ -375,7 +375,7 @@ 0 - + radioButton10 @@ -386,7 +386,7 @@ Convert as &end tags - + radioButton11 diff --git a/conduits/knotes/Makefile.am b/conduits/knotes/Makefile.am index b13a2ff..3161798 100644 --- a/conduits/knotes/Makefile.am +++ b/conduits/knotes/Makefile.am @@ -15,7 +15,7 @@ conduit_knotes_la_SOURCES = \ knotes-action.cc \ setup_base.ui -conduit_knotes_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) +conduit_knotes_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -lkdecore -lkio -lkdeui -lkcal conduit_knotes_la_LIBADD = ../../lib/libkpilot.la $(LIB_KDEUI) kde_kcfg_DATA = knotesconduit.kcfg diff --git a/conduits/knotes/knotes-action.cc b/conduits/knotes/knotes-action.cc index 26b595e..e29dedc 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 &,KNoteID_pt note); static NoteAndMemo findMemo(const TQValueList &,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 eb490e0..223dfe2 100644 --- a/conduits/knotes/knotes-action.h +++ b/conduits/knotes/knotes-action.h @@ -37,6 +37,7 @@ class PilotMemo; class KNotesAction : public ConduitAction { Q_OBJECT + TQ_OBJECT public: KNotesAction( KPilotLink *o, @@ -44,7 +45,7 @@ public: const TQStringList &a = TQStringList() ); virtual ~KNotesAction(); - enum Status { Init, + enum tqStatus { Init, ModifiedNotesToPilot, DeleteNotesOnPilot, NewNotesToPilot, diff --git a/conduits/knotes/knotes-factory.cc b/conduits/knotes/knotes-factory.cc index 9601e81..0abc76a 100644 --- a/conduits/knotes/knotes-factory.cc +++ b/conduits/knotes/knotes-factory.cc @@ -123,7 +123,7 @@ KNotesConduitFactory::~KNotesConduitFactory() else { WARNINGKPILOT - << "Couldn't cast parent to KPilotDeviceLink" + << "Couldn't cast tqparent to KPilotDeviceLink" << endl; return 0L; } diff --git a/conduits/knotes/knotes-factory.h b/conduits/knotes/knotes-factory.h index 02b0f61..b8c8311 100644 --- a/conduits/knotes/knotes-factory.h +++ b/conduits/knotes/knotes-factory.h @@ -37,6 +37,7 @@ class KAboutData; class KNotesConduitFactory : public KLibFactory { Q_OBJECT + TQ_OBJECT public: KNotesConduitFactory(TQObject * = 0L,const char * = 0L); @@ -50,9 +51,9 @@ public: // break its value. We store group and entry keys in here. protected: - virtual TQObject* createObject( TQObject* parent = 0, + virtual TQObject* createObject( TQObject* tqparent = 0, const char* name = 0, - const char* classname = "TQObject", + const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); private: KInstance *fInstance; diff --git a/conduits/knotes/knotes-setup.h b/conduits/knotes/knotes-setup.h index 652f222..96f008c 100644 --- a/conduits/knotes/knotes-setup.h +++ b/conduits/knotes/knotes-setup.h @@ -36,7 +36,7 @@ class KNotesWidget; class KNotesConfigBase : public ConduitConfigBase { public: - KNotesConfigBase(TQWidget *parent, const char *name); + KNotesConfigBase(TQWidget *tqparent, const char *name); virtual void commit(); virtual void load(); diff --git a/conduits/knotes/setup_base.ui b/conduits/knotes/setup_base.ui index 6e0fe44..b2007b8 100644 --- a/conduits/knotes/setup_base.ui +++ b/conduits/knotes/setup_base.ui @@ -1,6 +1,6 @@ KNotesWidget - + KNotesWidget @@ -22,11 +22,11 @@ 6 - + tabWidget - + tab @@ -37,7 +37,7 @@ unnamed - + fDeleteNoteForMemo @@ -51,7 +51,7 @@ <qt>Check this box if you wish to delete notes from KNotes automatically when the corresponding Pilot memo is deleted. Use this option with care, as the notes you want to keep in the handheld and in the desktop are not necessarily the same.</qt> - + fSuppressConfirm diff --git a/conduits/malconduit/Makefile.am b/conduits/malconduit/Makefile.am index df5ed04..081d129 100644 --- a/conduits/malconduit/Makefile.am +++ b/conduits/malconduit/Makefile.am @@ -13,6 +13,6 @@ kde_kcfg_DATA = malconduit.kcfg kde_module_LTLIBRARIES = conduit_mal.la conduit_mal_la_SOURCES = malconduitSettings.kcfgc mal-setup_dialog.ui mal-factory.cc mal-setup.cc mal-conduit.cc -conduit_mal_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) +conduit_mal_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -lkdecore -lkio -lkdeui conduit_mal_la_LIBADD = ../../lib/libkpilot.la $(MAL_LIB) $(LIB_KDEUI) diff --git a/conduits/malconduit/mal-conduit.cc b/conduits/malconduit/mal-conduit.cc index 2d3344f..10f1352 100644 --- a/conduits/malconduit/mal-conduit.cc +++ b/conduits/malconduit/mal-conduit.cc @@ -217,7 +217,7 @@ bool MALConduit::skip() syncMessage = i18n("No proxy server is set."); break; } - syncMessage = i18n("Using proxy server: %1").arg(proxyServer); + syncMessage = i18n("Using proxy server: %1").tqarg(proxyServer); #ifdef DEBUG DEBUGKPILOT<<" Using HTTP proxy server \""<proxyCustomPort->setValue(proxyPortNr); } fConfigWidget->proxyUserName->setText(MALConduitSettings::proxyUser()); - fConfigWidget->proxyPassword->setText(TQString::null); + fConfigWidget->proxyPassword->setText(TQString()); fConfigWidget->proxyPassword->insert(MALConduitSettings::proxyPassword()); #ifdef DEBUG diff --git a/conduits/malconduit/mal-setup.h b/conduits/malconduit/mal-setup.h index 6a63374..6114c28 100644 --- a/conduits/malconduit/mal-setup.h +++ b/conduits/malconduit/mal-setup.h @@ -40,6 +40,7 @@ class MALWidget; class MALWidgetSetup : public ConduitConfigBase { Q_OBJECT + TQ_OBJECT public: MALWidgetSetup(TQWidget *,const char *); virtual ~MALWidgetSetup(); diff --git a/conduits/malconduit/mal-setup_dialog.ui b/conduits/malconduit/mal-setup_dialog.ui index 645335b..2bc4c5e 100644 --- a/conduits/malconduit/mal-setup_dialog.ui +++ b/conduits/malconduit/mal-setup_dialog.ui @@ -1,7 +1,7 @@ MALWidget Reinhold Kainhofer - + MalWidget @@ -23,14 +23,14 @@ 6 - + tabWidget true - + tab @@ -41,7 +41,7 @@ unnamed - + syncTime @@ -61,7 +61,7 @@ 6 - + RadioButton1 @@ -78,7 +78,7 @@ <qt>Select this option to synchronize with the MAL server on every HotSync. To perform a successful synchronization, you need to have access to the MAL server during the HotSync.</qt> - + RadioButton1_2 @@ -92,7 +92,7 @@ <qt>Select this option to synchronize with the MAL server on every HotSync that is at least one hour after the previous MAL sync. To perform a successful synchronization, you need to have access to the MAL server during the HotSync.</qt> - + RadioButton1_3 @@ -103,7 +103,7 @@ <qt>Select this option to synchronize with the MAL server on every HotSync that is at least one day after the previous MAL sync. To perform a successful synchronization, you need to have access to the MAL server during the HotSync.</qt> - + RadioButton1_4 @@ -114,7 +114,7 @@ <qt>Select this option to synchronize with the MAL server on every HotSync that is at least one week after the previous MAL sync. To perform a successful synchronization, you need to have access to the MAL server during the HotSync.</qt> - + RadioButton1_5 @@ -146,7 +146,7 @@ - + tab @@ -157,7 +157,7 @@ unnamed - + proxyType @@ -177,7 +177,7 @@ 6 - + RadioButton8 @@ -191,7 +191,7 @@ <qt>Select this option if you do not want KPilot to use a proxy server. Use this option if you connect to the internet directly.</qt> - + RadioButton8_2 @@ -202,7 +202,7 @@ <qt>Select this option if you want KPilot to use a HTTP proxy.</qt> - + RadioButton8_2_2 @@ -215,7 +215,7 @@ - + proxyServerInformation @@ -252,7 +252,7 @@ - + proxyCustomPortCheck @@ -263,7 +263,7 @@ Check this box to use a non-standard proxy port. - + TextLabel1 @@ -316,7 +316,7 @@ <qt>If your proxy requires authentication, enter your password here.</qt> - + proxyUserName @@ -324,7 +324,7 @@ <qt>If your proxy requires authentication, enter your username here.</qt> - + TextLabel2_2 @@ -335,7 +335,7 @@ proxyPassword - + TextLabel2 @@ -363,7 +363,7 @@ Horizontal - + proxyExclude @@ -371,7 +371,7 @@ <qt>Enter a list of MAL servers that do not need the use of a proxy here, separated with commas, e.g: <br><i>localhost,127.0.0.1,.lan</i><qt> - + textLabel1 @@ -406,7 +406,7 @@ - + tab @@ -423,7 +423,7 @@ 6 - + GroupBox1_2 @@ -443,7 +443,7 @@ 6 - + TextLabel1_2 @@ -454,7 +454,7 @@ malServerName - + malCustomPortCheck @@ -501,12 +501,12 @@ malServerName - + malUserName - + TextLabel2_2_2 @@ -517,7 +517,7 @@ malPassword - + textLabel @@ -566,7 +566,7 @@ - + TextLabel1_3 diff --git a/conduits/memofileconduit/Makefile.am b/conduits/memofileconduit/Makefile.am index 1f51105..020c569 100644 --- a/conduits/memofileconduit/Makefile.am +++ b/conduits/memofileconduit/Makefile.am @@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = conduit_memofile.la conduit_memofile_la_SOURCES = memofileSettings.kcfgc setup_base.ui \ memofile-factory.cc memofile.cc memofiles.cc memofile-conduit.cc -conduit_memofile_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) +conduit_memofile_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -lkdecore -lkio -lkdeui conduit_memofile_la_LIBADD = ../../lib/libkpilot.la $(LIB_KDEUI) $(LIB_KFILE) kde_kcfg_DATA = memofileconduit.kcfg diff --git a/conduits/memofileconduit/memofile-conduit.cc b/conduits/memofileconduit/memofile-conduit.cc index 954af38..233f6af 100644 --- a/conduits/memofileconduit/memofile-conduit.cc +++ b/conduits/memofileconduit/memofile-conduit.cc @@ -31,7 +31,7 @@ // Only include what we really need: // First UNIX system stuff, then std C++, -// then Qt, then KDE, then local includes. +// then TQt, then KDE, then local includes. // // @@ -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; } @@ -448,7 +448,7 @@ void MemofileConduit::deleteUnsyncedHHRecords() Pilot::RecordIDList::iterator it; for ( it = ids.begin(); it != ids.end(); ++it ) { - if (!_memofiles->find(*it)) + if (!_memofiles->tqfind(*it)) { DEBUGKPILOT << fname << "Deleting record with ID "<< *it <<" from handheld " diff --git a/conduits/memofileconduit/memofile-conduit.h b/conduits/memofileconduit/memofile-conduit.h index c795066..d2d07d1 100644 --- a/conduits/memofileconduit/memofile-conduit.h +++ b/conduits/memofileconduit/memofile-conduit.h @@ -37,6 +37,7 @@ class PilotMemo; class MemofileConduit : public ConduitAction { Q_OBJECT + TQ_OBJECT public: MemofileConduit(KPilotLink *, const char *name=0L, @@ -52,8 +53,8 @@ protected slots: private: // configuration settings... - QString _DEFAULT_MEMODIR; - QString _memo_directory; + TQString _DEFAULT_MEMODIR; + TQString _memo_directory; bool _sync_private; PilotMemoInfo *fMemoAppInfo; diff --git a/conduits/memofileconduit/memofile-factory.cc b/conduits/memofileconduit/memofile-factory.cc index 795edc3..8b2d9df 100644 --- a/conduits/memofileconduit/memofile-factory.cc +++ b/conduits/memofileconduit/memofile-factory.cc @@ -46,7 +46,7 @@ class MemofileConduitConfig : public ConduitConfigBase { public: - MemofileConduitConfig(TQWidget *parent=0L, const char *n=0L); + MemofileConduitConfig(TQWidget *tqparent=0L, const char *n=0L); virtual void commit(); virtual void load(); protected: diff --git a/conduits/memofileconduit/memofile.h b/conduits/memofileconduit/memofile.h index 4bd5fb7..1308e98 100644 --- a/conduits/memofileconduit/memofile.h +++ b/conduits/memofileconduit/memofile.h @@ -32,7 +32,7 @@ // Only include what we really need: // First UNIX system stuff, then std C++, -// then Qt, then KDE, then local includes. +// then TQt, then KDE, then local includes. // // diff --git a/conduits/memofileconduit/memofileconduit.xmi b/conduits/memofileconduit/memofileconduit.xmi index 33ff89f..9088d35 100644 --- a/conduits/memofileconduit/memofileconduit.xmi +++ b/conduits/memofileconduit/memofileconduit.xmi @@ -34,7 +34,7 @@ - + @@ -43,7 +43,7 @@ - + @@ -54,8 +54,8 @@ - - + + @@ -65,7 +65,7 @@ - + @@ -79,7 +79,7 @@ - + @@ -92,39 +92,39 @@ - - - + + + - + - + - + - - + + - + - - + + - + diff --git a/conduits/memofileconduit/memofiles.cc b/conduits/memofileconduit/memofiles.cc index c51915b..c8ce67b 100644 --- a/conduits/memofileconduit/memofiles.cc +++ b/conduits/memofileconduit/memofiles.cc @@ -89,7 +89,7 @@ void Memofiles::load (bool loadAll) // DEBUGKPILOT << fname // << ": checking category: [" << categoryName // << "], file: [" << file << "]." << endl; - Memofile * memofile = find(categoryName, file); + Memofile * memofile = tqfind(categoryName, file); if (NULL == memofile) { memofile = new Memofile(category, categoryName, file, _baseDirectory); memofile->setModified(true); @@ -316,7 +316,7 @@ bool Memofiles::loadFromMetadata () return true; } -Memofile * Memofiles::find (recordid_t id) +Memofile * Memofiles::tqfind (recordid_t id) { Memofile * memofile; @@ -331,7 +331,7 @@ Memofile * Memofiles::find (recordid_t id) } -Memofile * Memofiles::find (const TQString & category, const TQString & filename) +Memofile * Memofiles::tqfind (const TQString & category, const TQString & filename) { Memofile * memofile; @@ -353,7 +353,7 @@ void Memofiles::deleteMemo(PilotMemo * memo) if (! memo->isDeleted()) return; - Memofile * memofile = find(memo->id()); + Memofile * memofile = tqfind(memo->id()); if (memofile) { memofile->deleteFile(); _memofiles.remove(memofile); @@ -375,7 +375,7 @@ void Memofiles::addModifiedMemo (PilotMemo * memo) + TQString::number(memo->id()) + CSL1("], title: [") + memo->getTitle() + CSL1("]. "); - Memofile * memofile = find(memo->id()); + Memofile * memofile = tqfind(memo->id()); if (NULL == memofile) { _cudCounter.created(); @@ -653,7 +653,7 @@ TQString Memofiles::filename(PilotMemo * memo) if (filename.isEmpty()) { TQString text = memo->text(); - int i = text.find(CSL1("\n")); + int i = text.tqfind(CSL1("\n")); if (i > 1) { filename = text.left(i); } @@ -666,7 +666,7 @@ TQString Memofiles::filename(PilotMemo * memo) TQString category = _categories[memo->category()]; - Memofile * memofile = find(category, filename); + Memofile * memofile = tqfind(category, filename); // if we couldn't find a memofile with this filename, or if the // memofile that is found is the same as the memo that we're looking @@ -683,7 +683,7 @@ TQString Memofiles::filename(PilotMemo * memo) // for trouble. while (NULL != memofile && uniq <=20) { newfilename = TQString(filename + CSL1(".") + TQString::number(uniq++) ); - memofile = find(category, newfilename); + memofile = tqfind(category, newfilename); } return newfilename; diff --git a/conduits/memofileconduit/memofiles.h b/conduits/memofileconduit/memofiles.h index 72b6ed4..290cf3a 100644 --- a/conduits/memofileconduit/memofiles.h +++ b/conduits/memofileconduit/memofiles.h @@ -55,8 +55,8 @@ public: TQPtrList getModified(); TQPtrList getAll() { return _memofiles; } ; - Memofile * find (const TQString & category, const TQString & filename); - Memofile * find (recordid_t id); + Memofile * tqfind (const TQString & category, const TQString & filename); + Memofile * tqfind (recordid_t id); MemoCategoryMap readCategoryMetadata(); void setCategories(MemoCategoryMap map) { _categories = map; } ; diff --git a/conduits/memofileconduit/setup_base.ui b/conduits/memofileconduit/setup_base.ui index 5053469..606bf5e 100644 --- a/conduits/memofileconduit/setup_base.ui +++ b/conduits/memofileconduit/setup_base.ui @@ -3,7 +3,7 @@ A tabWidget for configuring the Memofile-conduit settings. Jason 'vanRijn' Kasper - + Form1 @@ -46,7 +46,7 @@ the Memofile-conduit settings. 6 - + tabWidget @@ -60,7 +60,7 @@ the Memofile-conduit settings. - + Widget2 @@ -88,7 +88,7 @@ the Memofile-conduit settings. - + textLabel2 @@ -96,7 +96,7 @@ the Memofile-conduit settings. Sync private records: - + textLabel1 @@ -115,7 +115,7 @@ the Memofile-conduit settings. Select the directory you want to store your PDA's memos in - + fSyncPrivate diff --git a/conduits/notepadconduit/Makefile.am b/conduits/notepadconduit/Makefile.am index 7a052da..ce08524 100644 --- a/conduits/notepadconduit/Makefile.am +++ b/conduits/notepadconduit/Makefile.am @@ -9,6 +9,6 @@ kde_module_LTLIBRARIES = conduit_notepad.la conduit_notepad_la_SOURCES = notepadconduit.kcfgc notepad-setup.ui \ notepad-conduit.cc notepad-factory.cc -conduit_notepad_la_LDFLAGS= -module $(KDE_PLUGIN) $(all_libraries) +conduit_notepad_la_LDFLAGS= -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -lkdecore -lkio -lkdeui conduit_notepad_la_LIBADD= ../../lib/libkpilot.la $(LIB_KDEUI) $(LIB_KIO) diff --git a/conduits/notepadconduit/notepad-conduit.cc b/conduits/notepadconduit/notepad-conduit.cc index 10d9bf7..c33bd41 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; } @@ -115,8 +115,8 @@ bool NotepadConduit::event(TQEvent *e) // NotepadActionThread //----------------------------------------------------------------------------- -NotepadActionThread::NotepadActionThread(TQObject *parent, KPilotLink *link) : - fParent(parent), fLink(link), notSaved(0), saved(0) +NotepadActionThread::NotepadActionThread(TQObject *tqparent, KPilotLink *link) : + fParent(tqparent), fLink(link), notSaved(0), saved(0) { FUNCTIONSETUP; } @@ -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-conduit.h b/conduits/notepadconduit/notepad-conduit.h index 907a306..6f76768 100644 --- a/conduits/notepadconduit/notepad-conduit.h +++ b/conduits/notepadconduit/notepad-conduit.h @@ -59,10 +59,10 @@ private: /** * This class saves the notepads to disk */ -class NotepadActionThread : public QThread +class NotepadActionThread : public TQThread { public: - NotepadActionThread(TQObject *parent, KPilotLink *link); + NotepadActionThread(TQObject *tqparent, KPilotLink *link); virtual void run(); int getFailed() { return notSaved; } diff --git a/conduits/notepadconduit/notepad-factory.cc b/conduits/notepadconduit/notepad-factory.cc index 0e1094b..fdb0841 100644 --- a/conduits/notepadconduit/notepad-factory.cc +++ b/conduits/notepadconduit/notepad-factory.cc @@ -47,7 +47,7 @@ class NotepadConduitConfig : public ConduitConfigBase { public: - NotepadConduitConfig(TQWidget *parent=0L, const char *n=0L); + NotepadConduitConfig(TQWidget *tqparent=0L, const char *n=0L); virtual void commit(); virtual void load(); static ConduitConfigBase *create(TQWidget *p, const char *n) diff --git a/conduits/notepadconduit/notepad-setup.ui b/conduits/notepadconduit/notepad-setup.ui index c625d97..d7fd026 100644 --- a/conduits/notepadconduit/notepad-setup.ui +++ b/conduits/notepadconduit/notepad-setup.ui @@ -1,7 +1,7 @@ NotepadWidget Jörn Ahrens - + Form2 @@ -20,11 +20,11 @@ unnamed - + tabWidget - + tab @@ -57,7 +57,7 @@ fOutputDirectory - + textLabel1 diff --git a/conduits/null/Makefile.am b/conduits/null/Makefile.am index 783e881..bdcc43f 100644 --- a/conduits/null/Makefile.am +++ b/conduits/null/Makefile.am @@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = conduit_null.la conduit_null_la_SOURCES = nullSettings.kcfgc setup_base.ui null-conduit.cc null-factory.cc -conduit_null_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) +conduit_null_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -lkdecore -lkio -lkdeui conduit_null_la_LIBADD = ../../lib/libkpilot.la $(LIB_KDEUI) kde_kcfg_DATA = nullconduit.kcfg diff --git a/conduits/null/null-conduit.cc b/conduits/null/null-conduit.cc index d0c07c5..29d2499 100644 --- a/conduits/null/null-conduit.cc +++ b/conduits/null/null-conduit.cc @@ -35,7 +35,7 @@ // Only include what we really need: // First UNIX system stuff, then std C++, -// then Qt, then KDE, then local includes. +// then TQt, then KDE, then local includes. // // #include diff --git a/conduits/null/null-factory.cc b/conduits/null/null-factory.cc index c2d381d..6b80615 100644 --- a/conduits/null/null-factory.cc +++ b/conduits/null/null-factory.cc @@ -47,7 +47,7 @@ class NullConduitConfig : public ConduitConfigBase { public: - NullConduitConfig(TQWidget *parent=0L, const char *n=0L); + NullConduitConfig(TQWidget *tqparent=0L, const char *n=0L); virtual void commit(); virtual void load(); protected: diff --git a/conduits/null/setup_base.ui b/conduits/null/setup_base.ui index 2bcb518..ed7d234 100644 --- a/conduits/null/setup_base.ui +++ b/conduits/null/setup_base.ui @@ -3,7 +3,7 @@ A tabWidget for configuring the Null-conduit settings. Adriaan de Groot - + Form1 @@ -46,7 +46,7 @@ the Null-conduit settings. 6 - + tabWidget @@ -60,7 +60,7 @@ the Null-conduit settings. - + Widget2 @@ -77,7 +77,7 @@ the Null-conduit settings. 6 - + fLogMessage @@ -88,7 +88,7 @@ the Null-conduit settings. <qt>Enter the message to add to the Sync Log on your Pilot here.</qt> - + TextLabel1_2 diff --git a/conduits/popmail/Makefile.am b/conduits/popmail/Makefile.am index 5b6becd..365cd1b 100644 --- a/conduits/popmail/Makefile.am +++ b/conduits/popmail/Makefile.am @@ -16,7 +16,7 @@ kde_module_LTLIBRARIES = conduit_popmail.la conduit_popmail_la_SOURCES = popmailSettings.kcfgc setup-dialog.ui \ popmail-factory.cc setupDialog.cc \ popmail-conduit.cc -conduit_popmail_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) +conduit_popmail_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -lkdecore -lkio -lkdeui -lDCOP conduit_popmail_la_LIBADD = ../../lib/libkpilot.la $(LIB_KIO) # this option you can leave out. Just, if you use "make dist", you need it diff --git a/conduits/popmail/setup-dialog.ui b/conduits/popmail/setup-dialog.ui index d9cf74e..e82f4ad 100644 --- a/conduits/popmail/setup-dialog.ui +++ b/conduits/popmail/setup-dialog.ui @@ -1,6 +1,6 @@ PopMailWidget - + PopMailWidget @@ -22,11 +22,11 @@ 6 - + fTabWidget - + tab @@ -54,7 +54,7 @@ - + textLabel1_2 @@ -65,7 +65,7 @@ <qt>Select the method KPilot will use to send the mail from your Handheld to the recipients here. Depending on the method you choose, the other fields in the dialog may be enabled or disabled. Currently, the only <i>working</i> method is through KMail.</qt> - + textLabel1 @@ -87,7 +87,7 @@ <qt>Enter the email address you want to send messages as here.</qt> - + textLabel2 @@ -95,7 +95,7 @@ Signature file: - <qt>If you want to add a signature file, enter the location of your signature file (usually, <i>.signature</i>, located in your home folder) here, or select it clicking the file picker button. The signature file tqcontains the text that is added to the end of your outgoing mail messages.</qt> + <qt>If you want to add a signature file, enter the location of your signature file (usually, <i>.signature</i>, located in your home folder) here, or select it clicking the file picker button. The signature file contains the text that is added to the end of your outgoing mail messages.</qt> @@ -103,10 +103,10 @@ fSignature - <qt>If you want to add a signature file, enter the location of your signature file (usually, <i>.signature</i>, located in your home folder) here, or select it clicking the file picker button. The signature file tqcontains the text that is added to the end of your outgoing mail messages.</qt> + <qt>If you want to add a signature file, enter the location of your signature file (usually, <i>.signature</i>, located in your home folder) here, or select it clicking the file picker button. The signature file contains the text that is added to the end of your outgoing mail messages.</qt> - + Do Not Send Mail diff --git a/conduits/popmail/setupDialog.h b/conduits/popmail/setupDialog.h index 76bf9af..cc9d831 100644 --- a/conduits/popmail/setupDialog.h +++ b/conduits/popmail/setupDialog.h @@ -40,6 +40,7 @@ class PopMailWidget; // From setup-dialog.ui class PopMailWidgetConfig : public ConduitConfigBase { Q_OBJECT + TQ_OBJECT public: PopMailWidgetConfig(TQWidget *, const char *); virtual void load(); diff --git a/conduits/recordconduit/Makefile.am b/conduits/recordconduit/Makefile.am index 9fd691e..e00693a 100644 --- a/conduits/recordconduit/Makefile.am +++ b/conduits/recordconduit/Makefile.am @@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = conduit_record.la conduit_record_la_SOURCES = settings.kcfgc setup_base.ui factory.cc -conduit_record_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) +conduit_record_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -lkdecore -lkio -lkdeui conduit_record_la_LIBADD = ../../lib/libkpilot.la $(LIB_KDEUI) kde_kcfg_DATA = settings.kcfg diff --git a/conduits/recordconduit/factory.cc b/conduits/recordconduit/factory.cc index 8337733..76b790e 100644 --- a/conduits/recordconduit/factory.cc +++ b/conduits/recordconduit/factory.cc @@ -48,7 +48,7 @@ class ConduitConfig : public ConduitConfigBase { public: - ConduitConfig(TQWidget *parent=0L, const char *n=0L); + ConduitConfig(TQWidget *tqparent=0L, const char *n=0L); virtual void commit(); virtual void load(); protected: diff --git a/conduits/recordconduit/setup_base.ui b/conduits/recordconduit/setup_base.ui index 8bd9790..389219b 100644 --- a/conduits/recordconduit/setup_base.ui +++ b/conduits/recordconduit/setup_base.ui @@ -3,7 +3,7 @@ A tabWidget for configuring the Record-conduit settings. Adriaan de Groot - + Form1 @@ -46,7 +46,7 @@ the Record-conduit settings. 6 - + tabWidget @@ -60,7 +60,7 @@ the Record-conduit settings. - + Widget2 @@ -77,7 +77,7 @@ the Record-conduit settings. 6 - + fLogMessage @@ -88,7 +88,7 @@ the Record-conduit settings. <qt>Enter the message to add to the Sync Log on your Pilot here.</qt> - + TextLabel1_2 @@ -99,7 +99,7 @@ the Record-conduit settings. fLogMessage - + TextLabel2_2 @@ -110,7 +110,7 @@ the Record-conduit settings. fDatabases - + fDatabases @@ -135,7 +135,7 @@ the Record-conduit settings. - + fFailImmediately diff --git a/conduits/sysinfoconduit/Makefile.am b/conduits/sysinfoconduit/Makefile.am index b89b4df..3a5b59a 100644 --- a/conduits/sysinfoconduit/Makefile.am +++ b/conduits/sysinfoconduit/Makefile.am @@ -15,7 +15,7 @@ conduit_sysinfo_la_SOURCES = sysinfoSettings.kcfgc \ sysinfo-setup.cc \ sysinfo-conduit.cc \ sysinfo-setup_dialog.ui -conduit_sysinfo_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) +conduit_sysinfo_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -lkdecore -lkio -lkdeui conduit_sysinfo_la_LIBADD = ../../lib/libkpilot.la $(LIB_KDEUI) $(LIB_KIO) kpilot_sysinfo_data_DATA = Template.html Template.txt diff --git a/conduits/sysinfoconduit/Template.html b/conduits/sysinfoconduit/Template.html index e5a33e0..56aa328 100644 --- a/conduits/sysinfoconduit/Template.html +++ b/conduits/sysinfoconduit/Template.html @@ -147,7 +147,7 @@ Operating System:#os# Hostname:#hostname# - Qt Version:#qt# + TQt Version:#qt# KDE Libraries Version:#kde# KPilot Version:#kpilot# Pilot-Link Version:#pilotlink# diff --git a/conduits/sysinfoconduit/sysinfo-conduit.cc b/conduits/sysinfoconduit/sysinfo-conduit.cc index 64c53bc..b46f5a3 100644 --- a/conduits/sysinfoconduit/sysinfo-conduit.cc +++ b/conduits/sysinfoconduit/sysinfo-conduit.cc @@ -107,7 +107,7 @@ const TQString SysInfoConduit::defaultpage = CSL1("KPilot System Information Pag "-) Version Information (Desktop)\n" " Operating System: #os#\n" " Hostname: #hostname#\n" -" Qt Version: #qt#\n" +" TQt Version: #qt#\n" " KDE Version: #kde#\n" " KPilot Version: #kpilot#\n" " Pilot-Link Version: #pilotlink#\n" @@ -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::tqfromLatin1(device->getCardName())) - .arg(TQString::tqfromLatin1(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"); @@ -408,25 +408,25 @@ void SysInfoConduit::pcVersionInfo() struct utsname name; if (uname (&name) >= 0) { fValues[CSL1("os")] = CSL1("%1 %3, %5") - .arg(TQString::tqfromLatin1(name.sysname)) - .arg(TQString::tqfromLatin1(name.release)) - .arg(TQString::tqfromLatin1(name.machine)); - fValues[CSL1("hostname")] = CSL1("%2").arg(TQString::tqfromLatin1(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 KDE_VERSION_STRING fValues[CSL1("kde")] = TQString::tqfromLatin1(KDE_VERSION_STRING); #endif -#ifdef QT_VERSION_STR - fValues[CSL1("qt")] = TQString::tqfromLatin1(QT_VERSION_STR); +#ifdef 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::tqfromLatin1(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")); @@ -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("").arg(*it).arg(*it)); + TQRegExp re(CSL1("").tqarg(*it).tqarg(*it)); re.setMinimal(true); output.remove(re); } for ( TQStringList::Iterator it = keepParts.begin(); it != keepParts.end(); ++it ) { - TQRegExp re(CSL1("").arg(*it).arg(*it)); + TQRegExp re(CSL1("").tqarg(*it).tqarg(*it)); re.setMinimal(true); output.tqreplace(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.tqreplace(CSL1("#%1#").arg(it.key()), it.data()); + output.tqreplace(CSL1("#%1#").tqarg(it.key()), it.data()); } // Insert the list of databases @@ -571,7 +571,7 @@ void SysInfoConduit::writeFile() dbstring.append(newpatt); } - // Now, just tqreplace the whole found pattern by the string we just constructed. + // Now, just replace the whole found pattern by the string we just constructed. output.tqreplace(re.cap(0), dbstring); } @@ -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<setText(PART_SETTING,(ubbu->isOn() ? CSL1("1") : TQString::null)); } + ubbu->setText(PART_SETTING,(ubbu->isOn() ? CSL1("1") : TQString())); } SysInfoWidgetConfig::SysInfoWidgetConfig(TQWidget *w, const char *n) : diff --git a/conduits/sysinfoconduit/sysinfo-setup.h b/conduits/sysinfoconduit/sysinfo-setup.h index 400dea3..ae15b51 100644 --- a/conduits/sysinfoconduit/sysinfo-setup.h +++ b/conduits/sysinfoconduit/sysinfo-setup.h @@ -36,7 +36,7 @@ class SysInfoWidget; class SysInfoWidgetConfig : public ConduitConfigBase { public: - SysInfoWidgetConfig(TQWidget *parent, const char *); + SysInfoWidgetConfig(TQWidget *tqparent, const char *); virtual void commit(); virtual void load(); virtual bool isModified() const; diff --git a/conduits/sysinfoconduit/sysinfo-setup_dialog.ui b/conduits/sysinfoconduit/sysinfo-setup_dialog.ui index 935db05..6b8e2b9 100644 --- a/conduits/sysinfoconduit/sysinfo-setup_dialog.ui +++ b/conduits/sysinfoconduit/sysinfo-setup_dialog.ui @@ -1,7 +1,7 @@ SysInfoWidget Reinhold Kainhofer - + Form2 @@ -23,11 +23,11 @@ 6 - + tabWidget - + tab @@ -63,7 +63,7 @@ <qt>Enter here, or select by clicking the file picker button, the location and file name of the output file used to store the handheld's system information.</qt> - + textLabel4 @@ -77,7 +77,7 @@ <qt>Enter here, or select by clicking the file picker button, the location and file name of the output file used to store the handheld's system information.</qt> - + fOutputType @@ -88,7 +88,7 @@ unnamed - + radioButton3 @@ -102,7 +102,7 @@ <qt>Select this option to output the system information data as a HTML document.</qt> - + radioButton4 @@ -124,7 +124,7 @@ <qt>Enter here, or select by clicking on the file picker button, the location of the template to be used if you select the Custom template option.</qt> - + radioButton5 @@ -139,7 +139,7 @@ - + tab @@ -167,7 +167,7 @@ - + Output Type diff --git a/conduits/timeconduit/Makefile.am b/conduits/timeconduit/Makefile.am index 8c9ae93..d6018b1 100644 --- a/conduits/timeconduit/Makefile.am +++ b/conduits/timeconduit/Makefile.am @@ -16,7 +16,7 @@ conduit_time_la_SOURCES = timeConduitSettings.kcfgc \ time-setup.cc \ time-conduit.cc \ time-setup_dialog.ui -conduit_time_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) +conduit_time_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -lkdecore -lkio -lkdeui conduit_time_la_LIBADD = ../../lib/libkpilot.la $(LIB_KDEUI) kde_kcfg_DATA = timeconduit.kcfg diff --git a/conduits/timeconduit/time-setup.h b/conduits/timeconduit/time-setup.h index b0bb2f0..e662532 100644 --- a/conduits/timeconduit/time-setup.h +++ b/conduits/timeconduit/time-setup.h @@ -37,8 +37,9 @@ class KAboutData; class TimeWidgetConfig : public ConduitConfigBase { Q_OBJECT + TQ_OBJECT public: - TimeWidgetConfig(TQWidget *parent, const char *); + TimeWidgetConfig(TQWidget *tqparent, const char *); virtual void commit(); virtual void load(); static ConduitConfigBase *create(TQWidget *,const char *); diff --git a/conduits/timeconduit/time-setup_dialog.ui b/conduits/timeconduit/time-setup_dialog.ui index a32fbe4..2b3dbba 100644 --- a/conduits/timeconduit/time-setup_dialog.ui +++ b/conduits/timeconduit/time-setup_dialog.ui @@ -1,7 +1,7 @@ TimeWidget Reinhold Kainhofer - + Form2 @@ -23,11 +23,11 @@ 6 - + tabWidget - + tab @@ -55,7 +55,7 @@ Expanding - + directionGroup @@ -72,7 +72,7 @@ 6 - + RadioButton1 @@ -86,7 +86,7 @@ <qt>Select this option to synchronize the handheld time with the PC time, by using the PC time on both.</qt> - + RadioButton1_2 @@ -102,7 +102,7 @@ - + TextLabel1 diff --git a/conduits/vcalconduit/Makefile.am b/conduits/vcalconduit/Makefile.am index 4f0dcd8..76aae3d 100644 --- a/conduits/vcalconduit/Makefile.am +++ b/conduits/vcalconduit/Makefile.am @@ -24,17 +24,15 @@ libvcalconduit_shared_la_SOURCES = vcalconduitSettings.kcfgc \ conduit_vcal_la_SOURCES = vcal-conduit.cc vcalRecord.cc \ vcal-factory.cc vcal-setup.cc -conduit_vcal_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) +conduit_vcal_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -lkdecore -lkio -lkdeui -lkcal -lkresources conduit_vcal_la_LIBADD = ../../lib/libkpilot.la \ - ../../../libkcal/libkcal.la \ libvcalconduit_shared.la conduit_vcal_la_COMPILE_FIRST = vcalconduitSettings.h korganizerConduit.h conduit_todo_la_SOURCES = todo-conduit.cc todoRecord.cc \ todo-factory.cc todo-setup.cc -conduit_todo_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) +conduit_todo_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -lkdecore -lkio -lkdeui -lkcal -lkresources conduit_todo_la_LIBADD = ../../lib/libkpilot.la \ - ../../../libkcal/libkcal.la \ libvcalconduit_shared.la conduit_todo_la_COMPILE_FIRST = vcalconduitSettings.h korganizerConduit.h 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 7ff813a..b6cefab 100644 --- a/conduits/vcalconduit/korganizerConduit.ui +++ b/conduits/vcalconduit/korganizerConduit.ui @@ -1,7 +1,7 @@ VCalWidget Adriaan de Groot - + Form1 @@ -44,7 +44,7 @@ 6 - + tabWidget @@ -58,7 +58,7 @@ - + Widget2 @@ -86,7 +86,7 @@ - + fSyncDestination @@ -97,7 +97,7 @@ unnamed - + fSyncStdCalendar @@ -108,7 +108,7 @@ <qt>Select this option to synchronize with the calendar specified by the KDE calendar settings.</qt> - + fSyncFile @@ -143,7 +143,7 @@ - + fArchive @@ -157,7 +157,7 @@ be saved in the calendar on the PC. - + tab @@ -168,7 +168,7 @@ be saved in the calendar on the PC. unnamed - + fTextLabel @@ -187,7 +187,7 @@ be saved in the calendar on the PC. fConflictResolution - + Use KPilot's Global Setting 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/teststate.cc b/conduits/vcalconduit/teststate.cc index c762d32..7088033 100644 --- a/conduits/vcalconduit/teststate.cc +++ b/conduits/vcalconduit/teststate.cc @@ -38,7 +38,7 @@ #include "teststate.h" #include "vcal-conduitbase.h" -TestState::TestState() : fCalendar( TQString::null ) +TestState::TestState() : fCalendar( TQString() ) { fState = eTest; } diff --git a/conduits/vcalconduit/todo-conduit.cc b/conduits/vcalconduit/todo-conduit.cc index 9b1007c..fee93d6 100644 --- a/conduits/vcalconduit/todo-conduit.cc +++ b/conduits/vcalconduit/todo-conduit.cc @@ -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="<syncStatus()<summary()<<" had SynctqStatus="<synctqStatus()<getDescription()); } - return TQString::null; + return TQString(); } diff --git a/conduits/vcalconduit/todo-conduit.h b/conduits/vcalconduit/todo-conduit.h index 8d8780e..5938d41 100644 --- a/conduits/vcalconduit/todo-conduit.h +++ b/conduits/vcalconduit/todo-conduit.h @@ -64,6 +64,7 @@ public: class TodoConduit : public VCalConduitBase { Q_OBJECT + TQ_OBJECT public: TodoConduit(KPilotLink *, const char *name=0L, diff --git a/conduits/vcalconduit/todoRecord.cc b/conduits/vcalconduit/todoRecord.cc index 9bc0998..f3baaeb 100644 --- a/conduits/vcalconduit/todoRecord.cc +++ b/conduits/vcalconduit/todoRecord.cc @@ -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 d882cf8..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; } @@ -200,7 +200,7 @@ const TQString VCalConduit::getTitle(PilotRecordBase *de) { PilotDateEntry*d=dynamic_cast(de); if (d) return TQString(d->getDescription()); - return TQString::null; + return TQString(); } @@ -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(de); diff --git a/conduits/vcalconduit/vcal-conduit.h b/conduits/vcalconduit/vcal-conduit.h index ed47d71..482e8e7 100644 --- a/conduits/vcalconduit/vcal-conduit.h +++ b/conduits/vcalconduit/vcal-conduit.h @@ -67,6 +67,7 @@ public: class VCalConduit : public VCalConduitBase { Q_OBJECT + TQ_OBJECT public: VCalConduit(KPilotLink *, const char *name=0L, diff --git a/conduits/vcalconduit/vcal-conduitbase.cc b/conduits/vcalconduit/vcal-conduitbase.cc index cd288ba..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; @@ -433,7 +433,7 @@ int VCalConduitBase::resolveConflict( KCal::Incidence *e, PilotRecordBase *de ) return KMessageBox::No == questionYesNo( query, i18n( "Conflicting Entries" ), - TQString::null, + TQString(), 0 /* Never timeout */, i18n( "Handheld" ), i18n( "PC" )); } @@ -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,15 +573,15 @@ 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 ); } } const TQString VCalConduitBase::dbname() { - return TQString::null; + return TQString(); } PilotRecord *VCalConduitBase::readRecordByIndex( int index ) diff --git a/conduits/vcalconduit/vcal-conduitbase.h b/conduits/vcalconduit/vcal-conduitbase.h index 4e2f3ae..7f04cfd 100644 --- a/conduits/vcalconduit/vcal-conduitbase.h +++ b/conduits/vcalconduit/vcal-conduitbase.h @@ -75,6 +75,7 @@ public: class VCalConduitBase : public ConduitAction { Q_OBJECT + TQ_OBJECT public: VCalConduitBase(KPilotLink *, const char *name = 0L, 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; } diff --git a/configure.in.in b/configure.in.in index 2678141..79d4ecb 100644 --- a/configure.in.in +++ b/configure.in.in @@ -155,6 +155,8 @@ dnl dnl CPPFLAGS="$CPPFLAGS $PISOCK_INCLUDE" if test "$HAVE_PISOCK" = "1" ; then + LDFLAGS_save="$LDFLAGS" + LDFLAGS="$LDFLAGS -ltqt" AC_MSG_CHECKING([pilot-link version]) AC_TRY_RUN([ #include @@ -173,6 +175,7 @@ if test "$HAVE_PISOCK" = "1" ; then [AC_MSG_RESULT([Cross-compiling KPilot is doomed]) HAVE_PISOCK="0" ]) + LDFLAGS="$LDFLAGS_save" fi if test "x$with_pilot_link" = "xCHECK" ; then @@ -180,6 +183,8 @@ if test "x$with_pilot_link" = "xCHECK" ; then # Fairly random collection of possible extra libraries needed # to link pilot-link against. if test "$HAVE_PISOCK" = "1" ; then + LDFLAGS_save="$LDFLAGS" + LDFLAGS="$LDFLAGS -ltqt" HAVE_PISOCK=0 AC_CHECK_LIB(pisock, @@ -217,6 +222,7 @@ if test "$HAVE_PISOCK" = "1" ; then ) ] ) + LDFLAGS="$LDFLAGS_save" fi fi diff --git a/kpilot/addressEditor.cc b/kpilot/addressEditor.cc index cfab322..dc3bd25 100644 --- a/kpilot/addressEditor.cc +++ b/kpilot/addressEditor.cc @@ -32,13 +32,13 @@ #include "options.h" #endif -#ifndef QLINEEDIT_H +#ifndef TQLINEEDIT_H #include #endif -#ifndef QLAYOUT_H +#ifndef TQLAYOUT_H #include #endif -#ifndef QLABEL_H +#ifndef TQLABEL_H #include #endif #ifndef _KDEBUG_H @@ -54,12 +54,12 @@ AddressEditor::AddressEditor(PilotAddress * p, PilotAddressInfo *appInfo, - TQWidget * parent, + TQWidget * tqparent, const char *name) : KDialogBase(KDialogBase::Plain, i18n("Address Editor"), Ok | Cancel, Cancel, - parent, name, false /* non-modal */ ), + tqparent, name, false /* non-modal */ ), fDeleteOnCancel(p == 0L), fAddress(p), fAppInfo(appInfo) @@ -69,7 +69,7 @@ AddressEditor::AddressEditor(PilotAddress * p, initLayout(); fillFields(); - connect(parent, TQT_SIGNAL(recordChanged(PilotAddress *)), + connect(tqparent, TQT_SIGNAL(recordChanged(PilotAddress *)), this, TQT_SLOT(updateRecord(PilotAddress *))); } diff --git a/kpilot/addressEditor.h b/kpilot/addressEditor.h index 6c4d122..07b6f10 100644 --- a/kpilot/addressEditor.h +++ b/kpilot/addressEditor.h @@ -39,12 +39,13 @@ class TQLineEdit; class AddressEditor : public KDialogBase { Q_OBJECT + TQ_OBJECT public: AddressEditor(PilotAddress *address, PilotAddressInfo *appInfo, - TQWidget *parent, const char *name=0L); + TQWidget *tqparent, const char *name=0L); ~AddressEditor(); diff --git a/kpilot/addressWidget.cc b/kpilot/addressWidget.cc index 1b34baa..056b387 100644 --- a/kpilot/addressWidget.cc +++ b/kpilot/addressWidget.cc @@ -65,9 +65,9 @@ #include "addressWidget.moc" -AddressWidget::AddressWidget(TQWidget * parent, +AddressWidget::AddressWidget(TQWidget * tqparent, const TQString & path) : - PilotComponent(parent, "component_address", path), + PilotComponent(tqparent, "component_address", path), fAddrInfo(0L), fAddressAppInfo(0L), fPendingAddresses(0) @@ -185,7 +185,7 @@ void AddressWidget::hideComponent() #if KDE_VERSION<220 s = i18n("There are still %1 address editing windows open.") - .arg(TQString::number(fPendingAddresses)); + .tqarg(TQString::number(fPendingAddresses)); #else s = i18n("There is still an address editing window open.", "There are still %n address editing windows open.", @@ -606,7 +606,7 @@ void AddressWidget::slotShowAddress(int which) #endif TQString text(CSL1("")); - text += addr->getTextRepresentation(fAddressAppInfo,Qt::RichText); + text += addr->getTextRepresentation(fAddressAppInfo,TQt::RichText); text += CSL1("\n"); fAddrInfo->setText(text); @@ -675,11 +675,11 @@ void AddressWidget::slotExport() TQString prompt = (currentCatID==-1) ? i18n("Export All Addresses") : - i18n("Export Address Category %1").arg(fAddressAppInfo->categoryName(currentCatID)) ; + i18n("Export Address Category %1").tqarg(fAddressAppInfo->categoryName(currentCatID)) ; TQString saveFile = KFileDialog::getSaveFileName( - TQString::null, + TQString(), CSL1("*.csv|Comma Separated Values"), this, prompt @@ -693,7 +693,7 @@ void AddressWidget::slotExport() } if (TQFile::exists(saveFile) && KMessageBox::warningContinueCancel(this, - i18n("The file %1 exists. Overwrite?").arg(saveFile), + i18n("The file %1 exists. Overwrite?").tqarg(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.").arg(saveFile)); + i18n("The file %1 could not be opened for writing.").tqarg(saveFile)); return; } fAddressList.first(); diff --git a/kpilot/addressWidget.h b/kpilot/addressWidget.h index 9a7b2a8..7248922 100644 --- a/kpilot/addressWidget.h +++ b/kpilot/addressWidget.h @@ -44,9 +44,10 @@ class PilotDatabase; class AddressWidget : public PilotComponent { Q_OBJECT + TQ_OBJECT public: - AddressWidget(TQWidget* parent,const TQString& dbpath); + AddressWidget(TQWidget* tqparent,const TQString& dbpath); ~AddressWidget(); // Pilot Component Methods: @@ -117,7 +118,7 @@ private: * currently selected category. * * The entire address database is read into memory in the - * QList fAddressList. We need the appinfo block from the + * TQList fAddressList. We need the appinfo block from the * database to determine which categories there are; this * is held in fAddressAppInfo. * @@ -128,7 +129,7 @@ private: PilotAddressInfo *fAddressAppInfo; TQPtrList fAddressList; TQListBox *fListBox; - QPushButton *fEditButton,*fDeleteButton; + TQPushButton *fEditButton,*fDeleteButton; protected: /** diff --git a/kpilot/conduitConfigDialog.cc b/kpilot/conduitConfigDialog.cc index 0bde870..ac5a3dc 100644 --- a/kpilot/conduitConfigDialog.cc +++ b/kpilot/conduitConfigDialog.cc @@ -72,24 +72,24 @@ extern "C" { - KDE_EXPORT KCModule *create_kpilotconfig( TQWidget *parent, const char * ) + KDE_EXPORT KCModule *create_kpilotconfig( TQWidget *tqparent, const char * ) { FUNCTIONSETUP; - return new ConduitConfigWidget( parent, "kcmkpilotconfig" ); + return new ConduitConfigWidget( tqparent, "kcmkpilotconfig" ); } - KDE_EXPORT ConfigWizard *create_wizard(TQWidget *parent, int m) + KDE_EXPORT ConfigWizard *create_wizard(TQWidget *tqparent, int m) { FUNCTIONSETUP; - return new ConfigWizard(parent,"Wizard", m); + return new ConfigWizard(tqparent,"Wizard", m); } } -class ConduitTip : public QToolTip +class ConduitTip : public TQToolTip { public: - ConduitTip(TQListView *parent); + ConduitTip(TQListView *tqparent); virtual ~ConduitTip(); protected: @@ -133,7 +133,7 @@ ConduitTip::~ConduitTip() TQString s = l->text(CONDUIT_COMMENT); if (s.isEmpty()) return; - if (s.find(CSL1(""),0,false) == -1) + if (s.tqfind(CSL1(""),0,false) == -1) { s.prepend(CSL1("")); s.append(CSL1("")); @@ -145,10 +145,10 @@ ConduitTip::~ConduitTip() // implement our own check list items so we can detect if a given item was checked/unchecked. We need // this to prevent the modified signal if one only wants to display a conduit's config widget. Currently, // KListView doesn't provide any signal that indicates that the checked state of a checklist item was changed. -class KPilotCheckListItem : public QCheckListItem +class KPilotCheckListItem : public TQCheckListItem { public: - KPilotCheckListItem ( TQListViewItem * parent, const TQString & text, Type tt = RadioButtonController ) : TQCheckListItem(parent, text, tt),mOriginalState(false) {} + KPilotCheckListItem ( TQListViewItem * tqparent, const TQString & text, Type tt = RadioButtonController ) : TQCheckListItem(tqparent, text, tt),mOriginalState(false) {} ~KPilotCheckListItem() {} void setOriginalState(bool state) { mOriginalState=state; setOn(state);} @@ -171,20 +171,20 @@ protected: /* -** Create a page in the widget stack @p parent on page @p pageno, +** Create a page in the widget stack @p tqparent on page @p pageno, ** bearing the given @p text. The remainder of the parameters are ** for esoteric things like: ** @p buttons set to non-null to include (and return) a TQHBox suitable ** for displaying a row of buttons in on the page. ** @p label set to non-null to return the TQLabel used to display @p text. */ -static void addDescriptionPage(TQWidgetStack *parent, +static void addDescriptionPage(TQWidgetStack *tqparent, int pageno, const TQString &text, TQHBox **buttons = 0L, TQLabel **label = 0L) { - TQVBox *v = new TQVBox(parent); + TQVBox *v = new TQVBox(tqparent); TQLabel *l = 0L; v->setFrameShape(TQLabel::NoFrame); @@ -192,7 +192,7 @@ static void addDescriptionPage(TQWidgetStack *parent, l = new TQLabel(v); l->setText(text); - l->tqsetAlignment(Qt::AlignLeft | Qt::AlignVCenter | Qt::ExpandTabs | Qt::WordBreak); + l->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter | TQt::ExpandTabs | TQt::WordBreak); if (label) { *label = l; } @@ -202,12 +202,12 @@ static void addDescriptionPage(TQWidgetStack *parent, l = new TQLabel(v); } - parent->addWidget(v,pageno); + tqparent->addWidget(v,pageno); } -ConduitConfigWidgetBase::ConduitConfigWidgetBase(TQWidget *parent, const char *n) : - KCModule(parent, n), +ConduitConfigWidgetBase::ConduitConfigWidgetBase(TQWidget *tqparent, const char *n) : + KCModule(tqparent, n), fConduitList(0L), fStack(0L), fConfigureButton(0L), @@ -225,7 +225,7 @@ ConduitConfigWidgetBase::ConduitConfigWidgetBase(TQWidget *parent, const char *n // Create the left hand column fConduitList = new TQListView(this ,"ConduitList"); - fConduitList->addColumn(TQString::null); + fConduitList->addColumn(TQString()); fConduitList->header()->hide(); fConduitList->tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred)); @@ -267,7 +267,7 @@ ConduitConfigWidgetBase::ConduitConfigWidgetBase(TQWidget *parent, const char *n // Page 3 addDescriptionPage(fStack,INTERNAL_CONDUIT, - TQString::null,0L,&fActionDescription); + TQString(),0L,&fActionDescription); // Page 5 - explanation about conduits addDescriptionPage(fStack,CONDUIT_EXPLN, @@ -280,7 +280,7 @@ ConduitConfigWidgetBase::ConduitConfigWidgetBase(TQWidget *parent, const char *n // Page 6 - explanation about general setup addDescriptionPage(fStack,GENERAL_EXPLN, i18n("

The general portion of KPilot's setup " - "tqcontains settings for your hardware and the way KPilot " + "contains settings for your hardware and the way KPilot " "should display your data. For the basic setup, which should fulfill " "the need of most users, just use the setup wizard below.

" "If you need some special settings, this dialog provides all the options " @@ -300,9 +300,9 @@ ConduitConfigWidgetBase::ConduitConfigWidgetBase(TQWidget *parent, const char *n fStack->addWidget(ConduitConfigBase::aboutPage(fStack,0L),GENERAL_ABOUT); } -ConduitConfigWidget::ConduitConfigWidget(TQWidget *parent, const char *n, +ConduitConfigWidget::ConduitConfigWidget(TQWidget *tqparent, const char *n, bool) : - ConduitConfigWidgetBase(parent,n), + ConduitConfigWidgetBase(tqparent,n), fConfigure(0L), fCurrentConduit(0L), fGeneralPage(0L), @@ -358,7 +358,7 @@ void ConduitConfigWidget::fillLists() { FUNCTIONSETUP; - // 3 QListViewItems for the three headings in the list + // 3 TQListViewItems for the three headings in the list TQListViewItem *general,*conduits; // And two generic pointers for the rest. @@ -412,7 +412,7 @@ void ConduitConfigWidget::fillLists() p->setText(CONDUIT_COMMENT,i18n(c)); \ p->setText(CONDUIT_LIBRARY,CSL1("internal_" b)); \ p->setText(CONDUIT_DESKTOP,CSL1("internal_" b)); \ - if (potentiallyInstalled.findIndex(p->text(CONDUIT_DESKTOP))>=0) \ + if (potentiallyInstalled.tqfindIndex(p->text(CONDUIT_DESKTOP))>=0) \ p->setOriginalState(true); IC("Install Files","fileinstall", @@ -450,7 +450,7 @@ void ConduitConfigWidget::fillLists() p->setText(CONDUIT_DESKTOP,o->desktopEntryName()); p->setText(CONDUIT_LIBRARY,o->library()); - if (potentiallyInstalled.findIndex(o->desktopEntryName()) < 0) + if (potentiallyInstalled.tqfindIndex(o->desktopEntryName()) < 0) { p->setOriginalState(false); } @@ -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 " - "").arg(p->text(CONDUIT_COMMENT))); + "").tqarg(p->text(CONDUIT_COMMENT))); return; } @@ -596,7 +596,7 @@ void ConduitConfigWidget::loadAndConfigure(TQListViewItem *p) // ,bool exec) TQStringList a; a.append(CSL1("modal")); - o = f->create(fStack, 0L, "ConduitConfigBase", a); + o = f->create(TQT_TQOBJECT(fStack), 0L, "ConduitConfigBase", a); if (!o) { @@ -716,7 +716,7 @@ void ConduitConfigWidget::selected(TQListViewItem *p) #endif // set the dialog title to the selected item - TQListViewItem *pParent = p->parent(); + TQListViewItem *pParent = p->tqparent(); TQString title; title = pParent ? pParent->text(CONDUIT_NAME) + CSL1(" - ") : TQString() ; title += p ? p->text(CONDUIT_NAME) : i18n("KPilot Setup"); @@ -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.") - .arg(p->text(CONDUIT_NAME)); + .tqarg(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.") - .arg(p->text(CONDUIT_NAME)); + .tqarg(p->text(CONDUIT_NAME)); #ifdef DEBUG DEBUGKPILOT << fname << ": Can't load library for " @@ -805,7 +805,7 @@ void ConduitConfigWidget::load() TQCheckListItem*qq=dynamic_cast(q); if (qq) { - qq->setOn(! (potentiallyInstalled.findIndex(qq->text(CONDUIT_DESKTOP))<0) ); + qq->setOn(! (potentiallyInstalled.tqfindIndex(qq->text(CONDUIT_DESKTOP))<0) ); } q = q->nextSibling(); } diff --git a/kpilot/conduitConfigDialog.h b/kpilot/conduitConfigDialog.h index 9873e05..6640c00 100644 --- a/kpilot/conduitConfigDialog.h +++ b/kpilot/conduitConfigDialog.h @@ -45,6 +45,7 @@ class ConduitConfig; class ConduitConfigWidgetBase : public KCModule { Q_OBJECT + TQ_OBJECT public: ConduitConfigWidgetBase(TQWidget *p=0L,const char *n=0L); @@ -59,6 +60,7 @@ public: class ConduitConfigWidget : public ConduitConfigWidgetBase { Q_OBJECT + TQ_OBJECT public: ConduitConfigWidget(TQWidget *, const char *name=0L, bool ownButtons=false); diff --git a/kpilot/datebookWidget.cc b/kpilot/datebookWidget.cc index 8b76942..7d8c851 100644 --- a/kpilot/datebookWidget.cc +++ b/kpilot/datebookWidget.cc @@ -41,8 +41,8 @@ #include "datebookWidget.moc" -DatebookWidget::DatebookWidget(TQWidget *parent, const TQString &dbpath) : - PilotComponent(parent,"component_generic",dbpath) +DatebookWidget::DatebookWidget(TQWidget *tqparent, const TQString &dbpath) : + PilotComponent(tqparent,"component_generic",dbpath) { FUNCTIONSETUP; diff --git a/kpilot/datebookWidget.h b/kpilot/datebookWidget.h index 3b44a20..4acfbb3 100644 --- a/kpilot/datebookWidget.h +++ b/kpilot/datebookWidget.h @@ -39,9 +39,10 @@ class KListView; class DatebookWidget : public PilotComponent { Q_OBJECT + TQ_OBJECT public: - DatebookWidget(TQWidget* parent, const TQString& dbpath); + DatebookWidget(TQWidget* tqparent, const TQString& dbpath); virtual ~DatebookWidget(); // Pilot component methods diff --git a/kpilot/dbAppInfoEditor.cc b/kpilot/dbAppInfoEditor.cc index 2259f57..f0ddb1e 100644 --- a/kpilot/dbAppInfoEditor.cc +++ b/kpilot/dbAppInfoEditor.cc @@ -41,8 +41,8 @@ using namespace KHE; /************************************************* **************************************************/ -DBAppInfoEditor::DBAppInfoEditor(char*appInfoData, int l, TQWidget *parent) : - KDialogBase(parent, "AppBlock Editor",false, +DBAppInfoEditor::DBAppInfoEditor(char*appInfoData, int l, TQWidget *tqparent) : + KDialogBase(tqparent, "AppBlock Editor",false, i18n("Edit AppInfo Block"), Ok|Cancel), appInfo(appInfoData), @@ -66,8 +66,8 @@ DBAppInfoEditor::DBAppInfoEditor(char*appInfoData, int l, TQWidget *parent) : else { TQLabel*tmpW = new TQLabel( i18n("To view the Application info block data, please install a hex editor (e.g. khexedit from kdeutils)."), this ); - tmpW->setBackgroundMode( Qt::PaletteMid ); - tmpW->tqsetAlignment( Qt::AlignHCenter | Qt::AlignVCenter | Qt::WordBreak); + tmpW->setBackgroundMode( TQt::PaletteMid ); + tmpW->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter | TQt::WordBreak); tmpW->setFrameShape( TQFrame::Panel ); tmpW->setFrameShadow( TQFrame::Sunken ); fAppInfoEdit = tmpW; diff --git a/kpilot/dbAppInfoEditor.h b/kpilot/dbAppInfoEditor.h index cee9336..8ac9cf3 100644 --- a/kpilot/dbAppInfoEditor.h +++ b/kpilot/dbAppInfoEditor.h @@ -35,8 +35,9 @@ class TQWidget; class DBAppInfoEditor : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - DBAppInfoEditor(char*appInfoData, int l, TQWidget *parent = 0); + DBAppInfoEditor(char*appInfoData, int l, TQWidget *tqparent = 0); ~DBAppInfoEditor(); char*appInfo; int len; diff --git a/kpilot/dbFlagsEditor.cc b/kpilot/dbFlagsEditor.cc index eafbe58..7b366f9 100644 --- a/kpilot/dbFlagsEditor.cc +++ b/kpilot/dbFlagsEditor.cc @@ -40,8 +40,8 @@ #include "dbFlagsEditor_base.h" -DBFlagsEditor::DBFlagsEditor(DBInfo*dbinfo, TQWidget *parent) : - KDialogBase(parent, "FlagsEditor",false, +DBFlagsEditor::DBFlagsEditor(DBInfo*dbinfo, TQWidget *tqparent) : + KDialogBase(tqparent, "FlagsEditor",false, i18n("Edit Database Flags"), Ok|Cancel), dbi(dbinfo) { diff --git a/kpilot/dbFlagsEditor.h b/kpilot/dbFlagsEditor.h index c5ad3c0..c88daf0 100644 --- a/kpilot/dbFlagsEditor.h +++ b/kpilot/dbFlagsEditor.h @@ -38,8 +38,9 @@ struct DBInfo; class DBFlagsEditor : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - DBFlagsEditor(DBInfo*dbinfo=0L, TQWidget *parent = 0); + DBFlagsEditor(DBInfo*dbinfo=0L, TQWidget *tqparent = 0); ~DBFlagsEditor(); protected: diff --git a/kpilot/dbFlagsEditor_base.ui b/kpilot/dbFlagsEditor_base.ui index 5c77c53..3083b2e 100644 --- a/kpilot/dbFlagsEditor_base.ui +++ b/kpilot/dbFlagsEditor_base.ui @@ -1,6 +1,6 @@ DBFlagsEditorWidget - + DBFlagsEditorWidget @@ -16,7 +16,7 @@ unnamed - + fDBNameLabel @@ -35,7 +35,7 @@ fDBName - + fCreatorLabel @@ -54,7 +54,7 @@ fCreator - + fTypeLabel @@ -73,7 +73,7 @@ fType - + fType @@ -81,7 +81,7 @@ 4 - + fCreator @@ -89,7 +89,7 @@ 4 - + fDBFlagsGroup @@ -100,7 +100,7 @@ unnamed - + fRessourceDB @@ -108,7 +108,7 @@ &Ressource database - + fReadOnly @@ -116,7 +116,7 @@ Rea&d-only - + fBackupDB @@ -124,7 +124,7 @@ Database is &backed up - + fCopyProtect @@ -151,7 +151,7 @@ - + fMiscFlagsGroup @@ -179,7 +179,7 @@ - + fReset @@ -187,7 +187,7 @@ Reset after &installation - + fExcludeDB @@ -197,7 +197,7 @@ - + fTimeStampGroup @@ -208,7 +208,7 @@ unnamed - + fCreationLabel @@ -227,7 +227,7 @@ fCreationDate - + fModificationlabel @@ -238,7 +238,7 @@ fModificationDate - + fBackupLabel @@ -324,7 +324,7 @@ - + fDBName diff --git a/kpilot/dbFlagsEditor_base.ui.h b/kpilot/dbFlagsEditor_base.ui.h index 189f09d..74c3b5a 100644 --- a/kpilot/dbFlagsEditor_base.ui.h +++ b/kpilot/dbFlagsEditor_base.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ @@ -14,7 +14,7 @@ #include #else #warning "Workaround for KTimeWidget in KDE 3.1" -class KTimeWidget : public QWidget +class KTimeWidget : public TQWidget { public: KTimeWidget(TQWidget *p, const char *n) : TQWidget(p,n) {}; diff --git a/kpilot/dbRecordEditor.cc b/kpilot/dbRecordEditor.cc index 80e8bba..447d3df 100644 --- a/kpilot/dbRecordEditor.cc +++ b/kpilot/dbRecordEditor.cc @@ -49,8 +49,8 @@ using namespace KHE; -DBRecordEditor::DBRecordEditor(PilotRecord*r, int n, TQWidget *parent) - : KDialogBase(parent, "RecordEditor",false,i18n("Edit Record"), +DBRecordEditor::DBRecordEditor(PilotRecord*r, int n, TQWidget *tqparent) + : KDialogBase(tqparent, "RecordEditor",false,i18n("Edit Record"), Ok|Cancel), rec(r), nr(n) { // fWidget=new DBRecordEditorBase(this); @@ -144,7 +144,7 @@ void DBRecordEditor::initWidgets() fFlagsGroup->tqlayout()->setSpacing( 6 ); fFlagsGroup->tqlayout()->setMargin( 11 ); fFlagsGroupLayout = new TQGridLayout( fFlagsGroup->tqlayout() ); - fFlagsGroupLayout->tqsetAlignment( Qt::AlignTop ); + fFlagsGroupLayout->tqsetAlignment( TQt::AlignTop ); fDirty = new TQCheckBox( fFlagsGroup, "fDirty" ); fFlagsGroupLayout->addWidget( fDirty, 0, 0 ); @@ -191,8 +191,8 @@ void DBRecordEditor::initWidgets() else { TQLabel*tmpW = new TQLabel( i18n("To view and edit the record data, please install a hex editor (e.g. kbytesedit from kdeutils)."), fWidget ); - tmpW->setBackgroundMode( Qt::PaletteMid ); - tmpW->tqsetAlignment( Qt::AlignHCenter | Qt::AlignVCenter | Qt::WordBreak); + tmpW->setBackgroundMode( TQt::PaletteMid ); + tmpW->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter | TQt::WordBreak); tmpW->setFrameShape( TQFrame::Panel ); tmpW->setFrameShadow( TQFrame::Sunken ); fRecordData = tmpW; diff --git a/kpilot/dbRecordEditor.h b/kpilot/dbRecordEditor.h index 627af55..338113c 100644 --- a/kpilot/dbRecordEditor.h +++ b/kpilot/dbRecordEditor.h @@ -34,9 +34,10 @@ class TQVBoxLayout; class TQHBoxLayout; class TQGridLayout; -namespace KHE { -class BytesEditInterface; -} +#include +// namespace KHE { +// class BytesEditInterface; +// } using namespace KHE; class TQButtonGroup; @@ -52,9 +53,10 @@ class PilotRecord; */ class DBRecordEditor : public KDialogBase { -Q_OBJECT + Q_OBJECT + TQ_OBJECT public: - DBRecordEditor(PilotRecord*r=0L, int n=-1, TQWidget *parent = 0); + DBRecordEditor(PilotRecord*r=0L, int n=-1, TQWidget *tqparent = 0); ~DBRecordEditor(); protected: diff --git a/kpilot/dbRecordEditor_base.ui b/kpilot/dbRecordEditor_base.ui index 989f39c..e5922cf 100644 --- a/kpilot/dbRecordEditor_base.ui +++ b/kpilot/dbRecordEditor_base.ui @@ -1,6 +1,6 @@ DBRecordEditorBase - + DBRecordEditorBase @@ -16,7 +16,7 @@ unnamed - + fRecordIndexLabel @@ -24,7 +24,7 @@ Record index: - + fRecordIDLabel @@ -32,7 +32,7 @@ Record ID: - + fRecordIndex @@ -43,7 +43,7 @@ true - + fRecordID @@ -54,7 +54,7 @@ true - + fFlagsGroup @@ -73,7 +73,7 @@ unnamed - + fDirty @@ -81,7 +81,7 @@ &Dirty - + fDeleted @@ -89,7 +89,7 @@ &Deleted - + fBusy @@ -97,7 +97,7 @@ Busy - + fSecret @@ -105,7 +105,7 @@ &Secret - + fArchived diff --git a/kpilot/dbSelectionDialog.cc b/kpilot/dbSelectionDialog.cc index 1ba83f7..81cf50e 100644 --- a/kpilot/dbSelectionDialog.cc +++ b/kpilot/dbSelectionDialog.cc @@ -43,7 +43,7 @@ KPilotDBSelectionDialog::KPilotDBSelectionDialog(TQStringList &selectedDBs, TQStringList &deviceDBs, TQStringList &addedDBs, TQWidget *w, const char *n) : - KDialogBase(w, n, true, TQString::null, KDialogBase::Ok | KDialogBase::Cancel, + KDialogBase(w, n, true, TQString(), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, false), fSelectedDBs(selectedDBs), fAddedDBs(addedDBs), diff --git a/kpilot/dbSelectionDialog.h b/kpilot/dbSelectionDialog.h index ee0df63..fd309f2 100644 --- a/kpilot/dbSelectionDialog.h +++ b/kpilot/dbSelectionDialog.h @@ -37,6 +37,7 @@ class KPilotDBSelectionWidget; class KPilotDBSelectionDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: KPilotDBSelectionDialog(TQStringList &selectedDBs, TQStringList &deviceDBs, TQStringList &addedDBs, TQWidget *, const char *); diff --git a/kpilot/dbSelection_base.ui b/kpilot/dbSelection_base.ui index 7ec6088..5bb29c4 100644 --- a/kpilot/dbSelection_base.ui +++ b/kpilot/dbSelection_base.ui @@ -1,7 +1,7 @@ KPilotDBSelectionWidget Reinhold Kainhofer - + DBSelectionWidgetForm diff --git a/kpilot/dbviewerWidget.cc b/kpilot/dbviewerWidget.cc index a577644..ff7fad1 100644 --- a/kpilot/dbviewerWidget.cc +++ b/kpilot/dbviewerWidget.cc @@ -64,8 +64,8 @@ #include "dbviewerWidget.moc" -GenericDBWidget::GenericDBWidget(TQWidget *parent, const TQString &dbpath) : - PilotComponent(parent,"component_generic",dbpath), fDB(0L) +GenericDBWidget::GenericDBWidget(TQWidget *tqparent, const TQString &dbpath) : + PilotComponent(tqparent,"component_generic",dbpath), fDB(0L) { FUNCTIONSETUP; setupWidget(); @@ -148,7 +148,7 @@ GenericDBWidget::~GenericDBWidget() void GenericDBWidget::showComponent() { FUNCTIONSETUP; - fDBInfo->setText(TQString::null); + fDBInfo->setText(TQString()); slotDBType(0); fDBList->show(); @@ -187,12 +187,12 @@ void GenericDBWidget::slotSelected(const TQString &dbname) if (!fDB || !fDB->isOpen()) { fDBInfo->setText(i18n("Warning: Cannot read " - "database file %1.").arg(currentDB)); + "database file %1.").tqarg(currentDB)); return; } dbinfo=fDB->getDBInfo(); display.append(i18n("Database: %1, %2 records
") - .arg(TQString::tqfromLatin1(dbinfo.name)).arg(fDB->recordCount())); + .tqarg(TQString::tqfromLatin1(dbinfo.name)).tqarg(fDB->recordCount())); char buff[5]; set_long(buff, dbinfo.type); buff[4]='\0'; @@ -200,7 +200,7 @@ void GenericDBWidget::slotSelected(const TQString &dbname) set_long(buff, dbinfo.creator); buff[4]='\0'; TQString cr = TQString::tqfromLatin1(buff); - display.append(i18n("Type: %1, Creator: %2

").arg(tp).arg(cr)); + display.append(i18n("Type: %1, Creator: %2

").tqarg(tp).tqarg(cr)); int currentRecord = 0; PilotRecord *pilotRec; @@ -216,7 +216,7 @@ void GenericDBWidget::slotSelected(const TQString &dbname) PilotListViewItem*item=new PilotListViewItem(fRecordList, TQString::number(currentRecord), TQString::number(pilotRec->size()), TQString::number(pilotRec->id()), - TQString::null, + TQString(), pilotRec->id(), pilotRec); item->setNumericCol(0, true); item->setNumericCol(1, true); @@ -244,33 +244,33 @@ void GenericDBWidget::slotSelected(const TQString &dbname) if (!pf) { fDBInfo->setText(i18n("Warning: Cannot read " - "application file %1.").arg(dbname)); + "application file %1.").tqarg(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.").arg(dbname)); + "application file %1.").tqarg(dbname)); return; } #else pi_file_get_info(pf,&dbinfo); #endif - display.append(i18n("Application: %1

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

").tqarg(dbname)); } enableWidgets(currentDBtype==eDatabase); TQDateTime ttime; ttime.setTime_t(dbinfo.createDate); - display.append(i18n("Created: %1
").arg(ttime.toString())); + display.append(i18n("Created: %1
").tqarg(ttime.toString())); ttime.setTime_t(dbinfo.modifyDate); - display.append(i18n("Modified: %1
").arg(ttime.toString())); + display.append(i18n("Modified: %1
").tqarg(ttime.toString())); ttime.setTime_t(dbinfo.backupDate); - display.append(i18n("Backed up: %1
").arg(ttime.toString())); + display.append(i18n("Backed up: %1
").tqarg(ttime.toString())); fDBInfo->setText(display); } @@ -304,7 +304,7 @@ void GenericDBWidget::reset() fDBInfo->clear(); fRecordList->clear(); if (fDB) KPILOT_DELETE(fDB); - currentDB=TQString::null; + currentDB=TQString(); } void GenericDBWidget::slotAddRecord() @@ -314,7 +314,7 @@ void GenericDBWidget::slotAddRecord() PilotRecord *rec=new PilotRecord(b, 0, 0, 0); PilotListViewItem*item=new PilotListViewItem(fRecordList, TQString::number(-1), TQString::number(rec->size()), - TQString::number(rec->id()), TQString::null, + TQString::number(rec->id()), TQString(), rec->id(), rec); if (slotEditRecord(item)) { diff --git a/kpilot/dbviewerWidget.h b/kpilot/dbviewerWidget.h index 877a869..0a5f2d1 100644 --- a/kpilot/dbviewerWidget.h +++ b/kpilot/dbviewerWidget.h @@ -43,9 +43,10 @@ class KListView; class GenericDBWidget : public PilotComponent { Q_OBJECT + TQ_OBJECT public: - GenericDBWidget(TQWidget* parent, const TQString& dbpath); + GenericDBWidget(TQWidget* tqparent, const TQString& dbpath); virtual ~GenericDBWidget(); // Pilot component methods diff --git a/kpilot/fileInstallWidget.cc b/kpilot/fileInstallWidget.cc index 6990930..e8b55de 100644 --- a/kpilot/fileInstallWidget.cc +++ b/kpilot/fileInstallWidget.cc @@ -58,9 +58,9 @@ #include "fileInstallWidget.moc" -FileInstallWidget::FileInstallWidget(TQWidget * parent, +FileInstallWidget::FileInstallWidget(TQWidget * tqparent, const TQString & path) : - PilotComponent(parent, "component_files", path), + PilotComponent(tqparent, "component_files", path), fSaveFileList(false), fInstaller(0L) { @@ -116,7 +116,7 @@ FileInstallWidget::~FileInstallWidget() static inline bool pdbOrPrc(const TQString &s) { - return s.endsWith(CSL1(".pdb"),false) || s.endsWith(CSL1(".prc"),false) ; + return s.tqendsWith(CSL1(".pdb"),false) || s.tqendsWith(CSL1(".prc"),false) ; } void FileInstallWidget::dragEnterEvent(TQDragEnterEvent *event) @@ -145,7 +145,7 @@ bool FileInstallWidget::eventFilter(TQObject *watched, TQEvent *event) { FUNCTIONSETUP; - if(watched == fIconView->viewport()) + if(TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(fIconView->viewport())) { if(event->type() == TQEvent::DragEnter) { dragEnterEvent(static_cast(event)); @@ -159,7 +159,7 @@ bool FileInstallWidget::eventFilter(TQObject *watched, TQEvent *event) } if(event->type() == TQEvent::MouseButtonPress) { - contextMenu(static_cast(event)); + contextMenu(TQT_TQMOUSEEVENT(event)); } } @@ -214,7 +214,7 @@ void FileInstallWidget::slotAddFile() if (!shown) return; TQStringList fileNames = KFileDialog::getOpenFileNames( - TQString::null, i18n("*.pdb *.prc|PalmOS Databases (*.pdb *.prc)")); + TQString(), i18n("*.pdb *.prc|PalmOS Databases (*.pdb *.prc)")); for (TQStringList::Iterator fileName = fileNames.begin(); fileName != fileNames.end(); ++fileName) { @@ -285,7 +285,7 @@ void FileInstallWidget::contextMenu(TQMouseEvent *event) TQPopupMenu popup(fIconView); - item = fIconView->findItem(event->pos()); + item = fIconView->tqfindItem(event->pos()); if(item) { // Popup for the right clicked item popup.insertItem(i18n("Delete a single file item","Delete"), 10); diff --git a/kpilot/fileInstallWidget.h b/kpilot/fileInstallWidget.h index 4bc5946..b12fd00 100644 --- a/kpilot/fileInstallWidget.h +++ b/kpilot/fileInstallWidget.h @@ -45,9 +45,10 @@ class FileInstaller; class FileInstallWidget : public PilotComponent { Q_OBJECT + TQ_OBJECT public: - FileInstallWidget(TQWidget* parent, const TQString& dbPath); + FileInstallWidget(TQWidget* tqparent, const TQString& dbPath); virtual ~FileInstallWidget(); // Pilot Component Methods: diff --git a/kpilot/fileInstaller.cc b/kpilot/fileInstaller.cc index d46c67d..d02858e 100644 --- a/kpilot/fileInstaller.cc +++ b/kpilot/fileInstaller.cc @@ -105,8 +105,8 @@ void FileInstaller::deleteFiles(const TQStringList &files) { FUNCTIONSETUP; - if(!(s.endsWith(CSL1(".pdb"), false) || s.endsWith(CSL1(".prc"), false))) { - KMessageBox::detailedSorry(w, i18n("Cannot install %1").arg(s), + if(!(s.tqendsWith(CSL1(".pdb"), false) || s.tqendsWith(CSL1(".prc"), false))) { + KMessageBox::detailedSorry(w, i18n("Cannot install %1").tqarg(s), i18n("Only PalmOS database files (like *.pdb and *.prc) can be installed by the file installer.")); return false; } diff --git a/kpilot/fileInstaller.h b/kpilot/fileInstaller.h index 3009de7..60b5805 100644 --- a/kpilot/fileInstaller.h +++ b/kpilot/fileInstaller.h @@ -39,9 +39,10 @@ class TQStringList; class TQString; -class FileInstaller : public QObject +class FileInstaller : public TQObject { Q_OBJECT + TQ_OBJECT public: FileInstaller(); virtual ~FileInstaller(); diff --git a/kpilot/hotSync.cc b/kpilot/hotSync.cc index e0bc7e3..a6d4cc4 100644 --- a/kpilot/hotSync.cc +++ b/kpilot/hotSync.cc @@ -65,10 +65,10 @@ #include "hotSync.moc" -class BackupAction::Thread : public QThread +class BackupAction::Thread : public TQThread { public: - Thread( BackupAction *parent, + Thread( BackupAction *tqparent, KPilotLink *link, const TQString &filename, const DBInfo *info ); @@ -151,7 +151,7 @@ public: return false; } - if (fNoBackupCreators.findIndex(info->creator) != -1) + if (fNoBackupCreators.tqfindIndex(info->creator) != -1) { return false; } @@ -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]").arg(buf)); + creatorids.append(CSL1("[%1]").tqarg(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.").arg(fP->fBackupDir)); + logMessage(i18n("Backup directory: %1.").tqarg(fP->fBackupDir)); DEBUGKPILOT << fname << ": This Pilot user's name is \"" @@ -349,18 +349,18 @@ static inline bool checkBackupDirectory( const TQString &backupDir ) if (fP->fFullBackup) { - fActionStatus = FullBackup; + fActiontqStatus = FullBackup; addSyncLogEntry(i18n("Full backup started.")); } else { - fActionStatus = FastBackup; + fActiontqStatus = FastBackup; addSyncLogEntry(i18n("Fast backup started")); } if (!checkBackupDirectory(fP->fBackupDir)) { - fActionStatus=BackupIncomplete; + fActiontqStatus=BackupIncomplete; // Don't issue an error message, checkBackupDirectory // did this already... return false; @@ -380,13 +380,13 @@ static inline bool checkBackupDirectory( const TQString &backupDir ) struct DBInfo info; // TODO: make the progress reporting more accurate - emit logProgress(TQString::null, fP->fDBIndex); + emit logProgress(TQString(), fP->fDBIndex); if (openConduit() < 0) { addSyncLogEntry(i18n("Exiting on cancel.")); endBackup(); - fActionStatus = BackupIncomplete; + fActiontqStatus = BackupIncomplete; return; } @@ -403,7 +403,7 @@ static inline bool checkBackupDirectory( const TQString &backupDir ) addSyncLogEntry( i18n("Fast backup complete.") ); } endBackup(); - fActionStatus = BackupComplete; + fActiontqStatus = 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").arg(Pilot::fromPilot(info.name))); + addSyncLogEntry(i18n("Backing up: %1").tqarg(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") - .arg(Pilot::fromPilot(info.name)); + .tqarg(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") - .arg(Pilot::fromPilot(info->name))); + .tqarg(Pilot::fromPilot(info->name))); return false; } @@ -557,7 +557,7 @@ void BackupAction::endBackup() FUNCTIONSETUP; fP->fDBIndex = (-1); - fActionStatus = BackupEnded; + fActiontqStatus = 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").arg(fileName); + TQString m = i18n("Installing %1").tqarg(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.").arg(fileName)); + "KPilot cannot install this database.").tqarg(fileName)); } return r; @@ -769,7 +769,7 @@ bool FileInstallAction::resourceOK(const TQString &fileName, const TQString &fil } else { - return TQString(CSL1("Installing %1")).arg(fList[fDBIndex]); + return TQString(CSL1("Installing %1")).tqarg(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)?").arg(defaultUserName); + "(%1)?").tqarg(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?").arg(guiUserName); + "handheld as well?").tqarg(guiUserName); q += i18n("
(Note: If your handheld " "has been reset to factory defaults, you " "should use Restore instead of a " @@ -885,7 +885,7 @@ CheckUser::~CheckUser() int r = questionYesNoCancel(q, i18n("User Mismatch"), - TQString::null, + TQString(), 20, i18n("Use KPilot Name"), i18n("Use Handheld Name")); @@ -986,14 +986,14 @@ void RestoreAction::setDirectory( const TQString &path ) DEBUGKPILOT << fname << ": Restoring user " << dirname << endl; #endif - TQDir dir(dirname, TQString::null, TQDir::Name, + TQDir dir(dirname, TQString(), TQDir::Name, TQDir::Files | TQDir::Readable | TQDir::NoSymLinks); if (!dir.exists()) { WARNINGKPILOT << "Restore directory " << dirname << " does not exist." << endl; - fActionStatus = Error; + fActiontqStatus = 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...").arg(TQString::null),1); + emit logProgress(i18n("Restoring %1...").tqarg(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.").arg(s)); + logMessage(i18n("File '%1' cannot be read.").tqarg(s)); } } fP->fDBIndex = 0; fP->fDBIterator = fP->fDBList.begin(); - fActionStatus = InstallingFiles; + fActiontqStatus = 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(fActionStatus == InstallingFiles); + Q_ASSERT(fActiontqStatus == InstallingFiles); if (fP->fDBIterator == fP->fDBList.end()) { fP->fTimer.stop(); - fActionStatus = Done; + fActiontqStatus = Done; addSyncLogEntry(i18n("OK.")); delayDone(); return; @@ -1081,9 +1081,9 @@ void RestoreAction::setDirectory( const TQString &path ) if (openConduit() < 0) { - WARNINGKPILOT << "Restore apparently canceled." << endl; + WARNINGKPILOT << "Restore aptqparently canceled." << endl; logMessage(i18n("Restore incomplete.")); - fActionStatus = Done; + fActiontqStatus = 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...").arg(databaseInfo.fileName()), + emit logProgress(i18n("Restoring %1...").tqarg(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'.") - .arg(databaseInfo.fileName())); + .tqarg(databaseInfo.fileName())); } } @@ -1128,12 +1128,12 @@ void RestoreAction::setDirectory( const TQString &path ) -BackupAction::Thread::Thread( BackupAction *parent, +BackupAction::Thread::Thread( BackupAction *tqparent, KPilotLink *link, const TQString &filename, const DBInfo *info ) { - fParent = parent; + fParent = tqparent; fLink = link; fFilename = filename; memcpy(&fDBInfo,info,sizeof(DBInfo)); diff --git a/kpilot/hotSync.h b/kpilot/hotSync.h index f100e63..4b6b03d 100644 --- a/kpilot/hotSync.h +++ b/kpilot/hotSync.h @@ -52,6 +52,7 @@ protected: class BackupAction : public SyncAction { Q_OBJECT + TQ_OBJECT public: /** Constructor. Back up all the databases on @@ -64,7 +65,7 @@ public: */ BackupAction(KPilotLink *, bool full); - enum Status { Init, + enum tqStatus { Init, Error, FastBackup, FullBackup, @@ -117,6 +118,7 @@ private: class FileInstallAction : public SyncAction { Q_OBJECT + TQ_OBJECT public: FileInstallAction(KPilotLink *, const TQString &fileDir); @@ -144,10 +146,11 @@ private: class RestoreAction : public SyncAction { Q_OBJECT + TQ_OBJECT public: RestoreAction(KPilotLink *,TQWidget *w=0L); - typedef enum { InstallingFiles, GettingFileInfo,Done } Status; + typedef enum { InstallingFiles, GettingFileInfo,Done } tqStatus; 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 2c803f5..23e2c32 100644 --- a/kpilot/internalEditorAction.cc +++ b/kpilot/internalEditorAction.cc @@ -60,7 +60,7 @@ bool InternalEditorAction::exec() { FUNCTIONSETUP; emit logMessage(i18n("[Internal Editors]")); - fInternalEditorSyncStatus=eSyncStarted; + fInternalEditorSynctqStatus=eSyncStarted; TQTimer::singleShot(0, this, TQT_SLOT(syncDirtyDB())); return true; } @@ -69,11 +69,11 @@ void InternalEditorAction::syncDirtyDB() { FUNCTIONSETUP; - if (fInternalEditorSyncStatus!=eSyncDirtyDB) + if (fInternalEditorSynctqStatus!=eSyncDirtyDB) { - fInternalEditorSyncStatus=eSyncDirtyDB; + fInternalEditorSynctqStatus=eSyncDirtyDB; dirtyDBs=KPilotSettings::dirtyDatabases(); - emit logMessage(i18n("Databases with changed records: %1").arg(dirtyDBs.join(CSL1(", ")))); + emit logMessage(i18n("Databases with changed records: %1").tqarg(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.").arg(*dbIter)); + "Skipping it.").tqarg(*dbIter)); goto nextDB; } while ( (rec=localDB->readNextModifiedRec()) ) @@ -161,8 +161,8 @@ bool InternalEditorAction::queryUseKPilotChanges(TQString dbName, recordid_t id, PilotAddress localAddr(localrec); PilotAddress serialAddr(serialrec); - localEntry=localAddr.getTextRepresentation(&info,Qt::RichText); - serialEntry=serialAddr.getTextRepresentation(&info,Qt::RichText); + localEntry=localAddr.getTextRepresentation(&info,TQt::RichText); + serialEntry=serialAddr.getTextRepresentation(&info,TQt::RichText); recType=i18n("address"); } else @@ -172,8 +172,8 @@ bool InternalEditorAction::queryUseKPilotChanges(TQString dbName, recordid_t id, PilotTodoEntry localTodo(localrec); PilotTodoEntry serialTodo(serialrec); - localEntry=localTodo.getTextRepresentation(Qt::RichText); - serialEntry=serialTodo.getTextRepresentation(Qt::RichText); + localEntry=localTodo.getTextRepresentation(TQt::RichText); + serialEntry=serialTodo.getTextRepresentation(TQt::RichText); recType=i18n("to-do entry"); } else @@ -181,8 +181,8 @@ bool InternalEditorAction::queryUseKPilotChanges(TQString dbName, recordid_t id, { PilotMemo localMemo(localrec); PilotMemo serialMemo(serialrec); - localEntry=localMemo.getTextRepresentation(Qt::RichText); - serialEntry=serialMemo.getTextRepresentation(Qt::RichText); + localEntry=localMemo.getTextRepresentation(TQt::RichText); + serialEntry=serialMemo.getTextRepresentation(TQt::RichText); recType=i18n("memo"); } else @@ -192,8 +192,8 @@ bool InternalEditorAction::queryUseKPilotChanges(TQString dbName, recordid_t id, PilotDateEntry localEvent(localrec); PilotDateEntry serialEvent(serialrec); - localEntry=localEvent.getTextRepresentation(Qt::RichText); - serialEntry=serialEvent.getTextRepresentation(Qt::RichText); + localEntry=localEvent.getTextRepresentation(TQt::RichText); + serialEntry=serialEvent.getTextRepresentation(TQt::RichText); recType=i18n("calendar entry"); } else @@ -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?"). - arg(recType).arg(id).arg(dbName)); + tqarg(recType).tqarg(id).tqarg(dbName)); KDialogBase*resdlg=new KDialogBase(0L, "internalresolutiondialog", true, - i18n("Conflict in database %1").arg(*dbIter), + i18n("Conflict in database %1").tqarg(*dbIter), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true, i18n("Use KPilot"), i18n("Use Handheld") ); resdlg->setButtonText(KDialogBase::Ok, i18n("Use &KPilot")); @@ -228,14 +228,14 @@ bool InternalEditorAction::queryUseKPilotChanges(TQString dbName, recordid_t id, label=new TQLabel(i18n("Entry in KPilot"), page); tqlayout->addWidget( label, 2,0); - KTextEdit*textBrowser = new KTextEdit(CSL1("")+localEntry+CSL1(""), TQString::null, page); + KTextEdit*textBrowser = new KTextEdit(CSL1("")+localEntry+CSL1(""), TQString(), page); textBrowser->setReadOnly(true); tqlayout->addWidget( textBrowser, 3,0); label=new TQLabel(i18n("Entry on Handheld"), page); tqlayout->addWidget( label, 2,1); - textBrowser = new KTextEdit(CSL1("")+serialEntry+CSL1(""), TQString::null, page); + textBrowser = new KTextEdit(CSL1("")+serialEntry+CSL1(""), TQString(), page); textBrowser->setReadOnly(true); tqlayout->addWidget( textBrowser, 3,1); } @@ -261,8 +261,8 @@ bool InternalEditorAction::queryUseKPilotChanges(TQString dbName, recordid_t id, else { TQLabel*tmpW = new TQLabel( i18n("To view and edit the record data, please install a hex editor (e.g. khexedit from kdeutils)."), page ); - tmpW->setBackgroundMode( Qt::PaletteMid ); - tmpW->tqsetAlignment( Qt::AlignHCenter | Qt::AlignVCenter | Qt::WordBreak); + tmpW->setBackgroundMode( TQt::PaletteMid ); + tmpW->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter | TQt::WordBreak); tmpW->setFrameShape( TQFrame::Panel ); tmpW->setFrameShadow( TQFrame::Sunken ); hexEdit = tmpW; @@ -289,8 +289,8 @@ bool InternalEditorAction::queryUseKPilotChanges(TQString dbName, recordid_t id, else { TQLabel*tmpW = new TQLabel( i18n("To view and edit the record data, please install a hex editor (e.g. khexedit from kdeutils)."), page ); - tmpW->setBackgroundMode( Qt::PaletteMid ); - tmpW->tqsetAlignment( Qt::AlignHCenter | Qt::AlignVCenter | Qt::WordBreak); + tmpW->setBackgroundMode( TQt::PaletteMid ); + tmpW->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter | TQt::WordBreak); tmpW->setFrameShape( TQFrame::Panel ); tmpW->setFrameShadow( TQFrame::Sunken ); hexEdit = tmpW; @@ -308,11 +308,11 @@ bool InternalEditorAction::queryUseKPilotChanges(TQString dbName, recordid_t id, void InternalEditorAction::syncFlagsChangedDB() { FUNCTIONSETUP; - if (fInternalEditorSyncStatus!=eSyncFlagsChangedDB) + if (fInternalEditorSynctqStatus!=eSyncFlagsChangedDB) { - fInternalEditorSyncStatus=eSyncFlagsChangedDB; + fInternalEditorSynctqStatus=eSyncFlagsChangedDB; dirtyDBs=KPilotSettings::flagsChangedDatabases(); - emit logMessage(i18n("Databases with changed flags: %1").arg(dirtyDBs.join(CSL1(", ")))); + emit logMessage(i18n("Databases with changed flags: %1").tqarg(dirtyDBs.join(CSL1(", ")))); dbIter=dirtyDBs.begin(); } else @@ -349,11 +349,11 @@ return; void InternalEditorAction::syncAppBlockChangedDB() { FUNCTIONSETUP; - if (fInternalEditorSyncStatus!=eSyncAppBlockChangedDB) + if (fInternalEditorSynctqStatus!=eSyncAppBlockChangedDB) { - fInternalEditorSyncStatus=eSyncAppBlockChangedDB; + fInternalEditorSynctqStatus=eSyncAppBlockChangedDB; dirtyDBs=KPilotSettings::appBlockChangedDatabases(); - emit logMessage(i18n("Databases with changed AppBlock: %1").arg(dirtyDBs.join(CSL1(", ")))); + emit logMessage(i18n("Databases with changed AppBlock: %1").tqarg(dirtyDBs.join(CSL1(", ")))); dbIter=dirtyDBs.begin(); } else @@ -387,7 +387,7 @@ void InternalEditorAction::syncAppBlockChangedDB() void InternalEditorAction::cleanup() { FUNCTIONSETUP; - fInternalEditorSyncStatus=eSyncFinished; + fInternalEditorSynctqStatus=eSyncFinished; emit syncDone(this); } diff --git a/kpilot/internalEditorAction.h b/kpilot/internalEditorAction.h index ed26cb3..db78eb2 100644 --- a/kpilot/internalEditorAction.h +++ b/kpilot/internalEditorAction.h @@ -36,6 +36,7 @@ class InternalEditorAction : public SyncAction { Q_OBJECT + TQ_OBJECT public: InternalEditorAction(KPilotLink *); @@ -56,13 +57,13 @@ private: PilotRecord*localrec, PilotRecord*serialrec, PilotDatabase*db); TQStringList dirtyDBs; TQStringList::Iterator dbIter; - enum eInternalEditorSyncStatus { + enum eInternalEditorSynctqStatus { eSyncStarted, eSyncDirtyDB, eSyncFlagsChangedDB, eSyncAppBlockChangedDB, eSyncFinished - } fInternalEditorSyncStatus; + } fInternalEditorSynctqStatus; } ; #endif diff --git a/kpilot/kpilot.cc b/kpilot/kpilot.cc index 0af1258..91d8d31 100644 --- a/kpilot/kpilot.cc +++ b/kpilot/kpilot.cc @@ -104,7 +104,7 @@ KPilotInstaller::KPilotInstaller() : fQuitAfterCopyComplete(false), fManagingWidget(0L), fDaemonWasRunning(true), - fAppStatus(Startup), + fApptqStatus(Startup), fFileInstallWidget(0L), fLogWidget(0L) { @@ -143,7 +143,7 @@ void KPilotInstaller::startDaemonIfNeeded() { FUNCTIONSETUP; - fAppStatus=WaitingForDaemon; + fApptqStatus=WaitingForDaemon; TQString daemonError; TQCString daemonDCOP; @@ -169,7 +169,7 @@ void KPilotInstaller::startDaemonIfNeeded() if (!fDaemonWasRunning && KApplication::startServiceByDesktopName( CSL1("kpilotdaemon"), - TQString::null, &daemonError, &daemonDCOP, &daemonPID + TQString(), &daemonError, &daemonDCOP, &daemonPID , "0" /* no notify */ )) { @@ -178,9 +178,9 @@ void KPilotInstaller::startDaemonIfNeeded() { fLogWidget->addMessage(i18n("Could not start the " "KPilot daemon. The system error message " - "was: "%1"").arg(daemonError)); + "was: "%1"").tqarg(daemonError)); } - fAppStatus=Error; + fApptqStatus=Error; } else { @@ -189,14 +189,14 @@ void KPilotInstaller::startDaemonIfNeeded() { int wordoffset; s.remove(0,12); - wordoffset=s.find(';'); + wordoffset=s.tqfind(';'); if (wordoffset>0) s.truncate(wordoffset); fLogWidget->addMessage( i18n("Daemon status is `%1'") - .arg(s.isEmpty() ? i18n("not running") : s )); + .tqarg(s.isEmpty() ? i18n("not running") : s )); } - fAppStatus=Normal; + fApptqStatus=Normal; } } @@ -213,7 +213,7 @@ void KPilotInstaller::readConfig() { fLogWidget->addMessage(i18n("Using character set %1 on " "the handheld.") - .arg(Pilot::codecName())); + .tqarg(Pilot::codecName())); } } @@ -232,7 +232,7 @@ void KPilotInstaller::setupWidget() fManagingWidget->show(); setCentralWidget(fManagingWidget); connect( fManagingWidget, TQT_SIGNAL( aboutToShowPage ( TQWidget* ) ), - this, TQT_SLOT( slotAboutToShowComponent( TQWidget* ) ) ); + TQT_TQOBJECT(this), TQT_SLOT( slotAboutToShowComponent( TQWidget* ) ) ); initIcons(); initMenu(); @@ -256,7 +256,7 @@ void KPilotInstaller::initComponents() #define ADDICONPAGE(a,b) \ pixmap = KGlobal::iconLoader()->loadIcon(b, KIcon::Desktop, 64); \ - w = getManagingWidget()->addVBoxPage(a,TQString::null, pixmap) ; + w = getManagingWidget()->addVBoxPage(a,TQString(), pixmap) ; ADDICONPAGE(i18n("HotSync"),CSL1("kpilotbhotsync")); fLogWidget = new LogWidget(w); @@ -320,21 +320,21 @@ void KPilotInstaller::slotSelectComponent(PilotComponent *c) return; } - TQObject *o = c->parent(); + TQObject *o = c->tqparent(); if (!o) { - WARNINGKPILOT << "Widget has no parent." << endl; + WARNINGKPILOT << "Widget has no tqparent." << endl; return; } - TQWidget *parent = dynamic_cast(o); - if (!parent) + TQWidget *tqparent = dynamic_cast(o); + if (!tqparent) { - WARNINGKPILOT << "Widget's parent is not a widget." << endl; + WARNINGKPILOT << "Widget's tqparent is not a widget." << endl; return; } - int index = fManagingWidget->pageIndex(parent); + int index = fManagingWidget->pageIndex(tqparent); if (index < 0) { @@ -401,7 +401,7 @@ void KPilotInstaller::slotPCtoHHRequested() i18n("Please press the HotSync button.")); } -/* virtual DCOP */ ASYNC KPilotInstaller::daemonStatus(int i) +/* virtual DCOP */ ASYNC KPilotInstaller::daemontqStatus(int i) { FUNCTIONSETUP; DEBUGKPILOT << fname << ": Received daemon message " << i << endl; @@ -409,17 +409,17 @@ void KPilotInstaller::slotPCtoHHRequested() switch(i) { case KPilotDCOP::StartOfHotSync : - if (fAppStatus==Normal) + if (fApptqStatus==Normal) { - fAppStatus=WaitingForDaemon; + fApptqStatus=WaitingForDaemon; componentPreSync(); } break; case KPilotDCOP::EndOfHotSync : - if (fAppStatus==WaitingForDaemon) + if (fApptqStatus==WaitingForDaemon) { componentPostSync(); - fAppStatus=Normal; + fApptqStatus=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.")); } - fAppStatus=WaitingForDaemon; + fApptqStatus=WaitingForDaemon; break; case KPilotDCOP::None : WARNINGKPILOT << "Unhandled status message " << i << endl; @@ -437,7 +437,7 @@ void KPilotInstaller::slotPCtoHHRequested() } } -/* virtual DCOP*/ int KPilotInstaller::kpiloStatus() +/* virtual DCOP*/ int KPilotInstaller::kpilotqStatus() { return status(); } @@ -459,7 +459,7 @@ bool KPilotInstaller::componentPreSync() if (!reason.isNull()) { KMessageBox::sorry(this, - rprefix.arg(reason), + rprefix.tqarg(reason), i18n("Cannot start Sync")); return false; } @@ -519,11 +519,11 @@ void KPilotInstaller::initMenu() "This applies only to the next HotSync; to change the default, use " "the configuration dialog.")); connect(syncPopup, TQT_SIGNAL(activated()), - this, TQT_SLOT(slotHotSyncRequested())); + TQT_TQOBJECT(this), TQT_SLOT(slotHotSyncRequested())); // File actions, keep this list synced with kpilotui.rc and pilotDaemon.cc a = new KAction(i18n("&HotSync"), CSL1("hotsync"), 0, - this, TQT_SLOT(slotHotSyncRequested()), + TQT_TQOBJECT(this), TQT_SLOT(slotHotSyncRequested()), actionCollection(), "file_hotsync"); a->setToolTip(i18n("Next HotSync will be normal HotSync.")); a->setWhatsThis(i18n("Tell the daemon that the next HotSync " @@ -531,7 +531,7 @@ void KPilotInstaller::initMenu() syncPopup->insert(a); a = new KAction(i18n("Full&Sync"), CSL1("fullsync"), 0, - this, TQT_SLOT(slotFullSyncRequested()), + TQT_TQOBJECT(this), TQT_SLOT(slotFullSyncRequested()), actionCollection(), "file_fullsync"); a->setToolTip(i18n("Next HotSync will be a FullSync.")); a->setWhatsThis(i18n("Tell the daemon that the next HotSync " @@ -539,7 +539,7 @@ void KPilotInstaller::initMenu() syncPopup->insert(a); a = new KAction(i18n("&Backup"), CSL1("backup"), 0, - this, TQT_SLOT(slotBackupRequested()), + TQT_TQOBJECT(this), TQT_SLOT(slotBackupRequested()), actionCollection(), "file_backup"); a->setToolTip(i18n("Next HotSync will be backup.")); a->setWhatsThis(i18n("Tell the daemon that the next HotSync " @@ -547,15 +547,15 @@ void KPilotInstaller::initMenu() syncPopup->insert(a); a = new KAction(i18n("&Restore"), CSL1("restore"), 0, - this, TQT_SLOT(slotRestoreRequested()), + TQT_TQOBJECT(this), TQT_SLOT(slotRestoreRequested()), actionCollection(), "file_restore"); a->setToolTip(i18n("Next HotSync will be restore.")); a->setWhatsThis(i18n("Tell the daemon that the next HotSync " "should restore the Handheld from data on the PC.")); syncPopup->insert(a); - a = new KAction(i18n("Copy Handheld to PC"), TQString::null, 0, - this, TQT_SLOT(slotHHtoPCRequested()), + a = new KAction(i18n("Copy Handheld to PC"), TQString(), 0, + TQT_TQOBJECT(this), TQT_SLOT(slotHHtoPCRequested()), actionCollection(), "file_HHtoPC"); a->setToolTip(i18n("Next HotSync will be backup.")); a->setWhatsThis(i18n("Tell the daemon that the next HotSync " @@ -563,8 +563,8 @@ void KPilotInstaller::initMenu() "overwriting entries on the PC.")); syncPopup->insert(a); - a = new KAction(i18n("Copy PC to Handheld"), TQString::null, 0, - this, TQT_SLOT(slotPCtoHHRequested()), + a = new KAction(i18n("Copy PC to Handheld"), TQString(), 0, + TQT_TQOBJECT(this), TQT_SLOT(slotPCtoHHRequested()), actionCollection(), "file_PCtoHH"); a->setToolTip(i18n("Next HotSync will copy PC to Handheld.")); a->setWhatsThis(i18n("Tell the daemon that the next HotSync " @@ -586,14 +586,14 @@ void KPilotInstaller::initMenu() a = new KAction(i18n("Rese&t Link"),CSL1("reload"), 0, - this, TQT_SLOT(slotResetLink()), + TQT_TQOBJECT(this), TQT_SLOT(slotResetLink()), actionCollection(),"file_reload"); a->setToolTip(i18n("Reset the device connection.")); a->setWhatsThis(i18n("Try to reset the daemon and its connection " "to the Handheld.")); - a = KStdAction::quit(this, TQT_SLOT(quit()), actionCollection()); + a = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(quit()), actionCollection()); a->setWhatsThis(i18n("Quit KPilot, (and stop the daemon " "if configured that way).")); @@ -603,15 +603,15 @@ void KPilotInstaller::initMenu() createStandardStatusBarAction(); setStandardToolBarMenuEnabled(true); - (void) KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), + (void) KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection()); - (void) KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), + (void) KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection()); - (void) KStdAction::preferences(this, TQT_SLOT(configure()), + (void) KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(configure()), actionCollection()); a = new KAction(i18n("Configuration &Wizard..."), CSL1("wizard"), 0, - this, TQT_SLOT(configureWizard()), + TQT_TQOBJECT(this), TQT_SLOT(configureWizard()), actionCollection(), "options_configure_wizard"); a->setWhatsThis(i18n("Configure KPilot using the configuration wizard.")); @@ -685,13 +685,13 @@ void KPilotInstaller::addComponentPage(PilotComponent * p, KToggleAction *pt = new KToggleAction(name, /* "kpilot" -- component icon, */ 0, - p, TQT_SLOT(slotShowComponent()), + TQT_TQOBJECT(p), TQT_SLOT(slotShowComponent()), actionCollection(), actionname); pt->setExclusiveGroup(CSL1("view_menu")); - connect(p, TQT_SIGNAL(showComponent(PilotComponent *)), - this, TQT_SLOT(slotSelectComponent(PilotComponent *))); + connect(TQT_TQOBJECT(p), TQT_SIGNAL(showComponent(PilotComponent *)), + TQT_TQOBJECT(this), TQT_SLOT(slotSelectComponent(PilotComponent *))); } /* slot */ void KPilotInstaller::initializeComponents() @@ -719,7 +719,7 @@ void KPilotInstaller::optionsConfigureToolbars() // This was added in KDE 3.1 saveMainWindowSettings( KGlobal::config(), autoSaveGroup() ); KEditToolbar dlg(actionCollection()); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(slotNewToolbarConfig())); + connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_TQOBJECT(this), TQT_SLOT(slotNewToolbarConfig())); dlg.exec(); } @@ -741,7 +741,7 @@ void KPilotInstaller::slotResetLink() /* ** Can't be a member function because it needs to be called even with no KPilotInstaller. */ -static bool runConfigure(PilotDaemonDCOP_stub &daemon,TQWidget *parent) +static bool runConfigure(PilotDaemonDCOP_stub &daemon,TQWidget *tqparent) { FUNCTIONSETUP; bool ret = false; @@ -754,7 +754,7 @@ static bool runConfigure(PilotDaemonDCOP_stub &daemon,TQWidget *parent) KPilotSettings::self()->readConfig(); - KCMultiDialog *options = new KCMultiDialog( KDialogBase::Plain, i18n("Configuration"), parent, "KPilotPreferences", true ); + KCMultiDialog *options = new KCMultiDialog( KDialogBase::Plain, i18n("Configuration"), tqparent, "KPilotPreferences", true ); options->addModule( CSL1("kpilot_config.desktop") ); if (!options) @@ -796,7 +796,7 @@ static bool runConfigure(PilotDaemonDCOP_stub &daemon,TQWidget *parent) * canceled, though). */ typedef enum { Failed, OK, Cancel } WizardResult; -static WizardResult runWizard(PilotDaemonDCOP_stub &daemon,TQWidget *parent) +static WizardResult runWizard(PilotDaemonDCOP_stub &daemon,TQWidget *tqparent) { FUNCTIONSETUP; WizardResult ret = Failed ; @@ -826,7 +826,7 @@ static WizardResult runWizard(PilotDaemonDCOP_stub &daemon,TQWidget *parent) goto sorry; } - w = f(parent,ConfigWizard::Standalone); + w = f(tqparent,ConfigWizard::Standalone); if (!w) { WARNINGKPILOT << "Can't create wizard." << endl; @@ -847,7 +847,7 @@ static WizardResult runWizard(PilotDaemonDCOP_stub &daemon,TQWidget *parent) sorry: if (Failed == ret) { - KMessageBox::sorry(parent, + KMessageBox::sorry(tqparent, i18n("The library containing the configuration wizard for KPilot " "could not be loaded, and the wizard is not available. " "Please try to use the regular configuration dialog."), @@ -896,7 +896,7 @@ void KPilotInstaller::componentUpdate() if (fLogWidget) { fLogWidget->logMessage(i18n("Changed username to `%1'.") - .arg(KPilotSettings::userName())); + .tqarg(KPilotSettings::userName())); fManagingWidget->showPage(0); slotAboutToShowComponent(fLogWidget); } @@ -920,7 +920,7 @@ void KPilotInstaller::componentUpdate() { FUNCTIONSETUP; - if ( fAppStatus!=Normal || fConfigureKPilotDialogInUse ) + if ( fApptqStatus!=Normal || fConfigureKPilotDialogInUse ) { if (fLogWidget) { @@ -928,7 +928,7 @@ void KPilotInstaller::componentUpdate() } return; } - fAppStatus=UIBusy; + fApptqStatus=UIBusy; fConfigureKPilotDialogInUse = true; if (runWizard(getDaemon(),this) == OK) @@ -937,14 +937,14 @@ void KPilotInstaller::componentUpdate() } fConfigureKPilotDialogInUse = false; - fAppStatus=Normal; + fApptqStatus=Normal; } /* virtual DCOP */ ASYNC KPilotInstaller::configure() { FUNCTIONSETUP; - if ( fAppStatus!=Normal || fConfigureKPilotDialogInUse ) + if ( fApptqStatus!=Normal || fConfigureKPilotDialogInUse ) { if (fLogWidget) { @@ -952,7 +952,7 @@ void KPilotInstaller::componentUpdate() } return; } - fAppStatus=UIBusy; + fApptqStatus=UIBusy; fConfigureKPilotDialogInUse = true; if (runConfigure(getDaemon(),this)) { @@ -960,7 +960,7 @@ void KPilotInstaller::componentUpdate() } fConfigureKPilotDialogInUse = false; - fAppStatus=Normal; + fApptqStatus=Normal; } diff --git a/kpilot/kpilot.h b/kpilot/kpilot.h index d986567..da024b9 100644 --- a/kpilot/kpilot.h +++ b/kpilot/kpilot.h @@ -43,14 +43,14 @@ class PilotComponent; class FileInstallWidget; class LogWidget; - #include "kpilotDCOP.h" class KPilotInstaller : public KMainWindow, public KPilotDCOP { -Q_OBJECT + Q_OBJECT + TQ_OBJECT public: KPilotInstaller(); @@ -70,7 +70,7 @@ public: void addComponentPage(PilotComponent *, const TQString &name); - KPiloStatus status() const { return fAppStatus; } ; + KPilotqStatus status() const { return fApptqStatus; } ; protected: @@ -122,16 +122,25 @@ public: /** * This is the DCOP interface from the daemon to KPilot. */ - virtual ASYNC daemonStatus(int); - virtual int kpiloStatus(); + virtual ASYNC daemontqStatus(int); + virtual int kpilotqStatus(); public slots: /** * This is the DCOP interface from the daemon to KPilot * to configure KPilot. */ +// MOC_SKIP_BEGIN +#ifdef Q_MOC_RUN + virtual void configure(); + virtual void configureWizard(); +#else // Q_MOC_RUN +// MOC_SKIP_END virtual ASYNC configure(); virtual ASYNC configureWizard(); +// MOC_SKIP_BEGIN +#endif // Q_MOC_RUN +// MOC_SKIP_END protected: void readConfig(); @@ -166,7 +175,7 @@ private: KJanusWidget *fManagingWidget; bool fDaemonWasRunning; - KPiloStatus fAppStatus; + KPilotqStatus fApptqStatus; FileInstallWidget *fFileInstallWidget; LogWidget *fLogWidget; diff --git a/kpilot/kpilotConfig.cc b/kpilot/kpilotConfig.cc index c5dbad1..cec6382 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.").arg(fileversion).arg(ConfigurationVersion); + "needs version %2.").tqarg(fileversion).tqarg(ConfigurationVersion); if (run) { s += ' '; @@ -209,7 +209,7 @@ static void update440() TQStringList conduits( KPilotSettings::installedConduits() ); KConfig*c = KPilotSettings::self()->config(); /// c->resetGroup(); - c->setGroup( TQString::null ); + c->setGroup( TQString() ); bool installFiles = c->readBoolEntry("SyncFiles",true); if (installFiles) conduits.append( CSL1("internal_fileinstall") ); c->deleteEntry("SyncFiles"); @@ -234,7 +234,7 @@ static void update440() const char **s = oldconduits; while (*s) { - TQString libname = CSL1("kde3/lib%1conduit.so").arg(TQString::tqfromLatin1(*s)); + TQString libname = CSL1("kde3/lib%1conduit.so").tqarg(TQString::tqfromLatin1(*s)); TQString foundlib = ::locate("lib",libname); if (!foundlib.isEmpty()) { @@ -270,7 +270,7 @@ static void update443() { if ((*i).length()==4) { - fixSkip.append(CSL1("[%1]").arg(*i)); + fixSkip.append(CSL1("[%1]").tqarg(*i)); fixedSome = true; } else diff --git a/kpilot/kpilotConfigDialog.cc b/kpilot/kpilotConfigDialog.cc index 34cf824..1bd3b40 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?").arg(this->conduitName()); + "want to save the changes before continuing?").tqarg(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?") - .arg(d), + .tqarg(d), i18n("Device Name too Long"), i18n("Use"), i18n("Do Not Use") ) ; } diff --git a/kpilot/kpilotConfigDialog.h b/kpilot/kpilotConfigDialog.h index 11960f8..7fbe6a7 100644 --- a/kpilot/kpilotConfigDialog.h +++ b/kpilot/kpilotConfigDialog.h @@ -53,6 +53,7 @@ protected: class DeviceConfigPage : public ConfigPage { Q_OBJECT + TQ_OBJECT public: DeviceConfigPage( TQWidget *, const char * ); @@ -90,6 +91,7 @@ private: class BackupConfigPage : public ConfigPage { Q_OBJECT + TQ_OBJECT public: BackupConfigPage( TQWidget *, const char * ); diff --git a/kpilot/kpilotConfigDialog_backup.ui b/kpilot/kpilotConfigDialog_backup.ui index cb2a6ad..c9144bc 100644 --- a/kpilot/kpilotConfigDialog_backup.ui +++ b/kpilot/kpilotConfigDialog_backup.ui @@ -2,7 +2,7 @@ BackupConfigWidget A widget for editing HotSync-specific settings. David Bishop - + BackupConfigForm @@ -21,7 +21,7 @@ unnamed - + GroupBox23_2 @@ -32,7 +32,7 @@ unnamed - + TextLabel5_2 @@ -57,7 +57,7 @@ fBackupFrequency - + On every HotSync @@ -82,7 +82,7 @@ - + GroupBox23 @@ -93,7 +93,7 @@ unnamed - + TextLabel5 @@ -113,7 +113,7 @@ <qt><p>Enter the databases types you wish to exclude from the backup operation here. Use this setting if backing up some databases crashes the handheld, or if you do not want a backup of some databases (like AvantGo pages).</p><p>Entries with square brackets [] are <i>creator codes</i> like <tt>[lnch]</tt> and can exclude a whole range of databases. Entries without the brackets list database names, and may include shell-style wildcards, like <tt>*_a68k</tt>.</p></qt> - + TextLabel6 @@ -133,7 +133,7 @@ <qt><p>Enter the databases types you wish to exclude from the restore operation here (like AvantGo databases). They will be skipped even if they exist in the set of backup databases on the handheld. If you still want to install an ignored database to the handheld, you can always manually install it to the handheld.</p><p>Entries with square brackets [] are <i>creator codes</i> like <tt>[lnch]</tt> and can exclude a whole range of databases. Entries without the brackets list database names, and may include shell-style wildcards, like <tt>*_a68k</tt>.</p></qt> - + fBackupOnly @@ -141,7 +141,7 @@ <qt><p>Enter the databases types you wish to exclude from the backup operation here. Use this setting if backing up some databases crashes the handheld, or if you do not want a backup of some databases (like AvantGo pages).</p><p>Entries with square brackets [] are <i>creator codes</i> like <tt>[lnch]</tt> and can exclude a whole range of databases. Entries without the brackets list database names, and may include shell-style wildcards, like <tt>*_a68k</tt>.</p></qt> - + fSkipDB @@ -149,7 +149,7 @@ <qt><p>Enter the databases types you wish to exclude from the restore operation here (like AvantGo databases). They will be skipped even if they exist in the set of backup databases on the handheld. If you still want to install an ignored database to the handheld, you can always manually install it to the handheld.</p><p>Entries with square brackets [] are <i>creator codes</i> like <tt>[lnch]</tt> and can exclude a whole range of databases. Entries without the brackets list database names, and may include shell-style wildcards, like <tt>*_a68k</tt>.</p></qt> - + fBackupOnlyChooser @@ -160,7 +160,7 @@ <qt>Click here to open the database selection dialog. This dialog allows you to check the databases you want to exclude from the backup from a list.</qt> - + fSkipDBChooser @@ -173,7 +173,7 @@ - + fRunConduitsWithBackup diff --git a/kpilot/kpilotConfigDialog_device.ui b/kpilot/kpilotConfigDialog_device.ui index ef25851..cf86146 100644 --- a/kpilot/kpilotConfigDialog_device.ui +++ b/kpilot/kpilotConfigDialog_device.ui @@ -2,7 +2,7 @@ DeviceConfigWidget A widget for configuring the hardware device. David Bishop - + DeviceForm @@ -21,7 +21,7 @@ unnamed - + TextLabel1 @@ -35,7 +35,7 @@ <qt>Enter the device the Pilot is attached to (for instance a serial or USB port) here. You can also use <i>/dev/pilot</i>, and make that a symlink to the correct device. You need write permission to successfully synchronize with the handheld.</qt> - + fPilotDevice @@ -43,7 +43,7 @@ <qt>Enter the device the Pilot is attached to (for instance a serial or USB port) here. You can also use <i>/dev/pilot</i>, and make that a symlink to the correct device. You need write permission to successfully synchronize with the handheld.</qt> - + TextLabel4 @@ -57,7 +57,7 @@ <qt>Select the speed of the serial connection to your handheld here. This has no meaning for USB devices. For an older model, choose 9600. Newer models may be able to handle speeds up to the maximum listed, 115200. You can experiment with the connection speed: the manual suggests starting at a speed of 19200 and trying faster speeds to see if they work.</qt> - + fUserName @@ -82,7 +82,7 @@ - + 9600 @@ -115,7 +115,7 @@ <qt>Select the speed of the serial connection to your handheld here. This has no meaning for USB devices. For an older model, choose 9600. Newer models may be able to handle speeds up to the maximum listed, 115200. You can experiment with the connection speed: the manual suggests starting at a speed of 19200 and trying faster speeds to see if they work.</qt> - + textLabel1 @@ -129,7 +129,7 @@ <qt>PalmOS devices are available in many different languages. If your device uses a different encoding than ISO-latin1 (ISO8859-1), select the correct encoding here, in order to display special characters correctly.</qt> - + TextLabel2 @@ -143,7 +143,7 @@ <qt>Enter your name here, as it appears in the Pilot's &quot;Owner&quot; setting.</qt> - + fPilotEncoding @@ -154,7 +154,7 @@ <qt>PalmOS devices are available in many different languages. If your device uses a different encoding than ISO-latin1 (ISO8859-1), select the correct encoding here, in order to display special characters correctly.</qt> - + textLabel1_2 @@ -165,7 +165,7 @@ fWorkaround - + None diff --git a/kpilot/kpilotConfigDialog_startup.ui b/kpilot/kpilotConfigDialog_startup.ui index ff24e73..1c77f5f 100644 --- a/kpilot/kpilotConfigDialog_startup.ui +++ b/kpilot/kpilotConfigDialog_startup.ui @@ -3,7 +3,7 @@ A tabWidget for configuring KPilot's settings. David Bishop - + StartExitForm @@ -25,7 +25,7 @@ KPilot's settings. 0 - + groupBox4 @@ -36,7 +36,7 @@ KPilot's settings. unnamed - + fKillDaemonOnExit @@ -47,7 +47,7 @@ KPilot's settings. <qt>Check this box to stop the KPilot daemon when you quit KPilot (only if KPilot started the daemon itself).</qt> - + fQuitAfterSync @@ -60,7 +60,7 @@ KPilot's settings. - + GroupBox1_2 @@ -71,7 +71,7 @@ KPilot's settings. unnamed - + fStartDaemonAtLogin @@ -82,7 +82,7 @@ KPilot's settings. <qt>Check this box to start up the KPilot daemon every time you log in to KDE.</qt> - + fDockDaemon diff --git a/kpilot/kpilotConfigDialog_sync.ui b/kpilot/kpilotConfigDialog_sync.ui index 0a0696c..52478ca 100644 --- a/kpilot/kpilotConfigDialog_sync.ui +++ b/kpilot/kpilotConfigDialog_sync.ui @@ -2,7 +2,7 @@ SyncConfigWidget A widget for editing HotSync-specific settings. David Bishop - + SyncConfigForm @@ -24,7 +24,7 @@ 0 - + fFullSyncCheck @@ -38,7 +38,7 @@ <qt>Check this box to perform a full sync when your last sync was performed with another PC or system, to guarantee the completeness of your data.</qt> - + HotSync (sync all changes) @@ -66,7 +66,7 @@ <qt>Select in this list the synchronization type that KPilot will use as default. Possible values are:<br>"HotSync", to run all selected conduits, and sync the databases with a modified flag set, updating the modified records only;<br>"FullSync" to run all selected conduits, and sync all databases, reading all records, and performing a full backup;<br>"Copy PC to handheld" to run all conduits and sync all databases, but instead of merging the information from both sources, copy the PC data to the handheld;<br>"Copy handheld to PC" to run all conduits and sync all databases, but instead of merging the information from both sources, copy the handheld data to the PC.</qt> - + textLabel1_2 @@ -94,7 +94,7 @@ - + Ask User @@ -132,7 +132,7 @@ <qt>Select in this list how conflicting entries (entries which were edited both on your handheld and on the PC) are resolved. Possibly values are "Ask User" to let you decide case by case, "Do Nothing" to allow the entries to be different, "PC overrides", "Handheld overrides", "Use values from last sync" and "Use both entries" to create a new entry on both the PC and handheld. Note that the conflict resolution option selected here can be overridden by conduits that have their own conflict resolution configuration.</qt> - + textLabel1 @@ -151,7 +151,7 @@ fConflictResolution - + fScreenlockSecure diff --git a/kpilot/kpilotConfigDialog_viewers.ui b/kpilot/kpilotConfigDialog_viewers.ui index 4e395cb..32cdf89 100644 --- a/kpilot/kpilotConfigDialog_viewers.ui +++ b/kpilot/kpilotConfigDialog_viewers.ui @@ -3,7 +3,7 @@ A tabWidget for configuring KPilot's settings. David Bishop - + ViewersForm @@ -25,7 +25,7 @@ KPilot's settings. 0 - + groupBox2 @@ -36,7 +36,7 @@ KPilot's settings. unnamed - + fInternalEditors @@ -53,7 +53,7 @@ KPilot's settings. <qt>The internal viewers can be read only or editable. The editable mode allows you to add new records, delete or edit the existing records and sync your modifications back to the handheld. Check this box to set the internal viewers to editable mode, uncheck to set them to read only mode.</qt> - + fUseSecret @@ -66,7 +66,7 @@ KPilot's settings. - + fAddressGroup @@ -77,7 +77,7 @@ KPilot's settings. unnamed - + fNormalDisplay @@ -88,7 +88,7 @@ KPilot's settings. <qt>Select this option to display addresses in the internal address viewer sorted by last name, first name.</qt> - + fCompanyDisplay @@ -113,7 +113,7 @@ KPilot's settings. Horizontal - + fUseKeyField diff --git a/kpilot/kpilotConfigWizard.cc b/kpilot/kpilotConfigWizard.cc index fe1bc17..d26fbb6 100644 --- a/kpilot/kpilotConfigWizard.cc +++ b/kpilot/kpilotConfigWizard.cc @@ -52,8 +52,8 @@ #include "kpilotProbeDialog.h" -ConfigWizard::ConfigWizard(TQWidget *parent, const char *n, int m) : - KWizard(parent, n), +ConfigWizard::ConfigWizard(TQWidget *tqparent, const char *n, int m) : + KWizard(tqparent, n), fMode((Mode)m) { // page1=new ConfigWizard_base1(this); @@ -197,7 +197,7 @@ void ConfigWizard::accept() KPilotSettings::setInstalledConduits( conduits ); #undef APPEND_CONDUIT - TQString finishMessage = i18n("KPilot is now configured to sync with %1.").arg(applicationName); + TQString finishMessage = i18n("KPilot is now configured to sync with %1.").tqarg(applicationName); if (fMode == InDialog) { finishMessage.append(CSL1("\n")); diff --git a/kpilot/kpilotConfigWizard.h b/kpilot/kpilotConfigWizard.h index 742df39..5cf9fe6 100644 --- a/kpilot/kpilotConfigWizard.h +++ b/kpilot/kpilotConfigWizard.h @@ -37,6 +37,7 @@ class ConfigWizard_base3; class ConfigWizard : public KWizard { Q_OBJECT + TQ_OBJECT public: enum Mode { InDialog=0, Standalone=1 } ; diff --git a/kpilot/kpilotConfigWizard_app.ui b/kpilot/kpilotConfigWizard_app.ui index 638801a..061b107 100644 --- a/kpilot/kpilotConfigWizard_app.ui +++ b/kpilot/kpilotConfigWizard_app.ui @@ -1,6 +1,6 @@ ConfigWizard_base3 - + ConfigWizard_base3 @@ -16,7 +16,7 @@ unnamed - + textLabel6 @@ -29,7 +29,7 @@ Press "Finish" to setup KPilot according to the settings in this configuration W WordBreak|AlignVCenter - + fAppType @@ -40,7 +40,7 @@ Press "Finish" to setup KPilot according to the settings in this configuration W unnamed - + radioButton6 @@ -51,7 +51,7 @@ Press "Finish" to setup KPilot according to the settings in this configuration W true - + radioButton8 @@ -59,7 +59,7 @@ Press "Finish" to setup KPilot according to the settings in this configuration W &GNOME-PIM (Evolution) - + radioButton4 diff --git a/kpilot/kpilotConfigWizard_user.ui b/kpilot/kpilotConfigWizard_user.ui index 5dcfd36..3386f28 100644 --- a/kpilot/kpilotConfigWizard_user.ui +++ b/kpilot/kpilotConfigWizard_user.ui @@ -1,6 +1,6 @@ ConfigWizard_base2 - + ConfigWizard_base2 @@ -16,7 +16,7 @@ unnamed - + textLabel1 @@ -27,7 +27,7 @@ WordBreak|AlignVCenter - + textLabel5 @@ -38,7 +38,7 @@ WordBreak|AlignVCenter - + groupBox2 @@ -65,7 +65,7 @@ Network: This has not been tested by any of the KPilot developers themselves (ha unnamed - + textLabel3_2 @@ -79,7 +79,7 @@ Network: This has not been tested by any of the KPilot developers themselves (ha <qt>Enter the device the Pilot is attached to (for instance a serial or USB port) here. You can also use <i>/dev/pilot</i>, and make that a symlink to the correct device. Use the button below to automatically detect the device. You need write permission to successfully synchronize with the handheld.</qt> - + fProbeButton @@ -90,7 +90,7 @@ Network: This has not been tested by any of the KPilot developers themselves (ha <qt>Click this button to open the detection dialog. The wizard will try to automatically find and display the correct device and username for your handheld. If the wizard cannot retrieve this information, check if you have write permission for the device.</qt> - + fDeviceName @@ -101,7 +101,7 @@ Network: This has not been tested by any of the KPilot developers themselves (ha <qt>Enter the device the Pilot is attached to (for instance a serial or USB port) here. You can also use <i>/dev/pilot</i>, and make that a symlink to the correct device. Use the button below to automatically detect the device. You need write permission to successfully synchronize with the handheld.</qt> - + fUserName @@ -109,7 +109,7 @@ Network: This has not been tested by any of the KPilot developers themselves (ha <qt>Enter your username here, as it appears in the Pilot's &quot;Owner&quot; setting, or use the button below to automatically detect it.</qt> - + textLabel2_2 @@ -125,7 +125,7 @@ Network: This has not been tested by any of the KPilot developers themselves (ha - + fPilotRunningPermanently diff --git a/kpilot/kpilotDCOP.h b/kpilot/kpilotDCOP.h index fe4bc8b..045d9f9 100644 --- a/kpilot/kpilotDCOP.h +++ b/kpilot/kpilotDCOP.h @@ -43,7 +43,7 @@ public: StartOfHotSync=1, EndOfHotSync=2, DaemonQuit=4 } ; - enum KPiloStatus { + enum KPilotqStatus { 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 daemonStatus(int) = 0; + virtual ASYNC daemontqStatus(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 kpiloStatus() = 0; + virtual int kpilotqStatus() = 0; } ; diff --git a/kpilot/kpilotProbeDialog.cc b/kpilot/kpilotProbeDialog.cc index 2baa914..db62f9d 100644 --- a/kpilot/kpilotProbeDialog.cc +++ b/kpilot/kpilotProbeDialog.cc @@ -86,8 +86,8 @@ and the module can't be unloaded. */ -ProbeDialog::ProbeDialog(TQWidget *parent, const char *n) : - KDialogBase(parent, n, true, i18n("Autodetecting Your Handheld"), KDialogBase::Ok|KDialogBase::Cancel|KDialogBase::User1, KDialogBase::Cancel, true, i18n("Restart Detection")), +ProbeDialog::ProbeDialog(TQWidget *tqparent, const char *n) : + KDialogBase(tqparent, n, true, i18n("Autodetecting Your Handheld"), KDialogBase::Ok|KDialogBase::Cancel|KDialogBase::User1, KDialogBase::Cancel, true, i18n("Restart Detection")), mDetected(false), mUserName(), mDevice() { FUNCTIONSETUP; @@ -97,13 +97,13 @@ ProbeDialog::ProbeDialog(TQWidget *parent, const char *n) : 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 ); - fStatusGroup = new TQGroupBox( i18n("Status"), mainWidget, "fStatusGroup" ); + fStatusGroup = new TQGroupBox( i18n("tqStatus"), mainWidget, "fStatusGroup" ); fStatusGroup->setColumnLayout(0, Qt::Vertical ); fStatusGroupLayout = new TQGridLayout( fStatusGroup->tqlayout() ); - fStatus = new TQLabel( i18n("Autodetection not yet started..."), fStatusGroup, "fStatus" ); - fStatus->tqsetAlignment( TQLabel::WordBreak ); - fStatusGroupLayout->addWidget( fStatus, 0, 0 ); + ftqStatus = new TQLabel( i18n("Autodetection not yet started..."), fStatusGroup, "ftqStatus" ); + ftqStatus->tqsetAlignment( TQLabel::WordBreak ); + fStatusGroupLayout->addWidget( ftqStatus, 0, 0 ); fProgress = new KProgress( 100, fStatusGroup, "fProgress" ); fStatusGroupLayout->addWidget( fProgress, 1, 0 ); @@ -114,7 +114,7 @@ ProbeDialog::ProbeDialog(TQWidget *parent, const char *n) : fResultsGroup->setEnabled( FALSE ); fResultsGroup->setColumnLayout(0, Qt::Vertical ); fResultsGroupLayout = new TQGridLayout( fResultsGroup->tqlayout() ); - fResultsGroupLayout->tqsetAlignment( Qt::AlignTop ); + fResultsGroupLayout->tqsetAlignment( TQt::AlignTop ); fUserLabel = new TQLabel( i18n( "Handheld user:" ), fResultsGroup, "fUserLabel" ); fUserLabel->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)4, (TQSizePolicy::SizeType)5, 0, 0, fUserLabel->sizePolicy().hasHeightForWidth() ) ); @@ -192,7 +192,7 @@ void ProbeDialog::startDetection() disconnectDevices(); fProgress->setProgress(0); - fStatus->setText( i18n("Starting detection...") ); + ftqStatus->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(); } } - fStatus->setText( i18n("Waiting for handheld to connect...") ); + ftqStatus->setText( i18n("Waiting for handheld to connect...") ); mProbeDevicesIndex=0; detect(); @@ -263,7 +263,7 @@ void ProbeDialog::timeout() { disconnectDevices(); if (!mDetected) { - fStatus->setText( i18n("Timeout reached, could not detect a handheld.") ); + ftqStatus->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(); - fStatus->setText( i18n("Found a connected device on %1").arg(mDevice) ); + ftqStatus->setText( i18n("Found a connected device on %1").tqarg(mDevice) ); fUser->setText( mUserName ); fDevice->setText( mDevice ); mDetected = true; @@ -335,7 +335,7 @@ void ProbeDialog::disconnectDevices() { FUNCTIONSETUP; - if (!mDetected) fStatus->setText( i18n("Disconnected from all devices") ); + if (!mDetected) ftqStatus->setText( i18n("Disconnected from all devices") ); fProcessEventsTimer->stop( ); fTimeoutTimer->stop(); fProgressTimer->stop(); diff --git a/kpilot/kpilotProbeDialog.h b/kpilot/kpilotProbeDialog.h index d6fb1cb..997138a 100644 --- a/kpilot/kpilotProbeDialog.h +++ b/kpilot/kpilotProbeDialog.h @@ -46,6 +46,7 @@ typedef TQMap PilotLinkMap; class ProbeDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: ProbeDialog(TQWidget *p=0L,const char *n=0L); ~ProbeDialog(); @@ -77,7 +78,7 @@ protected: TQLabel* fUser; TQLabel* fDevice; TQGroupBox* fStatusGroup; - TQLabel* fStatus; + TQLabel* ftqStatus; KProgress* fProgress; TQTimer* fProcessEventsTimer; diff --git a/kpilot/kroupware.cc b/kpilot/kroupware.cc index 212df17..69f50c3 100644 --- a/kpilot/kroupware.cc +++ b/kpilot/kroupware.cc @@ -271,7 +271,7 @@ void KroupwareSync::end_syncNotesWithKMail() int pid; return KApplication::startServiceByDesktopName(CSL1("kmail"), - TQString::null, + TQString(), error, &kmdcop, &pid diff --git a/kpilot/listCat.cc b/kpilot/listCat.cc index 6419340..a5b2966 100644 --- a/kpilot/listCat.cc +++ b/kpilot/listCat.cc @@ -36,9 +36,9 @@ #include "listCat.moc" -ListCategorizer::ListCategorizer(TQWidget * parent, +ListCategorizer::ListCategorizer(TQWidget * tqparent, const char *name) : - KListView(parent, name), + KListView(tqparent, name), fStartOpen(false) { FUNCTIONSETUP; @@ -47,9 +47,9 @@ ListCategorizer::ListCategorizer(TQWidget * parent, ListCategorizer::ListCategorizer(const TQStringList & i, bool startOpen, - TQWidget * parent, + TQWidget * tqparent, const char *name) : - KListView(parent, name), + KListView(tqparent, name), fStartOpen(startOpen) { FUNCTIONSETUP; @@ -121,7 +121,7 @@ void ListCategorizer::setupWidget() return; } - TQListViewItem *category = p->parent(); + TQListViewItem *category = p->tqparent(); if (!category) { @@ -136,7 +136,7 @@ void ListCategorizer::setupWidget() FUNCTIONSETUP; TQListViewItem *p = currentItem(); - if (!p || !p->parent()) + if (!p || !p->tqparent()) return; KListView::startDrag(); @@ -194,7 +194,7 @@ RichListViewItem::RichListViewItem(TQListViewItem *p, fColumns=c; fIsRich = new bool[c]; - fRect = new QRect[c]; + fRect = new TQRect[c]; for (int i=0; i #include -class PilotListItem : public QListBoxText +class PilotListItem : public TQListBoxText { public: PilotListItem(const TQString &text, recordid_t pilotid=0, void *r=0); @@ -56,10 +56,10 @@ private: #endif }; -class PilotCheckListItem : public QCheckListItem +class PilotCheckListItem : public TQCheckListItem { public: - PilotCheckListItem( TQListView * parent, const TQString & text, recordid_t pilotid=0, void *r=0); + PilotCheckListItem( TQListView * tqparent, const TQString & text, recordid_t pilotid=0, void *r=0); virtual ~PilotCheckListItem(); recordid_t id() const {return fid;}; const void *rec() const {return fr;}; @@ -82,12 +82,12 @@ struct PilotListViewItemData unsigned long val; }; -class PilotListViewItem : public QListViewItem +class PilotListViewItem : public TQListViewItem { public: - PilotListViewItem( TQListView * parent, - TQString label1, TQString label2 = TQString::null, - TQString label3 = TQString::null, TQString label4 = TQString::null, + PilotListViewItem( TQListView * tqparent, + TQString label1, TQString label2 = TQString(), + TQString label3 = TQString(), TQString label4 = TQString(), recordid_t pilotid=0, void *r=0); virtual ~PilotListViewItem(); recordid_t id() const {return fid;}; diff --git a/kpilot/logFile.cc b/kpilot/logFile.cc index e4c7ed8..e047657 100644 --- a/kpilot/logFile.cc +++ b/kpilot/logFile.cc @@ -68,23 +68,23 @@ LogFile::LogFile() : DCOPObject("LogIface"), TQObject(), fOutfile(0L), fSyncing( } fSyncing = true; - fLogStream.setDevice(fOutfile); + fLogStream.setDevice(TQT_TQIODEVICE(fOutfile)); - fLogStream<<(CSL1("KPilot HotSync log, %1").arg(TQDateTime::tqcurrentDateTime().toString()))<" -#else #define TE_EOL "\n" -#endif -LogWidget::LogWidget(TQWidget * parent) : +LogWidget::LogWidget(TQWidget * tqparent) : DCOPObject("LogIface"), - PilotComponent(parent, "component_log", TQString::null), + PilotComponent(tqparent, "component_log", TQString()), fLog(0L), fShowTime(false), fSplash(0L), @@ -89,11 +85,7 @@ LogWidget::LogWidget(TQWidget * parent) : fLog->setReadOnly(true); fLog->setWordWrap(TQTextEdit::WidgetWidth); fLog->setWrapPolicy(TQTextEdit::AtWordOrDocumentBoundary); -#if QT_VERSION < 0x030100 - /* nothing, use AutoText */ -#else - fLog->setTextFormat(Qt::LogText); -#endif + fLog->setTextFormat(TQt::LogText); TQWhatsThis::add(fLog, i18n("This lists all the messages received " "during the current HotSync")); @@ -103,24 +95,24 @@ LogWidget::LogWidget(TQWidget * parent) : TQString initialText ; initialText.append(CSL1("Version: KPilot %1" TE_EOL) - .arg(TQString::tqfromLatin1(KPILOT_VERSION))); + .tqarg(TQString::tqfromLatin1(KPILOT_VERSION))); initialText.append(CSL1("Version: pilot-link %1.%2.%3%4" TE_EOL) - .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::tqfromLatin1(PILOT_LINK_PATCH)) + .tqarg(TQString::tqfromLatin1(PILOT_LINK_PATCH)) #else - .arg(TQString()) + .tqarg(TQString()) #endif ); #ifdef KDE_VERSION_STRING initialText.append(CSL1("Version: KDE %1" TE_EOL) - .arg(TQString::tqfromLatin1(KDE_VERSION_STRING))); + .tqarg(TQString::tqfromLatin1(KDE_VERSION_STRING))); #endif -#ifdef QT_VERSION_STR - initialText.append(CSL1("Version: Qt %1" TE_EOL) - .arg(TQString::tqfromLatin1(QT_VERSION_STR))); +#ifdef TQT_VERSION_STR + initialText.append(CSL1("Version: TQt %1" TE_EOL) + .tqarg(TQString::tqfromLatin1(TQT_VERSION_STR))); #endif initialText.append(CSL1(TE_EOL)); @@ -228,12 +220,7 @@ void LogWidget::addMessage(const TQString & s) t.append(s); -#if QT_VERSION < 0x030100 - t.append(TE_EOL); - fLog->setText(fLog->text() + t); -#else fLog->append(t); -#endif fLog->scrollToBottom(); } @@ -328,7 +315,7 @@ void LogWidget::hideSplash() if (fLog) { - fLog->setText(TQString::null); + fLog->setText(TQString()); } } @@ -341,7 +328,7 @@ void LogWidget::hideSplash() while (!finished) { TQString saveFileName = KFileDialog::getSaveFileName( - TQString::null, /* default */ + TQString(), /* default */ CSL1("*.log"), /* show log files by default */ this, i18n("Save Log")); diff --git a/kpilot/logWidget.h b/kpilot/logWidget.h index 2f6be95..2c569a4 100644 --- a/kpilot/logWidget.h +++ b/kpilot/logWidget.h @@ -40,6 +40,7 @@ class KProgress; class LogWidget : public PilotComponent , public LoggerDCOP { Q_OBJECT + TQ_OBJECT public: LogWidget(TQWidget *); diff --git a/kpilot/memoWidget.cc b/kpilot/memoWidget.cc index 186aeee..6d95ec9 100644 --- a/kpilot/memoWidget.cc +++ b/kpilot/memoWidget.cc @@ -74,9 +74,9 @@ public: } ; -MemoWidget::MemoWidget(TQWidget * parent, +MemoWidget::MemoWidget(TQWidget * tqparent, const TQString & path) : - PilotComponent(parent, "component_memo", path), + PilotComponent(tqparent, "component_memo", path), fTextWidget(0L), d(new Private()), lastSelectedMemo(-1) @@ -84,7 +84,7 @@ MemoWidget::MemoWidget(TQWidget * parent, FUNCTIONSETUP; setGeometry(0, 0, - parent->tqgeometry().width(), parent->tqgeometry().height()); + tqparent->tqgeometry().width(), tqparent->tqgeometry().height()); setupWidget(); d->fMemoList.setAutoDelete(true); slotUpdateButtons(); @@ -255,7 +255,7 @@ void MemoWidget::setupWidget() fTextWidget = new KTextEdit(this, "textArea"); fTextWidget->setWordWrap(KTextEdit::WidgetWidth); - fTextWidget->setTextFormat(Qt::PlainText); + fTextWidget->setTextFormat(TQt::PlainText); grid->addMultiCellWidget(fTextWidget, 1, 4, 2, 2); TQWhatsThis::add(fTextWidget, i18n("The text of the selected memo appears here.")); @@ -640,7 +640,7 @@ void MemoWidget::slotExportMemo() const TQString filter = CSL1("*|Plain text output\n*.xml|XML output"); TQString fileName; - KFileDialog kfile( TQString::null , filter, fExportButton , "memoSave" , true ); + KFileDialog kfile( TQString() , filter, fExportButton , "memoSave" , true ); kfile.setOperationMode( KFileDialog::Saving ); if ( kfile.exec() == TQDialog::Accepted ) { @@ -720,7 +720,7 @@ bool MemoWidget::saveAsXML(const TQString &fileName,const TQPtrListtqgeometry().width(), - parent->tqgeometry().height()); + resize(tqparent->tqgeometry().width(), + tqparent->tqgeometry().height()); } } diff --git a/kpilot/pilotComponent.h b/kpilot/pilotComponent.h index ec2c533..30a7845 100644 --- a/kpilot/pilotComponent.h +++ b/kpilot/pilotComponent.h @@ -38,13 +38,14 @@ struct CategoryAppInfo; class TQComboBox; class TQString; -class PilotComponent : public QWidget +class PilotComponent : public TQWidget { Q_OBJECT + TQ_OBJECT friend class KPilotInstaller; public: - PilotComponent(TQWidget* parent, + PilotComponent(TQWidget* tqparent, const char *id, const TQString& dbPath); @@ -81,7 +82,7 @@ public: * stating the reason why into @p s. This string will be * displayed to the user: * "Can't start HotSync. %1" - * where %1 is tqreplaced by s. + * where %1 is replaced by s. */ virtual bool preHotSync(TQString &s) ; diff --git a/kpilot/pilotDaemon.cc b/kpilot/pilotDaemon.cc index 198fe11..2e70aef 100644 --- a/kpilot/pilotDaemon.cc +++ b/kpilot/pilotDaemon.cc @@ -119,14 +119,14 @@ PilotDaemonTray::PilotDaemonTray(PilotDaemon * p) : switch (e->button()) { - case RightButton: + case Qt::RightButton: { KPopupMenu *menu = contextMenu(); contextMenuAboutToShow(menu); menu->popup(e->globalPos()); } break; - case LeftButton: + case Qt::LeftButton: if (daemon) daemon->slotRunKPilot(); break; default: @@ -166,7 +166,7 @@ void PilotDaemonTray::setupWidget() SyncAction::SyncMode::name(SyncAction::SyncMode::a) + once, \ (int)(SyncAction::SyncMode::a)); fSyncTypeMenu->insertItem(i18n("Default (%1)") - .arg(SyncAction::SyncMode::name((SyncAction::SyncMode::Mode)KPilotSettings::syncType())), + .tqarg(SyncAction::SyncMode::name((SyncAction::SyncMode::Mode)KPilotSettings::syncType())), 0); fSyncTypeMenu->insertSeparator(); @@ -279,7 +279,7 @@ void PilotDaemonTray::endHotSync() PilotDaemon::PilotDaemon() : DCOPObject("KPilotDaemonIface"), - fDaemonStatus(INIT), + fDaemontqStatus(INIT), fPostSyncAction(None), fPilotLink(0L), fNextSyncType(SyncAction::SyncMode::eHotSync,true), @@ -290,14 +290,14 @@ PilotDaemon::PilotDaemon() : fLogStub(new LoggerDCOP_stub("kpilot", "LogIface")), fLogFileStub(new LoggerDCOP_stub("kpilotDaemon", "LogIface")), fKPilotStub(new KPilotDCOP_stub("kpilot", "KPilotIface")), - fTempDevice(TQString::null) + fTempDevice(TQString()) { FUNCTIONSETUP; setupPilotLink(); reloadSettings(); - if (fDaemonStatus == ERROR) + if (fDaemontqStatus == ERROR) { WARNINGKPILOT << "Connecting to device failed." << endl; return; @@ -313,7 +313,7 @@ PilotDaemon::PilotDaemon() : #ifdef DEBUG DEBUGKPILOT << fname << ": The daemon is ready with status " - << statusString() << " (" << (int) fDaemonStatus << ")" << endl; + << statusString() << " (" << (int) fDaemontqStatus << ")" << endl; #endif } @@ -403,7 +403,7 @@ void PilotDaemon::showTray() DEBUGKPILOT << fname << ": Tray icon displayed." << endl; #endif - updateTrayStatus(); + updateTraytqStatus(); } /* DCOP ASYNC */ void PilotDaemon::setTempDevice(TQString d) @@ -420,7 +420,7 @@ void PilotDaemon::showTray() { FUNCTIONSETUP; - switch (fDaemonStatus) + switch (fDaemontqStatus) { case INIT: case HOTSYNC_END: @@ -508,15 +508,15 @@ void PilotDaemon::showTray() } } - updateTrayStatus(); - logProgress(TQString::null,0); + updateTraytqStatus(); + logProgress(TQString(),0); } /* DCOP */ void PilotDaemon::stopListening() { fIsListening=false; fTray->changeIcon(PilotDaemonTray::NotListening); - fDaemonStatus=NOT_LISTENING; + fDaemontqStatus=NOT_LISTENING; fPilotLink->close(); } @@ -524,7 +524,7 @@ void PilotDaemon::showTray() { fIsListening=true; fTray->changeIcon(PilotDaemonTray::Normal); - fDaemonStatus=INIT; + fDaemontqStatus=INIT; fPilotLink->reset(); } @@ -616,13 +616,13 @@ bool PilotDaemon::setupPilotLink() // Using switch to make sure we cover all the cases. // // - switch (fDaemonStatus) + switch (fDaemontqStatus) { case INIT: case HOTSYNC_END: case ERROR: case NOT_LISTENING: - getKPilot().daemonStatus(KPilotDCOP::DaemonQuit); + getKPilot().daemontqStatus(KPilotDCOP::DaemonQuit); kapp->quit(); break; case READY: @@ -655,7 +655,7 @@ bool PilotDaemon::setupPilotLink() return; } - updateTrayStatus(); + updateTraytqStatus(); if (fTray && (fTray->fSyncTypeMenu)) { @@ -667,7 +667,7 @@ bool PilotDaemon::setupPilotLink() } } - getLogger().logMessage(i18n("Next HotSync will be: %1. ").arg(fNextSyncType.name()) + + getLogger().logMessage(i18n("Next HotSync will be: %1. ").tqarg(fNextSyncType.name()) + i18n("Please press the HotSync button.")); } @@ -731,7 +731,7 @@ static void fillConduitNameMap() TQStringList l = KPilotSettings::installedConduits(); // Fill with internal settings. - if ( l.find( CSL1("internal_fileinstall") ) != l.end() ) { + if ( l.tqfind( CSL1("internal_fileinstall") ) != l.end() ) { conduitNameMap->insert( CSL1("internal_fileinstall"), new TQString(i18n("File Installer")) ); } @@ -739,7 +739,7 @@ static void fillConduitNameMap() TQStringList::ConstIterator end = l.end(); for (TQStringList::ConstIterator i = l.begin(); i != end; ++i) { - if (!conduitNameMap->find(*i)) + if (!conduitNameMap->tqfind(*i)) { TQString readableName = CSL1(""); KSharedPtr < KService > o = KService::serviceByDesktopName(*i); @@ -774,7 +774,7 @@ TQStringList PilotDaemon::configuredConduitList() TQStringList result; for (TQStringList::ConstIterator i = keys.begin(); i != end; ++i) { - result << *(conduitNameMap->find(*i)); + result << *(conduitNameMap->tqfind(*i)); } return result; @@ -799,8 +799,8 @@ bool PilotDaemon::killDaemonOnExit() return KPilotSettings::killDaemonAtExit(); } -typedef enum { NotLocked=0, Locked=1, DCOPError=2 } KDesktopLockStatus; -static KDesktopLockStatus isKDesktopLockRunning() +typedef enum { NotLocked=0, Locked=1, DCOPError=2 } KDesktopLocktqStatus; +static KDesktopLocktqStatus isKDesktopLockRunning() { if (!KPilotSettings::screenlockSecure()) return NotLocked; @@ -847,7 +847,7 @@ static void informOthers(KPilotDCOP_stub &kpilot, LoggerDCOP_stub &log, LoggerDCOP_stub &filelog) { - kpilot.daemonStatus(KPilotDCOP::StartOfHotSync); + kpilot.daemontqStatus(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.kpiloStatus(); + int kpilotstatus = kpilot.kpilotqStatus(); DCOPStub::Status callstatus = kpilot.status(); #ifdef DEBUG @@ -920,7 +920,7 @@ static void queueInstaller(ActionQueue *fSyncStack, FileInstaller *fInstaller, const TQStringList &c) { - if (c.findIndex(CSL1("internal_fileinstall")) >= 0) + if (c.tqfindIndex(CSL1("internal_fileinstall")) >= 0) { fSyncStack->addAction(new FileInstallAction(pilotLink,fInstaller->dir())); } @@ -999,11 +999,11 @@ bool PilotDaemon::shouldBackup() DEBUGKPILOT << fname << ": Starting Sync with type " << fNextSyncType.name() << endl; - DEBUGKPILOT << fname << ": Status is " << shorStatusString() << endl; + DEBUGKPILOT << fname << ": tqStatus is " << shorStatusString() << endl; (void) PilotDatabase::instanceCount(); #endif - fDaemonStatus = HOTSYNC_START ; + fDaemontqStatus = HOTSYNC_START ; if (fTray) { fTray->startHotSync(); @@ -1120,7 +1120,7 @@ launch: TQTimer::singleShot(0,fSyncStack,TQT_SLOT(execConduit())); - updateTrayStatus(); + updateTraytqStatus(); } /* slot */ void PilotDaemon::logMessage(const TQString & s) @@ -1129,7 +1129,7 @@ launch: getLogger().logMessage(s); getFileLogger().logMessage(s); - updateTrayStatus(s); + updateTraytqStatus(s); } /* slot */ void PilotDaemon::logError(const TQString & s) @@ -1138,7 +1138,7 @@ launch: getLogger().logError(s); getFileLogger().logError(s); - updateTrayStatus(s); + updateTraytqStatus(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()) updateTrayStatus(s); + if (!s.isEmpty()) updateTraytqStatus(s); } /* slot */ void PilotDaemon::endHotSync() @@ -1166,15 +1166,15 @@ launch: getFileLogger().logProgress(i18n("HotSync Completed.
    "), 100); getLogger().logEndSync(); getFileLogger().logEndSync(); - getKPilot().daemonStatus(KPilotDCOP::EndOfHotSync); + getKPilot().daemontqStatus(KPilotDCOP::EndOfHotSync); KPilotSettings::setLastSyncTime(TQDateTime::tqcurrentDateTime()); KPilotSettings::self()->writeConfig(); - fDaemonStatus = HOTSYNC_END; + fDaemontqStatus = HOTSYNC_END; if (fPostSyncAction & Quit) { - getKPilot().daemonStatus(KPilotDCOP::DaemonQuit); + getKPilot().daemontqStatus(KPilotDCOP::DaemonQuit); kapp->quit(); } if (fPostSyncAction & ReloadSettings) @@ -1191,7 +1191,7 @@ launch: (void) PilotDatabase::instanceCount(); - updateTrayStatus(); + updateTraytqStatus(); } @@ -1209,7 +1209,7 @@ void PilotDaemon::slotRunKPilot() int kpilotPID; if (KApplication::startServiceByDesktopName(CSL1("kpilot"), - TQString::null, &kpilotError, &kpilotDCOP, &kpilotPID + TQString(), &kpilotError, &kpilotDCOP, &kpilotPID #if (KDE_VERSION >= 220) // Startup notification added in 2.2 , "" @@ -1251,8 +1251,8 @@ void PilotDaemon::slotRunConfig() if ( client->isApplicationRegistered( "kpilot" ) ) { - client->send("kpilot", "kpilot-mainwindow#1", "raise()",TQString::null); - client->send("kpilot", "KPilotIface", "configure()", TQString::null); + client->send("kpilot", "kpilot-mainwindow#1", "raise()",TQString()); + client->send("kpilot", "KPilotIface", "configure()", TQString()); } else { @@ -1264,7 +1264,7 @@ void PilotDaemon::slotRunConfig() } } -void PilotDaemon::updateTrayStatus(const TQString &s) +void PilotDaemon::updateTraytqStatus(const TQString &s) { if (!fTray) return; @@ -1272,7 +1272,7 @@ void PilotDaemon::updateTrayStatus(const TQString &s) tipText.append( s ); tipText.append( CSL1(" ") ); tipText.append( i18n("Next sync is %1.") - .arg( fNextSyncType.name() ) ); + .tqarg( fNextSyncType.name() ) ); tipText.append( CSL1("") ); TQToolTip::remove(fTray); diff --git a/kpilot/pilotDaemon.h b/kpilot/pilotDaemon.h index 54c70fe..bfae7bc 100644 --- a/kpilot/pilotDaemon.h +++ b/kpilot/pilotDaemon.h @@ -54,6 +54,7 @@ class KPilotDeviceLink; class PilotDaemonTray : public KSystemTray { Q_OBJECT + TQ_OBJECT friend class PilotDaemon; @@ -126,7 +127,8 @@ private: class PilotDaemon : public TQObject, virtual public PilotDaemonDCOP { -Q_OBJECT + Q_OBJECT + TQ_OBJECT // The tray must be our friend so that we can let it stop the daemon. friend class PilotDaemonTray; @@ -136,7 +138,7 @@ public: PilotDaemon(); ~PilotDaemon(); - enum DaemonStatus + enum DaemontqStatus { HOTSYNC_START, // Hotsync is running HOTSYNC_END, // Hotsync is cleaning up @@ -147,7 +149,7 @@ public: NOT_LISTENING }; - DaemonStatus status() const { return fDaemonStatus; } ; + DaemontqStatus status() const { return fDaemontqStatus; } ; /* DCOP */ virtual TQString statusString(); /* DCOP */ virtual TQString shorStatusString(); @@ -163,7 +165,15 @@ public: // Some are also slots. // public slots: +// MOC_SKIP_BEGIN +#ifdef Q_MOC_RUN + virtual void requestSync(int); +#else // Q_MOC_RUN +// MOC_SKIP_END virtual ASYNC requestSync(int); +// MOC_SKIP_BEGIN +#endif // Q_MOC_RUN +// MOC_SKIP_END public: virtual ASYNC requestSyncType(TQString); virtual ASYNC requestRegularSyncNext(); @@ -188,7 +198,7 @@ public: virtual bool killDaemonOnExit(); protected: - DaemonStatus fDaemonStatus; + DaemontqStatus fDaemontqStatus; enum postSyncActions { None=0, @@ -234,7 +244,7 @@ private: /** * Set or change the tooltip displayed by the tray icon. */ - void updateTrayStatus(const TQString &s=TQString::null); + void updateTraytqStatus(const TQString &s=TQString()); FileInstaller *fInstaller; diff --git a/kpilot/syncCalendar.cc b/kpilot/syncCalendar.cc index 802ee35..e40021a 100644 --- a/kpilot/syncCalendar.cc +++ b/kpilot/syncCalendar.cc @@ -67,7 +67,7 @@ KCal::CalendarLocal *CalendarDumped::retrieve(const TQString &fn) KCal::CalendarLocal *retrieve(DatebookDB *db) { - KCal::CalendarLocal *cal = new CalendarLocal( TQString::null ); + KCal::CalendarLocal *cal = new CalendarLocal( TQString() ); int count = db->db()->recordCount(); diff --git a/kpilot/todoEditor.cc b/kpilot/todoEditor.cc index d7017bb..9ba89f1 100644 --- a/kpilot/todoEditor.cc +++ b/kpilot/todoEditor.cc @@ -45,8 +45,8 @@ TodoEditor::TodoEditor(PilotTodoEntry * p, struct ToDoAppInfo *appInfo, - TQWidget * parent, const char *name) : - KDialogBase(parent, name, false, i18n("To-do Editor"), Ok|Cancel), + TQWidget * tqparent, const char *name) : + KDialogBase(tqparent, name, false, i18n("To-do Editor"), Ok|Cancel), fDeleteOnCancel(p == 0L), fTodo(p), fAppInfo(appInfo) @@ -57,7 +57,7 @@ TodoEditor::TodoEditor(PilotTodoEntry * p, struct ToDoAppInfo *appInfo, setMainWidget(fWidget); fillFields(); - connect(parent, TQT_SIGNAL(recordChanged(PilotTodoEntry *)), + connect(tqparent, TQT_SIGNAL(recordChanged(PilotTodoEntry *)), this, TQT_SLOT(updateRecord(PilotTodoEntry *))); } diff --git a/kpilot/todoEditor.h b/kpilot/todoEditor.h index 53dbb33..523e1bb 100644 --- a/kpilot/todoEditor.h +++ b/kpilot/todoEditor.h @@ -44,12 +44,13 @@ class TodoEditorBase; class TodoEditor : public KDialogBase { Q_OBJECT + TQ_OBJECT public: TodoEditor(PilotTodoEntry *todo, struct ToDoAppInfo *appInfo, - TQWidget *parent, const char *name=0L); + TQWidget *tqparent, const char *name=0L); ~TodoEditor(); diff --git a/kpilot/todoEditor_base.ui b/kpilot/todoEditor_base.ui index 8ad7735..8e6f0d6 100644 --- a/kpilot/todoEditor_base.ui +++ b/kpilot/todoEditor_base.ui @@ -1,6 +1,6 @@ TodoEditorBase - + TodoEditorBase @@ -16,7 +16,7 @@ unnamed - + fDescriptionLabel @@ -38,7 +38,7 @@ fDescription - + fNoteLabel @@ -60,7 +60,7 @@ fNote - + fCategoryLabel @@ -74,7 +74,7 @@ fCategory - + fCategory @@ -82,7 +82,7 @@ false - + fPriorityLabel @@ -93,7 +93,7 @@ fPriority - + 1 @@ -123,7 +123,7 @@ fPriority - + fDescription @@ -134,12 +134,12 @@ - + fNote - + fCompleted @@ -147,7 +147,7 @@ &Completed - + fHasEndDate diff --git a/kpilot/todoWidget.cc b/kpilot/todoWidget.cc index 3713c8b..cb09911 100644 --- a/kpilot/todoWidget.cc +++ b/kpilot/todoWidget.cc @@ -49,8 +49,8 @@ -TodoCheckListItem::TodoCheckListItem(TQListView*parent, const TQString&text, - recordid_t pilotid, void*r):PilotCheckListItem(parent, text, pilotid, r) +TodoCheckListItem::TodoCheckListItem(TQListView*tqparent, const TQString&text, + recordid_t pilotid, void*r):PilotCheckListItem(tqparent, text, pilotid, r) { } @@ -63,9 +63,9 @@ void TodoCheckListItem::stateChange(bool state) -TodoWidget::TodoWidget(TQWidget * parent, +TodoWidget::TodoWidget(TQWidget * tqparent, const TQString & path) : - PilotComponent(parent, "component_todo", path), + PilotComponent(tqparent, "component_todo", path), fTodoInfo(0L), fTodoAppInfo(0L), fTodoDB(0L), @@ -172,7 +172,7 @@ void TodoWidget::showComponent() #if KDE_VERSION<220 s = i18n("There are still %1 to-do editing windows open.") - .arg(TQString::number(fPendingTodos)); + .tqarg(TQString::number(fPendingTodos)); #else s = i18n("There is still a to-do editing window open.", "There are still %n to-do editing windows open.", @@ -526,7 +526,7 @@ void TodoWidget::slotShowTodo(TQListViewItem*item) #endif TQString text(CSL1("")); - text += todo->getTextRepresentation(Qt::RichText); + text += todo->getTextRepresentation(TQt::RichText); text += CSL1("\n"); fTodoInfo->setText(text); diff --git a/kpilot/todoWidget.h b/kpilot/todoWidget.h index 63ee3e8..d4b5276 100644 --- a/kpilot/todoWidget.h +++ b/kpilot/todoWidget.h @@ -41,8 +41,9 @@ class TQTextView; class TodoListView : public KListView { Q_OBJECT + TQ_OBJECT public: - TodoListView(TQWidget * parent = 0, const char * name = 0 ):KListView(parent, name){}; + TodoListView(TQWidget * tqparent = 0, const char * name = 0 ):KListView(tqparent, name){}; ~TodoListView() {}; signals: void itemChecked(TQCheckListItem*item); @@ -58,7 +59,7 @@ public: class TodoCheckListItem : public PilotCheckListItem { public: - TodoCheckListItem(TQListView*parent, const TQString&text, recordid_t pilotid, void*r); + TodoCheckListItem(TQListView*tqparent, const TQString&text, recordid_t pilotid, void*r); ~TodoCheckListItem() {}; virtual void stateChange(bool state); }; @@ -66,9 +67,10 @@ public: class TodoWidget : public PilotComponent { Q_OBJECT + TQ_OBJECT public: - TodoWidget(TQWidget* parent,const TQString& dbpath); + TodoWidget(TQWidget* tqparent,const TQString& dbpath); ~TodoWidget(); // Pilot Component Methods: @@ -142,18 +144,18 @@ private: * currently selected category. * * The entire todo database is read into memory in the - * QList fTodoList. We need the appinfo block from the + * TQList fTodoList. We need the appinfo block from the * database to determine which categories there are; this * is held in fTodoAppInfo. * * The two buttons should speak for themselves. */ - QComboBox *fCatList; - QTextView *fTodoInfo; + TQComboBox *fCatList; + TQTextView *fTodoInfo; PilotToDoInfo *fTodoAppInfo; TQPtrList fTodoList; TodoListView *fListBox; - QPushButton *fEditButton,*fDeleteButton; + TQPushButton *fEditButton,*fDeleteButton; PilotDatabase *fTodoDB; protected: /** diff --git a/lib/actionQueue.h b/lib/actionQueue.h index 057b4be..b50e8aa 100644 --- a/lib/actionQueue.h +++ b/lib/actionQueue.h @@ -1,5 +1,5 @@ -#ifndef _KPILOT_ACTIONQUEUE_H -#define _KPILOT_ACTIONQUEUE_H +#ifndef _KPILOT_ACTIONTQUEUE_H +#define _KPILOT_ACTIONTQUEUE_H /* ** ** Copyright (C) 1998-2001,2003 by Dan Pilone @@ -57,6 +57,7 @@ KDE_EXPORT class ActionQueue : public SyncAction { Q_OBJECT + TQ_OBJECT public: /** * Constructor. Pass in a KPilot device link for it to act on. diff --git a/lib/actions.cc b/lib/actions.cc index 4f10cc4..03138a6 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") - .arg(TQString::tqfromLatin1(KPILOT_VERSION))); - emit logMessage( i18n("Using encoding %1 on the handheld.").arg(Pilot::codecName()) ); + .tqarg(TQString::tqfromLatin1(KPILOT_VERSION))); + emit logMessage( i18n("Using encoding %1 on the handheld.").tqarg(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...") - .arg(Pilot::fromPilot(db.name))); + .tqarg(Pilot::fromPilot(db.name))); } emit logMessage(i18n("HotSync finished.")); diff --git a/lib/actions.h b/lib/actions.h index 2e3b9b2..35496d0 100644 --- a/lib/actions.h +++ b/lib/actions.h @@ -67,7 +67,7 @@ public: * print that message (it must be i18n()ed already) instead of * the standard message. */ - SorryAction(KPilotLink *device, const TQString &s=TQString::null); + SorryAction(KPilotLink *device, const TQString &s=TQString()); protected: /** Reimplemented from SyncAction. */ diff --git a/lib/idmapperxml.h b/lib/idmapperxml.h index 87c9123..dc50557 100644 --- a/lib/idmapperxml.h +++ b/lib/idmapperxml.h @@ -32,7 +32,7 @@ #include #include -class IDMapperXml : public QXmlDefaultHandler +class IDMapperXml : public TQXmlDefaultHandler { public: IDMapperXml( const TQString &file ); diff --git a/lib/kpilotdevicelink.cc b/lib/kpilotdevicelink.cc index 5fed796..e211eab 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)") - .arg(link()->pilotPath() ))); + .tqarg(link()->pilotPath() ))); } link()->fMessages->reset(); @@ -155,7 +155,7 @@ void DeviceCommThread::reset() // Timer already deleted by close() call. startOpenTimer(this,fOpenTimer); - link()->fLinkStatus = WaitingForDevice; + link()->fLinktqStatus = WaitingForDevice; } /** @@ -176,16 +176,16 @@ void DeviceCommThread::openDevice() // This transition (from Waiting to Found) can only be // taken once. // - if (link()->fLinkStatus == WaitingForDevice) + if (link()->fLinktqStatus == WaitingForDevice) { - link()->fLinkStatus = FoundDevice; + link()->fLinktqStatus = FoundDevice; } if (link()->fMessages->shouldPrint(Messages::OpenMessage)) { TQApplication::postEvent(link(), new DeviceCommEvent(EventLogMessage, i18n("Trying to open device %1...") - .arg(link()->fPilotPath))); + .tqarg(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()->fLinkStatus = PilotLinkError; + link()->fLinktqStatus = 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)").arg(errorMessage(e)); + "with the Pilot (%1)").tqarg(errorMessage(e)); DEBUGKPILOT << msg << endl; DEBUGKPILOT << "(" << strerror(e) << ")" << endl; - link()->fLinkStatus = PilotLinkError; + link()->fLinktqStatus = 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()->fLinkStatus = CreatedSocket; + link()->fLinktqStatus = 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\". ").arg(link()->fRealPilotPath); + msg = i18n("Cannot open Pilot port \"%1\". ").tqarg(link()->fRealPilotPath); DEBUGKPILOT << msg << endl; DEBUGKPILOT << "(" << strerror(e) << ")" << endl; - link()->fLinkStatus = PilotLinkError; + link()->fLinktqStatus = PilotLinkError; if (link()->fMessages->shouldPrint(Messages::OpenFailMessage)) { @@ -301,7 +301,7 @@ bool DeviceCommThread::open(const TQString &device) return false; } - link()->fLinkStatus = DeviceOpen; + link()->fLinktqStatus = DeviceOpen; DeviceMap::self()->bindDevice(link()->fRealPilotPath); fSocketNotifier = new TQSocketNotifier(fTempSocket, @@ -394,7 +394,7 @@ void DeviceCommThread::acceptDevice() return; } - TQApplication::postEvent(link(), new DeviceCommEvent(EventLogProgress, TQString::null, 10)); + TQApplication::postEvent(link(), new DeviceCommEvent(EventLogProgress, TQString(), 10)); DEBUGKPILOT << fname << ": Listening to pilot. Now trying accept..." << endl; @@ -409,28 +409,28 @@ void DeviceCommThread::acceptDevice() WARNINGKPILOT << "pi_accept returned: [" << s << "]" << endl; TQApplication::postEvent(link(), new DeviceCommEvent(EventLogError, i18n("Cannot accept Pilot (%1)") - .arg(TQString::fromLocal8Bit(s)))); + .tqarg(TQString::fromLocal8Bit(s)))); - link()->fLinkStatus = PilotLinkError; + link()->fLinktqStatus = PilotLinkError; reset(); return; } DEBUGKPILOT << fname << ": Link accept done." << endl; - if ((link()->fLinkStatus != DeviceOpen) || (fPilotSocket == -1)) + if ((link()->fLinktqStatus != DeviceOpen) || (fPilotSocket == -1)) { - link()->fLinkStatus = PilotLinkError; + link()->fLinktqStatus = PilotLinkError; WARNINGKPILOT << "Already connected or unable to connect!" << endl; TQApplication::postEvent(link(), new DeviceCommEvent(EventLogError, i18n("Cannot accept Pilot (%1)") - .arg(i18n("already connected")))); + .tqarg(i18n("already connected")))); reset(); return; } - TQApplication::postEvent(link(), new DeviceCommEvent(EventLogProgress, TQString::null, 30)); + TQApplication::postEvent(link(), new DeviceCommEvent(EventLogProgress, TQString(), 30)); DEBUGKPILOT << fname << ": doing dlp_ReadSysInfo..." << endl; @@ -440,7 +440,7 @@ void DeviceCommThread::acceptDevice() TQApplication::postEvent(link(), new DeviceCommEvent(EventLogError, i18n("Unable to read system information from Pilot"))); - link()->fLinkStatus=PilotLinkError; + link()->fLinktqStatus=PilotLinkError; reset(); return; } @@ -461,7 +461,7 @@ void DeviceCommThread::acceptDevice() fWorkaroundUSBTimer->stop(); KPILOT_DELETE(fWorkaroundUSBTimer); - TQApplication::postEvent(link(), new DeviceCommEvent(EventLogProgress, TQString::null, 60)); + TQApplication::postEvent(link(), new DeviceCommEvent(EventLogProgress, TQString(), 60)); KPILOT_DELETE(link()->fPilotUser); link()->fPilotUser = new KPilotUser; @@ -488,9 +488,9 @@ void DeviceCommThread::acceptDevice() "Perhaps you have a password set on the device?"))); } - link()->fLinkStatus = AcceptedDevice; + link()->fLinktqStatus = AcceptedDevice; - TQApplication::postEvent(link(), new DeviceCommEvent(EventLogProgress, TQString::null, 100)); + TQApplication::postEvent(link(), new DeviceCommEvent(EventLogProgress, TQString(), 100)); DeviceCommEvent * ev = new DeviceCommEvent(EventDeviceReady); ev->setCurrentSocket(fPilotSocket); @@ -527,9 +527,9 @@ void DeviceCommThread::run() DEBUGKPILOT << fname << ": comm thread now done..." << endl; } -KPilotDeviceLink::KPilotDeviceLink(TQObject * parent, const char *name, +KPilotDeviceLink::KPilotDeviceLink(TQObject * tqparent, const char *name, const TQString &tempDevice) : - KPilotLink(parent, name), fLinkStatus(Init), fWorkaroundUSB(false), + KPilotLink(tqparent, name), fLinktqStatus(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 fLinkStatus == AcceptedDevice; + return fLinktqStatus == AcceptedDevice; } /* virtual */bool KPilotDeviceLink::event(TQEvent *e) @@ -640,12 +640,12 @@ void KPilotDeviceLink::reset(const TQString & dP) { FUNCTIONSETUP; - fLinkStatus = Init; + fLinktqStatus = Init; // Release all resources // close(); - fPilotPath = TQString::null; + fPilotPath = TQString(); fPilotPath = dP; if (fPilotPath.isEmpty()) @@ -670,7 +670,7 @@ void KPilotDeviceLink::startCommThread() TQString msg = i18n("The Pilot device is not configured yet."); WARNINGKPILOT << msg << endl; - fLinkStatus = PilotLinkError; + fLinktqStatus = PilotLinkError; emit logError(msg); return; @@ -689,7 +689,7 @@ void KPilotDeviceLink::reset() checkDevice(); - fLinkStatus = WaitingForDevice; + fLinktqStatus = WaitingForDevice; startCommThread(); } @@ -707,7 +707,7 @@ void KPilotDeviceLink::checkDevice() if (!(fi.isReadable() && fi.isWritable())) { emit logError(i18n("Pilot device %1 is not read-write.") - .arg(fPilotPath)); + .tqarg(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.") - .arg(fPilotPath)); + .tqarg(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(LinkStatus l) +TQString KPilotDeviceLink::statusString(LinktqStatus l) { TQString s= CSL1("KPilotDeviceLink="); diff --git a/lib/kpilotdevicelink.h b/lib/kpilotdevicelink.h index a648b23..b912c19 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 LinkStatus { +enum LinktqStatus { Init, WaitingForDevice, FoundDevice, @@ -75,20 +75,21 @@ friend class PilotSerialDatabase; friend class DeviceCommThread; Q_OBJECT + TQ_OBJECT public: /** * Constructor. Creates a link that can sync to a physical handheld. * Call reset() on it to start looking for a device. * - * @param parent Parent object. + * @param tqparent Parent object. * @param name Name of this object. * @param tempDevice Path to device node to use as an alternative * to the "normal" one set by KPilot. */ - KPilotDeviceLink( TQObject *parent = 0, + KPilotDeviceLink( TQObject *tqparent = 0, const char *name = 0, - const TQString &tempDevice = TQString::null ); + const TQString &tempDevice = TQString() ); /** * Destructor. This rudely ends the communication with the handheld. @@ -99,15 +100,15 @@ public: /** * Get the status (state enum) of this link. - * @return The LinkStatus enum for the link's current state. + * @return The LinktqStatus enum for the link's current state. */ - LinkStatus status() const + LinktqStatus status() const { - return fLinkStatus; + return fLinktqStatus; } /** Get a human-readable string for the given status @p l. */ - static TQString statusString(LinkStatus l); + static TQString statusString(LinktqStatus l); // The following API is the actual implementation of // the KPilotLink API, for documentation see that file. @@ -140,7 +141,7 @@ protected: private: - LinkStatus fLinkStatus; + LinktqStatus fLinktqStatus; public: diff --git a/lib/kpilotdevicelinkPrivate.h b/lib/kpilotdevicelinkPrivate.h index 518f019..b0967ba 100644 --- a/lib/kpilotdevicelinkPrivate.h +++ b/lib/kpilotdevicelinkPrivate.h @@ -109,8 +109,8 @@ private: class Messages { public: - Messages(KPilotDeviceLink *parent) : - fDeviceLink(parent) + Messages(KPilotDeviceLink *tqparent) : + fDeviceLink(tqparent) { reset(); } @@ -170,10 +170,10 @@ protected: KPilotDeviceLink *fDeviceLink; }; -class DeviceCommEvent : public QEvent +class DeviceCommEvent : public TQEvent { public: - DeviceCommEvent(DeviceCustomEvents type, TQString msg = TQString::null, + DeviceCommEvent(DeviceCustomEvents type, TQString msg = TQString(), int progress = 0) : TQEvent( (TQEvent::Type)type ), fMessage(msg), fProgress(progress), fPilotSocket(-1) @@ -207,15 +207,16 @@ private: }; /** Class that handles all device communications. We do this - in a different thread so that we do not block the main Qt + in a different thread so that we do not block the main TQt Event thread (similar to Swing's AWT event dispatch thread). */ -class DeviceCommThread : public TQObject, public QThread +class DeviceCommThread : public TQObject, public TQThread { friend class KPilotDeviceLink; Q_OBJECT + TQ_OBJECT public: DeviceCommThread(KPilotDeviceLink *d); @@ -239,7 +240,7 @@ protected: * Does the low-level opening of the device and handles the * pilot-link library initialisation. */ - bool open(const TQString &device = TQString::null); + bool open(const TQString &device = TQString()); protected slots: /** diff --git a/lib/kpilotlink.cc b/lib/kpilotlink.cc index da85d48..9ba4288 100644 --- a/lib/kpilotlink.cc +++ b/lib/kpilotlink.cc @@ -70,7 +70,7 @@ * the virtual tickle() method; deals with cancels through the * shared fDone variable. */ -class TickleThread : public QThread +class TickleThread : public TQThread { public: TickleThread(KPilotLink *d, bool *done, int timeout) : @@ -137,9 +137,9 @@ void TickleThread::run() -KPilotLink::KPilotLink( TQObject *parent, const char *name ) : - TQObject( parent, name ), - fPilotPath(TQString::null), +KPilotLink::KPilotLink( TQObject *tqparent, const char *name ) : + TQObject( tqparent, name ), + fPilotPath(TQString()), fPilotUser(0L), fPilotSysInfo(0L), fTickleDone(true), @@ -229,14 +229,14 @@ unsigned int KPilotLink::installFiles(const TQStringList & l, const bool deleteF for (i = l.begin(), e = l.end(); i != e; ++i) { - emit logProgress(TQString::null, + emit logProgress(TQString(), (int) ((100.0 / total) * (float) n)); if (installFile(*i, deleteFiles)) k++; n++; } - emit logProgress(TQString::null, 100); + emit logProgress(TQString(), 100); return k; } diff --git a/lib/kpilotlink.h b/lib/kpilotlink.h index 4389cb8..3816094 100644 --- a/lib/kpilotlink.h +++ b/lib/kpilotlink.h @@ -168,16 +168,17 @@ class PilotDatabase; * with a non-zero timeout and that timeout has elapsed. The * tickler is stopped before timeout is emitted. */ -class KDE_EXPORT KPilotLink : public QObject +class KDE_EXPORT KPilotLink : public TQObject { Q_OBJECT + TQ_OBJECT friend class SyncAction; public: /** A list of DBInfo structures. */ typedef TQValueList DBInfoList; /** Constructor. Use reset() to start looking for a device. */ - KPilotLink( TQObject *parent = 0, const char *name = 0 ); + KPilotLink( TQObject *tqparent = 0, const char *name = 0 ); /** Destructor. This rudely interrupts any communication in progress. * It is best to call endOfSync() or finishSync() before destroying @@ -381,7 +382,7 @@ signals: * time startTickle() is called, you can state how long * tickling should last (at most) before timing out. * - * You can only get a timeout when the Qt event loop is + * You can only get a timeout when the TQt event loop is * running, which somewhat limits the usefulness of timeouts. */ void timeout(); diff --git a/lib/kpilotlocallink.cc b/lib/kpilotlocallink.cc index 13c9cbc..aaf14c6 100644 --- a/lib/kpilotlocallink.cc +++ b/lib/kpilotlocallink.cc @@ -65,7 +65,7 @@ #include "kpilotlocallink.moc" -typedef QPair DatabaseDescriptor; +typedef TQPair DatabaseDescriptor; typedef TQValueList DatabaseDescriptorList; class KPilotLocalLink::Private @@ -99,7 +99,7 @@ unsigned int KPilotLocalLink::findAvailableDatabases( KPilotLocalLink::Private & TQString dbname = (*i); dbname.remove(dbname.length()-4,4); - TQString dbnamecheck = (*i).left((*i).findRev(CSL1(".pdb"))); + TQString dbnamecheck = (*i).left((*i).tqfindRev(CSL1(".pdb"))); Q_ASSERT(dbname == dbnamecheck); if (PilotLocalDatabase::infoFromFile( path + CSL1("/") + (*i), &dbi)) @@ -118,8 +118,8 @@ unsigned int KPilotLocalLink::findAvailableDatabases( KPilotLocalLink::Private & } -KPilotLocalLink::KPilotLocalLink( TQObject *parent, const char *name ) : - KPilotLink(parent,name), +KPilotLocalLink::KPilotLocalLink( TQObject *tqparent, const char *name ) : + KPilotLink(tqparent,name), fReady(false), d( new Private ) { diff --git a/lib/kpilotlocallink.h b/lib/kpilotlocallink.h index ca37bb5..99df9b9 100644 --- a/lib/kpilotlocallink.h +++ b/lib/kpilotlocallink.h @@ -43,8 +43,9 @@ class KDE_EXPORT KPilotLocalLink : public KPilotLink { Q_OBJECT + TQ_OBJECT public: - KPilotLocalLink( TQObject *parent=0L, const char *name=0L ); + KPilotLocalLink( TQObject *tqparent=0L, const char *name=0L ); virtual ~KPilotLocalLink(); virtual TQString statusString() const; diff --git a/lib/options.cc b/lib/options.cc index 0499177..749a57b 100644 --- a/lib/options.cc +++ b/lib/options.cc @@ -55,9 +55,9 @@ static const char debug_spaces[61] = " "; -TQString rtExpand(const TQString &s, Qt::TextFormat richText) +TQString rtExpand(const TQString &s, TQt::TextFormat richText) { - if (richText == Qt::RichText) + if (richText == TQt::RichText) { TQString t(s); return t.tqreplace(CSL1("\n"), CSL1("
    \n")); diff --git a/lib/options.h b/lib/options.h index edf3a6f..e1c6742 100644 --- a/lib/options.h +++ b/lib/options.h @@ -40,10 +40,6 @@ #include #include -#if (QT_VERSION < 0x030300) -#error "This is KPilot for KDE3.5 and won't compile with Qt < 3.3.0" -#endif - #include #include #include @@ -144,12 +140,12 @@ inline std::ostream& operator <<(std::ostream &o, const KPilotDepthCount &d) // Function to expand newlines in rich text to
    \n -TQString rtExpand(const TQString &s, Qt::TextFormat richText); +TQString rtExpand(const TQString &s, TQt::TextFormat richText); /** - * Convert a struct tm from the pilot-link package to a QDateTime + * Convert a struct tm from the pilot-link package to a TQDateTime */ KDE_EXPORT TQDateTime readTm(const struct tm &t); /** @@ -183,7 +179,7 @@ KDE_EXPORT struct tm writeTm(const TQDate &dt); #define TODO_I18N(a) TQString::tqfromLatin1(a) #define TODO_I18N_P(a,b,c) ((c>1) ? a : b) -// Handle some cases for QT_NO_CAST_ASCII and NO_ASCII_CAST. +// Handle some cases for TQT_NO_CAST_ASCII and NO_ASCII_CAST. // Where possible in the source, known constant strings in // latin1 encoding are marked with CSL1(), to avoid gobs // of latin1() or fromlatin1() calls which might obscure diff --git a/lib/pilot.cc b/lib/pilot.cc index 6fdec5e..18e61f6 100644 --- a/lib/pilot.cc +++ b/lib/pilot.cc @@ -144,7 +144,7 @@ TQString category(const struct CategoryAppInfo *info, unsigned int i) { if (!info || (i>=CATEGORY_COUNT)) { - return TQString::null; + return TQString(); } mutex->lock(); diff --git a/lib/pilot.h b/lib/pilot.h index 4ae7030..5638b70 100644 --- a/lib/pilot.h +++ b/lib/pilot.h @@ -55,7 +55,7 @@ class PilotCategoryInfo; // ... and category information /** * The Pilot namespace holds constants that are global for -* the handheld data structures. Also tqcontains some global +* the handheld data structures. Also contains some global * functions that deal with pilot-link structures as well * as mapping user-visible strings from UTF8 (KDE side) to * the encoding used on the handheld. @@ -106,7 +106,7 @@ namespace Pilot * native 8 bit encoding of the handheld. * * @param s String to encode - * @return Encoded string in a QCString + * @return Encoded string in a TQCString */ TQCString toPilot( const TQString &s ); @@ -141,9 +141,9 @@ namespace Pilot } /** Returns the TQString for the requested category @p i - * in the category structure @p info. Returns @c TQString::null + * in the category structure @p info. Returns @c TQString() * on error (bad pointer or bad category number). May also - * return @c TQString::null if the category name is empty. + * return @c TQString() if the category name is empty. */ inline TQString categoryName(const struct CategoryAppInfo *info, unsigned int i) { @@ -157,7 +157,7 @@ namespace Pilot } else { - return TQString::null; + return TQString(); } } diff --git a/lib/pilotAddress.cc b/lib/pilotAddress.cc index 4589688..11fdd12 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").arg(toOffset()).arg(toField()); + return TQString("%1,%2").tqarg(toOffset()).tqarg(toField()); } #define MAXFIELDS 19 @@ -273,13 +273,13 @@ PilotAddress::~PilotAddress() free_Address(&fAddressInfo); } -TQString PilotAddress::getTextRepresentation(const PilotAddressInfo *info, Qt::TextFormat richText) const +TQString PilotAddress::getTextRepresentation(const PilotAddressInfo *info, TQt::TextFormat richText) const { TQString text, tmp; - TQString par = (richText==Qt::RichText) ?CSL1("

    "): TQString(); - TQString ps = (richText==Qt::RichText) ?CSL1("

    "):CSL1("\n"); - TQString br = (richText==Qt::RichText) ?CSL1("
    "):CSL1("\n"); + TQString par = (richText==TQt::RichText) ?CSL1("

    "): TQString(); + TQString ps = (richText==TQt::RichText) ?CSL1("

    "):CSL1("\n"); + TQString br = (richText==TQt::RichText) ?CSL1("
    "):CSL1("\n"); // title + name text += par; @@ -293,14 +293,14 @@ TQString PilotAddress::getTextRepresentation(const PilotAddressInfo *info, Qt::T TQString firstName = getField(entryFirstname); if (firstName.isEmpty()) { - // So tqreplace placeholder for first name (%1) with empty - tmp = tmp.arg(TQString()); + // So replace placeholder for first name (%1) with empty + tmp = tmp.tqarg(TQString()); } else { - tmp = tmp.arg(rtExpand(firstName,richText)); + tmp = tmp.tqarg(rtExpand(firstName,richText)); } - tmp=tmp.arg(rtExpand(getField(entryLastname), richText)); + tmp=tmp.tqarg(rtExpand(getField(entryLastname), richText)); text += tmp; text += ps; @@ -335,13 +335,13 @@ TQString PilotAddress::getTextRepresentation(const PilotAddressInfo *info, Qt::T } if (info) { - tmp=tmp.arg(info->phoneLabel( getPhoneType( i ) )); + tmp=tmp.tqarg(info->phoneLabel( getPhoneType( i ) )); } else { - tmp=tmp.arg(CSL1("Contact: ")); + tmp=tmp.tqarg(CSL1("Contact: ")); } - tmp=tmp.arg(rtExpand(getField(i.toField()), richText)); + tmp=tmp.tqarg(rtExpand(getField(i.toField()), richText)); text += tmp; text += br; } diff --git a/lib/pilotAddress.h b/lib/pilotAddress.h index 94ae3f6..f5c2bcb 100644 --- a/lib/pilotAddress.h +++ b/lib/pilotAddress.h @@ -182,9 +182,9 @@ public: * - phone[6] = Pager * - phone[7] = Mobile * - * Apparently, this order is kept for all languages, just with localized + * Aptqparently, this order is kept for all languages, just with localized * strings. The implementation of the internal methods will assume - * this order is kept. In other languages, main can tqreplaced with + * this order is kept. In other languages, main can replaced with * Corporation. */ class KDE_EXPORT PilotAddress : public PilotRecordBase @@ -198,11 +198,11 @@ public: virtual ~PilotAddress(); /** Returns a text representation of the address. If @p richText is true, the - * text will be formatted with Qt-HTML tags. The AppInfo structure @p info + * text will be formatted with TQt-HTML tags. The AppInfo structure @p info * is used to figure out the phone labels; if it is NULL then bogus labels are * used to identify phone types. */ - TQString getTextRepresentation(const PilotAddressInfo *info, Qt::TextFormat richText) const; + TQString getTextRepresentation(const PilotAddressInfo *info, TQt::TextFormat richText) const; /** * @param text set the field value @@ -225,7 +225,7 @@ public: } } - /** Returns the text value of a given field @p field (or TQString::null + /** Returns the text value of a given field @p field (or TQString() * if there is no such field). */ TQString getField(int field) const; diff --git a/lib/pilotAppInfo.h b/lib/pilotAppInfo.h index b14cf0a..43e8eb5 100644 --- a/lib/pilotAppInfo.h +++ b/lib/pilotAppInfo.h @@ -102,7 +102,7 @@ public: return Pilot::findCategory(fC,name,unknownIsUnfiled); } ; - /** Gets a single category name. Returns TQString::null if there is no + /** Gets a single category name. Returns TQString() if there is no * such category number @p i . */ inline TQString categoryName(unsigned int i) const { diff --git a/lib/pilotDatabase.h b/lib/pilotDatabase.h index 82a6431..7c952d2 100644 --- a/lib/pilotDatabase.h +++ b/lib/pilotDatabase.h @@ -50,7 +50,7 @@ class KDE_EXPORT PilotDatabase { public: - PilotDatabase(const TQString &name = TQString::null); + PilotDatabase(const TQString &name = TQString()); virtual ~PilotDatabase(); diff --git a/lib/pilotDateEntry.cc b/lib/pilotDateEntry.cc index bae18ef..42becf2 100644 --- a/lib/pilotDateEntry.cc +++ b/lib/pilotDateEntry.cc @@ -160,23 +160,23 @@ PilotDateEntry & PilotDateEntry::operator = (const PilotDateEntry & e) } // end of assignment operator -TQString PilotDateEntry::getTextRepresentation(Qt::TextFormat richText) +TQString PilotDateEntry::getTextRepresentation(TQt::TextFormat richText) { TQString text, tmp; - TQString par = (richText==Qt::RichText) ?CSL1("

    "):TQString::null; - TQString ps = (richText==Qt::RichText) ?CSL1("

    "):CSL1("\n"); - TQString br = (richText==Qt::RichText) ?CSL1("
    "):CSL1("\n"); + TQString par = (richText==TQt::RichText) ?CSL1("

    "):TQString(); + TQString ps = (richText==TQt::RichText) ?CSL1("

    "):CSL1("\n"); + TQString br = (richText==TQt::RichText) ?CSL1("
    "):CSL1("\n"); // title + name text += par; tmp=richText?CSL1("%1"):CSL1("%1"); - text += tmp.arg(rtExpand(getDescription(), richText)); + text += tmp.tqarg(rtExpand(getDescription(), richText)); text += ps; TQDateTime dt(readTm(getEventStart())); TQString startDate(dt.toString(Qt::LocalDate)); text+=par; - text+=i18n("Start date: %1").arg(startDate); + text+=i18n("Start date: %1").tqarg(startDate); text+=ps; if (isEvent()) @@ -190,7 +190,7 @@ TQString PilotDateEntry::getTextRepresentation(Qt::TextFormat richText) dt=readTm(getEventEnd()); TQString endDate(dt.toString(Qt::LocalDate)); text+=par; - text+=i18n("End date: %1").arg(endDate); + text+=i18n("End date: %1").tqarg(endDate); text+=ps; } @@ -201,10 +201,10 @@ TQString PilotDateEntry::getTextRepresentation(Qt::TextFormat richText) arg(getAdvance()); switch (getAdvanceUnits()) { - 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::null); break;; + 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;; } text+=tmp; text+=ps; @@ -215,16 +215,16 @@ TQString PilotDateEntry::getTextRepresentation(Qt::TextFormat richText) text+=par; tmp=i18n("Recurrence: every %1 %2"); int freq = getRepeatFrequency(); - tmp=tmp.arg(freq); + tmp=tmp.tqarg(freq); switch(getRepeatType()) { - case repeatDaily: tmp=tmp.arg(i18n("day(s)")); break; - case repeatWeekly: tmp=tmp.arg(i18n("week(s)")); break; + case repeatDaily: tmp=tmp.tqarg(i18n("day(s)")); break; + case repeatWeekly: tmp=tmp.tqarg(i18n("week(s)")); break; case repeatMonthlyByDay: - case repeatMonthlyByDate: tmp=tmp.arg(i18n("month(s)")); break; - case repeatYearly: tmp=tmp.arg(i18n("year(s)")); break; - default: tmp=tmp.arg(TQString::null); break; + case repeatMonthlyByDate: tmp=tmp.tqarg(i18n("month(s)")); break; + case repeatYearly: tmp=tmp.tqarg(i18n("year(s)")); break; + default: tmp=tmp.tqarg(TQString()); break; } text+=tmp; text+=br; @@ -237,7 +237,7 @@ TQString PilotDateEntry::getTextRepresentation(Qt::TextFormat richText) else { dt = readTm(getRepeatEnd()).date(); - text+=i18n("Until %1").arg(dt.toString(Qt::LocalDate)); + text+=i18n("Until %1").tqarg(dt.toString(Qt::LocalDate)); } text+=br; @@ -245,7 +245,7 @@ TQString PilotDateEntry::getTextRepresentation(Qt::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").arg(getRepeatDays + if (getRepeatType()==repeatWeekly) text+=i18n("Repeat day flags: %1").tqarg(getRepeatDays const int *days = dateEntry->getRepeatDays(); // Rotate the days of the week, since day numbers on the Pilot and // in vCal / Events are different. @@ -421,7 +421,7 @@ void PilotDateEntry::setLocation(const TQString &s) else { TQString location = "Location: " + s + "\n"; - int pos = note.find(rxp); + int pos = note.tqfind(rxp); if(pos >= 0) { @@ -441,7 +441,7 @@ TQString PilotDateEntry::getLocation() const // one from PilotDateEntry::getNote(); TQString note = Pilot::fromPilot(getNoteP()); TQRegExp rxp = TQRegExp("^[Ll]ocation:[^\n]+\n"); - int pos = note.find(rxp, 0); + int pos = note.tqfind(rxp, 0); if(pos >= 0) { diff --git a/lib/pilotDateEntry.h b/lib/pilotDateEntry.h index 4360101..765a562 100644 --- a/lib/pilotDateEntry.h +++ b/lib/pilotDateEntry.h @@ -94,7 +94,7 @@ public: * If @p richText is true, then the text representation uses qt style * tags as well. */ - TQString getTextRepresentation(Qt::TextFormat richText); + TQString getTextRepresentation(TQt::TextFormat richText); /** Is this appointment a "floating" appointment? * diff --git a/lib/pilotLocalDatabase.cc b/lib/pilotLocalDatabase.cc index 8e94d4e..71de3eb 100644 --- a/lib/pilotLocalDatabase.cc +++ b/lib/pilotLocalDatabase.cc @@ -125,7 +125,7 @@ PilotLocalDatabase::PilotLocalDatabase(const TQString &dbName) : { FUNCTIONSETUP; - int p = dbName.findRev( '/' ); + int p = dbName.tqfindRev( '/' ); if (p<0) { // No slash @@ -279,7 +279,7 @@ TQValueList PilotLocalDatabase::idList() return idlist; } - // now create the QValue list from the idarr: + // now create the TQValue list from the idarr: for (int i=0; iid()); diff --git a/lib/pilotMemo.cc b/lib/pilotMemo.cc index 946a995..fab0ae8 100644 --- a/lib/pilotMemo.cc +++ b/lib/pilotMemo.cc @@ -74,25 +74,25 @@ PilotRecord *PilotMemo::pack() } -TQString PilotMemo::getTextRepresentation(Qt::TextFormat richText) +TQString PilotMemo::getTextRepresentation(TQt::TextFormat richText) { - if (richText==Qt::RichText) + if (richText==TQt::RichText) { return i18n("Title: %1
    \nMemoText:
    %2"). - arg(rtExpand(getTitle(), richText)).arg(rtExpand(text(), richText)); + tqarg(rtExpand(getTitle(), richText)).tqarg(rtExpand(text(), richText)); } else { - return i18n("Title: %1\nMemoText:\n%2").arg(getTitle()).arg(text()); + return i18n("Title: %1\nMemoText:\n%2").tqarg(getTitle()).tqarg(text()); } } TQString PilotMemo::getTitle() const { - if (fText.isEmpty()) return TQString::null; + if (fText.isEmpty()) return TQString(); - int memoTitleLen = fText.find('\n'); + int memoTitleLen = fText.tqfind('\n'); if (-1 == memoTitleLen) memoTitleLen=fText.length(); return fText.left(memoTitleLen); } @@ -106,7 +106,7 @@ TQString PilotMemo::shortTitle() const return t; t.truncate(40); - int spaceIndex = t.findRev(' '); + int spaceIndex = t.tqfindRev(' '); if (spaceIndex > 32) { diff --git a/lib/pilotMemo.h b/lib/pilotMemo.h index f4436ab..cc5389d 100644 --- a/lib/pilotMemo.h +++ b/lib/pilotMemo.h @@ -73,7 +73,7 @@ public: ~PilotMemo() { } ; - virtual TQString getTextRepresentation(Qt::TextFormat richText); + virtual TQString getTextRepresentation(TQt::TextFormat richText); TQString text(void) const { return fText; } ; void setText(const TQString &text) { fText = text.left(MAX_MEMO_LEN); } ; TQString getTitle(void) const ; diff --git a/lib/pilotRecord.cc b/lib/pilotRecord.cc index 59f055c..5abeaaf 100644 --- a/lib/pilotRecord.cc +++ b/lib/pilotRecord.cc @@ -54,8 +54,8 @@ /* virtual */ TQString PilotRecord::textRepresentation() const { return CSL1("[ %1,%2 ]") - .arg(PilotRecordBase::textRepresentation()) - .arg(size()); + .tqarg(PilotRecordBase::textRepresentation()) + .tqarg(size()); } diff --git a/lib/pilotSerialDatabase.cc b/lib/pilotSerialDatabase.cc index f57cac9..d1d7ee9 100644 --- a/lib/pilotSerialDatabase.cc +++ b/lib/pilotSerialDatabase.cc @@ -56,8 +56,8 @@ PilotSerialDatabase::PilotSerialDatabase(KPilotDeviceLink *l, } PilotSerialDatabase::PilotSerialDatabase( KPilotDeviceLink *l, const DBInfo *info ) : - PilotDatabase( info ? Pilot::fromPilot( info->name ) : TQString::null ), - fDBName( TQString::null ), + PilotDatabase( info ? Pilot::fromPilot( info->name ) : TQString() ), + fDBName( TQString() ), fDBHandle( -1 ), fDBSocket( l->pilotSocket() ) { @@ -157,7 +157,7 @@ TQValueList PilotSerialDatabase::idList() return idlist; } - // now create the QValue list from the idarr: + // now create the TQValue list from the idarr: for (idlen=0; idlen"): TQString(); - TQString ps = (richText==Qt::RichText) ?CSL1("

    "):CSL1("\n"); - TQString br = (richText==Qt::RichText) ?CSL1("
    "):CSL1("\n"); + TQString par = (richText==TQt::RichText) ?CSL1("

    "): TQString(); + TQString ps = (richText==TQt::RichText) ?CSL1("

    "):CSL1("\n"); + TQString br = (richText==TQt::RichText) ?CSL1("
    "):CSL1("\n"); // title + name text += par; - tmp= (richText==Qt::RichText) ?CSL1("%1"):CSL1("%1"); - text += tmp.arg(rtExpand(getDescription(), richText)); + tmp= (richText==TQt::RichText) ?CSL1("%1"):CSL1("%1"); + text += tmp.tqarg(rtExpand(getDescription(), richText)); text += ps; text += par; @@ -140,7 +140,7 @@ TQString PilotTodoEntry::getTextRepresentation(Qt::TextFormat richText) TQDate dt(readTm(getDueDate()).date()); TQString dueDate(dt.toString(Qt::LocalDate)); text+=par; - text+=i18n("Due date: %1").arg(dueDate); + text+=i18n("Due date: %1").tqarg(dueDate); text+=ps; } @@ -148,14 +148,14 @@ TQString PilotTodoEntry::getTextRepresentation(Qt::TextFormat richText) text+=ps; text+=par; - text+=i18n("Priority: %1").arg(getPriority()); + text+=i18n("Priority: %1").tqarg(getPriority()); text+=ps; if (!getNote().isEmpty()) { - text += (richText==Qt::RichText) ?CSL1("
    "):CSL1("-------------------------\n"); + text += (richText==TQt::RichText) ?CSL1("
    "):CSL1("-------------------------\n"); text+=par; - text+= (richText==Qt::RichText) ?i18n("Note:
    "):i18n("Note:\n"); + text+= (richText==TQt::RichText) ?i18n("Note:
    "):i18n("Note:\n"); text+=rtExpand(getNote(), richText); text+=ps; } diff --git a/lib/pilotTodoEntry.h b/lib/pilotTodoEntry.h index 020912f..999bb1f 100644 --- a/lib/pilotTodoEntry.h +++ b/lib/pilotTodoEntry.h @@ -72,7 +72,7 @@ public: /** Return a string for the ToDo item. If @param richText is true, then * use qt style markup to make the string clearer when displayed. */ - TQString getTextRepresentation(Qt::TextFormat richText); + TQString getTextRepresentation(TQt::TextFormat richText); /** Assign an existing ToDo item to this one. */ PilotTodoEntry& operator=(const PilotTodoEntry &e); diff --git a/lib/plugin.cc b/lib/plugin.cc index 27631ce..98c110d 100644 --- a/lib/plugin.cc +++ b/lib/plugin.cc @@ -65,9 +65,9 @@ #include "plugin.moc" -ConduitConfigBase::ConduitConfigBase(TQWidget *parent, +ConduitConfigBase::ConduitConfigBase(TQWidget *tqparent, const char *name) : - TQObject(parent,name), + TQObject(tqparent,name), fModified(false), fWidget(0L), fConduitName(i18n("Unnamed")) @@ -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?").arg(this->conduitName()); + "want to save the changes before continuing?").tqarg(this->conduitName()); } /* virtual */ bool ConduitConfigBase::maybeSave() @@ -102,17 +102,17 @@ ConduitConfigBase::~ConduitConfigBase() int r = KMessageBox::questionYesNoCancel(fWidget, maybeSaveText(), - i18n("%1 Conduit").arg(this->conduitName()), KStdGuiItem::save(), KStdGuiItem::discard()); + i18n("%1 Conduit").tqarg(this->conduitName()), KStdGuiItem::save(), KStdGuiItem::discard()); if (r == KMessageBox::Cancel) return false; if (r == KMessageBox::Yes) commit(); return true; } -TQWidget *ConduitConfigBase::aboutPage(TQWidget *parent, KAboutData *ad) +TQWidget *ConduitConfigBase::aboutPage(TQWidget *tqparent, KAboutData *ad) { FUNCTIONSETUP; - TQWidget *w = new TQWidget(parent, "aboutpage"); + TQWidget *w = new TQWidget(tqparent, "aboutpage"); TQString s; TQLabel *text; @@ -138,7 +138,7 @@ TQWidget *ConduitConfigBase::aboutPage(TQWidget *parent, KAboutData *ad) } text = new TQLabel(w); - // Experiment with a long non- string. Use that to find + // Experiment with a long non- string. Use that to tqfind // sensible widths for the columns. // text->setText(i18n("Send questions and comments to kdepim-users@kde.org")); @@ -148,7 +148,7 @@ TQWidget *ConduitConfigBase::aboutPage(TQWidget *parent, KAboutData *ad) int lineheight = text->size().height(); // Use the label to display the applciation icon - text->setText(TQString::null); + text->setText(TQString()); text->setPixmap(applicationIcon); text->adjustSize(); grid->addWidget(text, 0, 1); @@ -183,27 +183,27 @@ TQWidget *ConduitConfigBase::aboutPage(TQWidget *parent, KAboutData *ad) if (!p->homepage().isEmpty()) { - s = TQString::null; - s += CSL1("").arg(p->homepage()); + s = TQString(); + s += CSL1("").tqarg(p->homepage()); s += p->homepage(); s += CSL1("
    "); linktext->append(s); } - s = TQString::null; + s = TQString(); s += i18n("Send questions and comments to %2.") - .arg( CSL1("kdepim-users@kde.org") ) - .arg( CSL1("kdepim-users@kde.org") ); + .tqarg( CSL1("kdepim-users@kde.org") ) + .tqarg( CSL1("kdepim-users@kde.org") ); s += ' '; s += i18n("Send bug reports to %2.") - .arg(p->bugAddress()) - .arg(p->bugAddress()); + .tqarg(p->bugAddress()) + .tqarg(p->bugAddress()); s += ' '; s += i18n("For trademark information, see the " "KPilot User's Guide."); s += CSL1("
    "); linktext->append(s); - linktext->append(TQString::null); + linktext->append(TQString()); @@ -218,15 +218,15 @@ TQWidget *ConduitConfigBase::aboutPage(TQWidget *parent, KAboutData *ad) for (i=pl.begin(); i!=pl.end(); ++i) { s.append(CSL1("%1 (%2)%3") - .arg((*i).name()) - .arg((*i).task()) - .arg(countappend(s); - s = TQString::null; + s = TQString(); pl = p->credits(); if (pl.count()>0) { @@ -235,9 +235,9 @@ TQWidget *ConduitConfigBase::aboutPage(TQWidget *parent, KAboutData *ad) for (i=pl.begin(); i!=pl.end(); ++i) { s.append(CSL1("%1 (%2)%3") - .arg((*i).name()) - .arg((*i).task()) - .arg(count allowedVolatility) { - query = query.arg(fConduitName) - .arg(fCtrHH->type()).arg(fCtrHH->moo()); + query = query.tqarg(fConduitName) + .tqarg(fCtrHH->type()).tqarg(fCtrHH->moo()); DEBUGKPILOT << fname << ": Yikes, lots of volatility " << "caught. Check with user: [" << query @@ -494,7 +494,7 @@ void ConduitAction::finished() /* int rc = questionYesNo(query, caption, - TQString::null, 0 ); + TQString(), 0 ); if (rc == KMessageBox::Yes) { // TODO: add commit and rollback code. @@ -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.").arg(fDesktopName)); + addSyncLogEntry(i18n("Could not find conduit %1.").tqarg(fDesktopName)); return false; } @@ -556,7 +556,7 @@ ConduitProxy::ConduitProxy(KPilotLink *p, << " - " << KLibLoader::self()->lastErrorMessage() << endl; - addSyncLogEntry(i18n("Could not load conduit %1.").arg(fDesktopName)); + addSyncLogEntry(i18n("Could not load conduit %1.").tqarg(fDesktopName)); return false; } @@ -568,7 +568,7 @@ ConduitProxy::ConduitProxy(KPilotLink *p, << " has version " << version << endl; - addSyncLogEntry(i18n("Conduit %1 has wrong version (%2).").arg(fDesktopName).arg(version)); + addSyncLogEntry(i18n("Conduit %1 has wrong version (%2).").tqarg(fDesktopName).tqarg(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.").arg(fDesktopName)); + addSyncLogEntry(i18n("Could not initialize conduit %1.").tqarg(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.").arg(fDesktopName)); + addSyncLogEntry(i18n("Could not create conduit %1.").tqarg(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.").arg(fDesktopName)); + addSyncLogEntry(i18n("Could not create conduit %1.").tqarg(fDesktopName)); return false; } - addSyncLogEntry(i18n("[Conduit %1]").arg(fDesktopName)); + addSyncLogEntry(i18n("[Conduit %1]").tqarg(fDesktopName)); // Handle the syncDone signal properly & unload the conduit. TQObject::connect(fConduit,TQT_SIGNAL(syncDone(SyncAction *)), @@ -676,7 +676,7 @@ TQString findArgument(const TQStringList &a, const TQString &arg) } } - return TQString::null; + return TQString(); } /* static */ bool isRunning(const TQCString &n) @@ -704,7 +704,7 @@ TQString findArgument(const TQStringList &a, const TQString &arg) TQString symbol= CSL1("id_"); symbol.append(lib->name()); - if (!lib->hasSymbol(symbol.latin1())) return TQString::null; + if (!lib->hasSymbol(symbol.latin1())) return TQString(); return TQString::tqfromLatin1(*((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. ").arg(fStart).arg(fEnd); + i18n("Start: %1. End: %2. ").tqarg(fStart).tqarg(fEnd); - 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 > 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+fU+fD) <= 0) result += i18n("No changes made. "); diff --git a/lib/plugin.h b/lib/plugin.h index 5300c58..817d753 100644 --- a/lib/plugin.h +++ b/lib/plugin.h @@ -75,15 +75,16 @@ namespace Pilot * seems a little foolish. * */ -class KDE_EXPORT ConduitConfigBase : public QObject +class KDE_EXPORT ConduitConfigBase : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * Constructor. Creates a conduit configuration support object - * with the given parent @p parent and name (optional) @p n. + * with the given tqparent @p tqparent and name (optional) @p n. */ - ConduitConfigBase(TQWidget *parent=0L, const char *n=0L); + ConduitConfigBase(TQWidget *tqparent=0L, const char *n=0L); /** Destructor. */ virtual ~ConduitConfigBase(); @@ -151,10 +152,10 @@ public: * application's icon. This widget can be used pretty much * anywhere. Copied from KAboutDialog, mostly. * - * @param parent The widget that holds the about widget. + * @param tqparent The widget that holds the about widget. * @param data The KAboutData that is used to populate the widget. */ - static TQWidget *aboutPage(TQWidget *parent, KAboutData *data=0L); + static TQWidget *aboutPage(TQWidget *tqparent, KAboutData *data=0L); protected: /** @@ -260,6 +261,7 @@ private: class KDE_EXPORT ConduitAction : public SyncAction { Q_OBJECT + TQ_OBJECT public: ConduitAction(KPilotLink *, @@ -367,6 +369,7 @@ private: class ConduitProxy : public ConduitAction { Q_OBJECT + TQ_OBJECT public: ConduitProxy(KPilotLink *, @@ -387,7 +390,7 @@ protected: /** A namespace containing only static helper methods. */ namespace PluginUtility { - /** Searches the argument list for --foo=bar and returns bar, TQString::null if not found. + /** Searches the argument list for --foo=bar and returns bar, TQString() if not found. * Don't include the -- in the argname. */ TQString findArgument(const TQStringList &a, const TQString argname); @@ -418,6 +421,7 @@ namespace PluginUtility * class KPilotPlugin : public KLibFactory * { * Q_OBJECT + TQ_OBJECT * * public: * KPilotPlugin(TQObject * = 0L,const char * = 0L) ; @@ -440,9 +444,9 @@ namespace PluginUtility * * 
     * protected:
-* 	virtual TQObject* createObject( TQObject* parent = 0,
+* 	virtual TQObject* createObject( TQObject* tqparent = 0,
 * 		const char* name = 0,
-* 		const char* classname = "TQObject",
+* 		const char* classname = TQOBJECT_OBJECT_NAME_STRING,
 * 		const TQStringList &args = TQStringList() );
 *
    * diff --git a/lib/pluginfactory.h b/lib/pluginfactory.h index f43c706..4fa2d6f 100644 --- a/lib/pluginfactory.h +++ b/lib/pluginfactory.h @@ -45,26 +45,26 @@ class KPilotLink; template class ConduitFactory : public KLibFactory { public: - ConduitFactory(TQObject *parent = 0, const char *name = 0) : - KLibFactory(parent,name) + ConduitFactory(TQObject *tqparent = 0, const char *name = 0) : + KLibFactory(tqparent,name) { fInstance = new KInstance(name); } ; virtual ~ConduitFactory() { delete fInstance; } ; protected: virtual TQObject *createObject( - TQObject* parent = 0, + TQObject* tqparent = 0, const char* name = 0, - const char* classname = "TQObject", + const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ) { if (qstrcmp(classname,"ConduitConfigBase")==0) { - TQWidget *w = dynamic_cast(parent); + TQWidget *w = dynamic_cast(tqparent); if (w) return new Widget(w,name); else { - WARNINGKPILOT << "Could not cast parent to widget." << endl; + WARNINGKPILOT << "Could not cast tqparent to widget." << endl; return 0L; } } @@ -72,11 +72,11 @@ protected: if (qstrcmp(classname,"SyncAction")==0) { KPilotLink *d = 0L; - if (parent) d = dynamic_cast(parent); + if (tqparent) d = dynamic_cast(tqparent); - if (d || !parent) + if (d || !tqparent) { - if (!parent) + if (!tqparent) { kdDebug() << k_funcinfo << ": Using NULL device." << endl; } @@ -84,7 +84,7 @@ protected: } else { - WARNINGKPILOT << "Could not cast parent to KPilotLink" << endl; + WARNINGKPILOT << "Could not cast tqparent to KPilotLink" << endl; return 0L; } } diff --git a/lib/recordConduit.cc b/lib/recordConduit.cc index 0ffbbcf..ee01063 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.").arg( fDBName ) ); + emit logError(i18n("Unable to open the %1 database on the handheld.").tqarg( 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.").arg( dbName() ) ); + emit logError(i18n("Unable to open the %1 database on the handheld.").tqarg( dbName() ) ); return false; } _getAppInfo(); if( !mPCData->loadData() ) { - emit logError( i18n("Unable to open %1.").arg( mPCData->description() ) ); + emit logError( i18n("Unable to open %1.").tqarg( mPCData->description() ) ); return false; } // get the addresseMap which maps Pilot unique record(address) id's to @@ -496,7 +496,7 @@ void RecordConduit::slotDeletedRecord() } TQString uid = mEntryMap[ backupRec->id() ]; - PCEntry *pcEntry = mPCData->tqfindByUid( uid ); + PCEntry *pcEntry = mPCData->findByUid( uid ); PilotRecord *palmRec = fDatabase->readRecordById( backupRec->id() ); PilotAppCategory *backupEntry = 0L; if (backupRec) @@ -696,16 +696,16 @@ int RecordConduit::compareStr( const TQString & str1, const TQString & str2 ) /** * _getCat returns the id of the category from the given categories list. - * If the address has no categories on the PC, TQString::null is returned. + * If the address has no categories on the PC, TQString() is returned. * If the current category exists in the list of cats, it is returned * Otherwise the first cat in the list that exists on the HH is returned - * If none of the categories exists on the palm, TQString::null is returned + * If none of the categories exists on the palm, TQString() is returned */ TQString RecordConduit::getCatForHH( const TQStringList cats, const TQString curr ) const { FUNCTIONSETUP; if ( cats.size() < 1 ) - return TQString::null; + return TQString(); if ( cats.tqcontains( curr ) ) return curr; for ( TQStringList::ConstIterator it = cats.begin(); it != cats.end(); ++it) @@ -721,7 +721,7 @@ TQString RecordConduit::getCatForHH( const TQStringList cats, const TQString cur } // If we have a free label, return the first possible cat TQString lastCat( category( Pilot::CATEGORY_COUNT-1 ) ); - return ( lastCat.isEmpty() ) ? ( cats.first() ) : ( TQString::null ); + return ( lastCat.isEmpty() ) ? ( cats.first() ) : ( TQString() ); } void RecordConduit::setCategory(PCEntry * pcEntry, TQString cat) @@ -1102,7 +1102,7 @@ RecordConduit::PCEntry *RecordConduit::findMatch( PilotAppCategory *palmEntry ) #endif if( !id.isEmpty() ) { - PCEntry *res = mPCData->tqfindByUid( id ); + PCEntry *res = mPCData->findByUid( id ); if ( !res && !res->isEmpty() ) return res; KPILOT_DELETE( res ); #ifdef DEBUG diff --git a/lib/recordConduit.h b/lib/recordConduit.h index 9c7e5c6..87aa44e 100644 --- a/lib/recordConduit.h +++ b/lib/recordConduit.h @@ -56,6 +56,7 @@ class KPilotDeviceLink; class RecordConduitBase : public ConduitAction { Q_OBJECT + TQ_OBJECT public: /** Constructor. The TQStringList @p a sets flags for the ConduitAction. */ diff --git a/lib/syncAction.cc b/lib/syncAction.cc index 3e29ad3..d0227f4 100644 --- a/lib/syncAction.cc +++ b/lib/syncAction.cc @@ -65,11 +65,11 @@ SyncAction::SyncAction(KPilotLink *p, } SyncAction::SyncAction(KPilotLink *p, - TQWidget * visibleparent, + TQWidget * visibletqparent, const char *name) : TQObject(p, name), fHandle(p), - fParent(visibleparent) + fParent(visibletqparent) { FUNCTIONSETUP; } @@ -101,7 +101,7 @@ SyncAction::~SyncAction() if (!r) { emit logError(i18n("The conduit %1 could not be executed.") - .arg(TQString::tqfromLatin1(name()))); + .tqarg(TQString::tqfromLatin1(name()))); delayDone(); } } @@ -217,11 +217,11 @@ TQString SyncAction::SyncMode::name() const if (isTest()) { - s.append(CSL1(" [%1]").arg(i18n("Test Sync"))); + s.append(CSL1(" [%1]").tqarg(i18n("Test Sync"))); } if (isLocal()) { - s.append(CSL1(" [%1]").arg(i18n("Local Sync"))); + s.append(CSL1(" [%1]").tqarg(i18n("Local Sync"))); } return s; } @@ -332,7 +332,7 @@ int SyncAction::questionYesNo(const TQString & text, TQMessageBox::Question, text, TQStringList(), - (key.isEmpty() ? TQString::null : i18n("&Do not ask again")), + (key.isEmpty() ? TQString() : i18n("&Do not ask again")), &checkboxReturn, 0); @@ -445,7 +445,7 @@ int SyncAction::questionYesNoCancel(const TQString & text, TQMessageBox::Question, text, TQStringList(), - (key.isEmpty() ? TQString::null : i18n("&Do not ask again")), + (key.isEmpty() ? TQString() : i18n("&Do not ask again")), &checkboxReturn, 0); #else diff --git a/lib/syncAction.h b/lib/syncAction.h index f91ab3c..5f493f4 100644 --- a/lib/syncAction.h +++ b/lib/syncAction.h @@ -47,19 +47,20 @@ class TQTimer; class KPilotUser; class SyncAction; -class KDE_EXPORT SyncAction : public QObject +class KDE_EXPORT SyncAction : public TQObject { Q_OBJECT + TQ_OBJECT public: SyncAction(KPilotLink *p, const char *name=0L); SyncAction(KPilotLink *p, - TQWidget *visibleparent, + TQWidget *visibletqparent, const char *name=0L); ~SyncAction(); - typedef enum { Error=-1 } Status; + typedef enum { Error=-1 } tqStatus; /** A syncaction has a status, which can be expressed as an * integer. Subclasses are expected to define their own status @@ -67,7 +68,7 @@ public: */ int status() const { - return fActionStatus; + return fActiontqStatus; } /** Return a human-readable representation of the status. */ virtual TQString statusString() const; @@ -155,7 +156,7 @@ public: protected: /** Connection to the device. @todo make private. */ KPilotLink *fHandle; - int fActionStatus; + int fActiontqStatus; /** Returns a pointer to the connection to the device. */ inline KPilotLink *deviceLink() const @@ -184,7 +185,7 @@ public: /** * This class encapsulates the different sync modes that * can be used, and enforces a little discipline in changing - * the mode and messing around in general. It tqreplaces a + * the mode and messing around in general. It replaces a * simple enum by not much more, but it makes things like * local test backups less likely to happen. * @@ -393,17 +394,17 @@ protected: * @p timeout Timeout, in seconds. */ int questionYesNo(const TQString &question , - const TQString &caption = TQString::null, - const TQString &key = TQString::null, + const TQString &caption = TQString(), + const TQString &key = TQString(), unsigned timeout = 20, - const TQString &yes = TQString::null, - const TQString &no = TQString::null ); + const TQString &yes = TQString(), + const TQString &no = TQString() ); int questionYesNoCancel(const TQString &question , - const TQString &caption = TQString::null, - const TQString &key = TQString::null, + const TQString &caption = TQString(), + const TQString &key = TQString(), unsigned timeout = 20, - const TQString &yes = TQString::null, - const TQString &no = TQString::null ) ; + const TQString &yes = TQString(), + const TQString &no = TQString() ) ; }; diff --git a/tests/exportdatebook.cc b/tests/exportdatebook.cc index d4cf8c5..18bbf34 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->setSyncStatus( KCal::Incidence::SYNCNONE ); + event->setSynctqStatus( KCal::Incidence::SYNCNONE ); calendar->addEvent(event); diff --git a/tests/mergecalendars.cc b/tests/mergecalendars.cc index 5e31c33..0d390aa 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").arg(korgfile); - TQString newfilesave = TQString("%1.updated").arg(newfile); + TQString korgsave = TQString("%1.updated").tqarg(korgfile); + TQString newfilesave = TQString("%1.updated").tqarg(newfile); DEBUGKPILOT << "Using korgfile: [" << korgfile << "]" << endl; @@ -154,7 +154,7 @@ int main(int argc, char **argv) << pilotId << "]" << endl; ev->setPilotId(pilotId); - ev->setSyncStatus(KCal::Incidence::SYNCMOD); + ev->setSynctqStatus(KCal::Incidence::SYNCMOD); ++numkorgpilotids; } diff --git a/tests/testaddress.cc b/tests/testaddress.cc index 5da0c44..9f9f44e 100644 --- a/tests/testaddress.cc +++ b/tests/testaddress.cc @@ -81,7 +81,7 @@ int main(int argc, char **argv) { DEBUGKPILOT << "# Record @" << (void *)r << " ID=" << r->id() << endl; PilotAddress a( r ); - DEBUGKPILOT << "# Text Representation:" << endl << a.getTextRepresentation(&appinfo,Qt::PlainText) << endl; + DEBUGKPILOT << "# Text Representation:" << endl << a.getTextRepresentation(&appinfo,TQt::PlainText) << endl; DEBUGKPILOT << "# Category#" << a.category() << endl; DEBUGKPILOT << "# Category Label " << appinfo.categoryName(a.category()) << endl; DEBUGKPILOT << "# ID " << a.id() << endl; diff --git a/tests/testcategories.cc b/tests/testcategories.cc index 674fa5b..a29a307 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)").arg(i).arg(cat); + TQString s = CSL1("(%1:%2)").tqarg(i).tqarg(cat); cats.append(s); } } diff --git a/tests/testdatebook.cc b/tests/testdatebook.cc index 8e6cc55..5cc0b7d 100644 --- a/tests/testdatebook.cc +++ b/tests/testdatebook.cc @@ -79,7 +79,7 @@ int main(int argc, char **argv) { DEBUGKPILOT << "# Record @" << (void *)r << " ID=" << r->id() << endl; PilotDateEntry a( r ); - DEBUGKPILOT << "# Text Representation:" << endl << a.getTextRepresentation(Qt::PlainText) << endl; + DEBUGKPILOT << "# Text Representation:" << endl << a.getTextRepresentation(TQt::PlainText) << endl; DEBUGKPILOT << "# Category#" << a.category() << endl; DEBUGKPILOT << "# Category Label " << appinfo.categoryName(a.category()) << endl; DEBUGKPILOT << "# ID " << a.id() << endl;