1 files changed, 28 insertions, 84 deletions

diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/PeripheralUtils.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/PeripheralUtils.h
index c2efc05..9b2a43f 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/PeripheralUtils.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/PeripheralUtils.h
@@ -1,22 +1,11 @@
 /*
- *      Copyright (C) 2014-2017 Team Kodi
- *      http://kodi.tv
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this Program; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
+ *  Copyright (C) 2014-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
  *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
  */
+
 #pragma once
 
 #include "Peripheral.h"
@@ -97,10 +86,7 @@ namespace addon
   public:
     Peripheral(PERIPHERAL_TYPE type = PERIPHERAL_TYPE_UNKNOWN, const std::string& strName = "") :
       m_type(type),
-      m_strName(strName),
-      m_vendorId(0),
-      m_productId(0),
-      m_index(0)
+      m_strName(strName)
     {
     }
 
@@ -149,9 +135,9 @@ namespace addon
   private:
     PERIPHERAL_TYPE  m_type;
     std::string      m_strName;
-    uint16_t         m_vendorId;
-    uint16_t         m_productId;
-    unsigned int     m_index;
+    uint16_t         m_vendorId = 0;
+    uint16_t         m_productId = 0;
+    unsigned int     m_index = 0;
   };
 
   typedef PeripheralVector<Peripheral, PERIPHERAL_INFO> Peripherals;
@@ -259,12 +245,7 @@ namespace addon
     Joystick(const std::string& provider = "", const std::string& strName = "") :
       Peripheral(PERIPHERAL_TYPE_JOYSTICK, strName),
       m_provider(provider),
-      m_requestedPort(NO_PORT_REQUESTED),
-      m_buttonCount(0),
-      m_hatCount(0),
-      m_axisCount(0),
-      m_motorCount(0),
-      m_supportsPowerOff(false)
+      m_requestedPort(NO_PORT_REQUESTED)
     {
     }
 
@@ -345,11 +326,11 @@ namespace addon
   private:
     std::string                   m_provider;
     int                           m_requestedPort;
-    unsigned int                  m_buttonCount;
-    unsigned int                  m_hatCount;
-    unsigned int                  m_axisCount;
-    unsigned int                  m_motorCount;
-    bool                          m_supportsPowerOff;
+    unsigned int                  m_buttonCount = 0;
+    unsigned int                  m_hatCount = 0;
+    unsigned int                  m_axisCount = 0;
+    unsigned int                  m_motorCount = 0;
+    bool                          m_supportsPowerOff = false;
   };
 
   typedef PeripheralVector<Joystick, JOYSTICK_INFO> Joysticks;
@@ -402,12 +383,7 @@ namespace addon
      */
     DriverPrimitive(JOYSTICK_DRIVER_PRIMITIVE_TYPE type, unsigned int driverIndex) :
       m_type(type),
-      m_driverIndex(driverIndex),
-      m_hatDirection(JOYSTICK_DRIVER_HAT_UNKNOWN),
-      m_center(0),
-      m_semiAxisDirection(JOYSTICK_DRIVER_SEMIAXIS_UNKNOWN),
-      m_range(1),
-      m_relPointerDirection(JOYSTICK_DRIVER_RELPOINTER_UNKNOWN)
+      m_driverIndex(driverIndex)
     {
     }
 
@@ -415,16 +391,7 @@ namespace addon
     /*!
      * \brief Construct an invalid driver primitive
      */
-    DriverPrimitive(void) :
-      m_type(JOYSTICK_DRIVER_PRIMITIVE_TYPE_UNKNOWN),
-      m_driverIndex(0),
-      m_hatDirection(JOYSTICK_DRIVER_HAT_UNKNOWN),
-      m_center(0),
-      m_semiAxisDirection(JOYSTICK_DRIVER_SEMIAXIS_UNKNOWN),
-      m_range(1),
-      m_relPointerDirection(JOYSTICK_DRIVER_RELPOINTER_UNKNOWN)
-    {
-    }
+    DriverPrimitive(void) = default;
 
     /*!
      * \brief Construct a driver primitive representing a joystick button
@@ -441,11 +408,7 @@ namespace addon
     DriverPrimitive(unsigned int hatIndex, JOYSTICK_DRIVER_HAT_DIRECTION direction) :
       m_type(JOYSTICK_DRIVER_PRIMITIVE_TYPE_HAT_DIRECTION),
       m_driverIndex(hatIndex),
-      m_hatDirection(direction),
-      m_center(0),
-      m_semiAxisDirection(JOYSTICK_DRIVER_SEMIAXIS_UNKNOWN),
-      m_range(1),
-      m_relPointerDirection(JOYSTICK_DRIVER_RELPOINTER_UNKNOWN)
+      m_hatDirection(direction)
     {
     }
 
@@ -456,11 +419,9 @@ namespace addon
     DriverPrimitive(unsigned int axisIndex, int center, JOYSTICK_DRIVER_SEMIAXIS_DIRECTION direction, unsigned int range) :
       m_type(JOYSTICK_DRIVER_PRIMITIVE_TYPE_SEMIAXIS),
       m_driverIndex(axisIndex),
-      m_hatDirection(JOYSTICK_DRIVER_HAT_UNKNOWN),
       m_center(center),
       m_semiAxisDirection(direction),
-      m_range(range),
-      m_relPointerDirection(JOYSTICK_DRIVER_RELPOINTER_UNKNOWN)
+      m_range(range)
     {
     }
 
@@ -477,13 +438,7 @@ namespace addon
      */
     DriverPrimitive(std::string keycode) :
       m_type(JOYSTICK_DRIVER_PRIMITIVE_TYPE_KEY),
-      m_driverIndex(0),
-      m_hatDirection(JOYSTICK_DRIVER_HAT_UNKNOWN),
-      m_center(0),
-      m_semiAxisDirection(JOYSTICK_DRIVER_SEMIAXIS_UNKNOWN),
-      m_range(1),
-      m_keycode(std::move(keycode)),
-      m_relPointerDirection(JOYSTICK_DRIVER_RELPOINTER_UNKNOWN)
+      m_keycode(std::move(keycode))
     {
     }
 
@@ -501,23 +456,12 @@ namespace addon
      */
     DriverPrimitive(JOYSTICK_DRIVER_RELPOINTER_DIRECTION direction) :
       m_type(JOYSTICK_DRIVER_PRIMITIVE_TYPE_RELPOINTER_DIRECTION),
-      m_driverIndex(0),
-      m_hatDirection(JOYSTICK_DRIVER_HAT_UNKNOWN),
-      m_center(0),
-      m_semiAxisDirection(JOYSTICK_DRIVER_SEMIAXIS_UNKNOWN),
-      m_range(1),
       m_relPointerDirection(direction)
     {
     }
 
     explicit DriverPrimitive(const JOYSTICK_DRIVER_PRIMITIVE& primitive) :
-      m_type(primitive.type),
-      m_driverIndex(0),
-      m_hatDirection(JOYSTICK_DRIVER_HAT_UNKNOWN),
-      m_center(0),
-      m_semiAxisDirection(JOYSTICK_DRIVER_SEMIAXIS_UNKNOWN),
-      m_range(1),
-      m_relPointerDirection(JOYSTICK_DRIVER_RELPOINTER_UNKNOWN)
+      m_type(primitive.type)
     {
       switch (m_type)
       {
@@ -677,14 +621,14 @@ namespace addon
     }
 
   private:
-    JOYSTICK_DRIVER_PRIMITIVE_TYPE     m_type;
-    unsigned int                       m_driverIndex;
-    JOYSTICK_DRIVER_HAT_DIRECTION      m_hatDirection;
-    int                                m_center;
-    JOYSTICK_DRIVER_SEMIAXIS_DIRECTION m_semiAxisDirection;
-    unsigned int                       m_range;
+    JOYSTICK_DRIVER_PRIMITIVE_TYPE     m_type = JOYSTICK_DRIVER_PRIMITIVE_TYPE_UNKNOWN;
+    unsigned int                       m_driverIndex = 0;
+    JOYSTICK_DRIVER_HAT_DIRECTION      m_hatDirection = JOYSTICK_DRIVER_HAT_UNKNOWN;
+    int                                m_center = 0;
+    JOYSTICK_DRIVER_SEMIAXIS_DIRECTION m_semiAxisDirection = JOYSTICK_DRIVER_SEMIAXIS_UNKNOWN;
+    unsigned int                       m_range = 1;
     std::string                        m_keycode;
-    JOYSTICK_DRIVER_RELPOINTER_DIRECTION m_relPointerDirection;
+    JOYSTICK_DRIVER_RELPOINTER_DIRECTION m_relPointerDirection = JOYSTICK_DRIVER_RELPOINTER_UNKNOWN;
   };
 
   typedef PeripheralVector<DriverPrimitive, JOYSTICK_DRIVER_PRIMITIVE> DriverPrimitives;