1 files changed, 28 insertions, 16 deletions

diff --git a/src/CommonAPI/DBus/DBusInputStream.cpp b/src/CommonAPI/DBus/DBusInputStream.cpp
index 07964d8..ae2201a 100644
--- a/src/CommonAPI/DBus/DBusInputStream.cpp
+++ b/src/CommonAPI/DBus/DBusInputStream.cpp
@@ -11,7 +11,7 @@ namespace CommonAPI {
 namespace DBus {
 
 DBusInputStream::DBusInputStream(const CommonAPI::DBus::DBusMessage &_message)
-	: begin_(_message.getBodyData()),
+    : begin_(_message.getBodyData()),
       current_(0),
       size_(_message.getBodyLength()),
       exception_(nullptr),
@@ -33,7 +33,7 @@ void DBusInputStream::clearError() {
 }
 
 void DBusInputStream::align(const size_t _boundary) {
-    const unsigned int mask = _boundary - 1;
+    const unsigned int mask = static_cast<unsigned int>(_boundary) - 1;
     current_ = (current_ + mask) & (~mask);
 }
 
@@ -50,75 +50,86 @@ void DBusInputStream::setError() {
 }
 
 void DBusInputStream::pushPosition() {
-	positions_.push(current_);
+    positions_.push(current_);
 }
 
 size_t DBusInputStream::popPosition() {
-	size_t itsPosition = positions_.top();
-	positions_.pop();
-	return itsPosition;
+    size_t itsPosition = positions_.top();
+    positions_.pop();
+    return itsPosition;
 }
 
 void DBusInputStream::pushSize(size_t _size) {
-	sizes_.push(_size);
+    sizes_.push(static_cast<unsigned int>(_size));
 }
 
 size_t DBusInputStream::popSize() {
-	size_t itsSize = sizes_.top();
-	sizes_.pop();
-	return itsSize;
+    size_t itsSize = sizes_.top();
+    sizes_.pop();
+    return itsSize;
 }
 
 InputStream<DBusInputStream> &DBusInputStream::readValue(bool &_value, const EmptyDeployment *_depl) {
-	uint32_t tmp;
-	readValue(tmp, _depl);
-	if (tmp > 1)
-		setError();
-	_value = (tmp != 0);
-	return (*this);
+    uint32_t tmp;
+    readValue(tmp, _depl);
+    if (tmp > 1)
+        setError();
+    _value = (tmp != 0);
+    return (*this);
 }
 
 InputStream<DBusInputStream> &DBusInputStream::readValue(int8_t &_value, const EmptyDeployment *_depl) {
+    (void)_depl;
     return _readValue(_value);
 }
 
 InputStream<DBusInputStream> &DBusInputStream::readValue(int16_t &_value, const EmptyDeployment *_depl) {
+    (void)_depl;
     return _readValue(_value);
 }
 
 InputStream<DBusInputStream> &DBusInputStream::readValue(int32_t &_value, const EmptyDeployment *_depl) {
+    (void)_depl;
     return _readValue(_value);
 }
 
 InputStream<DBusInputStream> &DBusInputStream::readValue(int64_t &_value, const EmptyDeployment *_depl) {
+    (void)_depl;
     return _readValue(_value);
 }
 
 InputStream<DBusInputStream> &DBusInputStream::readValue(uint8_t &_value, const EmptyDeployment *_depl) {
+    (void)_depl;
     return _readValue(_value);
 }
 
 InputStream<DBusInputStream> &DBusInputStream::readValue(uint16_t &_value, const EmptyDeployment *_depl) {
+    (void)_depl;
     return _readValue(_value);
 }
 
 InputStream<DBusInputStream> &DBusInputStream::readValue(uint32_t &_value, const EmptyDeployment *_depl) {
+    (void)_depl;
     return _readValue(_value);
 }
 
 InputStream<DBusInputStream> &DBusInputStream::readValue(uint64_t &_value, const EmptyDeployment *_depl) {
+    (void)_depl;
     return _readValue(_value);
 }
 
 InputStream<DBusInputStream> &DBusInputStream::readValue(float &_value, const EmptyDeployment *_depl) {
+    (void)_depl;
     return _readValue(_value);
 }
 
 InputStream<DBusInputStream> &DBusInputStream::readValue(double &_value, const EmptyDeployment *_depl) {
+    (void)_depl;
     return _readValue(_value);
 }
 
 InputStream<DBusInputStream> &DBusInputStream::readValue(std::string &_value, const EmptyDeployment *_depl) {
+    (void)_depl;
     uint32_t length;
     _readValue(length);
 
@@ -132,6 +143,7 @@ InputStream<DBusInputStream> &DBusInputStream::readValue(std::string &_value, co
 }
 
 InputStream<DBusInputStream> &DBusInputStream::readValue(Version &_value, const EmptyDeployment *_depl) {
+    (void)_depl;
     align(8);
     _readValue(_value.Major);
     _readValue(_value.Minor);