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-pkg/edsp/edspindexfile.h  | 6 +++---
 apt-pkg/edsp/edsplistparser.h | 6 +++---
 apt-pkg/edsp/edspsystem.h     | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'apt-pkg/edsp')

diff --git a/apt-pkg/edsp/edspindexfile.h b/apt-pkg/edsp/edspindexfile.h
index 4ac0f9d72..8fa8fdd60 100644
--- a/apt-pkg/edsp/edspindexfile.h
+++ b/apt-pkg/edsp/edspindexfile.h
@@ -29,7 +29,7 @@ public:
    virtual bool Exists() const APT_OVERRIDE;
    virtual bool HasPackages() const APT_OVERRIDE;
 
-   edspLikeIndex(std::string const &File);
+   explicit edspLikeIndex(std::string const &File);
    virtual ~edspLikeIndex();
 };
 
@@ -42,7 +42,7 @@ protected:
 public:
    virtual const Type *GetType() const APT_OVERRIDE APT_PURE;
 
-   edspIndex(std::string const &File);
+   explicit edspIndex(std::string const &File);
    virtual ~edspIndex();
 };
 
@@ -55,7 +55,7 @@ protected:
 public:
    virtual const Type *GetType() const APT_OVERRIDE APT_PURE;
 
-   eippIndex(std::string const &File);
+   explicit eippIndex(std::string const &File);
    virtual ~eippIndex();
 };
 
diff --git a/apt-pkg/edsp/edsplistparser.h b/apt-pkg/edsp/edsplistparser.h
index 59c759f9d..8f56f8abf 100644
--- a/apt-pkg/edsp/edsplistparser.h
+++ b/apt-pkg/edsp/edsplistparser.h
@@ -35,7 +35,7 @@ class APT_HIDDEN edspLikeListParser : public debListParser
    virtual APT::StringView Description_md5() APT_OVERRIDE;
    virtual unsigned short VersionHash() APT_OVERRIDE;
 
-   edspLikeListParser(FileFd *File);
+   explicit edspLikeListParser(FileFd *File);
    virtual ~edspLikeListParser();
 };
 
@@ -48,7 +48,7 @@ protected:
    virtual bool ParseStatus(pkgCache::PkgIterator &Pkg,pkgCache::VerIterator &Ver) APT_OVERRIDE;
 
 public:
-   edspListParser(FileFd *File);
+   explicit edspListParser(FileFd *File);
    virtual ~edspListParser();
 };
 
@@ -58,7 +58,7 @@ protected:
    virtual bool ParseStatus(pkgCache::PkgIterator &Pkg,pkgCache::VerIterator &Ver) APT_OVERRIDE;
 
 public:
-   eippListParser(FileFd *File);
+   explicit eippListParser(FileFd *File);
    virtual ~eippListParser();
 };
 #endif
diff --git a/apt-pkg/edsp/edspsystem.h b/apt-pkg/edsp/edspsystem.h
index 0855bb53f..8f5452dcb 100644
--- a/apt-pkg/edsp/edspsystem.h
+++ b/apt-pkg/edsp/edspsystem.h
@@ -37,7 +37,7 @@ public:
    virtual bool FindIndex(pkgCache::PkgFileIterator File,
 			  pkgIndexFile *&Found) const APT_OVERRIDE;
 
-   edspLikeSystem(char const * const Label);
+   explicit edspLikeSystem(char const * const Label);
    virtual ~edspLikeSystem();
 };
 
-- 
cgit v1.2.3