From 10308be19ef7fa44699562cc75946e7ea1fdf6b9 Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 7 Jan 2011 03:45:53 +0000 Subject: Revert automated changes Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kdecore/kmdcodec.cpp | 130 +++++++++++++++++++++++++-------------------------- 1 file changed, 65 insertions(+), 65 deletions(-) (limited to 'kdecore/kmdcodec.cpp') diff --git a/kdecore/kmdcodec.cpp b/kdecore/kmdcodec.cpp index 73b868417..76c80d329 100644 --- a/kdecore/kmdcodec.cpp +++ b/kdecore/kmdcodec.cpp @@ -238,7 +238,7 @@ void KCodecs::quotedPrintableEncode(const TQByteArray& in, TQByteArray& out, boo ++lineLength; } } - // If we tqfind a line break, just let it through. + // If we find a line break, just let it through. else if ((useCRLF && ('\r' == c) && (i < end) && ('\n' == data[i + 1])) || (!useCRLF && ('\n' == c))) { @@ -787,7 +787,7 @@ void KMD5::update(const TQCString& in) void KMD5::update(const unsigned char* in, int len) { if (len < 0) - len = tqstrlen(reinterpret_cast(in)); + len = qstrlen(reinterpret_cast(in)); if (!len) return; @@ -797,12 +797,12 @@ void KMD5::update(const unsigned char* in, int len) return; } - TQ_UINT32 in_index; - TQ_UINT32 buffer_index; - TQ_UINT32 buffer_space; - TQ_UINT32 in_length = static_cast( len ); + Q_UINT32 in_index; + Q_UINT32 buffer_index; + Q_UINT32 buffer_space; + Q_UINT32 in_length = static_cast( len ); - buffer_index = static_cast((m_count[0] >> 3) & 0x3F); + buffer_index = static_cast((m_count[0] >> 3) & 0x3F); if ( (m_count[0] += (in_length << 3))<(in_length << 3) ) m_count[1]++; @@ -842,8 +842,8 @@ void KMD5::finalize () { if (m_finalized) return; - TQ_UINT8 bits[8]; - TQ_UINT32 index, padLen; + Q_UINT8 bits[8]; + Q_UINT32 index, padLen; static const unsigned char PADDING[64]= { 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -856,7 +856,7 @@ void KMD5::finalize () //memcpy( bits, m_count, 8 ); // Pad out to 56 mod 64. - index = static_cast((m_count[0] >> 3) & 0x3f); + index = static_cast((m_count[0] >> 3) & 0x3f); padLen = (index < 56) ? (56 - index) : (120 - index); update (reinterpret_cast(PADDING), padLen); @@ -957,7 +957,7 @@ void KMD5::reset() void KMD5::transform( const unsigned char block[64] ) { - TQ_UINT32 a = m_state[0], b = m_state[1], c = m_state[2], d = m_state[3], x[16]; + Q_UINT32 a = m_state[0], b = m_state[1], c = m_state[2], d = m_state[3], x[16]; decode (x, block, 64); //memcpy( x, block, 64 ); @@ -1044,91 +1044,91 @@ void KMD5::transform( const unsigned char block[64] ) memset ( static_cast(x), 0, sizeof(x) ); } -inline TQ_UINT32 KMD5::rotate_left (TQ_UINT32 x, TQ_UINT32 n) +inline Q_UINT32 KMD5::rotate_left (Q_UINT32 x, Q_UINT32 n) { return (x << n) | (x >> (32-n)) ; } -inline TQ_UINT32 KMD5::F (TQ_UINT32 x, TQ_UINT32 y, TQ_UINT32 z) +inline Q_UINT32 KMD5::F (Q_UINT32 x, Q_UINT32 y, Q_UINT32 z) { return (x & y) | (~x & z); } -inline TQ_UINT32 KMD5::G (TQ_UINT32 x, TQ_UINT32 y, TQ_UINT32 z) +inline Q_UINT32 KMD5::G (Q_UINT32 x, Q_UINT32 y, Q_UINT32 z) { return (x & z) | (y & ~z); } -inline TQ_UINT32 KMD5::H (TQ_UINT32 x, TQ_UINT32 y, TQ_UINT32 z) +inline Q_UINT32 KMD5::H (Q_UINT32 x, Q_UINT32 y, Q_UINT32 z) { return x ^ y ^ z; } -inline TQ_UINT32 KMD5::I (TQ_UINT32 x, TQ_UINT32 y, TQ_UINT32 z) +inline Q_UINT32 KMD5::I (Q_UINT32 x, Q_UINT32 y, Q_UINT32 z) { return y ^ (x | ~z); } -void KMD5::FF ( TQ_UINT32& a, TQ_UINT32 b, TQ_UINT32 c, TQ_UINT32 d, - TQ_UINT32 x, TQ_UINT32 s, TQ_UINT32 ac ) +void KMD5::FF ( Q_UINT32& a, Q_UINT32 b, Q_UINT32 c, Q_UINT32 d, + Q_UINT32 x, Q_UINT32 s, Q_UINT32 ac ) { a += F(b, c, d) + x + ac; a = rotate_left (a, s) +b; } -void KMD5::GG ( TQ_UINT32& a, TQ_UINT32 b, TQ_UINT32 c, TQ_UINT32 d, - TQ_UINT32 x, TQ_UINT32 s, TQ_UINT32 ac) +void KMD5::GG ( Q_UINT32& a, Q_UINT32 b, Q_UINT32 c, Q_UINT32 d, + Q_UINT32 x, Q_UINT32 s, Q_UINT32 ac) { a += G(b, c, d) + x + ac; a = rotate_left (a, s) +b; } -void KMD5::HH ( TQ_UINT32& a, TQ_UINT32 b, TQ_UINT32 c, TQ_UINT32 d, - TQ_UINT32 x, TQ_UINT32 s, TQ_UINT32 ac ) +void KMD5::HH ( Q_UINT32& a, Q_UINT32 b, Q_UINT32 c, Q_UINT32 d, + Q_UINT32 x, Q_UINT32 s, Q_UINT32 ac ) { a += H(b, c, d) + x + ac; a = rotate_left (a, s) +b; } -void KMD5::II ( TQ_UINT32& a, TQ_UINT32 b, TQ_UINT32 c, TQ_UINT32 d, - TQ_UINT32 x, TQ_UINT32 s, TQ_UINT32 ac ) +void KMD5::II ( Q_UINT32& a, Q_UINT32 b, Q_UINT32 c, Q_UINT32 d, + Q_UINT32 x, Q_UINT32 s, Q_UINT32 ac ) { a += I(b, c, d) + x + ac; a = rotate_left (a, s) +b; } -void KMD5::encode ( unsigned char* output, TQ_UINT32 *in, TQ_UINT32 len ) +void KMD5::encode ( unsigned char* output, Q_UINT32 *in, Q_UINT32 len ) { #if !defined(WORDS_BIGENDIAN) memcpy(output, in, len); #else - TQ_UINT32 i, j; + Q_UINT32 i, j; for (i = 0, j = 0; j < len; i++, j += 4) { - output[j] = static_cast((in[i] & 0xff)); - output[j+1] = static_cast(((in[i] >> 8) & 0xff)); - output[j+2] = static_cast(((in[i] >> 16) & 0xff)); - output[j+3] = static_cast(((in[i] >> 24) & 0xff)); + output[j] = static_cast((in[i] & 0xff)); + output[j+1] = static_cast(((in[i] >> 8) & 0xff)); + output[j+2] = static_cast(((in[i] >> 16) & 0xff)); + output[j+3] = static_cast(((in[i] >> 24) & 0xff)); } #endif } -// Decodes in (TQ_UINT8) into output (TQ_UINT32). Assumes len is a +// Decodes in (Q_UINT8) into output (Q_UINT32). Assumes len is a // multiple of 4. -void KMD5::decode (TQ_UINT32 *output, const unsigned char* in, TQ_UINT32 len) +void KMD5::decode (Q_UINT32 *output, const unsigned char* in, Q_UINT32 len) { #if !defined(WORDS_BIGENDIAN) memcpy(output, in, len); #else - TQ_UINT32 i, j; + Q_UINT32 i, j; for (i = 0, j = 0; j < len; i++, j += 4) - output[i] = static_cast(in[j]) | - (static_cast(in[j+1]) << 8) | - (static_cast(in[j+2]) << 16) | - (static_cast(in[j+3]) << 24); + output[i] = static_cast(in[j]) | + (static_cast(in[j+1]) << 8) | + (static_cast(in[j+2]) << 16) | + (static_cast(in[j+3]) << 24); #endif } @@ -1180,7 +1180,7 @@ void KMD4::update(const TQCString& in) void KMD4::update(const unsigned char *in, int len) { if (len < 0) - len = tqstrlen(reinterpret_cast(in)); + len = qstrlen(reinterpret_cast(in)); if (!len) return; @@ -1190,12 +1190,12 @@ void KMD4::update(const unsigned char *in, int len) return; } - TQ_UINT32 t; + Q_UINT32 t; /* Update bitcount */ t = m_count[0]; - if ((m_count[0] = t + ((TQ_UINT32) len << 3)) < t) + if ((m_count[0] = t + ((Q_UINT32) len << 3)) < t) m_count[1]++; /* Carry from low to high */ m_count[1] += len >> 29; @@ -1205,17 +1205,17 @@ void KMD4::update(const unsigned char *in, int len) if (t) { - TQ_UINT8 *p = &m_buffer[ t ]; + Q_UINT8 *p = &m_buffer[ t ]; t = 64 - t; - if ((TQ_UINT32)len < t) + if ((Q_UINT32)len < t) { memcpy (p, in, len); return; } memcpy (p, in, t); byteReverse (m_buffer, 16); - transform (m_state, (TQ_UINT32*) m_buffer); + transform (m_state, (Q_UINT32*) m_buffer); in += t; len -= t; } @@ -1225,7 +1225,7 @@ void KMD4::update(const unsigned char *in, int len) { memcpy (m_buffer, in, 64); byteReverse (m_buffer, 16); - transform (m_state, (TQ_UINT32 *) m_buffer); + transform (m_state, (Q_UINT32 *) m_buffer); in += 64; len -= 64; } @@ -1272,7 +1272,7 @@ void KMD4::finalize() /* Two lots of padding: Pad the first block to 64 bytes */ memset (p, 0, count); byteReverse (m_buffer, 16); - transform (m_state, (TQ_UINT32*) m_buffer); + transform (m_state, (Q_UINT32*) m_buffer); /* Now fill the next block with 56 bytes */ memset (m_buffer, 0, 56); @@ -1285,10 +1285,10 @@ void KMD4::finalize() byteReverse (m_buffer, 14); /* Append length in bits and transform */ - ((TQ_UINT32 *) m_buffer)[14] = m_count[0]; - ((TQ_UINT32 *) m_buffer)[15] = m_count[1]; + ((Q_UINT32 *) m_buffer)[14] = m_count[0]; + ((Q_UINT32 *) m_buffer)[15] = m_count[1]; - transform (m_state, (TQ_UINT32 *) m_buffer); + transform (m_state, (Q_UINT32 *) m_buffer); byteReverse ((unsigned char *) m_state, 4); memcpy (m_digest, m_state, 16); @@ -1380,53 +1380,53 @@ void KMD4::reset() memset ( m_digest, 0, sizeof(*m_digest)); } -//#define rotl32(x,n) (((x) << ((TQ_UINT32)(n))) | ((x) >> (32 - (TQ_UINT32)(n)))) +//#define rotl32(x,n) (((x) << ((Q_UINT32)(n))) | ((x) >> (32 - (Q_UINT32)(n)))) -inline TQ_UINT32 KMD4::rotate_left (TQ_UINT32 x, TQ_UINT32 n) +inline Q_UINT32 KMD4::rotate_left (Q_UINT32 x, Q_UINT32 n) { return (x << n) | (x >> (32-n)) ; } -inline TQ_UINT32 KMD4::F (TQ_UINT32 x, TQ_UINT32 y, TQ_UINT32 z) +inline Q_UINT32 KMD4::F (Q_UINT32 x, Q_UINT32 y, Q_UINT32 z) { return (x & y) | (~x & z); } -inline TQ_UINT32 KMD4::G (TQ_UINT32 x, TQ_UINT32 y, TQ_UINT32 z) +inline Q_UINT32 KMD4::G (Q_UINT32 x, Q_UINT32 y, Q_UINT32 z) { return ((x) & (y)) | ((x) & (z)) | ((y) & (z)); } -inline TQ_UINT32 KMD4::H (TQ_UINT32 x, TQ_UINT32 y, TQ_UINT32 z) +inline Q_UINT32 KMD4::H (Q_UINT32 x, Q_UINT32 y, Q_UINT32 z) { return x ^ y ^ z; } -inline void KMD4::FF ( TQ_UINT32& a, TQ_UINT32 b, TQ_UINT32 c, TQ_UINT32 d, - TQ_UINT32 x, TQ_UINT32 s ) +inline void KMD4::FF ( Q_UINT32& a, Q_UINT32 b, Q_UINT32 c, Q_UINT32 d, + Q_UINT32 x, Q_UINT32 s ) { a += F(b, c, d) + x; a = rotate_left (a, s); } -inline void KMD4::GG ( TQ_UINT32& a, TQ_UINT32 b, TQ_UINT32 c, TQ_UINT32 d, - TQ_UINT32 x, TQ_UINT32 s) +inline void KMD4::GG ( Q_UINT32& a, Q_UINT32 b, Q_UINT32 c, Q_UINT32 d, + Q_UINT32 x, Q_UINT32 s) { - a += G(b, c, d) + x + (TQ_UINT32)0x5a827999; + a += G(b, c, d) + x + (Q_UINT32)0x5a827999; a = rotate_left (a, s); } -inline void KMD4::HH ( TQ_UINT32& a, TQ_UINT32 b, TQ_UINT32 c, TQ_UINT32 d, - TQ_UINT32 x, TQ_UINT32 s ) +inline void KMD4::HH ( Q_UINT32& a, Q_UINT32 b, Q_UINT32 c, Q_UINT32 d, + Q_UINT32 x, Q_UINT32 s ) { - a += H(b, c, d) + x + (TQ_UINT32)0x6ed9eba1; + a += H(b, c, d) + x + (Q_UINT32)0x6ed9eba1; a = rotate_left (a, s); } -void KMD4::byteReverse( unsigned char *buf, TQ_UINT32 len ) +void KMD4::byteReverse( unsigned char *buf, Q_UINT32 len ) { #ifdef WORDS_BIGENDIAN - TQ_UINT32 *b = (TQ_UINT32*) buf; + Q_UINT32 *b = (Q_UINT32*) buf; while ( len > 0 ) { *b = ((((*b) & 0xff000000) >> 24) | (((*b) & 0x00ff0000) >> 8) | (((*b) & 0x0000ff00) << 8) | (((*b) & 0x000000ff) << 24)); @@ -1442,9 +1442,9 @@ void KMD4::byteReverse( unsigned char *buf, TQ_UINT32 len ) /* * The core of the MD4 algorithm */ -void KMD4::transform( TQ_UINT32 buf[4], TQ_UINT32 const in[16] ) +void KMD4::transform( Q_UINT32 buf[4], Q_UINT32 const in[16] ) { - TQ_UINT32 a, b, c, d; + Q_UINT32 a, b, c, d; a = buf[0]; b = buf[1]; -- cgit v1.2.1