Browse Source

Removed obsolete Qt2's TQList/TQListIterator classes and replaced

with TQt3's TQPtrList/TQPtrListIterator ones.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
bug/266/move-to-usr
Michele Calgaro 4 years ago
parent
commit
eced9c9ff8
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
  1. 2
      dcoppython/shell/pcop.cpp
  2. 2
      dcoppython/shell/pcop.h
  3. 2
      kalyptus/kalyptusDataDict.pm
  4. 10
      qtjava/javalib/qtjava/JavaSlot.cpp
  5. 2
      qtjava/javalib/qtjava/JavaSlot.h
  6. 1
      smoke/tde/header_list
  7. 1
      smoke/tqt/header_list

2
dcoppython/shell/pcop.cpp

@ -335,7 +335,7 @@ namespace PythonDCOP {
m_signature = m_name;
m_signature += "(";
TQListIterator<PCOPType> it( m_params );
TQPtrListIterator<PCOPType> it( m_params );
for( ; it.current(); ++it )
{
if ( !it.atFirst() )

2
dcoppython/shell/pcop.h

@ -177,7 +177,7 @@ namespace PythonDCOP {
TQCString m_signature;
TQCString m_name;
PCOPType* m_type;
TQList<PCOPType> m_params;
TQPtrList<PCOPType> m_params;
private:
PyObject *m_py_method;
};

2
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*',

10
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<TQListViewItem>,TQList<TQListViewItem>,TQList<TQListViewItem>)"},
{"(ArrayList,ArrayList,ArrayList)", "(TQPtrList<TQListViewItem>,TQPtrList<TQListViewItem>,TQPtrList<TQListViewItem>)"},
{"(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<TQListViewItem> arg1,TQList<TQListViewItem> arg2,TQList<TQListViewItem> arg3)
JavaSlot::invoke(TQPtrList<TQListViewItem> arg1,TQPtrList<TQListViewItem> arg2,TQPtrList<TQListViewItem> arg3)
{
JNIEnv * env;
jclass cls;
@ -1856,9 +1856,9 @@ JavaSlot::invoke(TQList<TQListViewItem> arg1,TQList<TQListViewItem> 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);
}

2
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<TQListViewItem> arg1,TQList<TQListViewItem> arg2,TQList<TQListViewItem> arg3);
void invoke(TQPtrList<TQListViewItem> arg1,TQPtrList<TQListViewItem> arg2,TQPtrList<TQListViewItem> arg3);
void invoke(TQListBoxItem* arg1);
void invoke(TQListBoxItem* arg1,const TQPoint& arg2);
void invoke(TQListViewItem* arg1, int arg2, const TQString& arg3);

1
smoke/tde/header_list

@ -136,7 +136,6 @@ ntqlibrary.h
ntqlined.h
ntqlineedit.h
ntqlistbox.h
ntqlist.h
ntqlistview.h
ntqlocalfs.h
ntqmainwindow.h

1
smoke/tqt/header_list

@ -136,7 +136,6 @@ ntqlibrary.h
ntqlined.h
ntqlineedit.h
ntqlistbox.h
ntqlist.h
ntqlistview.h
ntqlocalfs.h
ntqmainwindow.h

Loading…
Cancel
Save