From ae2a03531ba8b2d76ac9f21fc48b3a5bb46b69ef Mon Sep 17 00:00:00 2001 From: Kevin Matz Date: Sat, 11 Sep 2021 13:54:32 -0400 Subject: [PATCH] uint -> unsigned int for MinGW --- example/sACN Explorer/universemodel.cpp | 4 ++-- protocol/acn/pdu.cpp | 2 +- protocol/dmx/universe.cpp | 2 +- protocol/dmx/universe.h | 2 +- protocol/rdm/device.cpp | 8 ++++---- protocol/rdm/device.h | 2 +- protocol/sacn/universe.cpp | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/example/sACN Explorer/universemodel.cpp b/example/sACN Explorer/universemodel.cpp index f9268c1..7697ba3 100644 --- a/example/sACN Explorer/universemodel.cpp +++ b/example/sACN Explorer/universemodel.cpp @@ -146,7 +146,7 @@ bool UniverseModel::setData(const QModelIndex &index, const QVariant &value, { if (!value.canConvert()) return false; - uint d = value.toUInt(); + unsigned int d = value.toUInt(); if (d > 255) return false; data = d; @@ -157,7 +157,7 @@ bool UniverseModel::setData(const QModelIndex &index, const QVariant &value, if (!value.canConvert()) return false; bool ok; - uint d = value.toString().toInt(&ok, 16); + unsigned int d = value.toString().toInt(&ok, 16); if (!ok || d > 255) return false; data = d; diff --git a/protocol/acn/pdu.cpp b/protocol/acn/pdu.cpp index 55555f6..03205e4 100644 --- a/protocol/acn/pdu.cpp +++ b/protocol/acn/pdu.cpp @@ -182,7 +182,7 @@ void Pdu::iStream(Stream stream) // length includes the flags, length, and vector. // the remainder of the length of header and data - uint hd_length = length - (flags_.hasLength ? 3 : 2) - vector_size_; + unsigned int hd_length = length - (flags_.hasLength ? 3 : 2) - vector_size_; // abort if the remaining PDU length isn't available if (!stream->good() || stream->available() < hd_length) diff --git a/protocol/dmx/universe.cpp b/protocol/dmx/universe.cpp index d2d1b90..dcd7e10 100644 --- a/protocol/dmx/universe.cpp +++ b/protocol/dmx/universe.cpp @@ -84,7 +84,7 @@ double Universe::rxRate() * @brief milliseconds since the last update * @return */ -uint Universe::rxAge() +unsigned int Universe::rxAge() { rx_timeout_(); if (!rx_times_.size()) diff --git a/protocol/dmx/universe.h b/protocol/dmx/universe.h index ddcd69f..2dceb9a 100644 --- a/protocol/dmx/universe.h +++ b/protocol/dmx/universe.h @@ -53,7 +53,7 @@ class Universe { virtual uint8_t slot (const uint16_t); virtual double rxRate(); - virtual uint rxAge(); + virtual unsigned int rxAge(); virtual void setValue (const uint16_t address, const uint8_t value); virtual void setValue (const uint16_t start, const uint16_t footprint, diff --git a/protocol/rdm/device.cpp b/protocol/rdm/device.cpp index 63d2e1b..038f2a6 100644 --- a/protocol/rdm/device.cpp +++ b/protocol/rdm/device.cpp @@ -423,10 +423,10 @@ void Device::actionGetSupportedParameters(const MsgPtr message, MsgPtr response) if (!message->requiredLength(0, response)) return; - uint count = parameters_.size(); - uint length = count * sizeof(PID); - uint lastPage = length / 0xfe; - uint first = ack_overflow_page * ( 0xfe / sizeof(PID) ); + unsigned int count = parameters_.size(); + unsigned int length = count * sizeof(PID); + unsigned int lastPage = length / 0xfe; + unsigned int first = ack_overflow_page * ( 0xfe / sizeof(PID) ); if (first >= count) { ack_overflow_page = 0; first = 0; diff --git a/protocol/rdm/device.h b/protocol/rdm/device.h index c5c73d1..c4eb242 100644 --- a/protocol/rdm/device.h +++ b/protocol/rdm/device.h @@ -103,7 +103,7 @@ protected: private: Device* parent_; PID last_rx_pid_ = 0; - uint ack_overflow_page = 0; + unsigned int ack_overflow_page = 0; uint8_t status_reporting_threshold_; bool identifying_ = false; diff --git a/protocol/sacn/universe.cpp b/protocol/sacn/universe.cpp index c6fc45a..c8204bd 100644 --- a/protocol/sacn/universe.cpp +++ b/protocol/sacn/universe.cpp @@ -425,7 +425,7 @@ void Universe::tx_loop_() /// > (corresponding to DMX512-A slot data) shall be sent before the /// > initiation of transmission suppression. DMX::DimmerData last_null_data({0}); - uint retransmission_count = 0; + unsigned int retransmission_count = 0; /// > 2. Thereafter, a single keep-alive packet shall be transmitted at /// > intervals of between 800mS and 1000mS.