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/ntqiodevice.h | |
| 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/ntqiodevice.h')
| -rw-r--r-- | src/tools/ntqiodevice.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/tools/ntqiodevice.h b/src/tools/ntqiodevice.h index 33516d076..d014265cd 100644 --- a/src/tools/ntqiodevice.h +++ b/src/tools/ntqiodevice.h @@ -92,9 +92,9 @@ class Q_EXPORT TQIODevice { public: #if defined(QT_ABI_QT4) - typedef Q_LLONG Offset; + typedef TQ_LLONG Offset; #else - typedef Q_ULONG Offset; + typedef TQ_ULONG Offset; #endif TQIODevice(); @@ -131,10 +131,10 @@ public: virtual bool atEnd() const; bool reset() { return at(0); } - virtual Q_LONG readBlock( char *data, Q_ULONG maxlen ) = 0; - virtual Q_LONG writeBlock( const char *data, Q_ULONG len ) = 0; - virtual Q_LONG readLine( char *data, Q_ULONG maxlen ); - Q_LONG writeBlock( const TQByteArray& data ); + virtual TQ_LONG readBlock( char *data, TQ_ULONG maxlen ) = 0; + virtual TQ_LONG writeBlock( const char *data, TQ_ULONG len ) = 0; + virtual TQ_LONG readLine( char *data, TQ_ULONG maxlen ); + TQ_LONG writeBlock( const TQByteArray& data ); virtual TQByteArray readAll(); virtual int getch() = 0; |