Author: dmacvicar Date: Fri Dec 7 17:26:45 2007 New Revision: 42824 URL: http://svn.opensuse.org/viewcvs/yast?rev=42824&view=rev Log: YQPkgList, the uggly, no QT3_SUPPORT Modified: trunk/qt4/src/pkg/YQPkgList.cc Modified: trunk/qt4/src/pkg/YQPkgList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt4/src/pkg/YQPkgList.cc?rev=42824&r1=42823&r2=42824&view=diff ============================================================================== --- trunk/qt4/src/pkg/YQPkgList.cc (original) +++ trunk/qt4/src/pkg/YQPkgList.cc Fri Dec 7 17:26:45 2007 @@ -18,8 +18,6 @@ /-*/ -#define QT3_SUPPORT 1 - #define SOURCE_RPM_DISABLED 0 #define y2log_component "qt-pkg" @@ -28,6 +26,7 @@ #include <QAction> #include <QMenu> #include <QMessageBox> +#include <QFile> #include "utf8.h" @@ -182,15 +181,16 @@ { _sourceRpmContextMenu = new QMenu( this ); - actionInstallSourceRpm->addTo( _sourceRpmContextMenu ); - actionDontInstallSourceRpm->addTo( _sourceRpmContextMenu ); + _sourceRpmContextMenu->addAction(actionInstallSourceRpm); + _sourceRpmContextMenu->addAction(actionDontInstallSourceRpm); QMenu * submenu = new QMenu( _sourceRpmContextMenu ); Q_CHECK_PTR( submenu ); - _sourceRpmContextMenu->insertItem( _( "&All in This List" ), submenu ); + QAction *action = _sourceRpmContextMenu->addMenu( submenu ); + action->setText(_( "&All in This List" )); - actionInstallListSourceRpms->addTo( submenu ); - actionDontInstallListSourceRpms->addTo( submenu ); + submenu->addAction(actionInstallListSourceRpms); + submenu->addAction(actionDontInstallListSourceRpms); } @@ -251,15 +251,15 @@ _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 ); - _notInstalledContextMenu->insertSeparator(); - _notInstalledContextMenu->insertItem( _( "Export This List to &Text File..." ), + _notInstalledContextMenu->addSeparator(); + _notInstalledContextMenu->addAction( _( "Export This List to &Text File..." ), this, SLOT( askExportList() ) ); } @@ -270,15 +270,15 @@ _installedContextMenu = new QMenu( this ); Q_CHECK_PTR( _installedContextMenu ); - actionSetCurrentKeepInstalled->addTo( _installedContextMenu ); - actionSetCurrentDelete->addTo( _installedContextMenu ); - actionSetCurrentUpdate->addTo( _installedContextMenu ); - actionSetCurrentProtected->addTo( _installedContextMenu ); + _installedContextMenu->addAction(actionSetCurrentKeepInstalled); + _installedContextMenu->addAction(actionSetCurrentDelete); + _installedContextMenu->addAction(actionSetCurrentUpdate); + _installedContextMenu->addAction(actionSetCurrentProtected); addAllInListSubMenu( _installedContextMenu ); - _installedContextMenu->insertSeparator(); - _installedContextMenu->insertItem( _( "Export This List to &Text File..." ), + _installedContextMenu->addSeparator(); + _installedContextMenu->addAction( _( "Export This List to &Text File..." ), this, SLOT( askExportList() ) ); } @@ -289,16 +289,18 @@ 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 ); - actionSetListProtected->addTo( submenu ); + submenu->addAction(actionSetListInstall); + submenu->addAction(actionSetListDontInstall); + submenu->addAction(actionSetListKeepInstalled); + submenu->addAction(actionSetListDelete); + submenu->addAction(actionSetListDelete); + submenu->addAction(actionSetListUpdate); + submenu->addAction(actionSetListUpdateForce); + submenu->addAction(actionSetListTaboo); + submenu->addAction(actionSetListProtected); - menu->insertItem( _( "&All in This List" ), submenu ); + QAction *action = menu->addMenu( submenu ); + action->setText(_( "&All in This List" )); return submenu; } @@ -371,11 +373,12 @@ { // Open file - FILE * file = fopen( (const char *) filename, "w" ); + QFile file(filename); + file.open(QIODevice::WriteOnly); - if ( ! file ) + if ( file.error() != QFile::NoError ) { - y2error( "Can't open file %s", (const char *) filename ); + y2error( "Can't open file %s", qPrintable(filename) ); if ( interactive ) { @@ -402,13 +405,13 @@ QString header; header.sprintf( "# %-18s %-30s | %10s | %-16s | %-16s\n\n", - (const char *) _( "Status" ).utf8(), - (const char *) _( "Package" ).utf8(), - (const char *) _( "Size" ).utf8(), - (const char *) _( "Avail. Ver." ).utf8(), - (const char *) _( "Inst. Ver." ).utf8() + (const char *) _( "Status" ).toUtf8(), + (const char *) _( "Package" ).toUtf8(), + (const char *) _( "Size" ).toUtf8(), + (const char *) _( "Avail. Ver." ).toUtf8(), + (const char *) _( "Inst. Ver." ).toUtf8() ); - fputs( (const char *) header.utf8(), file ); + file.write(header.toUtf8()); // @@ -431,13 +434,15 @@ if ( instVersion.isEmpty() ) instVersion = "---"; QString status = "[" + statusText( pkg->status() ) + "]"; - fprintf( file, "%-20s %-30s | %10s | %-16s | %-16s\n", - (const char *) status.utf8(), + QString format; + format.sprintf("%-20s %-30s | %10s | %-16s | %-16s\n", + (const char *) status.toUtf8(), (const char *) pkg->text( nameCol() ), (const char *) pkg->text( sizeCol() ), (const char *) candVersion, (const char *) instVersion ); + file.write(format.toUtf8()); } item = item->nextSibling(); @@ -446,8 +451,8 @@ #endif // Clean up - if ( file ) - fclose( file ); + if ( file.isOpen() ) + file.close(); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org