diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-15 15:08:51 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-15 15:08:51 -0600 |
| commit | fb652a2be46ce1a2081e5dde268cd9f4ebe6fdd0 (patch) | |
| tree | a01fcd88aa65a77c2b2e12ba1a55851ddfe5afcc /dcop | |
| parent | 3fbca5d9a4bd057ed5f9df138333e6c16dbdcc62 (diff) | |
| download | tdelibs-fb652a2be46ce1a2081e5dde268cd9f4ebe6fdd0.tar.gz tdelibs-fb652a2be46ce1a2081e5dde268cd9f4ebe6fdd0.zip | |
Fix kdelibs FTBFS on native TQt3
Diffstat (limited to 'dcop')
| -rw-r--r-- | dcop/client/dcop.cpp | 6 | ||||
| -rw-r--r-- | dcop/dcopclient.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/dcop/client/dcop.cpp b/dcop/client/dcop.cpp index 4086d75b3..0eafb5055 100644 --- a/dcop/client/dcop.cpp +++ b/dcop/client/dcop.cpp @@ -672,7 +672,7 @@ int runDCOP( QCStringList args, UserList users, Session session, if( !success ) { cerr_ << "ERROR: Couldn't attach to DCOP server!" << endl; - retval = QMAX( retval, 1 ); + retval = TQMAX( retval, 1 ); if( users.isEmpty() ) break; else @@ -725,7 +725,7 @@ int runDCOP( QCStringList args, UserList users, Session session, if( !buf.isNull() ) { int res = callFunction( app, objid, function, params ); - retval = QMAX( retval, res ); + retval = TQMAX( retval, res ); } } } @@ -734,7 +734,7 @@ int runDCOP( QCStringList args, UserList users, Session session, // Just call function // cout_ << "call " << app << ", " << objid << ", " << function << ", (params)" << endl; int res = callFunction( app, objid, function, params ); - retval = QMAX( retval, res ); + retval = TQMAX( retval, res ); } break; } diff --git a/dcop/dcopclient.cpp b/dcop/dcopclient.cpp index 6a2bb3c98..ae1b85f9f 100644 --- a/dcop/dcopclient.cpp +++ b/dcop/dcopclient.cpp @@ -782,7 +782,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous ) emit attachFailed(TQString::tqfromLatin1( "Could not read network connection list.\n" )+TQFile::decodeName(fName)); return false; } - int size = QMIN( (qint64)1024, f.size() ); // protection against a huge file + int size = TQMIN( (qint64)1024, f.size() ); // protection against a huge file TQCString contents( size+1 ); if ( f.readBlock( contents.data(), size ) != size ) { |