Remove ssu dependency

mts/common/mtptypes.h

@@ -218,7 +218,7 @@ Q_DECLARE_METATYPE(MTPEventCode);
 typedef quint16 MTPContainerType;
 
 
-#define MTP_HEADER_SIZE  (2*sizeof(quint32) + 2*sizeof(quint16) )
+#define MTP_HEADER_SIZE  (2*sizeof(quint32) + 2*sizeof(quint16))
 #define MTP_STORAGE_INFO_SIZE ((2 * sizeof(quint64)) +\
                                (1 * sizeof(quint32)) +\
                                (2 * sizeof(quint8)) +\
@@ -709,7 +709,7 @@ struct MtpInt128 {
     }
 
     // Constructor taking upper and lower 8 bytes.
-    MtpInt128( quint64 lower, quint64 upper = 0 )
+    MtpInt128(quint64 lower, quint64 upper = 0)
     {
         for (qint32 i = 0; i < 8; i++) {
             val[i] = lower & 0xFF;
@@ -721,6 +721,14 @@ struct MtpInt128 {
         }
     }
 
+    // copy constructor
+    MtpInt128(const MtpInt128 &other)
+    {
+        for (qint32 i = 0; i < 16; i++) {
+            val[i] = other.val[i];
+        }
+    }
+
     // Increment operator
     MtpInt128 &operator++()
     {
@@ -731,15 +739,15 @@ struct MtpInt128 {
 
         // If the lower 8 bytes overflowed
         // due to this increment, increment the upper 8 bytes.
-        if ( !*lower ) {
+        if (!*lower) {
             ++*upper;
         }
 
         return *this;
     }
 
     // Compares two MtpInt128's
-    int compare( const MtpInt128 &rhs ) const
+    int compare(const MtpInt128 &rhs) const
     {
         int diff = 0;
         for (qint32 i = 15; ((i >= 0) && (0 == diff)) ; i--) {
@@ -748,9 +756,9 @@ struct MtpInt128 {
         return diff;
     }
 
-    bool operator==( const MtpInt128 &rhs ) const
+    bool operator==(const MtpInt128 &rhs) const
     {
-        return (0 == compare(rhs)) ? true : false;
+        return 0 == compare(rhs);
     }
 
     bool operator<(const MtpInt128 &rhs) const
@@ -764,7 +772,7 @@ struct MtpInt128 {
     }
 
     // Assignment operator
-    MtpInt128 &operator=( const MtpInt128 &rhs )
+    MtpInt128 &operator=(const MtpInt128 &rhs)
     {
         for (qint32 i = 0; i < 16; i++) {
             val[i] = rhs.val[i];
@@ -874,7 +882,7 @@ struct MTPObjectInfo {
     {
         bool differs = false;
 #define CMP(memb) do {\
-    if( this->memb != that->memb ) { \
+    if (this->memb != that->memb) { \
         MTP_LOG_TRACE(#memb":" << this->memb << "->" << that->memb);\
         differs = true;\
     }\

mts/platform/deviceinfo/deviceinfoprovider.cpp

@@ -30,25 +30,21 @@
 *
 */
 
-#include "deviceinfoprovider.h"
 #include <QTimer>
-#include <ssudeviceinfo.h>
 #include <batterystatus.h>
 #include <deviceinfo.h>
+
 #include "trace.h"
+#include "deviceinfoprovider.h"
 
 using namespace meegomtp1dot0;
 
-/**********************************************
- * DeviceInfoProvider::DeviceInfoProvider
- *********************************************/
 DeviceInfoProvider::DeviceInfoProvider()
     : m_batteryStatus(new BatteryStatus(this))
 {
-    DeviceInfo deviceInfo;
-    SsuDeviceInfo ssuDeviceInfo;
+    DeviceInfo deviceInfo(true);
 
-    m_serialNo = ssuDeviceInfo.deviceUid();
+    m_serialNo = deviceInfo.deviceUid();
     m_deviceVersion = deviceInfo.osVersion();
     m_manufacturer = deviceInfo.manufacturer();
     m_model = deviceInfo.prettyName();
@@ -63,9 +59,6 @@ DeviceInfoProvider::DeviceInfoProvider()
     }
 }
 
-/**********************************************
- * DeviceInfoProvider::~DeviceInfoProvider
- *********************************************/
 DeviceInfoProvider::~DeviceInfoProvider()
 {
 }

mts/platform/deviceinfo/deviceinfoprovider.h

@@ -52,10 +52,7 @@ class DeviceInfoProvider : public MtpDeviceInfo
     friend class DeviceInfoProvider_Test;
 #endif
 public:
-    /// Constructor.
     DeviceInfoProvider();
-
-    /// Destructor.
     ~DeviceInfoProvider();
 
 private:

rpm/buteo-mtp-qt5.spec

@@ -16,7 +16,6 @@ BuildRequires: pkgconfig(mount)
 BuildRequires: pkgconfig(mlite5)
 # for the thumbnailer unit test
 BuildRequires: pkgconfig(Qt5Gui)
-BuildRequires: ssu-devel >= 0.37.9
 BuildRequires: pkgconfig(systemsettings) >= 0.6.0
 BuildRequires: pkgconfig(nemodbus) >= 2.1.16
 Requires: mtp-vendor-configuration