refactor EDSP classes for better internal reuse

[apt.git] / apt-pkg / indexfile.h

diff --git a/apt-pkg/indexfile.h b/apt-pkg/indexfile.h
index 8f7e9dc0548ba502547abd9362097bb764802c98..76a3d069e58d390c410ace72c95c395fc679bd3c 100644 (file)
--- a/apt-pkg/indexfile.h
+++ b/apt-pkg/indexfile.h
@@ -87,6 +87,12 @@ class IndexTarget                                                    /*{{{*/
       EXISTING_FILENAME,
       PDIFFS,
       COMPRESSIONTYPES,
+      DEFAULTENABLED,
+      SOURCESENTRY,
+      BY_HASH,
+      KEEPCOMPRESSEDAS,
+      FALLBACK_OF,
+      IDENTIFIER,
    };
    std::string Option(OptionKeys const Key) const;
    bool OptionBool(OptionKeys const Key) const;
@@ -140,9 +146,14 @@ class pkgIndexFile
    virtual bool Merge(pkgCacheGenerator &/*Gen*/, OpProgress* const /*Prog*/) { return true; };
    virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const;
 
-   static bool TranslationsAvailable();
-   static bool CheckLanguageCode(const char * const Lang);
-   static std::string LanguageCode();
+   APT_DEPRECATED_MSG("These methods make no sense anymore with multi-language support") static bool TranslationsAvailable();
+   /* No intern need for this method anymore as the check for correctness
+      is already done in getLanguages(). Note also that this check is
+      rather bad (doesn't take three character like ast into account).*/
+   APT_DEPRECATED_MSG("These methods make no sense anymore with multi-language support") static bool CheckLanguageCode(const char * const Lang);
+   /* As we have now possibly more than one LanguageCode this method is
+      superseeded by a) private classmembers or b) getLanguages() */
+   APT_DEPRECATED_MSG("These methods make no sense anymore with multi-language support") static std::string LanguageCode();
 
    bool IsTrusted() const { return Trusted; };
 
@@ -165,7 +176,7 @@ public:
    virtual bool Merge(pkgCacheGenerator &Gen, OpProgress* const Prog) APT_OVERRIDE;
    virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const APT_OVERRIDE;
 
-   pkgDebianIndexFile(bool const Trusted);
+   explicit pkgDebianIndexFile(bool const Trusted);
    virtual ~pkgDebianIndexFile();
 };