Skip to content

Commit 808863f

Browse files
thekurtovicAdam
thekurtovic
authored and
Adam
committed
Add explicit keyword to constructors
Resolves cppcheck warnings noExplicitConstructor, useInitializationList, and passedByValue.
1 parent 15cb6bc commit 808863f

File tree

9 files changed

+45
-45
lines changed

9 files changed

+45
-45
lines changed

‎src/NimBLE2904.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ struct NimBLE2904Data {
3838
*/
3939
class NimBLE2904 : public NimBLEDescriptor {
4040
public:
41-
NimBLE2904(NimBLECharacteristic* pChr = nullptr);
41+
explicit NimBLE2904(NimBLECharacteristic* pChr = nullptr);
4242
static const uint8_t FORMAT_BOOLEAN = 1;
4343
static const uint8_t FORMAT_UINT2 = 2;
4444
static const uint8_t FORMAT_UINT4 = 3;

‎src/NimBLEAddress.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ class NimBLEAddress : private ble_addr_t {
4444
* @brief Create a blank address, i.e. 00:00:00:00:00:00, type 0.
4545
*/
4646
NimBLEAddress() = default;
47-
NimBLEAddress(const ble_addr_t address);
4847
NimBLEAddress(const uint8_t address[BLE_DEV_ADDR_LEN], uint8_t type);
4948
NimBLEAddress(const std::string& stringAddress, uint8_t type);
5049
NimBLEAddress(const uint64_t& address, uint8_t type);
50+
explicit NimBLEAddress(const ble_addr_t address);
5151

5252
bool isRpa() const;
5353
bool isNrpa() const;

‎src/NimBLEAttValue.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ class NimBLEAttValue {
8484
* @param[in] init_len The initial size in bytes.
8585
* @param[in] max_len The max size in bytes that the value can be.
8686
*/
87-
NimBLEAttValue(uint16_t init_len = CONFIG_NIMBLE_CPP_ATT_VALUE_INIT_LENGTH, uint16_t max_len = BLE_ATT_ATTR_MAX_LEN);
87+
explicit NimBLEAttValue(uint16_t init_len = CONFIG_NIMBLE_CPP_ATT_VALUE_INIT_LENGTH, uint16_t max_len = BLE_ATT_ATTR_MAX_LEN);
8888

8989
/**
9090
* @brief Construct with an initial value from a buffer.
@@ -99,7 +99,7 @@ class NimBLEAttValue {
9999
* @param value A pointer to the initial value to set.
100100
* @param[in] max_len The max size in bytes that the value can be.
101101
*/
102-
NimBLEAttValue(const char* value, uint16_t max_len = BLE_ATT_ATTR_MAX_LEN)
102+
explicit NimBLEAttValue(const char* value, uint16_t max_len = BLE_ATT_ATTR_MAX_LEN)
103103
: NimBLEAttValue((uint8_t*)value, (uint16_t)strlen(value), max_len) {}
104104

105105
/**
@@ -115,15 +115,15 @@ class NimBLEAttValue {
115115
* @param str A std::string containing to the initial value to set.
116116
* @param[in] max_len The max size in bytes that the value can be.
117117
*/
118-
NimBLEAttValue(const std::string str, uint16_t max_len = BLE_ATT_ATTR_MAX_LEN)
118+
explicit NimBLEAttValue(const std::string& str, uint16_t max_len = BLE_ATT_ATTR_MAX_LEN)
119119
: NimBLEAttValue(reinterpret_cast<const uint8_t*>(&str[0]), str.length(), max_len) {}
120120

121121
/**
122122
* @brief Construct with an initial value from a std::vector<uint8_t>.
123123
* @param vec A std::vector<uint8_t> containing to the initial value to set.
124124
* @param[in] max_len The max size in bytes that the value can be.
125125
*/
126-
NimBLEAttValue(const std::vector<uint8_t> vec, uint16_t max_len = BLE_ATT_ATTR_MAX_LEN)
126+
explicit NimBLEAttValue(const std::vector<uint8_t>& vec, uint16_t max_len = BLE_ATT_ATTR_MAX_LEN)
127127
: NimBLEAttValue(&vec[0], vec.size(), max_len) {}
128128

129129
# ifdef NIMBLE_CPP_ARDUINO_STRING_AVAILABLE

‎src/NimBLECharacteristic.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@ class NimBLE2904;
3939
*/
4040
class NimBLECharacteristic : public NimBLELocalValueAttribute {
4141
public:
42-
NimBLECharacteristic(const char* uuid,
43-
uint16_t properties = NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::WRITE,
44-
uint16_t maxLen = BLE_ATT_ATTR_MAX_LEN,
45-
NimBLEService* pService = nullptr);
46-
NimBLECharacteristic(const NimBLEUUID& uuid,
47-
uint16_t properties = NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::WRITE,
48-
uint16_t maxLen = BLE_ATT_ATTR_MAX_LEN,
49-
NimBLEService* pService = nullptr);
42+
explicit NimBLECharacteristic(const char* uuid,
43+
uint16_t properties = NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::WRITE,
44+
uint16_t maxLen = BLE_ATT_ATTR_MAX_LEN,
45+
NimBLEService* pService = nullptr);
46+
explicit NimBLECharacteristic(const NimBLEUUID& uuid,
47+
uint16_t properties = NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::WRITE,
48+
uint16_t maxLen = BLE_ATT_ATTR_MAX_LEN,
49+
NimBLEService* pService = nullptr);
5050

5151
~NimBLECharacteristic();
5252

‎src/NimBLEConnInfo.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,6 @@ class NimBLEConnInfo {
7878

7979
ble_gap_conn_desc m_desc{};
8080
NimBLEConnInfo() {};
81-
NimBLEConnInfo(ble_gap_conn_desc desc) { m_desc = desc; }
81+
explicit NimBLEConnInfo(ble_gap_conn_desc desc) : m_desc(desc) {}
8282
};
8383
#endif

‎src/NimBLEHIDDevice.cpp‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -46,23 +46,23 @@ static constexpr uint16_t bootOutputChrUuid = 0x2a32;
4646
*/
4747
NimBLEHIDDevice::NimBLEHIDDevice(NimBLEServer* server) {
4848
// Here we create mandatory services described in bluetooth specification
49-
m_deviceInfoSvc = server->createService(deviceInfoSvcUuid);
50-
m_hidSvc = server->createService(hidSvcUuid);
51-
m_batterySvc = server->createService(batterySvcUuid);
49+
m_deviceInfoSvc = server->createService(NimBLEUUID(deviceInfoSvcUuid));
50+
m_hidSvc = server->createService(NimBLEUUID(hidSvcUuid));
51+
m_batterySvc = server->createService(NimBLEUUID(batterySvcUuid));
5252

5353
// Mandatory characteristic for device info service
54-
m_pnpChr = m_deviceInfoSvc->createCharacteristic(pnpCharUuid, NIMBLE_PROPERTY::READ);
54+
m_pnpChr = m_deviceInfoSvc->createCharacteristic(NimBLEUUID(pnpCharUuid), NIMBLE_PROPERTY::READ);
5555

5656
// Mandatory characteristics for HID service
57-
m_hidInfoChr = m_hidSvc->createCharacteristic(hidInfoCharUuid, NIMBLE_PROPERTY::READ);
58-
m_reportMapChr = m_hidSvc->createCharacteristic(reportMapCharUuid, NIMBLE_PROPERTY::READ);
59-
m_hidControlChr = m_hidSvc->createCharacteristic(hidControlCharUuid, NIMBLE_PROPERTY::WRITE_NR);
57+
m_hidInfoChr = m_hidSvc->createCharacteristic(NimBLEUUID(hidInfoCharUuid), NIMBLE_PROPERTY::READ);
58+
m_reportMapChr = m_hidSvc->createCharacteristic(NimBLEUUID(reportMapCharUuid), NIMBLE_PROPERTY::READ);
59+
m_hidControlChr = m_hidSvc->createCharacteristic(NimBLEUUID(hidControlCharUuid), NIMBLE_PROPERTY::WRITE_NR);
6060
m_protocolModeChr =
61-
m_hidSvc->createCharacteristic(protocolModeCharUuid, NIMBLE_PROPERTY::WRITE_NR | NIMBLE_PROPERTY::READ);
61+
m_hidSvc->createCharacteristic(NimBLEUUID(protocolModeCharUuid), NIMBLE_PROPERTY::WRITE_NR | NIMBLE_PROPERTY::READ);
6262

6363
// Mandatory battery level characteristic with notification and presence descriptor
6464
m_batteryLevelChr =
65-
m_batterySvc->createCharacteristic(batteryLevelCharUuid, NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::NOTIFY);
65+
m_batterySvc->createCharacteristic(NimBLEUUID(batteryLevelCharUuid), NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::NOTIFY);
6666
NimBLE2904* batteryLevelDescriptor = m_batteryLevelChr->create2904();
6767
batteryLevelDescriptor->setFormat(NimBLE2904::FORMAT_UINT8);
6868
batteryLevelDescriptor->setUnit(0x27ad); // percentage
@@ -97,7 +97,7 @@ void NimBLEHIDDevice::startServices() {
9797
*/
9898
bool NimBLEHIDDevice::setManufacturer(const std::string& name) {
9999
if (m_manufacturerChr == nullptr) {
100-
m_manufacturerChr = m_deviceInfoSvc->createCharacteristic(m_manufacturerChrUuid, NIMBLE_PROPERTY::READ);
100+
m_manufacturerChr = m_deviceInfoSvc->createCharacteristic(NimBLEUUID(m_manufacturerChrUuid), NIMBLE_PROPERTY::READ);
101101
}
102102

103103
if (m_manufacturerChr) {
@@ -158,13 +158,13 @@ void NimBLEHIDDevice::setBatteryLevel(uint8_t level, bool notify) {
158158
* @return nullptr If the characteristic does not exist.
159159
*/
160160
NimBLECharacteristic* NimBLEHIDDevice::locateReportCharacteristicByIdAndType(uint8_t reportId, uint8_t reportType) {
161-
NimBLECharacteristic* candidate = m_hidSvc->getCharacteristic(inputReportChrUuid, 0);
161+
NimBLECharacteristic* candidate = m_hidSvc->getCharacteristic(NimBLEUUID(inputReportChrUuid), 0);
162162
for (uint16_t i = 1; (candidate != nullptr) && (i != 0); i++) {
163-
NimBLEDescriptor* dsc = candidate->getDescriptorByUUID(featureReportDscUuid);
163+
NimBLEDescriptor* dsc = candidate->getDescriptorByUUID(NimBLEUUID(featureReportDscUuid));
164164
NimBLEAttValue desc1_val_att = dsc->getValue();
165165
const uint8_t* desc1_val = desc1_val_att.data();
166166
if ((desc1_val[0] == reportId) && (desc1_val[1] == reportType)) return candidate;
167-
candidate = m_hidSvc->getCharacteristic(inputReportChrUuid, i);
167+
candidate = m_hidSvc->getCharacteristic(NimBLEUUID(inputReportChrUuid), i);
168168
}
169169
return nullptr;
170170
}
@@ -180,10 +180,10 @@ NimBLECharacteristic* NimBLEHIDDevice::getInputReport(uint8_t reportId) {
180180
NimBLECharacteristic* inputReportChr = locateReportCharacteristicByIdAndType(reportId, 0x01);
181181
if (inputReportChr == nullptr) {
182182
inputReportChr =
183-
m_hidSvc->createCharacteristic(inputReportChrUuid,
183+
m_hidSvc->createCharacteristic(NimBLEUUID(inputReportChrUuid),
184184
NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::NOTIFY | NIMBLE_PROPERTY::READ_ENC);
185185
NimBLEDescriptor* inputReportDsc =
186-
inputReportChr->createDescriptor(featureReportDscUuid, NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::READ_ENC);
186+
inputReportChr->createDescriptor(NimBLEUUID(featureReportDscUuid), NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::READ_ENC);
187187

188188
uint8_t desc1_val[] = {reportId, 0x01};
189189
inputReportDsc->setValue(desc1_val, 2);
@@ -203,11 +203,11 @@ NimBLECharacteristic* NimBLEHIDDevice::getOutputReport(uint8_t reportId) {
203203
NimBLECharacteristic* outputReportChr = locateReportCharacteristicByIdAndType(reportId, 0x02);
204204
if (outputReportChr == nullptr) {
205205
outputReportChr =
206-
m_hidSvc->createCharacteristic(inputReportChrUuid,
206+
m_hidSvc->createCharacteristic(NimBLEUUID(inputReportChrUuid),
207207
NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::WRITE | NIMBLE_PROPERTY::WRITE_NR |
208208
NIMBLE_PROPERTY::READ_ENC | NIMBLE_PROPERTY::WRITE_ENC);
209209
NimBLEDescriptor* outputReportDsc = outputReportChr->createDescriptor(
210-
featureReportDscUuid,
210+
NimBLEUUID(featureReportDscUuid),
211211
NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::WRITE | NIMBLE_PROPERTY::READ_ENC | NIMBLE_PROPERTY::WRITE_ENC);
212212
uint8_t desc1_val[] = {reportId, 0x02};
213213
outputReportDsc->setValue(desc1_val, 2);
@@ -227,10 +227,10 @@ NimBLECharacteristic* NimBLEHIDDevice::getFeatureReport(uint8_t reportId) {
227227
NimBLECharacteristic* featureReportChr = locateReportCharacteristicByIdAndType(reportId, 0x03);
228228
if (featureReportChr == nullptr) {
229229
featureReportChr = m_hidSvc->createCharacteristic(
230-
inputReportChrUuid,
230+
NimBLEUUID(inputReportChrUuid),
231231
NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::WRITE | NIMBLE_PROPERTY::READ_ENC | NIMBLE_PROPERTY::WRITE_ENC);
232232
NimBLEDescriptor* featureReportDsc = featureReportChr->createDescriptor(
233-
featureReportDscUuid,
233+
NimBLEUUID(featureReportDscUuid),
234234
NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::WRITE | NIMBLE_PROPERTY::READ_ENC | NIMBLE_PROPERTY::WRITE_ENC);
235235

236236
uint8_t desc1_val[] = {reportId, 0x03};
@@ -246,12 +246,12 @@ NimBLECharacteristic* NimBLEHIDDevice::getFeatureReport(uint8_t reportId) {
246246
* @details This will create the characteristic if not already created.
247247
*/
248248
NimBLECharacteristic* NimBLEHIDDevice::getBootInput() {
249-
NimBLECharacteristic* bootInputChr = m_hidSvc->getCharacteristic(bootInputChrUuid);
249+
NimBLECharacteristic* bootInputChr = m_hidSvc->getCharacteristic(NimBLEUUID(bootInputChrUuid));
250250
if (bootInputChr) {
251251
return bootInputChr;
252252
}
253253

254-
return m_hidSvc->createCharacteristic(bootInputChrUuid, NIMBLE_PROPERTY::NOTIFY);
254+
return m_hidSvc->createCharacteristic(NimBLEUUID(bootInputChrUuid), NIMBLE_PROPERTY::NOTIFY);
255255
} // getBootInput
256256

257257
/**
@@ -260,12 +260,12 @@ NimBLECharacteristic* NimBLEHIDDevice::getBootInput() {
260260
* @details This will create the characteristic if not already created.
261261
*/
262262
NimBLECharacteristic* NimBLEHIDDevice::getBootOutput() {
263-
NimBLECharacteristic* bootOutputChr = m_hidSvc->getCharacteristic(bootOutputChrUuid);
263+
NimBLECharacteristic* bootOutputChr = m_hidSvc->getCharacteristic(NimBLEUUID(bootOutputChrUuid));
264264
if (bootOutputChr) {
265265
return bootOutputChr;
266266
}
267267

268-
return m_hidSvc->createCharacteristic(bootOutputChrUuid,
268+
return m_hidSvc->createCharacteristic(NimBLEUUID(bootOutputChrUuid),
269269
NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::WRITE | NIMBLE_PROPERTY::WRITE_NR);
270270
} // getBootOutput
271271

‎src/NimBLEService.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ class NimBLEService;
3333
*/
3434
class NimBLEService : public NimBLELocalAttribute {
3535
public:
36-
NimBLEService(const char* uuid);
37-
NimBLEService(const NimBLEUUID& uuid);
36+
explicit NimBLEService(const char* uuid);
37+
explicit NimBLEService(const NimBLEUUID& uuid);
3838
~NimBLEService();
3939

4040
NimBLEServer* getServer() const;

‎src/NimBLEUUID.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ class NimBLEUUID {
4545
*/
4646
NimBLEUUID() = default;
4747
NimBLEUUID(const ble_uuid_any_t& uuid);
48-
NimBLEUUID(const std::string& uuid);
49-
NimBLEUUID(uint16_t uuid);
50-
NimBLEUUID(uint32_t uuid);
51-
NimBLEUUID(const ble_uuid128_t* uuid);
5248
NimBLEUUID(const uint8_t* pData, size_t size);
5349
NimBLEUUID(uint32_t first, uint16_t second, uint16_t third, uint64_t fourth);
50+
explicit NimBLEUUID(const std::string& uuid);
51+
explicit NimBLEUUID(uint16_t uuid);
52+
explicit NimBLEUUID(uint32_t uuid);
53+
explicit NimBLEUUID(const ble_uuid128_t* uuid);
5454

5555
uint8_t bitSize() const;
5656
const uint8_t* getValue() const;

‎src/NimBLEUtils.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class NimBLEAddress;
3030
* All items are optional, the m_pHandle will be set in taskWait().
3131
*/
3232
struct NimBLETaskData {
33-
NimBLETaskData(void* pInstance = nullptr, int flags = 0, void* buf = nullptr);
33+
explicit NimBLETaskData(void* pInstance = nullptr, int flags = 0, void* buf = nullptr);
3434
~NimBLETaskData();
3535
void* m_pInstance{nullptr};
3636
mutable int m_flags{0};

0 commit comments

Comments
 (0)