From eced9c9ff85b1d0edd0577b21f30b69188dd961b Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Wed, 17 Oct 2018 23:25:50 +0900 Subject: Removed obsolete Qt2's TQList/TQListIterator classes and replaced with TQt3's TQPtrList/TQPtrListIterator ones. Signed-off-by: Michele Calgaro --- qtjava/javalib/qtjava/JavaSlot.cpp | 10 +++++----- qtjava/javalib/qtjava/JavaSlot.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'qtjava') diff --git a/qtjava/javalib/qtjava/JavaSlot.cpp b/qtjava/javalib/qtjava/JavaSlot.cpp index 015aff88..0802313b 100644 --- a/qtjava/javalib/qtjava/JavaSlot.cpp +++ b/qtjava/javalib/qtjava/JavaSlot.cpp @@ -64,7 +64,7 @@ static const char * const javaToQtTypeSignatureMap[][2] = { {"(TQIconViewItem)", "(TQIconViewItem*)"}, {"(TQIconViewItem,TQPoint)", "(TQIconViewItem*,const TQPoint&)"}, {"(TQIconViewItem,String)", "(TQIconViewItem*,const TQString&)"}, - {"(ArrayList,ArrayList,ArrayList)", "(TQList,TQList,TQList)"}, + {"(ArrayList,ArrayList,ArrayList)", "(TQPtrList,TQPtrList,TQPtrList)"}, {"(TQListBoxItem)", "(TQListBoxItem*)"}, {"(TQListBoxItem,TQPoint)", "(TQListBoxItem*,const TQPoint&)"}, {"(TQListViewItem,int,String)", "(TQListViewItem*,int,const TQString&)"}, @@ -1840,7 +1840,7 @@ JavaSlot::invoke(TQListBoxItem* arg1,const TQPoint& arg2) } void -JavaSlot::invoke(TQList arg1,TQList arg2,TQList arg3) +JavaSlot::invoke(TQPtrList arg1,TQPtrList arg2,TQPtrList arg3) { JNIEnv * env; jclass cls; @@ -1856,9 +1856,9 @@ JavaSlot::invoke(TQList arg1,TQList arg2,TQList< return; } result = env->CallObjectMethod( invocation, mid, - QtSupport::objectForQtKey(env, (void *) &arg1, "org.trinitydesktop.qt.TQList"), - QtSupport::objectForQtKey(env, (void *) &arg2, "org.trinitydesktop.qt.TQList"), - QtSupport::objectForQtKey(env, (void *) &arg3, "org.trinitydesktop.qt.TQList") ); + QtSupport::objectForQtKey(env, (void *) &arg1, "org.trinitydesktop.qt.TQPtrList"), + QtSupport::objectForQtKey(env, (void *) &arg2, "org.trinitydesktop.qt.TQPtrList"), + QtSupport::objectForQtKey(env, (void *) &arg3, "org.trinitydesktop.qt.TQPtrList") ); env->PopLocalFrame(0); } diff --git a/qtjava/javalib/qtjava/JavaSlot.h b/qtjava/javalib/qtjava/JavaSlot.h index 47a827f2..a1d69069 100644 --- a/qtjava/javalib/qtjava/JavaSlot.h +++ b/qtjava/javalib/qtjava/JavaSlot.h @@ -109,7 +109,7 @@ public slots: void invoke(TQIconViewItem* arg1); void invoke(TQIconViewItem* arg1,const TQPoint& arg2); void invoke(TQIconViewItem* arg1,const TQString& arg2); - void invoke(TQList arg1,TQList arg2,TQList arg3); + void invoke(TQPtrList arg1,TQPtrList arg2,TQPtrList arg3); void invoke(TQListBoxItem* arg1); void invoke(TQListBoxItem* arg1,const TQPoint& arg2); void invoke(TQListViewItem* arg1, int arg2, const TQString& arg3); -- cgit v1.2.1