From 0818887422ac467b1654ab369d2eb63270f854ce Mon Sep 17 00:00:00 2001
From: dmacvicar <dmacvicar@e0cc52ee-31ee-0310-8b87-e83c4596d67c>
Date: Fri, 7 Dec 2007 10:27:41 +0000
Subject: [PATCH] YQPkgVersionsView

git-svn-id: http://svn.opensuse.org/svn/yast/trunk/qt4@42778 e0cc52ee-31ee-0310-8b87-e83c4596d67c
---
 src/pkg/YQPkgList.cc         |  4 ++--
 src/pkg/YQPkgList.h          | 11 -----------
 src/pkg/YQPkgPatternList.cc  | 23 +++++------------------
 src/pkg/YQPkgPatternList.h   | 22 +++++++---------------
 src/pkg/YQPkgVersionsView.cc | 21 ++++++++++++---------
 src/pkg/YQPkgVersionsView.h  |  1 -
 6 files changed, 26 insertions(+), 56 deletions(-)

diff --git a/src/pkg/YQPkgList.cc b/src/pkg/YQPkgList.cc
index c905c37..06783cb 100644
--- a/src/pkg/YQPkgList.cc
+++ b/src/pkg/YQPkgList.cc
@@ -755,7 +755,7 @@ YQPkgListItem::compare( QTreeWidgetItem *		otherListViewItem,
     return YQPkgObjListItem::compare( otherListViewItem, col, ascending );
 }
 
-
+#if 0
 void
 YQPkgListItem::paintCell( QPainter *		painter,
 			  const QColorGroup &	colorGroup,
@@ -808,7 +808,7 @@ YQPkgListItem::paintCell( QPainter *		painter,
     }
 #endif
 }
-
+#endif
 
 
 #include "YQPkgList.moc"
diff --git a/src/pkg/YQPkgList.h b/src/pkg/YQPkgList.h
index fdfa224..8b0d660 100644
--- a/src/pkg/YQPkgList.h
+++ b/src/pkg/YQPkgList.h
@@ -314,17 +314,6 @@ protected:
      **/
     void setSourceRpmIcon();
 
-    /**
-     * Paint method. Reimplemented from @ref QListViewItem so different
-     * colors can be used.
-     *
-     * Reimplemented from QListViewItem.
-     **/
-    virtual void paintCell( QPainter *		painter,
-			    const QColorGroup &	colorGroup,
-			    int			column,
-			    int			width,
-			    int			alignment );
 
     // Data members
 
diff --git a/src/pkg/YQPkgPatternList.cc b/src/pkg/YQPkgPatternList.cc
index e40ea52..37d4341 100644
--- a/src/pkg/YQPkgPatternList.cc
+++ b/src/pkg/YQPkgPatternList.cc
@@ -283,10 +283,11 @@ YQPkgPatternList::selectSomething()
 #endif
 }
 
-
-
-
-
+void YQPkgPatternList::drawRow ( QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index ) const
+{
+    painter->setFont( YQUI::yqApp()->headingFont() );
+    QTreeWidget::drawRow ( painter, option, index );
+}
 
 YQPkgPatternListItem::YQPkgPatternListItem( YQPkgPatternList *	patternList,
 					    ZyppSel		selectable,
@@ -384,20 +385,6 @@ YQPkgPatternCategoryItem::~YQPkgPatternCategoryItem()
     // NOP
 }
 
-
-void
-YQPkgPatternCategoryItem::paintCell( QPainter *			painter,
-				     const QColorGroup &	colorGroup,
-				     int			column,
-				     int			width,
-				     int			alignment )
-{
-    painter->setFont( YQUI::yqApp()->headingFont() );
-    //FIXME QY2ListViewItem::paintCell( painter, colorGroup, column, width, alignment );
-}
-
-
-
 void
 YQPkgPatternCategoryItem::addPattern( ZyppPattern pattern )
 {
diff --git a/src/pkg/YQPkgPatternList.h b/src/pkg/YQPkgPatternList.h
index a72977f..021fce3 100644
--- a/src/pkg/YQPkgPatternList.h
+++ b/src/pkg/YQPkgPatternList.h
@@ -54,6 +54,13 @@ public:
      **/
     virtual ~YQPkgPatternList();
 
+    /**
+     * Paint method. Reimplemented from @ref QTreeWidget so a different
+     * font can be used.
+     *
+     * Reimplemented from QY2ListViewItem.
+     **/
+    virtual void drawRow ( QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index ) const;
 
 public slots:
 
@@ -131,7 +138,6 @@ signals:
      **/
     void filterFinished();
 
-
 protected:
 
     /**
@@ -199,7 +205,6 @@ public:
     int statusCol()	const	{ return _patternList->statusCol();	}
     int summaryCol()	const	{ return _patternList->summaryCol();	}
 
-
 protected:
 
     /**
@@ -283,19 +288,6 @@ protected:
      * close icons.
      **/
     void setTreeIcon( void );
-    
-    /**
-     * Paint method. Reimplemented from @ref QListViewItem so a different
-     * font can be used.
-     *
-     * Reimplemented from QY2ListViewItem.
-     **/
-    virtual void paintCell( QPainter *		painter,
-			    const QColorGroup &	colorGroup,
-			    int			column,
-			    int			width,
-			    int			alignment );
-
     //
     // Data members
     //
diff --git a/src/pkg/YQPkgVersionsView.cc b/src/pkg/YQPkgVersionsView.cc
index a1a3df3..4d0a7f7 100644
--- a/src/pkg/YQPkgVersionsView.cc
+++ b/src/pkg/YQPkgVersionsView.cc
@@ -123,10 +123,10 @@ YQPkgVersionsView::showDetails( ZyppSel selectable )
 	return;
 
 #if FIXME
-    QY2CheckListItem * root = new QY2CheckListItem( this, selectable->theObj()->name().c_str(),
-						    Q3CheckListItem::Controller );
+    QY2CheckListItem * root = new QY2CheckListItem( this, selectable->theObj()->name().c_str() );
+    //FIXME add element
     Q_CHECK_PTR( root );
-    root->setOpen( true );
+    root->setExpanded( true );
 
     bool installedIsAvailable = false;
 
@@ -162,15 +162,18 @@ YQPkgVersionsView::showDetails( ZyppSel selectable )
 void
 YQPkgVersionsView::checkForChangedCandidate()
 {
+    QTreeWidgetItemIterator iter(this);
+    QTreeWidgetItem *first = *iter;
 #if FIXME
-    if ( ! firstChild() || ! _selectable )
+    if ( ! first || ! _selectable )
 	return;
 
-    Q3ListViewItem * item = firstChild()->firstChild();
-
-    while ( item )
+    
+    QTreeWidgetItemIterator iter_c(first);
+    
+    while ( *iter_c )
     {
-	YQPkgVersion * versionItem = dynamic_cast<YQPkgVersion *> (item);
+	YQPkgVersion * versionItem = dynamic_cast<YQPkgVersion *> (*iter_c);
 
 	if ( versionItem && versionItem->isOn() )
 	{
@@ -226,7 +229,7 @@ YQPkgVersionsView::checkForChangedCandidate()
 	    }
 	}
 
-	item = item->nextSibling();
+	++iter_c;
     }
 #endif
 }
diff --git a/src/pkg/YQPkgVersionsView.h b/src/pkg/YQPkgVersionsView.h
index 250257a..4735e08 100644
--- a/src/pkg/YQPkgVersionsView.h
+++ b/src/pkg/YQPkgVersionsView.h
@@ -22,7 +22,6 @@
 
 #include "QY2ListView.h"
 #include "YQZypp.h"
-#include <Q3ListViewItem>
 
 class QTabWidget;
 
-- 
2.39.2