From 69cac65817d949cda2672ec4f0aa73d5e66a0ba1 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 22 Jun 2011 00:30:31 +0000 Subject: TQt4 port kdenetwork This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kopete/libkopete/kopetetransfermanager.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'kopete/libkopete/kopetetransfermanager.h') diff --git a/kopete/libkopete/kopetetransfermanager.h b/kopete/libkopete/kopetetransfermanager.h index 53b2711f..30906b97 100644 --- a/kopete/libkopete/kopetetransfermanager.h +++ b/kopete/libkopete/kopetetransfermanager.h @@ -40,7 +40,7 @@ class KOPETE_EXPORT FileTransferInfo public: enum KopeteTransferDirection { Incoming, Outgoing }; - FileTransferInfo( Contact *, const TQString&, const unsigned long size, const TQString &, KopeteTransferDirection di, const unsigned int id, TQString internalId=TQString::null); + FileTransferInfo( Contact *, const TQString&, const unsigned long size, const TQString &, KopeteTransferDirection di, const unsigned int id, TQString internalId=TQString()); ~FileTransferInfo() {} unsigned int transferId() const { return mId; } const Contact* contact() const { return mContact; } @@ -63,9 +63,10 @@ private: /** * Creates and manages kopete file transfers */ -class KOPETE_EXPORT TransferManager : public QObject +class KOPETE_EXPORT TransferManager : public TQObject { Q_OBJECT + TQ_OBJECT public: /** @@ -78,7 +79,7 @@ public: * @brief Adds a file transfer to the Kopete::TransferManager */ Transfer *addTransfer( Contact *contact, const TQString& file, const unsigned long size, const TQString &recipient , FileTransferInfo::KopeteTransferDirection di); - int askIncomingTransfer( Contact *contact, const TQString& file, const unsigned long size, const TQString& description=TQString::null, TQString internalId=TQString::null); + int askIncomingTransfer( Contact *contact, const TQString& file, const unsigned long size, const TQString& description=TQString(), TQString internalId=TQString()); void removeTransfer( unsigned int id ); /** @@ -120,7 +121,7 @@ private slots: void slotComplete(KIO::Job*); private: - TransferManager( TQObject *parent ); + TransferManager( TQObject *tqparent ); static TransferManager *s_transferManager; int nextID; @@ -134,6 +135,7 @@ private: class KOPETE_EXPORT Transfer : public KIO::Job { Q_OBJECT + TQ_OBJECT public: /** -- cgit v1.2.1