Author: sh-sh-sh Date: Wed Jul 25 17:35:20 2007 New Revision: 39681 URL: http://svn.opensuse.org/viewcvs/yast?rev=39681&view=rev Log: consistent naming Modified: branches/tmp/sh/mod-ui/qt/src/pkg/YQPackageSelector.cc branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgRepoFilterView.cc branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgRepoFilterView.h branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgRepoList.cc branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgRepoList.h branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgSearchFilterView.cc branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgVersionsView.cc Modified: branches/tmp/sh/mod-ui/qt/src/pkg/YQPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/pkg/YQPackageSelector.cc?rev=39681&r1=39680&r2=39681&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/pkg/YQPackageSelector.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/pkg/YQPackageSelector.cc Wed Jul 25 17:35:20 2007 @@ -149,7 +149,7 @@ } else if ( _repoFilterView && repoMode() ) { - if ( YQPkgRepoList::countEnabledSources() > 1 ) + if ( YQPkgRepoList::countEnabledRepositories() > 1 ) { _filters->showPage( _repoFilterView ); _repoFilterView->filter(); @@ -1082,7 +1082,7 @@ try { - std::ofstream exportFile( fromUTF8( filename ) ); + std::ofstream exportFile( toUTF8( filename ).c_str() ); exportFile.exceptions( std::ios_base::badbit | std::ios_base::failbit ); exportFile << writer; @@ -1123,7 +1123,7 @@ try { - std::ifstream importFile( fromUTF8( filename ) ); + std::ifstream importFile( toUTF8( filename ).c_str() ); zypp::syscontent::Reader reader( importFile ); // Modified: branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgRepoFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgRepoFilterView.cc?rev=39681&r1=39680&r2=39681&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgRepoFilterView.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgRepoFilterView.cc Wed Jul 25 17:35:20 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: branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgRepoFilterView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgRepoFilterView.h?rev=39681&r1=39680&r2=39681&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgRepoFilterView.h (original) +++ branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgRepoFilterView.h Wed Jul 25 17:35:20 2007 @@ -58,14 +58,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: branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgRepoList.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgRepoList.cc?rev=39681&r1=39680&r2=39681&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgRepoList.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgRepoList.cc Wed Jul 25 17:35:20 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 ) { - ZyppSrc 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( ZyppSrc src ) +YQPkgRepoList::addRepo( ZyppRepo repo ) { - new YQPkgRepoListItem( this, src ); + new YQPkgRepoListItem( this, repo ); } @@ -216,17 +216,17 @@ YQPkgRepoListItem::YQPkgRepoListItem( YQPkgRepoList * repoList, - ZyppSrc 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; + zypp::Url repoUrl; - if ( ! src.info().baseUrlsEmpty() ) - srcUrl = *src.info().baseUrlsBegin(); + if ( ! repo.info().baseUrlsEmpty() ) + repoUrl = *repo.info().baseUrlsBegin(); - setText( urlCol(), srcUrl.asString().c_str() ); + setText( urlCol(), repoUrl.asString().c_str() ); } } @@ -255,17 +255,17 @@ ZyppProduct -YQPkgRepoListItem::singleProduct( ZyppSrc 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: branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgRepoList.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgRepoList.h?rev=39681&r1=39680&r2=39681&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgRepoList.h (original) +++ branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgRepoList.h Wed Jul 25 17:35:20 2007 @@ -28,7 +28,7 @@ class YQPkgRepoListItem; -typedef zypp::Repository ZyppSrc; +typedef zypp::Repository ZyppRepo; /** @@ -51,9 +51,9 @@ virtual ~YQPkgRepoList(); /** - * Returns the number of enabled installation sources. + * Returns the number of enabled repositories. **/ - static int countEnabledSources(); + static int countEnabledRepositories(); public slots: @@ -73,9 +73,9 @@ void filterIfVisible(); /** - * Add an inst source to the list. + * Add a repository to the list. **/ - void addRepo( ZyppSrc src ); + void addRepo( ZyppRepo repo ); public: @@ -102,14 +102,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 ); @@ -148,7 +148,7 @@ /** * Constructor **/ - YQPkgRepoListItem( YQPkgRepoList *parentList, ZyppSrc src ); + YQPkgRepoListItem( YQPkgRepoList *parentList, ZyppRepo repo ); /** * Destructor @@ -156,9 +156,9 @@ virtual ~YQPkgRepoListItem(); /** - * Returns the ZYPP source this item corresponds to + * Returns the ZYPP repository this item corresponds to **/ - ZyppSrc zyppSrc() const { return _zyppSrc; } + ZyppRepo zyppRepo() const { return _zyppRepo; } /** * Returns the parent list @@ -169,7 +169,7 @@ * Returns the product on a source if it has one single product * or 0 if there are no or multiple products. **/ - static ZyppProduct singleProduct( ZyppSrc src ); + static ZyppProduct singleProduct( ZyppRepo repo ); // Columns @@ -182,7 +182,7 @@ // Data members YQPkgRepoList * _repoList; - ZyppSrc _zyppSrc; + ZyppRepo _zyppRepo; }; Modified: branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgSearchFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgSearchFilterView.cc?rev=39681&r1=39680&r2=39681&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgSearchFilterView.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgSearchFilterView.cc Wed Jul 25 17:35:20 2007 @@ -222,7 +222,7 @@ int count = 0; for ( ZyppPoolIterator it = zyppPkgBegin(); - it != zyppPkgEnd(); + it != zyppPkgEnd() && ! progress.wasCancelled(); ++it ) { ZyppSel selectable = *it; Modified: branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgVersionsView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgVersionsView.cc?rev=39681&r1=39680&r2=39681&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgVersionsView.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgVersionsView.cc Wed Jul 25 17:35:20 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() ) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org