Merge github.com:adrian17/apt

[apt.git] / apt-private / private-list.cc

diff --git a/apt-private/private-list.cc b/apt-private/private-list.cc
index 5363486406d080856a12769c031aa576b23cb7cb..a948c7d9f2ae3fd723c8476e25788e54d5ded1d5 100644 (file)
--- a/apt-private/private-list.cc
+++ b/apt-private/private-list.cc
@@ -37,28 +37,20 @@ struct PackageSortAlphabetic                                                /*{{{*/
        return (l_name < r_name);
     }
 };
        return (l_name < r_name);
     }
 };

-                                                                       /*}}}*/
-class PackageNameMatcher : public Matcher                              /*{{{*/
+
+class PackageNameMatcher : public Matcher

 {
 {

-#ifdef PACKAGE_MATCHER_ABI_COMPAT
-#define PackageMatcher PackageNameMatchesFnmatch
-#endif

   public:
   public:

-   PackageNameMatcher(const char **patterns)
+   explicit PackageNameMatcher(const char **patterns)

    {
       for(int i=0; patterns[i] != NULL; ++i)
       {
          std::string pattern = patterns[i];
    {
       for(int i=0; patterns[i] != NULL; ++i)
       {
          std::string pattern = patterns[i];

-#ifdef PACKAGE_MATCHER_ABI_COMPAT
-            APT::CacheFilter::PackageNameMatchesFnmatch *cachefilter = NULL;
-            cachefilter = new APT::CacheFilter::PackageNameMatchesFnmatch(pattern);
-#else

          APT::CacheFilter::PackageMatcher *cachefilter = NULL;
          if(_config->FindB("APT::Cmd::Use-Regexp", false) == true)
             cachefilter = new APT::CacheFilter::PackageNameMatchesRegEx(pattern);
          else
             cachefilter = new APT::CacheFilter::PackageNameMatchesFnmatch(pattern);
          APT::CacheFilter::PackageMatcher *cachefilter = NULL;
          if(_config->FindB("APT::Cmd::Use-Regexp", false) == true)
             cachefilter = new APT::CacheFilter::PackageNameMatchesRegEx(pattern);
          else
             cachefilter = new APT::CacheFilter::PackageNameMatchesFnmatch(pattern);

-#endif

          filters.push_back(cachefilter);
       }
    }
          filters.push_back(cachefilter);
       }
    }


@@ -67,7 +59,7 @@ class PackageNameMatcher : public Matcher                             /*{{{*/
       for(J=filters.begin(); J != filters.end(); ++J)
          delete *J;
    }
       for(J=filters.begin(); J != filters.end(); ++J)
          delete *J;
    }

-   virtual bool operator () (const pkgCache::PkgIterator &P) 
+   virtual bool operator () (const pkgCache::PkgIterator &P) APT_OVERRIDE

    {
       for(J=filters.begin(); J != filters.end(); ++J)
       {
    {
       for(J=filters.begin(); J != filters.end(); ++J)
       {