Author: dmacvicar
Date: Fri Dec 7 17:26:45 2007
New Revision: 42823
URL: http://svn.opensuse.org/viewcvs/yast?rev=42823&view=rev
Log:
YQPkgObjList QT3_SUPPORT
Modified:
trunk/qt4/src/pkg/YQPkgObjList.cc
Modified: trunk/qt4/src/pkg/YQPkgObjList.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt4/src/pkg/YQPkgObjList.cc?rev=42823&r1=42822&r2=42823&view=diff
==============================================================================
--- trunk/qt4/src/pkg/YQPkgObjList.cc (original)
+++ trunk/qt4/src/pkg/YQPkgObjList.cc Fri Dec 7 17:26:45 2007
@@ -18,8 +18,6 @@
/-*/
-#define QT3_SUPPORT 1
-
#define y2log_component "qt-pkg"
#include
#include <QPixmap>
@@ -437,8 +435,7 @@
if ( ! insensitiveIcon.isNull() )
{
- iconSet.setPixmap( insensitiveIcon,
- QIcon::Automatic,
+ iconSet.addPixmap( insensitiveIcon,
QIcon::Disabled );
}
@@ -458,9 +455,9 @@
_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 @@
_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 @@
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 @@
if ( rule->isEnabled() )
{
y2milestone( "Active exclude rule: \"%s\"",
- rule->regexp().pattern().ascii() );
+ qPrintable(rule->regexp().pattern()) );
}
}
}
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
