Author: kmachalkova Date: Mon Apr 28 17:29:32 2008 New Revision: 47126 URL: http://svn.opensuse.org/viewcvs/yast?rev=47126&view=rev Log: up-to-date API (getting rid of deprecated funcs) Modified: trunk/ncurses-pkg/src/NCPackageSelector.cc trunk/ncurses-pkg/src/NCPkgTable.cc Modified: trunk/ncurses-pkg/src/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelector.cc?rev=47126&r1=47125&r2=47126&view=diff ============================================================================== --- trunk/ncurses-pkg/src/NCPackageSelector.cc (original) +++ trunk/ncurses-pkg/src/NCPackageSelector.cc Mon Apr 28 17:29:32 2008 @@ -1486,7 +1486,7 @@ ++it ) { if ( (*it)->candidateObj() ) - totalSize += (*it)->candidateObj()->size(); + totalSize += (*it)->candidateObj()->installsize(); } // show the download size Modified: trunk/ncurses-pkg/src/NCPkgTable.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgTable.cc?rev=47126&r1=47125&r2=47126&view=diff ============================================================================== --- trunk/ncurses-pkg/src/NCPkgTable.cc (original) +++ trunk/ncurses-pkg/src/NCPkgTable.cc Mon Apr 28 17:29:32 2008 @@ -441,7 +441,7 @@ // static bool slbHasInstalledObj (const ZyppSel & slb) { - return slb->hasInstalledObj (); + return ! slb->installedEmpty (); } /////////////////////////////////////////////////////////////////// @@ -564,7 +564,7 @@ { case T_PatchPkgs: { // if the package is installed, get the installed version - if ( slbPtr->hasInstalledObj() ) + if ( ! slbPtr->installedEmpty() ) { instVersion = slbPtr->installedObj()->edition().asString(); } @@ -587,7 +587,7 @@ status = slbPtr->status(); // the package status yuiMilestone() << "Status of " << slbPtr->name() << ": " << status << endl; - zypp::ByteCount size = pkgPtr->size(); // installed size + zypp::ByteCount size = pkgPtr->installsize(); // installed size pkgLine.push_back( size.asString( 8 ) ); // format size break; @@ -606,7 +606,7 @@ // set package status either to S_NoInst or S_KeepInstalled status = S_NoInst; - if ( slbPtr->hasInstalledObj() ) + if ( ! slbPtr->installedEmpty() ) { if ( pkgPtr->edition() == slbPtr->installedObj()->edition() && pkgPtr->arch() == slbPtr->installedObj()->arch() ) @@ -615,7 +615,7 @@ } } - zypp::ByteCount size = pkgPtr->size(); // installed size + zypp::ByteCount size = pkgPtr->installsize(); // installed size pkgLine.push_back( size.asString( 8 ) ); // format size pkgLine.push_back( pkgPtr->arch().asString()); // architecture @@ -626,7 +626,7 @@ // if the package is installed, get the installed version pkgLine.push_back( pkgPtr->summary() ); // short description - if ( slbPtr->hasInstalledObj() ) + if ( ! slbPtr->installedEmpty() ) { instVersion = slbPtr->installedObj()->edition().version(); @@ -649,7 +649,7 @@ status = slbPtr->status(); // the package status - zypp::ByteCount size = pkgPtr->size(); // installed size + zypp::ByteCount size = pkgPtr->installsize(); // installed size pkgLine.push_back( size.asString( 8 ) ); // format size // Selectable does not have source_install @@ -1055,7 +1055,7 @@ // clear the package table itemsCleared (); - yuiDebug() << "Number of available packages: " << slb->availableObjs() << endl; + yuiDebug() << "Number of available packages: " << slb->availableSize() << endl; // show all availables zypp::ui::Selectable::available_iterator @@ -1074,7 +1074,7 @@ } createListEntry( tryCastToZyppPkg (*it), slb ); } - if ( slb->hasInstalledObj() && addInstalled ) + if ( (! slb->installedEmpty()) && addInstalled ) { createListEntry( tryCastToZyppPkg (slb->installedObj()), slb ); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org