From 7ae5896bc8d9c480c70b0c29b32dfe4177bc9d77 Mon Sep 17 00:00:00 2001 From: Kevin Matz Date: Sat, 11 Sep 2021 14:29:17 -0400 Subject: [PATCH] correct more type defines --- platform/qt/qsacnuniverse.cpp | 2 +- platform/qt/qsacnuniverse.h | 2 +- protocol/otp/advertisement.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/platform/qt/qsacnuniverse.cpp b/platform/qt/qsacnuniverse.cpp index ef408b1..8ebcb63 100644 --- a/platform/qt/qsacnuniverse.cpp +++ b/platform/qt/qsacnuniverse.cpp @@ -91,7 +91,7 @@ double QSacnUniverse::rxRate() const * @param slot * @return */ -uint8_t QSacnUniverse::slot(const u_int16_t slot) const +uint8_t QSacnUniverse::slot(const uint16_t slot) const { return (universe_) ? universe_->slot(slot) : 0; } diff --git a/platform/qt/qsacnuniverse.h b/platform/qt/qsacnuniverse.h index 30a6c5b..76a7697 100644 --- a/platform/qt/qsacnuniverse.h +++ b/platform/qt/qsacnuniverse.h @@ -23,7 +23,7 @@ public: uint16_t number() const; uint8_t priority() const; double rxRate() const; - uint8_t slot(const u_int16_t) const; + uint8_t slot(const uint16_t) const; uint16_t activeSlots() const; bool isEditable() const; QList sources() const; diff --git a/protocol/otp/advertisement.h b/protocol/otp/advertisement.h index bc77027..cdfb6a6 100644 --- a/protocol/otp/advertisement.h +++ b/protocol/otp/advertisement.h @@ -109,7 +109,7 @@ struct name_data : PDU::pdu_data { union { - u_int8_t flags; + uint8_t flags; struct { uint8_t x_reserved : 7; bool response : 1; @@ -146,7 +146,7 @@ struct system_data : PDU::pdu_data { union { - u_int8_t flags; + uint8_t flags; struct { uint8_t x_reserved : 7; bool response : 1;