remove deprecated methods

diff --git a/zypp/Capability.cc b/zypp/Capability.cc
index 271bd7f..dc75eaa 100644 (file)
--- a/zypp/Capability.cc
+++ b/zypp/Capability.cc
@@ -360,7 +360,7 @@ namespace zypp
     static       str::smatch what;
     static const str::regex  filenameRegex(
                  "/(s?bin|lib(64)?|etc)/|^/usr/(games/|share/(dict/words|magic\\.mime)$)|^/opt/gnome/games/",
-                 str::regex::optimize|str::regex::nosubs );
+                 str::regex::nosubs );
 
     return str::regex_match( name_r, what, filenameRegex );
   }

diff --git a/zypp/KeyRing.cc b/zypp/KeyRing.cc
index 029b3e6..b97f095 100644 (file)
--- a/zypp/KeyRing.cc
+++ b/zypp/KeyRing.cc
@@ -696,28 +696,6 @@ namespace zypp
   std::list<PublicKeyData> KeyRing::trustedPublicKeyData()
   { return _pimpl->trustedPublicKeyData(); }
 
-  std::list<std::string> KeyRing::publicKeyIds()       // deprecated: use publicKeyData
-  {
-    const std::list<PublicKeyData> & keys( publicKeyData() );
-    std::list<std::string> ret;
-    for_( it, keys.begin(), keys.end() )
-    {
-      ret.push_back( (*it).id() );
-    }
-    return ret;
-  }
-
-  std::list<std::string> KeyRing::trustedPublicKeyIds()        // deprecated: use trustedPublicKeyData
-  {
-    const std::list<PublicKeyData> & keys( trustedPublicKeyData() );
-    std::list<std::string> ret;
-    for_( it, keys.begin(), keys.end() )
-    {
-      ret.push_back( (*it).id() );
-    }
-    return ret;
-  }
-
   bool KeyRing::verifyFileSignatureWorkflow(
       const Pathname & file,
       const std::string filedesc,

diff --git a/zypp/KeyRing.h b/zypp/KeyRing.h
index a1ad0cb..c45c330 100644 (file)
--- a/zypp/KeyRing.h
+++ b/zypp/KeyRing.h
@@ -237,18 +237,6 @@ namespace zypp
     std::list<PublicKeyData> trustedPublicKeyData();
 
     /**
-     * Get a list of public key ids in the keyring
-     * \deprecated \ref publicKeyData is cheaper to retrieve and contains more key data
-     */
-    std::list<std::string> publicKeyIds() ZYPP_DEPRECATED;
-
-    /**
-     * Get a list of trusted public key ids in the keyring
-     * \deprecated \ref trustedPublicKeyData is cheaper to retrieve and contains more key data
-     */
-    std::list<std::string> trustedPublicKeyIds() ZYPP_DEPRECATED;
-
-    /**
      * Follows a signature verification interacting with the user.
      * The bool returned depends on user decision to trust or not.
      *

diff --git a/zypp/base/Regex.cc b/zypp/base/Regex.cc
index 1609c39..13adc4f 100644 (file)
--- a/zypp/base/Regex.cc
+++ b/zypp/base/Regex.cc
@@ -33,6 +33,7 @@ void regex::assign(const std::string& str,int flags)
   m_flags = flags;
   int err;
   char errbuff[100];
+  static const int normal = 1<<16; // deprecated legacy, use match_extended
   if (!(flags & normal)) {
     flags |= match_extended;
     flags &= ~(normal);

diff --git a/zypp/base/Regex.h b/zypp/base/Regex.h
index 1eca7ff..f66f07b 100644 (file)
--- a/zypp/base/Regex.h
+++ b/zypp/base/Regex.h
@@ -88,12 +88,9 @@ namespace zypp
     public:
 
       enum RegFlags {
-        optimize       = 0,            ///< \deprecated legacy, obsolete
-        match_extra    = 0,            ///< \deprecated legacy, obsolete
         icase          = REG_ICASE,    ///< Do not differentiate case
         nosubs         = REG_NOSUB,    ///< Support for substring addressing of matches is not required
         match_extended = REG_EXTENDED, ///< Use POSIX Extended Regular Expression syntax when interpreting regex.
-        normal         = 1<<16         ///< \deprecated legacy, use match_extended
       };
 
       regex();