summaryrefslogtreecommitdiffstats
path: root/kopete/libkopete/kopetecontactlist.h
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-22 00:30:31 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-22 00:30:31 +0000
commit69cac65817d949cda2672ec4f0aa73d5e66a0ba1 (patch)
tree073fde0496ea90eb5bf5cffe66a8da43a9f55fbc /kopete/libkopete/kopetecontactlist.h
parent3467e6464beac3a162839bf7078e22e3a74d73e7 (diff)
downloadtdenetwork-69cac65817d949cda2672ec4f0aa73d5e66a0ba1.tar.gz
tdenetwork-69cac65817d949cda2672ec4f0aa73d5e66a0ba1.zip
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
Diffstat (limited to 'kopete/libkopete/kopetecontactlist.h')
-rw-r--r--kopete/libkopete/kopetecontactlist.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/kopete/libkopete/kopetecontactlist.h b/kopete/libkopete/kopetecontactlist.h
index ff653d34..a0b27ded 100644
--- a/kopete/libkopete/kopetecontactlist.h
+++ b/kopete/libkopete/kopetecontactlist.h
@@ -47,9 +47,10 @@ class Contact;
* @author Martijn Klingens <klingens@kde.org>
* @author Olivier Goffart <ogoffart@tiscalinet.be>
*/
-class KOPETE_EXPORT ContactList : public QObject
+class KOPETE_EXPORT ContactList : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
@@ -131,7 +132,7 @@ public:
/**
* return the metacontact that represent the user itself.
- * This metacontact should be the parent of every Kopete::Account::myself() contacts.
+ * This metacontact should be the tqparent of every Kopete::Account::myself() contacts.
*
* This metacontact is not in the contactlist.
*/
@@ -345,7 +346,7 @@ public: //TODO I think all theses method should be moved to the decop interface.
* Return all meta contacts with their current status
*
* FIXME: Do we *need* this one? Sounds error prone to me, because
- * nicknames can contain parentheses too. - Martijn
+ * nicknames can contain tqparentheses too. - Martijn
*/
TQStringList contactStatuses() const;
@@ -362,12 +363,12 @@ public: //TODO I think all theses method should be moved to the decop interface.
* @param fileSize (Optional) The size of the file
*/
void sendFile(const TQString &displayName, const KURL &sourceURL,
- const TQString &altFileName = TQString::null, const long unsigned int fileSize = 0L);
+ const TQString &altFileName = TQString(), const long unsigned int fileSize = 0L);
/**
* Open a chat to a contact, and optionally set some initial text
*/
- void messageContact( const TQString &displayName, const TQString &messageText = TQString::null );
+ void messageContact( const TQString &displayName, const TQString &messageText = TQString() );
public slots:
/**