diff -r 98ccebc37403 -r dc7c549001d5 javauis/eswt_qt/org.eclipse.swt/Eclipse_SWT_PI/qt/library/listdatamodel.h --- a/javauis/eswt_qt/org.eclipse.swt/Eclipse_SWT_PI/qt/library/listdatamodel.h Fri May 14 15:47:24 2010 +0300 +++ b/javauis/eswt_qt/org.eclipse.swt/Eclipse_SWT_PI/qt/library/listdatamodel.h Thu May 27 12:49:31 2010 +0300 @@ -42,18 +42,6 @@ QString txt; }; -class ListViewItem : public ListItem - { -public: - ListViewItem(const QString& aText, const QPixmap* aImage); - ~ListViewItem(); - const QPixmap* image() const; - void setImage(const QPixmap* pixmap); - -private: - const QPixmap* img; - }; - class ListBoxItem : public ListItem { public: @@ -65,9 +53,11 @@ const QList& headingImages() const; int detailImageCount() const; int headingImageCount() const; + void setContentsToNull(); + private: - const QString headingTxt; + QString headingTxt; QList detailImgs; QList headingImgs; }; @@ -109,14 +99,13 @@ void remove( const int row ); void appendItem( const QString& string ); void appendItem( const QString& string, const QPixmap* pixmap ); - void setItem( const int row, const QString& string ); - void setItem( const int row, const QString& string, const QPixmap* pixmap ); void insertItem( const int row, const QString& string ); void insertItem( const int row, const QString& string, const QPixmap* pixmap ); virtual void appendItem(const QString& aDetailText, const QPixmap** aDetailImages, const int aDetailImageCount, const QString& aHeadingText, const QPixmap** aHeadingImages, const int aHeadingImageCount ); virtual int itemHeight(); virtual void clearList(); + virtual void setItemContentsToNull( const int row ); /** * called by other native classes @@ -139,21 +128,6 @@ }; -class ListViewModel : public ListModel - { -public: - ListViewModel( int type, int style, QListView *parent ); - ~ListViewModel(); - -protected: - /** - * from ListModel - */ - ListItem* createItem( const QString& string ); - ListItem* createItem( const QString& string, const QPixmap* pixmap ); - }; - - class ListBoxModel : public ListModel { public: @@ -197,6 +171,7 @@ QPoint headingImageSize(const int row) const; int rowWithMaxDetailTextSize() const; int rowWithMaxHeadingTextSize() const; + void setItemContentsToNull( const int row ); protected: /**