[yast-commit] r44452 - /branches/tmp/coolo/split_qt_pkg/qt-pkg/src/

Author: coolo Date: Thu Feb 14 15:36:54 2008 New Revision: 44452 URL: http://svn.opensuse.org/viewcvs/yast?rev=44452&view=rev Log: commit my sat-changes.patch so I can work on this while the world breaks apart Modified: branches/tmp/coolo/split_qt_pkg/qt-pkg/src/CMakeLists.txt branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPackageSelector.cc branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPackageSelector.h branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPackageSelectorBase.cc branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPatternSelector.cc branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPatternSelector.h branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgConflictDialog.cc branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgConflictList.h branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgDependenciesView.cc branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgDependenciesView.h branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgLangList.h branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgPatchFilterView.cc branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgPatchFilterView.h branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgRepoList.cc branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgSearchFilterView.cc branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgSearchFilterView.h branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgSelDescriptionView.cc branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgUpdateProblemFilterView.cc branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgUpdateProblemFilterView.h branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQZypp.h Modified: branches/tmp/coolo/split_qt_pkg/qt-pkg/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/split_qt_pkg/qt-pkg/src/CMakeLists.txt?rev=44452&r1=44451&r2=44452&view=diff ============================================================================== --- branches/tmp/coolo/split_qt_pkg/qt-pkg/src/CMakeLists.txt (original) +++ branches/tmp/coolo/split_qt_pkg/qt-pkg/src/CMakeLists.txt Thu Feb 14 15:36:54 2008 @@ -35,7 +35,7 @@ YQPkgDiskUsageWarningDialog.cc YQPkgFileListView.cc YQPkgGenericDetailsView.cc - YQPkgLangList.cc +# YQPkgLangList.cc YQPkgList.cc YQPkgObjList.cc YQPkgPatchFilterView.cc @@ -48,7 +48,7 @@ YQPkgRpmGroupTagsFilterView.cc YQPkgSearchFilterView.cc YQPkgSelDescriptionView.cc - YQPkgSelList.cc +# YQPkgSelList.cc YQPkgSelMapper.cc YQPkgStatusFilterView.cc YQPkgTechnicalDetailsView.cc @@ -64,6 +64,7 @@ INCLUDE_DIRECTORIES( ${YAST_INCLUDE_DIR}/yui ) ADD_LIBRARY( py2qt_pkg SHARED ${qt_yast_pkg_plugin_SRCS}) +TARGET_LINK_LIBRARIES( py2qt_pkg py2qt ) TARGET_LINK_LIBRARIES( py2qt_pkg ${YAST_LIBRARY} ) TARGET_LINK_LIBRARIES( py2qt_pkg ${YAST_YCP_LIBRARY} ) TARGET_LINK_LIBRARIES( py2qt_pkg ${YAST_PLUGIN_WFM_LIBRARY} ) Modified: branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPackageSelector.cc?rev=44452&r1=44451&r2=44452&view=diff ============================================================================== --- branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPackageSelector.cc (original) +++ branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPackageSelector.cc Thu Feb 14 15:36:54 2008 @@ -71,7 +71,6 @@ #include "YQPkgProductDialog.h" #include "YQPkgRpmGroupTagsFilterView.h" #include "YQPkgSearchFilterView.h" -#include "YQPkgSelList.h" #include "YQPkgStatusFilterView.h" #include "YQPkgTechnicalDetailsView.h" #include "YQPkgTextDialog.h" @@ -121,7 +120,6 @@ _pkgVersionsView = 0; _rpmGroupTagsFilterView = 0; _searchFilterView = 0; - _selList = 0; _statusFilterView = 0; _updateProblemFilterView = 0; _patchFilterView = 0; @@ -187,11 +185,6 @@ _filters->showPage( _patternList ); _patternList->filter(); } - else if ( _selList ) - { - _filters->showPage( _selList ); - _selList->filter(); - } if ( _diskUsageList ) @@ -321,31 +314,6 @@ // - // Selections view - // - - if ( ! zyppPool().emptyzypp::Selection() || testMode() ) - { - - _selList = new YQPkgSelList( parent, true ); - Q_CHECK_PTR( _selList ); - _filters->addPage( _( "Selections" ), _selList ); - - connect( _selList, SIGNAL( statusChanged() ), - this, SLOT ( autoResolveDependencies() ) ); - - connect( this, SIGNAL( refresh() ), - _selList, SLOT ( updateItemStates() ) ); - - if ( _pkgConflictDialog ) - { - connect( _pkgConflictDialog, SIGNAL( updatePackages() ), - _selList, SLOT ( updateItemStates() ) ); - } - } - - - // // RPM group tags view // @@ -360,7 +328,8 @@ // // Languages view // - +#warning LangList +#if FIXME _langList = new YQPkgLangList( parent ); Q_CHECK_PTR( _langList ); @@ -373,6 +342,7 @@ connect( this, SIGNAL( refresh() ), _langList, SLOT ( updateItemStates() ) ); +#endif // // Repository view @@ -880,10 +850,9 @@ connectFilter( _updateProblemFilterView, _pkgList, false ); connectFilter( _patternList, _pkgList ); - connectFilter( _selList, _pkgList ); connectFilter( _repoFilterView, _pkgList, false ); connectFilter( _rpmGroupTagsFilterView, _pkgList, false ); - connectFilter( _langList, _pkgList ); + //FIXMEconnectFilter( _langList, _pkgList ); connectFilter( _statusFilterView, _pkgList, false ); connectFilter( _searchFilterView, _pkgList, false ); @@ -928,11 +897,6 @@ _patternList, SLOT ( updateItemStates() ) ); } - if ( _selList ) - { - connect( _pkgConflictDialog, SIGNAL( updatePackages() ), - _selList, SLOT ( updateItemStates() ) ); - } if ( _diskUsageList ) { Modified: branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPackageSelector.h?rev=44452&r1=44451&r2=44452&view=diff ============================================================================== --- branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPackageSelector.h (original) +++ branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPackageSelector.h Thu Feb 14 15:36:54 2008 @@ -67,7 +67,7 @@ YQPackageSelector( YWidget * parent, long modeFlags = 0 ); - + public slots: /** @@ -305,7 +305,6 @@ YQPkgPatternList * _patternList; YQPkgRpmGroupTagsFilterView * _rpmGroupTagsFilterView; YQPkgSearchFilterView * _searchFilterView; - YQPkgSelList * _selList; YQPkgStatusFilterView * _statusFilterView; YQPkgTechnicalDetailsView * _pkgTechnicalDetailsView; YQPkgUpdateProblemFilterView * _updateProblemFilterView; Modified: branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPackageSelectorBase.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPackageSelectorBase.cc?rev=44452&r1=44451&r2=44452&view=diff ============================================================================== --- branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPackageSelectorBase.cc (original) +++ branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPackageSelectorBase.cc Thu Feb 14 15:36:54 2008 @@ -81,8 +81,6 @@ zyppPool().saveState(); zyppPool().saveState(); - zyppPool().saveStatezypp::Selection(); - zyppPool().saveState(); zyppPool().saveState(); @@ -205,8 +203,6 @@ bool changes = zyppPool().diffState() || zyppPool().diffState() || - zyppPool().diffStatezypp::Selection() || - zyppPool().diffState() || zyppPool().diffState(); if ( changes ) @@ -217,12 +213,6 @@ if ( zyppPool().diffStatezypp::Pattern() ) yuiMilestone() << "diffState() reports changed patterns" << endl; - if ( zyppPool().diffStatezypp::Selection() ) - yuiMilestone() << "diffState() reports changed selections" << endl; - - if ( zyppPool().diffStatezypp::Language() ) - yuiMilestone() << "diffState() reports changed languages" << endl; - if ( zyppPool().diffStatezypp::Patch() ) yuiMilestone() << "diffState() reports changed patches" << endl; } @@ -238,8 +228,6 @@ { zyppPool().restoreState(); zyppPool().restoreState(); - zyppPool().restoreStatezypp::Selection(); - zyppPool().restoreState(); zyppPool().restoreState(); yuiMilestone() << "Closing PackageSelector with \"Cancel\"" << endl; Modified: branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPatternSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPatternSelector.cc?rev=44452&r1=44451&r2=44452&view=diff ============================================================================== --- branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPatternSelector.cc (original) +++ branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPatternSelector.cc Thu Feb 14 15:36:54 2008 @@ -34,7 +34,6 @@ #include "YQPkgSelDescriptionView.h" #include "YQPkgDiskUsageList.h" #include "YQPkgPatternList.h" -#include "YQPkgSelList.h" #include "YQWizard.h" #include "YQDialog.h" @@ -56,7 +55,6 @@ : YQPackageSelectorBase( parent, modeFlags ) { _patternList = 0; - _selList = 0; _descriptionView = 0; _wizard = findWizard(); @@ -68,14 +66,8 @@ _patternList->fillList(); _patternList->selectSomething(); } - else if ( _selList ) - { - _selList->fillList(); - _selList->selectSomething(); - } - if ( zyppPool().empty() && - zyppPool().emptyzypp::Selection() ) + if ( zyppPool().empty() ) { yuiWarning() << "Neither patterns nor selections in ZyppPool" << endl; } @@ -151,27 +143,6 @@ //_patternList->header()->hide(); } - if ( ! _patternList ) - { - // - // Fallback: selections list - // - - /** - * Create a selections list even if there are no selections, otherwise - * the layout will look very weird. An empty selections list still - * looks better than a lot of grey empty space. - **/ - - yuiWarning() << "No patterns in ZyppPool - using selections instead" << endl; - _selList = new YQPkgSelList( vbox, - false, // no autoFill - need to connect to details view first - false ); // no autoFilter - filterMatch() is not connected - Q_CHECK_PTR( _selList ); - layout->addWidget(_selList); - _selList->header()->hide(); - } - if ( _wizard ) // No button box - add "Details..." button here { // @@ -315,33 +286,6 @@ } - if ( _selList ) - { -#if ALWAYS_SOLVE_IMMEDIATELY - connect( _selList, SIGNAL( statusChanged() ), - this, SLOT ( resolveDependencies() ) ); - - if ( _pkgConflictDialog ) - { - connect( _pkgConflictDialog, SIGNAL( updatePackages() ), - _selList, SLOT ( updateItemStates() ) ); - } - -#endif - - if ( _descriptionView ) - { - connect( _selList, SIGNAL( currentItemChanged( ZyppSel ) ), - _descriptionView, SLOT ( showDetails ( ZyppSel ) ) ); - } - - if ( _diskUsageList ) - { - connect( _selList, SIGNAL( updatePackages() ), - _diskUsageList, SLOT ( updateDiskUsage() ) ); - } - } - yuiMilestone() << "Connection set up" << endl; Modified: branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPatternSelector.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPatternSelector.h?rev=44452&r1=44451&r2=44452&view=diff ============================================================================== --- branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPatternSelector.h (original) +++ branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPatternSelector.h Thu Feb 14 15:36:54 2008 @@ -28,7 +28,6 @@ class QPushButton; class YQPkgSelDescriptionView; -class YQPkgSelList; class YQPkgPatternList; class YQWizard; @@ -79,9 +78,6 @@ // Data members - - - YQPkgSelList * _selList; YQPkgPatternList * _patternList; YQPkgSelDescriptionView * _descriptionView; YQWizard * _wizard; Modified: branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgConflictDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgConflictDialog.cc?rev=44452&r1=44451&r2=44452&view=diff ============================================================================== --- branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgConflictDialog.cc (original) +++ branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgConflictDialog.cc Thu Feb 14 15:36:54 2008 @@ -255,7 +255,7 @@ QTime solveTime; solveTime.start(); - bool success = zypp::getZYpp()->resolver()->verifySystem( true ); // considerNewHardware + bool success = zypp::getZYpp()->resolver()->verifySystem(); // considerNewHardware yuiDebug() << "System verified in " << solveTime.elapsed() / 1000.0 << " s" << endl; Modified: branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgConflictList.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgConflictList.h?rev=44452&r1=44451&r2=44452&view=diff ============================================================================== --- branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgConflictList.h (original) +++ branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgConflictList.h Thu Feb 14 15:36:54 2008 @@ -81,11 +81,6 @@ void applyResolutions(); /** - * Ignore all conflicts. - **/ - void ignoreAll(); - - /** * Ask for a file name and save the current conflict list to file. **/ void askSaveToFile() const; Modified: branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgDependenciesView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgDependenciesView.cc?rev=44452&r1=44451&r2=44452&view=diff ============================================================================== --- branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgDependenciesView.cc (original) +++ branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgDependenciesView.cc Thu Feb 14 15:36:54 2008 @@ -131,7 +131,7 @@ QString YQPkgDependenciesView::row( const QString & heading, - const zypp::CapSet & capSet ) + const zypp::Capabilities & capSet ) { QString content = htmlLines( capSet ); @@ -147,8 +147,8 @@ QString YQPkgDependenciesView::row( const QString & heading, - const zypp::CapSet & capSet1, - const zypp::CapSet & capSet2 ) + const zypp::Capabilities & capSet1, + const zypp::Capabilities & capSet2 ) { QString content1 = htmlLines( capSet1 ); QString content2 = htmlLines( capSet2 ); @@ -165,11 +165,11 @@ QString -YQPkgDependenciesView::htmlLines( const zypp::CapSet & capSet ) +YQPkgDependenciesView::htmlLines( const zypp::Capabilities & capSet ) { QString html; - for ( zypp::CapSet::const_iterator it = capSet.begin(); + for ( zypp::Capabilities::const_iterator it = capSet.begin(); it != capSet.end(); ++it ) { Modified: branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgDependenciesView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgDependenciesView.h?rev=44452&r1=44451&r2=44452&view=diff ============================================================================== --- branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgDependenciesView.h (original) +++ branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgDependenciesView.h Thu Feb 14 15:36:54 2008 @@ -80,18 +80,18 @@ * Returns an empty string if capSet is empty. **/ static QString row( const QString & heading, - const zypp::CapSet & capSet ); + const zypp::Capabilities & capSet ); /** - * Format two zypp::CapSets (describing zypp::Dep::REQUIRES etc.) + * Format two zypp::Capabilities (describing zypp::Dep::REQUIRES etc.) * with a heading in HTML lines. * * Returns an empty string both capSets are empty. **/ static QString row( const QString & heading, - const zypp::CapSet & capSet1, - const zypp::CapSet & capSet2 ); + const zypp::Capabilities & capSet1, + const zypp::Capabilities & capSet2 ); /** * Returns a string containing a HTML table row with 'contents'. @@ -100,13 +100,13 @@ **/ static QString row( const QString & contents ) { return YQPkgGenericDetailsView::row( contents ); } - + /** - * Format a zypp::CapSet (describing zypp::Dep::REQUIRES etc.) + * Format a zypp::Capabilities (describing zypp::Dep::REQUIRES etc.) * in HTML lines, separated with <BR>. * Returns an empty string if capSet is empty. **/ - static QString htmlLines( const zypp::CapSet & capSet ); + static QString htmlLines( const zypp::Capabilities & capSet ); }; Modified: branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgLangList.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgLangList.h?rev=44452&r1=44451&r2=44452&view=diff ============================================================================== --- branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgLangList.h (original) +++ branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgLangList.h Thu Feb 14 15:36:54 2008 @@ -25,6 +25,7 @@ class YQPkgLangListItem; +typedef QString ZyppLang; /** * @short Display a list of zypp::Selection objects. @@ -71,7 +72,7 @@ void addLangItem( ZyppSel selectable, ZyppLang lang ); - + public: /** Modified: branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgPatchFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgPatchFilterView.cc?rev=44452&r1=44451&r2=44452&view=diff ============================================================================== --- branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgPatchFilterView.cc (original) +++ branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgPatchFilterView.cc Thu Feb 14 15:36:54 2008 @@ -35,7 +35,6 @@ #include "YQPkgPatchFilterView.h" #include "YQPkgPatchList.h" #include "YQPkgDescriptionView.h" -#include "YQPkgSelList.h" #include "QY2LayoutUtils.h" #include "YQi18n.h" Modified: branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgPatchFilterView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgPatchFilterView.h?rev=44452&r1=44451&r2=44452&view=diff ============================================================================== --- branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgPatchFilterView.h (original) +++ branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgPatchFilterView.h Thu Feb 14 15:36:54 2008 @@ -59,7 +59,7 @@ **/ YQPkgPatchList * patchList() const { return _patchList; } - + public slots: /** @@ -67,7 +67,7 @@ **/ void updateTotalDownloadSize(); - + protected slots: /** @@ -88,7 +88,7 @@ QTabWidget * _detailsViews; YQPkgDescriptionView * _descriptionView; QLabel * _totalDownloadSize; - + YQPkgSelMapper _selMapper; }; Modified: branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgRepoList.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgRepoList.cc?rev=44452&r1=44451&r2=44452&view=diff ============================================================================== --- branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgRepoList.cc (original) +++ branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgRepoList.cc Thu Feb 14 15:36:54 2008 @@ -122,10 +122,10 @@ set<ZyppSel> exactMatches; set<ZyppSel> nearMatches; - + QTreeWidgetItem * item; - + QList items = selectedItems(); QListIterator it(items); @@ -271,15 +271,17 @@ { ZyppProduct product; - zypp::ResStore::iterator it = zyppRepo.resolvables().begin(); + zypp::ResPool::byKind_iterator it = zypp::ResPool::instance().byKindBegin( zypp::ResKind::product ); + zypp::ResPool::byKind_iterator end = zypp::ResPool::instance().byKindEnd( zypp::ResKind::product ); // // Find the first product on this repository // - while ( it != zyppRepo.resolvables().end() && ! product ) + while ( it != end && ! product ) { - product = zypp::dynamic_pointer_castzypp::Product( *it ); + if ( it->resolvable()->repoInfo().alias() == zyppRepo.info().alias() ) + product = zypp::asKindzypp::Product( it->resolvable() ); ++it; } @@ -287,11 +289,11 @@ // Check if there is another product on this repository // - while ( it != zyppRepo.resolvables().end() ) + while ( it != end ) { - if ( zypp::dynamic_pointer_castzypp::Product( *it ) ) + if ( it->resolvable()->repoInfo().alias() == zyppRepo.info().alias() ) { - yuiMilestone() << "Multiple products in repository " + yuiMilestone() << "Multiple products in repository " << zyppRepo.info().alias() << endl; ZyppProduct null; Modified: branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgSearchFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgSearchFilterView.cc?rev=44452&r1=44451&r2=44452&view=diff ============================================================================== --- branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgSearchFilterView.cc (original) +++ branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgSearchFilterView.cc Thu Feb 14 15:36:54 2008 @@ -91,7 +91,7 @@ // // Where to search // - + QGroupBox * gbox = new QGroupBox( _( "Search in" ), this ); Q_CHECK_PTR( gbox ); layout->addWidget(gbox); @@ -353,9 +353,9 @@ bool -YQPkgSearchFilterView::check( const zypp::CapSet & capSet, const QRegExp & regexp ) +YQPkgSearchFilterView::check( const zypp::Capabilities& capSet, const QRegExp & regexp ) { - for ( zypp::CapSet::const_iterator it = capSet.begin(); + for ( zypp::Capabilities::const_iterator it = capSet.begin(); it != capSet.end(); ++it ) { Modified: branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgSearchFilterView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgSearchFilterView.h?rev=44452&r1=44451&r2=44452&view=diff ============================================================================== --- branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgSearchFilterView.h (original) +++ branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgSearchFilterView.h Thu Feb 14 15:36:54 2008 @@ -127,7 +127,7 @@ UseRegExp }; - + /** * Check if pkg matches the search criteria. **/ @@ -145,7 +145,7 @@ * zypp::Resolvable::dep( zypp::Dep::PROVIDES ), * zypp::Resolvable::dep( zypp::Dep::REQUIRES ) **/ - bool check( const zypp::CapSet & capSet, const QRegExp & regexp ); + bool check( const zypp::Capabilities & capSet, const QRegExp & regexp ); /** * Key press event: Execute search upon 'Return' Modified: branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgSelDescriptionView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgSelDescriptionView.cc?rev=44452&r1=44451&r2=44452&view=diff ============================================================================== --- branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgSelDescriptionView.cc (original) +++ branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgSelDescriptionView.cc Thu Feb 14 15:36:54 2008 @@ -73,10 +73,9 @@ YQPkgSelDescriptionView::htmlHeading( ZyppSel selectable ) { ZyppObj zyppObj = selectable->theObj(); - ZyppSelection selection = tryCastToZyppSelection( zyppObj ); ZyppPattern pattern = tryCastToZyppPattern ( zyppObj ); - if ( ! selection && ! pattern ) + if ( ! pattern ) return YQPkgGenericDetailsView::htmlHeading( selectable ); QString summary = fromUTF8( zyppObj->summary() ); Modified: branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgUpdateProblemFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgUpdateProblemFilterView.cc?rev=44452&r1=44451&r2=44452&view=diff ============================================================================== --- branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgUpdateProblemFilterView.cc (original) +++ branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgUpdateProblemFilterView.cc Thu Feb 14 15:36:54 2008 @@ -78,9 +78,9 @@ { emit filterStart(); - listzypp::PoolItem_Ref problemList = zypp::getZYpp()->resolver()->problematicUpdateItems(); - - for ( listzypp::PoolItem_Ref::const_iterator it = problemList.begin(); + listzypp::PoolItem problemList = zypp::getZYpp()->resolver()->problematicUpdateItems(); + + for ( listzypp::PoolItem::const_iterator it = problemList.begin(); it != problemList.end(); ++it ) { @@ -95,11 +95,11 @@ yuiMilestone() << "Problematic package: " << pkg->name() << "-" << pkg->edition().asString() << endl; - + emit filterMatch( sel, pkg ); } } - + } emit filterFinished(); Modified: branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgUpdateProblemFilterView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgUpdateProblemFilterView.h?rev=44452&r1=44451&r2=44452&view=diff ============================================================================== --- branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgUpdateProblemFilterView.h (original) +++ branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQPkgUpdateProblemFilterView.h Thu Feb 14 15:36:54 2008 @@ -51,7 +51,7 @@ **/ static bool haveProblematicPackages(); - + public slots: /** @@ -88,9 +88,9 @@ **/ void filterFinished(); - + protected: - + YQPkgSelMapper _selMapper; }; Modified: branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQZypp.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQZypp.h?rev=44452&r1=44451&r2=44452&view=diff ============================================================================== --- branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQZypp.h (original) +++ branches/tmp/coolo/split_qt_pkg/qt-pkg/src/YQZypp.h Thu Feb 14 15:36:54 2008 @@ -25,9 +25,7 @@ #include #include #include -#include #include -#include #include #include #include @@ -54,9 +52,7 @@ typedef zypp::ui::Selectable::Ptr ZyppSel; typedef zypp::ResObject::constPtr ZyppObj; typedef zypp::Package::constPtr ZyppPkg; -typedef zypp::Selection::constPtr ZyppSelection; typedef zypp::Pattern::constPtr ZyppPattern; -typedef zypp::Language::constPtr ZyppLang; typedef zypp::Patch::constPtr ZyppPatch; typedef zypp::Product::constPtr ZyppProduct; @@ -72,15 +68,9 @@ inline ZyppPoolIterator zyppPkgBegin() { return zyppBeginzypp::Package(); } inline ZyppPoolIterator zyppPkgEnd() { return zyppEndzypp::Package(); } -inline ZyppPoolIterator zyppSelectionsBegin() { return zyppBeginzypp::Selection(); } -inline ZyppPoolIterator zyppSelectionsEnd() { return zyppEndzypp::Selection(); } - inline ZyppPoolIterator zyppPatternsBegin() { return zyppBeginzypp::Pattern(); } inline ZyppPoolIterator zyppPatternsEnd() { return zyppEndzypp::Pattern(); } -inline ZyppPoolIterator zyppLangBegin() { return zyppBeginzypp::Language(); } -inline ZyppPoolIterator zyppLangEnd() { return zyppEndzypp::Language(); } - inline ZyppPoolIterator zyppPatchesBegin() { return zyppBeginzypp::Patch(); } inline ZyppPoolIterator zyppPatchesEnd() { return zyppEndzypp::Patch(); } @@ -95,21 +85,11 @@ return zypp::dynamic_pointer_cast<const zypp::Package>( zyppObj ); } -inline ZyppSelection tryCastToZyppSelection( ZyppObj zyppObj ) -{ - return zypp::dynamic_pointer_cast<const zypp::Selection>( zyppObj ); -} - inline ZyppPattern tryCastToZyppPattern( ZyppObj zyppObj ) { return zypp::dynamic_pointer_cast<const zypp::Pattern>( zyppObj ); } -inline ZyppLang tryCastToZyppLang( ZyppObj zyppObj ) -{ - return zypp::dynamic_pointer_cast<const zypp::Language>( zyppObj ); -} - inline ZyppPatch tryCastToZyppPatch( ZyppObj zyppObj ) { return zypp::dynamic_pointer_cast<const zypp::Patch>( zyppObj ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org