Merge branch 'pu/cleanups' into 'master'

Cleanup ABI - make stuff virtual, etc

See merge request apt-team/apt!106

1 files changed, 9 insertions, 37 deletions

diff --git a/apt-pkg/metaindex.cc b/apt-pkg/metaindex.cc
index d0b3f5165..06db06f83 100644
--- a/apt-pkg/metaindex.cc
+++ b/apt-pkg/metaindex.cc
@@ -11,12 +11,6 @@
 
 class metaIndexPrivate							/*{{{*/
 {
-   public:
-   std::string Origin;
-   std::string Label;
-   std::string Version;
-   signed short DefaultPin;
-   std::string ReleaseNotes;
 };
 									/*}}}*/
 
@@ -63,22 +57,15 @@ APT_PURE std::string metaIndex::GetDist() const { return Dist; }
 APT_PURE const char* metaIndex::GetType() const { return Type; }
 APT_PURE metaIndex::TriState metaIndex::GetTrusted() const { return Trusted; }
 APT_PURE std::string metaIndex::GetSignedBy() const { return SignedBy; }
-APT_PURE std::string metaIndex::GetOrigin() const { return d->Origin; }
-APT_PURE std::string metaIndex::GetLabel() const { return d->Label; }
-APT_PURE std::string metaIndex::GetVersion() const { return d->Version; }
+APT_PURE std::string metaIndex::GetOrigin() const { return Origin; }
+APT_PURE std::string metaIndex::GetLabel() const { return Label; }
+APT_PURE std::string metaIndex::GetVersion() const { return Version; }
 APT_PURE std::string metaIndex::GetCodename() const { return Codename; }
 APT_PURE std::string metaIndex::GetSuite() const { return Suite; }
-APT_PURE std::string metaIndex::GetReleaseNotes() const { return d->ReleaseNotes; }
-APT_PURE signed short metaIndex::GetDefaultPin() const { return d->DefaultPin; }
+APT_PURE std::string metaIndex::GetReleaseNotes() const { return ReleaseNotes; }
+APT_PURE signed short metaIndex::GetDefaultPin() const { return DefaultPin; }
 APT_PURE bool metaIndex::GetSupportsAcquireByHash() const { return SupportsAcquireByHash; }
 APT_PURE time_t metaIndex::GetValidUntil() const { return ValidUntil; }
-APT_PURE time_t metaIndex::GetNotBefore() const
-{
-   debReleaseIndex const *const deb = dynamic_cast<debReleaseIndex const *>(this);
-   if (deb != nullptr)
-      return deb->GetNotBefore();
-   return 0;
-}
 APT_PURE time_t metaIndex::GetDate() const { return this->Date; }
 APT_PURE metaIndex::TriState metaIndex::GetLoadedSuccessfully() const { return LoadedSuccessfully; }
 APT_PURE std::string metaIndex::GetExpectedDist() const { return Dist; }
@@ -137,40 +124,25 @@ void metaIndex::swapLoad(metaIndex * const OldMetaIndex)		/*{{{*/
    std::swap(Entries, OldMetaIndex->Entries);
    std::swap(LoadedSuccessfully, OldMetaIndex->LoadedSuccessfully);
 
-   OldMetaIndex->SetOrigin(d->Origin);
-   OldMetaIndex->SetLabel(d->Label);
-   OldMetaIndex->SetVersion(d->Version);
-   OldMetaIndex->SetDefaultPin(d->DefaultPin);
+   OldMetaIndex->Origin = Origin;
+   OldMetaIndex->Label = Label;
+   OldMetaIndex->Version =Version;
+   OldMetaIndex->DefaultPin = DefaultPin;
 }
 									/*}}}*/
 
 bool metaIndex::IsArchitectureSupported(std::string const &arch) const	/*{{{*/
 {
-   debReleaseIndex const * const deb = dynamic_cast<debReleaseIndex const *>(this);
-   if (deb != NULL)
-      return deb->IsArchitectureSupported(arch);
    return true;
 }
 									/*}}}*/
 bool metaIndex::IsArchitectureAllSupportedFor(IndexTarget const &target) const/*{{{*/
 {
-   debReleaseIndex const * const deb = dynamic_cast<debReleaseIndex const *>(this);
-   if (deb != NULL)
-      return deb->IsArchitectureAllSupportedFor(target);
    return true;
 }
 									/*}}}*/
 bool metaIndex::HasSupportForComponent(std::string const &component) const/*{{{*/
 {
-   debReleaseIndex const * const deb = dynamic_cast<debReleaseIndex const *>(this);
-   if (deb != NULL)
-      return deb->HasSupportForComponent(component);
    return true;
 }
 									/*}}}*/
-
-void metaIndex::SetOrigin(std::string const &origin) { d->Origin = origin; }
-void metaIndex::SetLabel(std::string const &label) { d->Label = label; }
-void metaIndex::SetVersion(std::string const &version) { d->Version = version; }
-void metaIndex::SetDefaultPin(signed short const defaultpin) { d->DefaultPin = defaultpin; }
-void metaIndex::SetReleaseNotes(std::string const &notes) { d->ReleaseNotes = notes; }