From 75b3974355014edfa66d9eecae09673bb464ec81 Mon Sep 17 00:00:00 2001
From: Michael Andres <ma@suse.de>
Date: Fri, 5 Sep 2008 16:29:44 +0000
Subject: [PATCH] Ease swigs life by not using "using"

---
 zypp/ResObject.h  | 21 ++++++++++++-----
 zypp/Resolvable.h | 67 ++++++++++++++++++++++++++++++++++++++++---------------
 2 files changed, 65 insertions(+), 23 deletions(-)

diff --git a/zypp/ResObject.h b/zypp/ResObject.h
index 31f6605..bfcd5d9 100644
--- a/zypp/ResObject.h
+++ b/zypp/ResObject.h
@@ -55,13 +55,23 @@ namespace zypp
     */
     //@{
     /** \see \ref sat::Solvable::supportsLocales */
-    using sat::Solvable::supportsLocales;
+    bool supportsLocales() const
+    { return sat::Solvable::supportsLocales(); }
+
     /** \see \ref sat::Solvable::supportsLocale */
-    using sat::Solvable::supportsLocale;
+    bool supportsLocale( const Locale & locale_r ) const
+    { return sat::Solvable::supportsLocale( locale_r ); }
+
+    bool supportsLocale( const LocaleSet & locales_r ) const
+    { return sat::Solvable::supportsLocale( locales_r ); }
+
     /** \see \ref sat::Solvable::supportsRequestedLocales */
-    using sat::Solvable::supportsRequestedLocales;
+    bool supportsRequestedLocales() const
+    { return sat::Solvable::supportsRequestedLocales(); }
+
     /** \see \ref sat::Solvable::getSupportedLocales */
-    using sat::Solvable::getSupportedLocales;
+    LocaleSet getSupportedLocales() const
+    { return sat::Solvable::getSupportedLocales(); }
     //@}
 
   public:
@@ -124,7 +134,8 @@ namespace zypp
     ByteCount downloadSize() const;
 
     /** \see \ref sat::Solvable::repository */
-    using sat::Solvable::repository;
+    Repository repository() const
+    { return sat::Solvable::repository(); }
 
      /** \ref RepoInfo associated with the repository
       *  providing this resolvable.
diff --git a/zypp/Resolvable.h b/zypp/Resolvable.h
index 5bcdea4..5984bbd 100644
--- a/zypp/Resolvable.h
+++ b/zypp/Resolvable.h
@@ -54,38 +54,69 @@ namespace zypp
     using sat::Solvable::operator bool_type;
 #endif
     /** Whether this represents an installed solvable. */
-    using sat::Solvable::isSystem;
+    bool isSystem() const
+    { return sat::Solvable::isSystem(); }
 
-    using sat::Solvable::ident;
+    IdString ident() const
+    { return sat::Solvable::ident(); }
 
-    using sat::Solvable::kind;
-    using sat::Solvable::isKind;
-    using sat::Solvable::name;
-    using sat::Solvable::edition;
-    using sat::Solvable::arch;
+    ResKind kind() const
+    { return sat::Solvable::kind(); }
 
+    bool isKind( const ResKind & kind_r ) const
+    { return sat::Solvable::isKind( kind_r ); }
+
+    std::string name() const
+    { return sat::Solvable::name(); }
+
+    Edition edition() const
+    { return sat::Solvable::edition(); }
+
+    Arch arch() const
+    { return sat::Solvable::arch(); }
 
     /**
      * Flag in the metadata indicating this should be
      * installed unsing '-i' (not -U).
      */
-    using sat::Solvable::installOnly;
+    bool installOnly() const
+    { return sat::Solvable::installOnly(); }
 
     /** \name Dependencies. */
     //@{
     /** Select by Dep. */
     Capabilities dep( Dep which_r ) const
     { return operator[]( which_r ); }
-    using sat::Solvable::operator[];
-    using sat::Solvable::provides;
-    using sat::Solvable::requires;
-    using sat::Solvable::conflicts;
-    using sat::Solvable::obsoletes;
-    using sat::Solvable::recommends;
-    using sat::Solvable::suggests;
-    using sat::Solvable::enhances;
-    using sat::Solvable::supplements;
-    using sat::Solvable::prerequires;
+
+    Capabilities operator[]( Dep which_r ) const
+    { return sat::Solvable::operator[]( which_r ); }
+
+    Capabilities provides()    const
+    { return sat::Solvable::provides(); }
+
+    Capabilities requires()    const
+    { return sat::Solvable::requires(); }
+
+    Capabilities conflicts()   const
+    { return sat::Solvable::conflicts(); }
+
+    Capabilities obsoletes()   const
+    { return sat::Solvable::obsoletes(); }
+
+    Capabilities recommends()  const
+    { return sat::Solvable::recommends(); }
+
+    Capabilities suggests()    const
+    { return sat::Solvable::suggests(); }
+
+    Capabilities enhances()    const
+    { return sat::Solvable::enhances(); }
+
+    Capabilities supplements() const
+    { return sat::Solvable::supplements(); }
+
+    Capabilities prerequires() const
+    { return sat::Solvable::prerequires(); }
     //@}
 
   public:
-- 
2.7.4