diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-22 00:30:31 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-22 00:30:31 +0000 |
| commit | 69cac65817d949cda2672ec4f0aa73d5e66a0ba1 (patch) | |
| tree | 073fde0496ea90eb5bf5cffe66a8da43a9f55fbc /kopete/protocols/jabber/jingle/jinglesessionmanager.cpp | |
| parent | 3467e6464beac3a162839bf7078e22e3a74d73e7 (diff) | |
| download | tdenetwork-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/protocols/jabber/jingle/jinglesessionmanager.cpp')
| -rw-r--r-- | kopete/protocols/jabber/jingle/jinglesessionmanager.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kopete/protocols/jabber/jingle/jinglesessionmanager.cpp b/kopete/protocols/jabber/jingle/jinglesessionmanager.cpp index 54fc7274..766da28e 100644 --- a/kopete/protocols/jabber/jingle/jinglesessionmanager.cpp +++ b/kopete/protocols/jabber/jingle/jinglesessionmanager.cpp @@ -14,7 +14,7 @@ * * ************************************************************************* */ -// libjingle before everything else to not clash with Qt +// libjingle before everything else to not clash with TQt #define POSIX #include "talk/xmpp/constants.h" #include "talk/base/sigslot.h" @@ -55,8 +55,8 @@ class JingleSessionManager; class JingleSessionManager::SlotsProxy : public sigslot::has_slots<> { public: - SlotsProxy(JingleSessionManager *parent) - : sessionManager(parent) + SlotsProxy(JingleSessionManager *tqparent) + : sessionManager(tqparent) {} void OnSignalingRequest() |