Avoid yielding blank lines with APT::Cmd::use-format=true

[apt.git] / apt-private / private-cacheset.h

diff --git a/apt-private/private-cacheset.h b/apt-private/private-cacheset.h
index 15b531e9d1be476ea68544e5b039dde7972e4b01..854d169221528e3266d50a261cc18a1dacf66094 100644 (file)
--- a/apt-private/private-cacheset.h
+++ b/apt-private/private-cacheset.h
@@ -1,17 +1,32 @@
 #ifndef APT_PRIVATE_CACHESET_H
 #define APT_PRIVATE_CACHESET_H
 
 #ifndef APT_PRIVATE_CACHESET_H
 #define APT_PRIVATE_CACHESET_H
 

+#include <apt-pkg/aptconfiguration.h>

 #include <apt-pkg/cachefile.h>
 #include <apt-pkg/cacheset.h>
 #include <apt-pkg/sptr.h>
 #include <apt-pkg/cachefile.h>
 #include <apt-pkg/cacheset.h>
 #include <apt-pkg/sptr.h>

+#include <apt-pkg/strutl.h>
+#include <apt-pkg/depcache.h>
+#include <apt-pkg/error.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/macros.h>

 
 #include <algorithm>
 #include <vector>
 
 #include <algorithm>
 #include <vector>

+#include <string.h>
+#include <list>
+#include <ostream>
+#include <set>
+#include <string>
+#include <utility>

 
 #include "private-output.h"
 
 #include <apti18n.h>
 
 
 #include "private-output.h"
 
 #include <apti18n.h>
 

+class OpProgress;
+

 struct VersionSortDescriptionLocality
 {
    bool operator () (const pkgCache::VerIterator &v_lhs, 
 struct VersionSortDescriptionLocality
 {
    bool operator () (const pkgCache::VerIterator &v_lhs, 


@@ -42,8 +57,8 @@ typedef APT::VersionContainer<
 
 class Matcher {
 public:
 
 class Matcher {
 public:

-    virtual bool operator () (const pkgCache::PkgIterator &P) {
-        return true;};
+    virtual bool operator () (const pkgCache::PkgIterator &/*P*/) {
+        return true;}

 };
 
 // FIXME: add default argument for OpProgress (or overloaded function)
 };
 
 // FIXME: add default argument for OpProgress (or overloaded function)


@@ -101,13 +116,18 @@ public:
                                Pkg.FullName(true).c_str(), pattern.c_str());
                explicitlyNamed = false;
        }
                                Pkg.FullName(true).c_str(), pattern.c_str());
                explicitlyNamed = false;
        }

+        virtual void showFnmatchSelection(pkgCache::PkgIterator const &Pkg, std::string const &pattern) {
+               ioprintf(out, _("Note, selecting '%s' for glob '%s'\n"),
+                               Pkg.FullName(true).c_str(), pattern.c_str());
+               explicitlyNamed = false;
+       }

        virtual void showRegExSelection(pkgCache::PkgIterator const &Pkg, std::string const &pattern) {
                ioprintf(out, _("Note, selecting '%s' for regex '%s'\n"),
                                Pkg.FullName(true).c_str(), pattern.c_str());
                explicitlyNamed = false;
        }
        virtual void showRegExSelection(pkgCache::PkgIterator const &Pkg, std::string const &pattern) {
                ioprintf(out, _("Note, selecting '%s' for regex '%s'\n"),
                                Pkg.FullName(true).c_str(), pattern.c_str());
                explicitlyNamed = false;
        }

-       virtual void showSelectedVersion(pkgCache::PkgIterator const &Pkg, pkgCache::VerIterator const Ver,
-                                std::string const &ver, bool const verIsRel) {
+       virtual void showSelectedVersion(pkgCache::PkgIterator const &/*Pkg*/, pkgCache::VerIterator const Ver,
+                                std::string const &ver, bool const /*verIsRel*/) {

                if (ver == Ver.VerStr())
                        return;
                selectedByRelease.push_back(make_pair(Ver, ver));
                if (ver == Ver.VerStr())
                        return;
                selectedByRelease.push_back(make_pair(Ver, ver));