Author: sh-sh-sh Date: Mon Jul 23 18:09:04 2007 New Revision: 39618 URL: http://svn.opensuse.org/viewcvs/yast?rev=39618&view=rev Log: consistent naming Modified: trunk/qt/src/pkg/YQPackageSelector.cc trunk/qt/src/pkg/YQPkgRepoFilterView.cc trunk/qt/src/pkg/YQPkgRepoFilterView.h trunk/qt/src/pkg/YQPkgRepoList.cc trunk/qt/src/pkg/YQPkgRepoList.h trunk/qt/src/pkg/YQPkgSelMapper.h trunk/qt/src/pkg/YQPkgVersionsView.cc trunk/qt/src/pkg/YQPkgVersionsView.h Modified: trunk/qt/src/pkg/YQPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPackageSelector.cc?rev=39618&r1=39617&r2=39618&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPackageSelector.cc (original) +++ trunk/qt/src/pkg/YQPackageSelector.cc Mon Jul 23 18:09:04 2007 @@ -154,7 +154,7 @@ } else if ( _repoFilterView && _instSourcesMode ) { - if ( YQPkgRepoList::countEnabledSources() > 1 ) + if ( YQPkgRepoList::countEnabledRepositories() > 1 ) { _filters->showPage( _repoFilterView ); _repoFilterView->filter(); Modified: trunk/qt/src/pkg/YQPkgRepoFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgRepoFilterView.cc?rev=39618&r1=39617&r2=39618&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgRepoFilterView.cc (original) +++ trunk/qt/src/pkg/YQPkgRepoFilterView.cc Mon Jul 23 18:09:04 2007 @@ -94,7 +94,7 @@ addVSpacing( vbox, MARGIN ); // Translators: This is a combo box where the user can apply a secondary filter - // in addition to the primary filter by installation source - one of + // in addition to the primary filter by repository - one of // "all packages", "RPM groups", "search", "summary" _secondaryFilters = new QY2ComboTabWidget( _( "&Secondary Filter:" ), vbox ); CHECK_PTR( _secondaryFilters ); Modified: trunk/qt/src/pkg/YQPkgRepoFilterView.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgRepoFilterView.h?rev=39618&r1=39617&r2=39618&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgRepoFilterView.h (original) +++ trunk/qt/src/pkg/YQPkgRepoFilterView.h Mon Jul 23 18:09:04 2007 @@ -60,14 +60,14 @@ /** * Emitted during filtering for each pkg that matches the filter - * and the candidate package comes from the respective source + * and the candidate package comes from the respective repository **/ void filterMatch( ZyppSel selectable, ZyppPkg pkg ); /** * Emitted during filtering for each pkg that matches the filter - * and the candidate package does not come from the respective source + * and the candidate package does not come from the respective repository **/ void filterNearMatch( ZyppSel selectable, ZyppPkg pkg ); Modified: trunk/qt/src/pkg/YQPkgRepoList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgRepoList.cc?rev=39618&r1=39617&r2=39618&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgRepoList.cc (original) +++ trunk/qt/src/pkg/YQPkgRepoList.cc Mon Jul 23 18:09:04 2007 @@ -44,7 +44,7 @@ int numCol = 0; - // Column headers for installation source list + // Column headers for repository list addColumn( _( "Name" ) ); _nameCol = numCol++; addColumn( _( "URL" ) ); _urlCol = numCol++; @@ -85,7 +85,7 @@ int -YQPkgRepoList::countEnabledSources() +YQPkgRepoList::countEnabledRepositories() { return zyppPool().knownRepositoriesSize(); } @@ -126,14 +126,14 @@ if ( repoItem ) { - ZyppRepo currentSrc = repoItem->zyppSrc(); + ZyppRepo currentRepo = repoItem->zyppRepo(); for ( ZyppPoolIterator sel_it = zyppPkgBegin(); sel_it != zyppPkgEnd(); ++sel_it ) { if ( (*sel_it)->candidateObj() && - (*sel_it)->candidateObj()->repository() == currentSrc ) + (*sel_it)->candidateObj()->repository() == currentRepo ) { exactMatches.insert( *sel_it ); } @@ -143,7 +143,7 @@ while ( pkg_it != (*sel_it)->availableEnd() ) { - if ( (*pkg_it)->repository() == currentSrc ) + if ( (*pkg_it)->repository() == currentRepo ) nearMatches.insert( *sel_it ); ++pkg_it; @@ -193,9 +193,9 @@ void -YQPkgRepoList::addRepo( ZyppRepo src ) +YQPkgRepoList::addRepo( ZyppRepo repo ) { - new YQPkgRepoListItem( this, src ); + new YQPkgRepoListItem( this, repo ); } @@ -216,17 +216,17 @@ YQPkgRepoListItem::YQPkgRepoListItem( YQPkgRepoList * repoList, - ZyppRepo src ) + ZyppRepo repo ) : QY2ListViewItem( repoList ) , _repoList( repoList ) - , _zyppSrc( src ) + , _zyppRepo( repo ) { if ( nameCol() >= 0 ) { string name; - ZyppProduct product = singleProduct( _zyppSrc ); + ZyppProduct product = singleProduct( _zyppRepo ); - if ( product ) // only if the source provides exactly one product + if ( product ) // only if the repository provides exactly one product { // (which is the most common case) name = product->summary(); } @@ -237,12 +237,12 @@ if ( urlCol() >= 0 ) { - zypp::Url srcUrl; - if ( ! src.info().baseUrlsEmpty() ) + zypp::Url repoUrl; + if ( ! repo.info().baseUrlsEmpty() ) { - srcUrl = *src.info().baseUrlsBegin(); + repoUrl = *repo.info().baseUrlsBegin(); } - setText( urlCol(), srcUrl.asString().c_str() ); + setText( urlCol(), repoUrl.asString().c_str() ); } } @@ -255,17 +255,17 @@ ZyppProduct -YQPkgRepoListItem::singleProduct( ZyppRepo zyppSrc ) +YQPkgRepoListItem::singleProduct( ZyppRepo zyppRepo ) { ZyppProduct product; - zypp::ResStore::iterator it = zyppSrc.resolvables().begin(); + zypp::ResStore::iterator it = zyppRepo.resolvables().begin(); // // Find the first product on this repository // - while ( it != zyppSrc.resolvables().end() && ! product ) + while ( it != zyppRepo.resolvables().end() && ! product ) { product = zypp::dynamic_pointer_castzypp::Product( *it ); ++it; @@ -275,12 +275,12 @@ // Check if there is another product on this repository // - while ( it != zyppSrc.resolvables().end() ) + while ( it != zyppRepo.resolvables().end() ) { if ( zypp::dynamic_pointer_castzypp::Product( *it ) ) { y2milestone( "Multiple products in repository %s", - zyppSrc.info().alias().c_str() ); + zyppRepo.info().alias().c_str() ); ZyppProduct null; return null; } @@ -290,7 +290,7 @@ if ( ! product ) y2milestone( "No product in repository %s", - zyppSrc.info().alias().c_str() ); + zyppRepo.info().alias().c_str() ); return product; } Modified: trunk/qt/src/pkg/YQPkgRepoList.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgRepoList.h?rev=39618&r1=39617&r2=39618&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgRepoList.h (original) +++ trunk/qt/src/pkg/YQPkgRepoList.h Mon Jul 23 18:09:04 2007 @@ -53,9 +53,9 @@ virtual ~YQPkgRepoList(); /** - * Returns the number of enabled installation sources. + * Returns the number of enabled repositories. **/ - static int countEnabledSources(); + static int countEnabledRepositories(); public slots: @@ -75,9 +75,9 @@ void filterIfVisible(); /** - * Add an inst source to the list. + * Add a repository to the list. **/ - void addRepo( ZyppRepo src ); + void addRepo( ZyppRepo repo ); public: @@ -104,14 +104,14 @@ /** * Emitted during filtering for each pkg that matches the filter - * and the candidate package comes from the respective source + * and the candidate package comes from the respective repository **/ void filterMatch( ZyppSel selectable, ZyppPkg pkg ); /** * Emitted during filtering for each pkg that matches the filter - * and the candidate package does not come from the respective source + * and the candidate package does not come from the respective repository **/ void filterNearMatch( ZyppSel selectable, ZyppPkg pkg ); @@ -150,7 +150,7 @@ /** * Constructor **/ - YQPkgRepoListItem( YQPkgRepoList *parentList, ZyppRepo src ); + YQPkgRepoListItem( YQPkgRepoList *parentList, ZyppRepo repo ); /** * Destructor @@ -158,9 +158,9 @@ virtual ~YQPkgRepoListItem(); /** - * Returns the ZYPP source this item corresponds to + * Returns the ZYPP repository this item corresponds to **/ - ZyppRepo zyppSrc() const { return _zyppSrc; } + ZyppRepo zyppRepo() const { return _zyppRepo; } /** * Returns the parent list @@ -168,10 +168,10 @@ const YQPkgRepoList * repoList() const { return _repoList; } /** - * Returns the product on a source if it has one single product + * Returns the product on a repository if it has one single product * or 0 if there are no or multiple products. **/ - static ZyppProduct singleProduct( ZyppRepo src ); + static ZyppProduct singleProduct( ZyppRepo repo ); // Columns @@ -184,7 +184,7 @@ // Data members YQPkgRepoList * _repoList; - ZyppRepo _zyppSrc; + ZyppRepo _zyppRepo; }; Modified: trunk/qt/src/pkg/YQPkgSelMapper.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgSelMapper.h?rev=39618&r1=39617&r2=39618&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgSelMapper.h (original) +++ trunk/qt/src/pkg/YQPkgSelMapper.h Mon Jul 23 18:09:04 2007 @@ -62,8 +62,7 @@ /** * Rebuild the shared cache. This is expensive. Call this only when the - * ZyppPool has changed, i.e. after installation sources were added or - * removed. + * ZyppPool has changed, i.e. after repositories were added or removed. * * Since the cache is shared, this affects all instances of this class. **/ Modified: trunk/qt/src/pkg/YQPkgVersionsView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgVersionsView.cc?rev=39618&r1=39617&r2=39618&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgVersionsView.cc (original) +++ trunk/qt/src/pkg/YQPkgVersionsView.cc Mon Jul 23 18:09:04 2007 @@ -258,12 +258,12 @@ } if ( urlCol() >= 0 ) { - zypp::Url srcUrl; + zypp::Url repoUrl; if ( ! zyppObj->repository().info().baseUrlsEmpty() ) { - srcUrl = *zyppObj->repository().info().baseUrlsBegin(); + repoUrl = *zyppObj->repository().info().baseUrlsBegin(); } - setText( urlCol(), srcUrl.asString().c_str() ); + setText( urlCol(), repoUrl.asString().c_str() ); } if ( _selectable->hasInstalledObj() ) Modified: trunk/qt/src/pkg/YQPkgVersionsView.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgVersionsView.h?rev=39618&r1=39617&r2=39618&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgVersionsView.h (original) +++ trunk/qt/src/pkg/YQPkgVersionsView.h Mon Jul 23 18:09:04 2007 @@ -31,7 +31,7 @@ /** * @short Package version selector: Display a list of available versions from - * all the different installation sources and let the user change the candidate + * all the different repositories and let the user change the candidate * version for installation / update. **/ class YQPkgVersionsView : public QY2ListView -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org