From 201683afe4596ae32f7b1ea12dfca52995d59f9d Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Sun, 10 Nov 2019 19:11:03 -0500
Subject: Bug 1487082 - Resolve potential for build bustage regarding bad
 implicit conversion constructors

* Part 1: make conversion CTORs explicit.
  Minor tweaks to conform with new(ish) static analysis rule which flags up implicit single-argument conversion constructors.
* Part 2: fix a couple of double-mRefCnt declaration errors.
* Part 3: Fix unsafe use of NS_ConvertASCIItoUTF16().

Tag #1273
---
 mailnews/addrbook/src/nsAbBSDirectory.cpp  | 2 +-
 mailnews/addrbook/src/nsAbMDBDirProperty.h | 2 +-
 mailnews/addrbook/src/nsAbUtils.h          | 4 ++--
 mailnews/addrbook/src/nsAddrDatabase.cpp   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'mailnews/addrbook/src')

diff --git a/mailnews/addrbook/src/nsAbBSDirectory.cpp b/mailnews/addrbook/src/nsAbBSDirectory.cpp
index 0d018bbda..7ebe67845 100644
--- a/mailnews/addrbook/src/nsAbBSDirectory.cpp
+++ b/mailnews/addrbook/src/nsAbBSDirectory.cpp
@@ -242,7 +242,7 @@ NS_IMETHODIMP nsAbBSDirectory::DeleteDirectory(nsIAbDirectory *directory)
 
   struct GetDirectories
   {
-    GetDirectories(DIR_Server* aServer) : mServer(aServer) { }
+    explicit GetDirectories(DIR_Server* aServer) : mServer(aServer) { }
 
     nsCOMArray<nsIAbDirectory> directories;
     DIR_Server* mServer;
diff --git a/mailnews/addrbook/src/nsAbMDBDirProperty.h b/mailnews/addrbook/src/nsAbMDBDirProperty.h
index 3ee90d17e..fce4db297 100644
--- a/mailnews/addrbook/src/nsAbMDBDirProperty.h
+++ b/mailnews/addrbook/src/nsAbMDBDirProperty.h
@@ -28,7 +28,7 @@ class nsAbMDBDirProperty: public nsIAbMDBDirectory, public nsAbDirProperty
 public: 
 	nsAbMDBDirProperty(void);
 
-	NS_DECL_ISUPPORTS
+	NS_DECL_ISUPPORTS_INHERITED
 	NS_DECL_NSIABMDBDIRECTORY
 
 protected:
diff --git a/mailnews/addrbook/src/nsAbUtils.h b/mailnews/addrbook/src/nsAbUtils.h
index d6b8915e0..c50ba4d0d 100644
--- a/mailnews/addrbook/src/nsAbUtils.h
+++ b/mailnews/addrbook/src/nsAbUtils.h
@@ -15,7 +15,7 @@
 class CharPtrArrayGuard
 {
 public:
-    CharPtrArrayGuard (bool freeElements = true) :
+    explicit CharPtrArrayGuard (bool freeElements = true) :
         mFreeElements (freeElements),
         mArray (0),
         mSize (0)
@@ -80,7 +80,7 @@ private:
 class PRUnicharPtrArrayGuard
 {
 public:
-    PRUnicharPtrArrayGuard (bool freeElements = true) :
+    explicit PRUnicharPtrArrayGuard (bool freeElements = true) :
         mFreeElements (freeElements),
         mArray (0),
         mSize (0)
diff --git a/mailnews/addrbook/src/nsAddrDatabase.cpp b/mailnews/addrbook/src/nsAddrDatabase.cpp
index ea29ba8af..9b1450b94 100644
--- a/mailnews/addrbook/src/nsAddrDatabase.cpp
+++ b/mailnews/addrbook/src/nsAddrDatabase.cpp
@@ -2507,7 +2507,7 @@ public:
     NS_DECL_NSIADDRDBLISTENER
     // nsAddrDBEnumerator methods:
 
-    nsAddrDBEnumerator(nsAddrDatabase* aDb);
+    explicit nsAddrDBEnumerator(nsAddrDatabase* aDb);
     void Clear();
 protected:
     virtual ~nsAddrDBEnumerator();
-- 
cgit v1.2.3