diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-14 21:07:24 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-14 21:07:24 -0600 |
| commit | 8c554b0d552004f8c44d8a16a38633a82ee02aea (patch) | |
| tree | 12b920d7bf62af8b1a761407829ee7ac4c232177 | |
| parent | cc259f5a8508ce97c383878670e6b180b2dd8596 (diff) | |
| download | k3b-8c554b0d.tar.gz k3b-8c554b0d.zip | |
Update various qt function definitions and static methods for tqt3
| -rw-r--r-- | acinclude.m4 | 12 | ||||
| -rw-r--r-- | src/fastscale/scale.cpp | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 96a42fa..08f2aa0 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/fastscale/scale.cpp b/src/fastscale/scale.cpp index 62e0661..e15c5da 100644 --- a/src/fastscale/scale.cpp +++ b/src/fastscale/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. */ |