add d-pointer, virtual destructors and de-inline de/constructors

[apt.git] / apt-pkg / edsp / edspsystem.h

diff --git a/apt-pkg/edsp/edspsystem.h b/apt-pkg/edsp/edspsystem.h
index ca703fa84824d74e050c58def8420fa932b82d57..1e27d2cb03d983fed5bbae1c1bfb59a307bcfc42 100644 (file)
--- a/apt-pkg/edsp/edspsystem.h
+++ b/apt-pkg/edsp/edspsystem.h
@@ -11,9 +11,18 @@
 #define PKGLIB_EDSPSYSTEM_H
 
 #include <apt-pkg/pkgsystem.h>
 #define PKGLIB_EDSPSYSTEM_H
 
 #include <apt-pkg/pkgsystem.h>

+#include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/pkgcache.h>

 
 

+#include <vector>
+
+class Configuration;
+class pkgDepCache;
+class pkgIndexFile;
+class pkgPackageManager;

 class edspIndex;
 class edspIndex;

-class edspSystem : public pkgSystem
+
+class APT_HIDDEN edspSystem : public pkgSystem

 {
    /** \brief dpointer placeholder (for later in case we need it) */
    void *d;
 {
    /** \brief dpointer placeholder (for later in case we need it) */
    void *d;


@@ -22,20 +31,18 @@ class edspSystem : public pkgSystem
 
    public:
 
 
    public:
 

-   virtual bool Lock();
-   virtual bool UnLock(bool NoErrors = false);
-   virtual pkgPackageManager *CreatePM(pkgDepCache *Cache) const;
+   virtual bool Lock() APT_CONST;
+   virtual bool UnLock(bool NoErrors = false) APT_CONST;
+   virtual pkgPackageManager *CreatePM(pkgDepCache *Cache) const APT_CONST;

    virtual bool Initialize(Configuration &Cnf);
    virtual bool Initialize(Configuration &Cnf);

-   virtual bool ArchiveSupported(const char *Type);
+   virtual bool ArchiveSupported(const char *Type) APT_CONST;

    virtual signed Score(Configuration const &Cnf);
    virtual bool AddStatusFiles(std::vector<pkgIndexFile *> &List);
    virtual bool FindIndex(pkgCache::PkgFileIterator File,
                          pkgIndexFile *&Found) const;
 
    edspSystem();
    virtual signed Score(Configuration const &Cnf);
    virtual bool AddStatusFiles(std::vector<pkgIndexFile *> &List);
    virtual bool FindIndex(pkgCache::PkgFileIterator File,
                          pkgIndexFile *&Found) const;
 
    edspSystem();

-   ~edspSystem();
+   virtual ~edspSystem();

 };
 
 };
 

-extern edspSystem edspSys;
-

 #endif
 #endif