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 --- dcoppython/shell/pcop.cpp | 2 +- dcoppython/shell/pcop.h | 2 +- kalyptus/kalyptusDataDict.pm | 2 -- qtjava/javalib/qtjava/JavaSlot.cpp | 10 +++++----- qtjava/javalib/qtjava/JavaSlot.h | 2 +- smoke/tde/header_list | 1 - smoke/tqt/header_list | 1 - 7 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dcoppython/shell/pcop.cpp b/dcoppython/shell/pcop.cpp index c264f954..19557a14 100644 --- a/dcoppython/shell/pcop.cpp +++ b/dcoppython/shell/pcop.cpp @@ -335,7 +335,7 @@ namespace PythonDCOP { m_signature = m_name; m_signature += "("; - TQListIterator it( m_params ); + TQPtrListIterator it( m_params ); for( ; it.current(); ++it ) { if ( !it.atFirst() ) diff --git a/dcoppython/shell/pcop.h b/dcoppython/shell/pcop.h index f1ce9c2b..0208d44a 100644 --- a/dcoppython/shell/pcop.h +++ b/dcoppython/shell/pcop.h @@ -177,7 +177,7 @@ namespace PythonDCOP { TQCString m_signature; TQCString m_name; PCOPType* m_type; - TQList m_params; + TQPtrList m_params; private: PyObject *m_py_method; }; diff --git a/kalyptus/kalyptusDataDict.pm b/kalyptus/kalyptusDataDict.pm index 0df9006b..a4e3924e 100644 --- a/kalyptus/kalyptusDataDict.pm +++ b/kalyptus/kalyptusDataDict.pm @@ -1820,12 +1820,10 @@ BEGIN 'TQLibraryInterface*' => 'qt_QLibraryInterface*', 'TQLineEdit*' => 'qt_QLineEdit*' , 'TQLineEdit::EchoMode' => 'int' , -'TQList*' => 'qt_QList*', 'TQListBox*' => 'qt_QListBox*', 'TQListBoxItem*' => 'qt_QListBoxItem*', 'TQListBoxPixmap*' => 'qt_QListBoxPixmap*', 'TQListBoxText*' => 'qt_QListBoxText*', -'TQListIterator*' => 'qt_QListIterator*', 'TQListView*' => 'qt_QListView*', 'TQListViewItem*&' => 'qt_QListViewItem*', 'TQListViewItem*' => 'qt_QListViewItem*', 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); diff --git a/smoke/tde/header_list b/smoke/tde/header_list index ffa24c70..e1979d5c 100644 --- a/smoke/tde/header_list +++ b/smoke/tde/header_list @@ -136,7 +136,6 @@ ntqlibrary.h ntqlined.h ntqlineedit.h ntqlistbox.h -ntqlist.h ntqlistview.h ntqlocalfs.h ntqmainwindow.h diff --git a/smoke/tqt/header_list b/smoke/tqt/header_list index ffa24c70..e1979d5c 100644 --- a/smoke/tqt/header_list +++ b/smoke/tqt/header_list @@ -136,7 +136,6 @@ ntqlibrary.h ntqlined.h ntqlineedit.h ntqlistbox.h -ntqlist.h ntqlistview.h ntqlocalfs.h ntqmainwindow.h -- cgit v1.2.3