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/qtextstream.cpp | |
| parent | af8fdcf1ca7bdbda6f0c1afecd8c2d8ffa23bebb (diff) | |
| parent | 6dec101d43dcbd4195c47d54bd388db1a8d7230e (diff) | |
| download | tqt-d1096751ddb25cdef23919c17389fc268c31edaf.tar.gz tqt-d1096751ddb25cdef23919c17389fc268c31edaf.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
Diffstat (limited to 'src/tools/qtextstream.cpp')
| -rw-r--r-- | src/tools/qtextstream.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/tools/qtextstream.cpp b/src/tools/qtextstream.cpp index e5ccf8bad..6a0e1d6b7 100644 --- a/src/tools/qtextstream.cpp +++ b/src/tools/qtextstream.cpp @@ -299,8 +299,8 @@ public: Offset size() const; Offset at() const; bool at( Offset pos ); - Q_LONG readBlock( char *p, Q_ULONG len ); - Q_LONG writeBlock( const char *p, Q_ULONG len ); + TQ_LONG readBlock( char *p, TQ_ULONG len ); + TQ_LONG writeBlock( const char *p, TQ_ULONG len ); int getch(); int putch( int ch ); int ungetch( int ch ); @@ -396,7 +396,7 @@ bool TQStringBuffer::at( Offset pos ) } -Q_LONG TQStringBuffer::readBlock( char *p, Q_ULONG len ) +TQ_LONG TQStringBuffer::readBlock( char *p, TQ_ULONG len ) { #if defined(QT_CHECK_STATE) TQ_CHECK_PTR( p ); @@ -423,7 +423,7 @@ Q_LONG TQStringBuffer::readBlock( char *p, Q_ULONG len ) return len; } -Q_LONG TQStringBuffer::writeBlock( const char *p, Q_ULONG len ) +TQ_LONG TQStringBuffer::writeBlock( const char *p, TQ_ULONG len ) { #if defined(QT_CHECK_NULL) if ( p == 0 && len != 0 ) |