diff options
| -rw-r--r-- | dcop/dcopclient.cpp | 2 | ||||
| -rw-r--r-- | dcop/dcopglobal.h | 2 | ||||
| -rw-r--r-- | dcop/dcopserver.cpp | 2 | ||||
| -rw-r--r-- | dcop/dcopserver.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/dcop/dcopclient.cpp b/dcop/dcopclient.cpp index f5588ad3c..0aae67b7a 100644 --- a/dcop/dcopclient.cpp +++ b/dcop/dcopclient.cpp @@ -821,7 +821,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous ) emit attachFailed(TQString::fromLatin1( "Could not read network connection list.\n" )+TQFile::decodeName(fName)); return false; } - int size = TQMIN( (qint64)1024, f.size() ); // protection against a huge file + int size = TQMIN( (long)1024, f.size() ); // protection against a huge file TQCString contents( size+1 ); if ( f.readBlock( contents.data(), size ) != size ) { diff --git a/dcop/dcopglobal.h b/dcop/dcopglobal.h index 559037d2f..de6a9b223 100644 --- a/dcop/dcopglobal.h +++ b/dcop/dcopglobal.h @@ -37,7 +37,7 @@ #define DCOPReplyDelayed 6 #define DCOPFind 7 -#define INT32 QINT32 +#define INT32 TQ_INT32 #ifdef Q_WS_X11 #include <X11/Xlib.h> #include <X11/Xmd.h> diff --git a/dcop/dcopserver.cpp b/dcop/dcopserver.cpp index ec6086f09..a565df405 100644 --- a/dcop/dcopserver.cpp +++ b/dcop/dcopserver.cpp @@ -1618,7 +1618,7 @@ static bool isRunning(const TQCString &fName, bool printNetworkId = false) if (::access(fName.data(), R_OK) == 0) { TQFile f(fName); f.open(IO_ReadOnly); - int size = TQMIN( (qint64)1024, f.size() ); // protection against a huge file + int size = TQMIN( (long)1024, f.size() ); // protection against a huge file TQCString contents( size+1 ); bool ok = f.readBlock( contents.data(), size ) == size; contents[size] = '\0'; diff --git a/dcop/dcopserver.h b/dcop/dcopserver.h index 77c88f62e..c9ff4d3ff 100644 --- a/dcop/dcopserver.h +++ b/dcop/dcopserver.h @@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqintdict.h> #include <tqapplication.h> -#define INT32 QINT32 +#define INT32 TQ_INT32 #ifdef Q_WS_X11 #include <X11/Xlib.h> #include <X11/Xmd.h> |