diff options
Diffstat (limited to 'kpilot/conduits/abbrowserconduit/abbrowser-conduit.h')
| -rw-r--r-- | kpilot/conduits/abbrowserconduit/abbrowser-conduit.h | 16 |
1 files changed, 8 insertions, 8 deletions
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 |