TDE
/
gwenview
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/gwenview
0
0
Fork 0
Code Issues Releases Wiki Activity

Update various qt function definitions and static methods for tqt3

Browse Source
r14.0.x
Timothy Pearson 13 years ago
parent 79a556634a
commit f072772a09
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File

12
acinclude.m4
Unescape View File

@ -1104,7 +1104,7 @@ EOF
if test $kde_qtsubver -gt 0; then if test $kde_qtsubver -gt 0; then
cat >> conftest.$ac_ext <<EOF cat >> conftest.$ac_ext <<EOF
#if QT_VERSION < 210 #if TQT_VERSION < 210
#error 1 #error 1
#endif #endif
EOF EOF
@ -1201,22 +1201,22 @@ fi
if test -z "$3"; then if test -z "$3"; then
if test $kde_qtver = 3; then if test $kde_qtver = 3; then
if test $kde_qtsubver -gt 0; then if test $kde_qtsubver -gt 0; then
kde_qt_verstring="QT_VERSION >= 0x03@VER@00 && QT_VERSION < 0x040000" kde_qt_verstring="TQT_VERSION >= 0x03@VER@00 && TQT_VERSION < 0x040000"
qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'` qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'`
kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"` kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"`
else else
kde_qt_verstring="QT_VERSION >= 300 && QT_VERSION < 0x040000" kde_qt_verstring="TQT_VERSION >= 300 && TQT_VERSION < 0x040000"
fi fi
fi fi
if test $kde_qtver = 2; then if test $kde_qtver = 2; then
if test $kde_qtsubver -gt 0; then if test $kde_qtsubver -gt 0; then
kde_qt_verstring="QT_VERSION >= 222" kde_qt_verstring="TQT_VERSION >= 222"
else else
kde_qt_verstring="QT_VERSION >= 200" kde_qt_verstring="TQT_VERSION >= 200"
fi fi
fi fi
if test $kde_qtver = 1; then if test $kde_qtver = 1; then
kde_qt_verstring="QT_VERSION >= 142 && QT_VERSION < 200" kde_qt_verstring="TQT_VERSION >= 142 && TQT_VERSION < 200"
fi fi
else else
kde_qt_verstring="$3" kde_qt_verstring="$3"

4
src/gvcore/qxcfi.h
Unescape View File

@ -69,7 +69,7 @@ public:
return *this; return *this;
} }
value = new char[len]; value = new char[len];
Q_CHECK_PTR( value ); TQ_CHECK_PTR( value );
if ( !value ) { if ( !value ) {
mFailed=true; mFailed=true;
return *this; return *this;
@ -83,7 +83,7 @@ public:
*this >> len; *this >> len;
if (mFailed) return *this; if (mFailed) return *this;
data=new char[len]; data=new char[len];
Q_CHECK_PTR( data ); TQ_CHECK_PTR( data );
if ( !data ) { if ( !data ) {
mFailed=true; mFailed=true;
return *this; return *this;

2
src/imageutils/scale.cpp
Unescape View File

@ -631,7 +631,7 @@ static TQImage ResizeImage(const TQImage& image,const int columns,
if (support < filtersupport) if (support < filtersupport)
support=filtersupport; support=filtersupport;
contribution=new ContributionInfo[ fasttolong( 2.0*Max(support,0.5)+3 ) ]; contribution=new ContributionInfo[ fasttolong( 2.0*Max(support,0.5)+3 ) ];
Q_CHECK_PTR( contribution ); TQ_CHECK_PTR( contribution );
/* /*
Resize image. Resize image.
*/ */

Write Preview
Loading…
Cancel
Save