diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:53:50 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:53:50 +0000 |
| commit | 7be55ffa061c026e35e2d6a0effe1161ddb0d41f (patch) | |
| tree | 8474f9b444b2756228600050f07a7ff25de532b2 /kpilot/conduits | |
| parent | f587f20a6d09f1729dd0a8c1cd8ee0110aec7451 (diff) | |
| download | tdepim-7be55ffa061c026e35e2d6a0effe1161ddb0d41f.tar.gz tdepim-7be55ffa061c026e35e2d6a0effe1161ddb0d41f.zip | |
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1157655 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kpilot/conduits')
79 files changed, 970 insertions, 970 deletions
diff --git a/kpilot/conduits/abbrowserconduit/abbrowser-conduit.cc b/kpilot/conduits/abbrowserconduit/abbrowser-conduit.cc index bf038bb21..11e25f2dd 100644 --- a/kpilot/conduits/abbrowserconduit/abbrowser-conduit.cc +++ b/kpilot/conduits/abbrowserconduit/abbrowser-conduit.cc @@ -33,10 +33,10 @@ #include "options.h" -#include <qtimer.h> -#include <qtextcodec.h> -#include <qfile.h> -#include <qregexp.h> +#include <tqtimer.h> +#include <tqtextcodec.h> +#include <tqfile.h> +#include <tqregexp.h> #include <kabc/stdaddressbook.h> #include <kabc/resourcefile.h> @@ -110,7 +110,7 @@ using namespace KABC; *********************************************************************/ -AbbrowserConduit::AbbrowserConduit(KPilotLink * o, const char *n, const QStringList & a): +AbbrowserConduit::AbbrowserConduit(KPilotLink * o, const char *n, const TQStringList & a): ConduitAction(o, n, a), aBook(0L), fAddressAppInfo(0L), @@ -153,7 +153,7 @@ AbbrowserConduit::~AbbrowserConduit() /* Builds the map which links record ids to uid's of Addressee */ -void AbbrowserConduit::_mapContactsToPilot(QMap < recordid_t, QString > &idContactMap) +void AbbrowserConduit::_mapContactsToPilot(TQMap < recordid_t, TQString > &idContactMap) { FUNCTIONSETUP; @@ -163,7 +163,7 @@ void AbbrowserConduit::_mapContactsToPilot(QMap < recordid_t, QString > &idConta contactIter != aBook->end(); ++contactIter) { Addressee aContact = *contactIter; - QString recid = aContact.custom(KABCSync::appString, KABCSync::idString); + TQString recid = aContact.custom(KABCSync::appString, KABCSync::idString); if(!recid.isEmpty()) { recordid_t id = recid.toULong(); @@ -400,7 +400,7 @@ bool AbbrowserConduit::_saveAddressBook() else { KIO::NetAccess::removeTempFile(fABookFile); } - QFile backup(fABookFile + CSL1("~")); + TQFile backup(fABookFile + CSL1("~")); backup.remove(); } @@ -524,13 +524,13 @@ void AbbrowserConduit::showAddresses( // Local block { - QString dbpath = fLocalDatabase->dbPathName(); + TQString dbpath = fLocalDatabase->dbPathName(); DEBUGKPILOT << fname << ": Local database path " << dbpath << endl; } if ( syncMode().isTest() ) { - QTimer::singleShot(0, this, SLOT(slotTestRecord())); + TQTimer::singleShot(0, this, TQT_SLOT(slotTestRecord())); return true; } @@ -561,7 +561,7 @@ void AbbrowserConduit::showAddresses( allIds=fDatabase->idList(); } - QValueVector<int> v(4); + TQValueVector<int> v(4); v[0] = AbbrowserSettings::custom0(); v[1] = AbbrowserSettings::custom1(); v[2] = AbbrowserSettings::custom2(); @@ -580,7 +580,7 @@ void AbbrowserConduit::showAddresses( for this, and no longer purge the whole addressbook before the sync to prevent data loss in case of connection loss. */ - QTimer::singleShot(0, this, SLOT(slotPalmRecToPC())); + TQTimer::singleShot(0, this, TQT_SLOT(slotPalmRecToPC())); return true; } @@ -596,7 +596,7 @@ void AbbrowserConduit::slotPalmRecToPC() { DEBUGKPILOT << fname << ": Done; change to PCtoHH phase." << endl; abiter = aBook->begin(); - QTimer::singleShot(0, this, SLOT(slotPCRecToPalm())); + TQTimer::singleShot(0, this, TQT_SLOT(slotPCRecToPalm())); return; } @@ -614,7 +614,7 @@ void AbbrowserConduit::slotPalmRecToPC() if(!palmRec) { abiter = aBook->begin(); - QTimer::singleShot(0, this, SLOT(slotPCRecToPalm())); + TQTimer::singleShot(0, this, TQT_SLOT(slotPCRecToPalm())); return; } @@ -622,7 +622,7 @@ void AbbrowserConduit::slotPalmRecToPC() if(syncedIds.contains(palmRec->id())) { KPILOT_DELETE(palmRec); - QTimer::singleShot(0, this, SLOT(slotPalmRecToPC())); + TQTimer::singleShot(0, this, TQT_SLOT(slotPalmRecToPC())); return; } @@ -650,7 +650,7 @@ void AbbrowserConduit::slotPalmRecToPC() KPILOT_DELETE(palmRec); KPILOT_DELETE(backupRec); - QTimer::singleShot(0, this, SLOT(slotPalmRecToPC())); + TQTimer::singleShot(0, this, TQT_SLOT(slotPalmRecToPC())); } @@ -664,7 +664,7 @@ void AbbrowserConduit::slotPCRecToPalm() { DEBUGKPILOT << fname << ": Done; change to delete records." << endl; pilotindex = 0; - QTimer::singleShot(0, this, SLOT(slotDeletedRecord())); + TQTimer::singleShot(0, this, TQT_SLOT(slotDeletedRecord())); return; } @@ -678,12 +678,12 @@ void AbbrowserConduit::slotPCRecToPalm() { DEBUGKPILOT << fname << ": address with id " << ad.uid() << " marked archived, so don't sync." << endl; - QTimer::singleShot(0, this, SLOT(slotPCRecToPalm())); + TQTimer::singleShot(0, this, TQT_SLOT(slotPCRecToPalm())); return; } - QString recID(ad.custom(KABCSync::appString, KABCSync::idString)); + TQString recID(ad.custom(KABCSync::appString, KABCSync::idString)); bool ok; recordid_t rid = recID.toLong(&ok); if (recID.isEmpty() || !ok || !rid) @@ -691,7 +691,7 @@ void AbbrowserConduit::slotPCRecToPalm() DEBUGKPILOT << fname << ": This is a new record." << endl; // it's a new item(no record ID and not inserted by the Palm -> PC sync), so add it syncAddressee(ad, 0L, 0L); - QTimer::singleShot(0, this, SLOT(slotPCRecToPalm())); + TQTimer::singleShot(0, this, TQT_SLOT(slotPCRecToPalm())); return; } @@ -699,7 +699,7 @@ void AbbrowserConduit::slotPCRecToPalm() if (syncedIds.contains(rid)) { DEBUGKPILOT << ": address with id " << rid << " already synced." << endl; - QTimer::singleShot(0, this, SLOT(slotPCRecToPalm())); + TQTimer::singleShot(0, this, TQT_SLOT(slotPCRecToPalm())); return; } @@ -742,7 +742,7 @@ void AbbrowserConduit::slotPCRecToPalm() syncedIds.append(rid); // done with the sync process, go on with the next one: - QTimer::singleShot(0, this, SLOT(slotPCRecToPalm())); + TQTimer::singleShot(0, this, TQT_SLOT(slotPCRecToPalm())); } @@ -755,13 +755,13 @@ void AbbrowserConduit::slotDeletedRecord() if(!backupRec || isFirstSync() ) { KPILOT_DELETE(backupRec); - QTimer::singleShot(0, this, SLOT(slotDeleteUnsyncedPCRecords())); + TQTimer::singleShot(0, this, TQT_SLOT(slotDeleteUnsyncedPCRecords())); return; } recordid_t id = backupRec->id(); - QString uid = addresseeMap[id]; + TQString uid = addresseeMap[id]; Addressee e = aBook->findByUid(uid); DEBUGKPILOT << fname << ": now looking at palm id: [" @@ -796,7 +796,7 @@ void AbbrowserConduit::slotDeletedRecord() KPILOT_DELETE(palmRec); KPILOT_DELETE(backupAddr); KPILOT_DELETE(backupRec); - QTimer::singleShot(0, this, SLOT(slotDeletedRecord())); + TQTimer::singleShot(0, this, TQT_SLOT(slotDeletedRecord())); } @@ -806,9 +806,9 @@ void AbbrowserConduit::slotDeleteUnsyncedPCRecords() FUNCTIONSETUP; if ( syncMode()==SyncMode::eCopyHHToPC ) { - QStringList uids; + TQStringList uids; RecordIDList::iterator it; - QString uid; + TQString uid; for ( it = syncedIds.begin(); it != syncedIds.end(); ++it) { uid=addresseeMap[*it]; @@ -829,7 +829,7 @@ void AbbrowserConduit::slotDeleteUnsyncedPCRecords() } } } - QTimer::singleShot(0, this, SLOT(slotDeleteUnsyncedHHRecords())); + TQTimer::singleShot(0, this, TQT_SLOT(slotDeleteUnsyncedHHRecords())); } @@ -852,7 +852,7 @@ void AbbrowserConduit::slotDeleteUnsyncedHHRecords() } } } - QTimer::singleShot(0, this, SLOT(slotCleanup())); + TQTimer::singleShot(0, this, TQT_SLOT(slotCleanup())); } @@ -874,7 +874,7 @@ void AbbrowserConduit::slotCleanup() } // Write out the sync maps - QString syncFile = fLocalDatabase->dbPathName() + CSL1(".sync"); + TQString syncFile = fLocalDatabase->dbPathName() + CSL1(".sync"); DEBUGKPILOT << fname << ": Writing sync map to " << syncFile << endl; KSaveFile map( syncFile ); if ( map.status() == 0 ) @@ -1215,7 +1215,7 @@ bool AbbrowserConduit::_savePalmAddr(PilotAddress *palmAddr, Addressee &pcAddr) abId = pcAddr.custom(KABCSync::appString, KABCSync::idString).toUInt(); if(abId != pilotId) { - pcAddr.insertCustom(KABCSync::appString, KABCSync::idString, QString::number(pilotId)); + pcAddr.insertCustom(KABCSync::appString, KABCSync::idString, TQString::number(pilotId)); return true; } @@ -1230,16 +1230,16 @@ bool AbbrowserConduit::_savePCAddr(Addressee &pcAddr, PilotAddress*, FUNCTIONSETUP; DEBUGKPILOT<<"Before _savePCAddr, pcAddr.custom="<<pcAddr.custom(KABCSync::appString, KABCSync::idString)<<endl; - QString pilotId = pcAddr.custom(KABCSync::appString, KABCSync::idString); + TQString pilotId = pcAddr.custom(KABCSync::appString, KABCSync::idString); long pilotIdL = pilotId.toLong(); if(!pilotId.isEmpty()) { // because we maintain a mapping between pilotId -> kabc uid, whenever we add // a new relationship, we have to remove any old mapping that would tie a different // pilot id -> this kabc uid - QMap < recordid_t, QString>::iterator it; + TQMap < recordid_t, TQString>::iterator it; for ( it = addresseeMap.begin(); it != addresseeMap.end(); ++it ) { - QString kabcUid = it.data(); + TQString kabcUid = it.data(); if (kabcUid == pcAddr.uid()) { addresseeMap.remove(it); break; @@ -1317,8 +1317,8 @@ bool AbbrowserConduit::_equal(const PilotAddress *piAddress, const Addressee &ab { // Check that the name of the category of the HH record // is one matching the PC record. - QString addressCategoryLabel = fAddressAppInfo->categoryName(piAddress->category()); - QString cat = KABCSync::bestMatchedCategoryName(abEntry.categories(), + TQString addressCategoryLabel = fAddressAppInfo->categoryName(piAddress->category()); + TQString cat = KABCSync::bestMatchedCategoryName(abEntry.categories(), *fAddressAppInfo, piAddress->category()); if(!_equal(cat, addressCategoryLabel)) { @@ -1330,22 +1330,22 @@ bool AbbrowserConduit::_equal(const PilotAddress *piAddress, const Addressee &ab if (flags & eqFlagsPhones) { // first, look for missing e-mail addresses on either side - QStringList abEmails(abEntry.emails()); - QStringList piEmails(piAddress->getEmails()); + TQStringList abEmails(abEntry.emails()); + TQStringList piEmails(piAddress->getEmails()); if (abEmails.count() != piEmails.count()) { DEBUGKPILOT << fname << ": email count not equal" << endl; return false; } - for (QStringList::Iterator it = abEmails.begin(); it != abEmails.end(); it++) { + for (TQStringList::Iterator it = abEmails.begin(); it != abEmails.end(); it++) { if (!piEmails.contains(*it)) { DEBUGKPILOT << fname << ": pilot e-mail missing" << endl; return false; } } - for (QStringList::Iterator it = piEmails.begin(); it != piEmails.end(); it++) { + for (TQStringList::Iterator it = piEmails.begin(); it != piEmails.end(); it++) { if (!abEmails.contains(*it)) { DEBUGKPILOT << fname << ": kabc e-mail missing" << endl; @@ -1483,8 +1483,8 @@ bool AbbrowserConduit::_equal(const PilotAddress *piAddress, const Addressee &ab @pc, @backup, @palm ... entries of the according databases @returns string of the merged entries. */ -QString AbbrowserConduit::_smartMergeString(const QString &pc, const QString & backup, - const QString & palm, ConflictResolution confRes) +TQString AbbrowserConduit::_smartMergeString(const TQString &pc, const TQString & backup, + const TQString & palm, ConflictResolution confRes) { FUNCTIONSETUP; @@ -1493,7 +1493,7 @@ QString AbbrowserConduit::_smartMergeString(const QString &pc, const QString & b // If this is a first sync, we don't have a backup record, so if(isFirstSync() || backup.isEmpty()) { - if (pc.isEmpty() && palm.isEmpty() ) return QString::null; + if (pc.isEmpty() && palm.isEmpty() ) return TQString::null; if(pc.isEmpty()) return palm; if(palm.isEmpty()) return pc; } else { @@ -1512,7 +1512,7 @@ QString AbbrowserConduit::_smartMergeString(const QString &pc, const QString & b case SyncAction::ePreviousSyncOverrides: return backup; break; default: break; } - return QString::null; + return TQString::null; } @@ -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):(QString::null), \ - (palmAddr)?(palmAddr->palmfield):(QString::null), \ - (backupAddr)?(backupAddr->palmfield):(QString::null) )) + (!pcAddr.isEmpty())?(abfield):(TQString::null), \ + (palmAddr)?(palmAddr->palmfield):(TQString::null), \ + (backupAddr)?(backupAddr->palmfield):(TQString::null) )) #define appendAddr(desc, abfield, palmfield) \ appendGen(desc, abfield, getField(palmfield)) #define appendGenPhone(desc, abfield, palmfield) \ @@ -1572,12 +1572,12 @@ bool AbbrowserConduit::_buildResolutionTable(ResolutionTable*tab, const Addresse appendAddr(i18n("Postal code"), abAddress.postalCode(), entryZip); appendAddr(i18n("Country"), abAddress.country(), entryCountry); - QString palmAddrCategoryLabel; + TQString palmAddrCategoryLabel; if (palmAddr) { palmAddrCategoryLabel = fAddressAppInfo->categoryName(palmAddr->category()); } - QString backupAddrCategoryLabel; + TQString backupAddrCategoryLabel; if (backupAddr) { backupAddrCategoryLabel = fAddressAppInfo->categoryName(backupAddr->category()); @@ -1588,7 +1588,7 @@ bool AbbrowserConduit::_buildResolutionTable(ResolutionTable*tab, const Addresse tab->fExistItems, !pcAddr.isEmpty() ? KABCSync::bestMatchedCategoryName(pcAddr.categories(), *fAddressAppInfo, category) : - QString::null, + TQString::null, palmAddrCategoryLabel, backupAddrCategoryLabel)); #undef appendGen @@ -1601,7 +1601,7 @@ bool AbbrowserConduit::_buildResolutionTable(ResolutionTable*tab, const Addresse /// This function just sets the phone number of type "type" to "phone" -static inline void setPhoneNumber(Addressee &abEntry, int type, const QString &nr) +static inline void setPhoneNumber(Addressee &abEntry, int type, const TQString &nr) { PhoneNumber phone = abEntry.phoneNumber(type); phone.setNumber(nr); @@ -1746,7 +1746,7 @@ bool AbbrowserConduit::_smartMergeAddressee(Addressee &pcAddr, if (!mergeOk) { - QString dlgText; + TQString dlgText; if (!palmAddr) { dlgText=i18n("The following address entry was changed, but does no longer exist on the handheld. Please resolve this conflict:"); @@ -1839,7 +1839,7 @@ Addressee AbbrowserConduit::_findMatch(const PilotAddress & pilotAddress) const // first, use the pilotID to UID map to find the appropriate record if( !isFirstSync() && (pilotAddress.id() > 0) ) { - QString id(addresseeMap[pilotAddress.id()]); + TQString id(addresseeMap[pilotAddress.id()]); DEBUGKPILOT << fname << ": PilotRecord has id " << pilotAddress.id() << ", mapped to " << id << endl; if(!id.isEmpty()) { @@ -1852,7 +1852,7 @@ Addressee AbbrowserConduit::_findMatch(const PilotAddress & pilotAddress) const for(AddressBook::Iterator iter = aBook->begin(); iter != aBook->end(); ++iter) { Addressee abEntry = *iter; - QString recID(abEntry.custom(KABCSync::appString, KABCSync::idString)); + TQString recID(abEntry.custom(KABCSync::appString, KABCSync::idString)); bool ok; if (!recID.isEmpty() ) { @@ -1893,5 +1893,5 @@ void AbbrowserConduit::slotTestRecord() // Schedule more work. ++pilotindex; - QTimer::singleShot(0, this, SLOT(slotTestRecord())); + TQTimer::singleShot(0, this, TQT_SLOT(slotTestRecord())); } diff --git a/kpilot/conduits/abbrowserconduit/abbrowser-conduit.h b/kpilot/conduits/abbrowserconduit/abbrowser-conduit.h index 484f61292..22e94469a 100644 --- a/kpilot/conduits/abbrowserconduit/abbrowser-conduit.h +++ b/kpilot/conduits/abbrowserconduit/abbrowser-conduit.h @@ -49,14 +49,14 @@ class Ticket; using namespace KABC; -typedef QValueList<recordid_t> RecordIDList; +typedef TQValueList<recordid_t> RecordIDList; class AbbrowserConduit : public ConduitAction { Q_OBJECT public: AbbrowserConduit(KPilotLink *o,const char *n = 0L, - const QStringList &a = QStringList() ); + const TQStringList &a = TQStringList() ); virtual ~AbbrowserConduit(); /********************************************************************* @@ -97,7 +97,7 @@ private: /* Given a list of contacts, creates the pilot id to contact key map * and a list of new contacts in O(n) time (single pass) */ - void _mapContactsToPilot( QMap < recordid_t, QString> &idContactMap); + void _mapContactsToPilot( TQMap < recordid_t, TQString> &idContactMap); /* Do the preperations before doSync or doBackup. * Load contacts, set the pilot */ bool _prepare(); @@ -141,7 +141,7 @@ private: /********************************************************************* C O P Y R E C O R D S *********************************************************************/ - inline bool _equal(const QString & str1, const QString & str2) const + inline bool _equal(const TQString & str1, const TQString & str2) const { return (str1.isEmpty() && str2.isEmpty()) || (str1 == str2); } ; @@ -168,8 +168,8 @@ private: * @pc, @backup, @palm ... entries of the according databases * @returns string of the merged entries. */ - QString _smartMergeString(const QString &pc, const QString & backup, - const QString & palm, ConflictResolution confRes); + TQString _smartMergeString(const TQString &pc, const TQString & backup, + const TQString & palm, ConflictResolution confRes); bool _buildResolutionTable(ResolutionTable*tab, const Addressee &pcAddr, PilotAddress *backupAddr, PilotAddress *palmAddr); bool _applyResolutionTable(ResolutionTable*tab, Addressee &pcAddr, @@ -200,9 +200,9 @@ private: int pilotindex; bool abChanged; /** addresseeMap maps record ids to IDs of Addressees. This is used to speed up searching the local addressbook */ - QMap < recordid_t, QString> addresseeMap; + TQMap < recordid_t, TQString> addresseeMap; RecordIDList syncedIds, allIds; - QString fABookFile; + TQString fABookFile; AddressBook::Iterator abiter; /** For a local file resource, we need to obtain a saveTicket * when opening the abook, just in case we want to modify it diff --git a/kpilot/conduits/abbrowserconduit/abbrowser-setup.cc b/kpilot/conduits/abbrowserconduit/abbrowser-setup.cc index 4a2aa4215..f4d80d2ce 100644 --- a/kpilot/conduits/abbrowserconduit/abbrowser-setup.cc +++ b/kpilot/conduits/abbrowserconduit/abbrowser-setup.cc @@ -29,9 +29,9 @@ #include "options.h" -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qbuttongroup.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqbuttongroup.h> #include <kurlrequester.h> #include <kaboutdata.h> @@ -62,7 +62,7 @@ static KAboutData *createAbout() return fAbout; } -AbbrowserWidgetSetup::AbbrowserWidgetSetup(QWidget *w, const char *n) : +AbbrowserWidgetSetup::AbbrowserWidgetSetup(TQWidget *w, const char *n) : ConduitConfigBase(w,n), fConfigWidget(new AbbrowserWidget(w)) { @@ -73,20 +73,20 @@ AbbrowserWidgetSetup::AbbrowserWidgetSetup(QWidget *w, const char *n) : ConduitConfigBase::addAboutPage(fConfigWidget->tabWidget,fAbout); fWidget=fConfigWidget; fConfigWidget->fAbookFile->setMode(KFile::File); -#define CM(a,b) connect(fConfigWidget->a,b,this,SLOT(modified())); - CM(fSyncDestination,SIGNAL(clicked(int))); - CM(fAbookFile,SIGNAL(textChanged(const QString &))); - CM(fArchive,SIGNAL(toggled(bool))); - CM(fConflictResolution,SIGNAL(activated(int))); - CM(fOtherPhone,SIGNAL(activated(int))); - CM(fAddress,SIGNAL(activated(int))); - CM(fFax,SIGNAL(activated(int))); - CM(fCustom0,SIGNAL(activated(int))); - CM(fCustom1,SIGNAL(activated(int))); - CM(fCustom2,SIGNAL(activated(int))); - CM(fCustom3,SIGNAL(activated(int))); - CM(fCustomDate, SIGNAL(activated(int))); - CM(fCustomDate, SIGNAL(textChanged(const QString&))); +#define CM(a,b) connect(fConfigWidget->a,b,this,TQT_SLOT(modified())); + CM(fSyncDestination,TQT_SIGNAL(clicked(int))); + CM(fAbookFile,TQT_SIGNAL(textChanged(const TQString &))); + CM(fArchive,TQT_SIGNAL(toggled(bool))); + CM(fConflictResolution,TQT_SIGNAL(activated(int))); + CM(fOtherPhone,TQT_SIGNAL(activated(int))); + CM(fAddress,TQT_SIGNAL(activated(int))); + CM(fFax,TQT_SIGNAL(activated(int))); + CM(fCustom0,TQT_SIGNAL(activated(int))); + CM(fCustom1,TQT_SIGNAL(activated(int))); + CM(fCustom2,TQT_SIGNAL(activated(int))); + CM(fCustom3,TQT_SIGNAL(activated(int))); + CM(fCustomDate, TQT_SIGNAL(activated(int))); + CM(fCustomDate, TQT_SIGNAL(textChanged(const TQString&))); #undef CM } @@ -99,7 +99,7 @@ AbbrowserWidgetSetup::~AbbrowserWidgetSetup() { FUNCTIONSETUP; - QButtonGroup*grp=fConfigWidget->fSyncDestination; + TQButtonGroup*grp=fConfigWidget->fSyncDestination; AbbrowserSettings::setAddressbookType(grp->id(grp->selected())); AbbrowserSettings::setFileName(fConfigWidget->fAbookFile->url()); AbbrowserSettings::setArchiveDeleted(fConfigWidget->fArchive->isChecked()); @@ -132,7 +132,7 @@ AbbrowserWidgetSetup::~AbbrowserWidgetSetup() #endif int fmtindex=fConfigWidget->fCustomDate->currentItem(); AbbrowserSettings::setCustomDateFormat( - (fmtindex==0)?(QString::null):fConfigWidget->fCustomDate->currentText() ); + (fmtindex==0)?(TQString::null):fConfigWidget->fCustomDate->currentText() ); AbbrowserSettings::self()->writeConfig(); unmodified(); @@ -175,7 +175,7 @@ AbbrowserWidgetSetup::~AbbrowserWidgetSetup() fConfigWidget->fCustom1->setCurrentItem(AbbrowserSettings::custom1()); fConfigWidget->fCustom2->setCurrentItem(AbbrowserSettings::custom2()); fConfigWidget->fCustom3->setCurrentItem(AbbrowserSettings::custom3()); - QString datefmt=AbbrowserSettings::customDateFormat(); + TQString datefmt=AbbrowserSettings::customDateFormat(); if (datefmt.isEmpty()) { fConfigWidget->fCustomDate->setCurrentItem(0); @@ -188,7 +188,7 @@ AbbrowserWidgetSetup::~AbbrowserWidgetSetup() unmodified(); } -/* static */ ConduitConfigBase *AbbrowserWidgetSetup::create(QWidget *w, const char *n) +/* static */ ConduitConfigBase *AbbrowserWidgetSetup::create(TQWidget *w, const char *n) { return new AbbrowserWidgetSetup(w,n); } diff --git a/kpilot/conduits/abbrowserconduit/abbrowser-setup.h b/kpilot/conduits/abbrowserconduit/abbrowser-setup.h index 71981dc09..47eff1cf1 100644 --- a/kpilot/conduits/abbrowserconduit/abbrowser-setup.h +++ b/kpilot/conduits/abbrowserconduit/abbrowser-setup.h @@ -38,11 +38,11 @@ class KAboutData; class AbbrowserWidgetSetup : public ConduitConfigBase { public: - AbbrowserWidgetSetup(QWidget *,const char *); + AbbrowserWidgetSetup(TQWidget *,const char *); virtual ~AbbrowserWidgetSetup(); virtual void load(); virtual void commit(); - static ConduitConfigBase *create(QWidget *,const char *); + static ConduitConfigBase *create(TQWidget *,const char *); private: AbbrowserWidget *fConfigWidget; KAboutData *fAbout; diff --git a/kpilot/conduits/abbrowserconduit/kabcRecord.cc b/kpilot/conduits/abbrowserconduit/kabcRecord.cc index b5d68121a..9b49a2cad 100644 --- a/kpilot/conduits/abbrowserconduit/kabcRecord.cc +++ b/kpilot/conduits/abbrowserconduit/kabcRecord.cc @@ -33,7 +33,7 @@ #include "options.h" -#include <qregexp.h> +#include <tqregexp.h> #include <kglobal.h> #include <kabc/addressee.h> @@ -79,7 +79,7 @@ KABC::PhoneNumber::List KABCSync::getPhoneNumbers(const PilotAddress &a) FUNCTIONSETUP; KABC::PhoneNumber::List list; - QString test; + TQString test; PhoneSlot shownPhone = a.getShownPhone(); @@ -136,7 +136,7 @@ void KABCSync::setPhoneNumbers(const PilotAddressInfo &info, const KABC::PhoneNumber::List &list) { FUNCTIONSETUP; - QString test; + TQString test; // clear all phone numbers (not e-mails) first for ( PhoneSlot i = PhoneSlot::begin(); i.isValid() ; ++i ) @@ -144,7 +144,7 @@ void KABCSync::setPhoneNumbers(const PilotAddressInfo &info, PilotAddressInfo::EPhoneType ind = a.getPhoneType( i ); if (ind != PilotAddressInfo::eEmail) { - a.setField(i, QString()); + a.setField(i, TQString()); } } @@ -199,7 +199,7 @@ void KABCSync::setPhoneNumbers(const PilotAddressInfo &info, // after setting the numbers, make sure that something sensible is set as the // shownPhone on the Pilot if nothing is yet... - QString pref = a.getField(a.getShownPhone()); + TQString pref = a.getField(a.getShownPhone()); if (!a.getShownPhone().isValid() || pref.isEmpty()) { DEBUGKPILOT << fname << ": Pilot's showPhone: [" @@ -222,7 +222,7 @@ void KABCSync::setPhoneNumbers(const PilotAddressInfo &info, } } -unsigned int KABCSync::bestMatchedCategory(const QStringList &pccategories, +unsigned int KABCSync::bestMatchedCategory(const TQStringList &pccategories, const PilotAddressInfo &info, unsigned int hhcategory) { @@ -243,7 +243,7 @@ unsigned int KABCSync::bestMatchedCategory(const QStringList &pccategories, // Look for the first category from the list which is available on // the handheld as well. - for(QStringList::ConstIterator it = pccategories.begin(); it != pccategories.end(); ++it) + for(TQStringList::ConstIterator it = pccategories.begin(); it != pccategories.end(); ++it) { // Do not map unknown to unfiled when looking for category int c = info.findCategory( *it, false ); @@ -258,7 +258,7 @@ unsigned int KABCSync::bestMatchedCategory(const QStringList &pccategories, return Pilot::Unfiled; } -void KABCSync::setCategory(KABC::Addressee & abEntry, const QString &cat) +void KABCSync::setCategory(KABC::Addressee & abEntry, const TQString &cat) { if ( (!cat.isEmpty())) { @@ -267,24 +267,24 @@ void KABCSync::setCategory(KABC::Addressee & abEntry, const QString &cat) } -QString KABCSync::getFieldForHHCustom( +TQString KABCSync::getFieldForHHCustom( const unsigned int index, const KABC::Addressee &abEntry, const KABCSync::Settings &settings) { FUNCTIONSETUPL(4); - QString retval; + TQString retval; if (index>3) { WARNINGKPILOT << "Bad index number " << index << endl; - retval = QString(); + retval = TQString(); } if (settings.customMapping().count() != 4) { WARNINGKPILOT << "Mapping does not have 4 elements." << index << endl; - retval = QString(); + retval = TQString(); } switch (settings.custom(index)) @@ -296,9 +296,9 @@ QString KABCSync::getFieldForHHCustom( } else { - QString tmpfmt(KGlobal::locale()->dateFormat()); + TQString tmpfmt(KGlobal::locale()->dateFormat()); KGlobal::locale()->setDateFormat(settings.dateFormat()); - QString ret(KGlobal::locale()->formatDate(abEntry.birthday().date())); + TQString ret(KGlobal::locale()->formatDate(abEntry.birthday().date())); KGlobal::locale()->setDateFormat(tmpfmt); retval = ret; } @@ -311,7 +311,7 @@ QString KABCSync::getFieldForHHCustom( break; case eCustomField: default: - retval = abEntry.custom(appString, CSL1("CUSTOM")+QString::number(index)); + retval = abEntry.custom(appString, CSL1("CUSTOM")+TQString::number(index)); break; } @@ -321,7 +321,7 @@ QString KABCSync::getFieldForHHCustom( void KABCSync::setFieldFromHHCustom( const unsigned int index, KABC::Addressee &abEntry, - const QString &value, + const TQString &value, const KABCSync::Settings &settings) { FUNCTIONSETUPL(4); @@ -341,7 +341,7 @@ void KABCSync::setFieldFromHHCustom( { case eCustomBirthdate: { - QDate bdate; + TQDate bdate; bool ok=false; if (settings.dateFormat().isEmpty()) { @@ -356,8 +356,8 @@ void KABCSync::setFieldFromHHCustom( if (!ok) { - QString format = KGlobal::locale()->dateFormatShort(); - QRegExp re(CSL1("%[yY][^%]*")); + TQString format = KGlobal::locale()->dateFormatShort(); + TQRegExp re(CSL1("%[yY][^%]*")); format.remove(re); // Remove references to year and following punctuation bdate = KGlobal::locale()->readDate(value, format, &ok); } @@ -382,7 +382,7 @@ void KABCSync::setFieldFromHHCustom( break; case eCustomField: default: - abEntry.insertCustom(appString, CSL1("CUSTOM")+QString::number(index), value); + abEntry.insertCustom(appString, CSL1("CUSTOM")+TQString::number(index), value); break; } } @@ -416,7 +416,7 @@ KABC::Address KABCSync::getAddress(const KABC::Addressee &abEntry, const KABCSyn } -QString KABCSync::getFieldForHHOtherPhone(const KABC::Addressee & abEntry, const KABCSync::Settings &s) +TQString KABCSync::getFieldForHHOtherPhone(const KABC::Addressee & abEntry, const KABCSync::Settings &s) { switch(s.fieldForOtherPhone()) { @@ -437,11 +437,11 @@ QString KABCSync::getFieldForHHOtherPhone(const KABC::Addressee & abEntry, const case eTTYTTDPhone: return abEntry.phoneNumber(KABC::PhoneNumber::Pcs).number(); default: - return QString::null; + return TQString::null; } } -void KABCSync::setFieldFromHHOtherPhone(KABC::Addressee & abEntry, const QString &nr, const KABCSync::Settings &s) +void KABCSync::setFieldFromHHOtherPhone(KABC::Addressee & abEntry, const TQString &nr, const KABCSync::Settings &s) { int phoneType = 0; switch (s.fieldForOtherPhone()) @@ -496,13 +496,13 @@ void KABCSync::setAddress(PilotAddress &toPilotAddr, bool KABCSync::isArchived(const KABC::Addressee &addr) { - return addr.custom(KABCSync::appString, KABCSync::flagString) == QString::number(SYNCDEL); + return addr.custom(KABCSync::appString, KABCSync::flagString) == TQString::number(SYNCDEL); } void KABCSync::makeArchived(KABC::Addressee &addr) { FUNCTIONSETUP; - addr.insertCustom(KABCSync::appString, KABCSync::flagString, QString::number(SYNCDEL)); + addr.insertCustom(KABCSync::appString, KABCSync::flagString, TQString::number(SYNCDEL)); addr.removeCustom(KABCSync::appString, KABCSync::idString); } @@ -536,7 +536,7 @@ void KABCSync::copy(PilotAddress &toPilotAddr, // Other field is an oddball and if the user has more than one field set // as "Other" then only one will be carried over. - QString oth = KABCSync::getFieldForHHOtherPhone(fromAbEntry,syncSettings); + TQString oth = KABCSync::getFieldForHHOtherPhone(fromAbEntry,syncSettings); DEBUGKPILOT << fname << ": putting: ["<<oth<<"] into Palm's other"<<endl; toPilotAddr.setPhoneField(PilotAddressInfo::eOther, oth, PilotAddress::Replace); @@ -650,7 +650,7 @@ void KABCSync::copy(KABC::Addressee &toAbEntry, // pilot id may be zero(since it could be new) but couldn't hurt // to even assign it to zero; let's us know what state the // toAbEntry is in - toAbEntry.insertCustom(KABCSync::appString, KABCSync::idString, QString::number(fromPiAddr.id())); + toAbEntry.insertCustom(KABCSync::appString, KABCSync::idString, TQString::number(fromPiAddr.id())); KABCSync::setCategory(toAbEntry, appInfo.categoryName(fromPiAddr.category())); diff --git a/kpilot/conduits/abbrowserconduit/kabcRecord.h b/kpilot/conduits/abbrowserconduit/kabcRecord.h index 13a3e2694..f27f0b1a2 100644 --- a/kpilot/conduits/abbrowserconduit/kabcRecord.h +++ b/kpilot/conduits/abbrowserconduit/kabcRecord.h @@ -33,7 +33,7 @@ ** Bug reports and questions can be sent to kde-pim@kde.org. */ -#include <qvaluevector.h> +#include <tqvaluevector.h> #include <kabc/phonenumber.h> @@ -71,20 +71,20 @@ namespace KABCSync { public: Settings(); - QString dateFormat() const + TQString dateFormat() const { return fDateFormat; } - void setDateFormat(const QString& s) + void setDateFormat(const TQString& s) { fDateFormat = s; } - const QValueVector<int> &customMapping() const + const TQValueVector<int> &customMapping() const { return fCustomMapping; } - void setCustomMapping(const QValueVector<int> &v) + void setCustomMapping(const TQValueVector<int> &v) { if (v.count()==4) { @@ -130,8 +130,8 @@ namespace KABCSync fFaxTypeOnPC = v; } private: - QString fDateFormat; - QValueVector<int> fCustomMapping; + TQString fDateFormat; + TQValueVector<int> fCustomMapping; int fOtherPhone; bool fPreferHome; int fFaxTypeOnPC; @@ -165,12 +165,12 @@ namespace KABCSync * @return Category index that best matches. * @return Pilot::Unfiled if no best match. */ - unsigned int bestMatchedCategory(const QStringList &categorynames, + unsigned int bestMatchedCategory(const TQStringList &categorynames, const PilotAddressInfo &info, unsigned int category); /** As above, but return the name of the category. */ - inline QString bestMatchedCategoryName(const QStringList &categorynames, + inline TQString bestMatchedCategoryName(const TQStringList &categorynames, const PilotAddressInfo &info, unsigned int category) { @@ -181,14 +181,14 @@ namespace KABCSync /** Give the addressee @p abEntry the category @p cat (leaving * existing category assignments intact). */ - void setCategory(KABC::Addressee &abEntry, const QString &cat); + void setCategory(KABC::Addressee &abEntry, const TQString &cat); /* These are string identifiers used for custom properties in the addressees, * used to store KPilot-specific settings. */ - const QString appString=CSL1("KPILOT"); ///< Identifier for the application - const QString flagString=CSL1("Flag"); ///< Flags: synced or not - const QString idString=CSL1("RecordID"); ///< Record ID on HH for this addressee + const TQString appString=CSL1("KPILOT"); ///< Identifier for the application + const TQString flagString=CSL1("Flag"); ///< Flags: synced or not + const TQString idString=CSL1("RecordID"); ///< Record ID on HH for this addressee /** Get the string value for HH custom field @p index (0..3) from the addressee @@ -199,9 +199,9 @@ namespace KABCSync * string @p dateFormat. If this is empty, use the locale setting. * * @return String value for HH custom field @p index - * @return Null QString on error (is also a valid return value) + * @return Null TQString on error (is also a valid return value) */ - QString getFieldForHHCustom( + TQString getFieldForHHCustom( unsigned int index, const KABC::Addressee &abEntry, const Settings &settings); @@ -215,7 +215,7 @@ namespace KABCSync void setFieldFromHHCustom( const unsigned int index, KABC::Addressee &abEntry, - const QString &value, + const TQString &value, const Settings &settings); /** The HH has a phone type "other" which may be mapped to any one of @@ -223,7 +223,7 @@ namespace KABCSync * * @note @p mappingForOther should come from AbbrowserSettings::pilotOther() */ - QString getFieldForHHOtherPhone(const KABC::Addressee &abEntry, const Settings &s); + TQString getFieldForHHOtherPhone(const KABC::Addressee &abEntry, const Settings &s); /** The HH has a phone type "other" which may be mapped to any one * of several PC side phone numbers. Store the number @p nr in the @@ -231,7 +231,7 @@ namespace KABCSync * * @note @p mappingForOther should come from AbbrowserSettings::pilotOther() */ - void setFieldFromHHOtherPhone(KABC::Addressee &abEntry, const QString &nr, const Settings &s); + void setFieldFromHHOtherPhone(KABC::Addressee &abEntry, const TQString &nr, const Settings &s); /** Returns the address portion of an addressee. Since the HH can only store * one address, we return the preferred address (if the Addressee @p abEntry diff --git a/kpilot/conduits/abbrowserconduit/resolutionDialog.cc b/kpilot/conduits/abbrowserconduit/resolutionDialog.cc index 2749074f8..aa8e2f148 100644 --- a/kpilot/conduits/abbrowserconduit/resolutionDialog.cc +++ b/kpilot/conduits/abbrowserconduit/resolutionDialog.cc @@ -28,11 +28,11 @@ #include "options.h" -#include <qtimer.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qlistview.h> -#include <qregexp.h> +#include <tqtimer.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqlistview.h> +#include <tqregexp.h> #include "resolutionTable.h" #include "resolutionDialog_base.h" @@ -46,16 +46,16 @@ * activated (stateChange), it sets the text of its parent (which is the * controller, which is an instance of ResolutionCheckListItem, too). **/ -class ResolutionCheckListItem : QCheckListItem { +class ResolutionCheckListItem : TQCheckListItem { public: ResolutionCheckListItem(ResolutionItem*it, ResolutionTable*tb, - QListView*parent); - ResolutionCheckListItem(QString header, QString text, + TQListView*parent); + ResolutionCheckListItem(TQString header, TQString text, ResolutionCheckListItem*parent); ~ResolutionCheckListItem() {}; virtual void stateChange(bool newstate); - virtual void setValue(QString text); - virtual void setCaption(QString caption); + virtual void setValue(TQString text); + virtual void setCaption(TQString caption); protected: void updateText(); @@ -65,20 +65,20 @@ protected: /* The description of the entry, e.g. Backup, PC, Palm for the radio buttons, * of the field name for the controllers */ - QString fCaption; + TQString fCaption; /* The currrent value of the entry (for controllers this changes with the * selected button */ - QString fText; + TQString fText; }; ResolutionCheckListItem::ResolutionCheckListItem(ResolutionItem*it, - ResolutionTable*tb, QListView*parent) : - QCheckListItem(parent, QString::null, QCheckListItem::Controller), + ResolutionTable*tb, TQListView*parent) : + TQCheckListItem(parent, TQString::null, TQCheckListItem::Controller), fResItem(it), isController(true), - fCaption(it?(it->fName):(QString::null)), - fText(it?(it->fResolved):(QString::null)) + fCaption(it?(it->fName):(TQString::null)), + fText(it?(it->fResolved):(TQString::null)) { FUNCTIONSETUP; if (it && tb) @@ -86,7 +86,7 @@ ResolutionCheckListItem::ResolutionCheckListItem(ResolutionItem*it, // If all three texts are identical, there is no need for // resolution so don't show the radio items below bool itemsEqual=true; - QString testtext(QString::null); + TQString testtext(TQString::null); const enum eExistItems its[3]={eExistsPC, eExistsPalm, eExistsBackup}; // get a valid text from a valid field, which will serve as the // test text for the comparison @@ -118,9 +118,9 @@ ResolutionCheckListItem::ResolutionCheckListItem(ResolutionItem*it, setOpen(true); } -ResolutionCheckListItem::ResolutionCheckListItem(QString text, QString header, +ResolutionCheckListItem::ResolutionCheckListItem(TQString text, TQString header, ResolutionCheckListItem*parent) : - QCheckListItem(parent, QString(), QCheckListItem::RadioButton), + TQCheckListItem(parent, TQString(), TQCheckListItem::RadioButton), fResItem(0L), isController(false), fCaption(header), @@ -140,7 +140,7 @@ void ResolutionCheckListItem::stateChange(bool newstate) } } -void ResolutionCheckListItem::setValue(QString text) +void ResolutionCheckListItem::setValue(TQString text) { FUNCTIONSETUP; fText=text; @@ -151,7 +151,7 @@ void ResolutionCheckListItem::setValue(QString text) updateText(); } -void ResolutionCheckListItem::setCaption(QString caption) +void ResolutionCheckListItem::setCaption(TQString caption) { fCaption=caption; updateText(); @@ -159,8 +159,8 @@ void ResolutionCheckListItem::setCaption(QString caption) void ResolutionCheckListItem::updateText() { - QString newText(i18n("Entries in the resolution dialog. First the name of the field, then the entry from the Handheld or PC after the colon", "%1: %2").arg(fCaption).arg(fText)); - newText.replace(QRegExp(CSL1("\n")), + TQString newText(i18n("Entries in the resolution dialog. First the name of the field, then the entry from the Handheld or PC after the colon", "%1: %2").arg(fCaption).arg(fText)); + newText.replace(TQRegExp(CSL1("\n")), i18n("Denoting newlines in Address entries. No need to translate", " | ")); setText(0, newText); } @@ -171,8 +171,8 @@ void ResolutionCheckListItem::updateText() * *****************************************************************/ -ResolutionDlg::ResolutionDlg( QWidget* parent, KPilotLink*fH, - const QString &caption, const QString &helpText, ResolutionTable*tab) : +ResolutionDlg::ResolutionDlg( TQWidget* parent, KPilotLink*fH, + const TQString &caption, const TQString &helpText, ResolutionTable*tab) : KDialogBase( parent, "ResolutionDlg", false, caption, Apply|Cancel, Apply), tickleTimer(0L), fHandle(fH), @@ -189,20 +189,20 @@ ResolutionDlg::ResolutionDlg( QWidget* parent, KPilotLink*fH, adjustSize(); resize(size()); - if (fHandle) tickleTimer=new QTimer(this, "TickleTimer"); + if (fHandle) tickleTimer=new TQTimer(this, "TickleTimer"); if (tickleTimer) { - connect( tickleTimer, SIGNAL(timeout()), this, SLOT(_tickle())); + connect( tickleTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(_tickle())); // tickle the palm every 10 seconds to prevent a timeout until the // sync is really finished. tickleTimer->start( 10000 ); } - connect(fWidget->fKeepBoth, SIGNAL(clicked()), SLOT(slotKeepBoth())); - connect(fWidget->fBackupValues, SIGNAL(clicked()), SLOT(slotUseBackup())); - connect(fWidget->fPalmValues, SIGNAL(clicked()), SLOT(slotUsePalm())); - connect(fWidget->fPCValues, SIGNAL(clicked()), SLOT(slotUsePC())); + connect(fWidget->fKeepBoth, TQT_SIGNAL(clicked()), TQT_SLOT(slotKeepBoth())); + connect(fWidget->fBackupValues, TQT_SIGNAL(clicked()), TQT_SLOT(slotUseBackup())); + connect(fWidget->fPalmValues, TQT_SIGNAL(clicked()), TQT_SLOT(slotUsePalm())); + connect(fWidget->fPCValues, TQT_SIGNAL(clicked()), TQT_SLOT(slotUsePC())); } void ResolutionDlg::adjustButtons(ResolutionTable*tab) diff --git a/kpilot/conduits/abbrowserconduit/resolutionDialog.h b/kpilot/conduits/abbrowserconduit/resolutionDialog.h index 5f41ba0f2..d0b8fd527 100644 --- a/kpilot/conduits/abbrowserconduit/resolutionDialog.h +++ b/kpilot/conduits/abbrowserconduit/resolutionDialog.h @@ -42,10 +42,10 @@ class ResolutionDlg : public KDialogBase Q_OBJECT public: - ResolutionDlg( QWidget* parent=0, + ResolutionDlg( TQWidget* parent=0, KPilotLink*fH=0L, - const QString &caption=QString(), - const QString &helpText=QString(), + const TQString &caption=TQString(), + const TQString &helpText=TQString(), ResolutionTable *tab=0L ); ~ResolutionDlg(); @@ -60,7 +60,7 @@ protected: void fillListView(); void adjustButtons(ResolutionTable*tab); - QTimer* tickleTimer; + TQTimer* tickleTimer; KPilotLink* fHandle; ResolutionTable*fTable; diff --git a/kpilot/conduits/abbrowserconduit/resolutionTable.h b/kpilot/conduits/abbrowserconduit/resolutionTable.h index 760f962e2..51c25190e 100644 --- a/kpilot/conduits/abbrowserconduit/resolutionTable.h +++ b/kpilot/conduits/abbrowserconduit/resolutionTable.h @@ -29,7 +29,7 @@ */ -#include <qvaluelist.h> +#include <tqvaluelist.h> #include "syncAction.h" typedef enum eExistItems { @@ -41,12 +41,12 @@ class ResolutionItem { public: enum eExistItems fExistItems; - QString fEntries[3]; - QString fResolved; - QString fName; + TQString fEntries[3]; + TQString fResolved; + TQString fName; public: ResolutionItem() {} - ResolutionItem(QString name, int ex, QString pc, QString palm, QString backup):fExistItems((eExistItems)ex),fName(name) + ResolutionItem(TQString name, int ex, TQString pc, TQString palm, TQString backup):fExistItems((eExistItems)ex),fName(name) {fEntries[0]=pc;fEntries[1]=palm; fEntries[2]=backup; /*fExistItems=(eExistItems)ex;*/ } ~ResolutionItem() {} }; @@ -54,15 +54,15 @@ public: /** @author Reinhold Kainhofer */ -class ResolutionTable : public QPtrList<ResolutionItem> +class ResolutionTable : public TQPtrList<ResolutionItem> { public: - ResolutionTable():QPtrList<ResolutionItem>() {fResolution=SyncAction::eAskUser;}; + ResolutionTable():TQPtrList<ResolutionItem>() {fResolution=SyncAction::eAskUser;}; ~ResolutionTable() {}; SyncAction::ConflictResolution fResolution; - QString labels[3]; + TQString labels[3]; enum eExistItems fExistItems; }; diff --git a/kpilot/conduits/docconduit/DOC-converter.cc b/kpilot/conduits/docconduit/DOC-converter.cc index c8d7ac02d..6502fe54e 100644 --- a/kpilot/conduits/docconduit/DOC-converter.cc +++ b/kpilot/conduits/docconduit/DOC-converter.cc @@ -30,10 +30,10 @@ #include "options.h" #include "DOC-converter.moc" -#include <qdir.h> -#include <qfileinfo.h> -#include <qregexp.h> -#include <qsortedlist.h> +#include <tqdir.h> +#include <tqfileinfo.h> +#include <tqregexp.h> +#include <tqsortedlist.h> #include <pilotDatabase.h> #include <pilotLocalDatabase.h> @@ -50,7 +50,7 @@ /**************************************************************************************************** - * various bookmark classes. Most important is the bmkList findMatches(QString) function, + * various bookmark classes. Most important is the bmkList findMatches(TQString) function, * which needs to return a list of all bookmarks found for the given bookmark expression. * A bookmark usually consists of a bookmark text and an offset into the text document. ****************************************************************************************************/ @@ -70,7 +70,7 @@ bool operator== ( const docBookmark &s1, const docBookmark &s2) } -int docMatchBookmark::findMatches(QString doctext, bmkList &fBookmarks) { +int docMatchBookmark::findMatches(TQString doctext, bmkList &fBookmarks) { FUNCTIONSETUP; // bmkList res; int pos = 0, nr=0, found=0; @@ -99,11 +99,11 @@ int docMatchBookmark::findMatches(QString doctext, bmkList &fBookmarks) { -int docRegExpBookmark::findMatches(QString doctext, bmkList &fBookmarks) +int docRegExpBookmark::findMatches(TQString doctext, bmkList &fBookmarks) { FUNCTIONSETUP; // bmkList res; - QRegExp rx(pattern); + TQRegExp rx(pattern); int pos = 0, nr=0, found=0; while (pos>=0 && found<=to) { @@ -118,7 +118,7 @@ int docRegExpBookmark::findMatches(QString doctext, bmkList &fBookmarks) fBookmarks.append(new docBookmark(/*bmkName.left(16)*/rx.cap(capSubexpression), pos)); } else { // TODO: use the subexpressions from the regexp for the bmk name ($1..$9) (given as separate regexp) - QString bmkText(bmkName); + TQString bmkText(bmkName); for (int i=0; i<=rx.numCaptures(); ++i) { bmkText.replace(CSL1("$%1").arg(i), rx.cap(i)); bmkText.replace(CSL1("\\%1").arg(i), rx.cap(i)); @@ -145,7 +145,7 @@ int docRegExpBookmark::findMatches(QString doctext, bmkList &fBookmarks) *********************************************************************/ -DOCConverter::DOCConverter(QObject *parent, const char *name):QObject(parent,name) { +DOCConverter::DOCConverter(TQObject *parent, const char *name):TQObject(parent,name) { FUNCTIONSETUP; docdb=0L; eSortBookmarks=eSortNone; @@ -168,16 +168,16 @@ DOCConverter::~DOCConverter() { -void DOCConverter::setTXTpath(QString path, QString file) { - QDir dr(path); - QFileInfo pth(dr, file); +void DOCConverter::setTXTpath(TQString path, TQString file) { + TQDir dr(path); + TQFileInfo pth(dr, file); if (!file.isEmpty()) txtfilename = pth.absFilePath(); } -void DOCConverter::setTXTpath(QString filename) { +void DOCConverter::setTXTpath(TQString filename) { if (!filename.isEmpty()) txtfilename = filename; } @@ -189,26 +189,26 @@ void DOCConverter::setPDB(PilotDatabase * dbi) { -QString DOCConverter::readText() { +TQString DOCConverter::readText() { FUNCTIONSETUP; - if (txtfilename.isEmpty()) return QString(); - QFile docfile(txtfilename); + if (txtfilename.isEmpty()) return TQString(); + TQFile docfile(txtfilename); if (!docfile.open(IO_ReadOnly)) { emit logError(i18n("Unable to open text file %1 for reading.").arg(txtfilename)); - return QString(); + return TQString(); } - QTextStream docstream(&docfile); + TQTextStream docstream(&docfile); - QString doc = docstream.read(); + TQString doc = docstream.read(); docfile.close(); return doc; } -int DOCConverter::findBmkEndtags(QString &text, bmkList&fBmks) { +int DOCConverter::findBmkEndtags(TQString &text, bmkList&fBmks) { FUNCTIONSETUP; // Start from the end of the text int pos = text.length() - 1, nr=0; @@ -256,11 +256,11 @@ int DOCConverter::findBmkEndtags(QString &text, bmkList&fBmks) { return nr; } -int DOCConverter::findBmkInline(QString &text, bmkList &fBmks) { +int DOCConverter::findBmkInline(TQString &text, bmkList &fBmks) { FUNCTIONSETUP; // bmkList res; int nr=0; - QRegExp rx(CSL1("<\\*(.*)\\*>")); + TQRegExp rx(CSL1("<\\*(.*)\\*>")); rx.setMinimal(TRUE); int pos = 0; @@ -275,17 +275,17 @@ int DOCConverter::findBmkInline(QString &text, bmkList &fBmks) { return nr; } -int DOCConverter::findBmkFile(QString &, bmkList &fBmks) { +int DOCConverter::findBmkFile(TQString &, bmkList &fBmks) { FUNCTIONSETUP; int nr=0; - QString bmkfilename = txtfilename; + TQString bmkfilename = txtfilename; if (bmkfilename.endsWith(CSL1(".txt"))){ bmkfilename.remove(bmkfilename.length()-4, 4); } - QString oldbmkfilename=bmkfilename; + TQString oldbmkfilename=bmkfilename; bmkfilename+=CSL1(BMK_SUFFIX); - QFile bmkfile(bmkfilename); + TQFile bmkfile(bmkfilename); if (!bmkfile.open(IO_ReadOnly)) { bmkfilename=oldbmkfilename+CSL1(PDBBMK_SUFFIX); bmkfile.setName(bmkfilename); @@ -297,11 +297,11 @@ int DOCConverter::findBmkFile(QString &, bmkList &fBmks) { DEBUGKPILOT<<"Bookmark file: "<<bmkfilename<<endl; - QTextStream bmkstream(&bmkfile); - QString line; + TQTextStream bmkstream(&bmkfile); + TQString line; while ( !(line=bmkstream.readLine()).isEmpty() ) { if (!line.isEmpty() && !line.startsWith(CSL1("#")) ) { - QStringList bmkinfo=QStringList::split(CSL1(","), line); + TQStringList bmkinfo=TQStringList::split(CSL1(","), line); int fieldnr=bmkinfo.count(); // We use the same syntax for the entries as MakeDocJ bookmark files: // <bookmark>,<string-to-search>,<bookmark-name-string>,<starting-bookmark>,<ending-bookmark> @@ -309,19 +309,19 @@ int DOCConverter::findBmkFile(QString &, bmkList &fBmks) { if (fieldnr>0){ DEBUGKPILOT<<"Working on bookmark \""<<line<<"\""<<endl; docMatchBookmark*bmk=0L; - QString bookmark=bmkinfo[0]; + TQString bookmark=bmkinfo[0]; bool ok; int pos=bookmark.toInt(&ok); if (ok) { if (fieldnr>1) { - QString name(bmkinfo[1]); + TQString name(bmkinfo[1]); DEBUGKPILOT<<"Bookmark \""<<name<<"\" set at position "<<pos<<endl; fBmks.append(new docBookmark(name, pos)); } } else if (bookmark==CSL1("-") || bookmark==CSL1("+")) { if (fieldnr>1) { - QString patt(bmkinfo[1]); - QString name(patt); + TQString patt(bmkinfo[1]); + TQString name(patt); if (fieldnr>2) { int cap=bmkinfo[2].toInt(&ok); if (ok) { @@ -359,7 +359,7 @@ int DOCConverter::findBmkFile(QString &, bmkList &fBmks) { DEBUGKPILOT<<"RegExp bookmark found with no other information (no bookmark pattern nor name)"<<endl; } } else { - QString pattern(bookmark); + TQString pattern(bookmark); if (fieldnr>1) pattern=bmkinfo[1]; if (fieldnr>2) bookmark=bmkinfo[2]; DEBUGKPILOT<<"RegExp Bookmark, pattern="<<pattern<<", name="<<bookmark<<endl; @@ -384,7 +384,7 @@ bool DOCConverter::convertTXTtoPDB() { return false; } - QString text = readText(); + TQString text = readText(); if (fBmkTypes & eBmkEndtags) { findBmkEndtags(text, fBookmarks); @@ -537,14 +537,14 @@ bool DOCConverter::convertPDBtoTXT() <<" version="<<header.version<<endl; // next come the header.numRecords real document records (might be compressed, see the version flag in the header) - QFile docfile(txtfilename); + TQFile docfile(txtfilename); if (!docfile.open(IO_WriteOnly)) { emit logError(i18n("Unable to open output file %1.").arg(txtfilename)); KPILOT_DELETE(docdb); return false; } - QString doctext; + TQString doctext; for (int i=1; i<header.numRecords+1; ++i) { PilotRecord*rec=docdb->readRecordByIndex(i); @@ -570,7 +570,7 @@ bool DOCConverter::convertPDBtoTXT() if (rec) { PilotDOCBookmark bookie(rec); - docBookmark*bmk=new docBookmark(QString::fromLatin1(bookie.bookmarkName), bookie.pos); + docBookmark*bmk=new docBookmark(TQString::fromLatin1(bookie.bookmarkName), bookie.pos); bmks.append(bmk); KPILOT_DELETE(rec); } else { @@ -583,12 +583,12 @@ bool DOCConverter::convertPDBtoTXT() if ((fBmkTypes & eBmkFile) && (bmks.count()>0)) { - QString bmkfilename = docfile.name(); + TQString bmkfilename = docfile.name(); if (bmkfilename.endsWith(CSL1(".txt"))){ bmkfilename.remove(bmkfilename.length()-4, 4); } bmkfilename+=CSL1(PDBBMK_SUFFIX); - QFile bmkfile(bmkfilename); + TQFile bmkfile(bmkfilename); if (!bmkfile.open(IO_WriteOnly)) { emit logError(i18n("Unable to open file %1 for the bookmarks of %2.") @@ -598,7 +598,7 @@ bool DOCConverter::convertPDBtoTXT() { DEBUGKPILOT<<"Writing "<<upperBmkRec-header.numRecords<< "("<<upperBmkRec<<") bookmarks to file "<<bmkfilename<<endl; - QTextStream bmkstream(&bmkfile); + TQTextStream bmkstream(&bmkfile); for (docBookmark*bmk=bmks.first(); bmk; bmk=bmks.next()) { bmkstream<<bmk->position<<", "<<bmk->bmkName<<endl; @@ -611,14 +611,14 @@ bool DOCConverter::convertPDBtoTXT() { for (docBookmark*bmk=bmks.last(); bmk; bmk=bmks.prev()) { - doctext.insert(bmk->position, QString(CSL1("<*") + + doctext.insert(bmk->position, TQString(CSL1("<*") + bmk->bmkName + CSL1("*>"))); } } // Finally, write the actual text out to the file. - QTextStream docstream(&docfile); + TQTextStream docstream(&docfile); docstream<<doctext; //docstream.close(); docfile.close(); diff --git a/kpilot/conduits/docconduit/DOC-converter.h b/kpilot/conduits/docconduit/DOC-converter.h index f3747ea1d..802d60f20 100644 --- a/kpilot/conduits/docconduit/DOC-converter.h +++ b/kpilot/conduits/docconduit/DOC-converter.h @@ -36,51 +36,51 @@ #define BMK_SUFFIX ".bmk" #define PDBBMK_SUFFIX ".bm" -#include <qptrlist.h> -#include <qobject.h> +#include <tqptrlist.h> +#include <tqobject.h> class PilotDatabase; /**************************************************************************************************** - * various bookmark classes. Most important is the bmkList findMatches(QString, bmkList &) function, + * various bookmark classes. Most important is the bmkList findMatches(TQString, bmkList &) function, * which needs to return a list of all bookmarks found for the given bookmark expression. * A bookmark usually consists of a bookmark text and an offset into the text document. ****************************************************************************************************/ class docBookmark; -#define bmkList QPtrList<docBookmark> -#define bmkSortedList QSortedList<docBookmark> +#define bmkList TQPtrList<docBookmark> +#define bmkSortedList TQSortedList<docBookmark> class docBookmark { public: static bool compare_pos; docBookmark():bmkName(), position(0) { }; - docBookmark(QString name, long int pos):bmkName(name), position(pos) { }; + docBookmark(TQString name, long int pos):bmkName(name), position(pos) { }; docBookmark(const docBookmark &bmk):bmkName(bmk.bmkName),position(bmk.position){}; virtual ~ docBookmark() { }; - virtual int findMatches(QString, bmkList &fBookmarks) { + virtual int findMatches(TQString, bmkList &fBookmarks) { FUNCTIONSETUP; fBookmarks.append(new docBookmark(*this)); return 1; }; - QString bmkName; + TQString bmkName; long int position; }; class docMatchBookmark:public docBookmark { public: docMatchBookmark():docBookmark() { from=0; to=100;}; - docMatchBookmark(QString pattrn, int options=0):docBookmark(), + docMatchBookmark(TQString pattrn, int options=0):docBookmark(), pattern(pattrn), opts(options) { from=0; to=100; }; - docMatchBookmark(QString pattrn, QString bmkname, + docMatchBookmark(TQString pattrn, TQString bmkname, int options=0):docBookmark(bmkname, 0), pattern(pattrn), opts(options) { from=0; to=100; }; virtual ~ docMatchBookmark() { }; - virtual int findMatches(QString, bmkList &fBookmarks); - QString pattern; + virtual int findMatches(TQString, bmkList &fBookmarks); + TQString pattern; int opts; int from, to; }; @@ -88,13 +88,13 @@ class docMatchBookmark:public docBookmark { class docRegExpBookmark:public docMatchBookmark { public: docRegExpBookmark():docMatchBookmark() { capSubexpression=-1;}; - docRegExpBookmark(QString regexp, int cap=0, + docRegExpBookmark(TQString regexp, int cap=0, int options=0):docMatchBookmark(regexp, options) {capSubexpression=cap; }; - docRegExpBookmark(QString pattrn, QString bmkname, + docRegExpBookmark(TQString pattrn, TQString bmkname, int options=0):docMatchBookmark(pattrn, bmkname, options) { capSubexpression=-1; }; virtual ~ docRegExpBookmark() { }; - virtual int findMatches(QString, bmkList &fBookmarks); + virtual int findMatches(TQString, bmkList &fBookmarks); int capSubexpression; }; @@ -103,12 +103,12 @@ class docRegExpBookmark:public docMatchBookmark { * The converter class that does the real work for us. *************************************************************************************************************/ -class DOCConverter:public QObject { +class DOCConverter:public TQObject { Q_OBJECT private: PilotDatabase * docdb; - QString txtfilename; - QString bmkfilename; + TQString txtfilename; + TQString bmkfilename; bool compress; bmkList fBookmarks; @@ -121,16 +121,16 @@ public: } eSortBookmarks; public: - DOCConverter(QObject *parent=0L, const char *name=0L); + DOCConverter(TQObject *parent=0L, const char *name=0L); virtual ~ DOCConverter(); - QString readText(); - void setTXTpath(QString path, QString file); - void setTXTpath(QString filename); + TQString readText(); + void setTXTpath(TQString path, TQString file); + void setTXTpath(TQString filename); void setPDB(PilotDatabase * dbi); - QString txtFilename() const {return txtfilename;} - QString bmkFilename() const {return bmkfilename;} - void setBmkFilename(QString bmkf) { bmkfilename=bmkf;} + TQString txtFilename() const {return txtfilename;} + TQString bmkFilename() const {return bmkfilename;} + void setBmkFilename(TQString bmkf) { bmkfilename=bmkf;} bool getCompress() const { return compress; }; void setCompress(bool newcomp) {compress=newcomp;}; @@ -151,9 +151,9 @@ public: return fBookmarks.count(); }; - int findBmkEndtags(QString &, bmkList&); - int findBmkInline(QString &, bmkList&); - int findBmkFile(QString &, bmkList&); + int findBmkEndtags(TQString &, bmkList&); + int findBmkInline(TQString &, bmkList&); + int findBmkFile(TQString &, bmkList&); void setSort(enum eSortBookmarksEnum sort) {eSortBookmarks=sort;} @@ -176,8 +176,8 @@ protected: private: void readConfig(); signals: - void logMessage(const QString &); - void logError(const QString &); + void logMessage(const TQString &); + void logError(const TQString &); }; #endif diff --git a/kpilot/conduits/docconduit/doc-conduit.cc b/kpilot/conduits/docconduit/doc-conduit.cc index eee36080c..fbaa22f59 100644 --- a/kpilot/conduits/docconduit/doc-conduit.cc +++ b/kpilot/conduits/docconduit/doc-conduit.cc @@ -36,8 +36,8 @@ #include "options.h" #include "doc-conduit.moc" -#include <qtimer.h> -#include <qdir.h> +#include <tqtimer.h> +#include <tqdir.h> #include <kconfig.h> #include <kmdcodec.h> @@ -59,7 +59,7 @@ extern "C" unsigned long version_conduit_doc = Pilot::PLUGIN_API; } -QString dirToString(eSyncDirectionEnum dir) { +TQString dirToString(eSyncDirectionEnum dir) { switch(dir) { // case eSyncAll: return "eSyncAll"; case eSyncPDAToPC: return CSL1("eSyncPDAToPC"); @@ -78,7 +78,7 @@ QString dirToString(eSyncDirectionEnum dir) { DOCConduit::DOCConduit(KPilotLink * o, - const char *n, const QStringList & a):ConduitAction(o, n, a) + const char *n, const TQStringList & a):ConduitAction(o, n, a) { FUNCTIONSETUP; fConduitName=i18n("DOC"); @@ -145,13 +145,13 @@ void DOCConduit::readConfig() -bool DOCConduit::pcTextChanged(QString txtfn) +bool DOCConduit::pcTextChanged(TQString txtfn) { FUNCTIONSETUP; // How do I find out if a text file has changed shince we last synced it?? // Use KMD5 for now. If I realize it is too slow, then I have to go back to comparing modification times // if there is no config setting yet, assume the file has been changed. the md5 sum will be written to the config file after the sync. - QString oldDigest=DOCConduitSettings::self()->config()->readEntry(txtfn); + TQString oldDigest=DOCConduitSettings::self()->config()->readEntry(txtfn); if (oldDigest.length()<=0) { return true; @@ -161,10 +161,10 @@ bool DOCConduit::pcTextChanged(QString txtfn) #endif KMD5 docmd5; - QFile txtfile(txtfn); + TQFile txtfile(txtfn); if (txtfile.open(IO_ReadOnly)){ docmd5.update(txtfile); - QString thisDigest(docmd5.hexDigest() /* .data() */); + TQString thisDigest(docmd5.hexDigest() /* .data() */); #ifdef DEBUG DEBUGKPILOT<<"New digest is "<<thisDigest<<endl; #endif @@ -233,19 +233,19 @@ bool DOCConduit::hhTextChanged(PilotDatabase*docdb) * Helper functions ********************************************************************/ -QString DOCConduit::constructPDBFileName(QString name) { +TQString DOCConduit::constructPDBFileName(TQString name) { FUNCTIONSETUP; - QString fn; - QDir dr(DOCConduitSettings::pDBDirectory()); - QFileInfo pth(dr, name); + TQString fn; + TQDir dr(DOCConduitSettings::pDBDirectory()); + TQFileInfo pth(dr, name); if (!name.isEmpty()) fn=pth.absFilePath()+CSL1(".pdb"); return fn; } -QString DOCConduit::constructTXTFileName(QString name) { +TQString DOCConduit::constructTXTFileName(TQString name) { FUNCTIONSETUP; - QString fn; - QDir dr( DOCConduitSettings::tXTDirectory() ); - QFileInfo pth(dr, name); + TQString fn; + TQDir dr( DOCConduitSettings::tXTDirectory() ); + TQFileInfo pth(dr, name); if (!name.isEmpty()) fn=pth.absFilePath()+CSL1(".txt"); return fn; } @@ -271,7 +271,7 @@ QString DOCConduit::constructTXTFileName(QString name) { emit logMessage(i18n("Searching for texts and databases to synchronize")); - QTimer::singleShot(0, this, SLOT(syncNextDB())); + TQTimer::singleShot(0, this, TQT_SLOT(syncNextDB())); return true; } @@ -284,15 +284,15 @@ bool DOCConduit::doSync(docSyncInfo &sinfo) if (sinfo.direction==eSyncDelete) { if (!sinfo.txtfilename.isEmpty()) { - if (!QFile::remove(sinfo.txtfilename)) { + if (!TQFile::remove(sinfo.txtfilename)) { WARNINGKPILOT << "Unable to delete the text file " << sinfo.txtfilename << " on the PC" << endl; } - QString bmkfilename = sinfo.txtfilename; + TQString bmkfilename = sinfo.txtfilename; if (bmkfilename.endsWith(CSL1(".txt"))){ bmkfilename.remove(bmkfilename.length()-4, 4); } bmkfilename+=CSL1(PDBBMK_SUFFIX); - if (!QFile::remove(bmkfilename)) { + if (!TQFile::remove(bmkfilename)) { #ifdef DEBUG DEBUGKPILOT<<"Could not remove bookmarks file "<<bmkfilename<<" for database "<<sinfo.handheldDB<<endl; #endif @@ -300,7 +300,7 @@ bool DOCConduit::doSync(docSyncInfo &sinfo) } if (!sinfo.pdbfilename.isEmpty() && DOCConduitSettings::keepPDBsLocally() ) { PilotLocalDatabase*database=new PilotLocalDatabase(DOCConduitSettings::pDBDirectory(), - QString::fromLatin1(sinfo.dbinfo.name), false); + TQString::fromLatin1(sinfo.dbinfo.name), false); if (database) { if ( database->deleteDatabase() !=0 ) { WARNINGKPILOT << "Unable to delete database " << sinfo.dbinfo.name << " on the PC" << endl; @@ -336,8 +336,8 @@ bool DOCConduit::doSync(docSyncInfo &sinfo) if (database && database->isOpen()) { DOCConverter docconverter; - connect(&docconverter, SIGNAL(logError(const QString &)), SIGNAL(logError(const QString &))); - connect(&docconverter, SIGNAL(logMessage(const QString &)), SIGNAL(logMessage(const QString &))); + connect(&docconverter, TQT_SIGNAL(logError(const TQString &)), TQT_SIGNAL(logError(const TQString &))); + connect(&docconverter, TQT_SIGNAL(logMessage(const TQString &)), TQT_SIGNAL(logMessage(const TQString &))); docconverter.setTXTpath( DOCConduitSettings::tXTDirectory(), sinfo.txtfilename ); docconverter.setPDB(database); @@ -360,10 +360,10 @@ bool DOCConduit::doSync(docSyncInfo &sinfo) if (res) { KMD5 docmd5; - QFile txtfile(docconverter.txtFilename()); + TQFile txtfile(docconverter.txtFilename()); if (txtfile.open(IO_ReadOnly)) { docmd5.update(txtfile); - QString thisDigest(docmd5.hexDigest() /* .data() */); + TQString thisDigest(docmd5.hexDigest() /* .data() */); DOCConduitSettings::self()->config()->writeEntry(docconverter.txtFilename(), thisDigest); DOCConduitSettings::self()->config()->sync(); #ifdef DEBUG @@ -378,18 +378,18 @@ 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(QString::fromLatin1(sinfo.dbinfo.name))); + .arg(TQString::fromLatin1(sinfo.dbinfo.name))); if (!res) emit logError(i18n("Conversion of PalmDOC \"%1\" failed.") - .arg(QString::fromLatin1(sinfo.dbinfo.name))); -// disconnect(&docconverter, SIGNAL(logError(const QString &)), SIGNAL(logError(const QString &))); -// disconnect(&docconverter, SIGNAL(logMessage(const QString &)), SIGNAL(logMessage(const QString &))); + .arg(TQString::fromLatin1(sinfo.dbinfo.name))); +// disconnect(&docconverter, TQT_SIGNAL(logError(const TQString &)), TQT_SIGNAL(logError(const TQString &))); +// disconnect(&docconverter, TQT_SIGNAL(logMessage(const TQString &)), TQT_SIGNAL(logMessage(const TQString &))); // KPILOT_DELETE(database); } else { emit logError(i18n("Unable to open or create the database %1.") - .arg(QString::fromLatin1(sinfo.dbinfo.name))); + .arg(TQString::fromLatin1(sinfo.dbinfo.name))); } return res; } @@ -404,7 +404,7 @@ void DOCConduit::syncNextDB() { if (eSyncDirection==eSyncPCToPDA || fHandle->findDatabase(NULL, &dbinfo, dbnr, dbtype(), dbcreator() /*, cardno */ ) < 0) { // no more databases available, so check for PC->Palm sync - QTimer::singleShot(0, this, SLOT(syncNextTXT())); + TQTimer::singleShot(0, this, TQT_SLOT(syncNextTXT())); return; } dbnr=dbinfo.index+1; @@ -414,23 +414,23 @@ void DOCConduit::syncNextDB() { // if creator and/or type don't match, go to next db if (!isCorrectDBTypeCreator(dbinfo) || - fDBNames.contains(QString::fromLatin1(dbinfo.name))) + fDBNames.contains(TQString::fromLatin1(dbinfo.name))) { - QTimer::singleShot(0, this, SLOT(syncNextDB())); + TQTimer::singleShot(0, this, TQT_SLOT(syncNextDB())); return; } - QString txtfilename=constructTXTFileName(QString::fromLatin1(dbinfo.name)); - QString pdbfilename=constructPDBFileName(QString::fromLatin1(dbinfo.name)); + TQString txtfilename=constructTXTFileName(TQString::fromLatin1(dbinfo.name)); + TQString pdbfilename=constructPDBFileName(TQString::fromLatin1(dbinfo.name)); - docSyncInfo syncInfo(QString::fromLatin1(dbinfo.name), + docSyncInfo syncInfo(TQString::fromLatin1(dbinfo.name), txtfilename, pdbfilename, eSyncNone); syncInfo.dbinfo=dbinfo; needsSync(syncInfo); fSyncInfoList.append(syncInfo); - fDBNames.append(QString::fromLatin1(dbinfo.name)); + fDBNames.append(TQString::fromLatin1(dbinfo.name)); - QTimer::singleShot(0, this, SLOT(syncNextDB())); + TQTimer::singleShot(0, this, TQT_SLOT(syncNextDB())); return; } @@ -444,28 +444,28 @@ void DOCConduit::syncNextTXT() { // We don't sync from PC to PDB, so start the conflict resolution and then the actual sync process docnames.clear(); - QTimer::singleShot(0, this, SLOT(checkPDBFiles())); + TQTimer::singleShot(0, this, TQT_SLOT(checkPDBFiles())); return; } // if docnames isn't initialized, get a list of all *.txt files in DOCConduitSettings::tXTDirectory() if (docnames.isEmpty()/* || dociterator==docnames.end() */) { - docnames=QDir( DOCConduitSettings::tXTDirectory(), CSL1("*.txt")).entryList() ; + docnames=TQDir( DOCConduitSettings::tXTDirectory(), CSL1("*.txt")).entryList() ; dociterator=docnames.begin(); } if (dociterator==docnames.end()) { // no more databases available, so start the conflict resolution and then the actual sync proces docnames.clear(); - QTimer::singleShot(0, this, SLOT(checkPDBFiles())); + TQTimer::singleShot(0, this, TQT_SLOT(checkPDBFiles())); return; } - QString fn=(*dociterator); + TQString fn=(*dociterator); - QDir dr( DOCConduitSettings::tXTDirectory() ); - QFileInfo fl(dr, fn ); - QString txtfilename=fl.absFilePath(); - QString pdbfilename; + TQDir dr( DOCConduitSettings::tXTDirectory() ); + TQFileInfo fl(dr, fn ); + TQString txtfilename=fl.absFilePath(); + TQString pdbfilename; ++dociterator; DBInfo dbinfo; @@ -476,19 +476,19 @@ void DOCConduit::syncNextTXT() bool alreadySynced=fDBNames.contains(fl.baseName(TRUE)); if (!alreadySynced) { - docSyncInfo syncInfo(QString::fromLatin1(dbinfo.name), + docSyncInfo syncInfo(TQString::fromLatin1(dbinfo.name), txtfilename, pdbfilename, eSyncNone); syncInfo.dbinfo=dbinfo; needsSync(syncInfo); fSyncInfoList.append(syncInfo); - fDBNames.append(QString::fromLatin1(dbinfo.name)); + fDBNames.append(TQString::fromLatin1(dbinfo.name)); } else { #ifdef DEBUG DEBUGKPILOT<<txtfilename<<" has already been synced, skipping it."<<endl; #endif } - QTimer::singleShot(0, this, SLOT(syncNextTXT())); + TQTimer::singleShot(0, this, TQT_SLOT(syncNextTXT())); return; } @@ -502,33 +502,33 @@ void DOCConduit::checkPDBFiles() { if ( DOCConduitSettings::localSync() || !DOCConduitSettings::keepPDBsLocally() || eSyncDirection==eSyncPCToPDA ) { // no more databases available, so check for PC->Palm sync - QTimer::singleShot(0, this, SLOT(checkDeletedDocs())); + TQTimer::singleShot(0, this, TQT_SLOT(checkDeletedDocs())); return; } // Walk through all files in the pdb directory and check if it has already been synced. // if docnames isn't initialized, get a list of all *.pdb files in DOCConduitSettings::pDBDirectory() if (docnames.isEmpty()/* || dociterator==docnames.end() */) { - docnames=QDir(DOCConduitSettings::pDBDirectory(), CSL1("*.pdb")).entryList() ; + docnames=TQDir(DOCConduitSettings::pDBDirectory(), CSL1("*.pdb")).entryList() ; dociterator=docnames.begin(); } if (dociterator==docnames.end()) { // no more databases available, so start the conflict resolution and then the actual sync proces docnames.clear(); - QTimer::singleShot(0, this, SLOT(checkDeletedDocs())); + TQTimer::singleShot(0, this, TQT_SLOT(checkDeletedDocs())); return; } - QString fn=(*dociterator); + TQString fn=(*dociterator); - QDir dr(DOCConduitSettings::pDBDirectory()); - QFileInfo fl(dr, fn ); - QString pdbfilename=fl.absFilePath(); + TQDir dr(DOCConduitSettings::pDBDirectory()); + TQFileInfo fl(dr, fn ); + TQString pdbfilename=fl.absFilePath(); ++dociterator; // Get the doc title and check if it has already been synced (in the synced docs list of in fDBNames to be synced) // If the doc title doesn't appear in either list, install it to the Handheld, and add it to the list of dbs to be synced. - QString dbname=fl.baseName(TRUE).left(30); + TQString dbname=fl.baseName(TRUE).left(30); if (!fDBNames.contains(dbname) && !fDBListSynced.contains(dbname)) { if (fHandle->installFiles(pdbfilename, false)) { DBInfo dbinfo; @@ -549,7 +549,7 @@ void DOCConduit::checkPDBFiles() { } } - QTimer::singleShot(0, this, SLOT(checkPDBFiles())); + TQTimer::singleShot(0, this, TQT_SLOT(checkPDBFiles())); } @@ -558,12 +558,12 @@ void DOCConduit::checkDeletedDocs() { FUNCTIONSETUP; - for (QStringList::Iterator it=fDBListSynced.begin(); it!=fDBListSynced.end(); ++it ) { + for (TQStringList::Iterator it=fDBListSynced.begin(); it!=fDBListSynced.end(); ++it ) { if (!fDBNames.contains(*it)) { // We need to delete this doc: - QString dbname(*it); - QString txtfilename=constructTXTFileName(dbname); - QString pdbfilename=constructPDBFileName(dbname); + TQString dbname(*it); + TQString txtfilename=constructTXTFileName(dbname); + TQString pdbfilename=constructPDBFileName(dbname); docSyncInfo syncInfo(dbname, txtfilename, pdbfilename, eSyncDelete); DBInfo dbinfo; @@ -574,7 +574,7 @@ void DOCConduit::checkDeletedDocs() fSyncInfoList.append(syncInfo); } } - QTimer::singleShot(0, this, SLOT(resolve())); + TQTimer::singleShot(0, this, TQT_SLOT(resolve())); return; } @@ -628,7 +628,7 @@ void DOCConduit::resolve() { if (!dlg || !dlg->exec() ) { KPILOT_DELETE(dlg) emit logMessage(i18n("Sync aborted by user.")); - QTimer::singleShot(0, this, SLOT(cleanup())); + TQTimer::singleShot(0, this, TQT_SLOT(cleanup())); return; } } @@ -638,7 +638,7 @@ void DOCConduit::resolve() { // fDBNames will be filled with the names of the databases that are actually synced (not deleted), so I can write the list to the config file fDBNames.clear(); fSyncInfoListIterator=fSyncInfoList.begin(); - QTimer::singleShot(0,this, SLOT(syncDatabases())); + TQTimer::singleShot(0,this, TQT_SLOT(syncDatabases())); return; } @@ -648,7 +648,7 @@ void DOCConduit::syncDatabases() { FUNCTIONSETUP; if (fSyncInfoListIterator==fSyncInfoList.end()) { // We're done, so clean up - QTimer::singleShot(0, this, SLOT(cleanup())); + TQTimer::singleShot(0, this, TQT_SLOT(cleanup())); return; } @@ -679,12 +679,12 @@ void DOCConduit::syncDatabases() { } if (sinfo.direction != eSyncDelete) fDBNames.append(sinfo.handheldDB); - QTimer::singleShot(0,this, SLOT(syncDatabases())); + TQTimer::singleShot(0,this, TQT_SLOT(syncDatabases())); return; } -PilotDatabase*DOCConduit::openDOCDatabase(const QString &dbname) { +PilotDatabase*DOCConduit::openDOCDatabase(const TQString &dbname) { if (DOCConduitSettings::localSync()) { return new PilotLocalDatabase(DOCConduitSettings::pDBDirectory(), dbname, false); @@ -701,7 +701,7 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo) FUNCTIONSETUP; sinfo.direction = eSyncNone; - PilotDatabase*docdb=openDOCDatabase(QString::fromLatin1(sinfo.dbinfo.name)); + PilotDatabase*docdb=openDOCDatabase(TQString::fromLatin1(sinfo.dbinfo.name)); if (!fDBListSynced.contains(sinfo.handheldDB)) { // the database wasn't included on last sync, so it has to be new. #ifdef DEBUG @@ -716,7 +716,7 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo) N N | C P H */ - if (QFile::exists(sinfo.txtfilename)) sinfo.fPCStatus=eStatNew; + if (TQFile::exists(sinfo.txtfilename)) sinfo.fPCStatus=eStatNew; else sinfo.fPCStatus=eStatDoesntExist; if (docdb && docdb->isOpen()) sinfo.fPalmStatus=eStatNew; else sinfo.fPalmStatus=eStatDoesntExist; @@ -756,7 +756,7 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo) } // Text was included in the last sync - if (!QFile::exists(sinfo.txtfilename)) sinfo.fPCStatus=eStatDeleted; + if (!TQFile::exists(sinfo.txtfilename)) sinfo.fPCStatus=eStatDeleted; else if(pcTextChanged(sinfo.txtfilename)) { sinfo.fPCStatus=eStatChanged; #ifdef DEBUG @@ -871,7 +871,7 @@ PilotDatabase *DOCConduit::preSyncAction(docSyncInfo &sinfo) const { // make sure the dir for the local texts really exists! - QDir dir( DOCConduitSettings::tXTDirectory() ); + TQDir dir( DOCConduitSettings::tXTDirectory() ); if (!dir.exists()) { dir.mkdir(dir.absPath()); @@ -885,7 +885,7 @@ PilotDatabase *DOCConduit::preSyncAction(docSyncInfo &sinfo) const if (DOCConduitSettings::keepPDBsLocally()) { // make sure the dir for the local db really exists! - QDir dir(DOCConduitSettings::pDBDirectory()); + TQDir dir(DOCConduitSettings::pDBDirectory()); if (!dir.exists()) { @@ -909,7 +909,7 @@ PilotDatabase *DOCConduit::preSyncAction(docSyncInfo &sinfo) const if (DOCConduitSettings::keepPDBsLocally()) { // make sure the dir for the local db really exists! - QDir dir(DOCConduitSettings::pDBDirectory()); + TQDir dir(DOCConduitSettings::pDBDirectory()); if (!dir.exists()) { dir.mkdir(dir.absPath()); @@ -922,11 +922,11 @@ PilotDatabase *DOCConduit::preSyncAction(docSyncInfo &sinfo) const if (DOCConduitSettings::keepPDBsLocally()) { return new PilotLocalDatabase(DOCConduitSettings::pDBDirectory(), - QString::fromLatin1(dbinfo.name), false); + TQString::fromLatin1(dbinfo.name), false); } else { - return deviceLink()->database(QString::fromLatin1(dbinfo.name)); + return deviceLink()->database(TQString::fromLatin1(dbinfo.name)); } } @@ -950,7 +950,7 @@ bool DOCConduit::postSyncAction(PilotDatabase * database, if (DOCConduitSettings::keepPDBsLocally() && !DOCConduitSettings::localSync()) { PilotDatabase*db=deviceLink()->database( - QString::fromLatin1(sinfo.dbinfo.name)); + TQString::fromLatin1(sinfo.dbinfo.name)); #ifdef DEBUG DEBUGKPILOT<<"Middle 1 Resetting sync flags for database " <<sinfo.dbinfo.name<<endl; @@ -977,7 +977,7 @@ bool DOCConduit::postSyncAction(PilotDatabase * database, DEBUGKPILOT<<"Installing file "<<localdb->dbPathName()<<" (" <<sinfo.handheldDB<<") to the handheld"<<endl; #endif - QString dbpathname=localdb->dbPathName(); + TQString dbpathname=localdb->dbPathName(); // This deletes localdb as well, which is just a cast from database KPILOT_DELETE(database); if (!fHandle->installFiles(dbpathname, false)) diff --git a/kpilot/conduits/docconduit/doc-conduit.h b/kpilot/conduits/docconduit/doc-conduit.h index 834002bea..aefb4264f 100644 --- a/kpilot/conduits/docconduit/doc-conduit.h +++ b/kpilot/conduits/docconduit/doc-conduit.h @@ -31,7 +31,7 @@ #include <plugin.h> class docSyncInfo; -typedef QValueList<docSyncInfo> syncInfoList; +typedef TQValueList<docSyncInfo> syncInfoList; typedef enum eSyncDirectionEnum { eSyncNone, @@ -51,7 +51,7 @@ typedef enum eTextStatus { }; -QString dirToString(eSyncDirectionEnum dir); +TQString dirToString(eSyncDirectionEnum dir); class DOCConduit:public ConduitAction { Q_OBJECT @@ -60,11 +60,11 @@ public: public: DOCConduit(KPilotLink * o, - const char *n = 0L, const QStringList & a = QStringList()); + const char *n = 0L, const TQStringList & a = TQStringList()); virtual ~ DOCConduit(); - bool encode(QStringList fileName, PilotDatabase * db); - bool decode(PilotDatabase * db, QString fileName); + bool encode(TQStringList fileName, PilotDatabase * db); + bool decode(PilotDatabase * db, TQString fileName); virtual bool exec(); protected: virtual bool isCorrectDBTypeCreator(DBInfo dbinfo); @@ -106,33 +106,33 @@ public slots: */ bool postSyncAction(PilotDatabase * dbinfo, docSyncInfo &sinfo, bool res = true); - bool pcTextChanged(QString txtfn); + bool pcTextChanged(TQString txtfn); bool hhTextChanged(PilotDatabase*docdb); /** Opens the database with name dbname. For a local sync, this will be a * PilotLocalDatabase, otherwise it will be a database on the serial device * (i.e. an object of class PilotSerialDatabase) */ - PilotDatabase *openDOCDatabase(const QString &dbname); + PilotDatabase *openDOCDatabase(const TQString &dbname); - QString constructPDBFileName(QString name); - QString constructTXTFileName(QString name); + TQString constructPDBFileName(TQString name); + TQString constructTXTFileName(TQString name); eSyncDirectionEnum eConflictResolution; int fTXTBookmarks, fPDBBookmarks; - QStringList fDBListSynced; - QStringList fDBNames; + TQStringList fDBListSynced; + TQStringList fDBNames; syncInfoList fSyncInfoList; syncInfoList::Iterator fSyncInfoListIterator; long int dbnr; - QStringList docnames; - QStringList::Iterator dociterator; + TQStringList docnames; + TQStringList::Iterator dociterator; }; class docSyncInfo { public: - docSyncInfo(QString hhDB=QString(), QString txtfn=QString(), QString pdbfn=QString(), eSyncDirectionEnum dir=eSyncNone) + docSyncInfo(TQString hhDB=TQString(), TQString txtfn=TQString(), TQString pdbfn=TQString(), eSyncDirectionEnum dir=eSyncNone) { handheldDB=hhDB; txtfilename=txtfn; @@ -142,7 +142,7 @@ public: fPalmStatus=eStatNone; }; ~docSyncInfo(){}; - QString handheldDB, txtfilename, pdbfilename; + TQString handheldDB, txtfilename, pdbfilename; DBInfo dbinfo; eSyncDirectionEnum direction; eTextStatus fPCStatus, fPalmStatus; diff --git a/kpilot/conduits/docconduit/doc-conflictdialog.cc b/kpilot/conduits/docconduit/doc-conflictdialog.cc index 7dafd9b66..50ecbbd1e 100644 --- a/kpilot/conduits/docconduit/doc-conflictdialog.cc +++ b/kpilot/conduits/docconduit/doc-conflictdialog.cc @@ -28,54 +28,54 @@ #include "options.h" #include "doc-conflictdialog.moc" -#include <qlabel.h> -#include <qpushbutton.h> -#include <qlayout.h> -#include <qbuttongroup.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqlayout.h> +#include <tqbuttongroup.h> #include <kmessagebox.h> -#include <qtimer.h> -#include <qtable.h> -#include <qcombobox.h> -#include <qscrollview.h> +#include <tqtimer.h> +#include <tqtable.h> +#include <tqcombobox.h> +#include <tqscrollview.h> -ResolutionDialog::ResolutionDialog( QWidget* parent, const QString& caption, syncInfoList*sinfo, KPilotLink*lnk ) +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) { FUNCTIONSETUP; syncInfo=sinfo; hasConflicts=false; - QWidget *page = new QWidget( this ); + TQWidget *page = new TQWidget( this ); setMainWidget(page); - QVBoxLayout *topLayout = new QVBoxLayout( page, 0, spacingHint() ); + TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() ); // First, insert the texts on top: - textLabel1 = new QLabel(i18n("Here is a list of all text files and DOC databases the conduit found. The conduit tried to determine the correct sync direction, but for databases in bold red letters a conflict occurred (i.e. the text was changed both on the desktop and on the handheld). For these databases please specify which version is the current one."), page); - textLabel1->setAlignment( int( QLabel::WordBreak | QLabel::AlignVCenter ) ); + textLabel1 = new TQLabel(i18n("Here is a list of all text files and DOC databases the conduit found. The conduit tried to determine the correct sync direction, but for databases in bold red letters a conflict occurred (i.e. the text was changed both on the desktop and on the handheld). For these databases please specify which version is the current one."), page); + textLabel1->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); topLayout->addWidget(textLabel1); - textLabel2 = new QLabel(i18n("You can also change the sync direction for databases without a conflict." ), page ); - textLabel2->setAlignment( int( QLabel::WordBreak | QLabel::AlignVCenter ) ); + textLabel2 = new TQLabel(i18n("You can also change the sync direction for databases without a conflict." ), page ); + textLabel2->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); topLayout->addWidget(textLabel2); - resolutionGroupBox = new QGroupBox(i18n("DOC Databases"), page ); - QVBoxLayout*playout = new QVBoxLayout(resolutionGroupBox); - QScrollView* sv = new QScrollView(resolutionGroupBox); + resolutionGroupBox = new TQGroupBox(i18n("DOC Databases"), page ); + TQVBoxLayout*playout = new TQVBoxLayout(resolutionGroupBox); + TQScrollView* sv = new TQScrollView(resolutionGroupBox); playout->addWidget(sv); - sv->setResizePolicy(QScrollView::AutoOneFit); - sv->setHScrollBarMode(QScrollView::AlwaysOff); + sv->setResizePolicy(TQScrollView::AutoOneFit); + sv->setHScrollBarMode(TQScrollView::AlwaysOff); sv->setMargin(5); - QFrame* big_box = new QFrame(sv->viewport()); + TQFrame* big_box = new TQFrame(sv->viewport()); sv->addChild(big_box); - resolutionGroupBoxLayout = new QGridLayout( big_box, syncInfo->size(), 3 ); + resolutionGroupBoxLayout = new TQGridLayout( big_box, syncInfo->size(), 3 ); resolutionGroupBoxLayout->setAlignment( Qt::AlignTop ); // Invisible button group for the information buttons to use the same slot for all of them (see Dallheimer's book, page 309f) - QButtonGroup *bgroup = new QButtonGroup( this ); + TQButtonGroup *bgroup = new TQButtonGroup( this ); bgroup->hide(); - QObject::connect(bgroup, SIGNAL(clicked(int)), this, SLOT(slotInfo(int))); + TQObject::connect(bgroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotInfo(int))); if (syncInfo) { DEBUGKPILOT<<"Adding resolution options for the databases "<<endl; @@ -89,18 +89,18 @@ ResolutionDialog::ResolutionDialog( QWidget* parent, const QString& caption, syn cE.conflict=(si.direction==eSyncConflict); DEBUGKPILOT<<"Adding "<<si.handheldDB<<" to the conflict resolution dialog"<<endl; - QString text=si.handheldDB; + TQString text=si.handheldDB; if (cE.conflict) { text=CSL1("<qt><b><font color=red>")+text+CSL1("</font></b></qt>"); DEBUGKPILOT<<"We have a conflict for database "<<si.handheldDB<<endl; hasConflicts=true; } - cE.dbname=new QLabel(text, big_box); + cE.dbname=new TQLabel(text, big_box); resolutionGroupBoxLayout->addWidget( cE.dbname, cE.index, 0 ); - cE.resolution=new QComboBox( FALSE, big_box); - cE.resolution->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, - (QSizePolicy::SizeType)0, 0, 0, + cE.resolution=new TQComboBox( FALSE, big_box); + cE.resolution->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, + (TQSizePolicy::SizeType)0, 0, 0, cE.resolution->sizePolicy().hasHeightForWidth() ) ); cE.resolution->clear(); cE.resolution->insertItem( i18n( "No Sync" ) ); @@ -110,7 +110,7 @@ ResolutionDialog::ResolutionDialog( QWidget* parent, const QString& caption, syn cE.resolution->setCurrentItem((int)si.direction); resolutionGroupBoxLayout->addWidget( cE.resolution, cE.index, 1); - cE.info = new QPushButton( i18n("More Info..."), big_box ); + cE.info = new TQPushButton( i18n("More Info..."), big_box ); resolutionGroupBoxLayout->addWidget(cE.info, cE.index, 2); bgroup->insert(cE.info); @@ -123,11 +123,11 @@ ResolutionDialog::ResolutionDialog( QWidget* parent, const QString& caption, syn topLayout->addWidget( resolutionGroupBox ); - resize( QSize(600, 480).expandedTo(minimumSizeHint()) ); + resize( TQSize(600, 480).expandedTo(minimumSizeHint()) ); - if (fHandle) tickleTimer=new QTimer(this, "TickleTimer"); + if (fHandle) tickleTimer=new TQTimer(this, "TickleTimer"); if (tickleTimer) { - connect( tickleTimer, SIGNAL(timeout()), this, SLOT(_tickle()) ); + connect( tickleTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(_tickle()) ); tickleTimer->start( 10000 ); // tickle the palm every 10 seconds to prevent a timeout until the sync is really finished. } @@ -143,14 +143,14 @@ ResolutionDialog::~ResolutionDialog() /* virtual slot */ void ResolutionDialog::slotOk() { FUNCTIONSETUP; - QValueList<conflictEntry>::Iterator ceIt; + TQValueList<conflictEntry>::Iterator ceIt; for (ceIt=conflictEntries.begin(); ceIt!=conflictEntries.end(); ++ceIt) { (*syncInfo)[(*ceIt).index].direction=(eSyncDirectionEnum)((*ceIt).resolution->currentItem()); } KDialogBase::slotOk(); } -QString eTextStatusToString(eTextStatus stat) { +TQString eTextStatusToString(eTextStatus stat) { switch(stat) { case eStatNone: return i18n("unchanged"); case eStatNew: return i18n("new"); @@ -168,7 +168,7 @@ void ResolutionDialog::slotInfo(int index) { int ix=cE.index; if (!syncInfo) return; docSyncInfo si=(*syncInfo)[ix]; - QString text=i18n("Status of the database %1:\n\n").arg(si.handheldDB); + TQString text=i18n("Status of the database %1:\n\n").arg(si.handheldDB); text+=i18n("Handheld: %1\n").arg(eTextStatusToString(si.fPalmStatus)); text+=i18n("Desktop: %1\n").arg(eTextStatusToString(si.fPCStatus)); diff --git a/kpilot/conduits/docconduit/doc-conflictdialog.h b/kpilot/conduits/docconduit/doc-conflictdialog.h index f8ad8caf7..00a3ef1a5 100644 --- a/kpilot/conduits/docconduit/doc-conflictdialog.h +++ b/kpilot/conduits/docconduit/doc-conflictdialog.h @@ -43,9 +43,9 @@ class KPilotLink; typedef struct conflictEntry { - QLabel*dbname; - QComboBox* resolution; - QPushButton*info; + TQLabel*dbname; + TQComboBox* resolution; + TQPushButton*info; int index; bool conflict; }; @@ -56,23 +56,23 @@ class ResolutionDialog : public KDialogBase Q_OBJECT public: - ResolutionDialog( QWidget* parent=0, const QString& caption=i18n("Resolution Dialog"), syncInfoList*sinfo=0L, KPilotLink*lnk=0L); + ResolutionDialog( TQWidget* parent=0, const TQString& caption=i18n("Resolution Dialog"), syncInfoList*sinfo=0L, KPilotLink*lnk=0L); ~ResolutionDialog(); bool hasConflicts; public slots: void _tickle(); protected: - QTimer* tickleTimer; + TQTimer* tickleTimer; KPilotLink* fHandle; protected: - QGroupBox* resolutionGroupBox; - QGridLayout*resolutionGroupBoxLayout; + TQGroupBox* resolutionGroupBox; + TQGridLayout*resolutionGroupBoxLayout; syncInfoList*syncInfo; - QValueList<conflictEntry> conflictEntries; - QLabel *textLabel1,*textLabel2; + TQValueList<conflictEntry> conflictEntries; + TQLabel *textLabel1,*textLabel2; protected slots: virtual void slotOk(); diff --git a/kpilot/conduits/docconduit/doc-factory.cc b/kpilot/conduits/docconduit/doc-factory.cc index 3d2a16b11..cfab20f4d 100644 --- a/kpilot/conduits/docconduit/doc-factory.cc +++ b/kpilot/conduits/docconduit/doc-factory.cc @@ -54,7 +54,7 @@ const char *DOCConduitFactory::dbDOCcreator = "REAd"; -DOCConduitFactory::DOCConduitFactory(QObject * p, const char *n): +DOCConduitFactory::DOCConduitFactory(TQObject * p, const char *n): KLibFactory(p, n) { FUNCTIONSETUP; @@ -77,8 +77,8 @@ DOCConduitFactory::~DOCConduitFactory() } -/* virtual */ QObject * DOCConduitFactory::createObject(QObject * p, - const char *n, const char *c, const QStringList & a) +/* virtual */ TQObject * DOCConduitFactory::createObject(TQObject * p, + const char *n, const char *c, const TQStringList & a) { FUNCTIONSETUP; @@ -87,7 +87,7 @@ DOCConduitFactory::~DOCConduitFactory() #endif if (qstrcmp(c, "ConduitConfigBase") == 0) { - QWidget *w = dynamic_cast<QWidget *>(p); + TQWidget *w = dynamic_cast<TQWidget *>(p); if (w) { return new DOCWidgetConfig(w,n); diff --git a/kpilot/conduits/docconduit/doc-factory.h b/kpilot/conduits/docconduit/doc-factory.h index c848777a0..312b9def9 100644 --- a/kpilot/conduits/docconduit/doc-factory.h +++ b/kpilot/conduits/docconduit/doc-factory.h @@ -41,7 +41,7 @@ class DOCConduitFactory:public KLibFactory Q_OBJECT public: - DOCConduitFactory(QObject * = 0L, const char * = 0L); + DOCConduitFactory(TQObject * = 0L, const char * = 0L); virtual ~ DOCConduitFactory(); static KAboutData *about() { @@ -55,10 +55,10 @@ public: protected: - virtual QObject * createObject(QObject * parent = 0, + virtual TQObject * createObject(TQObject * parent = 0, const char *name = 0, - const char *classname = "QObject", - const QStringList & args = QStringList()); + const char *classname = "TQObject", + const TQStringList & args = TQStringList()); private: KInstance * fInstance; diff --git a/kpilot/conduits/docconduit/doc-setup.cc b/kpilot/conduits/docconduit/doc-setup.cc index a6de2d2ad..6e6858a5c 100644 --- a/kpilot/conduits/docconduit/doc-setup.cc +++ b/kpilot/conduits/docconduit/doc-setup.cc @@ -28,10 +28,10 @@ #include "options.h" -#include <qtabwidget.h> -#include <qcheckbox.h> -#include <qbuttongroup.h> -#include <qcombobox.h> +#include <tqtabwidget.h> +#include <tqcheckbox.h> +#include <tqbuttongroup.h> +#include <tqcombobox.h> #include <kconfig.h> #include <kurlrequester.h> @@ -43,7 +43,7 @@ #include "docconduitSettings.h" -DOCWidgetConfig::DOCWidgetConfig(QWidget * w, const char *n): +DOCWidgetConfig::DOCWidgetConfig(TQWidget * w, const char *n): ConduitConfigBase(w, n), fConfigWidget(new DOCWidget(w)) { @@ -51,8 +51,8 @@ DOCWidgetConfig::DOCWidgetConfig(QWidget * w, const char *n): fWidget=fConfigWidget; - QStringList l = KGlobal::charsets()->descriptiveEncodingNames(); - for ( QStringList::Iterator it = l.begin(); it != l.end(); ++it) + TQStringList l = KGlobal::charsets()->descriptiveEncodingNames(); + for ( TQStringList::Iterator it = l.begin(); it != l.end(); ++it) { fConfigWidget->fEncoding->insertItem(*it); } @@ -63,9 +63,9 @@ DOCWidgetConfig::DOCWidgetConfig(QWidget * w, const char *n): fConduitName=i18n("Palm DOC"); -#define CMOD(a,b) connect(fConfigWidget->a,SIGNAL(b),this,SLOT(modified())) - CMOD(fTXTDir,textChanged(const QString &)); - CMOD(fPDBDir,textChanged(const QString &)); +#define CMOD(a,b) connect(fConfigWidget->a,TQT_SIGNAL(b),this,TQT_SLOT(modified())) + CMOD(fTXTDir,textChanged(const TQString &)); + CMOD(fPDBDir,textChanged(const TQString &)); CMOD(fkeepPDBLocally,clicked()); CMOD(fConflictResolution,clicked(int)); CMOD(fConvertBookmarks,stateChanged(int)); @@ -77,7 +77,7 @@ DOCWidgetConfig::DOCWidgetConfig(QWidget * w, const char *n): CMOD(fNoConversionOfBmksOnly,stateChanged(int)); CMOD(fAlwaysUseResolution,stateChanged(int)); CMOD(fPCBookmarks,clicked(int)); - CMOD(fEncoding,textChanged(const QString &)); + CMOD(fEncoding,textChanged(const TQString &)); #undef CMOD fConfigWidget->adjustSize(); diff --git a/kpilot/conduits/docconduit/doc-setup.h b/kpilot/conduits/docconduit/doc-setup.h index 470585e01..32d1b54bc 100644 --- a/kpilot/conduits/docconduit/doc-setup.h +++ b/kpilot/conduits/docconduit/doc-setup.h @@ -36,7 +36,7 @@ class DOCWidget; class DOCWidgetConfig : public ConduitConfigBase { public: - DOCWidgetConfig(QWidget *, const char *); + DOCWidgetConfig(TQWidget *, const char *); virtual void commit(); virtual void load(); protected: diff --git a/kpilot/conduits/docconduit/kpalmdoc_dlg.cc b/kpilot/conduits/docconduit/kpalmdoc_dlg.cc index 5bdacba8c..29713ffae 100644 --- a/kpilot/conduits/docconduit/kpalmdoc_dlg.cc +++ b/kpilot/conduits/docconduit/kpalmdoc_dlg.cc @@ -31,12 +31,12 @@ #include <stdio.h> #include <iostream> -#include <qtabwidget.h> -#include <qcheckbox.h> -#include <qradiobutton.h> -#include <qbuttongroup.h> -#include <qlabel.h> -#include <qcombobox.h> +#include <tqtabwidget.h> +#include <tqcheckbox.h> +#include <tqradiobutton.h> +#include <tqbuttongroup.h> +#include <tqlabel.h> +#include <tqcombobox.h> #include <klocale.h> #include <kconfig.h> @@ -54,24 +54,24 @@ #include "kpalmdocSettings.h" -ConverterDlg::ConverterDlg( QWidget *parent, const QString& caption) +ConverterDlg::ConverterDlg( TQWidget *parent, const TQString& caption) : KDialogBase( parent, "converterdialog", false, caption, KDialogBase::Close|KDialogBase::Help|KDialogBase::User1, KDialogBase::Close, true, i18n("&About")) { - QWidget *page = makeHBoxMainWidget(); + TQWidget *page = makeHBoxMainWidget(); dlg=new ConverterDlgBase(page); - QStringList l = KGlobal::charsets()->descriptiveEncodingNames(); - for ( QStringList::Iterator it = l.begin(); it != l.end(); ++it) + TQStringList l = KGlobal::charsets()->descriptiveEncodingNames(); + for ( TQStringList::Iterator it = l.begin(); it != l.end(); ++it) { dlg->fEncoding->insertItem(*it); } readSettings(); - connect(dlg->fDirectories, SIGNAL(toggled(bool)), - this, SLOT(slotDirectories(bool))); - connect(dlg->fTextToPDB, SIGNAL(clicked()), this, SLOT(slotToPDB())); - connect(dlg->fPDBToText, SIGNAL(clicked()), this, SLOT(slotToText())); + connect(dlg->fDirectories, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotDirectories(bool))); + connect(dlg->fTextToPDB, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotToPDB())); + connect(dlg->fPDBToText, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotToText())); resize(minimumSize()); } @@ -117,7 +117,7 @@ void ConverterDlg::readSettings() slotDirectories(dir); dlg->fAskOverwrite->setChecked( KPalmDocSettings::askOverwrite() ); dlg->fVerbose->setChecked( KPalmDocSettings::verboseMessages() ); - QString encoding = KPalmDocSettings::encoding(); + TQString encoding = KPalmDocSettings::encoding(); #ifdef DEBUG DEBUGKPILOT << fname << ": Encoding=" << encoding << endl; #endif @@ -162,11 +162,11 @@ void ConverterDlg::slotToText() bool dir=dlg->fDirectories->isChecked(); - QString txturl=dlg->fTXTDir->url(); - QString pdburl=dlg->fPDBDir->url(); + TQString txturl=dlg->fTXTDir->url(); + TQString pdburl=dlg->fPDBDir->url(); - QFileInfo txtinfo(txturl); - QFileInfo pdbinfo(pdburl); + TQFileInfo txtinfo(txturl); + TQFileInfo pdbinfo(pdburl); if (dir) { @@ -176,7 +176,7 @@ void ConverterDlg::slotToText() i18n("<qt>You selected to sync folders, " "but gave a filename instead (<em>%1</em>)." "<br>Use folder <em>%2</em> instead?</qt>").arg(pdburl) - .arg(pdbinfo.dirPath(true)), QString::null, i18n("Use Folder"), KStdGuiItem::cancel()); + .arg(pdbinfo.dirPath(true)), TQString::null, i18n("Use Folder"), KStdGuiItem::cancel()); if (res==KMessageBox::Yes) { pdburl=pdbinfo.dirPath(true); @@ -212,7 +212,7 @@ void ConverterDlg::slotToText() i18n("<qt>You selected to sync folders, " "but gave a filename instead (<em>%1</em>)." "<br>Use folder <em>%2</em> instead?</qt>").arg(txturl) - .arg(txtinfo.dirPath(true)), QString::null, i18n("Use Folder"), KStdGuiItem::cancel()); + .arg(txtinfo.dirPath(true)), TQString::null, i18n("Use Folder"), KStdGuiItem::cancel()); if (res==KMessageBox::Yes) { txturl=txtinfo.dirPath(true); txtinfo.setFile(txturl); @@ -235,13 +235,13 @@ void ConverterDlg::slotToText() // Now that we have both directories, create the converter object DEBUGKPILOT<<"Pdbinfo.dir="<<pdbinfo.dir().absPath()<<endl; DEBUGKPILOT<<"txtinfo.dir="<<txtinfo.dir().absPath()<<endl; - QStringList pdbfiles(pdbinfo.dir().entryList(CSL1("*.pdb"))); - QStringList converted_Files; + TQStringList pdbfiles(pdbinfo.dir().entryList(CSL1("*.pdb"))); + TQStringList converted_Files; DEBUGKPILOT<<"Length of filename list: "<<pdbfiles.size()<<endl; - for ( QStringList::Iterator it = pdbfiles.begin(); it != pdbfiles.end(); ++it ) + for ( TQStringList::Iterator it = pdbfiles.begin(); it != pdbfiles.end(); ++it ) { - QString txtfile=QFileInfo(*it).baseName(true)+CSL1(".txt"); + TQString txtfile=TQFileInfo(*it).baseName(true)+CSL1(".txt"); DEBUGKPILOT<<"pdbfile="<<*it<<", pdbdir="<<pdburl<<", txtfile="<<txtfile<<", txtdir="<<txturl<<endl; if (convertPDBtoTXT(pdburl, *it, txturl, txtfile, &conv)) { @@ -311,11 +311,11 @@ void ConverterDlg::slotToPDB() bool dir=dlg->fDirectories->isChecked(); - QString txturl=dlg->fTXTDir->url(); - QString pdburl=dlg->fPDBDir->url(); + TQString txturl=dlg->fTXTDir->url(); + TQString pdburl=dlg->fPDBDir->url(); - QFileInfo txtinfo(txturl); - QFileInfo pdbinfo(pdburl); + TQFileInfo txtinfo(txturl); + TQFileInfo pdbinfo(pdburl); if (dir) { @@ -325,7 +325,7 @@ void ConverterDlg::slotToPDB() i18n("<qt>You selected to sync folders, " "but gave a filename instead (<em>%1</em>)." "<br>Use folder <em>%2</em> instead?</qt>").arg(txturl) - .arg(txtinfo.dirPath(true)), QString::null, i18n("Use Folder"), KStdGuiItem::cancel()); + .arg(txtinfo.dirPath(true)), TQString::null, i18n("Use Folder"), KStdGuiItem::cancel()); if (res==KMessageBox::Yes) { txturl=txtinfo.dirPath(true); @@ -351,7 +351,7 @@ void ConverterDlg::slotToPDB() "but gave a filename instead (<em>%1</em>)." "<br>Use folder <em>%2</em> instead?</qt>") .arg(pdburl) - .arg(pdbinfo.dirPath(true)), QString::null, i18n("Use Folder"), KStdGuiItem::cancel()); + .arg(pdbinfo.dirPath(true)), TQString::null, i18n("Use Folder"), KStdGuiItem::cancel()); if (res==KMessageBox::Yes) { pdburl=pdbinfo.dirPath(true); pdbinfo.setFile(pdburl); @@ -373,13 +373,13 @@ void ConverterDlg::slotToPDB() // Now that we have both directories, create the converter object DEBUGKPILOT<<"Pdbinfo.dir="<<pdbinfo.dir().absPath()<<endl; DEBUGKPILOT<<"txtinfo.dir="<<txtinfo.dir().absPath()<<endl; - QStringList txtfiles(txtinfo.dir().entryList(CSL1("*.txt"))); - QStringList converted_Files; + TQStringList txtfiles(txtinfo.dir().entryList(CSL1("*.txt"))); + TQStringList converted_Files; DEBUGKPILOT<<"Length of filename list: "<<txtfiles.size()<<endl; - for ( QStringList::Iterator it = txtfiles.begin(); it != txtfiles.end(); ++it ) + for ( TQStringList::Iterator it = txtfiles.begin(); it != txtfiles.end(); ++it ) { - QString pdbfile=QFileInfo(*it).baseName(true)+CSL1(".pdb"); + TQString pdbfile=TQFileInfo(*it).baseName(true)+CSL1(".pdb"); DEBUGKPILOT<<"pdbfile="<<pdbfile<<", pdbdir="<<pdburl<<", txtfile="<<*it<<", txtdir="<<txturl<<endl; if (convertTXTtoPDB(txturl, *it, pdburl, pdbfile, &conv)) { @@ -444,19 +444,19 @@ void ConverterDlg::slotDirectories(bool dir) } } -bool ConverterDlg::convertTXTtoPDB(QString txtdir, QString txtfile, - QString pdbdir, QString pdbfile, DOCConverter*conv) +bool ConverterDlg::convertTXTtoPDB(TQString txtdir, TQString txtfile, + TQString pdbdir, TQString pdbfile, DOCConverter*conv) { FUNCTIONSETUP; bool res=false; - QFileInfo dbfileinfo(pdbdir, pdbfile); + TQFileInfo dbfileinfo(pdbdir, pdbfile); DEBUGKPILOT<<"Working on file "<<pdbfile<<endl; if (!dbfileinfo.exists() || !askOverwrite || (KMessageBox::Yes==KMessageBox::questionYesNo(this, i18n("<qt>The database file <em>%1</em> already exists. Overwrite it?</qt>") - .arg(dbfileinfo.filePath()), QString::null, i18n("Overwrite"), KStdGuiItem::cancel() ) )) + .arg(dbfileinfo.filePath()), TQString::null, i18n("Overwrite"), KStdGuiItem::cancel() ) )) { - PilotLocalDatabase*pdbdb=new PilotLocalDatabase(pdbdir, QFileInfo(pdbfile).baseName(), false); + PilotLocalDatabase*pdbdb=new PilotLocalDatabase(pdbdir, TQFileInfo(pdbfile).baseName(), false); if (pdbdb) { if (!pdbdb->isOpen()) @@ -489,19 +489,19 @@ bool ConverterDlg::convertTXTtoPDB(QString txtdir, QString txtfile, return res; } -bool ConverterDlg::convertPDBtoTXT(QString pdbdir, QString pdbfile, - QString txtdir, QString txtfile, DOCConverter*conv) +bool ConverterDlg::convertPDBtoTXT(TQString pdbdir, TQString pdbfile, + TQString txtdir, TQString txtfile, DOCConverter*conv) { FUNCTIONSETUP; bool res=false; - QFileInfo txtfileinfo(txtdir, txtfile); + TQFileInfo txtfileinfo(txtdir, txtfile); DEBUGKPILOT<<"Working on file "<<txtfile<<endl; if (!txtfileinfo.exists() || !askOverwrite || (KMessageBox::Yes==KMessageBox::questionYesNo(this, i18n("<qt>The text file <em>%1</em> already exists. Overwrite it?</qt>") - .arg(txtfileinfo.filePath()), QString::null, i18n("Overwrite"), KStdGuiItem::cancel() ) )) + .arg(txtfileinfo.filePath()), TQString::null, i18n("Overwrite"), KStdGuiItem::cancel() ) )) { - PilotLocalDatabase*pdbdb=new PilotLocalDatabase(pdbdir, QFileInfo(pdbfile).baseName(), false); + PilotLocalDatabase*pdbdb=new PilotLocalDatabase(pdbdir, TQFileInfo(pdbfile).baseName(), false); if (pdbdb) { if (pdbdb->isOpen()) diff --git a/kpilot/conduits/docconduit/kpalmdoc_dlg.h b/kpilot/conduits/docconduit/kpalmdoc_dlg.h index 410b24568..5e9202b00 100644 --- a/kpilot/conduits/docconduit/kpalmdoc_dlg.h +++ b/kpilot/conduits/docconduit/kpalmdoc_dlg.h @@ -37,7 +37,7 @@ class ConverterDlg : public KDialogBase Q_OBJECT public: - ConverterDlg( QWidget *parent=0, const QString& caption=0); + ConverterDlg( TQWidget *parent=0, const TQString& caption=0); ~ConverterDlg(); protected slots: @@ -51,10 +51,10 @@ protected: void readSettings(); // These two functions convert one single file to or from a pdb database - bool convertTXTtoPDB(QString txtdir, QString txtfile, - QString pdbdir, QString pdbfile, DOCConverter*conv); - bool convertPDBtoTXT(QString pdbdir, QString pdbfile, - QString txtdir, QString txtfile, DOCConverter*conv); + bool convertTXTtoPDB(TQString txtdir, TQString txtfile, + TQString pdbdir, TQString pdbfile, DOCConverter*conv); + bool convertPDBtoTXT(TQString pdbdir, TQString pdbfile, + TQString txtdir, TQString txtfile, DOCConverter*conv); // The actual dialog widget (designer created) holding all controls diff --git a/kpilot/conduits/docconduit/pilotDOCEntry.h b/kpilot/conduits/docconduit/pilotDOCEntry.h index b1b9ba45b..4ecaf19a9 100644 --- a/kpilot/conduits/docconduit/pilotDOCEntry.h +++ b/kpilot/conduits/docconduit/pilotDOCEntry.h @@ -48,11 +48,11 @@ public: PilotDOCEntry & operator=(const PilotDOCEntry & e); - QString getText() { + TQString getText() { fText.Decompress(); - return QString::fromLatin1((const char *) fText.text()); + return TQString::fromLatin1((const char *) fText.text()); }; - void setText(QString newtext, bool compressed = false) { + void setText(TQString newtext, bool compressed = false) { fText.setText((const unsigned char *) newtext.latin1(), newtext.length(), compressed); }; diff --git a/kpilot/conduits/knotes/knotes-action.cc b/kpilot/conduits/knotes/knotes-action.cc index 905e5ef39..ca3291321 100644 --- a/kpilot/conduits/knotes/knotes-action.cc +++ b/kpilot/conduits/knotes/knotes-action.cc @@ -29,8 +29,8 @@ #include "options.h" -#include <qmap.h> -#include <qtimer.h> +#include <tqmap.h> +#include <tqtimer.h> #include <kapplication.h> @@ -63,8 +63,8 @@ unsigned long version_conduit_knotes = Pilot::PLUGIN_API; } -typedef QString KNoteID_t; -typedef const QString &KNoteID_pt; +typedef TQString KNoteID_t; +typedef const TQString &KNoteID_pt; class NoteAndMemo { @@ -79,21 +79,21 @@ public: int memo() const { return memoId; } ; KNoteID_t note() const { return noteId; } ; inline bool valid() const { return (memoId>0) && (!noteId.isEmpty()) ; } ; - QString toString() const { return CSL1("<%1,%2>").arg(noteId).arg(memoId); } ; + TQString toString() const { return CSL1("<%1,%2>").arg(noteId).arg(memoId); } ; - static NoteAndMemo findNote(const QValueList<NoteAndMemo> &,KNoteID_pt note); - static NoteAndMemo findMemo(const QValueList<NoteAndMemo> &,int memo); + static NoteAndMemo findNote(const TQValueList<NoteAndMemo> &,KNoteID_pt note); + static NoteAndMemo findMemo(const TQValueList<NoteAndMemo> &,int memo); protected: KNoteID_t noteId; int memoId; } ; -NoteAndMemo NoteAndMemo::findNote(const QValueList<NoteAndMemo> &l ,KNoteID_pt note) +NoteAndMemo NoteAndMemo::findNote(const TQValueList<NoteAndMemo> &l ,KNoteID_pt note) { FUNCTIONSETUP; - for (QValueList<NoteAndMemo>::ConstIterator it = l.begin(); + for (TQValueList<NoteAndMemo>::ConstIterator it = l.begin(); it != l.end(); ++it) { @@ -103,11 +103,11 @@ NoteAndMemo NoteAndMemo::findNote(const QValueList<NoteAndMemo> &l ,KNoteID_pt n return NoteAndMemo(); } -NoteAndMemo NoteAndMemo::findMemo(const QValueList<NoteAndMemo> &l , int memo) +NoteAndMemo NoteAndMemo::findMemo(const TQValueList<NoteAndMemo> &l , int memo) { FUNCTIONSETUP; - for (QValueList<NoteAndMemo>::ConstIterator it =l.begin(); + for (TQValueList<NoteAndMemo>::ConstIterator it =l.begin(); it != l.end(); ++it) { @@ -158,7 +158,7 @@ public: //KNotesIface_stub *fKNotes; // The timer for invoking process() to do some more work. - QTimer *fTimer; + TQTimer *fTimer; // The database we're working with (MemoDB) // PilotSerialDatabase *fDatabase; @@ -175,7 +175,7 @@ public: // We need to translate between the ids that KNotes uses and // Pilot id's, so we make a list of pairs. // - QValueList<NoteAndMemo> fIdList; + TQValueList<NoteAndMemo> fIdList; // Setting to delete a KNote when the corresponding memo // has been deleted. @@ -185,7 +185,7 @@ public: KNotesAction::KNotesAction(KPilotLink *o, - const char *n, const QStringList &a) : + const char *n, const TQStringList &a) : ConduitAction(o,n ? n : "knotes-conduit",a), fP(new KNotesActionPrivate) { @@ -220,7 +220,7 @@ KNotesAction::KNotesAction(KPilotLink *o, return true; } - QString e; + TQString e; if (!openKNotesResource()) return false; // Database names seem to be latin1 @@ -233,13 +233,13 @@ KNotesAction::KNotesAction(KPilotLink *o, return false; } - fP->fTimer = new QTimer(this); + fP->fTimer = new TQTimer(this); fActionStatus = Init; // this is not needed. As it is done in the initstate in process(); // resetIndexes(); - connect(fP->fTimer,SIGNAL(timeout()),SLOT(process())); + connect(fP->fTimer,TQT_SIGNAL(timeout()),TQT_SLOT(process())); fP->fTimer->start(0,false); return true; @@ -257,7 +257,7 @@ bool KNotesAction::openKNotesResource() KConfig korgcfg( locate( "config", CSL1("korganizerrc") ) ); korgcfg.setGroup( "Time & Date" ); - QString tz(korgcfg.readEntry( "TimeZoneId" ) ); + TQString tz(korgcfg.readEntry( "TimeZoneId" ) ); fP->fNotesResource = new KCal::CalendarLocal(tz); KURL mURL = KGlobal::dirs()->saveLocation( "data", "knotes/" ) + "notes.ics"; @@ -395,8 +395,8 @@ void KNotesAction::getConfigInfo() fP->fDeleteNoteForMemo = KNotesConduitSettings::deleteNoteForMemo(); - QValueList<KNoteID_t> notes; - QValueList<int> memos; + TQValueList<KNoteID_t> notes; + TQValueList<int> memos; // Make this match the type of KNoteID_t ! notes=KNotesConduitSettings::noteIds(); @@ -416,8 +416,8 @@ void KNotesAction::getConfigInfo() setFirstSync( true ); } - QValueList<KNoteID_t>::ConstIterator iNotes = notes.begin(); - QValueList<int>::ConstIterator iMemos = memos.begin(); + TQValueList<KNoteID_t>::ConstIterator iNotes = notes.begin(); + TQValueList<int>::ConstIterator iMemos = memos.begin(); while((iNotes != notes.end()) && (iMemos != memos.end())) { @@ -465,7 +465,7 @@ bool KNotesAction::modifyNoteOnPilot() if (nm.valid()) { - QString text,title,body; + TQString text,title,body; title = fP->fIndex.data(); body = fP->fKNotes->text(fP->fIndex.key()); if (body.startsWith(title)) @@ -517,7 +517,7 @@ bool KNotesAction::deleteNoteOnPilot() FUNCTIONSETUP; /* - QValueList<NoteAndMemo>::Iterator i = fP->fIdList.begin(); + TQValueList<NoteAndMemo>::Iterator i = fP->fIdList.begin(); while ( i != fP->fIdList.end() ) { // TODO DCOP_REMOVE @@ -732,7 +732,7 @@ int KNotesAction::addNoteToPilot() << endl; #endif - QString text = j->summary() + CSL1("\n"); + TQString text = j->summary() + CSL1("\n"); text.append( j->description() ); //TODO DCOP_REMOVAL //text.append(fP->fKNotes->text(fP->fIndex.key())); @@ -775,10 +775,10 @@ void KNotesAction::cleanupMemos() << endl; #endif - QValueList<KNoteID_t> notes; - QValueList<int> memos; + TQValueList<KNoteID_t> notes; + TQValueList<int> memos; - for (QValueList<NoteAndMemo>::ConstIterator i = + for (TQValueList<NoteAndMemo>::ConstIterator i = fP->fIdList.begin(); i!=fP->fIdList.end(); ++i) @@ -846,7 +846,7 @@ void KNotesAction::cleanupMemos() } -/* virtual */ QString KNotesAction::statusString() const +/* virtual */ TQString KNotesAction::statusString() const { switch(fActionStatus) { diff --git a/kpilot/conduits/knotes/knotes-action.h b/kpilot/conduits/knotes/knotes-action.h index 695e90747..eb490e0a7 100644 --- a/kpilot/conduits/knotes/knotes-action.h +++ b/kpilot/conduits/knotes/knotes-action.h @@ -41,7 +41,7 @@ public: KNotesAction( KPilotLink *o, const char *n = 0L, - const QStringList &a = QStringList() ); + const TQStringList &a = TQStringList() ); virtual ~KNotesAction(); enum Status { Init, @@ -51,7 +51,7 @@ public: MemosToKNotes, Cleanup, Done } ; - virtual QString statusString() const; + virtual TQString statusString() const; protected: virtual bool exec(); diff --git a/kpilot/conduits/knotes/knotes-factory.cc b/kpilot/conduits/knotes/knotes-factory.cc index a919e1ed1..9601e81e5 100644 --- a/kpilot/conduits/knotes/knotes-factory.cc +++ b/kpilot/conduits/knotes/knotes-factory.cc @@ -57,7 +57,7 @@ void *init_conduit_knotes() /* static */ KAboutData *KNotesConduitFactory::fAbout = 0L; -KNotesConduitFactory::KNotesConduitFactory(QObject *p, const char *n) : +KNotesConduitFactory::KNotesConduitFactory(TQObject *p, const char *n) : KLibFactory(p,n) { FUNCTIONSETUP; @@ -85,10 +85,10 @@ KNotesConduitFactory::~KNotesConduitFactory() KPILOT_DELETE(fAbout); } -/* virtual */ QObject *KNotesConduitFactory::createObject( QObject *p, +/* virtual */ TQObject *KNotesConduitFactory::createObject( TQObject *p, const char *n, const char *c, - const QStringList &a) + const TQStringList &a) { FUNCTIONSETUP; @@ -101,7 +101,7 @@ KNotesConduitFactory::~KNotesConduitFactory() if (qstrcmp(c,"ConduitConfigBase")==0) { - QWidget *w = dynamic_cast<QWidget *>(p); + TQWidget *w = dynamic_cast<TQWidget *>(p); if (w) { return new KNotesConfigBase(w,0L); diff --git a/kpilot/conduits/knotes/knotes-factory.h b/kpilot/conduits/knotes/knotes-factory.h index 94ad44429..02b0f6102 100644 --- a/kpilot/conduits/knotes/knotes-factory.h +++ b/kpilot/conduits/knotes/knotes-factory.h @@ -39,7 +39,7 @@ class KNotesConduitFactory : public KLibFactory Q_OBJECT public: - KNotesConduitFactory(QObject * = 0L,const char * = 0L); + KNotesConduitFactory(TQObject * = 0L,const char * = 0L); virtual ~KNotesConduitFactory(); static KAboutData *about() { return fAbout; } ; @@ -50,10 +50,10 @@ public: // break its value. We store group and entry keys in here. protected: - virtual QObject* createObject( QObject* parent = 0, + virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0, - const char* classname = "QObject", - const QStringList &args = QStringList() ); + const char* classname = "TQObject", + const TQStringList &args = TQStringList() ); private: KInstance *fInstance; static KAboutData *fAbout; diff --git a/kpilot/conduits/knotes/knotes-setup.cc b/kpilot/conduits/knotes/knotes-setup.cc index da8b31c48..1127011ad 100644 --- a/kpilot/conduits/knotes/knotes-setup.cc +++ b/kpilot/conduits/knotes/knotes-setup.cc @@ -28,10 +28,10 @@ #include "options.h" -#include <qtabwidget.h> -#include <qcheckbox.h> -#include <qmap.h> -#include <qtimer.h> +#include <tqtabwidget.h> +#include <tqcheckbox.h> +#include <tqmap.h> +#include <tqtimer.h> #include <kapplication.h> #include <kconfig.h> @@ -43,19 +43,19 @@ #include "knotesconduitSettings.h" -KNotesConfigBase::KNotesConfigBase(QWidget *w, const char *n) : +KNotesConfigBase::KNotesConfigBase(TQWidget *w, const char *n) : ConduitConfigBase(w,n), fConfigWidget(0L) { fConfigWidget = new KNotesWidget(w); ConduitConfigBase::addAboutPage(fConfigWidget->tabWidget,KNotesConduitFactory::about()); fWidget = fConfigWidget; - QObject::connect(fConfigWidget->fDeleteNoteForMemo,SIGNAL(clicked()), - this,SLOT(modified())); - QObject::connect(fConfigWidget->fSuppressConfirm,SIGNAL(clicked()), - this,SLOT(modified())); - QObject::connect(fConfigWidget->fDeleteNoteForMemo,SIGNAL(toggled(bool)), - fConfigWidget->fSuppressConfirm,SLOT(setEnabled(bool))); + TQObject::connect(fConfigWidget->fDeleteNoteForMemo,TQT_SIGNAL(clicked()), + this,TQT_SLOT(modified())); + TQObject::connect(fConfigWidget->fSuppressConfirm,TQT_SIGNAL(clicked()), + this,TQT_SLOT(modified())); + TQObject::connect(fConfigWidget->fDeleteNoteForMemo,TQT_SIGNAL(toggled(bool)), + fConfigWidget->fSuppressConfirm,TQT_SLOT(setEnabled(bool))); fConduitName=i18n("KNotes"); } @@ -76,7 +76,7 @@ void KNotesConfigBase::load() unmodified(); } -/* static */ ConduitConfigBase *KNotesConfigBase::create(QWidget *w, const char *n) +/* static */ ConduitConfigBase *KNotesConfigBase::create(TQWidget *w, const char *n) { return new KNotesConfigBase(w,n); } diff --git a/kpilot/conduits/knotes/knotes-setup.h b/kpilot/conduits/knotes/knotes-setup.h index 9e7603df7..652f22238 100644 --- a/kpilot/conduits/knotes/knotes-setup.h +++ b/kpilot/conduits/knotes/knotes-setup.h @@ -36,12 +36,12 @@ class KNotesWidget; class KNotesConfigBase : public ConduitConfigBase { public: - KNotesConfigBase(QWidget *parent, const char *name); + KNotesConfigBase(TQWidget *parent, const char *name); virtual void commit(); virtual void load(); - static ConduitConfigBase *create(QWidget *p, const char *n); + static ConduitConfigBase *create(TQWidget *p, const char *n); private: KNotesWidget *fConfigWidget; } ; diff --git a/kpilot/conduits/malconduit/mal-conduit.cc b/kpilot/conduits/malconduit/mal-conduit.cc index 73a77a141..95c4d64b5 100644 --- a/kpilot/conduits/malconduit/mal-conduit.cc +++ b/kpilot/conduits/malconduit/mal-conduit.cc @@ -34,7 +34,7 @@ #include "options.h" -#include <qregexp.h> +#include <tqregexp.h> #include <kconfig.h> #include <kdebug.h> @@ -109,7 +109,7 @@ static int32 cbItem (void */*out*/, MALConduit::MALConduit(KPilotLink * o, const char *n, - const QStringList & a) : + const TQStringList & a) : ConduitAction(o, n, a) { FUNCTIONSETUP; @@ -144,7 +144,7 @@ void MALConduit::readConfig() void MALConduit::saveConfig() { FUNCTIONSETUP; - MALConduitSettings::setLastMALSync( QDateTime::currentDateTime() ); + MALConduitSettings::setLastMALSync( TQDateTime::currentDateTime() ); MALConduitSettings::self()->writeConfig(); } @@ -152,8 +152,8 @@ void MALConduit::saveConfig() bool MALConduit::skip() { - QDateTime now=QDateTime::currentDateTime(); - QDateTime lastSync=MALConduitSettings::lastMALSync(); + TQDateTime now=TQDateTime::currentDateTime(); + TQDateTime lastSync=MALConduitSettings::lastMALSync(); if (!lastSync.isValid() || !now.isValid()) return false; @@ -203,9 +203,9 @@ bool MALConduit::skip() return false; } - QString proxyServer( MALConduitSettings::proxyServer() ); + TQString proxyServer( MALConduitSettings::proxyServer() ); int proxyPort( MALConduitSettings::proxyPort() ); - QString syncMessage; + TQString syncMessage; bool canContinue = true; // Set all proxy settings switch (MALConduitSettings::proxyType()) @@ -222,7 +222,7 @@ bool MALConduit::skip() #ifdef DEBUG DEBUGKPILOT<<" Using HTTP proxy server \""<<proxyServer<< "\", Port "<<proxyPort<<", User "<<MALConduitSettings::proxyUser()<< - ", Password "<<( (MALConduitSettings::proxyPassword().isEmpty())?QString("not "):QString())<<"set" + ", Password "<<( (MALConduitSettings::proxyPassword().isEmpty())?TQString("not "):TQString())<<"set" <<endl; #endif #ifdef LIBMAL20 @@ -261,7 +261,7 @@ bool MALConduit::skip() } syncMessage = i18n("Using SOCKS proxy: %1").arg(proxyServer); #ifdef DEBUG - DEBUGKPILOT<<" Using SOCKS proxy server \""<<proxyServer<<"\", Port "<<proxyPort<<", User "<<MALConduitSettings::proxyUser()<<", Password "<<( (MALConduitSettings::proxyPassword().isEmpty())?QString("not "):QString() )<<"set"<<endl; + DEBUGKPILOT<<" Using SOCKS proxy server \""<<proxyServer<<"\", Port "<<proxyPort<<", User "<<MALConduitSettings::proxyUser()<<", Password "<<( (MALConduitSettings::proxyPassword().isEmpty())?TQString("not "):TQString() )<<"set"<<endl; #endif #ifdef LIBMAL20 setSocksProxy( const_cast<char *>(proxyServer.latin1()) ); @@ -304,13 +304,13 @@ bool MALConduit::skip() return delayDone(); } -void MALConduit::printLogMessage(QString msg) +void MALConduit::printLogMessage(TQString msg) { FUNCTIONSETUP; // Remove the pseudo-progressbar: - QString newmsg(msg); - newmsg.replace( QRegExp("^\\s*\\.*\\s*"), ""); - newmsg.replace( QRegExp("\\s*\\.*\\s*$"), ""); + TQString newmsg(msg); + newmsg.replace( TQRegExp("^\\s*\\.*\\s*"), ""); + newmsg.replace( TQRegExp("\\s*\\.*\\s*$"), ""); if (newmsg.length()>0) { emit logMessage(newmsg); diff --git a/kpilot/conduits/malconduit/mal-conduit.h b/kpilot/conduits/malconduit/mal-conduit.h index 83f72ace1..3f5c14a04 100644 --- a/kpilot/conduits/malconduit/mal-conduit.h +++ b/kpilot/conduits/malconduit/mal-conduit.h @@ -42,9 +42,9 @@ public: MALConduit( KPilotLink *o, const char *n = 0L, - const QStringList &a = QStringList() ); + const TQStringList &a = TQStringList() ); virtual ~MALConduit(); - void printLogMessage(QString msg); + void printLogMessage(TQString msg); virtual bool exec(); protected: diff --git a/kpilot/conduits/malconduit/mal-factory.cc b/kpilot/conduits/malconduit/mal-factory.cc index f9a8bcafb..3e363d269 100644 --- a/kpilot/conduits/malconduit/mal-factory.cc +++ b/kpilot/conduits/malconduit/mal-factory.cc @@ -60,7 +60,7 @@ unsigned long version_conduit_mal = Pilot::PLUGIN_API; // KAboutData *MALConduitFactory::fAbout = 0L; -MALConduitFactory::MALConduitFactory(QObject *p, const char *n) : +MALConduitFactory::MALConduitFactory(TQObject *p, const char *n) : KLibFactory(p,n) { FUNCTIONSETUP; @@ -90,10 +90,10 @@ MALConduitFactory::~MALConduitFactory() KPILOT_DELETE(fAbout); } -/* virtual */ QObject *MALConduitFactory::createObject( QObject *p, +/* virtual */ TQObject *MALConduitFactory::createObject( TQObject *p, const char *n, const char *c, - const QStringList &a) + const TQStringList &a) { FUNCTIONSETUP; @@ -106,7 +106,7 @@ MALConduitFactory::~MALConduitFactory() if (qstrcmp(c,"ConduitConfigBase")==0) { - QWidget *w = dynamic_cast<QWidget *>(p); + TQWidget *w = dynamic_cast<TQWidget *>(p); if (w) { diff --git a/kpilot/conduits/malconduit/mal-factory.h b/kpilot/conduits/malconduit/mal-factory.h index 82631e1ac..a15316381 100644 --- a/kpilot/conduits/malconduit/mal-factory.h +++ b/kpilot/conduits/malconduit/mal-factory.h @@ -42,16 +42,16 @@ class MALConduitFactory : public KLibFactory Q_OBJECT public: - MALConduitFactory(QObject * = 0L,const char * = 0L); + MALConduitFactory(TQObject * = 0L,const char * = 0L); virtual ~MALConduitFactory(); static KAboutData *about() { return fAbout; } ; protected: - virtual QObject* createObject( QObject* parent = 0, + virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0, - const char* classname = "QObject", - const QStringList &args = QStringList() ); + const char* classname = "TQObject", + const TQStringList &args = TQStringList() ); private: KInstance *fInstance; static KAboutData *fAbout; diff --git a/kpilot/conduits/malconduit/mal-setup.cc b/kpilot/conduits/malconduit/mal-setup.cc index d2652b035..1d1f89ff2 100644 --- a/kpilot/conduits/malconduit/mal-setup.cc +++ b/kpilot/conduits/malconduit/mal-setup.cc @@ -32,11 +32,11 @@ #include "options.h" -#include <qtabwidget.h> -#include <qradiobutton.h> -#include <qbuttongroup.h> -#include <qlineedit.h> -#include <qcheckbox.h> +#include <tqtabwidget.h> +#include <tqradiobutton.h> +#include <tqbuttongroup.h> +#include <tqlineedit.h> +#include <tqcheckbox.h> #include <kcombobox.h> #include <knuminput.h> @@ -53,7 +53,7 @@ #include "malconduitSettings.h" -MALWidgetSetup::MALWidgetSetup(QWidget *w, const char *n) : +MALWidgetSetup::MALWidgetSetup(TQWidget *w, const char *n) : ConduitConfigBase(w,n), fConfigWidget(new MALWidget(w)) { @@ -65,21 +65,21 @@ MALWidgetSetup::MALWidgetSetup(QWidget *w, const char *n) : fConfigWidget->tabWidget->adjustSize(); fConfigWidget->resize(fConfigWidget->tabWidget->size()); -#define CM(a,b) connect(fConfigWidget->a,b,this,SLOT(modified())); - CM( syncTime, SIGNAL(clicked(int)) ); - CM( proxyType, SIGNAL(clicked(int)) ); - - CM( proxyServerName, SIGNAL(textChanged(const QString &)) ); - CM( proxyCustomPortCheck, SIGNAL(clicked()) ); - CM( proxyCustomPort, SIGNAL(valueChanged(int)) ); - CM( proxyUserName, SIGNAL(textChanged(const QString &)) ); - CM( proxyPassword, SIGNAL(textChanged(const QString &)) ); - - CM( malServerName, SIGNAL(textChanged(const QString &)) ); - CM( malCustomPortCheck, SIGNAL(clicked()) ); - CM( malCustomPort, SIGNAL(valueChanged(int)) ); - CM( malUserName, SIGNAL(textChanged(const QString &)) ); - CM( malPassword, SIGNAL(textChanged(const QString &)) ); +#define CM(a,b) connect(fConfigWidget->a,b,this,TQT_SLOT(modified())); + CM( syncTime, TQT_SIGNAL(clicked(int)) ); + CM( proxyType, TQT_SIGNAL(clicked(int)) ); + + CM( proxyServerName, TQT_SIGNAL(textChanged(const TQString &)) ); + CM( proxyCustomPortCheck, TQT_SIGNAL(clicked()) ); + CM( proxyCustomPort, TQT_SIGNAL(valueChanged(int)) ); + CM( proxyUserName, TQT_SIGNAL(textChanged(const TQString &)) ); + CM( proxyPassword, TQT_SIGNAL(textChanged(const TQString &)) ); + + CM( malServerName, TQT_SIGNAL(textChanged(const TQString &)) ); + CM( malCustomPortCheck, TQT_SIGNAL(clicked()) ); + CM( malCustomPort, TQT_SIGNAL(valueChanged(int)) ); + CM( malUserName, TQT_SIGNAL(textChanged(const TQString &)) ); + CM( malPassword, TQT_SIGNAL(textChanged(const TQString &)) ); #undef CM } @@ -150,7 +150,7 @@ MALWidgetSetup::~MALWidgetSetup() fConfigWidget->proxyCustomPort->setValue(proxyPortNr); } fConfigWidget->proxyUserName->setText(MALConduitSettings::proxyUser()); - fConfigWidget->proxyPassword->setText(QString::null); + fConfigWidget->proxyPassword->setText(TQString::null); fConfigWidget->proxyPassword->insert(MALConduitSettings::proxyPassword()); #ifdef DEBUG @@ -178,7 +178,7 @@ MALWidgetSetup::~MALWidgetSetup() unmodified(); } -/* static */ ConduitConfigBase *MALWidgetSetup::create(QWidget *w, const char *n) +/* static */ ConduitConfigBase *MALWidgetSetup::create(TQWidget *w, const char *n) { return new MALWidgetSetup(w,n); } diff --git a/kpilot/conduits/malconduit/mal-setup.h b/kpilot/conduits/malconduit/mal-setup.h index 78b6a0ee2..6a6337496 100644 --- a/kpilot/conduits/malconduit/mal-setup.h +++ b/kpilot/conduits/malconduit/mal-setup.h @@ -41,11 +41,11 @@ class MALWidgetSetup : public ConduitConfigBase { Q_OBJECT public: - MALWidgetSetup(QWidget *,const char *); + MALWidgetSetup(TQWidget *,const char *); virtual ~MALWidgetSetup(); virtual void load(); virtual void commit(); - static ConduitConfigBase *create(QWidget *, const char *); + static ConduitConfigBase *create(TQWidget *, const char *); private: MALWidget *fConfigWidget; } ; diff --git a/kpilot/conduits/memofileconduit/memofile-conduit.cc b/kpilot/conduits/memofileconduit/memofile-conduit.cc index 1dc5fe386..7c2402eaf 100644 --- a/kpilot/conduits/memofileconduit/memofile-conduit.cc +++ b/kpilot/conduits/memofileconduit/memofile-conduit.cc @@ -41,9 +41,9 @@ #include "pilotMemo.h" -#include <qfile.h> -#include <qdir.h> -#include <qtextcodec.h> +#include <tqfile.h> +#include <tqdir.h> +#include <tqtextcodec.h> #include <kconfig.h> #include <kdebug.h> @@ -60,9 +60,9 @@ */ MemofileConduit::MemofileConduit(KPilotLink *d, const char *n, - const QStringList &l) : + const TQStringList &l) : ConduitAction(d,n,l), - _DEFAULT_MEMODIR(QDir::homeDirPath() + CSL1("/MyMemos")), + _DEFAULT_MEMODIR(TQDir::homeDirPath() + CSL1("/MyMemos")), fMemoAppInfo(0L), _memofiles(0L) { @@ -145,7 +145,7 @@ bool MemofileConduit::readConfig() { FUNCTIONSETUP; - QString dir(MemofileConduitSettings::directory()); + TQString dir(MemofileConduitSettings::directory()); if (dir.isEmpty()) { dir = _DEFAULT_MEMODIR; @@ -235,7 +235,7 @@ bool MemofileConduit::loadPilotCategories() fCategories.clear(); - QString _category_name; + TQString _category_name; int _category_id=0; int _category_num=0; @@ -378,7 +378,7 @@ void MemofileConduit::listPilotMemos() PilotMemo *memo; for ( memo = fMemoList.first(); memo; memo = fMemoList.next() ) { - QString _category_name = fCategories[memo->category()]; + TQString _category_name = fCategories[memo->category()]; DEBUGKPILOT << fConduitName << ": listing record id: [" << memo->id() @@ -421,7 +421,7 @@ bool MemofileConduit::copyPCToHH() _memofiles->load(true); - QPtrList<Memofile> memofiles = _memofiles->getAll(); + TQPtrList<Memofile> memofiles = _memofiles->getAll(); Memofile * memofile; @@ -484,7 +484,7 @@ int MemofileConduit::writeToPilot(Memofile * memofile) memofile->setID(newid); - QString status; + TQString status; if (oldid <=0) { fCtrHH->created(); status = "new to pilot"; @@ -534,7 +534,7 @@ bool MemofileConduit::sync() _memofiles->addModifiedMemo(memo); } - QPtrList<Memofile> memofiles = _memofiles->getModified(); + TQPtrList<Memofile> memofiles = _memofiles->getModified(); Memofile *memofile; for ( memofile = memofiles.first(); memofile; memofile = memofiles.next() ) { diff --git a/kpilot/conduits/memofileconduit/memofile-conduit.h b/kpilot/conduits/memofileconduit/memofile-conduit.h index 08fdbd0f7..c79506611 100644 --- a/kpilot/conduits/memofileconduit/memofile-conduit.h +++ b/kpilot/conduits/memofileconduit/memofile-conduit.h @@ -40,7 +40,7 @@ Q_OBJECT public: MemofileConduit(KPilotLink *, const char *name=0L, - const QStringList &args = QStringList()); + const TQStringList &args = TQStringList()); virtual ~MemofileConduit(); protected: @@ -57,7 +57,7 @@ private: bool _sync_private; PilotMemoInfo *fMemoAppInfo; - QPtrList<PilotMemo> fMemoList; + TQPtrList<PilotMemo> fMemoList; // our categories MemoCategoryMap fCategories; diff --git a/kpilot/conduits/memofileconduit/memofile-factory.cc b/kpilot/conduits/memofileconduit/memofile-factory.cc index e373a0185..795edc33d 100644 --- a/kpilot/conduits/memofileconduit/memofile-factory.cc +++ b/kpilot/conduits/memofileconduit/memofile-factory.cc @@ -28,9 +28,9 @@ #include "options.h" -#include <qtabwidget.h> -#include <qlineedit.h> -#include <qcheckbox.h> +#include <tqtabwidget.h> +#include <tqlineedit.h> +#include <tqcheckbox.h> #include <kconfig.h> #include <kinstance.h> @@ -46,14 +46,14 @@ class MemofileConduitConfig : public ConduitConfigBase { public: - MemofileConduitConfig(QWidget *parent=0L, const char *n=0L); + MemofileConduitConfig(TQWidget *parent=0L, const char *n=0L); virtual void commit(); virtual void load(); protected: MemofileWidget *fConfigWidget; } ; -MemofileConduitConfig::MemofileConduitConfig(QWidget *p, const char *n) : +MemofileConduitConfig::MemofileConduitConfig(TQWidget *p, const char *n) : ConduitConfigBase(p,n), fConfigWidget(new MemofileWidget(p)) { @@ -72,10 +72,10 @@ MemofileConduitConfig::MemofileConduitConfig(QWidget *p, const char *n) : ConduitConfigBase::addAboutPage(fConfigWidget->tabWidget,about); fWidget=fConfigWidget; - QObject::connect(fConfigWidget->fDirectory,SIGNAL(textChanged(const QString&)), - this,SLOT(modified())); - QObject::connect(fConfigWidget->fSyncPrivate,SIGNAL(toggled(bool)), - this,SLOT(modified())); + TQObject::connect(fConfigWidget->fDirectory,TQT_SIGNAL(textChanged(const TQString&)), + this,TQT_SLOT(modified())); + TQObject::connect(fConfigWidget->fSyncPrivate,TQT_SIGNAL(toggled(bool)), + this,TQT_SLOT(modified())); } diff --git a/kpilot/conduits/memofileconduit/memofile.cc b/kpilot/conduits/memofileconduit/memofile.cc index 1428c487d..3a7ff6c3a 100644 --- a/kpilot/conduits/memofileconduit/memofile.cc +++ b/kpilot/conduits/memofileconduit/memofile.cc @@ -27,7 +27,7 @@ #include "memofile.h" -Memofile::Memofile(PilotMemo * memo, QString categoryName, QString fileName, QString baseDirectory) : +Memofile::Memofile(PilotMemo * memo, TQString categoryName, TQString fileName, TQString baseDirectory) : PilotMemo(memo,memo->text()), _categoryName(categoryName), _filename(fileName), _baseDirectory(baseDirectory) { _lastModified = 0; @@ -36,7 +36,7 @@ Memofile::Memofile(PilotMemo * memo, QString categoryName, QString fileName, QSt } Memofile::Memofile(recordid_t id, int category, uint lastModifiedTime, uint size, - QString categoryName, QString fileName, QString baseDirectory) : + TQString categoryName, TQString fileName, TQString baseDirectory) : PilotMemo(), _categoryName(categoryName), _filename(fileName),_baseDirectory(baseDirectory) { @@ -47,7 +47,7 @@ Memofile::Memofile(recordid_t id, int category, uint lastModifiedTime, uint size _modified = _modifiedByPalm = false; } -Memofile::Memofile(int category, QString categoryName, QString fileName, QString baseDirectory) : +Memofile::Memofile(int category, TQString categoryName, TQString fileName, TQString baseDirectory) : PilotMemo(), _categoryName(categoryName), _filename(fileName), _baseDirectory(baseDirectory) { @@ -70,7 +70,7 @@ bool Memofile::load() return false; } - QFile f( filenameAbs() ); + TQFile f( filenameAbs() ); if ( !f.open( IO_ReadOnly ) ) { DEBUGKPILOT << fname << ": Couldn't open file: [" << filenameAbs() << "] to read. " @@ -78,9 +78,9 @@ bool Memofile::load() return false; } - QTextStream ts( &f ); + TQTextStream ts( &f ); - QString text,title,body; + TQString text,title,body; title = filename(); body = ts.read(); @@ -136,7 +136,7 @@ bool Memofile::deleteFile() FUNCTIONSETUP; DEBUGKPILOT << fname << ": deleting file: [" << filenameAbs() << "]." << endl; - return QFile::remove(filenameAbs()); + return TQFile::remove(filenameAbs()); } @@ -156,7 +156,7 @@ bool Memofile::saveFile() << filenameAbs() << "]" << endl; - QFile f( filenameAbs() ); + TQFile f( filenameAbs() ); if ( !f.open( IO_WriteOnly ) ) { DEBUGKPILOT << fname << ": Couldn't open file: [" << filenameAbs() << "] to write your memo to. " @@ -164,7 +164,7 @@ bool Memofile::saveFile() return false; } - QTextStream stream(&f); + TQTextStream stream(&f); stream << text() << endl; f.close(); @@ -226,14 +226,14 @@ bool Memofile::isModifiedBySize() uint Memofile::getFileLastModified() { - QFileInfo f = QFileInfo(filenameAbs()); + TQFileInfo f = TQFileInfo(filenameAbs()); uint lastModifiedTime = f.lastModified().toTime_t(); return lastModifiedTime; } uint Memofile::getFileSize() { - QFileInfo f = QFileInfo(filenameAbs()); + TQFileInfo f = TQFileInfo(filenameAbs()); uint size = f.size(); return size; } diff --git a/kpilot/conduits/memofileconduit/memofile.h b/kpilot/conduits/memofileconduit/memofile.h index 27931cdfe..4bd5fb776 100644 --- a/kpilot/conduits/memofileconduit/memofile.h +++ b/kpilot/conduits/memofileconduit/memofile.h @@ -40,10 +40,10 @@ #include <pi-memo.h> -#include <qfile.h> -#include <qdir.h> -#include <qtextstream.h> -#include <qtextcodec.h> +#include <tqfile.h> +#include <tqdir.h> +#include <tqtextstream.h> +#include <tqtextcodec.h> #include "pilotMemo.h" @@ -55,9 +55,9 @@ class Memofile : public PilotMemo { public: - Memofile(PilotMemo * memo, QString categoryName, QString fileName, QString baseDirectory); - Memofile(recordid_t id, int category, uint lastModifiedTime, uint size, QString categoryName, QString filename, QString baseDirectory); - Memofile(int category, QString categoryName, QString fileName, QString baseDirectory); + Memofile(PilotMemo * memo, TQString categoryName, TQString fileName, TQString baseDirectory); + Memofile(recordid_t id, int category, uint lastModifiedTime, uint size, TQString categoryName, TQString filename, TQString baseDirectory); + Memofile(int category, TQString categoryName, TQString fileName, TQString baseDirectory); uint lastModified() const { return _lastModified; } ; uint size() const { return _size; } ; @@ -72,30 +72,30 @@ class Memofile : public PilotMemo bool load(); - bool fileExists() { return QFile::exists(filenameAbs()); } ; + bool fileExists() { return TQFile::exists(filenameAbs()); } ; void setID(recordid_t id); bool save(); bool deleteFile(); - QString toString() { - return CSL1("id: [") + QString::number(id()) + TQString toString() { + return CSL1("id: [") + TQString::number(id()) + CSL1("], category:[") + _categoryName + CSL1("], filename: [") + _filename + CSL1("]"); } ; - const QString & getCategoryName() { return _categoryName; } ; - const QString & getFilename() { return _filename; } ; - const QString & filename() { return _filename; } ; + const TQString & getCategoryName() { return _categoryName; } ; + const TQString & getFilename() { return _filename; } ; + const TQString & filename() { return _filename; } ; private: bool saveFile(); bool isModifiedByTimestamp(); bool isModifiedBySize(); - QString filenameAbs() { return dirName() + filename(); } ; - QString dirName() { return _baseDirectory + QDir::separator() + _categoryName + QDir::separator(); } ; - bool setCategory(const QString &label); + TQString filenameAbs() { return dirName() + filename(); } ; + TQString dirName() { return _baseDirectory + TQDir::separator() + _categoryName + TQDir::separator(); } ; + bool setCategory(const TQString &label); uint getFileLastModified(); uint getFileSize(); @@ -105,9 +105,9 @@ class Memofile : public PilotMemo uint _lastModified; uint _size; - QString _categoryName; - QString _filename; - QString _baseDirectory; + TQString _categoryName; + TQString _filename; + TQString _baseDirectory; } ; #endif diff --git a/kpilot/conduits/memofileconduit/memofiles.cc b/kpilot/conduits/memofileconduit/memofiles.cc index 2846d448b..db3d8cacc 100644 --- a/kpilot/conduits/memofileconduit/memofiles.cc +++ b/kpilot/conduits/memofileconduit/memofiles.cc @@ -30,17 +30,17 @@ #include "memofiles.h" #include "memofile.h" -QString Memofiles::FIELD_SEP = CSL1("\t"); +TQString Memofiles::FIELD_SEP = CSL1("\t"); Memofiles::Memofiles (MemoCategoryMap & categories, PilotMemoInfo &appInfo, - QString & baseDirectory, CUDCounter &fCtrPC) : + TQString & baseDirectory, CUDCounter &fCtrPC) : _categories(categories), _memoAppInfo(appInfo), _baseDirectory(baseDirectory), _cudCounter(fCtrPC) { FUNCTIONSETUP; _memofiles.clear(); - _memoMetadataFile = _baseDirectory + QDir::separator() + CSL1(".ids"); - _categoryMetadataFile = _baseDirectory + QDir::separator() + CSL1(".categories"); + _memoMetadataFile = _baseDirectory + TQDir::separator() + CSL1(".ids"); + _categoryMetadataFile = _baseDirectory + TQDir::separator() + CSL1(".categories"); _memofiles.setAutoDelete(true); _ready = ensureDirectoryReady(); @@ -67,10 +67,10 @@ void Memofiles::load (bool loadAll) for ( it = _categories.begin(); it != _categories.end(); ++it ) { int category = it.key(); - QString categoryName = it.data(); - QString categoryDirname = _baseDirectory + QDir::separator() + categoryName; + TQString categoryName = it.data(); + TQString categoryDirname = _baseDirectory + TQDir::separator() + categoryName; - QDir dir = QDir(categoryDirname); + TQDir dir = TQDir(categoryDirname); if (! dir.exists() ) { DEBUGKPILOT << fname << ": category directory: [" << categoryDirname @@ -79,11 +79,11 @@ void Memofiles::load (bool loadAll) } - QStringList entries = dir.entryList(QDir::Files); - QString file; - for(QStringList::Iterator it = entries.begin(); it != entries.end(); ++it) { + TQStringList entries = dir.entryList(TQDir::Files); + TQString file; + for(TQStringList::Iterator it = entries.begin(); it != entries.end(); ++it) { file = *it; - QFileInfo info(dir, file); + TQFileInfo info(dir, file); if(info.isFile() && info.isReadable()) { // DEBUGKPILOT << fname @@ -151,13 +151,13 @@ bool Memofiles::ensureDirectoryReady() int failures = 0; // now make sure that a directory for each category exists. - QString _category_name; - QString dir; + TQString _category_name; + TQString dir; MemoCategoryMap::Iterator it; for ( it = _categories.begin(); it != _categories.end(); ++it ) { _category_name = it.data(); - dir = _baseDirectory + QDir::separator() + _category_name; + dir = _baseDirectory + TQDir::separator() + _category_name; DEBUGKPILOT << fname << ": checking directory: [" << dir << "]" << endl; @@ -169,12 +169,12 @@ bool Memofiles::ensureDirectoryReady() return failures == 0; } -bool Memofiles::checkDirectory(QString & dir) +bool Memofiles::checkDirectory(TQString & dir) { FUNCTIONSETUP; // make sure that the directory we're asked to write to exists - QDir d(dir); - QFileInfo fid( dir ); + TQDir d(dir); + TQFileInfo fid( dir ); if ( ! fid.isDir() ) { @@ -212,15 +212,15 @@ void Memofiles::eraseLocalMemos () MemoCategoryMap::Iterator it; for ( it = _categories.begin(); it != _categories.end(); ++it ) { - QString dir = _baseDirectory + QDir::separator() + it.data(); + TQString dir = _baseDirectory + TQDir::separator() + it.data(); - if (!folderRemove(QDir(dir))) { + if (!folderRemove(TQDir(dir))) { DEBUGKPILOT << fname << ": couldn't erase all local memos from: [" << dir << "]." << endl; } } - QDir d(_baseDirectory); + TQDir d(_baseDirectory); d.remove(_memoMetadataFile); ensureDirectoryReady(); @@ -228,7 +228,7 @@ void Memofiles::eraseLocalMemos () _memofiles.clear(); } -void Memofiles::setPilotMemos (QPtrList<PilotMemo> & memos) +void Memofiles::setPilotMemos (TQPtrList<PilotMemo> & memos) { FUNCTIONSETUP; @@ -252,7 +252,7 @@ bool Memofiles::loadFromMetadata () _memofiles.clear(); - QFile f( _memoMetadataFile ); + TQFile f( _memoMetadataFile ); if ( !f.open( IO_ReadOnly ) ) { DEBUGKPILOT << fname << ": ooh, bad. couldn't open your memo-id file for reading." @@ -260,15 +260,15 @@ bool Memofiles::loadFromMetadata () return false; } - QTextStream t( &f ); + TQTextStream t( &f ); Memofile * memofile; while ( !t.atEnd() ) { - QString data = t.readLine(); + TQString data = t.readLine(); int errors = 0; bool ok; - QStringList fields = QStringList::split( FIELD_SEP, data ); + TQStringList fields = TQStringList::split( FIELD_SEP, data ); if ( fields.count() >= 4 ) { int id = fields[0].toInt( &ok ); if ( !ok ) @@ -282,7 +282,7 @@ bool Memofiles::loadFromMetadata () uint size = fields[3].toInt( &ok ); if ( !ok ) errors++; - QString filename = fields[4]; + TQString filename = fields[4]; if ( filename.isEmpty() ) errors++; @@ -331,7 +331,7 @@ Memofile * Memofiles::find (recordid_t id) } -Memofile * Memofiles::find (const QString & category, const QString & filename) +Memofile * Memofiles::find (const TQString & category, const TQString & filename) { Memofile * memofile; @@ -371,8 +371,8 @@ void Memofiles::addModifiedMemo (PilotMemo * memo) return; } - QString debug = CSL1(": adding a PilotMemo. id: [") - + QString::number(memo->id()) + CSL1("], title: [") + TQString debug = CSL1(": adding a PilotMemo. id: [") + + TQString::number(memo->id()) + CSL1("], title: [") + memo->getTitle() + CSL1("]. "); Memofile * memofile = find(memo->id()); @@ -400,11 +400,11 @@ void Memofiles::addModifiedMemo (PilotMemo * memo) } -QPtrList<Memofile> Memofiles::getModified () +TQPtrList<Memofile> Memofiles::getModified () { FUNCTIONSETUP; - QPtrList<Memofile> modList; + TQPtrList<Memofile> modList; modList.clear(); Memofile * memofile; @@ -441,8 +441,8 @@ bool Memofiles::saveMemoMetadata() << ": saving memo metadata to file: [" << _memoMetadataFile << "]" << endl; - QFile f( _memoMetadataFile ); - QTextStream stream(&f); + TQFile f( _memoMetadataFile ); + TQTextStream stream(&f); if( !f.open(IO_WriteOnly) ) { DEBUGKPILOT << fname @@ -484,8 +484,8 @@ MemoCategoryMap Memofiles::readCategoryMetadata() MemoCategoryMap map; map.clear(); - QFile f( _categoryMetadataFile ); - QTextStream stream(&f); + TQFile f( _categoryMetadataFile ); + TQTextStream stream(&f); if( !f.open(IO_ReadOnly) ) { DEBUGKPILOT << fname @@ -496,16 +496,16 @@ MemoCategoryMap Memofiles::readCategoryMetadata() while ( !stream.atEnd() ) { - QString data = stream.readLine(); + TQString data = stream.readLine(); int errors = 0; bool ok; - QStringList fields = QStringList::split( FIELD_SEP, data ); + TQStringList fields = TQStringList::split( FIELD_SEP, data ); if ( fields.count() >= 2 ) { int id = fields[0].toInt( &ok ); if ( !ok ) errors++; - QString categoryName = fields[1]; + TQString categoryName = fields[1]; if ( categoryName.isEmpty() ) errors++; @@ -541,8 +541,8 @@ bool Memofiles::saveCategoryMetadata() << ": saving categories to file: [" << _categoryMetadataFile << "]" << endl; - QFile f( _categoryMetadataFile ); - QTextStream stream(&f); + TQFile f( _categoryMetadataFile ); + TQTextStream stream(&f); if( !f.open(IO_WriteOnly) ) { DEBUGKPILOT << fname @@ -601,8 +601,8 @@ bool Memofiles::saveMemos() bool Memofiles::isFirstSync() { FUNCTIONSETUP; - bool metadataExists = QFile::exists(_memoMetadataFile) && - QFile::exists(_categoryMetadataFile); + bool metadataExists = TQFile::exists(_memoMetadataFile) && + TQFile::exists(_categoryMetadataFile); bool valid = metadataExists && _metadataLoaded; @@ -615,19 +615,19 @@ bool Memofiles::isFirstSync() -bool Memofiles::folderRemove(const QDir &_d) +bool Memofiles::folderRemove(const TQDir &_d) { FUNCTIONSETUP; - QDir d = _d; + TQDir d = _d; - QStringList entries = d.entryList(); - for(QStringList::Iterator it = entries.begin(); it != entries.end(); ++it) { + TQStringList entries = d.entryList(); + for(TQStringList::Iterator it = entries.begin(); it != entries.end(); ++it) { if(*it == CSL1(".") || *it == CSL1("..")) continue; - QFileInfo info(d, *it); + TQFileInfo info(d, *it); if(info.isDir()) { - if(!folderRemove(QDir(info.filePath()))) + if(!folderRemove(TQDir(info.filePath()))) return FALSE; } else { DEBUGKPILOT << fname @@ -635,7 +635,7 @@ bool Memofiles::folderRemove(const QDir &_d) d.remove(info.filePath()); } } - QString name = d.dirName(); + TQString name = d.dirName(); if(!d.cdUp()) return FALSE; DEBUGKPILOT << fname @@ -645,14 +645,14 @@ bool Memofiles::folderRemove(const QDir &_d) return TRUE; } -QString Memofiles::filename(PilotMemo * memo) +TQString Memofiles::filename(PilotMemo * memo) { FUNCTIONSETUP; - QString filename = memo->getTitle(); + TQString filename = memo->getTitle(); if (filename.isEmpty()) { - QString text = memo->text(); + TQString text = memo->text(); int i = text.find(CSL1("\n")); if (i > 1) { filename = text.left(i); @@ -664,7 +664,7 @@ QString Memofiles::filename(PilotMemo * memo) filename = sanitizeName(filename); - QString category = _categories[memo->category()]; + TQString category = _categories[memo->category()]; Memofile * memofile = find(category, filename); @@ -676,22 +676,22 @@ QString Memofiles::filename(PilotMemo * memo) } int uniq = 2; - QString newfilename; + TQString newfilename; // try to find a good filename, but only do this 20 times at the most. // if our user has 20 memos with the same filename, he/she is asking // for trouble. while (NULL != memofile && uniq <=20) { - newfilename = QString(filename + CSL1(".") + QString::number(uniq++) ); + newfilename = TQString(filename + CSL1(".") + TQString::number(uniq++) ); memofile = find(category, newfilename); } return newfilename; } -QString Memofiles::sanitizeName(QString name) +TQString Memofiles::sanitizeName(TQString name) { - QString clean = name; + TQString clean = name; // safety net. we can't save a // filesystem separator as part of a filename, now can we? clean.replace('/', CSL1("-")); diff --git a/kpilot/conduits/memofileconduit/memofiles.h b/kpilot/conduits/memofileconduit/memofiles.h index ec0497d5b..72b6ed4a9 100644 --- a/kpilot/conduits/memofileconduit/memofiles.h +++ b/kpilot/conduits/memofileconduit/memofiles.h @@ -27,11 +27,11 @@ */ #include "plugin.h" -#include <qmap.h> +#include <tqmap.h> #include "memofile.h" -typedef QMap<int, QString> MemoCategoryMap; +typedef TQMap<int, TQString> MemoCategoryMap; class Memofile; @@ -40,29 +40,29 @@ class Memofiles { public: Memofiles (MemoCategoryMap & categories, PilotMemoInfo &appInfo, - QString & baseDirectory, CUDCounter &fCtrHH); + TQString & baseDirectory, CUDCounter &fCtrHH); ~Memofiles(); void load(bool loadAll); void save(); void eraseLocalMemos(); - void setPilotMemos (QPtrList<PilotMemo> & memos); + void setPilotMemos (TQPtrList<PilotMemo> & memos); void addModifiedMemo (PilotMemo * memo); void deleteMemo (PilotMemo * memo); bool isFirstSync(); bool isReady() { return _ready; }; - QPtrList<Memofile> getModified(); - QPtrList<Memofile> getAll() { return _memofiles; } ; - Memofile * find (const QString & category, const QString & filename); + TQPtrList<Memofile> getModified(); + TQPtrList<Memofile> getAll() { return _memofiles; } ; + Memofile * find (const TQString & category, const TQString & filename); Memofile * find (recordid_t id); MemoCategoryMap readCategoryMetadata(); void setCategories(MemoCategoryMap map) { _categories = map; } ; - static QString FIELD_SEP; - static QString sanitizeName(QString name); + static TQString FIELD_SEP; + static TQString sanitizeName(TQString name); int count() { return _memofiles.count(); } @@ -70,23 +70,23 @@ private: MemoCategoryMap _categories; PilotMemoInfo &_memoAppInfo; - QString & _baseDirectory; + TQString & _baseDirectory; CUDCounter &_cudCounter; - QPtrList<Memofile> _memofiles; + TQPtrList<Memofile> _memofiles; bool loadFromMetadata(); bool ensureDirectoryReady(); - bool checkDirectory(QString & dir); + bool checkDirectory(TQString & dir); bool saveMemoMetadata(); bool saveCategoryMetadata(); bool saveMemos(); - bool folderRemove(const QDir & dir); + bool folderRemove(const TQDir & dir); - QString filename(PilotMemo * memo); + TQString filename(PilotMemo * memo); - QString _categoryMetadataFile; - QString _memoMetadataFile; + TQString _categoryMetadataFile; + TQString _memoMetadataFile; bool _metadataLoaded; bool _ready; diff --git a/kpilot/conduits/notepadconduit/notepad-conduit.cc b/kpilot/conduits/notepadconduit/notepad-conduit.cc index 763f3acd0..da6f085d5 100644 --- a/kpilot/conduits/notepadconduit/notepad-conduit.cc +++ b/kpilot/conduits/notepadconduit/notepad-conduit.cc @@ -40,12 +40,12 @@ #include <pi-notepad.h> -#include <qthread.h> -#include <qapplication.h> -#include <qvaluelist.h> -#include <qimage.h> -#include <qdir.h> -#include <qcstring.h> +#include <tqthread.h> +#include <tqapplication.h> +#include <tqvaluelist.h> +#include <tqimage.h> +#include <tqdir.h> +#include <tqcstring.h> extern "C" { @@ -53,7 +53,7 @@ unsigned long version_conduit_notepad = Pilot::PLUGIN_API; } NotepadConduit::NotepadConduit(KPilotLink *d, const char *n, - const QStringList &args) : ConduitAction(d, n, args) + const TQStringList &args) : ConduitAction(d, n, args) { FUNCTIONSETUP; fConduitName=i18n("Notepad"); @@ -74,7 +74,7 @@ NotepadConduit::~NotepadConduit() DEBUGKPILOT << fname << ": In exec() @" << (unsigned long) this << endl; #endif - QDir dir(NotepadConduitSettings::outputDirectory()); + TQDir dir(NotepadConduitSettings::outputDirectory()); if(!dir.exists() && !dir.mkdir(dir.path())) { emit logError(i18n("Unable to open %1").arg(dir.path())); delayDone(); @@ -91,11 +91,11 @@ NotepadConduit::~NotepadConduit() return true; } -bool NotepadConduit::event(QEvent *e) +bool NotepadConduit::event(TQEvent *e) { FUNCTIONSETUP; - if(e->type() == QEvent::User) { + if(e->type() == TQEvent::User) { #ifdef DEBUG DEBUGKPILOT << fname << ": Notepad thread done." << endl; #endif @@ -115,7 +115,7 @@ bool NotepadConduit::event(QEvent *e) // NotepadActionThread //----------------------------------------------------------------------------- -NotepadActionThread::NotepadActionThread(QObject *parent, KPilotLink *link) : +NotepadActionThread::NotepadActionThread(TQObject *parent, KPilotLink *link) : fParent(parent), fLink(link), notSaved(0), saved(0) { FUNCTIONSETUP; @@ -131,8 +131,8 @@ void NotepadActionThread::run() if ( n > 0 ) { - QValueList<recordid_t> vl = db->idList(); - QValueList<recordid_t>::iterator it; + TQValueList<recordid_t> vl = db->idList(); + TQValueList<recordid_t>::iterator it; struct NotePad a; for ( it = vl.begin(); it != vl.end(); ++it ) { @@ -146,10 +146,10 @@ void NotepadActionThread::run() } } KPILOT_DELETE(db); - QApplication::postEvent(fParent, new QEvent(QEvent::User)); + TQApplication::postEvent(fParent, new TQEvent(TQEvent::User)); } -static void saveImageFromBITS(QImage &image, struct NotePad *n, unsigned int width) +static void saveImageFromBITS(TQImage &image, struct NotePad *n, unsigned int width) { FUNCTIONSETUP; image.setColor(0, qRgb(0xaa, 0xc1 ,0x91)); @@ -175,7 +175,7 @@ static void saveImageFromBITS(QImage &image, struct NotePad *n, unsigned int wid } } -static void saveImageFromUNCOMPRESSED(QImage &image, struct NotePad *n, unsigned int width) +static void saveImageFromUNCOMPRESSED(TQImage &image, struct NotePad *n, unsigned int width) { FUNCTIONSETUP; @@ -219,7 +219,7 @@ void NotepadActionThread::saveImage(struct NotePad *n) int height = n->body.height; - QImage image(width, height, 8, 2); + TQImage image(width, height, 8, 2); switch (n->body.dataType) { @@ -240,7 +240,7 @@ void NotepadActionThread::saveImage(struct NotePad *n) // TODO: Post a warning to the UI } - QString filename(n->name); + TQString filename(n->name); if(filename.isEmpty()) { filename.sprintf("%4d-%02d-%02d_%02d-%02d-%02d", @@ -251,7 +251,7 @@ void NotepadActionThread::saveImage(struct NotePad *n) n->changeDate.min, n->changeDate.sec); } - QString imgname = QString("%1/%2.png").arg(NotepadConduitSettings::outputDirectory()).arg(filename); + TQString imgname = TQString("%1/%2.png").arg(NotepadConduitSettings::outputDirectory()).arg(filename); #ifdef DEBUG diff --git a/kpilot/conduits/notepadconduit/notepad-conduit.h b/kpilot/conduits/notepadconduit/notepad-conduit.h index 5ba915e31..907a306a2 100644 --- a/kpilot/conduits/notepadconduit/notepad-conduit.h +++ b/kpilot/conduits/notepadconduit/notepad-conduit.h @@ -35,7 +35,7 @@ #include "plugin.h" -#include <qthread.h> +#include <tqthread.h> struct NotePad; class NotepadActionThread; @@ -44,9 +44,9 @@ class NotepadConduit : public ConduitAction public: NotepadConduit(KPilotLink *, const char *name=0L, - const QStringList &args = QStringList()); + const TQStringList &args = TQStringList()); virtual ~NotepadConduit(); - virtual bool event(QEvent *e); + virtual bool event(TQEvent *e); protected: virtual bool exec(); // From ConduitAction @@ -62,14 +62,14 @@ private: class NotepadActionThread : public QThread { public: - NotepadActionThread(QObject *parent, KPilotLink *link); + NotepadActionThread(TQObject *parent, KPilotLink *link); virtual void run(); int getFailed() { return notSaved; } int getSaved() { return saved; } private: - QObject *fParent; + TQObject *fParent; KPilotLink *fLink; /** diff --git a/kpilot/conduits/notepadconduit/notepad-factory.cc b/kpilot/conduits/notepadconduit/notepad-factory.cc index f934a2cb1..0e1094b6f 100644 --- a/kpilot/conduits/notepadconduit/notepad-factory.cc +++ b/kpilot/conduits/notepadconduit/notepad-factory.cc @@ -33,7 +33,7 @@ #include <kaboutdata.h> #include <kurlrequester.h> #include <kmessagebox.h> -#include <qlineedit.h> +#include <tqlineedit.h> #include "pluginfactory.h" @@ -47,10 +47,10 @@ class NotepadConduitConfig : public ConduitConfigBase { public: - NotepadConduitConfig(QWidget *parent=0L, const char *n=0L); + NotepadConduitConfig(TQWidget *parent=0L, const char *n=0L); virtual void commit(); virtual void load(); - static ConduitConfigBase *create(QWidget *p, const char *n) + static ConduitConfigBase *create(TQWidget *p, const char *n) { return new NotepadConduitConfig(p, n); }; @@ -80,7 +80,7 @@ static KAboutData *createAbout() } -NotepadConduitConfig::NotepadConduitConfig(QWidget *p, const char *n) : +NotepadConduitConfig::NotepadConduitConfig(TQWidget *p, const char *n) : ConduitConfigBase(p, n), fConfigWidget(new NotepadWidget(p)) { @@ -89,8 +89,8 @@ NotepadConduitConfig::NotepadConduitConfig(QWidget *p, const char *n) : fConduitName = i18n("Notepad"); ConduitConfigBase::addAboutPage(fConfigWidget->tabWidget, createAbout()); fWidget=fConfigWidget; - QObject::connect(fConfigWidget->fOutputDirectory, SIGNAL(textChanged(const QString&)), - this, SLOT(modified())); + TQObject::connect(fConfigWidget->fOutputDirectory, TQT_SIGNAL(textChanged(const TQString&)), + this, TQT_SLOT(modified())); fConfigWidget->fOutputDirectory->setMode(KFile::Directory | KFile::LocalOnly); } diff --git a/kpilot/conduits/null/null-conduit.cc b/kpilot/conduits/null/null-conduit.cc index 56599fec9..f04c7435c 100644 --- a/kpilot/conduits/null/null-conduit.cc +++ b/kpilot/conduits/null/null-conduit.cc @@ -54,7 +54,7 @@ // NullConduit::NullConduit(KPilotLink *d, const char *n, - const QStringList &l) : + const TQStringList &l) : ConduitAction(d,n,l), fDatabase(0L), fFailImmediately( l.contains( CSL1("--fail") )) @@ -82,7 +82,7 @@ NullConduit::~NullConduit() return false; } - QString m(NullConduitSettings::logMessage()); + TQString m(NullConduitSettings::logMessage()); if (!m.isEmpty()) { addSyncLogEntry(m); diff --git a/kpilot/conduits/null/null-conduit.h b/kpilot/conduits/null/null-conduit.h index 7bf1b67de..4cdbbdec4 100644 --- a/kpilot/conduits/null/null-conduit.h +++ b/kpilot/conduits/null/null-conduit.h @@ -51,7 +51,7 @@ public: */ NullConduit(KPilotLink *, const char *name=0L, - const QStringList &args = QStringList()); + const TQStringList &args = TQStringList()); virtual ~NullConduit(); protected: diff --git a/kpilot/conduits/null/null-factory.cc b/kpilot/conduits/null/null-factory.cc index 2a829c6e3..c2d381de6 100644 --- a/kpilot/conduits/null/null-factory.cc +++ b/kpilot/conduits/null/null-factory.cc @@ -28,9 +28,9 @@ #include "options.h" -#include <qtabwidget.h> -#include <qlineedit.h> -#include <qcheckbox.h> +#include <tqtabwidget.h> +#include <tqlineedit.h> +#include <tqcheckbox.h> #include <kconfig.h> #include <kinstance.h> @@ -47,7 +47,7 @@ class NullConduitConfig : public ConduitConfigBase { public: - NullConduitConfig(QWidget *parent=0L, const char *n=0L); + NullConduitConfig(TQWidget *parent=0L, const char *n=0L); virtual void commit(); virtual void load(); protected: @@ -55,7 +55,7 @@ protected: KAboutData *fAbout; } ; -NullConduitConfig::NullConduitConfig(QWidget *p, const char *n) : +NullConduitConfig::NullConduitConfig(TQWidget *p, const char *n) : ConduitConfigBase(p,n), fConfigWidget(new NullWidget(p)) { @@ -74,8 +74,8 @@ NullConduitConfig::NullConduitConfig(QWidget *p, const char *n) : ConduitConfigBase::addAboutPage(fConfigWidget->tabWidget,fAbout); fWidget=fConfigWidget; - QObject::connect(fConfigWidget->fLogMessage,SIGNAL(textChanged(const QString&)), - this,SLOT(modified())); + TQObject::connect(fConfigWidget->fLogMessage,TQT_SIGNAL(textChanged(const TQString&)), + this,TQT_SLOT(modified())); } /* virtual */ void NullConduitConfig::commit() diff --git a/kpilot/conduits/popmail/popmail-conduit.cc b/kpilot/conduits/popmail/popmail-conduit.cc index 47315edaa..8f51545cf 100644 --- a/kpilot/conduits/popmail/popmail-conduit.cc +++ b/kpilot/conduits/popmail/popmail-conduit.cc @@ -41,8 +41,8 @@ unsigned long version_conduit_popmail = Pilot::PLUGIN_API; } -#include <qsocket.h> -#include <qregexp.h> +#include <tqsocket.h> +#include <tqregexp.h> #include <sys/types.h> @@ -60,9 +60,9 @@ unsigned long version_conduit_popmail = Pilot::PLUGIN_API; #endif #include <pi-mail.h> -#include <qdir.h> -#include <qtextstream.h> -#include <qtextcodec.h> +#include <tqdir.h> +#include <tqtextstream.h> +#include <tqtextcodec.h> #include <kapplication.h> #include <kmessagebox.h> @@ -78,11 +78,11 @@ unsigned long version_conduit_popmail = Pilot::PLUGIN_API; #include "popmailSettings.h" #include "setupDialog.h" -static QString DATE_FORMAT("ddd, d MMM yyyy hh:mm:ss"); +static TQString DATE_FORMAT("ddd, d MMM yyyy hh:mm:ss"); PopMailConduit::PopMailConduit(KPilotLink *d, const char *n, - const QStringList &l) : + const TQStringList &l) : ConduitAction(d,n,l) { FUNCTIONSETUP; @@ -157,7 +157,7 @@ int PopMailConduit::sendPendingMail(int mode) } -QString PopMailConduit::getKMailOutbox() const +TQString PopMailConduit::getKMailOutbox() const { FUNCTIONSETUP; @@ -165,7 +165,7 @@ QString PopMailConduit::getKMailOutbox() const KSimpleConfig c(CSL1("kmailrc"),true); c.setGroup("General"); - QString outbox = c.readEntry("outboxFolder"); + TQString outbox = c.readEntry("outboxFolder"); if (outbox.isEmpty()) { outbox = MailConduitSettings::outboxFolder(); @@ -184,7 +184,7 @@ int PopMailConduit::sendViaKMail() { FUNCTIONSETUP; int count=0; - QString kmailOutboxName = getKMailOutbox(); + TQString kmailOutboxName = getKMailOutbox(); DCOPClient *dcopptr = KApplication::kApplication()->dcopClient(); if (!dcopptr) @@ -252,15 +252,15 @@ int PopMailConduit::sendViaKMail() writeMessageToFile(sendf, theMail); - QByteArray data,returnValue; - QCString returnType; - QDataStream arg(data,IO_WriteOnly); + TQByteArray data,returnValue; + TQCString returnType; + TQDataStream arg(data,IO_WriteOnly); arg << kmailOutboxName << t.name() << CSL1("N") ; if (!dcopptr->call("kmail", "KMailIface", - "dcopAddMessage(QString,QString,QString)", + "dcopAddMessage(TQString,TQString,TQString)", data, returnType, returnValue, @@ -302,9 +302,9 @@ void PopMailConduit::writeMessageToFile(FILE* sendf, struct Mail& theMail) { FUNCTIONSETUP; - QTextStream mailPipe(sendf, IO_WriteOnly); + TQTextStream mailPipe(sendf, IO_WriteOnly); - QString fromAddress = MailConduitSettings::emailAddress(); + TQString fromAddress = MailConduitSettings::emailAddress(); mailPipe << "From: " << fromAddress << "\r\n"; mailPipe << "To: " << theMail.to << "\r\n"; if(theMail.cc) @@ -319,13 +319,13 @@ void PopMailConduit::writeMessageToFile(FILE* sendf, struct Mail& theMail) // if our struct indicates that it's dated, then use the date it // holds. otherwise, provide current date. either way, we need to // have a date... - QDateTime date = QDateTime::currentDateTime(); + TQDateTime date = TQDateTime::currentDateTime(); if (theMail.dated) { date = readTm(theMail.date); } - QString dateString = date.toString(DATE_FORMAT); + TQString dateString = date.toString(DATE_FORMAT); mailPipe << "Date: " << dateString << "\r\n"; @@ -343,16 +343,16 @@ void PopMailConduit::writeMessageToFile(FILE* sendf, struct Mail& theMail) } //insert the real signature file from disk - QString signature = MailConduitSettings::signature(); + TQString signature = MailConduitSettings::signature(); if(!signature.isEmpty()) { DEBUGKPILOT << fname << ": Reading signature" << endl; - QFile f(signature); + TQFile f(signature); if ( f.open(IO_ReadOnly) ) { // file opened successfully mailPipe << "-- \r\n"; - QTextStream t( &f ); // use a text stream + TQTextStream t( &f ); // use a text stream while ( !t.eof() ) { // until end of file... mailPipe << t.readLine() << "\r\n"; @@ -370,15 +370,15 @@ void PopMailConduit::writeMessageToFile(FILE* sendf, struct Mail& theMail) { FUNCTIONSETUP; - QString outbox = getKMailOutbox(); + TQString outbox = getKMailOutbox(); DEBUGKPILOT << fname << ": KMail's outbox is " << outbox << endl; - QDateTime date = QDateTime::currentDateTime(); - QString dateString = date.toString(DATE_FORMAT); + TQDateTime date = TQDateTime::currentDateTime(); + TQString dateString = date.toString(DATE_FORMAT); DEBUGKPILOT << fname << ": Date format example: [" << dateString << "]" << endl; diff --git a/kpilot/conduits/popmail/popmail-conduit.h b/kpilot/conduits/popmail/popmail-conduit.h index 1df1a6912..52b5b9174 100644 --- a/kpilot/conduits/popmail/popmail-conduit.h +++ b/kpilot/conduits/popmail/popmail-conduit.h @@ -46,7 +46,7 @@ class PopMailConduit : public ConduitAction public: PopMailConduit(KPilotLink *d, const char *n=0L, - const QStringList &l=QStringList()); + const TQStringList &l=TQStringList()); virtual ~PopMailConduit(); protected: @@ -67,7 +67,7 @@ protected: int sendViaKMail(); // int sendViaSMTP(); void writeMessageToFile(FILE* sendf, struct Mail& theMail); - QString getKMailOutbox() const; + TQString getKMailOutbox() const; }; diff --git a/kpilot/conduits/popmail/setupDialog.cc b/kpilot/conduits/popmail/setupDialog.cc index 64553562b..b8d3db70b 100644 --- a/kpilot/conduits/popmail/setupDialog.cc +++ b/kpilot/conduits/popmail/setupDialog.cc @@ -42,9 +42,9 @@ #include <klineedit.h> #include <kaboutdata.h> -#include <qcheckbox.h> -#include <qdir.h> -#include <qcombobox.h> +#include <tqcheckbox.h> +#include <tqdir.h> +#include <tqcombobox.h> #include "kfiledialog.h" @@ -58,7 +58,7 @@ -PopMailWidgetConfig::PopMailWidgetConfig(QWidget *p,const char *n) : +PopMailWidgetConfig::PopMailWidgetConfig(TQWidget *p,const char *n) : ConduitConfigBase(p,n), fConfigWidget(new PopMailWidget(p,"PopMailWidget")) { @@ -86,14 +86,14 @@ PopMailWidgetConfig::PopMailWidgetConfig(QWidget *p,const char *n) : ConduitConfigBase::addAboutPage(fConfigWidget->fTabWidget,fAbout); fWidget=fConfigWidget; -#define CM(a,b) connect(fConfigWidget->a,b,this,SLOT(modified())); - CM(fSendMode,SIGNAL(activated(int))); - CM(fEmailFrom,SIGNAL(textChanged(const QString &))); - CM(fSignature,SIGNAL(textChanged(const QString &))); +#define CM(a,b) connect(fConfigWidget->a,b,this,TQT_SLOT(modified())); + CM(fSendMode,TQT_SIGNAL(activated(int))); + CM(fEmailFrom,TQT_SIGNAL(textChanged(const TQString &))); + CM(fSignature,TQT_SIGNAL(textChanged(const TQString &))); #undef CM - connect(fConfigWidget->fSendMode,SIGNAL(activated(int)), - this,SLOT(toggleSendMode(int))); + connect(fConfigWidget->fSendMode,TQT_SIGNAL(activated(int)), + this,TQT_SLOT(toggleSendMode(int))); } diff --git a/kpilot/conduits/popmail/setupDialog.h b/kpilot/conduits/popmail/setupDialog.h index 248b4ecbf..76bf9afe5 100644 --- a/kpilot/conduits/popmail/setupDialog.h +++ b/kpilot/conduits/popmail/setupDialog.h @@ -41,11 +41,11 @@ class PopMailWidgetConfig : public ConduitConfigBase { Q_OBJECT public: - PopMailWidgetConfig(QWidget *, const char *); + PopMailWidgetConfig(TQWidget *, const char *); virtual void load(); virtual void commit(); - static ConduitConfigBase *create(QWidget *w, const char *n) + static ConduitConfigBase *create(TQWidget *w, const char *n) { return new PopMailWidgetConfig(w,n); } ; // These enums must follow the order of items in the combo box diff --git a/kpilot/conduits/recordconduit/factory.cc b/kpilot/conduits/recordconduit/factory.cc index 8015763d1..83377336a 100644 --- a/kpilot/conduits/recordconduit/factory.cc +++ b/kpilot/conduits/recordconduit/factory.cc @@ -28,9 +28,9 @@ #include "options.h" -#include <qtabwidget.h> -#include <qlineedit.h> -#include <qcheckbox.h> +#include <tqtabwidget.h> +#include <tqlineedit.h> +#include <tqcheckbox.h> #include <kconfig.h> #include <kinstance.h> @@ -48,7 +48,7 @@ class ConduitConfig : public ConduitConfigBase { public: - ConduitConfig(QWidget *parent=0L, const char *n=0L); + ConduitConfig(TQWidget *parent=0L, const char *n=0L); virtual void commit(); virtual void load(); protected: @@ -56,7 +56,7 @@ protected: KAboutData *fAbout; } ; -ConduitConfig::ConduitConfig(QWidget *p, const char *n) : +ConduitConfig::ConduitConfig(TQWidget *p, const char *n) : ConduitConfigBase(p,n), fConfigWidget(new RecordWidget(p)) { @@ -75,12 +75,12 @@ ConduitConfig::ConduitConfig(QWidget *p, const char *n) : ConduitConfigBase::addAboutPage(fConfigWidget->tabWidget,fAbout); fWidget=fConfigWidget; - QObject::connect(fConfigWidget->fLogMessage,SIGNAL(textChanged(const QString&)), - this,SLOT(modified())); - QObject::connect(fConfigWidget->fDatabases,SIGNAL(textChanged(const QString&)), - this,SLOT(modified())); - QObject::connect(fConfigWidget->fFailImmediately,SIGNAL(toggled(bool)), - this,SLOT(modified())); + TQObject::connect(fConfigWidget->fLogMessage,TQT_SIGNAL(textChanged(const TQString&)), + this,TQT_SLOT(modified())); + TQObject::connect(fConfigWidget->fDatabases,TQT_SIGNAL(textChanged(const TQString&)), + this,TQT_SLOT(modified())); + TQObject::connect(fConfigWidget->fFailImmediately,TQT_SIGNAL(toggled(bool)), + this,TQT_SLOT(modified())); } /* virtual */ void ConduitConfig::commit() diff --git a/kpilot/conduits/sysinfoconduit/sysinfo-conduit.cc b/kpilot/conduits/sysinfoconduit/sysinfo-conduit.cc index b3e69b65c..86fc10752 100644 --- a/kpilot/conduits/sysinfoconduit/sysinfo-conduit.cc +++ b/kpilot/conduits/sysinfoconduit/sysinfo-conduit.cc @@ -29,10 +29,10 @@ #include <pi-version.h> -#include <qtimer.h> -#include <qdir.h> -#include <qfileinfo.h> -#include <qregexp.h> +#include <tqtimer.h> +#include <tqdir.h> +#include <tqfileinfo.h> +#include <tqregexp.h> #include <kconfig.h> #include <kdebug.h> @@ -49,7 +49,7 @@ #include "sysinfo-conduit.moc" #include "sysinfoSettings.h" -const QString SysInfoConduit::defaultpage = CSL1("KPilot System Information Page\n" +const TQString SysInfoConduit::defaultpage = CSL1("KPilot System Information Page\n" "==============================\n" "(Kpilot was unable to find the correct template file, \n" "so this simple template was used.)\n\n" @@ -156,7 +156,7 @@ unsigned long version_conduit_sysinfo = Pilot::PLUGIN_API; SysInfoConduit::SysInfoConduit(KPilotLink * o, const char *n, - const QStringList & a) : + const TQStringList & a) : ConduitAction(o, n, a) { FUNCTIONSETUP; @@ -196,7 +196,7 @@ void SysInfoConduit::readConfig() readConfig(); - QTimer::singleShot(0, this, SLOT(hardwareInfo())); + TQTimer::singleShot(0, this, TQT_SLOT(hardwareInfo())); return true; } @@ -204,7 +204,7 @@ void SysInfoConduit::hardwareInfo() { FUNCTIONSETUP; if (fHardwareInfo) { - QString unknown = i18n("unknown"); + TQString unknown = i18n("unknown"); /* Retrieve values for * - #deviceid# @@ -214,14 +214,14 @@ void SysInfoConduit::hardwareInfo() * - #devicetype# */ KPilotSysInfo sysinfo = fHandle->getSysInfo(); - fValues[CSL1("deviceid")] = QString::fromLatin1(sysinfo.getProductID()); + fValues[CSL1("deviceid")] = TQString::fromLatin1(sysinfo.getProductID()); const KPilotCard *device = fHandle->getCardInfo(); if (device) { - fValues[CSL1("devicename")] = QString::fromLatin1(device->getCardName()); + fValues[CSL1("devicename")] = TQString::fromLatin1(device->getCardName()); fValues[CSL1("devicemodel")] = unknown; // TODO - fValues[CSL1("manufacturer")] = QString::fromLatin1(device->getCardManufacturer()); + fValues[CSL1("manufacturer")] = TQString::fromLatin1(device->getCardManufacturer()); } else { @@ -235,7 +235,7 @@ void SysInfoConduit::hardwareInfo() KPILOT_DELETE(device); keepParts.append(CSL1("hardware")); } else removeParts.append(CSL1("hardware")); - QTimer::singleShot(0, this, SLOT(userInfo())); + TQTimer::singleShot(0, this, TQT_SLOT(userInfo())); } void SysInfoConduit::userInfo() @@ -257,15 +257,15 @@ void SysInfoConduit::userInfo() { fValues[CSL1("pw")] = i18n("No password set"); } - fValues[CSL1("uid")] = QString::number(user.data()->userID); - fValues[CSL1("viewerid")] = QString::number(user.data()->viewerID); + fValues[CSL1("uid")] = TQString::number(user.data()->userID); + fValues[CSL1("viewerid")] = TQString::number(user.data()->viewerID); keepParts.append(CSL1("user")); } else { removeParts.append(CSL1("user")); } - QTimer::singleShot(0, this, SLOT(memoryInfo())); + TQTimer::singleShot(0, this, TQT_SLOT(memoryInfo())); } void SysInfoConduit::memoryInfo() @@ -280,13 +280,13 @@ void SysInfoConduit::memoryInfo() const KPilotCard *device = fHandle->getCardInfo(); if (device) { - fValues[CSL1("rom")] = QString::number(device->getRomSize()/1024); - fValues[CSL1("totalmem")] = QString::number(device->getRamSize()/1024); - fValues[CSL1("freemem")] = QString::number(device->getRamFree()/1024); + fValues[CSL1("rom")] = TQString::number(device->getRomSize()/1024); + fValues[CSL1("totalmem")] = TQString::number(device->getRamSize()/1024); + fValues[CSL1("freemem")] = TQString::number(device->getRamFree()/1024); } keepParts.append(CSL1("memory")); } else removeParts.append(CSL1("memory")); - QTimer::singleShot(0, this, SLOT(storageInfo())); + TQTimer::singleShot(0, this, TQT_SLOT(storageInfo())); } void SysInfoConduit::storageInfo() @@ -299,8 +299,8 @@ void SysInfoConduit::storageInfo() const KPilotCard *device = fHandle->getCardInfo(1); if (device) { fValues[CSL1("cards")] = CSL1("%1 (%2, %3 kB of %3 kB free)") - .arg(QString::fromLatin1(device->getCardName())) - .arg(QString::fromLatin1(device->getCardManufacturer())) + .arg(TQString::fromLatin1(device->getCardName())) + .arg(TQString::fromLatin1(device->getCardManufacturer())) .arg(device->getRamFree()/1024) .arg(device->getRamSize()/1024); KPILOT_DELETE(device); @@ -309,7 +309,7 @@ void SysInfoConduit::storageInfo() } keepParts.append(CSL1("storage")); } else removeParts.append(CSL1("storage")); - QTimer::singleShot(0, this, SLOT(dbListInfo())); + TQTimer::singleShot(0, this, TQT_SLOT(dbListInfo())); } void SysInfoConduit::dbListInfo() @@ -322,7 +322,7 @@ void SysInfoConduit::dbListInfo() dblist=deviceLink()->getDBList(); keepParts.append(CSL1("dblist")); } else removeParts.append(CSL1("dblist")); - QTimer::singleShot(0, this, SLOT(recNumberInfo())); + TQTimer::singleShot(0, this, TQT_SLOT(recNumberInfo())); } void SysInfoConduit::recNumberInfo() @@ -336,34 +336,34 @@ void SysInfoConduit::recNumberInfo() * - #memos# */ PilotDatabase *fDatabase = 0L; - QString ERROR = CSL1("ERROR"); + TQString ERROR = CSL1("ERROR"); fValues[CSL1("addresses")] = ERROR; fValues[CSL1("events")] = ERROR; fValues[CSL1("todos")] = ERROR; fValues[CSL1("memos")] = ERROR; fDatabase = deviceLink()->database(CSL1("AddressDB")); if (fDatabase) { - fValues[CSL1("addresses")] = QString::number(fDatabase->recordCount()); + fValues[CSL1("addresses")] = TQString::number(fDatabase->recordCount()); KPILOT_DELETE(fDatabase); } fDatabase = deviceLink()->database(CSL1("DatebookDB")); if (fDatabase) { - fValues[CSL1("events")] = QString::number(fDatabase->recordCount()); + fValues[CSL1("events")] = TQString::number(fDatabase->recordCount()); KPILOT_DELETE(fDatabase); } fDatabase = deviceLink()->database(CSL1("ToDoDB")); if (fDatabase) { - fValues[CSL1("todos")] = QString::number(fDatabase->recordCount()); + fValues[CSL1("todos")] = TQString::number(fDatabase->recordCount()); KPILOT_DELETE(fDatabase); } fDatabase = deviceLink()->database(CSL1("MemoDB")); if (fDatabase) { - fValues[CSL1("memos")] = QString::number(fDatabase->recordCount()); + fValues[CSL1("memos")] = TQString::number(fDatabase->recordCount()); KPILOT_DELETE(fDatabase); } keepParts.append(CSL1("records")); } else removeParts.append(CSL1("records")); - QTimer::singleShot(0, this, SLOT(syncInfo())); + TQTimer::singleShot(0, this, TQT_SLOT(syncInfo())); } void SysInfoConduit::syncInfo() @@ -377,16 +377,16 @@ void SysInfoConduit::syncInfo() */ KPilotUser user = deviceLink()->getPilotUser(); time_t lastsync = user.getLastSyncDate(); - QDateTime qlastsync; + TQDateTime qlastsync; qlastsync.setTime_t(lastsync); fValues[CSL1("lastsync")] = qlastsync.toString(Qt::LocalDate); lastsync = user.getLastSuccessfulSyncDate(); qlastsync.setTime_t(lastsync); fValues[CSL1("lastsuccsync")] = qlastsync.toString(Qt::LocalDate); - fValues[CSL1("lastsyncpc")] = QString::number(user.getLastSyncPC()); + fValues[CSL1("lastsyncpc")] = TQString::number(user.getLastSyncPC()); keepParts.append(CSL1("sync")); } else removeParts.append(CSL1("sync")); - QTimer::singleShot(0, this, SLOT(pcVersionInfo())); + TQTimer::singleShot(0, this, TQT_SLOT(pcVersionInfo())); } void SysInfoConduit::pcVersionInfo() @@ -400,7 +400,7 @@ void SysInfoConduit::pcVersionInfo() * - #kpilot# * - #pilotlink# */ - fValues[CSL1("kpilot")] = QString::fromLatin1(KPILOT_VERSION); + fValues[CSL1("kpilot")] = TQString::fromLatin1(KPILOT_VERSION); fValues[CSL1("kde")] = i18n("unknown"); fValues[CSL1("qt")] = i18n("unknown"); fValues[CSL1("os")] = i18n("unknown"); @@ -408,29 +408,29 @@ void SysInfoConduit::pcVersionInfo() struct utsname name; if (uname (&name) >= 0) { fValues[CSL1("os")] = CSL1("%1 %3, %5") - .arg(QString::fromLatin1(name.sysname)) - .arg(QString::fromLatin1(name.release)) - .arg(QString::fromLatin1(name.machine)); - fValues[CSL1("hostname")] = CSL1("%2").arg(QString::fromLatin1(name.nodename)); + .arg(TQString::fromLatin1(name.sysname)) + .arg(TQString::fromLatin1(name.release)) + .arg(TQString::fromLatin1(name.machine)); + fValues[CSL1("hostname")] = CSL1("%2").arg(TQString::fromLatin1(name.nodename)); } #ifdef KDE_VERSION_STRING - fValues[CSL1("kde")] = QString::fromLatin1(KDE_VERSION_STRING); + fValues[CSL1("kde")] = TQString::fromLatin1(KDE_VERSION_STRING); #endif #ifdef QT_VERSION_STR - fValues[CSL1("qt")] = QString::fromLatin1(QT_VERSION_STR); + fValues[CSL1("qt")] = TQString::fromLatin1(QT_VERSION_STR); #endif fValues[CSL1("pilotlink")] = CSL1("%1.%2.%3%4") .arg(PILOT_LINK_VERSION) .arg(PILOT_LINK_MAJOR) .arg(PILOT_LINK_MINOR) #ifdef PILOT_LINK_PATCH - .arg(QString::fromLatin1(PILOT_LINK_PATCH)); + .arg(TQString::fromLatin1(PILOT_LINK_PATCH)); #else - .arg(QString()); + .arg(TQString()); #endif keepParts.append(CSL1("pcversion")); } else removeParts.append(CSL1("pcversion")); - QTimer::singleShot(0, this, SLOT(palmVersionInfo())); + TQTimer::singleShot(0, this, TQT_SLOT(palmVersionInfo())); } void SysInfoConduit::palmVersionInfo() @@ -440,7 +440,7 @@ void SysInfoConduit::palmVersionInfo() /* Retrieve values for * - #palmos# */ -/* fValues["palmos"] = QString("PalmOS %1.%2 (compat %3.%4)") +/* fValues["palmos"] = TQString("PalmOS %1.%2 (compat %3.%4)") .arg(fHandle->getSysInfo()->getMajorVersion()) .arg(fHandle->getSysInfo()->getMinorVersion()) .arg(fHandle->getSysInfo()->getCompatMajorVersion()) @@ -450,7 +450,7 @@ void SysInfoConduit::palmVersionInfo() keepParts.append(CSL1("palmversion")); } else removeParts.append(CSL1("palmversion")); - QTimer::singleShot(0, this, SLOT(debugInfo())); + TQTimer::singleShot(0, this, TQT_SLOT(debugInfo())); } void SysInfoConduit::debugInfo() @@ -463,18 +463,18 @@ void SysInfoConduit::debugInfo() fValues[CSL1("debug")] = i18n("No debug data"); keepParts.append(CSL1("debug")); } else removeParts.append(CSL1("debug")); - QTimer::singleShot(0, this, SLOT(writeFile())); + TQTimer::singleShot(0, this, TQT_SLOT(writeFile())); } void SysInfoConduit::writeFile() { FUNCTIONSETUP; - fValues[CSL1("date")] = QDateTime::currentDateTime().toString(Qt::LocalDate); + fValues[CSL1("date")] = TQDateTime::currentDateTime().toString(Qt::LocalDate); - QString output; + TQString output; // Open the template file - QString templatefile; + TQString templatefile; switch(fOutputType) { case eOutputText: @@ -495,9 +495,9 @@ void SysInfoConduit::writeFile() #ifdef DEBUG DEBUGKPILOT<<"Loading template file "<<templatefile<<endl; #endif - QFile infile(templatefile); + TQFile infile(templatefile); if (infile.open(IO_ReadOnly)) { - QTextStream instream(&infile); + TQTextStream instream(&infile); output = instream.read(); infile.close(); loaded=true; @@ -512,32 +512,32 @@ void SysInfoConduit::writeFile() } // Remove all parts not extracted - for ( QStringList::Iterator it = removeParts.begin(); it != removeParts.end(); ++it ) { - QRegExp re(CSL1("<!--#if%1#.*#endif%1#-->").arg(*it).arg(*it)); + for ( TQStringList::Iterator it = removeParts.begin(); it != removeParts.end(); ++it ) { + TQRegExp re(CSL1("<!--#if%1#.*#endif%1#-->").arg(*it).arg(*it)); re.setMinimal(true); output.remove(re); } - for ( QStringList::Iterator it = keepParts.begin(); it != keepParts.end(); ++it ) { - QRegExp re(CSL1("<!--#if%1#(.*)#endif%1#-->").arg(*it).arg(*it)); + for ( TQStringList::Iterator it = keepParts.begin(); it != keepParts.end(); ++it ) { + TQRegExp re(CSL1("<!--#if%1#(.*)#endif%1#-->").arg(*it).arg(*it)); re.setMinimal(true); output.replace(re, CSL1("\\1")); } // Do a loop through all keys in fValues - QMap<QString,QString>::Iterator it; + TQMap<TQString,TQString>::Iterator it; for ( it = fValues.begin(); it != fValues.end(); ++it ) { output.replace(CSL1("#%1#").arg(it.key()), it.data()); } // Insert the list of databases - QRegExp re(CSL1("#dblist\\[(.*)\\]#")); + TQRegExp re(CSL1("#dblist\\[(.*)\\]#")); re.setMinimal(true); while (re.search(output)>=0){ - QString dbstring; - QString subpatt=re.cap(1); + TQString dbstring; + TQString subpatt=re.cap(1); for (KPilotLink::DBInfoList::ConstIterator i = dblist.begin(); i != dblist.end(); ++i ) { DBInfo dbi = *i; - QString newpatt(subpatt); + TQString newpatt(subpatt); char tmpchr[5]; ::memset(&tmpchr[0], 0, 5); /* Patterns for the dblist argument: @@ -552,16 +552,16 @@ void SysInfoConduit::writeFile() * %8 .. modifyDate * %9 .. backupDate */ - newpatt.replace(CSL1("%0"), QString::fromLatin1(dbi.name)); + newpatt.replace(CSL1("%0"), TQString::fromLatin1(dbi.name)); set_long(&tmpchr[0],dbi.type); - newpatt.replace(CSL1("%1"), QString::fromLatin1(tmpchr)); + newpatt.replace(CSL1("%1"), TQString::fromLatin1(tmpchr)); set_long(&tmpchr[0],dbi.creator); - newpatt.replace(CSL1("%2"), QString::fromLatin1(tmpchr)); - newpatt.replace(CSL1("%3"), QString::number(dbi.index)); - newpatt.replace(CSL1("%4"), QString::number(dbi.flags)); - newpatt.replace(CSL1("%5"), QString::number(dbi.miscFlags)); - newpatt.replace(CSL1("%6"), QString::number(dbi.version)); - QDateTime tm; + newpatt.replace(CSL1("%2"), TQString::fromLatin1(tmpchr)); + newpatt.replace(CSL1("%3"), TQString::number(dbi.index)); + newpatt.replace(CSL1("%4"), TQString::number(dbi.flags)); + newpatt.replace(CSL1("%5"), TQString::number(dbi.miscFlags)); + newpatt.replace(CSL1("%6"), TQString::number(dbi.version)); + TQDateTime tm; tm.setTime_t(dbi.createDate); newpatt.replace(CSL1("%7"), tm.toString(Qt::LocalDate)); tm.setTime_t(dbi.modifyDate); @@ -576,12 +576,12 @@ void SysInfoConduit::writeFile() } // Write out the result - QFile outfile(fOutputFile); + TQFile outfile(fOutputFile); #ifdef DEBUG DEBUGKPILOT << fname << ": Writing file <" << fOutputFile << ">" << endl; #endif if (fOutputFile.isEmpty() || (!outfile.open(IO_WriteOnly)) ) { - QFileInfo fi(QDir::home(), CSL1("KPilotSysInfo.")+QFileInfo(templatefile).extension() ); + 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)); @@ -589,18 +589,18 @@ void SysInfoConduit::writeFile() if (!outfile.open(IO_WriteOnly)) { WARNINGKPILOT<< "Unable to open " << fOutputFile << endl; emit logError(i18n("Unable to open %1").arg(fOutputFile)); - QTimer::singleShot(0, this, SLOT(cleanup())); + TQTimer::singleShot(0, this, TQT_SLOT(cleanup())); return; } } // Finally, write the actual text out to the file. - QTextStream outstream(&outfile); + TQTextStream outstream(&outfile); outstream<<output; outfile.close(); emit logMessage(i18n("Handheld system information written to the file %1").arg(fOutputFile)); - QTimer::singleShot(0, this, SLOT(cleanup())); + TQTimer::singleShot(0, this, TQT_SLOT(cleanup())); } void SysInfoConduit::cleanup() diff --git a/kpilot/conduits/sysinfoconduit/sysinfo-conduit.h b/kpilot/conduits/sysinfoconduit/sysinfo-conduit.h index 05bc395d3..803bc7370 100644 --- a/kpilot/conduits/sysinfoconduit/sysinfo-conduit.h +++ b/kpilot/conduits/sysinfoconduit/sysinfo-conduit.h @@ -37,7 +37,7 @@ public: SysInfoConduit( KPilotLink *o, const char *n = 0L, - const QStringList &a = QStringList() ); + const TQStringList &a = TQStringList() ); virtual ~SysInfoConduit(); virtual bool exec(); @@ -58,12 +58,12 @@ public slots: protected: void readConfig(); private: - QMap<QString,QString> fValues; + TQMap<TQString,TQString> fValues; bool fHardwareInfo, fUserInfo, fMemoryInfo, fStorageInfo, fDBList, fRecordNumber, fSyncInfo, fKDEVersion, fPalmOSVersion, fDebugInfo; - QString fOutputFile, fTemplateFile; + TQString fOutputFile, fTemplateFile; enum eOutputTypeEnum { eOutputHTML=0, eOutputText, @@ -71,9 +71,9 @@ private: } fOutputType; KPilotLink::DBInfoList dblist; - QStringList removeParts; - QStringList keepParts; - static const QString defaultpage; + TQStringList removeParts; + TQStringList keepParts; + static const TQString defaultpage; } ; #endif diff --git a/kpilot/conduits/sysinfoconduit/sysinfo-setup.cc b/kpilot/conduits/sysinfoconduit/sysinfo-setup.cc index ed7419ab3..271db659b 100644 --- a/kpilot/conduits/sysinfoconduit/sysinfo-setup.cc +++ b/kpilot/conduits/sysinfoconduit/sysinfo-setup.cc @@ -28,11 +28,11 @@ #include "options.h" -#include <qtabwidget.h> -#include <qradiobutton.h> -#include <qcheckbox.h> -#include <qbuttongroup.h> -#include <qlistview.h> +#include <tqtabwidget.h> +#include <tqradiobutton.h> +#include <tqcheckbox.h> +#include <tqbuttongroup.h> +#include <tqlistview.h> #include <kaboutdata.h> #include <kapplication.h> @@ -81,11 +81,11 @@ const sysinfoEntry_t sysinfoEntries[] = /* ** This is a convenience define to update an item's "original setting". */ -#define updateSetting(i) { QCheckListItem *ubbu=(i); \ - ubbu->setText(PART_SETTING,(ubbu->isOn() ? CSL1("1") : QString::null)); } +#define updateSetting(i) { TQCheckListItem *ubbu=(i); \ + ubbu->setText(PART_SETTING,(ubbu->isOn() ? CSL1("1") : TQString::null)); } -SysInfoWidgetConfig::SysInfoWidgetConfig(QWidget *w, const char *n) : +SysInfoWidgetConfig::SysInfoWidgetConfig(TQWidget *w, const char *n) : ConduitConfigBase(w,n), fConfigWidget(new SysInfoWidget(w)) { @@ -103,12 +103,12 @@ SysInfoWidgetConfig::SysInfoWidgetConfig(QWidget *w, const char *n) : ConduitConfigBase::addAboutPage(fConfigWidget->tabWidget,fAbout); fWidget=fConfigWidget; - QObject::connect(fConfigWidget->fOutputFile,SIGNAL(textChanged(const QString&)), - this,SLOT(modified())); - QObject::connect(fConfigWidget->fTemplateFile,SIGNAL(textChanged(const QString&)), - this,SLOT(modified())); - QObject::connect(fConfigWidget->fOutputType,SIGNAL(clicked(int)), - this,SLOT(modified())); + TQObject::connect(fConfigWidget->fOutputFile,TQT_SIGNAL(textChanged(const TQString&)), + this,TQT_SLOT(modified())); + TQObject::connect(fConfigWidget->fTemplateFile,TQT_SIGNAL(textChanged(const TQString&)), + this,TQT_SLOT(modified())); + TQObject::connect(fConfigWidget->fOutputType,TQT_SIGNAL(clicked(int)), + this,TQT_SLOT(modified())); fConduitName=i18n("System Information"); } @@ -123,8 +123,8 @@ void SysInfoWidgetConfig::commit() SysinfoSettings::setOutputFormat( fConfigWidget->fOutputType->id(fConfigWidget->fOutputType->selected())); - QListViewItem *i = fConfigWidget->fPartsList->firstChild(); - QCheckListItem *ci = dynamic_cast<QCheckListItem *>(i); + TQListViewItem *i = fConfigWidget->fPartsList->firstChild(); + TQCheckListItem *ci = dynamic_cast<TQCheckListItem *>(i); while(ci) { #ifdef DEBUG @@ -139,7 +139,7 @@ void SysInfoWidgetConfig::commit() } updateSetting(ci); i=i->nextSibling(); - ci = dynamic_cast<QCheckListItem *>(i); + ci = dynamic_cast<TQCheckListItem *>(i); } SysinfoSettings::self()->writeConfig(); unmodified(); @@ -151,13 +151,13 @@ void SysInfoWidgetConfig::load() SysinfoSettings::self()->readConfig(); const sysinfoEntry_t *p = sysinfoEntries; - QCheckListItem *i = 0L; + TQCheckListItem *i = 0L; while (p && p->name) { - i = new QCheckListItem(fConfigWidget->fPartsList,i18n(p->name),QCheckListItem::CheckBox); + i = new TQCheckListItem(fConfigWidget->fPartsList,i18n(p->name),TQCheckListItem::CheckBox); // by default let the sysinfo conduit write out all available information i->setOn( p->accessor() ); - i->setText(PART_KEY, QString::number(p-sysinfoEntries)); // store index there + i->setText(PART_KEY, TQString::number(p-sysinfoEntries)); // store index there updateSetting(i); #ifdef DEBUG DEBUGKPILOT << fname << ": Loaded " << p->name @@ -177,8 +177,8 @@ void SysInfoWidgetConfig::load() FUNCTIONSETUP; if (fModified) return true; - QListViewItem *i = fConfigWidget->fPartsList->firstChild(); - QCheckListItem *ci = dynamic_cast<QCheckListItem *>(i); + TQListViewItem *i = fConfigWidget->fPartsList->firstChild(); + TQCheckListItem *ci = dynamic_cast<TQCheckListItem *>(i); while(ci) { @@ -192,7 +192,7 @@ void SysInfoWidgetConfig::load() if (current!=original) return true; i=i->nextSibling(); - ci = dynamic_cast<QCheckListItem *>(i); + ci = dynamic_cast<TQCheckListItem *>(i); } return false; } diff --git a/kpilot/conduits/sysinfoconduit/sysinfo-setup.h b/kpilot/conduits/sysinfoconduit/sysinfo-setup.h index 41e55eb86..400dea3c1 100644 --- a/kpilot/conduits/sysinfoconduit/sysinfo-setup.h +++ b/kpilot/conduits/sysinfoconduit/sysinfo-setup.h @@ -36,7 +36,7 @@ class SysInfoWidget; class SysInfoWidgetConfig : public ConduitConfigBase { public: - SysInfoWidgetConfig(QWidget *parent, const char *); + SysInfoWidgetConfig(TQWidget *parent, const char *); virtual void commit(); virtual void load(); virtual bool isModified() const; diff --git a/kpilot/conduits/timeconduit/time-conduit.cc b/kpilot/conduits/timeconduit/time-conduit.cc index c1455b359..76798dbed 100644 --- a/kpilot/conduits/timeconduit/time-conduit.cc +++ b/kpilot/conduits/timeconduit/time-conduit.cc @@ -50,7 +50,7 @@ unsigned long version_conduit_time = Pilot::PLUGIN_API ; TimeConduit::TimeConduit(KPilotLink * o, const char *n, - const QStringList & a) : + const TQStringList & a) : ConduitAction(o, n, a) { FUNCTIONSETUP; @@ -83,7 +83,7 @@ void TimeConduit::readConfig() { #ifdef DEBUG DEBUGKPILOT << fname << ": Would have set time to " - << QDateTime::currentDateTime().toString() << endl; + << TQDateTime::currentDateTime().toString() << endl; #endif return delayDone(); } diff --git a/kpilot/conduits/timeconduit/time-conduit.h b/kpilot/conduits/timeconduit/time-conduit.h index 8a6a57a50..06b6b50e1 100644 --- a/kpilot/conduits/timeconduit/time-conduit.h +++ b/kpilot/conduits/timeconduit/time-conduit.h @@ -36,7 +36,7 @@ public: TimeConduit( KPilotLink *o, const char *n = 0L, - const QStringList &a = QStringList() ); + const TQStringList &a = TQStringList() ); virtual ~TimeConduit(); virtual bool exec(); diff --git a/kpilot/conduits/timeconduit/time-setup.cc b/kpilot/conduits/timeconduit/time-setup.cc index ce562d7dd..409cdc346 100644 --- a/kpilot/conduits/timeconduit/time-setup.cc +++ b/kpilot/conduits/timeconduit/time-setup.cc @@ -28,9 +28,9 @@ #include "options.h" -#include <qtabwidget.h> -#include <qradiobutton.h> -#include <qbuttongroup.h> +#include <tqtabwidget.h> +#include <tqradiobutton.h> +#include <tqbuttongroup.h> #include <kapplication.h> #include <kaboutdata.h> @@ -57,7 +57,7 @@ static KAboutData *createAbout() -TimeWidgetConfig::TimeWidgetConfig(QWidget *w, const char *n) : +TimeWidgetConfig::TimeWidgetConfig(TQWidget *w, const char *n) : ConduitConfigBase(w,n), fConfigWidget(new TimeWidget(w)) { diff --git a/kpilot/conduits/timeconduit/time-setup.h b/kpilot/conduits/timeconduit/time-setup.h index 7552c12d6..b0bb2f0ae 100644 --- a/kpilot/conduits/timeconduit/time-setup.h +++ b/kpilot/conduits/timeconduit/time-setup.h @@ -38,10 +38,10 @@ class TimeWidgetConfig : public ConduitConfigBase { Q_OBJECT public: - TimeWidgetConfig(QWidget *parent, const char *); + TimeWidgetConfig(TQWidget *parent, const char *); virtual void commit(); virtual void load(); - static ConduitConfigBase *create(QWidget *,const char *); + static ConduitConfigBase *create(TQWidget *,const char *); protected: TimeWidget *fConfigWidget; KAboutData *fAbout; diff --git a/kpilot/conduits/vcalconduit/cleanupstate.cc b/kpilot/conduits/vcalconduit/cleanupstate.cc index 29b1f6ea5..209a0e918 100644 --- a/kpilot/conduits/vcalconduit/cleanupstate.cc +++ b/kpilot/conduits/vcalconduit/cleanupstate.cc @@ -29,7 +29,7 @@ #include <options.h> #include <kio/netaccess.h> -#include <qfile.h> +#include <tqfile.h> #include "pilotDatabase.h" @@ -74,7 +74,7 @@ void CleanUpState::startSync( ConduitAction *ca ) } KCal::Calendar *fCalendar = vccb->calendar(); - QString fCalendarFile = vccb->calendarFile(); + TQString fCalendarFile = vccb->calendarFile(); if ( fCalendar ) { @@ -96,7 +96,7 @@ void CleanUpState::startSync( ConduitAction *ca ) else { KIO::NetAccess::removeTempFile( fCalendarFile ); } - QFile backup( fCalendarFile + CSL1( "~" ) ); + TQFile backup( fCalendarFile + CSL1( "~" ) ); backup.remove(); } break; diff --git a/kpilot/conduits/vcalconduit/hhtopcstate.cc b/kpilot/conduits/vcalconduit/hhtopcstate.cc index 79089671d..82024f123 100644 --- a/kpilot/conduits/vcalconduit/hhtopcstate.cc +++ b/kpilot/conduits/vcalconduit/hhtopcstate.cc @@ -186,13 +186,13 @@ void VCalConduitBase::slotPalmRecToPC() if ( syncMode()==SyncMode::eCopyHHToPC ) { emit logMessage(i18n("Cleaning up ...")); - QTimer::singleShot(0, this, SLOT(cleanup())); + TQTimer::singleShot(0, this, TQT_SLOT(cleanup())); return; } else { emit logMessage(i18n("Copying records to Pilot ...")); - QTimer::singleShot(0 ,this,SLOT(slotPCRecToPalm())); + TQTimer::singleShot(0 ,this,TQT_SLOT(slotPCRecToPalm())); return; } } @@ -244,6 +244,6 @@ void VCalConduitBase::slotPalmRecToPC() KPILOT_DELETE(r); KPILOT_DELETE(s); - QTimer::singleShot(0,this,SLOT(slotPalmRecToPC())); + TQTimer::singleShot(0,this,TQT_SLOT(slotPalmRecToPC())); } */ diff --git a/kpilot/conduits/vcalconduit/kcalRecord.cc b/kpilot/conduits/vcalconduit/kcalRecord.cc index f12d9b8c3..598866dc5 100644 --- a/kpilot/conduits/vcalconduit/kcalRecord.cc +++ b/kpilot/conduits/vcalconduit/kcalRecord.cc @@ -49,8 +49,8 @@ void KCalSync::setCategory(PilotRecordBase *de, return; } - QString deCategory; - QStringList eventCategories = e->categories(); + TQString deCategory; + TQStringList eventCategories = e->categories(); if (eventCategories.size() < 1) { // This event has no categories. @@ -70,14 +70,14 @@ void KCalSync::setCategory(PilotRecordBase *de, } } - QStringList availableHandheldCategories = Pilot::categoryNames(&info); + TQStringList availableHandheldCategories = Pilot::categoryNames(&info); // Either the record is unfiled, and should be filed, or // it has a category set which is not in the list of // categories that the event has. So go looking for // a category that is available both for the event // and on the handheld. - for ( QStringList::ConstIterator it = eventCategories.begin(); + for ( TQStringList::ConstIterator it = eventCategories.begin(); it != eventCategories.end(); ++it ) { // Odd, an empty category string. @@ -113,9 +113,9 @@ void KCalSync::setCategory(KCal::Incidence *e, return; } - QStringList cats=e->categories(); + TQStringList cats=e->categories(); int cat = de->category(); - QString newcat = Pilot::categoryName(&info,cat); + TQString newcat = Pilot::categoryName(&info,cat); DEBUGKPILOT << fname << ": palm category id: [" << cat << "], label: [" << newcat << "]" << endl; diff --git a/kpilot/conduits/vcalconduit/pctohhstate.cc b/kpilot/conduits/vcalconduit/pctohhstate.cc index b68771f13..d2866fd19 100644 --- a/kpilot/conduits/vcalconduit/pctohhstate.cc +++ b/kpilot/conduits/vcalconduit/pctohhstate.cc @@ -111,8 +111,8 @@ void PCToHHState::handleRecord( ConduitAction *ca ) DEBUGKPILOT << fname << ": found PC entry with pilotID " << id <<endl; DEBUGKPILOT << fname << ": Description: " << e->summary() << endl; - QDateTime start_time = e->dtStart(); - QDateTime end_time = e->dtEnd(); + TQDateTime start_time = e->dtStart(); + TQDateTime end_time = e->dtEnd(); DEBUGKPILOT << fname << ": Time: "<< start_time.toString() << " until " << end_time.toString() << endl; diff --git a/kpilot/conduits/vcalconduit/teststate.cc b/kpilot/conduits/vcalconduit/teststate.cc index d8c8e56cc..c762d32b4 100644 --- a/kpilot/conduits/vcalconduit/teststate.cc +++ b/kpilot/conduits/vcalconduit/teststate.cc @@ -28,8 +28,8 @@ #include <options.h> -#include <qdatetime.h> -#include <qfile.h> +#include <tqdatetime.h> +#include <tqfile.h> #include "pilotSerialDatabase.h" #include "pilotLocalDatabase.h" @@ -38,7 +38,7 @@ #include "teststate.h" #include "vcal-conduitbase.h" -TestState::TestState() : fCalendar( QString::null ) +TestState::TestState() : fCalendar( TQString::null ) { fState = eTest; } @@ -109,7 +109,7 @@ void TestState::finishSync( ConduitAction *ca ) // No more records present on the device so lets dump the // readed records in a file. - QFile f( CSL1("dump.ics") ); + TQFile f( CSL1("dump.ics") ); if( !f.exists() ) { f.open( IO_WriteOnly ); diff --git a/kpilot/conduits/vcalconduit/todo-conduit.cc b/kpilot/conduits/vcalconduit/todo-conduit.cc index 302ada565..9b1007c20 100644 --- a/kpilot/conduits/vcalconduit/todo-conduit.cc +++ b/kpilot/conduits/vcalconduit/todo-conduit.cc @@ -34,8 +34,8 @@ #include "options.h" -#include <qdatetime.h> -#include <qtextcodec.h> +#include <tqdatetime.h> +#include <tqtextcodec.h> #include <libkcal/calendar.h> #include <libkcal/todo.h> @@ -110,8 +110,8 @@ KCal::Incidence *TodoConduitPrivate::findIncidence(PilotRecordBase *tosearch) PilotTodoEntry*entry=dynamic_cast<PilotTodoEntry*>(tosearch); if (!entry) return 0L; - QString title=entry->getDescription(); - QDateTime dt=readTm( entry->getDueDate() ); + TQString title=entry->getDescription(); + TQDateTime dt=readTm( entry->getDueDate() ); KCal::Todo::List::ConstIterator it; for( it = fAllTodos.begin(); it != fAllTodos.end(); ++it ) { @@ -176,7 +176,7 @@ KCal::Incidence *TodoConduitPrivate::getNextModifiedIncidence() TodoConduit::TodoConduit(KPilotLink *d, const char *n, - const QStringList &a) : VCalConduitBase(d,n,a), + const TQStringList &a) : VCalConduitBase(d,n,a), fTodoAppInfo( 0L ) { FUNCTIONSETUP; @@ -223,14 +223,14 @@ void TodoConduit::_getAppInfo() -const QString TodoConduit::getTitle(PilotRecordBase *de) +const TQString TodoConduit::getTitle(PilotRecordBase *de) { PilotTodoEntry*d=dynamic_cast<PilotTodoEntry*>(de); if (d) { - return QString(d->getDescription()); + return TQString(d->getDescription()); } - return QString::null; + return TQString::null; } diff --git a/kpilot/conduits/vcalconduit/todo-conduit.h b/kpilot/conduits/vcalconduit/todo-conduit.h index 3364d61f2..8d8780eba 100644 --- a/kpilot/conduits/vcalconduit/todo-conduit.h +++ b/kpilot/conduits/vcalconduit/todo-conduit.h @@ -67,13 +67,13 @@ Q_OBJECT public: TodoConduit(KPilotLink *, const char *name=0L, - const QStringList &args = QStringList()); + const TQStringList &args = TQStringList()); virtual ~TodoConduit(); protected: - virtual const QString getTitle(PilotRecordBase *de); + virtual const TQString getTitle(PilotRecordBase *de); - virtual const QString dbname() { return CSL1("ToDoDB"); }; + virtual const TQString dbname() { return CSL1("ToDoDB"); }; virtual void preSync(); virtual VCalConduitPrivateBase *createPrivateCalendarData(KCal::Calendar *fCalendar) { diff --git a/kpilot/conduits/vcalconduit/todo-setup.cc b/kpilot/conduits/vcalconduit/todo-setup.cc index eb1c98c91..19a731c5a 100644 --- a/kpilot/conduits/vcalconduit/todo-setup.cc +++ b/kpilot/conduits/vcalconduit/todo-setup.cc @@ -29,7 +29,7 @@ #include "options.h" -#include <qbuttongroup.h> +#include <tqbuttongroup.h> #include <kaboutdata.h> #include "korganizerConduit.h" @@ -38,7 +38,7 @@ -ToDoWidgetSetup::ToDoWidgetSetup(QWidget *w, const char *n) : +ToDoWidgetSetup::ToDoWidgetSetup(TQWidget *w, const char *n) : VCalWidgetSetupBase(w,n) { FUNCTIONSETUP; @@ -74,7 +74,7 @@ ToDoWidgetSetup::~ToDoWidgetSetup() FUNCTIONSETUP; } -/* static */ ConduitConfigBase *ToDoWidgetSetup::create(QWidget *w, const char *n) +/* static */ ConduitConfigBase *ToDoWidgetSetup::create(TQWidget *w, const char *n) { return new ToDoWidgetSetup(w,n); } diff --git a/kpilot/conduits/vcalconduit/todo-setup.h b/kpilot/conduits/vcalconduit/todo-setup.h index 9eebd3a3d..b9b919c92 100644 --- a/kpilot/conduits/vcalconduit/todo-setup.h +++ b/kpilot/conduits/vcalconduit/todo-setup.h @@ -34,11 +34,11 @@ class ToDoWidgetSetup : public VCalWidgetSetupBase { public: - ToDoWidgetSetup(QWidget *,const char *); + ToDoWidgetSetup(TQWidget *,const char *); virtual ~ToDoWidgetSetup(); virtual VCalConduitSettings*config(); - static ConduitConfigBase *create(QWidget *, const char *); + static ConduitConfigBase *create(TQWidget *, const char *); } ; #endif diff --git a/kpilot/conduits/vcalconduit/todoRecord.cc b/kpilot/conduits/vcalconduit/todoRecord.cc index 7db753fb5..7618df368 100644 --- a/kpilot/conduits/vcalconduit/todoRecord.cc +++ b/kpilot/conduits/vcalconduit/todoRecord.cc @@ -126,7 +126,7 @@ bool KCalSync::setTodo(KCal::Todo *e, // COMPLETED? // e->setCompleted(de->getComplete()); if ( de->getComplete() && !e->hasCompletedDate() ) { - e->setCompleted( QDateTime::currentDateTime() ); + e->setCompleted( TQDateTime::currentDateTime() ); } e->setSummary(de->getDescription()); diff --git a/kpilot/conduits/vcalconduit/vcal-conduit.cc b/kpilot/conduits/vcalconduit/vcal-conduit.cc index 0eea42733..d882cf8f8 100644 --- a/kpilot/conduits/vcalconduit/vcal-conduit.cc +++ b/kpilot/conduits/vcalconduit/vcal-conduit.cc @@ -104,8 +104,8 @@ KCal::Incidence *VCalConduitPrivate::findIncidence(PilotRecordBase *tosearch) PilotDateEntry*entry=dynamic_cast<PilotDateEntry*>(tosearch); if (!entry) return 0L; - QString title=entry->getDescription(); - QDateTime dt=readTm( entry->getEventStart() ); + TQString title=entry->getDescription(); + TQDateTime dt=readTm( entry->getEventStart() ); KCal::Event::List::ConstIterator it; for( it = fAllEvents.begin(); it != fAllEvents.end(); ++it ) { @@ -170,7 +170,7 @@ KCal::Incidence *VCalConduitPrivate::getNextModifiedIncidence() VCalConduit::VCalConduit(KPilotLink *d, const char *n, - const QStringList &a) : + const TQStringList &a) : VCalConduitBase(d,n,a), fAppointmentAppInfo( 0L ) { @@ -196,11 +196,11 @@ void VCalConduit::_getAppInfo() fAppointmentAppInfo = new PilotDateInfo( fDatabase ); } -const QString VCalConduit::getTitle(PilotRecordBase *de) +const TQString VCalConduit::getTitle(PilotRecordBase *de) { PilotDateEntry*d=dynamic_cast<PilotDateEntry*>(de); - if (d) return QString(d->getDescription()); - return QString::null; + if (d) return TQString(d->getDescription()); + return TQString::null; } diff --git a/kpilot/conduits/vcalconduit/vcal-conduit.h b/kpilot/conduits/vcalconduit/vcal-conduit.h index c41ceb906..ed47d712f 100644 --- a/kpilot/conduits/vcalconduit/vcal-conduit.h +++ b/kpilot/conduits/vcalconduit/vcal-conduit.h @@ -70,11 +70,11 @@ Q_OBJECT public: VCalConduit(KPilotLink *, const char *name=0L, - const QStringList &args = QStringList()); + const TQStringList &args = TQStringList()); virtual ~VCalConduit(); protected: - virtual const QString dbname() { return CSL1("DatebookDB"); }; + virtual const TQString dbname() { return CSL1("DatebookDB"); }; virtual void preSync() {VCalConduitBase::preSync(); _getAppInfo(); }; virtual VCalConduitPrivateBase *createPrivateCalendarData(KCal::Calendar *fCalendar); @@ -84,7 +84,7 @@ protected: virtual PilotRecordBase *newPilotEntry(PilotRecord*r); virtual KCal::Incidence*newIncidence(); - virtual const QString getTitle(PilotRecordBase *de); + virtual const TQString getTitle(PilotRecordBase *de); virtual VCalConduitSettings *config(); public: static VCalConduitSettings *theConfig(); diff --git a/kpilot/conduits/vcalconduit/vcal-conduitbase.cc b/kpilot/conduits/vcalconduit/vcal-conduitbase.cc index a9fc6376b..cd288ba59 100644 --- a/kpilot/conduits/vcalconduit/vcal-conduitbase.cc +++ b/kpilot/conduits/vcalconduit/vcal-conduitbase.cc @@ -33,8 +33,8 @@ #include <options.h> -#include <qtimer.h> -#include <qfile.h> +#include <tqtimer.h> +#include <tqfile.h> #include <kmessagebox.h> #include <kio/netaccess.h> @@ -66,7 +66,7 @@ VCalConduitBase::VCalConduitBase(KPilotLink *d, const char *n, - const QStringList &a) : + const TQStringList &a) : ConduitAction(d,n,a), fCalendar(0L), fP(0L) @@ -176,7 +176,7 @@ VCalConduitBase::~VCalConduitBase() if (!syncMode().isTest() && !openCalendar() ) goto error; // Start processing the sync - QTimer::singleShot(0, this, SLOT(slotProcess())); + TQTimer::singleShot(0, this, TQT_SLOT(slotProcess())); return true; error: @@ -200,13 +200,13 @@ void VCalConduitBase::slotProcess() { if( hasNextRecord ) { fState->handleRecord( this ); - QTimer::singleShot( 0, this, SLOT( slotProcess() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( slotProcess() ) ); } // Else finish the current state if there is one else if( fState ) { fState->finishSync( this ); - QTimer::singleShot( 0, this, SLOT( slotProcess() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( slotProcess() ) ); } // No state so sync is finished else @@ -245,7 +245,7 @@ static void listResources( KCal::CalendarResources *p ) // this part taken from adcalendarbase.cpp: korgcfg.setGroup( "Time & Date" ); - QString tz(korgcfg.readEntry( "TimeZoneId" ) ); + TQString tz(korgcfg.readEntry( "TimeZoneId" ) ); DEBUGKPILOT << fname << ": KOrganizer's time zone = " << tz << endl; @@ -312,7 +312,7 @@ static void listResources( KCal::CalendarResources *p ) // Try to create empty file. if it fails, // no valid file name was given. - QFile fl(fCalendarFile); + TQFile fl(fCalendarFile); if (!fl.open(IO_WriteOnly | IO_Append)) { DEBUGKPILOT << fname << "Invalid calendar file name " @@ -422,7 +422,7 @@ int VCalConduitBase::resolveConflict( KCal::Incidence *e, PilotRecordBase *de ) if ( getConflictResolution() == SyncAction::eAskUser ) { // TODO: This is messed up!!! - QString query = i18n( "The following item was modified " + TQString query = i18n( "The following item was modified " "both on the Handheld and on your PC:\nPC entry:\n\t" ); query += e->summary(); query += i18n( "\nHandheld entry:\n\t" ); @@ -433,7 +433,7 @@ int VCalConduitBase::resolveConflict( KCal::Incidence *e, PilotRecordBase *de ) return KMessageBox::No == questionYesNo( query, i18n( "Conflicting Entries" ), - QString::null, + TQString::null, 0 /* Never timeout */, i18n( "Handheld" ), i18n( "PC" )); } @@ -579,9 +579,9 @@ void VCalConduitBase::updateIncidenceOnPalm( KCal::Incidence *e, } } -const QString VCalConduitBase::dbname() +const TQString VCalConduitBase::dbname() { - return QString::null; + return TQString::null; } PilotRecord *VCalConduitBase::readRecordByIndex( int index ) diff --git a/kpilot/conduits/vcalconduit/vcal-conduitbase.h b/kpilot/conduits/vcalconduit/vcal-conduitbase.h index 7d2fc6588..4e2f3ae10 100644 --- a/kpilot/conduits/vcalconduit/vcal-conduitbase.h +++ b/kpilot/conduits/vcalconduit/vcal-conduitbase.h @@ -30,7 +30,7 @@ */ -#include <qstring.h> +#include <tqstring.h> #include <libkcal/calendarlocal.h> @@ -78,7 +78,7 @@ class VCalConduitBase : public ConduitAction public: VCalConduitBase(KPilotLink *, const char *name = 0L, - const QStringList &args = QStringList()); + const TQStringList &args = TQStringList()); virtual ~VCalConduitBase(); /********************************************************************* @@ -86,13 +86,13 @@ public: *********************************************************************/ protected: KCal::Calendar *fCalendar; - QString fCalendarFile; + TQString fCalendarFile; VCalConduitPrivateBase *fP; ConduitState *fState; bool hasNextRecord; - virtual const QString dbname() = 0; - virtual const QString getTitle(PilotRecordBase *de) = 0; + virtual const TQString dbname() = 0; + virtual const TQString getTitle(PilotRecordBase *de) = 0; virtual void readConfig(); virtual bool exec(); @@ -147,7 +147,7 @@ public: // Getters KCal::Calendar *calendar() const { return fCalendar; }; - QString calendarFile() const { return fCalendarFile; }; + TQString calendarFile() const { return fCalendarFile; }; virtual VCalConduitSettings *config() = 0; virtual PilotDatabase *database() const { return fDatabase; }; diff --git a/kpilot/conduits/vcalconduit/vcal-setup.cc b/kpilot/conduits/vcalconduit/vcal-setup.cc index 666e9ee0a..0361c3255 100644 --- a/kpilot/conduits/vcalconduit/vcal-setup.cc +++ b/kpilot/conduits/vcalconduit/vcal-setup.cc @@ -29,7 +29,7 @@ #include "options.h" -#include <qbuttongroup.h> +#include <tqbuttongroup.h> #include <kaboutdata.h> #include "korganizerConduit.h" @@ -37,7 +37,7 @@ #include "vcal-setup.h" -VCalWidgetSetup::VCalWidgetSetup(QWidget *w, const char *n) : +VCalWidgetSetup::VCalWidgetSetup(TQWidget *w, const char *n) : VCalWidgetSetupBase(w,n) { KAboutData *fAbout = new KAboutData("vcalConduit", @@ -71,7 +71,7 @@ VCalWidgetSetup::VCalWidgetSetup(QWidget *w, const char *n) : } -/* static */ ConduitConfigBase *VCalWidgetSetup::create(QWidget *w,const char *n) +/* static */ ConduitConfigBase *VCalWidgetSetup::create(TQWidget *w,const char *n) { return new VCalWidgetSetup(w,n); } diff --git a/kpilot/conduits/vcalconduit/vcal-setup.h b/kpilot/conduits/vcalconduit/vcal-setup.h index 407c0d99f..20723ceb8 100644 --- a/kpilot/conduits/vcalconduit/vcal-setup.h +++ b/kpilot/conduits/vcalconduit/vcal-setup.h @@ -37,8 +37,8 @@ class VCalConduitSettings; class VCalWidgetSetup : public VCalWidgetSetupBase { public: - VCalWidgetSetup(QWidget *, const char *); - static ConduitConfigBase *create(QWidget *, const char *); + VCalWidgetSetup(TQWidget *, const char *); + static ConduitConfigBase *create(TQWidget *, const char *); protected: virtual VCalConduitSettings*config(); } ; diff --git a/kpilot/conduits/vcalconduit/vcal-setupbase.cc b/kpilot/conduits/vcalconduit/vcal-setupbase.cc index 3e97987fa..643dee645 100644 --- a/kpilot/conduits/vcalconduit/vcal-setupbase.cc +++ b/kpilot/conduits/vcalconduit/vcal-setupbase.cc @@ -29,9 +29,9 @@ #include "options.h" -#include <qcheckbox.h> -#include <qbuttongroup.h> -#include <qcombobox.h> +#include <tqcheckbox.h> +#include <tqbuttongroup.h> +#include <tqcombobox.h> #include <kurlrequester.h> @@ -39,7 +39,7 @@ #include "vcalconduitSettings.h" #include "vcal-setupbase.h" -VCalWidgetSetupBase::VCalWidgetSetupBase(QWidget *w, const char *n) : +VCalWidgetSetupBase::VCalWidgetSetupBase(TQWidget *w, const char *n) : ConduitConfigBase(w,n), fConfigWidget(new VCalWidget(w)) { @@ -49,11 +49,11 @@ VCalWidgetSetupBase::VCalWidgetSetupBase(QWidget *w, const char *n) : fConfigWidget->fCalendarFile->setMode(KFile::File); fConfigWidget->fCalendarFile->setFilter(CSL1("*.vcs *.ics|ICalendars\n*.*|All Files (*.*)")); -#define CM(a,b) connect(fConfigWidget->a,b,this,SLOT(modified())); - CM(fSyncDestination,SIGNAL(clicked(int))); - CM(fCalendarFile,SIGNAL(textChanged(const QString &))); - CM(fArchive,SIGNAL(toggled(bool))); - CM(fConflictResolution,SIGNAL(activated(int))); +#define CM(a,b) connect(fConfigWidget->a,b,this,TQT_SLOT(modified())); + CM(fSyncDestination,TQT_SIGNAL(clicked(int))); + CM(fCalendarFile,TQT_SIGNAL(textChanged(const TQString &))); + CM(fArchive,TQT_SIGNAL(toggled(bool))); + CM(fConflictResolution,TQT_SIGNAL(activated(int))); #undef CM } diff --git a/kpilot/conduits/vcalconduit/vcal-setupbase.h b/kpilot/conduits/vcalconduit/vcal-setupbase.h index 7863659bd..a14bf14d8 100644 --- a/kpilot/conduits/vcalconduit/vcal-setupbase.h +++ b/kpilot/conduits/vcalconduit/vcal-setupbase.h @@ -37,7 +37,7 @@ class VCalConduitSettings; class VCalWidgetSetupBase : public ConduitConfigBase { public: - VCalWidgetSetupBase(QWidget *, const char *); + VCalWidgetSetupBase(TQWidget *, const char *); virtual ~VCalWidgetSetupBase(); virtual void load(); diff --git a/kpilot/conduits/vcalconduit/vcalRecord.cc b/kpilot/conduits/vcalconduit/vcalRecord.cc index f9866d91a..898bc7986 100644 --- a/kpilot/conduits/vcalconduit/vcalRecord.cc +++ b/kpilot/conduits/vcalconduit/vcalRecord.cc @@ -70,7 +70,7 @@ static void setAlarms(KCal::Event *e, const PilotDateEntry *de) e->clearAlarms(); if (!de->isAlarmEnabled()) return; -// QDateTime alarmDT = readTm(de->getEventStart()); +// TQDateTime alarmDT = readTm(de->getEventStart()); int advanceUnits = de->getAdvanceUnits(); switch (advanceUnits) @@ -117,7 +117,7 @@ static void setRecurrence(KCal::Event *event,const PilotDateEntry *dateEntry) KCal::Recurrence *recur = event->recurrence(); int freq = dateEntry->getRepeatFrequency(); bool repeatsForever = dateEntry->getRepeatForever(); - QDate endDate, evt; + TQDate endDate, evt; if (!repeatsForever) { @@ -131,7 +131,7 @@ static void setRecurrence(KCal::Event *event,const PilotDateEntry *dateEntry) #endif } - QBitArray dayArray(7); + TQBitArray dayArray(7); switch(dateEntry->getRepeatType()) { @@ -326,7 +326,7 @@ static void setRecurrence(PilotDateEntry*dateEntry, const KCal::Event *event) // first we have 'fake type of recurrence' when a multi-day event is passed to the pilot, it is converted to an event // which recurs daily a number of times. if the event itself recurs, this will be overridden, and // only the first day will be included in the event!!!! - QDateTime startDt(readTm(dateEntry->getEventStart())), endDt(readTm(dateEntry->getEventEnd())); + TQDateTime startDt(readTm(dateEntry->getEventStart())), endDt(readTm(dateEntry->getEventEnd())); if (startDt.daysTo(endDt)) { isMultiDay=true; @@ -350,7 +350,7 @@ static void setRecurrence(PilotDateEntry*dateEntry, const KCal::Event *event) int freq=r->frequency(); - QDate endDate=r->endDate(); + TQDate endDate=r->endDate(); if ( r->duration() < 0 || !endDate.isValid() ) { @@ -366,7 +366,7 @@ static void setRecurrence(PilotDateEntry*dateEntry, const KCal::Event *event) DEBUGKPILOT<< "duration: "<<r->duration() << ", endDate: "<<endDate.toString()<< ", ValidEndDate: "<<endDate.isValid()<<", NullEndDate: "<<endDate.isNull()<<endl; #endif - QBitArray dayArray(7), dayArrayPalm(7); + TQBitArray dayArray(7), dayArrayPalm(7); switch(recType) { case KCal::Recurrence::rDaily: @@ -392,7 +392,7 @@ static void setRecurrence(PilotDateEntry*dateEntry, const KCal::Event *event) if (r->monthPositions().count()>0) { // Only take the first monthly position, as the palm allows only one - QValueList<KCal::RecurrenceRule::WDayPos> mps=r->monthPositions(); + TQValueList<KCal::RecurrenceRule::WDayPos> mps=r->monthPositions(); KCal::RecurrenceRule::WDayPos mp=mps.first(); int week = mp.pos(); int day = (mp.day()+1) % 7; // rotate because of different offset |