Merge remote-tracking branch 'upstream/debian/sid' into debian/sid

[apt.git] / apt-pkg / deb / debsystem.h

diff --git a/apt-pkg/deb/debsystem.h b/apt-pkg/deb/debsystem.h
index c4e27ced31dee78ac0a6c91b8d7b1187781d0289..a945f68fbaaeb93bb212e742783ae4482e4ff369 100644 (file)
--- a/apt-pkg/deb/debsystem.h
+++ b/apt-pkg/deb/debsystem.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: debsystem.h,v 1.3 2001/04/29 05:13:51 jgg Exp $
+// $Id: debsystem.h,v 1.4 2003/01/11 07:16:33 jgg Exp $

 /* ######################################################################
 
    System - Debian version of the  System Class
 /* ######################################################################
 
    System - Debian version of the  System Class


@@ -10,22 +10,27 @@
 #ifndef PKGLIB_DEBSYSTEM_H
 #define PKGLIB_DEBSYSTEM_H
 
 #ifndef PKGLIB_DEBSYSTEM_H
 #define PKGLIB_DEBSYSTEM_H
 

-#ifdef __GNUG__
-#pragma interface "apt-pkg/debsystem.h"
-#endif
-

 #include <apt-pkg/pkgsystem.h>
 #include <apt-pkg/pkgsystem.h>

-    
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
+
+#include <vector>
+class Configuration;
+class pkgIndexFile;
+class pkgPackageManager;
+class debSystemPrivate;
+class pkgDepCache;
+
+#ifndef APT_10_CLEANER_HEADERS

 class debStatusIndex;
 class debStatusIndex;

+#endif
+

 class debSystem : public pkgSystem
 {
 class debSystem : public pkgSystem
 {

-   // For locking support
-   int LockFD;
-   unsigned LockCount;
+   // private d-pointer
+   debSystemPrivate *d;

    bool CheckUpdates();
    bool CheckUpdates();

-   
-   debStatusIndex *StatusFile;
-   
+

    public:
 
    virtual bool Lock();
    public:
 
    virtual bool Lock();


@@ -34,12 +39,12 @@ class debSystem : public pkgSystem
    virtual bool Initialize(Configuration &Cnf);
    virtual bool ArchiveSupported(const char *Type);
    virtual signed Score(Configuration const &Cnf);
    virtual bool Initialize(Configuration &Cnf);
    virtual bool ArchiveSupported(const char *Type);
    virtual signed Score(Configuration const &Cnf);

-   virtual bool AddStatusFiles(vector<pkgIndexFile *> &List);
+   virtual bool AddStatusFiles(std::vector<pkgIndexFile *> &List);

    virtual bool FindIndex(pkgCache::PkgFileIterator File,
                          pkgIndexFile *&Found) const;
 
    debSystem();
    virtual bool FindIndex(pkgCache::PkgFileIterator File,
                          pkgIndexFile *&Found) const;
 
    debSystem();

-   ~debSystem();
+   virtual ~debSystem();

 };
 
 extern debSystem debSys;
 };
 
 extern debSystem debSys;