diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-08-02 19:23:47 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-08-02 19:23:47 +0000 |
| commit | 8f14fb0418241694e61cb35dda95fea6d9b7830d (patch) | |
| tree | 73afdda59a8126db123133d64bab78a3503657dc /dcop/dcopclient.cpp | |
| parent | ffe8a83e053396df448e9413828527613ca3bd46 (diff) | |
| download | tdelibs-8f14fb0418241694e61cb35dda95fea6d9b7830d.tar.gz tdelibs-8f14fb0418241694e61cb35dda95fea6d9b7830d.zip | |
TQt conversion fixes
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1158447 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'dcop/dcopclient.cpp')
| -rw-r--r-- | dcop/dcopclient.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/dcop/dcopclient.cpp b/dcop/dcopclient.cpp index 176dbf8e9..2bbe69ed9 100644 --- a/dcop/dcopclient.cpp +++ b/dcop/dcopclient.cpp @@ -61,7 +61,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqsocketnotifier.h> #include <tqregexp.h> -#include <private/qucomextra_p.h> +#include <tqucomextra_p.h> #include <dcopglobal.h> #include <dcopclient.h> @@ -780,7 +780,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous ) emit attachFailed(TQString::fromLatin1( "Could not read network connection list.\n" )+TQFile::decodeName(fName)); return false; } - int size = QMIN( 1024, f.size() ); // protection against a huge file + int size = QMIN( (qint64)1024, f.size() ); // protection against a huge file TQCString contents( size+1 ); if ( f.readBlock( contents.data(), size ) != size ) { @@ -1339,7 +1339,7 @@ static void fillQtObjects( QCStringList& l, TQObject* o, TQCString path ) if ( n == "unnamed" || n.isEmpty() ) { n.sprintf("%p", (void *) obj); - n = TQString("unnamed%1(%2, %3)").arg(++unnamed).arg(obj->className()).arg(n).latin1(); + n = TQString("unnamed%1(%2, %3)").arg(++unnamed).arg(obj->className()).arg(TQString(n)).latin1(); } TQCString fn = path + n; l.append( fn ); @@ -1376,7 +1376,7 @@ static void fillQtObjectsEx( TQValueList<O>& l, TQObject* o, TQCString path ) if ( n == "unnamed" || n.isEmpty() ) { n.sprintf("%p", (void *) obj); - n = TQString("unnamed%1(%2, %3)").arg(++unnamed).arg(obj->className()).arg(n).latin1(); + n = TQString("unnamed%1(%2, %3)").arg(++unnamed).arg(obj->className()).arg(TQString(n)).latin1(); } TQCString fn = path + n; l.append( O( fn, obj ) ); @@ -1785,8 +1785,8 @@ int DCOPClient::callAsync(const TQCString &remApp, const TQCString &remObjId, TQByteArray replyData; ReplyStruct *replyStruct = new ReplyStruct; - replyStruct->replyType = new QCString; - replyStruct->replyData = new QByteArray; + replyStruct->replyType = new TQCString; + replyStruct->replyData = new TQByteArray; replyStruct->replyObject = callBackObj; replyStruct->replySlot = callBackSlot; replyStruct->replyId = ++d->transactionId; |