"PoolItem *" -> "PoolItem"

diff --git a/zypp/solver/detail/InstallOrder.h b/zypp/solver/detail/InstallOrder.h
index 54fc6886bd9d7b16012754e118232040f64e78c0..111b5aea9a1cf316b121fdfcccb2d42d7da86c24 100644 (file)
--- a/zypp/solver/detail/InstallOrder.h
+++ b/zypp/solver/detail/InstallOrder.h
@@ -63,7 +63,7 @@ class InstallOrder
        CPoolItemSet _installed;
 
        /** adjacency list type */
-       typedef std::map<const PoolItem *, CPoolItemSet> Graph;
+       typedef std::map<const PoolItem , CPoolItemSet> Graph;
 
        /** adjacency list, package -> requirements */
        Graph _graph;
@@ -78,13 +78,13 @@ class InstallOrder
            bool visited;
            int order; // number of incoming edges in reverse graph
 
-           const PoolItem *item;
+           const PoolItem item;
 
            NodeInfo() : begintime(0), endtime(0), visited(false), order(0) {}
-           NodeInfo(const PoolItem *item) : begintime(0), endtime(0), visited(false), order(0), item(item) {}
+           NodeInfo(const PoolItem item) : begintime(0), endtime(0), visited(false), order(0), item(item) {}
        };
        
-       typedef std::map<const PoolItem *,NodeInfo> Nodes;
+       typedef std::map<const PoolItem ,NodeInfo> Nodes;
 
        Nodes _nodes;
 
@@ -97,7 +97,7 @@ class InstallOrder
        unsigned _numrun;
 
     private:
-       void rdfsvisit (const PoolItem *item);
+       void rdfsvisit (const PoolItem item);
 
     public:
 
@@ -119,7 +119,7 @@ class InstallOrder
         * set a Solvable as installed, computeNextSet is able to compute a new
         * set then
         * */
-       void setInstalled( const PoolItem *item );
+       void setInstalled( const PoolItem item );
        
        /**
         * like above, for convenience

diff --git a/zypp/solver/detail/ProblemSolutionIgnore.h b/zypp/solver/detail/ProblemSolutionIgnore.h
index 2516cd734ffba37dd3b51a485e74cdcb29664522..0b5294458ba6b780f8532e02f3a26afabb8c4fab 100644 (file)
--- a/zypp/solver/detail/ProblemSolutionIgnore.h
+++ b/zypp/solver/detail/ProblemSolutionIgnore.h
@@ -52,7 +52,7 @@ namespace zypp
             **/
            ProblemSolutionIgnore( ResolverProblem_Ptr parent,
                                   const Dep &dep,
-                                  PoolItem *item,
+                                  PoolItem item,
                                   const Capability & capability);
        };
 

diff --git a/zypp/solver/detail/ProblemSolutionInstall.h b/zypp/solver/detail/ProblemSolutionInstall.h
index 2e64c2fd9831171d12a3240d20af39701a972b53..ba99685d561dff4bfd10d68b07ccddb47dc72204 100644 (file)
--- a/zypp/solver/detail/ProblemSolutionInstall.h
+++ b/zypp/solver/detail/ProblemSolutionInstall.h
@@ -49,7 +49,7 @@ namespace zypp
            /**
             * Constructor.
             **/
-           ProblemSolutionInstall( ResolverProblem_Ptr parent, PoolItem *item);
+           ProblemSolutionInstall( ResolverProblem_Ptr parent, PoolItem item);
            ProblemSolutionInstall( ResolverProblem_Ptr parent, PoolItemList & itemlist );          
        };
 

diff --git a/zypp/solver/detail/ProblemSolutionUninstall.h b/zypp/solver/detail/ProblemSolutionUninstall.h
index 0adfd7e2eac28b966de0814c76b2bb6af17c692b..d54ee0a1a06e3b11e84158f3d9e816f3661f1f8b 100644 (file)
--- a/zypp/solver/detail/ProblemSolutionUninstall.h
+++ b/zypp/solver/detail/ProblemSolutionUninstall.h
@@ -49,7 +49,7 @@ namespace zypp
            /**
             * Constructor.
             **/
-           ProblemSolutionUninstall( ResolverProblem_Ptr parent, PoolItem *item);
+           ProblemSolutionUninstall( ResolverProblem_Ptr parent, PoolItem item);
            ProblemSolutionUninstall( ResolverProblem_Ptr parent, PoolItemList & itemlist);         
        };
 

diff --git a/zypp/solver/detail/QueueItemConflict.h b/zypp/solver/detail/QueueItemConflict.h
index cd323e0b7c3d4bc3076523d83036f3af0fcf9e37..277a5b675230e24aa423994a3a55c58537dee30a 100644 (file)
--- a/zypp/solver/detail/QueueItemConflict.h
+++ b/zypp/solver/detail/QueueItemConflict.h
@@ -50,13 +50,13 @@ class QueueItemConflict : public QueueItem {
 
   private:
     const Capability & _capability;            // the conflicting capability
-    PoolItem *_conflicting_item;               // the item which issued the conflict
+    PoolItem _conflicting_item;                // the item which issued the conflict
 
     bool _actually_an_obsolete;
 
   public:
 
-    QueueItemConflict (const ResPool *pool, const Capability & capability, PoolItem *item);
+    QueueItemConflict (const ResPool *pool, const Capability & capability, PoolItem item);
     virtual ~QueueItemConflict();
 
     // ---------------------------------- I/O

diff --git a/zypp/solver/detail/QueueItemEstablish.h b/zypp/solver/detail/QueueItemEstablish.h
index b2d278d665af1e91e210ce2803cecf2a23cf81b0..0ff617c7eccaf3a9fab4239dcd3ce5aca9dd6ddb 100644 (file)
--- a/zypp/solver/detail/QueueItemEstablish.h
+++ b/zypp/solver/detail/QueueItemEstablish.h
@@ -47,7 +47,7 @@ namespace zypp
 class QueueItemEstablish : public QueueItem {
 
   private:
-    PoolItem *_item;
+    PoolItem _item;
     int _channel_priority;
     int _other_penalty;
 
@@ -55,7 +55,7 @@ class QueueItemEstablish : public QueueItem {
 
   public:
 
-    QueueItemEstablish (const ResPool *pool, PoolItem *item);
+    QueueItemEstablish (const ResPool *pool, PoolItem item);
     virtual ~QueueItemEstablish();
 
     // ---------------------------------- I/O
@@ -64,7 +64,7 @@ class QueueItemEstablish : public QueueItem {
 
     // ---------------------------------- accessors
 
-    PoolItem *item (void) const { return _item; }
+    PoolItem item (void) const { return _item; }
 
     int channelPriority (void) const { return _channel_priority; }
     void setChannelPriority (int channel_priority) { _channel_priority = channel_priority; }

diff --git a/zypp/solver/detail/QueueItemInstall.h b/zypp/solver/detail/QueueItemInstall.h
index d03cf895b47d1639bf48695ddcb01870072a9703..94aa2714dd9e1183771e7c267b3a612ce2ab0247 100644 (file)
--- a/zypp/solver/detail/QueueItemInstall.h
+++ b/zypp/solver/detail/QueueItemInstall.h
@@ -48,8 +48,8 @@ class QueueItemInstall : public QueueItem {
 
 
   private:
-    PoolItem *_item;                                   // the item to-be-installed
-    PoolItem *_upgrades;                               // the item this install upgrades (if any)
+    PoolItem _item;                                    // the item to-be-installed
+    PoolItem _upgrades;                                // the item this install upgrades (if any)
     CapSet _deps_satisfied_by_this_install;
     CPoolItemList _needed_by;
     int _channel_priority;
@@ -59,7 +59,7 @@ class QueueItemInstall : public QueueItem {
 
   public:
 
-    QueueItemInstall (const ResPool *pool, PoolItem *item);
+    QueueItemInstall (const ResPool *pool, PoolItem item);
     virtual ~QueueItemInstall();
 
     // ---------------------------------- I/O
@@ -68,10 +68,10 @@ class QueueItemInstall : public QueueItem {
 
     // ---------------------------------- accessors
 
-    PoolItem *item(void) const { return _item; }
+    PoolItem item(void) const { return _item; }
 
-    PoolItem *upgrades (void) const { return _upgrades; }
-    void setUpgrades (PoolItem *upgrades) { _upgrades = upgrades; }
+    PoolItem upgrades (void) const { return _upgrades; }
+    void setUpgrades (PoolItem upgrades) { _upgrades = upgrades; }
 
     int channelPriority (void) const { return _channel_priority; }
     void setChannelPriority (int channel_priority) { _channel_priority = channel_priority; }
@@ -91,7 +91,7 @@ class QueueItemInstall : public QueueItem {
     virtual bool isSatisfied (ResolverContext_Ptr context) const;
 
     void addDependency (const Capability & capability);
-    void addNeededBy (const PoolItem *item);
+    void addNeededBy (const PoolItem item);
 
 };
 

diff --git a/zypp/solver/detail/QueueItemRequire.h b/zypp/solver/detail/QueueItemRequire.h
index f66b3ec6c5c5983557213fc66f91e7d2255e05fe..dc1c156a59422e039dc49ee21006d5ad720917ed 100644 (file)
--- a/zypp/solver/detail/QueueItemRequire.h
+++ b/zypp/solver/detail/QueueItemRequire.h
@@ -55,10 +55,10 @@ class QueueItemRequire : public QueueItem {
   private:
     const Capability _capability;              // the required capability
 
-    PoolItem *_requiring_item;                 // who's requiring it
+    PoolItem _requiring_item;                  // who's requiring it
 
-    PoolItem *_upgraded_item;
-    PoolItem *_lost_item;
+    PoolItem _upgraded_item;
+    PoolItem _lost_item;
 
     bool _remove_only;
     bool _is_child;
@@ -77,8 +77,8 @@ class QueueItemRequire : public QueueItem {
     const Capability & capability (void) const { return _capability; }
 
     void setRemoveOnly (void) { _remove_only = true; }
-    void setUpgradedPoolItem (PoolItem *upgraded_item) { _upgraded_item = upgraded_item; }
-    void setLostPoolItem (PoolItem *lost_item) { _lost_item = lost_item; }
+    void setUpgradedPoolItem (PoolItem upgraded_item) { _upgraded_item = upgraded_item; }
+    void setLostPoolItem (PoolItem lost_item) { _lost_item = lost_item; }
 
     // ---------------------------------- methods
 
@@ -88,7 +88,7 @@ class QueueItemRequire : public QueueItem {
     virtual bool isRedundant (ResolverContext_Ptr context) const { return false; }
     virtual bool isSatisfied (ResolverContext_Ptr context) const { return false; }
 
-    void addPoolItem (PoolItem * item);
+    void addPoolItem (PoolItem item);
 
 
 };

diff --git a/zypp/solver/detail/QueueItemUninstall.h b/zypp/solver/detail/QueueItemUninstall.h
index e75753657fbf8fc94c7901e44ccb2b4c857da7fc..b2062eac95ba54358e2beb97bcf9918b4c542466 100644 (file)
--- a/zypp/solver/detail/QueueItemUninstall.h
+++ b/zypp/solver/detail/QueueItemUninstall.h
@@ -60,10 +60,10 @@ class QueueItemUninstall : public QueueItem {
 
 
        private:
-         PoolItem *_item;                      // the item to-be-uninstalled
+         PoolItem _item;                       // the item to-be-uninstalled
          UninstallReason _reason;
          Capability _cap_leading_to_uninstall;
-         PoolItem *_upgraded_to;               // if the uninstall is actually an upgrade
+         PoolItem _upgraded_to;                // if the uninstall is actually an upgrade
 
          bool _explicitly_requested;
          bool _remove_only;
@@ -73,7 +73,7 @@ class QueueItemUninstall : public QueueItem {
 
        public:
 
-         QueueItemUninstall (const ResPool *pool, PoolItem *item, UninstallReason reason);
+         QueueItemUninstall (const ResPool *pool, PoolItem item, UninstallReason reason);
          virtual ~QueueItemUninstall();
 
          // ---------------------------------- I/O
@@ -86,7 +86,7 @@ class QueueItemUninstall : public QueueItem {
          void setDependency (const Capability & cap)   { _cap_leading_to_uninstall = cap; }
          void setExplicitlyRequested (void)            { _explicitly_requested = true; }
          void setRemoveOnly (void)                     { _remove_only = true; }
-         void setUpgradedTo (PoolItem *item)           { _upgraded_to = item; }
+         void setUpgradedTo (PoolItem item)            { _upgraded_to = item; }
          void setDueToConflict (void)                  { _due_to_conflict = true; }
          void setDueToObsolete (void)                  { _due_to_obsolete = true; }
          void setUnlink (void);

diff --git a/zypp/solver/detail/Resolver.h b/zypp/solver/detail/Resolver.h
index 8a841df3a79e71651e424dae12a4aaff5662ae44..18f6bd34234a4aebd855ae2521a87c4b1444e68a 100644 (file)
--- a/zypp/solver/detail/Resolver.h
+++ b/zypp/solver/detail/Resolver.h
@@ -111,16 +111,16 @@ class Resolver : public base::ReferenceCounted, private base::NonCopyable {
 //    void setCurrentChannel (Channel_constPtr channel) { _current_channel = channel; }
 //    void addSubscribedChannel (Channel_constPtr channel);
 
-    void addPoolItemToInstall (PoolItem *item);
+    void addPoolItemToInstall (PoolItem item);
     void addPoolItemsToInstallFromList (CPoolItemList & rl);
 
-    void addPoolItemToRemove (PoolItem *item);
+    void addPoolItemToRemove (PoolItem item);
     void addPoolItemsToRemoveFromList (CPoolItemList & rl);
 
-    void addPoolItemToEstablish (PoolItem *item);
+    void addPoolItemToEstablish (PoolItem item);
     void addPoolItemsToEstablishFromList (CPoolItemList & rl);
 
-    void addPoolItemToVerify (PoolItem *item);
+    void addPoolItemToVerify (PoolItem item);
 
     void addExtraCapability (const Capability & capability);
     void addExtraConflict (const Capability & capability);

diff --git a/zypp/solver/detail/ResolverContext.h b/zypp/solver/detail/ResolverContext.h
index b0b686deb1df6862751050fc9b37042b9d8d0c91..19f8e02e63ad923de20ff0ce0d2d912df3124f16 100644 (file)
--- a/zypp/solver/detail/ResolverContext.h
+++ b/zypp/solver/detail/ResolverContext.h
@@ -43,8 +43,8 @@ namespace zypp
     { ///////////////////////////////////////////////////////////////////
 
 typedef void (*ResolverContextFn) (ResolverContext_Ptr ctx, void *data);
-typedef void (*MarkedPoolItemFn) (PoolItem *item, void *data);
-typedef void (*MarkedPoolItemPairFn) (PoolItem *item1, PoolItem *item2, void *data);
+typedef void (*MarkedPoolItemFn) (PoolItem item, void *data);
+typedef void (*MarkedPoolItemPairFn) (PoolItem item1, PoolItem item2, void *data);
 
 
 ///////////////////////////////////////////////////////////////////
@@ -57,7 +57,7 @@ class ResolverContext : public base::ReferenceCounted, private base::NonCopyable
 
     ResolverContext_Ptr _parent;               // branches share a common parent
 
-    typedef std::set<PoolItem *> Context;
+    typedef std::set<PoolItem > Context;
     Context _context;                          // the set of items touched in this transaction
 
     ResolverInfoList _log;                     // report log
@@ -104,42 +104,42 @@ class ResolverContext : public base::ReferenceCounted, private base::NonCopyable
      *set the state of \c item to \c status
      *If \c status is not the current state of \c item, make \c item
      *part of the current transaction (the context) */
-    void setStatus (PoolItem *item, ResStatus & status);
+    void setStatus (PoolItem item, ResStatus & status);
 
     /**
      *set \c item to \a to-be-installed */
-    bool install (PoolItem *item, bool is_soft, int other_penalty);
+    bool install (PoolItem item, bool is_soft, int other_penalty);
 
     /**
      *set \c item to \a satisfied */
-    bool satisfy (PoolItem *item, int other_penalty);
+    bool satisfy (PoolItem item, int other_penalty);
 
     /**
      *set \c item to \a unneeded */
-    bool unneeded (PoolItem *item, int other_penalty);
+    bool unneeded (PoolItem item, int other_penalty);
 
     /**
      *set \c item to \a incomplete */
-    bool incomplete (PoolItem *item, int other_penalty);
+    bool incomplete (PoolItem item, int other_penalty);
 
     /**
      *upgrade \c from to \c to
      *marks \c from as \a to-be-uninstalled and \c to as \a to-be-installed  */
-    bool upgrade (PoolItem *to, PoolItem *from, bool is_soft, int other_penalty);
+    bool upgrade (PoolItem to, PoolItem from, bool is_soft, int other_penalty);
 
     /**
      *set \c item to \a to-be-uninstalled */
-    bool uninstall (PoolItem *item, bool part_of_upgrade, bool due_to_obsolete, bool due_to_unlink);
+    bool uninstall (PoolItem item, bool part_of_upgrade, bool due_to_obsolete, bool due_to_unlink);
 
     // rough installed/uninstalled test for 'after transaction'
 
     /**
      *\return \c true if \c item is \a installed or \a to-be-installed */
-    bool isPresent (PoolItem *item);
+    bool isPresent (PoolItem item);
 
     /**
      *\return \c true if \c item is \a uninstalled or \a to-be-uninstalled */
-    bool isAbsent (PoolItem *item);
+    bool isAbsent (PoolItem item);
 
     bool requirementIsMet (const Capability & cap, bool is_child = false);
     bool requirementIsPossible (const Capability & cap);
@@ -176,7 +176,7 @@ class ResolverContext : public base::ReferenceCounted, private base::NonCopyable
     void addError (ResolverInfo_Ptr info);                                     // error progress info
 
     // iterate over report log
-    void foreachInfo (PoolItem *item, int priority, ResolverInfoFn fn, void *data);
+    void foreachInfo (PoolItem item, int priority, ResolverInfoFn fn, void *data);
     ResolverInfoList getInfo (void);
 
     // Context compare to identify equal branches

diff --git a/zypp/solver/detail/ResolverInfo.h b/zypp/solver/detail/ResolverInfo.h
index fe0bf04ab1418fb70a34b98419a37f7071253b47..fbc57f85822349f820c78402ae6b61bbc3600535 100644 (file)
--- a/zypp/solver/detail/ResolverInfo.h
+++ b/zypp/solver/detail/ResolverInfo.h
@@ -92,7 +92,7 @@ class ResolverInfo : public base::ReferenceCounted, private base::NonCopyable {
 
     ResolverInfoType _type;
 
-    PoolItem *_affected;
+    PoolItem _affected;
 
     int _priority;
 
@@ -101,7 +101,7 @@ class ResolverInfo : public base::ReferenceCounted, private base::NonCopyable {
 
   protected:
 
-    ResolverInfo (ResolverInfoType type, PoolItem *affected, int priority);
+    ResolverInfo (ResolverInfoType type, PoolItem affected, int priority);
 
   public:
 
@@ -116,7 +116,7 @@ class ResolverInfo : public base::ReferenceCounted, private base::NonCopyable {
     // ---------------------------------- accessors
 
     ResolverInfoType type (void) const { return _type; }
-    PoolItem *affected (void) const { return _affected; }
+    PoolItem affected (void) const { return _affected; }
     int priority (void) const { return _priority; }
 
     int error (void) const { return _error; }

diff --git a/zypp/solver/detail/ResolverInfoChildOf.h b/zypp/solver/detail/ResolverInfoChildOf.h
index eb019f9e43e3f340a8f8170cc80838cf217b8046..4757a5798c896ac0726f9b7076e801434c42d004 100644 (file)
--- a/zypp/solver/detail/ResolverInfoChildOf.h
+++ b/zypp/solver/detail/ResolverInfoChildOf.h
@@ -45,7 +45,7 @@ class ResolverInfoChildOf : public ResolverInfoContainer {
 
   public:
 
-    ResolverInfoChildOf (PoolItem *item, PoolItem *dependency);
+    ResolverInfoChildOf (PoolItem item, PoolItem dependency);
     virtual ~ResolverInfoChildOf();
 
     // ---------------------------------- I/O

diff --git a/zypp/solver/detail/ResolverInfoConflictsWith.h b/zypp/solver/detail/ResolverInfoConflictsWith.h
index 24ad80d2bce470ffc823159099bb6ce9c7068a81..642f6c6033b181e6a5781f1e73fe3c3c1fbff89e 100644 (file)
--- a/zypp/solver/detail/ResolverInfoConflictsWith.h
+++ b/zypp/solver/detail/ResolverInfoConflictsWith.h
@@ -45,7 +45,7 @@ class ResolverInfoConflictsWith : public ResolverInfoContainer {
 
   public:
 
-    ResolverInfoConflictsWith (PoolItem *resItem, PoolItem *with);
+    ResolverInfoConflictsWith (PoolItem resItem, PoolItem with);
     virtual ~ResolverInfoConflictsWith();
 
     // ---------------------------------- I/O

diff --git a/zypp/solver/detail/ResolverInfoContainer.h b/zypp/solver/detail/ResolverInfoContainer.h
index fd0a973a6de31f2e3266bb2a025d7f5cf48304c6..57b0c956e82cce97d8445230d3345afba957b090 100644 (file)
--- a/zypp/solver/detail/ResolverInfoContainer.h
+++ b/zypp/solver/detail/ResolverInfoContainer.h
@@ -47,7 +47,7 @@ class ResolverInfoContainer : public ResolverInfo {
 
   protected:
 
-    ResolverInfoContainer (ResolverInfoType type, PoolItem *initial_item, int priority, PoolItem *child = NULL);
+    ResolverInfoContainer (ResolverInfoType type, PoolItem initial_item, int priority, PoolItem child = NULL);
 
   public:
     virtual ~ResolverInfoContainer();
@@ -70,8 +70,8 @@ class ResolverInfoContainer : public ResolverInfo {
     std::string itemsToString (const bool names_only,
                                const bool shorten_output = false) const;
 
-    bool mentions (PoolItem *item) const;
-    void addRelatedPoolItem (PoolItem *item);
+    bool mentions (PoolItem item) const;
+    void addRelatedPoolItem (PoolItem item);
     void addRelatedPoolItemList (const CPoolItemList & items);
 
 };

diff --git a/zypp/solver/detail/ResolverInfoDependsOn.h b/zypp/solver/detail/ResolverInfoDependsOn.h
index b31323ea82196acd60ac05fcd30747114b226203..831197099809a9c1363d4b76aa46c06d2d280b52 100644 (file)
--- a/zypp/solver/detail/ResolverInfoDependsOn.h
+++ b/zypp/solver/detail/ResolverInfoDependsOn.h
@@ -46,7 +46,7 @@ class ResolverInfoDependsOn : public ResolverInfoContainer {
 
   public:
 
-    ResolverInfoDependsOn (PoolItem *item, PoolItem *on);
+    ResolverInfoDependsOn (PoolItem item, PoolItem on);
     virtual ~ResolverInfoDependsOn();
 
     // ---------------------------------- I/O

diff --git a/zypp/solver/detail/ResolverInfoMisc.h b/zypp/solver/detail/ResolverInfoMisc.h
index 1634f1d1d4bff0342f7fd3ab677e0cd8e06dc676..940289a8781156ddc6b656f131b680ef820f0455 100644 (file)
--- a/zypp/solver/detail/ResolverInfoMisc.h
+++ b/zypp/solver/detail/ResolverInfoMisc.h
@@ -46,7 +46,7 @@ class ResolverInfoMisc : public ResolverInfoContainer {
 
          Capability _capability;                       // capability leading to this info
 
-         PoolItem *_other_item;
+         PoolItem _other_item;
          Capability _other_capability;
 
          std::string _action;
@@ -54,7 +54,7 @@ class ResolverInfoMisc : public ResolverInfoContainer {
 
        public:
 
-         ResolverInfoMisc (ResolverInfoType detailedtype, PoolItem *affected, int priority, const Capability & capability = Capability());
+         ResolverInfoMisc (ResolverInfoType detailedtype, PoolItem affected, int priority, const Capability & capability = Capability());
          virtual ~ResolverInfoMisc();
 
          // ---------------------------------- I/O
@@ -67,7 +67,7 @@ class ResolverInfoMisc : public ResolverInfoContainer {
          std::string action (void) const { return _action; }
          std::string trigger (void) const { return _trigger; }
 
-         PoolItem *other (void) const { return _other_item; }
+         PoolItem other (void) const { return _other_item; }
          const Capability other_capability (void) const { return _other_capability; }
          const Capability capability(void) const { return _capability; }
 
@@ -79,7 +79,7 @@ class ResolverInfoMisc : public ResolverInfoContainer {
          void addAction (const std::string & action_msg);
          void addTrigger (const std::string & trigger_msg);
 
-         void setOtherPoolItem (PoolItem *other);
+         void setOtherPoolItem (PoolItem other);
          void setOtherCapability (const Capability & capability);
 };
 

diff --git a/zypp/solver/detail/ResolverInfoMissingReq.h b/zypp/solver/detail/ResolverInfoMissingReq.h
index af64e5732f801235a9396942d137722ad81fb031..f084ec0f12e82266aaced667b9012c3b894cf3fd 100644 (file)
--- a/zypp/solver/detail/ResolverInfoMissingReq.h
+++ b/zypp/solver/detail/ResolverInfoMissingReq.h
@@ -48,7 +48,7 @@ class ResolverInfoMissingReq : public ResolverInfo {
 
   public:
 
-    ResolverInfoMissingReq (PoolItem *item, const Capability & missing_req);
+    ResolverInfoMissingReq (PoolItem item, const Capability & missing_req);
     virtual ~ResolverInfoMissingReq();
 
     // ---------------------------------- I/O

diff --git a/zypp/solver/detail/ResolverInfoNeededBy.h b/zypp/solver/detail/ResolverInfoNeededBy.h
index 01eb93aa65ddc2cf12399db0ca2cc564b103ced1..e23f3c27dcb41b1dcb64f80b802c911124aecaa2 100644 (file)
--- a/zypp/solver/detail/ResolverInfoNeededBy.h
+++ b/zypp/solver/detail/ResolverInfoNeededBy.h
@@ -47,7 +47,7 @@ class ResolverInfoNeededBy : public ResolverInfoContainer {
 
   public:
 
-    ResolverInfoNeededBy (PoolItem *item);
+    ResolverInfoNeededBy (PoolItem item);
     virtual ~ResolverInfoNeededBy();
 
     // ---------------------------------- I/O

diff --git a/zypp/solver/detail/ResolverInfoObsoletes.h b/zypp/solver/detail/ResolverInfoObsoletes.h
index 0e6c89c5be5edec2ef5f28f9edc9baa0e7ca7356..f1a9854d70acd66bd12d018b906534e599b67a99 100644 (file)
--- a/zypp/solver/detail/ResolverInfoObsoletes.h
+++ b/zypp/solver/detail/ResolverInfoObsoletes.h
@@ -45,7 +45,7 @@ class ResolverInfoObsoletes : public ResolverInfoContainer {
 
   public:
 
-    ResolverInfoObsoletes (PoolItem *resItem, PoolItem *obsoletes);
+    ResolverInfoObsoletes (PoolItem resItem, PoolItem obsoletes);
     virtual ~ResolverInfoObsoletes();
 
     // ---------------------------------- I/O

diff --git a/zypp/solver/detail/ResolverQueue.h b/zypp/solver/detail/ResolverQueue.h
index 047878f7aae908e477f93318cad796404c3f75b0..08e22acd2220a4cbb3b42e4a5ab79f530e3d883e 100644 (file)
--- a/zypp/solver/detail/ResolverQueue.h
+++ b/zypp/solver/detail/ResolverQueue.h
@@ -75,10 +75,10 @@ class ResolverQueue : public base::ReferenceCounted, private base::NonCopyable {
     // ---------------------------------- methods
 
 
-    void addPoolItemToInstall (PoolItem *item);
-    void addPoolItemToEstablish (PoolItem *item);
-    void addPoolItemToRemove (PoolItem *item, bool remove_only_mode);
-    void addPoolItemToVerify (PoolItem *item);
+    void addPoolItemToInstall (PoolItem item);
+    void addPoolItemToEstablish (PoolItem item);
+    void addPoolItemToRemove (PoolItem item, bool remove_only_mode);
+    void addPoolItemToVerify (PoolItem item);
     void addExtraDependency (const Capability & cap);
     void addExtraConflict (const Capability & cap);
     void addItem (QueueItem_Ptr item);

diff --git a/zypp/solver/detail/SolutionAction.h b/zypp/solver/detail/SolutionAction.h
index 4ce493b344b19d3251011edd714aad20a4b93254..563fc66ee569f1588a120984bc810df92d92bac5 100644 (file)
--- a/zypp/solver/detail/SolutionAction.h
+++ b/zypp/solver/detail/SolutionAction.h
@@ -72,7 +72,7 @@ namespace zypp
        class TransactionSolutionAction: public SolutionAction
        {
        public:
-           TransactionSolutionAction( PoolItem *item,
+           TransactionSolutionAction( PoolItem item,
                                       TransactionKind action )
                : SolutionAction(), _item( item ), _action( action ) {}
 
@@ -82,7 +82,7 @@ namespace zypp
 
          // ---------------------------------- accessors
 
-         PoolItem *item() const { return _item; }
+         PoolItem item() const { return _item; }
          TransactionKind action() const { return _action;     }
 
          // ---------------------------------- methods
@@ -91,7 +91,7 @@ namespace zypp
 
        protected:
 
-           PoolItem *_item;
+           PoolItem _item;
            TransactionKind _action;
        };
 

diff --git a/zypp/solver/detail/Types.h b/zypp/solver/detail/Types.h
index c9798db8100f3f72a91988af74e8b1ff7a951beb..b351a8b445cae07dd78b3fcfb124a6db9458ac9b 100644 (file)
--- a/zypp/solver/detail/Types.h
+++ b/zypp/solver/detail/Types.h
@@ -33,9 +33,9 @@
 
 #include "zypp/PoolItem.h"
 
-typedef std::list <zypp::PoolItem *> PoolItemList;
-typedef std::list <const zypp::PoolItem *> CPoolItemList;
-typedef std::set <const zypp::PoolItem *> CPoolItemSet;
+typedef std::list <zypp::PoolItem> PoolItemList;
+typedef std::list <const zypp::PoolItem> CPoolItemList;
+typedef std::set <const zypp::PoolItem> CPoolItemSet;
 
 
 #define item_status_is_to_be_uninstalled(x) true