diff options
Diffstat (limited to 'freebsd/dependencies/pinentry-tqt/files/patch-tqt_secqstring.cpp')
| -rw-r--r-- | freebsd/dependencies/pinentry-tqt/files/patch-tqt_secqstring.cpp | 47 |
1 files changed, 34 insertions, 13 deletions
diff --git a/freebsd/dependencies/pinentry-tqt/files/patch-tqt_secqstring.cpp b/freebsd/dependencies/pinentry-tqt/files/patch-tqt_secqstring.cpp index f5ea4924b..bc6a87622 100644 --- a/freebsd/dependencies/pinentry-tqt/files/patch-tqt_secqstring.cpp +++ b/freebsd/dependencies/pinentry-tqt/files/patch-tqt_secqstring.cpp @@ -1,6 +1,6 @@ ---- tqt/secqstring.cpp.orig 2017-12-03 16:32:49 UTC +--- tqt/secqstring.cpp.orig +++ tqt/secqstring.cpp -@@ -80,8 +80,8 @@ static uint computeNewMax( uint len ) +@@ -80,8 +80,8 @@ // IMPORTANT! If you change these, make sure you also change the // "delete unicode" statement in ~SecTQStringData() in SecTQString.h correspondingly! @@ -11,16 +11,28 @@ /***************************************************************************** -@@ -188,7 +188,7 @@ static uint computeNewMax( uint len ) +@@ -188,13 +188,13 @@ \sa TQChar TQCString TQByteArray SecTQConstString */ -Q_EXPORT SecTQStringData *SecTQString::shared_null = 0; +-QT_STATIC_CONST_IMPL SecTQString SecTQString::null; +-QT_STATIC_CONST_IMPL TQChar TQChar::null; +-QT_STATIC_CONST_IMPL TQChar TQChar::replacement((ushort)0xfffd); +-QT_STATIC_CONST_IMPL TQChar TQChar::byteOrderMark((ushort)0xfeff); +-QT_STATIC_CONST_IMPL TQChar TQChar::byteOrderSwapped((ushort)0xfffe); +-QT_STATIC_CONST_IMPL TQChar TQChar::nbsp((ushort)0x00a0); +TQ_EXPORT SecTQStringData *SecTQString::shared_null = 0; - QT_STATIC_CONST_IMPL SecTQString SecTQString::null; - QT_STATIC_CONST_IMPL TQChar TQChar::null; - QT_STATIC_CONST_IMPL TQChar TQChar::replacement((ushort)0xfffd); -@@ -220,7 +220,7 @@ SecTQStringData* SecTQString::makeSharedNull() ++const SecTQString SecTQString::null; ++const TQChar TQChar::null; ++const TQChar TQChar::replacement((ushort)0xfffd); ++const TQChar TQChar::byteOrderMark((ushort)0xfeff); ++const TQChar TQChar::byteOrderSwapped((ushort)0xfffe); ++const TQChar TQChar::nbsp((ushort)0x00a0); + + SecTQStringData* SecTQString::makeSharedNull() + { +@@ -220,7 +220,7 @@ */ SecTQString::SecTQString( TQChar ch ) { @@ -29,7 +41,7 @@ d->unicode[0] = ch; } -@@ -239,7 +239,7 @@ SecTQString::SecTQString( int size, bool /*dummy*/ ) +@@ -239,7 +239,7 @@ { if ( size ) { int l = size; @@ -38,7 +50,7 @@ d = new SecTQStringData( uc, 0, l ); } else { d = shared_null ? shared_null : (shared_null=new SecTQStringData); -@@ -258,7 +258,7 @@ SecTQString::SecTQString( const TQString &str ) +@@ -258,7 +258,7 @@ d = shared_null ? shared_null : makeSharedNull(); d->ref(); } else { @@ -47,7 +59,7 @@ if ( unicode ) memcpy(uc, unicode, length*sizeof(TQChar)); d = new SecTQStringData(uc,unicode ? length : 0,length); -@@ -287,7 +287,7 @@ SecTQString::SecTQString( const TQChar* unicode, uint +@@ -287,7 +287,7 @@ d = shared_null ? shared_null : makeSharedNull(); d->ref(); } else { @@ -56,7 +68,7 @@ if ( unicode ) memcpy(uc, unicode, length*sizeof(TQChar)); d = new SecTQStringData(uc,unicode ? length : 0,length); -@@ -429,7 +429,7 @@ void SecTQString::setLength( uint newLen ) +@@ -429,7 +429,7 @@ ( newLen * 4 < d->maxl && d->maxl > 4 ) ) { // detach, grow or shrink uint newMax = computeNewMax( newLen ); @@ -65,7 +77,16 @@ if ( nd ) { uint len = TQMIN( d->len, newLen ); memcpy( nd, d->unicode, sizeof(TQChar) * len ); -@@ -594,10 +594,10 @@ SecTQString &SecTQString::insert( uint index, const TQ +@@ -548,7 +548,7 @@ + len = slen - index; + if ( index == 0 && len == slen ) + return *this; +- register const TQChar *p = unicode()+index; ++ const TQChar *p = unicode()+index; + SecTQString s( len, TRUE ); + memcpy( s.d->unicode, p, len * sizeof(TQChar) ); + s.d->len = len; +@@ -594,10 +594,10 @@ if ( s >= d->unicode && (uint)(s - d->unicode) < d->maxl ) { // Part of me - take a copy. @@ -78,7 +99,7 @@ return *this; } -@@ -669,10 +669,10 @@ SecTQString &SecTQString::replace( uint index, uint le +@@ -669,10 +669,10 @@ memcpy( d->unicode+index, s, len * sizeof(TQChar) ); } else if ( s >= d->unicode && (uint)(s - d->unicode) < d->maxl ) { // Part of me - take a copy. |