From ac921f8a29cabd4baf9b82a38878641efc3c6bc9 Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Wed, 28 Jul 2021 17:20:26 -0500 Subject: [PATCH] Fix some build warnings --- Controllers/AlienwareController/AlienwareController.cpp | 2 +- .../AsusAuraSMBusControllerDetect.cpp | 5 ----- .../AsusAuraUSBController/AsusAuraUSBControllerDetect.cpp | 4 ++-- .../QMKOpenRGBController/RGBController_QMKOpenRGBRev9.cpp | 6 +++--- .../QMKOpenRGBController/RGBController_QMKOpenRGBRevB.cpp | 6 +++--- Controllers/RazerController/RazerController.cpp | 2 +- .../SinowealthController/SinowealthControllerDetect.cpp | 4 ++-- .../SinowealthController/SinowealthKeyboardController.cpp | 2 +- 8 files changed, 13 insertions(+), 18 deletions(-) diff --git a/Controllers/AlienwareController/AlienwareController.cpp b/Controllers/AlienwareController/AlienwareController.cpp index 6fa8006c..0dc44ae6 100644 --- a/Controllers/AlienwareController/AlienwareController.cpp +++ b/Controllers/AlienwareController/AlienwareController.cpp @@ -132,7 +132,7 @@ AlienwareController::AlienwareController(hid_device* dev_handle, const hid_devic | It doesn't seem possible to read the controller's | | current state, hence the default value being set here.| \*-----------------------------------------------------*/ - for(unsigned int zone_idx; zone_idx < zones.size(); zone_idx++) + for(unsigned int zone_idx = 0; zone_idx < zones.size(); zone_idx++) { zones[zone_idx].color[0] = 0x000000; zones[zone_idx].color[1] = 0x000000; diff --git a/Controllers/AsusAuraSMBusController/AsusAuraSMBusControllerDetect.cpp b/Controllers/AsusAuraSMBusController/AsusAuraSMBusControllerDetect.cpp index 98e89bb1..64fddfba 100644 --- a/Controllers/AsusAuraSMBusController/AsusAuraSMBusControllerDetect.cpp +++ b/Controllers/AsusAuraSMBusController/AsusAuraSMBusControllerDetect.cpp @@ -199,13 +199,8 @@ void DetectAsusAuraSMBusDRAMControllers(std::vector &busse void DetectAsusAuraSMBusMotherboardControllers(std::vector &busses) { - AuraSMBusController* new_aura; - RGBController_AuraSMBus* new_controller; - for (unsigned int bus = 0; bus < busses.size(); bus++) { - int address_list_idx = -1; - // Add Aura-enabled motherboard controllers IF_MOBO_SMBUS(busses[bus]->pci_vendor, busses[bus]->pci_device) { diff --git a/Controllers/AsusAuraUSBController/AsusAuraUSBControllerDetect.cpp b/Controllers/AsusAuraUSBController/AsusAuraUSBControllerDetect.cpp index b09e7e40..5947e11b 100644 --- a/Controllers/AsusAuraUSBController/AsusAuraUSBControllerDetect.cpp +++ b/Controllers/AsusAuraUSBController/AsusAuraUSBControllerDetect.cpp @@ -81,7 +81,7 @@ void DetectAsusAuraUSBTerminal(hid_device_info* info, const std::string& name) } } -void DetectAsusAuraUSBAddressable(hid_device_info* info, const std::string& name) +void DetectAsusAuraUSBAddressable(hid_device_info* info, const std::string& /*name*/) { hid_device* dev = hid_open_path(info->path); @@ -95,7 +95,7 @@ void DetectAsusAuraUSBAddressable(hid_device_info* info, const std::string& name } } -void DetectAsusAuraUSBMotherboards(hid_device_info* info, const std::string& name) +void DetectAsusAuraUSBMotherboards(hid_device_info* info, const std::string& /*name*/) { hid_device* dev = hid_open_path(info->path); if(dev) diff --git a/Controllers/QMKOpenRGBController/RGBController_QMKOpenRGBRev9.cpp b/Controllers/QMKOpenRGBController/RGBController_QMKOpenRGBRev9.cpp index 669d7091..8b3efa6e 100644 --- a/Controllers/QMKOpenRGBController/RGBController_QMKOpenRGBRev9.cpp +++ b/Controllers/QMKOpenRGBController/RGBController_QMKOpenRGBRev9.cpp @@ -356,7 +356,7 @@ void RGBController_QMKOpenRGBRev9::SetupZones() /*---------------------------------------------------------*\ | Create LEDs | \*---------------------------------------------------------*/ - for(int led_idx = 0; led_idx < number_of_leds; led_idx++) + for(unsigned int led_idx = 0; led_idx < number_of_leds; led_idx++) { led keyboard_led; @@ -600,9 +600,9 @@ VectorMatrix RGBController_QMKOpenRGBRev9::MakeEmptyMatrixMap ) { std::vector > matrix_map(height); - for (int i = 0; i < height; i++) + for (unsigned int i = 0; i < height; i++) { - for (int j = 0; j < width; j++) + for (unsigned int j = 0; j < width; j++) { matrix_map[i].push_back(NO_LED); } diff --git a/Controllers/QMKOpenRGBController/RGBController_QMKOpenRGBRevB.cpp b/Controllers/QMKOpenRGBController/RGBController_QMKOpenRGBRevB.cpp index e979a919..4b139c40 100644 --- a/Controllers/QMKOpenRGBController/RGBController_QMKOpenRGBRevB.cpp +++ b/Controllers/QMKOpenRGBController/RGBController_QMKOpenRGBRevB.cpp @@ -367,7 +367,7 @@ void RGBController_QMKOpenRGBRevB::SetupZones() /*---------------------------------------------------------*\ | Create LEDs | \*---------------------------------------------------------*/ - for(int led_idx = 0; led_idx < number_of_leds; led_idx++) + for(unsigned int led_idx = 0; led_idx < number_of_leds; led_idx++) { led keyboard_led; @@ -622,9 +622,9 @@ VectorMatrix RGBController_QMKOpenRGBRevB::MakeEmptyMatrixMap ) { std::vector > matrix_map(height); - for (int i = 0; i < height; i++) + for (unsigned int i = 0; i < height; i++) { - for (int j = 0; j < width; j++) + for (unsigned int j = 0; j < width; j++) { matrix_map[i].push_back(NO_LED); } diff --git a/Controllers/RazerController/RazerController.cpp b/Controllers/RazerController/RazerController.cpp index 7e4077bc..7c983712 100644 --- a/Controllers/RazerController/RazerController.cpp +++ b/Controllers/RazerController/RazerController.cpp @@ -774,7 +774,7 @@ razer_report RazerController::razer_create_mode_breathing_random_extended_matrix return report; } -razer_report RazerController::razer_create_mode_breathing_random_standard_matrix_report(unsigned char variable_storage, unsigned char led_id) +razer_report RazerController::razer_create_mode_breathing_random_standard_matrix_report(unsigned char /*variable_storage*/, unsigned char /*led_id*/) { razer_report report = razer_create_report(0x03, 0x0A, 0x08); diff --git a/Controllers/SinowealthController/SinowealthControllerDetect.cpp b/Controllers/SinowealthController/SinowealthControllerDetect.cpp index 1e9edf14..c8e8170e 100644 --- a/Controllers/SinowealthController/SinowealthControllerDetect.cpp +++ b/Controllers/SinowealthController/SinowealthControllerDetect.cpp @@ -73,7 +73,7 @@ void DetectSinowealthMouse(hid_device_info* info, const std::string& name) } else { - for(int i = 0; i < usage_count; ++i) + for(unsigned int i = 0; i < usage_count; ++i) { if(usages[i]) { @@ -109,7 +109,7 @@ void DetectSinowealthKeyboard(hid_device_info* info, const std::string& name) } else { - for(int i = 0; i < usage_count; ++i) + for(unsigned int i = 0; i < usage_count; ++i) { if(usages[i]) { diff --git a/Controllers/SinowealthController/SinowealthKeyboardController.cpp b/Controllers/SinowealthController/SinowealthKeyboardController.cpp index 61374352..dfde6c01 100644 --- a/Controllers/SinowealthController/SinowealthKeyboardController.cpp +++ b/Controllers/SinowealthController/SinowealthKeyboardController.cpp @@ -151,7 +151,7 @@ void SinowealthKeyboardController::SetLEDsDirect(std::vector colors) /*-----------------------------------------------------*\ | Fill in color data | \*-----------------------------------------------------*/ - for(int i = 0; i < num_keys; i++) + for(unsigned int i = 0; i < num_keys; i++) { buf[tkl_keys_per_key_index[i]] = RGBGetBValue(colors[i]); buf[tkl_keys_per_key_index[i] + 0x7E] = RGBGetGValue(colors[i]);