summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-02-14 21:07:15 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-02-14 21:07:15 -0600
commitf072772a092e289b7bfa5d0f8c5996334bf0799e (patch)
tree53ace576d26b2223003a44a183762553b5f2bb8a
parent79a556634a727f011420aa3ace6adde37f84f5f5 (diff)
downloadgwenview-f072772a092e289b7bfa5d0f8c5996334bf0799e.tar.gz
gwenview-f072772a092e289b7bfa5d0f8c5996334bf0799e.zip
Update various qt function definitions and static methods for tqt3
-rw-r--r--acinclude.m412
-rw-r--r--src/gvcore/qxcfi.h4
-rw-r--r--src/imageutils/scale.cpp2
3 files changed, 9 insertions, 9 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index f51be64..a5c0e8e 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1104,7 +1104,7 @@ EOF
if test $kde_qtsubver -gt 0; then
cat >> conftest.$ac_ext <<EOF
-#if QT_VERSION < 210
+#if TQT_VERSION < 210
#error 1
#endif
EOF
@@ -1201,22 +1201,22 @@ fi
if test -z "$3"; then
if test $kde_qtver = 3; 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,'`
kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"`
else
- kde_qt_verstring="QT_VERSION >= 300 && QT_VERSION < 0x040000"
+ kde_qt_verstring="TQT_VERSION >= 300 && TQT_VERSION < 0x040000"
fi
fi
if test $kde_qtver = 2; then
if test $kde_qtsubver -gt 0; then
- kde_qt_verstring="QT_VERSION >= 222"
+ kde_qt_verstring="TQT_VERSION >= 222"
else
- kde_qt_verstring="QT_VERSION >= 200"
+ kde_qt_verstring="TQT_VERSION >= 200"
fi
fi
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
else
kde_qt_verstring="$3"
diff --git a/src/gvcore/qxcfi.h b/src/gvcore/qxcfi.h
index 570ee53..031c008 100644
--- a/src/gvcore/qxcfi.h
+++ b/src/gvcore/qxcfi.h
@@ -69,7 +69,7 @@ public:
return *this;
}
value = new char[len];
- Q_CHECK_PTR( value );
+ TQ_CHECK_PTR( value );
if ( !value ) {
mFailed=true;
return *this;
@@ -83,7 +83,7 @@ public:
*this >> len;
if (mFailed) return *this;
data=new char[len];
- Q_CHECK_PTR( data );
+ TQ_CHECK_PTR( data );
if ( !data ) {
mFailed=true;
return *this;
diff --git a/src/imageutils/scale.cpp b/src/imageutils/scale.cpp
index 733dc1a..3d331f0 100644
--- a/src/imageutils/scale.cpp
+++ b/src/imageutils/scale.cpp
@@ -631,7 +631,7 @@ static TQImage ResizeImage(const TQImage& image,const int columns,
if (support < filtersupport)
support=filtersupport;
contribution=new ContributionInfo[ fasttolong( 2.0*Max(support,0.5)+3 ) ];
- Q_CHECK_PTR( contribution );
+ TQ_CHECK_PTR( contribution );
/*
Resize image.
*/