diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-02-15 19:11:41 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-02-15 19:11:41 +0000 |
| commit | 374d939d8af431477ce2601815f0ba121b66871c (patch) | |
| tree | ad878478dcc0bedf51e3cffb2ed611ada422b290 /dcop/dcopclient.cpp | |
| parent | f9279733bf71e446933b46f40cbe9c9b9f57b778 (diff) | |
| download | tdelibs-374d939d8af431477ce2601815f0ba121b66871c.tar.gz tdelibs-374d939d8af431477ce2601815f0ba121b66871c.zip | |
Allow kdelibs to function correctly with TQt for Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1220926 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'dcop/dcopclient.cpp')
| -rw-r--r-- | dcop/dcopclient.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/dcop/dcopclient.cpp b/dcop/dcopclient.cpp index 8f4b7ce15..892884af3 100644 --- a/dcop/dcopclient.cpp +++ b/dcop/dcopclient.cpp @@ -483,7 +483,7 @@ void DCOPProcessInternal( DCOPClientPrivate *d, int opcode, CARD32 key, const TQ int datalen = reply.size(); pMsg->key = key; pMsg->length += datalen; - IceSendData( iceConn, datalen, const_cast<char *>(reply.data())); + IceSendData( iceConn, datalen, reply.data()); return; } @@ -1617,7 +1617,8 @@ bool DCOPClient::receive(const TQCString &/*app*/, const TQCString &objId, // fall through and send to object proxies } - if (!objId.isEmpty() && objId[objId.length()-1] == '*') { +// if (!objId.isEmpty() && objId[objId.length()-1] == '*') { + if (!objId.isEmpty() && ((objId.length()>0)?(objId[objId.length()-1] == '*'):0)) { // handle a multicast to several objects. // doesn't handle proxies currently. should it? TQPtrList<DCOPObject> matchList = |