Update various qt function definitions and static methods for tqt3

pull/1/head
Timothy Pearson 12 years ago
parent c4b82c275c
commit 47b5be1cd3

@ -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"

@ -192,8 +192,8 @@ SQ_GLWidget::SQ_GLWidget(TQWidget *parent, const char *name) : TQGLWidget(parent
timer_prev = new TQTimer(this); timer_prev = new TQTimer(this);
timer_next = new TQTimer(this); timer_next = new TQTimer(this);
Q_CHECK_PTR(timer_prev); TQ_CHECK_PTR(timer_prev);
Q_CHECK_PTR(timer_next); TQ_CHECK_PTR(timer_next);
connect(timer_prev, TQT_SIGNAL(timeout()), SQ_WidgetStack::instance(), TQT_SLOT(emitPreviousSelected())); connect(timer_prev, TQT_SIGNAL(timeout()), SQ_WidgetStack::instance(), TQT_SLOT(emitPreviousSelected()));
connect(timer_next, TQT_SIGNAL(timeout()), SQ_WidgetStack::instance(), TQT_SLOT(emitNextSelected())); connect(timer_next, TQT_SIGNAL(timeout()), SQ_WidgetStack::instance(), TQT_SLOT(emitNextSelected()));
@ -201,7 +201,7 @@ SQ_GLWidget::SQ_GLWidget(TQWidget *parent, const char *name) : TQGLWidget(parent
timer_anim = new TQTimer(this); timer_anim = new TQTimer(this);
Q_CHECK_PTR(timer_anim); TQ_CHECK_PTR(timer_anim);
connect(timer_anim, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAnimateNext())); connect(timer_anim, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAnimateNext()));

@ -630,7 +630,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.
*/ */

@ -192,8 +192,8 @@ SQ_GLWidget::SQ_GLWidget(TQWidget *parent, const char *name) : TQGLWidget(parent
timer_prev = new TQTimer(this); timer_prev = new TQTimer(this);
timer_next = new TQTimer(this); timer_next = new TQTimer(this);
Q_CHECK_PTR(timer_prev); TQ_CHECK_PTR(timer_prev);
Q_CHECK_PTR(timer_next); TQ_CHECK_PTR(timer_next);
connect(timer_prev, TQT_SIGNAL(timeout()), SQ_WidgetStack::instance(), TQT_SLOT(emitPreviousSelected())); connect(timer_prev, TQT_SIGNAL(timeout()), SQ_WidgetStack::instance(), TQT_SLOT(emitPreviousSelected()));
connect(timer_next, TQT_SIGNAL(timeout()), SQ_WidgetStack::instance(), TQT_SLOT(emitNextSelected())); connect(timer_next, TQT_SIGNAL(timeout()), SQ_WidgetStack::instance(), TQT_SLOT(emitNextSelected()));
@ -201,7 +201,7 @@ SQ_GLWidget::SQ_GLWidget(TQWidget *parent, const char *name) : TQGLWidget(parent
timer_anim = new TQTimer(this); timer_anim = new TQTimer(this);
Q_CHECK_PTR(timer_anim); TQ_CHECK_PTR(timer_anim);
connect(timer_anim, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAnimateNext())); connect(timer_anim, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAnimateNext()));

@ -630,7 +630,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.
*/ */

Loading…
Cancel
Save