implement 'virtual dumpOn()' for QueueItem also

diff --git a/zypp/solver/detail/QueueItem.cc b/zypp/solver/detail/QueueItem.cc
index 55b37e5..117917a 100644 (file)
--- a/zypp/solver/detail/QueueItem.cc
+++ b/zypp/solver/detail/QueueItem.cc
@@ -39,8 +39,8 @@ IMPL_PTR_TYPE(QueueItem);
 
 //---------------------------------------------------------------------------
 
-ostream&
-operator<<( ostream & os, const QueueItem & item )
+std::ostream &
+QueueItem::dumpOn( std::ostream & os ) const
 {
     return os << "<queueitem/>";
 }

diff --git a/zypp/solver/detail/QueueItem.h b/zypp/solver/detail/QueueItem.h
index 1035f31..ae2b59e 100644 (file)
--- a/zypp/solver/detail/QueueItem.h
+++ b/zypp/solver/detail/QueueItem.h
@@ -86,8 +86,11 @@ class QueueItem : public base::ReferenceCounted, private base::NonCopyable {
 
     // ---------------------------------- I/O
 
-    friend std::ostream& operator<<(std::ostream&, const QueueItem & item);
-    friend std::ostream& operator<<(std::ostream&, const QueueItemList & itemlist);
+    virtual std::ostream & dumpOn( std::ostream & str ) const;
+
+    friend std::ostream& operator<<(std::ostream & str, const QueueItem & obj)
+    { return obj.dumpOn (str); }
+    friend std::ostream& operator<<(std::ostream & str, const QueueItemList & itemlist);
 
     // ---------------------------------- accessors
 

diff --git a/zypp/solver/detail/QueueItemBranch.cc b/zypp/solver/detail/QueueItemBranch.cc
index 3cb38a0..f51c7b6 100644 (file)
--- a/zypp/solver/detail/QueueItemBranch.cc
+++ b/zypp/solver/detail/QueueItemBranch.cc
@@ -42,15 +42,15 @@ IMPL_PTR_TYPE(QueueItemBranch);
 
 //---------------------------------------------------------------------------
 
-ostream&
-operator<<( ostream& os, const QueueItemBranch & item)
+std::ostream &
+QueueItemBranch::dumpOn( std::ostream & os ) const
 {
     os << "[Branch: ";
-    if (!item._label.empty()) {
-       os << item._label;
+    if (!_label.empty()) {
+       os << _label;
     }
     os << endl << "\t";
-    os << item._possible_qitems << endl << "\t";
+    os << _possible_qitems << endl << "\t";
     os << "]";
     return os;
 }

diff --git a/zypp/solver/detail/QueueItemBranch.h b/zypp/solver/detail/QueueItemBranch.h
index 0f7f44a..007f866 100644 (file)
--- a/zypp/solver/detail/QueueItemBranch.h
+++ b/zypp/solver/detail/QueueItemBranch.h
@@ -57,7 +57,11 @@ class QueueItemBranch : public QueueItem {
 
     // ---------------------------------- I/O
 
-    friend std::ostream& operator<<(std::ostream&, const QueueItemBranch & item);
+    virtual std::ostream & dumpOn( std::ostream & str ) const;
+
+    friend std::ostream& operator<<(std::ostream & str, const QueueItemBranch & obj)
+    { return obj.dumpOn (str); }
+
     // ---------------------------------- accessors
 
     QueueItemList possibleQItems (void) const { return _possible_qitems; }

diff --git a/zypp/solver/detail/QueueItemConflict.cc b/zypp/solver/detail/QueueItemConflict.cc
index e64b01f..b2f3392 100644 (file)
--- a/zypp/solver/detail/QueueItemConflict.cc
+++ b/zypp/solver/detail/QueueItemConflict.cc
@@ -60,14 +60,14 @@ IMPL_PTR_TYPE(QueueItemConflict);
 
 //---------------------------------------------------------------------------
 
-ostream&
-operator<<( ostream& os, const QueueItemConflict & item)
+std::ostream &
+QueueItemConflict::dumpOn( std::ostream & os ) const
 {
     os << "[Conflict: ";
-    os << item._capability;
+    os << _capability;
     os << ", Triggered by ";
-    os << item._conflicting_item;
-    if (item._actually_an_obsolete) os << ", Obsolete !";
+    os << _conflicting_item;
+    if (_actually_an_obsolete) os << ", Obsolete !";
     os << "]";
     return os;
 }

diff --git a/zypp/solver/detail/QueueItemConflict.h b/zypp/solver/detail/QueueItemConflict.h
index 2f1afb5..7fc944e 100644 (file)
--- a/zypp/solver/detail/QueueItemConflict.h
+++ b/zypp/solver/detail/QueueItemConflict.h
@@ -61,7 +61,10 @@ class QueueItemConflict : public QueueItem {
 
     // ---------------------------------- I/O
 
-    friend std::ostream& operator<<(std::ostream&, const QueueItemConflict & item);
+    virtual std::ostream & dumpOn( std::ostream & str ) const;
+
+    friend std::ostream& operator<<(std::ostream & str, const QueueItemConflict & obj)
+    { return obj.dumpOn (str); }
 
     // ---------------------------------- accessors
 

diff --git a/zypp/solver/detail/QueueItemEstablish.cc b/zypp/solver/detail/QueueItemEstablish.cc
index 48996ec..5cef170 100644 (file)
--- a/zypp/solver/detail/QueueItemEstablish.cc
+++ b/zypp/solver/detail/QueueItemEstablish.cc
@@ -52,12 +52,12 @@ IMPL_PTR_TYPE(QueueItemEstablish);
 
 //---------------------------------------------------------------------------
 
-ostream&
-operator<<( ostream& os, const QueueItemEstablish & item)
+std::ostream &
+QueueItemEstablish::dumpOn( std::ostream & os ) const
 {
     os <<"[Establish: ";
-    os << item._item;
-    if (item._explicitly_requested) os << ", Explicit !";
+    os << _item;
+    if (_explicitly_requested) os << ", Explicit !";
     os << "]";
     return os;
 }

diff --git a/zypp/solver/detail/QueueItemEstablish.h b/zypp/solver/detail/QueueItemEstablish.h
index 1cad2cd..24c9457 100644 (file)
--- a/zypp/solver/detail/QueueItemEstablish.h
+++ b/zypp/solver/detail/QueueItemEstablish.h
@@ -60,7 +60,10 @@ class QueueItemEstablish : public QueueItem {
 
     // ---------------------------------- I/O
 
-    friend std::ostream& operator<<(std::ostream&, const QueueItemEstablish & item);
+    virtual std::ostream & dumpOn( std::ostream & str ) const;
+
+    friend std::ostream& operator<<(std::ostream & str, const QueueItemEstablish & obj)
+    { return obj.dumpOn (str); }
 
     // ---------------------------------- accessors
 

diff --git a/zypp/solver/detail/QueueItemGroup.cc b/zypp/solver/detail/QueueItemGroup.cc
index dfa1c0b..ec4b8cd 100644 (file)
--- a/zypp/solver/detail/QueueItemGroup.cc
+++ b/zypp/solver/detail/QueueItemGroup.cc
@@ -39,11 +39,11 @@ IMPL_PTR_TYPE(QueueItemGroup);
 
 //---------------------------------------------------------------------------
 
-ostream&
-operator<<( ostream& os, const QueueItemGroup & item)
+std::ostream &
+QueueItemGroup::dumpOn( std::ostream & os ) const
 {
     os << "[Group: ";
-    os << item._subitems;
+    os << _subitems;
     os << "]";
     return os;
 }

diff --git a/zypp/solver/detail/QueueItemGroup.h b/zypp/solver/detail/QueueItemGroup.h
index 4053a43..9454aab 100644 (file)
--- a/zypp/solver/detail/QueueItemGroup.h
+++ b/zypp/solver/detail/QueueItemGroup.h
@@ -56,7 +56,10 @@ class QueueItemGroup : public QueueItem {
 
     // ---------------------------------- I/O
 
-    friend std::ostream& operator<<(std::ostream&, const QueueItemGroup & item);
+    virtual std::ostream & dumpOn( std::ostream & str ) const;
+
+    friend std::ostream& operator<<(std::ostream & str, const QueueItemGroup & obj)
+    { return obj.dumpOn (str); }
 
     // ---------------------------------- accessors
 

diff --git a/zypp/solver/detail/QueueItemInstall.cc b/zypp/solver/detail/QueueItemInstall.cc
index aca6cbd..f2e9328 100644 (file)
--- a/zypp/solver/detail/QueueItemInstall.cc
+++ b/zypp/solver/detail/QueueItemInstall.cc
@@ -58,33 +58,33 @@ IMPL_PTR_TYPE(QueueItemInstall);
 
 //---------------------------------------------------------------------------
 
-ostream&
-operator<<( ostream& os, const QueueItemInstall & item)
+std::ostream &
+QueueItemInstall::dumpOn( std::ostream & os ) const
 {
     os << "[Install: ";
-    os << item._item;
-    if (item._upgrades) {
+    os << _item;
+    if (_upgrades) {
        os << ", Upgrades ";
-       os << item._upgrades;
+       os << _upgrades;
     }
-    if (!item._deps_satisfied_by_this_install.empty()) {
+    if (!_deps_satisfied_by_this_install.empty()) {
        os << ", Satisfies [";
-       for (CapSet::const_iterator iter = item._deps_satisfied_by_this_install.begin();
-           iter != item._deps_satisfied_by_this_install.end(); iter++)
+       for (CapSet::const_iterator iter = _deps_satisfied_by_this_install.begin();
+           iter != _deps_satisfied_by_this_install.end(); iter++)
        {
-           if (iter != item._deps_satisfied_by_this_install.begin()) os << ", ";
+           if (iter != _deps_satisfied_by_this_install.begin()) os << ", ";
            os << (*iter);
        }
        os << "]";
     }
-    if (!item._needed_by.empty()) {
+    if (!_needed_by.empty()) {
        os << ", Needed by ";
-       for (PoolItemList::const_iterator it = item._needed_by.begin(); it != item._needed_by.end(); ++it) {
-           if (it != item._needed_by.begin()) os << ", ";
+       for (PoolItemList::const_iterator it = _needed_by.begin(); it != _needed_by.end(); ++it) {
+           if (it != _needed_by.begin()) os << ", ";
            os << *it;
        }
     }
-    if (item._explicitly_requested) os << ", Explicit !";
+    if (_explicitly_requested) os << ", Explicit !";
     os << "]";
     return os;
 }

diff --git a/zypp/solver/detail/QueueItemInstall.h b/zypp/solver/detail/QueueItemInstall.h
index 5c28e2a..4403b76 100644 (file)
--- a/zypp/solver/detail/QueueItemInstall.h
+++ b/zypp/solver/detail/QueueItemInstall.h
@@ -64,7 +64,10 @@ class QueueItemInstall : public QueueItem {
 
     // ---------------------------------- I/O
 
-    friend std::ostream& operator<<(std::ostream&, const QueueItemInstall & item);
+    virtual std::ostream & dumpOn( std::ostream & str ) const;
+
+    friend std::ostream& operator<<(std::ostream & str, const QueueItemInstall & obj)
+    { return obj.dumpOn (str); }
 
     // ---------------------------------- accessors
 

diff --git a/zypp/solver/detail/QueueItemRequire.cc b/zypp/solver/detail/QueueItemRequire.cc
index 38f3dd1..a8ac7e9 100644 (file)
--- a/zypp/solver/detail/QueueItemRequire.cc
+++ b/zypp/solver/detail/QueueItemRequire.cc
@@ -57,22 +57,22 @@ IMPL_PTR_TYPE(QueueItemRequire);
 
 //---------------------------------------------------------------------------
 
-ostream&
-operator<<( ostream& os, const QueueItemRequire & item)
+std::ostream &
+QueueItemRequire::dumpOn( std::ostream & os ) const
 {
     os << "[Require: ";
-    os << item._capability;
-    if (item._requiring_item) {
-       os << ", Required by " << item._requiring_item;
+    os << _capability;
+    if (_requiring_item) {
+       os << ", Required by " << _requiring_item;
     }
-    if (item._upgraded_item) {
-       os << ", Upgrades " << item._upgraded_item;
+    if (_upgraded_item) {
+       os << ", Upgrades " << _upgraded_item;
     }
-    if (item._lost_item) {
-       os << ", Lost " << item._lost_item;
+    if (_lost_item) {
+       os << ", Lost " << _lost_item;
     }
-    if (item._remove_only) os << ", Remove Only";
-    if (item._is_child) os << ", Child";
+    if (_remove_only) os << ", Remove Only";
+    if (_is_child) os << ", Child";
     return os << "]";
 }
 

diff --git a/zypp/solver/detail/QueueItemRequire.h b/zypp/solver/detail/QueueItemRequire.h
index 2027b80..6bad43c 100644 (file)
--- a/zypp/solver/detail/QueueItemRequire.h
+++ b/zypp/solver/detail/QueueItemRequire.h
@@ -70,7 +70,10 @@ class QueueItemRequire : public QueueItem {
 
     // ---------------------------------- I/O
 
-    friend std::ostream & operator<<(std::ostream &os, const QueueItemRequire & item);
+    virtual std::ostream & dumpOn( std::ostream & str ) const;
+
+    friend std::ostream & operator<<(std::ostream & str, const QueueItemRequire & obj)
+    { return obj.dumpOn (str); }
 
     // ---------------------------------- accessors
 

diff --git a/zypp/solver/detail/QueueItemUninstall.cc b/zypp/solver/detail/QueueItemUninstall.cc
index fac2c6b..22f3b56 100644 (file)
--- a/zypp/solver/detail/QueueItemUninstall.cc
+++ b/zypp/solver/detail/QueueItemUninstall.cc
@@ -53,14 +53,14 @@ IMPL_PTR_TYPE(QueueItemUninstall);
 
 //---------------------------------------------------------------------------
 
-ostream&
-operator<<( ostream& os, const QueueItemUninstall & item)
+std::ostream &
+QueueItemUninstall::dumpOn( std::ostream & os ) const
 {
     os << "[Uninstall: ";
 
-    os << item._item;
+    os << _item;
     os << " (";
-    switch (item._reason) {
+    switch (_reason) {
        case QueueItemUninstall::CONFLICT:      os << "conflicts"; break;
        case QueueItemUninstall::OBSOLETE:      os << "obsoletes"; break;
        case QueueItemUninstall::UNSATISFIED:   os << "unsatisfied dependency"; break;
@@ -70,19 +70,19 @@ operator<<( ostream& os, const QueueItemUninstall & item)
        case QueueItemUninstall::EXPLICIT:      os << "explicit"; break;
     }
     os << ")";
-    if (item._cap_leading_to_uninstall != Capability::noCap) {
+    if (_cap_leading_to_uninstall != Capability::noCap) {
        os << ", Triggered By ";
-       os << item._cap_leading_to_uninstall;
+       os << _cap_leading_to_uninstall;
     }
-    if (item._upgraded_to) {
+    if (_upgraded_to) {
        os << ", Upgraded To ";
-       os << item._upgraded_to;
+       os << _upgraded_to;
     }
-    if (item._explicitly_requested) os << ", Explicit";
-    if (item._remove_only) os << ", Remove Only";
-    if (item._due_to_conflict) os << ", Due To Conflict";
-    if (item._due_to_obsolete) os << ", Due To Obsolete";
-    if (item._unlink) os << ", Unlink";
+    if (_explicitly_requested) os << ", Explicit";
+    if (_remove_only) os << ", Remove Only";
+    if (_due_to_conflict) os << ", Due To Conflict";
+    if (_due_to_obsolete) os << ", Due To Obsolete";
+    if (_unlink) os << ", Unlink";
     os << "]";
     return os;
 }

diff --git a/zypp/solver/detail/QueueItemUninstall.h b/zypp/solver/detail/QueueItemUninstall.h
index e9d1040..80662f4 100644 (file)
--- a/zypp/solver/detail/QueueItemUninstall.h
+++ b/zypp/solver/detail/QueueItemUninstall.h
@@ -76,7 +76,10 @@ class QueueItemUninstall : public QueueItem {
 
     // ---------------------------------- I/O
 
-    friend std::ostream& operator<<(std::ostream&, const QueueItemUninstall & item);
+    virtual std::ostream & dumpOn( std::ostream & str ) const;
+
+    friend std::ostream& operator<<(std::ostream& str, const QueueItemUninstall & obj)
+    { return obj.dumpOn (str); }
 
     // ---------------------------------- accessors