From 9073a4265b0a8cfd409bfbbfa9e0d4a4a32c11bd Mon Sep 17 00:00:00 2001
From: dmacvicar <dmacvicar@e0cc52ee-31ee-0310-8b87-e83c4596d67c>
Date: Fri, 7 Dec 2007 16:26:45 +0000
Subject: [PATCH] YQPkgObjList QT3_SUPPORT

git-svn-id: http://svn.opensuse.org/svn/yast/trunk/qt4@42823 e0cc52ee-31ee-0310-8b87-e83c4596d67c
---
 src/pkg/YQPkgObjList.cc | 36 +++++++++++++++++-------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/src/pkg/YQPkgObjList.cc b/src/pkg/YQPkgObjList.cc
index fbcdc61..bd76f4b 100644
--- a/src/pkg/YQPkgObjList.cc
+++ b/src/pkg/YQPkgObjList.cc
@@ -18,8 +18,6 @@
 
 /-*/
 
-#define QT3_SUPPORT 1
-
 #define y2log_component "qt-pkg"
 #include <ycp/y2log.h>
 #include <QPixmap>
@@ -437,8 +435,7 @@ YQPkgObjList::createAction( const QString &	text,
 
     if ( ! insensitiveIcon.isNull() )
     {
-	iconSet.setPixmap( insensitiveIcon,
-			   QIcon::Automatic,
+	iconSet.addPixmap( insensitiveIcon,
 			   QIcon::Disabled );
     }
 
@@ -458,9 +455,9 @@ YQPkgObjList::createNotInstalledContextMenu()
     _notInstalledContextMenu = new QMenu( this );
     Q_CHECK_PTR( _notInstalledContextMenu );
 
-    actionSetCurrentInstall->addTo( _notInstalledContextMenu );
-    actionSetCurrentDontInstall->addTo( _notInstalledContextMenu );
-    actionSetCurrentTaboo->addTo( _notInstalledContextMenu );
+    _notInstalledContextMenu->addAction(actionSetCurrentInstall);
+    _notInstalledContextMenu->addAction(actionSetCurrentDontInstall);
+    _notInstalledContextMenu->addAction(actionSetCurrentTaboo);
 
     addAllInListSubMenu( _notInstalledContextMenu );
 }
@@ -472,9 +469,9 @@ YQPkgObjList::createInstalledContextMenu()
     _installedContextMenu = new QMenu( this );
     Q_CHECK_PTR( _installedContextMenu );
 
-    actionSetCurrentKeepInstalled->addTo( _installedContextMenu );
-    actionSetCurrentDelete->addTo( _installedContextMenu );
-    actionSetCurrentUpdate->addTo( _installedContextMenu );
+    _installedContextMenu->addAction(actionSetCurrentKeepInstalled);
+    _installedContextMenu->addAction(actionSetCurrentDelete);
+    _installedContextMenu->addAction(actionSetCurrentUpdate);
 
     addAllInListSubMenu( _installedContextMenu );
 }
@@ -486,15 +483,16 @@ YQPkgObjList::addAllInListSubMenu( QMenu * menu )
     QMenu * submenu = new QMenu( menu );
     Q_CHECK_PTR( submenu );
 
-    actionSetListInstall->addTo( submenu );
-    actionSetListDontInstall->addTo( submenu );
-    actionSetListKeepInstalled->addTo( submenu );
-    actionSetListDelete->addTo( submenu );
-    actionSetListUpdate->addTo( submenu );
-    actionSetListUpdateForce->addTo( submenu );
-    actionSetListTaboo->addTo( submenu );
+    submenu->addAction(actionSetListInstall);
+    submenu->addAction(actionSetListDontInstall);
+    submenu->addAction(actionSetListKeepInstalled);
+    submenu->addAction(actionSetListDelete);
+    submenu->addAction(actionSetListUpdate);
+    submenu->addAction(actionSetListUpdateForce);
+    submenu->addAction(actionSetListTaboo);
 
-    menu->insertItem( _( "&All in This List" ), submenu );
+    QAction *action = menu->addMenu( submenu );
+    action->setText(_( "&All in This List" ));
 
     return submenu;
 }
@@ -762,7 +760,7 @@ YQPkgObjList::logExcludeStatistics()
 	    if ( rule->isEnabled() )
 	    {
 		y2milestone( "Active exclude rule: \"%s\"",
-			     rule->regexp().pattern().ascii() );
+			     qPrintable(rule->regexp().pattern()) );
 	    }
 	}
     }
-- 
2.39.2