From b52c6552c44fcb997b0db9f5e9f17b4674dd5359 Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <julian.klode@canonical.com>
Date: Tue, 30 Apr 2019 12:07:07 +0200
Subject: Add 'explicit' to most single argument constructors

This prevents implicit conversions that we do not want, such
as having a FileFd* being converted to a debListParser.

Two cases are not yet handled because they require changes
in code using them:

1. The classes in hashes.h
2. The URI class - this one is used quite a lot
---
 apt-inst/contrib/arfile.h | 2 +-
 apt-inst/deb/debfile.h    | 4 ++--
 apt-inst/filelist.h       | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'apt-inst')

diff --git a/apt-inst/contrib/arfile.h b/apt-inst/contrib/arfile.h
index 8124208c9..cf454941e 100644
--- a/apt-inst/contrib/arfile.h
+++ b/apt-inst/contrib/arfile.h
@@ -44,7 +44,7 @@ class ARArchive
    const Member *FindMember(const char *Name) const;
    inline Member *Members() { return List; }
    
-   ARArchive(FileFd &File);
+   explicit ARArchive(FileFd &File);
    ~ARArchive();
 };
 
diff --git a/apt-inst/deb/debfile.h b/apt-inst/deb/debfile.h
index 23a76bfdf..21c59a567 100644
--- a/apt-inst/deb/debfile.h
+++ b/apt-inst/deb/debfile.h
@@ -56,7 +56,7 @@ class debDebFile
    const ARArchive::Member *GotoMember(const char *Name);
    inline FileFd &GetFile() {return File;};
    
-   debDebFile(FileFd &File);
+   explicit debDebFile(FileFd &File);
 };
 
 class debDebFile::ControlExtract : public pkgDirStream
@@ -87,7 +87,7 @@ class debDebFile::MemControlExtract : public pkgDirStream
    bool TakeControl(const void *Data,unsigned long long Size);
 
    MemControlExtract() : IsControl(false), Control(0), Length(0), Member("control") {};
-   MemControlExtract(std::string Member) : IsControl(false), Control(0), Length(0), Member(Member) {};
+   explicit MemControlExtract(std::string Member) : IsControl(false), Control(0), Length(0), Member(Member) {};
    ~MemControlExtract() {delete [] Control;};   
 };
 									/*}}}*/
diff --git a/apt-inst/filelist.h b/apt-inst/filelist.h
index 7fe43de63..c5f103d87 100644
--- a/apt-inst/filelist.h
+++ b/apt-inst/filelist.h
@@ -97,7 +97,7 @@ class pkgFLCache
    bool AddConfFile(const char *Name,const char *NameEnd,
 		    PkgIterator const &Owner,const unsigned char *Sum);
 
-   pkgFLCache(DynamicMMap &Map);
+   explicit pkgFLCache(DynamicMMap &Map);
 //   ~pkgFLCache();
 };
 
@@ -288,7 +288,7 @@ class pkgFLCache::NodeIterator
    Package *RealPackage() const;
 
    NodeIterator() : Nde(0), Type(NdeHash), Owner(0) {};
-   NodeIterator(pkgFLCache &Owner) : Nde(Owner.NodeP), Type(NdeHash), Owner(&Owner) {}
+   explicit NodeIterator(pkgFLCache &Owner) : Nde(Owner.NodeP), Type(NdeHash), Owner(&Owner) {}
    NodeIterator(pkgFLCache &Owner,Node *Trg) : Nde(Trg), Type(NdeHash), Owner(&Owner) {}
    NodeIterator(pkgFLCache &Owner,Node *Trg,Package *) : Nde(Trg), Type(NdePkg), Owner(&Owner) {}
 };
-- 
cgit v1.2.3