dbus: fix covariant error

Change-Id: Ibd9fa41bde63a52176fb78714cda5d2a19af8b00

bin/dbus/dbusconfigurationmanager.cpp

@@ -153,13 +153,13 @@ DBusConfigurationManager::sendTextMessage(const std::string& accountID, const st
     return DRing::sendAccountTextMessage(accountID, to, payloads);
 }
 
-std::vector<DBus::Struct<std::string, std::map<std::string, std::string>, long unsigned int>>
+std::vector<RingDBusMessage>
 DBusConfigurationManager::getLastMessages(const std::string& accountID, const uint64_t& base_timestamp)
 {
     auto messages = DRing::getLastMessages(accountID, base_timestamp);
-    std::vector<DBus::Struct<std::string, std::map<std::string, std::string>, long unsigned int>> result;
+    std::vector<RingDBusMessage> result;
     for (const auto& message : messages) {
-        DBus::Struct<std::string, std::map<std::string, std::string>, long unsigned int> m;
+        RingDBusMessage m;
         m._1 = message.from;
         m._2 = message.payloads;
         m._3 = message.received;

bin/dbus/dbusconfigurationmanager.h

@@ -49,6 +49,8 @@
 #pragma GCC diagnostic warning "-Wunused-but-set-variable"
 #endif
 
+using RingDBusMessage = DBus::Struct<std::string, std::map<std::string, std::string>, uint64_t>;
+
 class DBusConfigurationManager :
     public cx::ring::Ring::ConfigurationManager_adaptor,
     public DBus::IntrospectableAdaptor,
@@ -80,7 +82,7 @@ class DBusConfigurationManager :
         void sendRegister(const std::string& accoundID, const bool& enable);
         void registerAllAccounts(void);
         uint64_t sendTextMessage(const std::string& accoundID, const std::string& to, const std::map<std::string, std::string>& payloads);
-        std::vector<DBus::Struct<std::string, std::map<std::string, std::string>, long unsigned int>> getLastMessages(const std::string& accountID, const uint64_t& base_timestamp);
+        std::vector<RingDBusMessage> getLastMessages(const std::string& accountID, const uint64_t& base_timestamp);
         int getMessageStatus(const uint64_t& id);
         std::map<std::string, std::string> getTlsDefaultSettings();
         std::vector<std::string> getSupportedCiphers(const std::string& accountID);