From 236c10ff56ed102ca15237219213c1e15ae648fa Mon Sep 17 00:00:00 2001
From: sangelovic <angelovic.s@gmail.com>
Date: Mon, 10 Jun 2019 21:54:02 +0200
Subject: [PATCH] Resolve a few clang-tidy suggestions and warnings (thanks to
 @ardazishvili)

Fixes part of #52.
---
 include/sdbus-c++/Message.h | 6 +++---
 src/Message.cpp             | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/sdbus-c++/Message.h b/include/sdbus-c++/Message.h
index 7ff447e..6c21948 100644
--- a/include/sdbus-c++/Message.h
+++ b/include/sdbus-c++/Message.h
@@ -127,7 +127,7 @@ namespace sdbus {
         Message& enterStruct(const std::string& signature);
         Message& exitStruct();
 
-        operator bool() const;
+        explicit operator bool() const;
         void clearFlags();
 
         std::string getInterfaceName() const;
@@ -144,7 +144,7 @@ namespace sdbus {
 
     protected:
         Message() = default;
-        Message(internal::ISdBus* sdbus) noexcept;
+        explicit Message(internal::ISdBus* sdbus) noexcept;
         Message(void *msg, internal::ISdBus* sdbus) noexcept;
         Message(void *msg, internal::ISdBus* sdbus, adopt_message_t) noexcept;
 
@@ -188,7 +188,7 @@ namespace sdbus {
         using Slot = std::unique_ptr<void, std::function<void(void*)>>;
 
         AsyncMethodCall() = default;
-        AsyncMethodCall(MethodCall&& call) noexcept;
+        explicit AsyncMethodCall(MethodCall&& call) noexcept;
         Slot send(void* callback, void* userData) const;
     };
 
diff --git a/src/Message.cpp b/src/Message.cpp
index 3396e2b..6d39a1e 100644
--- a/src/Message.cpp
+++ b/src/Message.cpp
@@ -602,7 +602,7 @@ bool Message::isValid() const
 
 bool Message::isEmpty() const
 {
-    return sd_bus_message_is_empty((sd_bus_message*)msg_);
+    return sd_bus_message_is_empty((sd_bus_message*)msg_) != 0;
 }
 
 void MethodCall::dontExpectReply()
@@ -615,7 +615,7 @@ bool MethodCall::doesntExpectReply() const
 {
     auto r = sd_bus_message_get_expect_reply((sd_bus_message*)msg_);
     SDBUS_THROW_ERROR_IF(r < 0, "Failed to get the dont-expect-reply flag", -r);
-    return r > 0 ? false : true;
+    return r == 0;
 }
 
 MethodReply MethodCall::send() const
@@ -721,7 +721,7 @@ PlainMessage createPlainMessage()
 
     thread_local struct BusReferenceKeeper
     {
-        BusReferenceKeeper(sd_bus* bus) : bus_(sd_bus_ref(bus)) { sd_bus_flush(bus_); }
+        explicit BusReferenceKeeper(sd_bus* bus) : bus_(sd_bus_ref(bus)) { sd_bus_flush(bus_); }
         ~BusReferenceKeeper() { sd_bus_flush_close_unref(bus_); }
         sd_bus* bus_{};
     } busReferenceKeeper{bus};