diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-14 20:16:30 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-14 20:16:30 +0000 |
commit | 1c93fca14d9ce37499bcfdf994c660186a0b6f17 (patch) | |
tree | f2defe163a805a9e34a2142dfde4cdb5e49241e7 /kmail/util.cpp | |
parent | 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (diff) | |
download | tdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.tar.gz tdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.zip |
Enable kdepim compilation under Qt4
This will likely break Qt3 compilation temporarily, which is an unintended side effect.
A third and final kdepim commit will repair Qt3 compilation shortly.
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227946 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kmail/util.cpp')
-rw-r--r-- | kmail/util.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kmail/util.cpp b/kmail/util.cpp index 9586f70d1..d153e9d37 100644 --- a/kmail/util.cpp +++ b/kmail/util.cpp @@ -146,7 +146,7 @@ void KMail::Util::append( TQByteArray& that, const TQByteArray& str ) that.detach(); uint len1 = that.size(); uint len2 = str.size(); - if ( that.resize( len1 + len2, TQByteArray::SpeedOptim ) ) + if ( that.tqresize( len1 + len2, TQGArray::SpeedOptim ) ) memcpy( that.data() + len1, str.data(), len2 ); } @@ -157,7 +157,7 @@ void KMail::Util::append( TQByteArray& that, const char* str ) that.detach(); uint len1 = that.size(); uint len2 = tqstrlen(str); - if ( that.resize( len1 + len2, TQByteArray::SpeedOptim ) ) + if ( that.tqresize( len1 + len2, TQGArray::SpeedOptim ) ) memcpy( that.data() + len1, str, len2 ); } @@ -166,7 +166,7 @@ void KMail::Util::append( TQByteArray& that, const TQCString& str ) that.detach(); uint len1 = that.size(); uint len2 = str.size() - 1; - if ( that.resize( len1 + len2, TQByteArray::SpeedOptim ) ) + if ( that.tqresize( len1 + len2, TQGArray::SpeedOptim ) ) memcpy( that.data() + len1, str.data(), len2 ); } @@ -180,13 +180,13 @@ void KMail::Util::insert( TQByteArray& that, uint index, const char* s ) int nlen = olen + len; if ( index >= olen ) { // insert after end of string that.detach(); - if ( that.resize(nlen+index-olen, TQByteArray::SpeedOptim ) ) { + if ( that.tqresize(nlen+index-olen, TQGArray::SpeedOptim ) ) { memset( that.data()+olen, ' ', index-olen ); memcpy( that.data()+index, s, len ); } } else { that.detach(); - if ( that.resize(nlen, TQByteArray::SpeedOptim ) ) { // normal insert + if ( that.tqresize(nlen, TQGArray::SpeedOptim ) ) { // normal insert memmove( that.data()+index+len, that.data()+index, olen-index ); memcpy( that.data()+index, s, len ); } |