Fixed warnings by removing useless const in return types.

diff --git a/zypp/Resolver.cc b/zypp/Resolver.cc
index c34afec..102f109 100644 (file)
--- a/zypp/Resolver.cc
+++ b/zypp/Resolver.cc
@@ -88,11 +88,11 @@ namespace zypp
   { _pimpl->setArchitecture( arch ); }
   void Resolver::setForceResolve( const bool force )
   { _pimpl->setForceResolve( force ); }
-  const bool Resolver::forceResolve()
+  bool Resolver::forceResolve()
   { return _pimpl->forceResolve(); }
     void Resolver::setPreferHighestVersion( const bool highestVersion )
   { _pimpl->setPreferHighestVersion( highestVersion ); }
-  const bool Resolver::preferHighestVersion()
+  bool Resolver::preferHighestVersion()
   { return _pimpl->preferHighestVersion(); }
   bool Resolver::transactResObject( ResObject::constPtr robj, bool install)
   { return _pimpl->transactResObject( robj, install ); }

diff --git a/zypp/Resolver.h b/zypp/Resolver.h
index 078d242..b759e88 100644 (file)
--- a/zypp/Resolver.h
+++ b/zypp/Resolver.h
@@ -195,14 +195,14 @@ namespace zypp
      * This behaviour is favourited by ZMD.
      **/
     void setForceResolve (const bool force);
-    const bool forceResolve();
+    bool forceResolve();
 
     /**      
      * Prefer the result with the newest version if there are more solver
      * results. 
      **/
     void setPreferHighestVersion (const bool highestVersion);
-    const bool preferHighestVersion();      
+    bool preferHighestVersion();      
 
     /**
      * transact a single ResObject

diff --git a/zypp/TmpPath.cc b/zypp/TmpPath.cc
index 871835e..246d180 100644 (file)
--- a/zypp/TmpPath.cc
+++ b/zypp/TmpPath.cc
@@ -126,10 +126,10 @@ namespace zypp {
 
     ///////////////////////////////////////////////////////////////////
     //
-    //      METHOD NAME : TmpPath::operator const void *const
+    //      METHOD NAME : TmpPath::operator const void *
     //      METHOD TYPE :
     //
-    TmpPath::operator const void *const() const
+    TmpPath::operator const void * () const
     {
       return _impl.get();
     }

diff --git a/zypp/TmpPath.h b/zypp/TmpPath.h
index b3430ca..ad2b6ce 100644 (file)
--- a/zypp/TmpPath.h
+++ b/zypp/TmpPath.h
@@ -59,7 +59,7 @@ namespace zypp {
          * Test whether the Pathname is valid (i.e. not empty. NOT whether
          * it really denotes an existing file or directory).
          **/
-        operator const void *const() const;
+        operator const void * () const;
 
         /**
          * @return The Pathname.

diff --git a/zypp/detail/ResObjectImplIf.h b/zypp/detail/ResObjectImplIf.h
index 9cc33cb..10bf7f6 100644 (file)
--- a/zypp/detail/ResObjectImplIf.h
+++ b/zypp/detail/ResObjectImplIf.h
@@ -124,7 +124,7 @@ namespace zypp
       { return _backRef; }
 
       /** Access to Resolvable data if connected. */
-      const Resolvable *const self() const
+      const Resolvable * self() const
       { return _backRef; }
 
     private:

diff --git a/zypp/parser/xml/Reader.h b/zypp/parser/xml/Reader.h
index c2abbb7..689900f 100644 (file)
--- a/zypp/parser/xml/Reader.h
+++ b/zypp/parser/xml/Reader.h
@@ -133,7 +133,7 @@ namespace zypp
       { return _node; }
 
       /** */
-      const Node *const operator->() const
+      const Node * operator->() const
       { return &_node; }
 
     public:

diff --git a/zypp/parser/xml/XmlString.h b/zypp/parser/xml/XmlString.h
index c2691c2..1b31614 100644 (file)
--- a/zypp/parser/xml/XmlString.h
+++ b/zypp/parser/xml/XmlString.h
@@ -57,7 +57,7 @@ namespace zypp
                  OnDelete ondelete_r           = NOFREE );
 
       /** Access the <tt>xmlChar *</tt>. */
-      const xmlChar *const get() const
+      const xmlChar * get() const
       {
         if ( ! _xmlstr )
           return NULL;
@@ -65,11 +65,11 @@ namespace zypp
       }
 
       /** Implicit conversion to <tt>xmlChar *</tt>. */
-      operator const xmlChar *const() const
+      operator const xmlChar * () const
       { return get(); }
 
-      /** Explicit conversion to <tt>const char *const</tt>. */
-      const char *const c_str() const
+      /** Explicit conversion to <tt>const char *</tt>. */
+      const char * c_str() const
       { return reinterpret_cast<const char *const>(get()); }
 
       /** Explicit conversion to <tt>std::string</tt>. */

diff --git a/zypp/repo/RepoType.h b/zypp/repo/RepoType.h
index 00932cf..4926446 100644 (file)
--- a/zypp/repo/RepoType.h
+++ b/zypp/repo/RepoType.h
@@ -45,7 +45,7 @@ namespace zypp
 
     explicit RepoType(const std::string & strval_r);
 
-    const Type toEnum() const { return _type; }
+    Type toEnum() const { return _type; }
 
     RepoType::Type parse(const std::string & strval_r);
 

diff --git a/zypp/repo/yum/ResourceType.h b/zypp/repo/yum/ResourceType.h
index 6126902..426478e 100644 (file)
--- a/zypp/repo/yum/ResourceType.h
+++ b/zypp/repo/yum/ResourceType.h
@@ -54,7 +54,7 @@ namespace zypp
 
     explicit ResourceType(const std::string & strval_r);
 
-    const Type toEnum() const { return _type; }
+    Type toEnum() const { return _type; }
     
     ResourceType::Type parse(const std::string & strval_r);
 

diff --git a/zypp/solver/detail/InstallOrder.cc b/zypp/solver/detail/InstallOrder.cc
index 3fe7039..78095e1 100644 (file)
--- a/zypp/solver/detail/InstallOrder.cc
+++ b/zypp/solver/detail/InstallOrder.cc
@@ -66,7 +66,7 @@ InstallOrder::InstallOrder( const ResPool & pool, const PoolItemSet & toinstall,
 
 //-----------------------------------------------------------------------------
 
-const void
+void
 InstallOrder::printAdj (std::ostream& os, bool reversed) const
 {
     const Graph& g = (reversed ? _rgraph : _graph);

diff --git a/zypp/solver/detail/InstallOrder.h b/zypp/solver/detail/InstallOrder.h
index 280e71b..5c9d8ac 100644 (file)
--- a/zypp/solver/detail/InstallOrder.h
+++ b/zypp/solver/detail/InstallOrder.h
@@ -153,7 +153,7 @@ class InstallOrder
         * */
        const PoolItemList getTopSorted() const;
 
-       const void printAdj (std::ostream & os, bool reversed = false) const;
+       void printAdj (std::ostream & os, bool reversed = false) const;
 };
 
 ///////////////////////////////////////////////////////////////////

diff --git a/zypp/solver/detail/Resolver.h b/zypp/solver/detail/Resolver.h
index 1ee723f..3a92e63 100644 (file)
--- a/zypp/solver/detail/Resolver.h
+++ b/zypp/solver/detail/Resolver.h
@@ -245,12 +245,12 @@ class Resolver : public base::ReferenceCounted, private base::NonCopyable {
     void addIgnoreVendorItem (const PoolItem_Ref item);    
 
     void setForceResolve (const bool force) { _forceResolve = force; }
-    const bool forceResolve() { return _forceResolve; }
+    bool forceResolve() { return _forceResolve; }
     void setPreferHighestVersion (const bool highestVersion) { _preferHighestVersion = highestVersion; }
-    const bool preferHighestVersion() { return _preferHighestVersion; }
+    bool preferHighestVersion() { return _preferHighestVersion; }
 
     void setTryAllPossibilities (const bool tryAllPossibilities) { _tryAllPossibilities = tryAllPossibilities; }
-    const bool tryAllPossibilities () const { return _tryAllPossibilities; };
+    bool tryAllPossibilities () const { return _tryAllPossibilities; };
 
     bool verifySystem (bool considerNewHardware = false);
     void establishState (ResolverContext_Ptr context = NULL);

diff --git a/zypp/solver/detail/ResolverContext.h b/zypp/solver/detail/ResolverContext.h
index 09e44ba..8fdad57 100644 (file)
--- a/zypp/solver/detail/ResolverContext.h
+++ b/zypp/solver/detail/ResolverContext.h
@@ -187,15 +187,15 @@ class ResolverContext : public base::ReferenceCounted, private base::NonCopyable
     const PoolItemList getIgnoreVendorItem() const { return _ignoreVendorItem; }
     
     void setForceResolve (const bool force) { _forceResolve = force; }
-    const bool forceResolve() { return _forceResolve; }
+    bool forceResolve() { return _forceResolve; }
 
     void setEstablishContext (const ResolverContext_Ptr establish_context) { _establish_context = establish_context; }
 
     void setPreferHighestVersion (const bool highestVersion) { _preferHighestVersion = highestVersion; }
-    const bool preferHighestVersion() { return _preferHighestVersion; }  
+    bool preferHighestVersion() { return _preferHighestVersion; }  
 
     void setUpgradeMode (const bool upgrade) { _upgradeMode = upgrade; }
-    const bool upgradeMode() { return _upgradeMode; }
+    bool upgradeMode() { return _upgradeMode; }
 
     void setUserDeleteItems ( const PoolItemList & deleteItems) { _userDeleteItems = deleteItems; }
     void setUserInstallItems ( const PoolItemList& installItems) { _userInstallItems = installItems; }

diff --git a/zypp/solver/detail/SolutionAction.h b/zypp/solver/detail/SolutionAction.h
index 369abde..31ad47a 100644 (file)
--- a/zypp/solver/detail/SolutionAction.h
+++ b/zypp/solver/detail/SolutionAction.h
@@ -94,7 +94,7 @@ namespace zypp
          // ---------------------------------- accessors
 
          const PoolItem_Ref item() const { return _item; }
-         const TransactionKind action() const { return _action; }
+         TransactionKind action() const { return _action; }
 
          // ---------------------------------- methods
            virtual bool execute(Resolver & resolver) const;