diff options
| author | Darrell Anderson <[email protected]> | 2012-06-18 00:09:52 -0500 |
|---|---|---|
| committer | Darrell Anderson <[email protected]> | 2012-06-18 00:09:52 -0500 |
| commit | d1096751ddb25cdef23919c17389fc268c31edaf (patch) | |
| tree | b910be3588cb706defc00c31aefa850bb2312784 /src/tools/qfile_unix.cpp | |
| parent | af8fdcf1ca7bdbda6f0c1afecd8c2d8ffa23bebb (diff) | |
| parent | 6dec101d43dcbd4195c47d54bd388db1a8d7230e (diff) | |
| download | tqt3-d1096751ddb25cdef23919c17389fc268c31edaf.tar.gz tqt3-d1096751ddb25cdef23919c17389fc268c31edaf.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
Diffstat (limited to 'src/tools/qfile_unix.cpp')
| -rw-r--r-- | src/tools/qfile_unix.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/tools/qfile_unix.cpp b/src/tools/qfile_unix.cpp index 90decadb5..9aa4b1f60 100644 --- a/src/tools/qfile_unix.cpp +++ b/src/tools/qfile_unix.cpp @@ -553,7 +553,7 @@ bool TQFile::at( Offset pos ) readBlock() solved this problem. */ -Q_LONG TQFile::readBlock( char *p, Q_ULONG len ) +TQ_LONG TQFile::readBlock( char *p, TQ_ULONG len ) { if ( !len ) // nothing to do return 0; @@ -572,7 +572,7 @@ Q_LONG TQFile::readBlock( char *p, Q_ULONG len ) return -1; } #endif - Q_ULONG nread = 0; // number of bytes read + TQ_ULONG nread = 0; // number of bytes read if ( !ungetchBuffer.isEmpty() ) { // need to add these to the returned string. uint l = ungetchBuffer.length(); @@ -622,7 +622,7 @@ Q_LONG TQFile::readBlock( char *p, Q_ULONG len ) \sa readBlock() */ -Q_LONG TQFile::writeBlock( const char *p, Q_ULONG len ) +TQ_LONG TQFile::writeBlock( const char *p, TQ_ULONG len ) { if ( !len ) // nothing to do return 0; @@ -641,7 +641,7 @@ Q_LONG TQFile::writeBlock( const char *p, Q_ULONG len ) return -1; } #endif - Q_ULONG nwritten; // number of bytes written + TQ_ULONG nwritten; // number of bytes written if ( isRaw() ) // raw file nwritten = ::write( fd, (void *)p, len ); else // buffered file |