Author: kmachalkova Date: Fri Apr 18 12:44:46 2008 New Revision: 46830 URL: http://svn.opensuse.org/viewcvs/yast?rev=46830&view=rev Log: Removing no longer needed code (thanks, zypp guys) Modified: trunk/ncurses-pkg/src/NCPkgFilterContainer.cc trunk/ncurses-pkg/src/NCPkgFilterContainer.h Modified: trunk/ncurses-pkg/src/NCPkgFilterContainer.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterContainer.cc?rev=46830&r1=46829&r2=46830&view=diff ============================================================================== --- trunk/ncurses-pkg/src/NCPkgFilterContainer.cc (original) +++ trunk/ncurses-pkg/src/NCPkgFilterContainer.cc Fri Apr 18 12:44:46 2008 @@ -122,67 +122,6 @@ } -bool NCPkgFilterContainer::showContainerContent( const set<string> & wanted ) -{ - NCPkgTable * packageList = packager->PackageList(); - - if ( !packageList ) - { - yuiError() << "Widget is not a valid NCPkgTable widget" << endl; - return false; - } - - // clear the package table - packageList->itemsCleared (); - - set<string>::iterator not_found = wanted.end (); - - std::vector<ZyppSel> sorted; - sorted.reserve (wanted.size ()); - - yuiMilestone() << "Showing " << wanted.size () << " packages" << endl; - // find the objects for the names - ZyppPoolIterator - b = zyppPkgBegin(), - e = zyppPkgEnd(), - it; - for ( it = b; it != e; ++it ) - { - string name = (*it)->name(); // omitted theObj - - if ( wanted.find (name) != not_found ) - { - ZyppPkg zyppPkg = tryCastToZyppPkg( (*it)->theObj() ); - if ( zyppPkg ) - { - sorted.push_back (*it); - } - } - } - - // sort it and insert it to the list - sort (sorted.begin (), sorted.end (), sortByName); - { - std::vector<ZyppSel>::iterator - b = sorted.begin (), - e = sorted.end (), - it; - for ( it = b; it != e; ++it ) - { - ZyppPkg zyppPkg = tryCastToZyppPkg( (*it)->theObj() ); - // already know that it is valid - packageList->createListEntry( zyppPkg, *it ); - } - } - - // show the package table - packageList->setCurrentItem( 0 ); - packageList->drawList(); - packageList->showInformation(); - - return true; - -} /////////////////////////////////////////////////////////////////// // // NCursesEvent & showSelectionPopup () @@ -200,6 +139,8 @@ //ZyppLang langPtr = tryCastToZyppLang (objPtr); if (patPtr) { + packager->FilterDescription()->setText ( showDescription( objPtr ) ); + yuiMilestone() << "Show packages belonging to selected pattern: " << getCurrentLine() << endl; NCPkgTable * packageList = packager->PackageList(); @@ -210,9 +151,6 @@ } packageList->itemsCleared (); - // zypp::ui::PatternContents patternContents( patPtr ); - packager->FilterDescription()->setText ( showDescription( objPtr ) ); - // packages = patternContents.install_packages(); zypp::Pattern::Contents related ( patPtr->contents() ); for ( zypp::Pattern::Contents::Selectable_iterator it = related.selectableBegin(); it != related.selectableEnd(); @@ -264,7 +202,6 @@ } #endif - //showContainerContent( packages ); } } Modified: trunk/ncurses-pkg/src/NCPkgFilterContainer.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterContainer.h?rev=46830&r1=46829&r2=46830&view=diff ============================================================================== --- trunk/ncurses-pkg/src/NCPkgFilterContainer.h (original) +++ trunk/ncurses-pkg/src/NCPkgFilterContainer.h Fri Apr 18 12:44:46 2008 @@ -69,7 +69,6 @@ */ bool fillContainerList ( SelType type ); - bool showContainerContent( const set<string> & wanted ); string showDescription( ZyppObj objPtr ); /** -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org