diff options
Diffstat (limited to 'src/tools/qdatastream.cpp')
| -rw-r--r-- | src/tools/qdatastream.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/tools/qdatastream.cpp b/src/tools/qdatastream.cpp index 2cdd5f7..f36afeb 100644 --- a/src/tools/qdatastream.cpp +++ b/src/tools/qdatastream.cpp @@ -493,7 +493,7 @@ extern "C" long long __strtoll( const char *, char**, int ); static Q_INT64 read_int_ascii( QDataStream *s ) { - register int n = 0; + int n = 0; char buf[40]; for ( ;; ) { buf[n] = s->device()->getch(); @@ -575,7 +575,7 @@ QDataStream &QDataStream::operator>>( Q_INT16 &i ) } else if ( noswap ) { // no conversion needed dev->readBlock( (char *)&i, sizeof(Q_INT16) ); } else { // swap bytes - register uchar *p = (uchar *)(&i); + uchar *p = (uchar *)(&i); char b[2]; if (dev->readBlock( b, 2 ) >= 2) { *p++ = b[1]; @@ -687,7 +687,7 @@ QDataStream &QDataStream::operator>>( Q_LONG &i ) } else if ( noswap ) { // no conversion needed dev->readBlock( (char *)&i, sizeof(Q_LONG) ); } else { // swap bytes - register uchar *p = (uchar *)(&i); + uchar *p = (uchar *)(&i); char b[sizeof(Q_LONG)]; if (dev->readBlock( b, sizeof(Q_LONG) ) >= (int)sizeof(Q_LONG)) { for ( int j = sizeof(Q_LONG); j; ) { @@ -701,7 +701,7 @@ QDataStream &QDataStream::operator>>( Q_LONG &i ) static double read_double_ascii( QDataStream *s ) { - register int n = 0; + int n = 0; char buf[80]; for ( ;; ) { buf[n] = s->device()->getch(); @@ -759,7 +759,7 @@ QDataStream &QDataStream::operator>>( double &f ) } else if ( noswap ) { // no conversion needed dev->readBlock( (char *)&f, sizeof(double) ); } else { // swap bytes - register uchar *p = (uchar *)(&f); + uchar *p = (uchar *)(&f); char b[8]; if (dev->readBlock( b, 8 ) >= 8) { *p++ = b[7]; @@ -841,7 +841,7 @@ QDataStream &QDataStream::readRawBytes( char *s, uint len ) { CHECK_STREAM_PRECOND if ( printable ) { // printable data - register Q_INT8 *p = (Q_INT8*)s; + Q_INT8 *p = (Q_INT8*)s; if ( version() < 4 ) { while ( len-- ) { Q_INT32 tmp; @@ -918,7 +918,7 @@ QDataStream &QDataStream::operator<<( Q_INT16 i ) } else if ( noswap ) { // no conversion needed dev->writeBlock( (char *)&i, sizeof(Q_INT16) ); } else { // swap bytes - register uchar *p = (uchar *)(&i); + uchar *p = (uchar *)(&i); char b[2]; b[1] = *p++; b[0] = *p; @@ -944,7 +944,7 @@ QDataStream &QDataStream::operator<<( Q_INT32 i ) } else if ( noswap ) { // no conversion needed dev->writeBlock( (char *)&i, sizeof(Q_INT32) ); } else { // swap bytes - register uchar *p = (uchar *)(&i); + uchar *p = (uchar *)(&i); char b[4]; b[3] = *p++; b[2] = *p++; @@ -987,7 +987,7 @@ QDataStream &QDataStream::operator<<( Q_INT64 i ) } else if ( noswap ) { // no conversion needed dev->writeBlock( (char *)&i, sizeof(Q_INT64) ); } else { // swap bytes - register uchar *p = (uchar *)(&i); + uchar *p = (uchar *)(&i); char b[8]; b[7] = *p++; b[6] = *p++; @@ -1027,7 +1027,7 @@ QDataStream &QDataStream::operator<<( Q_LONG i ) } else if ( noswap ) { // no conversion needed dev->writeBlock( (char *)&i, sizeof(Q_LONG) ); } else { // swap bytes - register uchar *p = (uchar *)(&i); + uchar *p = (uchar *)(&i); char b[sizeof(Q_LONG)]; for ( int j = sizeof(Q_LONG); j; ) b[--j] = *p++; @@ -1064,7 +1064,7 @@ QDataStream &QDataStream::operator<<( float f ) if ( noswap ) { // no conversion needed dev->writeBlock( (char *)&g, sizeof(float) ); } else { // swap bytes - register uchar *p = (uchar *)(&g); + uchar *p = (uchar *)(&g); char b[4]; b[3] = *p++; b[2] = *p++; @@ -1094,7 +1094,7 @@ QDataStream &QDataStream::operator<<( double f ) } else if ( noswap ) { // no conversion needed dev->writeBlock( (char *)&f, sizeof(double) ); } else { // swap bytes - register uchar *p = (uchar *)(&f); + uchar *p = (uchar *)(&f); char b[8]; b[7] = *p++; b[6] = *p++; @@ -1163,11 +1163,11 @@ QDataStream &QDataStream::writeRawBytes( const char *s, uint len ) CHECK_STREAM_PRECOND if ( printable ) { // write printable if ( version() < 4 ) { - register char *p = (char *)s; + char *p = (char *)s; while ( len-- ) *this << *p++; } else { - register Q_INT8 *p = (Q_INT8*)s; + Q_INT8 *p = (Q_INT8*)s; while ( len-- ) *this << *p++; } |