Author: dmacvicar
Date: Tue Apr 8 17:41:44 2008
New Revision: 46253
URL: http://svn.opensuse.org/viewcvs/yast?rev=46253&view=rev
Log:
update with libzypp changes
Modified:
trunk/qt-pkg/src/YQPackageSelector.cc
trunk/qt-pkg/src/YQPkgList.cc
trunk/qt-pkg/src/YQPkgObjList.cc
trunk/qt-pkg/src/YQPkgPatchList.cc
trunk/qt-pkg/src/YQPkgPatternList.cc
trunk/qt-pkg/src/YQPkgRepoFilterView.cc
trunk/qt-pkg/src/YQPkgVersionsView.cc
Modified: trunk/qt-pkg/src/YQPackageSelector.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPackageSelector.cc?rev=46253&r1=46252&r2=46253&view=diff
==============================================================================
--- trunk/qt-pkg/src/YQPackageSelector.cc (original)
+++ trunk/qt-pkg/src/YQPackageSelector.cc Tue Apr 8 17:41:44 2008
@@ -1301,7 +1301,7 @@
}
if ( oldStatus != newStatus )
- selectable->set_status( newStatus );
+ selectable->setStatus( newStatus );
}
@@ -1439,7 +1439,7 @@
if ( ! subPkg->installedObj() )
{
- subPkg->set_status( S_Install );
+ subPkg->setStatus( S_Install );
yuiMilestone() << "Installing subpackage " << subPkgName << endl;
}
break;
@@ -1452,12 +1452,12 @@
if ( ! subPkg->installedObj() )
{
- subPkg->set_status( S_Install );
+ subPkg->setStatus( S_Install );
yuiMilestone() << "Installing subpackage " << subPkgName << endl;
}
else
{
- subPkg->set_status( S_Update );
+ subPkg->setStatus( S_Update );
yuiMilestone() << "Updating subpackage " << subPkgName << endl;
}
break;
Modified: trunk/qt-pkg/src/YQPkgList.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgList.cc?rev=46253&r1=46252&r2=46253&view=diff
==============================================================================
--- trunk/qt-pkg/src/YQPkgList.cc (original)
+++ trunk/qt-pkg/src/YQPkgList.cc Tue Apr 8 17:41:44 2008
@@ -502,7 +502,7 @@
case S_Del:
case S_AutoDel:
case S_Protected:
- doChange = selectable->hasInstalledObj();
+ doChange = !selectable->installedEmpty();
break;
case S_Update:
@@ -510,7 +510,7 @@
if ( force )
{
- doChange = selectable->hasInstalledObj();
+ doChange = !selectable->installedEmpty();
}
else // don't force - update only if useful (if candidate is newer)
{
@@ -528,14 +528,14 @@
case S_AutoInstall:
case S_NoInst:
case S_Taboo:
- doChange = ! selectable->hasInstalledObj();
+ doChange = selectable->installedEmpty();
break;
}
if ( doChange )
{
if ( ! countOnly )
- selectable->set_status( newStatus );
+ selectable->setStatus( newStatus );
changedCount++;
// yuiMilestone() << "Updating " << selectable->name() << endl;
@@ -705,7 +705,7 @@
QString installed;
QString candidate;
- if ( selectable()->hasInstalledObj() )
+ if ( !selectable()->installedEmpty() )
{
installed = selectable()->installedObj()->edition().asString().c_str();
installed += "-";
@@ -720,7 +720,7 @@
candidate += selectable()->candidateObj()->arch().asString().c_str();
}
- if ( selectable()->hasInstalledObj() )
+ if ( !selectable()->installedEmpty() )
{
text += installed + "\n";
Modified: trunk/qt-pkg/src/YQPkgObjList.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgObjList.cc?rev=46253&r1=46252&r2=46253&view=diff
==============================================================================
--- trunk/qt-pkg/src/YQPkgObjList.cc (original)
+++ trunk/qt-pkg/src/YQPkgObjList.cc Tue Apr 8 17:41:44 2008
@@ -920,12 +920,12 @@
const ZyppObj candidate = selectable()->candidateObj();
const ZyppObj installed = selectable()->installedObj();
- if ( candidate && installed )
+ if ( candidate && (! selectable()->installedEmpty() ) )
{
- if ( candidate->edition() < installed->edition() )
- _installedIsNewer = true;
- else if ( installed->edition() < candidate->edition() )
- _candidateIsNewer = true;
+ if ( candidate->edition() < installed->edition() )
+ _installedIsNewer = true;
+ else if ( installed->edition() < candidate->edition() )
+ _candidateIsNewer = true;
}
if ( nameCol() >= 0 ) setText( nameCol(), zyppObj()->name() );
@@ -933,33 +933,32 @@
if ( sizeCol() >= 0 )
{
- zypp::ByteCount size = zyppObj()->size();
+ zypp::ByteCount size = zyppObj()->size();
- if ( size > 0L )
- setText( sizeCol(), size.asString() );
+ if ( size > 0L )
+ setText( sizeCol(), size.asString() );
}
if ( instVersionCol() >= 0 )
{
- if ( selectable()->hasInstalledObj() )
- setText( instVersionCol(), installed->edition() );
+ if ( !selectable()->installedEmpty() )
+ setText( instVersionCol(), installed->edition() );
- if ( zyppObj() != selectable()->installedObj() &&
- zyppObj() != selectable()->candidateObj() )
- {
- setText( versionCol(), zyppObj()->edition() );
- }
- else if ( selectable()->hasCandidateObj() )
- {
- setText( versionCol(), candidate->edition() );
- }
+ if ( zyppObj() != selectable()->installedObj() &&
+ zyppObj() != selectable()->candidateObj() )
+ {
+ setText( versionCol(), zyppObj()->edition() );
+ }
+ else if ( selectable()->hasCandidateObj() )
+ {
+ setText( versionCol(), candidate->edition() );
+ }
}
else
{
- setText( versionCol(), zyppObj()->edition() );
+ setText( versionCol(), zyppObj()->edition() );
}
-
setStatusIcon();
}
@@ -1012,7 +1011,7 @@
YQPkgObjListItem::setStatus( ZyppStatus newStatus, bool sendSignals )
{
ZyppStatus oldStatus = selectable()->status();
- selectable()->set_status( newStatus );
+ selectable()->setStatus( newStatus );
if ( oldStatus != selectable()->status() )
{
@@ -1107,7 +1106,7 @@
if ( _selectable->hasInstalledObj() )
return false;
- return _selectable->candidatePoolItem().isSatisfied();
+ return _selectable->candidateObj().isSatisfied();
}
@@ -1312,7 +1311,7 @@
<< " - setting to TABOO"
<< endl;
- sel->set_status( S_Taboo );
+ sel->setStatus( S_Taboo );
break;
@@ -1323,7 +1322,7 @@
<< " - setting to PROTECTED"
<< endl;
- sel->set_status( S_Protected );
+ sel->setStatus( S_Protected );
// S_Keep wouldn't be good enough: The next solver run might
// set it to S_AutoUpdate again
break;
Modified: trunk/qt-pkg/src/YQPkgPatchList.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgPatchList.cc?rev=46253&r1=46252&r2=46253&view=diff
==============================================================================
--- trunk/qt-pkg/src/YQPkgPatchList.cc (original)
+++ trunk/qt-pkg/src/YQPkgPatchList.cc Tue Apr 8 17:41:44 2008
@@ -148,7 +148,7 @@
else // not installed
{
if ( selectable->hasCandidateObj() &&
- selectable->candidatePoolItem().isSatisfied() )
+ selectable->candidateObj().isSatisfied() )
{
// This is a pretty exotic case, but still it might happen:
//
@@ -173,8 +173,8 @@
// installed, but either no version of that patch is installed or there is a
// newer one to which the patch could be updated.
- if ( selectable->candidatePoolItem().status().isUninstalled()
- && selectable->candidatePoolItem().isBroken() ) // patch really needed?
+ if ( selectable->candidateObj().status().isUninstalled()
+ && selectable->candidateObj().isBroken() ) // patch really needed?
{
// Patches are needed if any of the packages that belong to the patch
// are installed on the system.
@@ -201,7 +201,7 @@
}
else // not installed - display only if needed
{
- if ( selectable->candidatePoolItem().isBroken() )
+ if ( selectable->candidateObj().isBroken() )
{
displayPatch = true;
}
@@ -548,10 +548,8 @@
{
YQPkgObjListItem::cycleStatus();
-#if ! ENABLE_DELETING_PATCHES
if ( status() == S_Del ) // Can't delete patches
- setStatus( S_KeepInstalled );
-#endif
+ setStatus( S_KeepInstalled );
}
Modified: trunk/qt-pkg/src/YQPkgPatternList.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgPatternList.cc?rev=46253&r1=46252&r2=46253&view=diff
==============================================================================
--- trunk/qt-pkg/src/YQPkgPatternList.cc (original)
+++ trunk/qt-pkg/src/YQPkgPatternList.cc Tue Apr 8 17:41:44 2008
@@ -53,7 +53,8 @@
painter->save();
QColor background = option.palette.color(QPalette::Window);
painter->setBackground( background );
- //painter->setFont( YQApplication::ui()->headingFont() );
+ painter->setFont( YQUI::yqApp()->headingFont() );
+
YQPkgPatternListItem *item = dynamic_cast