4 files changed, 10 insertions, 4 deletions
diff --git a/lib/connection.h b/lib/connection.h
index eca3c5be..4ab8d5ba 100644
--- a/lib/connection.h
+++ b/lib/connection.h
@@ -122,7 +122,7 @@ namespace QMatrixClient
 
             explicit Connection(QObject* parent = nullptr);
             explicit Connection(const QUrl& server, QObject* parent = nullptr);
-            virtual ~Connection();
+            ~Connection() override;
 
             /** Get all Invited and Joined rooms
              * \return a hashmap from a composite key - room name and whether
diff --git a/lib/events/event.h b/lib/events/event.h
index b7bbd83e..5248472c 100644
--- a/lib/events/event.h
+++ b/lib/events/event.h
@@ -259,7 +259,7 @@ namespace QMatrixClient
             }
 
             template <typename T>
-            T content(const QLatin1String& key) const
+            T content(QLatin1String key) const
             {
                 return fromJson<T>(contentJson()[key]);
             }
diff --git a/lib/events/eventcontent.h b/lib/events/eventcontent.h
index ab31a75d..254eb9a9 100644
--- a/lib/events/eventcontent.h
+++ b/lib/events/eventcontent.h
@@ -53,6 +53,9 @@ namespace QMatrixClient
                 QJsonObject originalJson;
 
             protected:
+                Base(const Base&) = default;
+                Base(Base&&) = default;
+
                 virtual void fillJson(QJsonObject* o) const = 0;
         };
 
@@ -167,11 +170,14 @@ namespace QMatrixClient
         class TypedBase: public Base
         {
             public:
-                explicit TypedBase(const QJsonObject& o = {}) : Base(o) { }
+                explicit TypedBase(QJsonObject o = {}) : Base(std::move(o)) { }
                 virtual QMimeType type() const = 0;
                 virtual const FileInfo* fileInfo() const { return nullptr; }
                 virtual FileInfo* fileInfo() { return nullptr; }
                 virtual const Thumbnail* thumbnailInfo() const { return nullptr; }
+
+            protected:
+                using Base::Base;
         };
 
         /**
diff --git a/lib/joinstate.h b/lib/joinstate.h
index 379183f6..4ae67de8 100644
--- a/lib/joinstate.h
+++ b/lib/joinstate.h
@@ -41,7 +41,7 @@ namespace QMatrixClient
     inline const char* toCString(JoinState js)
     {
         size_t state = size_t(js), index = 0;
-        while (state >>= 1) ++index;
+        while (state >>= 1u) ++index;
         return JoinStateStrings[index];
     }
 }  // namespace QMatrixClient