summaryrefslogtreecommitdiffstats
path: root/src/tools/qtextstream.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-09-12 12:59:53 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-09-12 12:59:53 -0500
commitb47847259808cc29f6bf98b8c788603d0d21a038 (patch)
tree4ce7377f698a62b2c6e04ec50b70641730dcfa42 /src/tools/qtextstream.cpp
parent9c2ce91a364c22f9b232eb40f3c2a392360ed21c (diff)
downloadtqt3-b47847259808cc29f6bf98b8c788603d0d21a038.tar.gz
tqt3-b47847259808cc29f6bf98b8c788603d0d21a038.zip
Automated update from Qt3
Diffstat (limited to 'src/tools/qtextstream.cpp')
-rw-r--r--src/tools/qtextstream.cpp31
1 files changed, 29 insertions, 2 deletions
diff --git a/src/tools/qtextstream.cpp b/src/tools/qtextstream.cpp
index 6a0e1d6b..213581b8 100644
--- a/src/tools/qtextstream.cpp
+++ b/src/tools/qtextstream.cpp
@@ -195,6 +195,7 @@
#define I_SHORT 0x0010
#define I_INT 0x0020
#define I_LONG 0x0030
+#define I_LONGLONG 0x0040
#define I_TYPE_MASK 0x00f0
#define I_BASE_2 TQTS::bin
@@ -1862,7 +1863,7 @@ TQTextStream &TQTextStream::operator<<( char c )
return *this;
}
-TQTextStream &TQTextStream::output_int( int format, ulong n, bool neg )
+TQTextStream &TQTextStream::output_int( int format, unsigned long long n, bool neg )
{
static const char hexdigits_lower[] = "0123456789abcdef";
static const char hexdigits_upper[] = "0123456789ABCDEF";
@@ -1879,6 +1880,7 @@ TQTextStream &TQTextStream::output_int( int format, ulong n, bool neg )
case I_SHORT: len=16; break;
case I_INT: len=sizeof(int)*8; break;
case I_LONG: len=32; break;
+ case I_LONGLONG: len=64; break;
default: len = 0;
}
p = &buf[74]; // go reverse order
@@ -1925,7 +1927,7 @@ TQTextStream &TQTextStream::output_int( int format, ulong n, bool neg )
p = &buf[74];
*p = '\0';
if ( neg )
- n = (ulong)(-(long)n);
+ n = (unsigned long long)(-(long long)n);
do {
*--p = ((int)(n%10)) + '0';
n /= 10;
@@ -2041,6 +2043,31 @@ TQTextStream &TQTextStream::operator<<( unsigned long i )
return output_int( I_LONG | I_UNSIGNED, i, FALSE );
}
+/*!
+ \overload
+
+ Writes a \c long long \c int \a i to the stream and returns a reference
+ to the stream.
+*/
+
+TQTextStream &TQTextStream::operator<<( signed long long i )
+{
+ return output_int( I_LONGLONG | I_SIGNED, i, i < 0 );
+}
+
+
+/*!
+ \overload
+
+ Writes an \c unsigned \c long \c int \a i to the stream and
+ returns a reference to the stream.
+*/
+
+TQTextStream &TQTextStream::operator<<( unsigned long long i )
+{
+ return output_int( I_LONGLONG | I_UNSIGNED, i, FALSE );
+}
+
/*!
\overload