diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-06-18 00:09:52 -0500 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-06-18 00:09:52 -0500 |
| commit | d1096751ddb25cdef23919c17389fc268c31edaf (patch) | |
| tree | b910be3588cb706defc00c31aefa850bb2312784 /src/tools/qfile.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.cpp')
| -rw-r--r-- | src/tools/qfile.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/tools/qfile.cpp b/src/tools/qfile.cpp index eee256836..47f77b5e3 100644 --- a/src/tools/qfile.cpp +++ b/src/tools/qfile.cpp @@ -150,7 +150,7 @@ extern bool qt_file_access( const TQString& fn, int t ); */ /*! - \fn Q_LONG TQFile::writeBlock( const TQByteArray& data ) + \fn TQ_LONG TQFile::writeBlock( const TQByteArray& data ) \overload */ @@ -366,7 +366,7 @@ bool TQFile::atEnd() const \sa readBlock(), TQTextStream::readLine() */ -Q_LONG TQFile::readLine( char *p, Q_ULONG maxlen ) +TQ_LONG TQFile::readLine( char *p, TQ_ULONG maxlen ) { if ( maxlen == 0 ) // application bug? return 0; @@ -381,7 +381,7 @@ Q_LONG TQFile::readLine( char *p, Q_ULONG maxlen ) return -1; } #endif - Q_LONG nread; // number of bytes read + TQ_LONG nread; // number of bytes read if ( isRaw() ) { // raw file nread = TQIODevice::readLine( p, maxlen ); } else { // buffered file @@ -419,10 +419,10 @@ Q_LONG TQFile::readLine( char *p, Q_ULONG maxlen ) \sa readBlock(), TQTextStream::readLine() */ -Q_LONG TQFile::readLine( TQString& s, Q_ULONG maxlen ) +TQ_LONG TQFile::readLine( TQString& s, TQ_ULONG maxlen ) { TQByteArray ba(maxlen); - Q_LONG l = readLine(ba.data(),maxlen); + TQ_LONG l = readLine(ba.data(),maxlen); if ( l >= 0 ) { ba.truncate(l); s = TQString(ba); |