From 5616f547e457d3a47161bf39e8d766f4b0d56f3c Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Thu, 29 Apr 2021 13:42:49 -0500 Subject: [PATCH] Fix a bunch of warnings --- .../ASRockPolychromeUSBControllerDetect.cpp | 4 ++-- .../RGBController_ASRockPolychromeUSB.cpp | 12 ------------ .../AsusAuraMainboardController.cpp | 4 ++-- .../CoolerMasterController/CMARGBcontroller.cpp | 2 +- .../RGBController_CMMP750Controller.cpp | 2 +- .../EVGAGPUController/RGBController_EVGAGPUv2.cpp | 2 ++ .../EVisionKeyboardControllerDetect.cpp | 4 ++-- .../RGBController_LogitechG560.cpp | 4 ++-- .../MSIMysticLightControllerDetect.cpp | 4 ++-- Controllers/RazerController/RGBController_Razer.cpp | 4 ++-- .../RGBController_RazerAddressable.cpp | 4 ++-- .../RazerController/RGBController_RazerKraken.cpp | 4 ++-- Controllers/RazerController/RazerController.h | 4 ++-- Controllers/RazerController/RazerKrakenController.h | 2 +- .../RGBController_SteelSeriesOldApex.cpp | 4 ++-- .../SteelSeriesApexMController.cpp | 2 +- .../WootingKeyboardController.cpp | 4 ++++ ProfileManager.cpp | 3 --- RGBController/RGBController.h | 2 +- i2c_smbus/i2c_smbus_linux.cpp | 1 - qt/OpenRGBDevicePage.cpp | 2 +- 21 files changed, 32 insertions(+), 42 deletions(-) diff --git a/Controllers/ASRockPolychromeUSBController/ASRockPolychromeUSBControllerDetect.cpp b/Controllers/ASRockPolychromeUSBController/ASRockPolychromeUSBControllerDetect.cpp index 7ae93784..e3a32f1e 100644 --- a/Controllers/ASRockPolychromeUSBController/ASRockPolychromeUSBControllerDetect.cpp +++ b/Controllers/ASRockPolychromeUSBController/ASRockPolychromeUSBControllerDetect.cpp @@ -20,7 +20,7 @@ #define ASROCK_MOTHERBOARD_1_PID 0x01A2 #define ASROCK_DESKMINI_ADDRESSABLE_LED_STRIP_PID 0x01A6 -void DetectPolychromeUSBControllers(hid_device_info* info, const std::string& name) +void DetectPolychromeUSBControllers(hid_device_info* info, const std::string& /*name*/) { hid_device* dev = hid_open_path(info->path); @@ -33,4 +33,4 @@ void DetectPolychromeUSBControllers(hid_device_info* info, const std::string& na } REGISTER_HID_DETECTOR("ASRock Polychrome USB", DetectPolychromeUSBControllers, ASROCK_VID, ASROCK_MOTHERBOARD_1_PID); -REGISTER_HID_DETECTOR("ASRock Deskmini Addressable LED Strip", DetectPolychromeUSBControllers, ASROCK_VID, ASROCK_DESKMINI_ADDRESSABLE_LED_STRIP_PID); \ No newline at end of file +REGISTER_HID_DETECTOR("ASRock Deskmini Addressable LED Strip", DetectPolychromeUSBControllers, ASROCK_VID, ASROCK_DESKMINI_ADDRESSABLE_LED_STRIP_PID); diff --git a/Controllers/ASRockPolychromeUSBController/RGBController_ASRockPolychromeUSB.cpp b/Controllers/ASRockPolychromeUSBController/RGBController_ASRockPolychromeUSB.cpp index 3cbbfeb9..41d16862 100755 --- a/Controllers/ASRockPolychromeUSBController/RGBController_ASRockPolychromeUSB.cpp +++ b/Controllers/ASRockPolychromeUSBController/RGBController_ASRockPolychromeUSB.cpp @@ -171,16 +171,6 @@ RGBController_PolychromeUSB::RGBController_PolychromeUSB(PolychromeUSBController void RGBController_PolychromeUSB::SetupZones() { - /*-------------------------------------------------*\ - | Only set LED count on the first run | - \*-------------------------------------------------*/ - bool first_run = false; - - if(zones.size() == 0) - { - first_run = true; - } - /*-------------------------------------------------*\ | Clear any existing color/LED configuration | \*-------------------------------------------------*/ @@ -191,7 +181,6 @@ void RGBController_PolychromeUSB::SetupZones() /*-------------------------------------------------*\ | Set zones and leds | \*-------------------------------------------------*/ - int addressableCounter = 1; for(unsigned int channel_idx = 0; channel_idx < zones.size(); channel_idx++) { PolychromeDeviceInfo device_info = polychrome->GetPolychromeDevices()[channel_idx]; @@ -316,7 +305,6 @@ void RGBController_PolychromeUSB::UpdateSingleLED(int led) unsigned char RGBController_PolychromeUSB::GetDeviceMode(unsigned char zone) { int dev_mode; - int color_mode = MODE_COLORS_PER_LED; dev_mode = polychrome->GetZoneConfig(zone).mode; active_mode = dev_mode; diff --git a/Controllers/AsusAuraUSBController/AsusAuraMainboardController.cpp b/Controllers/AsusAuraUSBController/AsusAuraMainboardController.cpp index 4f7104b0..8e7899c4 100644 --- a/Controllers/AsusAuraUSBController/AsusAuraMainboardController.cpp +++ b/Controllers/AsusAuraUSBController/AsusAuraMainboardController.cpp @@ -142,7 +142,7 @@ void AuraMainboardController::SendEffect void AuraMainboardController::SendColor ( - unsigned char channel, + unsigned char /*channel*/, unsigned char start_led, unsigned char led_count, unsigned char* led_data @@ -196,4 +196,4 @@ void AuraMainboardController::SendCommit() | Send packet | \*-----------------------------------------------------*/ hid_write(dev, usb_buf, 65); -} \ No newline at end of file +} diff --git a/Controllers/CoolerMasterController/CMARGBcontroller.cpp b/Controllers/CoolerMasterController/CMARGBcontroller.cpp index 1ebd8ac5..98750b1f 100644 --- a/Controllers/CoolerMasterController/CMARGBcontroller.cpp +++ b/Controllers/CoolerMasterController/CMARGBcontroller.cpp @@ -204,7 +204,7 @@ void CMARGBController::SetLedsDirect(RGBColor *led_colours, unsigned int led_cou /*---------------------------------------------*\ | Set up the RGB triplets to send | \*---------------------------------------------*/ - for(int i = 0; i < led_count; i++) + for(unsigned int i = 0; i < led_count; i++) { RGBColor colour = led_colours[i]; diff --git a/Controllers/CoolerMasterController/RGBController_CMMP750Controller.cpp b/Controllers/CoolerMasterController/RGBController_CMMP750Controller.cpp index f79a3e8a..b2688e60 100644 --- a/Controllers/CoolerMasterController/RGBController_CMMP750Controller.cpp +++ b/Controllers/CoolerMasterController/RGBController_CMMP750Controller.cpp @@ -87,7 +87,7 @@ RGBController_CMMP750Controller::~RGBController_CMMP750Controller() int RGBController_CMMP750Controller::GetDeviceMode() { int temp_mode = cmmp750->GetMode(); - for( int i = 0; i < modes.size(); i++) + for(unsigned int i = 0; i < modes.size(); i++) { if (temp_mode == modes[i].value) { diff --git a/Controllers/EVGAGPUController/RGBController_EVGAGPUv2.cpp b/Controllers/EVGAGPUController/RGBController_EVGAGPUv2.cpp index 3cb73639..7728e3c2 100644 --- a/Controllers/EVGAGPUController/RGBController_EVGAGPUv2.cpp +++ b/Controllers/EVGAGPUController/RGBController_EVGAGPUv2.cpp @@ -124,6 +124,8 @@ int RGBController_EVGAGPUv2::getModeIndex(unsigned char mode_value) return mode_index; } } + + return 0; } void RGBController_EVGAGPUv2::SetupZones() diff --git a/Controllers/EVisionKeyboardController/EVisionKeyboardControllerDetect.cpp b/Controllers/EVisionKeyboardController/EVisionKeyboardControllerDetect.cpp index b93d136e..6aea8b76 100644 --- a/Controllers/EVisionKeyboardController/EVisionKeyboardControllerDetect.cpp +++ b/Controllers/EVisionKeyboardController/EVisionKeyboardControllerDetect.cpp @@ -24,7 +24,7 @@ * * \******************************************************************************************/ -void DetectEVisionKeyboards(hid_device_info* info, const std::string& name) +void DetectEVisionKeyboards(hid_device_info* info, const std::string& /*name*/) { hid_device* dev = hid_open_path(info->path); if( dev ) @@ -43,4 +43,4 @@ REGISTER_HID_DETECTOR_IP("EVision Keyboard 0C45:5204", DetectEVisionKeyboards, REGISTER_HID_DETECTOR_IP("EVision Keyboard 0C45:5104", DetectEVisionKeyboards, EVISION_KEYBOARD_VID, REDRAGON_K552_PID, 1, EVISION_KEYBOARD_USAGE_PAGE); REGISTER_HID_DETECTOR_IP("EVision Keyboard 0C45:5004", DetectEVisionKeyboards, EVISION_KEYBOARD_VID, REDRAGON_K556_PID, 1, EVISION_KEYBOARD_USAGE_PAGE); REGISTER_HID_DETECTOR_IP("EVision Keyboard 0C45:652F", DetectEVisionKeyboards, EVISION_KEYBOARD_VID, TECWARE_PHANTOM_ELITE_PID, 1, EVISION_KEYBOARD_USAGE_PAGE); -REGISTER_HID_DETECTOR_IP("EVision Keyboard 0C45:8520", DetectEVisionKeyboards, EVISION_KEYBOARD_VID, WARRIOR_KANE_TC235, 1, EVISION_KEYBOARD_USAGE_PAGE); \ No newline at end of file +REGISTER_HID_DETECTOR_IP("EVision Keyboard 0C45:8520", DetectEVisionKeyboards, EVISION_KEYBOARD_VID, WARRIOR_KANE_TC235, 1, EVISION_KEYBOARD_USAGE_PAGE); diff --git a/Controllers/LogitechController/RGBController_LogitechG560.cpp b/Controllers/LogitechController/RGBController_LogitechG560.cpp index 7bea882b..2588ae69 100644 --- a/Controllers/LogitechController/RGBController_LogitechG560.cpp +++ b/Controllers/LogitechController/RGBController_LogitechG560.cpp @@ -118,12 +118,12 @@ void RGBController_LogitechG560::DeviceUpdateLEDs() } } -void RGBController_LogitechG560::UpdateZoneLEDs(int zone) +void RGBController_LogitechG560::UpdateZoneLEDs(int /*zone*/) { DeviceUpdateLEDs(); } -void RGBController_LogitechG560::UpdateSingleLED(int led) +void RGBController_LogitechG560::UpdateSingleLED(int /*led*/) { DeviceUpdateLEDs(); } diff --git a/Controllers/MSIMysticLightController/MSIMysticLightControllerDetect.cpp b/Controllers/MSIMysticLightController/MSIMysticLightControllerDetect.cpp index 4c012d4f..fb0fad8b 100644 --- a/Controllers/MSIMysticLightController/MSIMysticLightControllerDetect.cpp +++ b/Controllers/MSIMysticLightController/MSIMysticLightControllerDetect.cpp @@ -23,7 +23,7 @@ * * \******************************************************************************************/ -void DetectMSIMysticLight162Controllers(hid_device_info* info, const std::string& name) +void DetectMSIMysticLight162Controllers(hid_device_info* info, const std::string& /*name*/) { hid_device* dev = hid_open_path(info->path); @@ -44,7 +44,7 @@ void DetectMSIMysticLight162Controllers(hid_device_info* info, const std::string * * \******************************************************************************************/ -void DetectMSIMysticLight185Controllers(hid_device_info* info, const std::string& name) +void DetectMSIMysticLight185Controllers(hid_device_info* info, const std::string& /*name*/) { hid_device* dev = hid_open_path(info->path); diff --git a/Controllers/RazerController/RGBController_Razer.cpp b/Controllers/RazerController/RGBController_Razer.cpp index 58098bae..ce50c822 100644 --- a/Controllers/RazerController/RGBController_Razer.cpp +++ b/Controllers/RazerController/RGBController_Razer.cpp @@ -182,12 +182,12 @@ void RGBController_Razer::DeviceUpdateLEDs() controller->SetLEDs(&colors[0]); } -void RGBController_Razer::UpdateZoneLEDs(int zone) +void RGBController_Razer::UpdateZoneLEDs(int /*zone*/) { DeviceUpdateLEDs(); } -void RGBController_Razer::UpdateSingleLED(int led) +void RGBController_Razer::UpdateSingleLED(int /*led*/) { DeviceUpdateLEDs(); } diff --git a/Controllers/RazerController/RGBController_RazerAddressable.cpp b/Controllers/RazerController/RGBController_RazerAddressable.cpp index 781b907c..ff6314bf 100644 --- a/Controllers/RazerController/RGBController_RazerAddressable.cpp +++ b/Controllers/RazerController/RGBController_RazerAddressable.cpp @@ -224,12 +224,12 @@ void RGBController_RazerAddressable::DeviceUpdateLEDs() controller->SetLEDs(&colors_buf[0]); } -void RGBController_RazerAddressable::UpdateZoneLEDs(int zone) +void RGBController_RazerAddressable::UpdateZoneLEDs(int /*zone*/) { DeviceUpdateLEDs(); } -void RGBController_RazerAddressable::UpdateSingleLED(int led) +void RGBController_RazerAddressable::UpdateSingleLED(int /*led*/) { DeviceUpdateLEDs(); } diff --git a/Controllers/RazerController/RGBController_RazerKraken.cpp b/Controllers/RazerController/RGBController_RazerKraken.cpp index f99100dd..0912f389 100644 --- a/Controllers/RazerController/RGBController_RazerKraken.cpp +++ b/Controllers/RazerController/RGBController_RazerKraken.cpp @@ -172,12 +172,12 @@ void RGBController_RazerKraken::DeviceUpdateLEDs() controller->SetModeCustom(red, grn, blu); } -void RGBController_RazerKraken::UpdateZoneLEDs(int zone) +void RGBController_RazerKraken::UpdateZoneLEDs(int /*zone*/) { DeviceUpdateLEDs(); } -void RGBController_RazerKraken::UpdateSingleLED(int led) +void RGBController_RazerKraken::UpdateSingleLED(int /*led*/) { DeviceUpdateLEDs(); } diff --git a/Controllers/RazerController/RazerController.h b/Controllers/RazerController/RazerController.h index 8a659199..bb98041a 100644 --- a/Controllers/RazerController/RazerController.h +++ b/Controllers/RazerController/RazerController.h @@ -127,7 +127,7 @@ union command_id_union } parts; }; -PACK(typedef struct razer_report +PACK(struct razer_report { unsigned char report_id; unsigned char status; @@ -145,7 +145,7 @@ PACK(typedef struct razer_report /*---------------------------------------------------------*\ | Razer ARGB Report Type (taken from OpenRazer) | \*---------------------------------------------------------*/ -PACK(typedef struct razer_argb_report +PACK(struct razer_argb_report { unsigned char hid_id; unsigned char report_id; diff --git a/Controllers/RazerController/RazerKrakenController.h b/Controllers/RazerController/RazerKrakenController.h index 6d815d1b..2b20ca32 100644 --- a/Controllers/RazerController/RazerKrakenController.h +++ b/Controllers/RazerController/RazerKrakenController.h @@ -53,7 +53,7 @@ PACK(typedef struct razer_kraken_request_report unsigned char arguments[32]; }); -PACK(typedef struct razer_kraken_response_report +PACK(struct razer_kraken_response_report { unsigned char report_id; unsigned char arguments[36]; diff --git a/Controllers/SteelSeriesController/RGBController_SteelSeriesOldApex.cpp b/Controllers/SteelSeriesController/RGBController_SteelSeriesOldApex.cpp index ec5c3af5..307e5b01 100644 --- a/Controllers/SteelSeriesController/RGBController_SteelSeriesOldApex.cpp +++ b/Controllers/SteelSeriesController/RGBController_SteelSeriesOldApex.cpp @@ -209,7 +209,7 @@ void RGBController_SteelSeriesOldApex::DeviceUpdateLEDs() } -void RGBController_SteelSeriesOldApex::UpdateZoneLEDs(int zone) +void RGBController_SteelSeriesOldApex::UpdateZoneLEDs(int /*zone*/) { // updating for one zone is pointless, // all zones have to be blasted anyway @@ -218,7 +218,7 @@ void RGBController_SteelSeriesOldApex::UpdateZoneLEDs(int zone) } -void RGBController_SteelSeriesOldApex::UpdateSingleLED(int led) +void RGBController_SteelSeriesOldApex::UpdateSingleLED(int /*led*/) { // Each zone is one LED, however // updating for one zone is pointless, diff --git a/Controllers/SteelSeriesController/SteelSeriesApexMController.cpp b/Controllers/SteelSeriesController/SteelSeriesApexMController.cpp index 93f06789..ad1f9037 100644 --- a/Controllers/SteelSeriesController/SteelSeriesApexMController.cpp +++ b/Controllers/SteelSeriesController/SteelSeriesApexMController.cpp @@ -62,7 +62,7 @@ void SteelSeriesApexMController::EnableLEDControl() hid_send_feature_report(dev, buf, 513); } -void SteelSeriesApexMController::SetMode(unsigned char mode, std::vector colors) +void SteelSeriesApexMController::SetMode(unsigned char /*mode*/, std::vector /*colors*/) { } diff --git a/Controllers/WootingKeyboardController/WootingKeyboardController.cpp b/Controllers/WootingKeyboardController/WootingKeyboardController.cpp index 9c24657e..ed278639 100644 --- a/Controllers/WootingKeyboardController/WootingKeyboardController.cpp +++ b/Controllers/WootingKeyboardController/WootingKeyboardController.cpp @@ -168,6 +168,8 @@ bool WootingKeyboardController::wooting_usb_send_feature(uint8_t commandId, uint | Send packet | \*---------------------------------------------------------*/ hid_send_feature_report(dev, report_buffer, WOOTING_COMMAND_SIZE); + + return true; } bool WootingKeyboardController::wooting_usb_send_buffer(RGB_PARTS part_number, uint8_t rgb_buffer[]) @@ -225,4 +227,6 @@ bool WootingKeyboardController::wooting_usb_send_buffer(RGB_PARTS part_number, u | Send packet | \*---------------------------------------------------------*/ hid_write(dev, report_buffer, WOOTING_REPORT_SIZE); + + return true; } diff --git a/ProfileManager.cpp b/ProfileManager.cpp index c881b954..36c0ae5f 100644 --- a/ProfileManager.cpp +++ b/ProfileManager.cpp @@ -123,7 +123,6 @@ std::vector ProfileManager::LoadProfileToList std::vector temp_controllers; unsigned int controller_size; unsigned int controller_offset = 0; - bool ret_val = false; std::string filename = configuration_directory + profile_name; @@ -193,8 +192,6 @@ std::vector ProfileManager::LoadProfileToList controller_offset += controller_size; controller_file.seekg(controller_offset); - - ret_val = true; } } } diff --git a/RGBController/RGBController.h b/RGBController/RGBController.h index f0e7f68c..0f621a34 100644 --- a/RGBController/RGBController.h +++ b/RGBController/RGBController.h @@ -22,7 +22,7 @@ typedef unsigned int RGBColor; #define RGBGetGValue(rgb) ((rgb >> 8) & 0x000000FF) #define RGBGetBValue(rgb) ((rgb >> 16) & 0x000000FF) -#define ToRGBColor(r, g, b) ((b << 16) | (g << 8) | (r)) +#define ToRGBColor(r, g, b) ((RGBColor)((b << 16) | (g << 8) | (r))) /*------------------------------------------------------------------*\ | Mode Flags | diff --git a/i2c_smbus/i2c_smbus_linux.cpp b/i2c_smbus/i2c_smbus_linux.cpp index f923939f..391617d5 100644 --- a/i2c_smbus/i2c_smbus_linux.cpp +++ b/i2c_smbus/i2c_smbus_linux.cpp @@ -46,7 +46,6 @@ void i2c_smbus_linux_detect() char buff[100]; unsigned short pci_device, pci_vendor, pci_subsystem_device, pci_subsystem_vendor; unsigned short port_id; - bool info; // Start looking for I2C adapters in /sys/bus/i2c/devices/ strcpy(driver_path, "/sys/bus/i2c/devices/"); diff --git a/qt/OpenRGBDevicePage.cpp b/qt/OpenRGBDevicePage.cpp index e303dd5b..dd4bf918 100644 --- a/qt/OpenRGBDevicePage.cpp +++ b/qt/OpenRGBDevicePage.cpp @@ -693,7 +693,7 @@ void Ui::OpenRGBDevicePage::UpdateModeUi() ui->ResizeButton->setEnabled(true); } - for (std::size_t i = 0; i < device->modes[selected_mode].colors.size(); i++) + for(unsigned int i = 0; i < device->modes[selected_mode].colors.size(); i++) { char id_buf[32]; snprintf(id_buf, 16, "Mode Color %u", i);