diff --git a/Controllers/AMDWraithPrismController/AMDWraithPrismController.cpp b/Controllers/AMDWraithPrismController/AMDWraithPrismController.cpp index 86d4efdf..abecbb4d 100644 --- a/Controllers/AMDWraithPrismController/AMDWraithPrismController.cpp +++ b/Controllers/AMDWraithPrismController/AMDWraithPrismController.cpp @@ -12,17 +12,6 @@ #include #include -#ifdef WIN32 -#include -#else -#include - -static void Sleep(unsigned int milliseconds) -{ - usleep(1000 * milliseconds); -} -#endif - AMDWraithPrismController::AMDWraithPrismController(libusb_device_handle* dev_handle) { dev = dev_handle; diff --git a/Controllers/AuraController/AuraController.cpp b/Controllers/AuraController/AuraController.cpp index b6fbc227..5686fb09 100644 --- a/Controllers/AuraController/AuraController.cpp +++ b/Controllers/AuraController/AuraController.cpp @@ -161,7 +161,7 @@ void AuraController::SetAllColorsDirect(unsigned char red, unsigned char green, { unsigned char* colors = new unsigned char[led_count * 3]; - for (int i = 0; i < (led_count * 3); i += 3) + for (unsigned int i = 0; i < (led_count * 3); i += 3) { colors[i + 0] = red; colors[i + 1] = blue; @@ -177,7 +177,7 @@ void AuraController::SetAllColorsEffect(unsigned char red, unsigned char green, { unsigned char* colors = new unsigned char[led_count * 3]; - for (int i = 0; i < (led_count * 3); i += 3) + for (unsigned int i = 0; i < (led_count * 3); i += 3) { colors[i + 0] = red; colors[i + 1] = blue; @@ -188,7 +188,7 @@ void AuraController::SetAllColorsEffect(unsigned char red, unsigned char green, AuraRegisterWrite(AURA_REG_APPLY, AURA_APPLY_VAL); - delete colors; + delete[] colors; } void AuraController::SetDirect(unsigned char direct) diff --git a/Controllers/CorsairController/CorsairController.cpp b/Controllers/CorsairController/CorsairController.cpp index 9652c441..18070ed8 100644 --- a/Controllers/CorsairController/CorsairController.cpp +++ b/Controllers/CorsairController/CorsairController.cpp @@ -53,7 +53,7 @@ void CorsairController::SetAllColors(unsigned char red, unsigned char green, uns bus->i2c_smbus_write_byte_data(dev, CORSAIR_VENGEANCE_RGB_CMD_MODE, CORSAIR_VENGEANCE_RGB_MODE_SINGLE); } -void CorsairController::SetLEDColor(unsigned int led, unsigned char red, unsigned char green, unsigned char blue) +void CorsairController::SetLEDColor(unsigned int /*led*/, unsigned char red, unsigned char green, unsigned char blue) { bus->i2c_smbus_write_byte_data(dev, CORSAIR_VENGEANCE_RGB_CMD_FADE_TIME, 0x00); bus->i2c_smbus_write_byte_data(dev, CORSAIR_VENGEANCE_RGB_CMD_RED_VAL, red); @@ -62,7 +62,7 @@ void CorsairController::SetLEDColor(unsigned int led, unsigned char red, unsigne bus->i2c_smbus_write_byte_data(dev, CORSAIR_VENGEANCE_RGB_CMD_MODE, CORSAIR_VENGEANCE_RGB_MODE_SINGLE); } -void CorsairController::SetMode(unsigned char mode) +void CorsairController::SetMode(unsigned char /*mode*/) { bus->i2c_smbus_write_byte_data(dev, CORSAIR_VENGEANCE_RGB_CMD_MODE, CORSAIR_VENGEANCE_RGB_MODE_SINGLE); } diff --git a/Controllers/CorsairProController/CorsairProController.cpp b/Controllers/CorsairProController/CorsairProController.cpp index 386a0d02..b654f5dc 100644 --- a/Controllers/CorsairProController/CorsairProController.cpp +++ b/Controllers/CorsairProController/CorsairProController.cpp @@ -29,7 +29,7 @@ CorsairProController::CorsairProController(i2c_smbus_interface* bus, corsair_dev strcpy(device_name, "Corsair Vengeance Pro RGB"); led_count = CORSAIR_PRO_LED_COUNT; - for (int i = 0; i < led_count; i++) + for (unsigned int i = 0; i < led_count; i++) { led_red[i] = 0; led_green[i] = 0; @@ -64,7 +64,7 @@ unsigned int CorsairProController::GetLEDCount() void CorsairProController::SetAllColors(unsigned char red, unsigned char green, unsigned char blue) { - for (int i = 0; i < led_count; i++) + for (unsigned int i = 0; i < led_count; i++) { led_red[i] = red; led_green[i] = green; diff --git a/Controllers/Hue2Controller/Hue2Controller.cpp b/Controllers/Hue2Controller/Hue2Controller.cpp index 13d86976..ee49dff3 100644 --- a/Controllers/Hue2Controller/Hue2Controller.cpp +++ b/Controllers/Hue2Controller/Hue2Controller.cpp @@ -10,18 +10,6 @@ #include #include - -#ifdef WIN32 -#include -#else -#include - -static void Sleep(unsigned int milliseconds) -{ - usleep(1000 * milliseconds); -} -#endif - Hue2Controller::Hue2Controller(libusb_device_handle* dev_handle) { dev = dev_handle; @@ -33,7 +21,7 @@ Hue2Controller::~Hue2Controller() { } -unsigned int Hue2Controller::GetStripsOnChannel(unsigned int channel) +unsigned int Hue2Controller::GetStripsOnChannel(unsigned int /*channel*/) { unsigned int ret_val = 0; @@ -128,7 +116,7 @@ void Hue2Controller::SetChannelLEDs(unsigned int channel, std::vector }; int actual; - int pkt_max = 20; + std::size_t pkt_max = 20; /*-----------------------------------------------------*\ | Set channel in USB packets | @@ -144,7 +132,7 @@ void Hue2Controller::SetChannelLEDs(unsigned int channel, std::vector pkt_max = colors.size(); } - for (int idx = 0; idx < pkt_max; idx++) + for (std::size_t idx = 0; idx < pkt_max; idx++) { int pixel_idx = idx * 3; RGBColor color = colors[idx]; @@ -166,14 +154,12 @@ void Hue2Controller::SetChannelLEDs(unsigned int channel, std::vector usb_buf[0x01] = 0x11; pkt_max = 20; - if(pkt_max > ((signed int)colors.size() - 20)) - { - pkt_max = colors.size() - 20; - } + if (colors.size() > 20) + pkt_max = std::min(pkt_max, colors.size() - 20); if(pkt_max > 0) { - for (int idx = 0; idx < pkt_max; idx++) + for (std::size_t idx = 0; idx < pkt_max; idx++) { int pixel_idx = idx * 3; RGBColor color = colors[idx + 20]; diff --git a/Controllers/HuePlusController/HuePlusController.cpp b/Controllers/HuePlusController/HuePlusController.cpp index a65b1d35..7766b53d 100644 --- a/Controllers/HuePlusController/HuePlusController.cpp +++ b/Controllers/HuePlusController/HuePlusController.cpp @@ -96,7 +96,7 @@ void HuePlusController::SetChannelLEDs(unsigned int channel, std::vectori2c_smbus_write_byte_data(dev, POLYCHROME_REG_MODE, mode); } -} \ No newline at end of file +} diff --git a/RGBController/OpenRazerDetect.cpp b/RGBController/OpenRazerDetect.cpp index d4caacb2..5093457b 100644 --- a/RGBController/OpenRazerDetect.cpp +++ b/RGBController/OpenRazerDetect.cpp @@ -22,7 +22,6 @@ void DetectOpenRazerControllers(std::vector &rgb_controllers) char driver_path[512]; DIR *dir; struct dirent *ent; - int test_fd; bool done = false; int driver_to_read = 0; @@ -97,7 +96,6 @@ void DetectOpenRazerControllers(std::vector &rgb_controllers) } else { - int device_type; char device_string[1024]; strcpy(device_string, driver_path); strcat(device_string, ent->d_name); @@ -124,4 +122,4 @@ void DetectOpenRazerControllers(std::vector &rgb_controllers) driver_to_read++; } -} /* DetectOpenRazerControllers() */ \ No newline at end of file +} /* DetectOpenRazerControllers() */ diff --git a/RGBController/RGBController.h b/RGBController/RGBController.h index de8fd2c0..121e1de7 100644 --- a/RGBController/RGBController.h +++ b/RGBController/RGBController.h @@ -77,6 +77,8 @@ public: std::vector colors; /* Color buffer */ device_type type; /* device type */ + virtual ~RGBController() = default; + virtual int GetMode() = 0; virtual void SetMode(int mode) = 0; virtual void SetCustomMode() = 0; diff --git a/RGBController/RGBController_AMDWraithPrism.cpp b/RGBController/RGBController_AMDWraithPrism.cpp index dca363ee..96b9227d 100644 --- a/RGBController/RGBController_AMDWraithPrism.cpp +++ b/RGBController/RGBController_AMDWraithPrism.cpp @@ -68,7 +68,7 @@ int RGBController_AMDWraithPrism::GetMode() return 0; } -void RGBController_AMDWraithPrism::SetMode(int mode) +void RGBController_AMDWraithPrism::SetMode(int /*mode*/) { } @@ -132,4 +132,4 @@ void RGBController_AMDWraithPrism::SetLED(int led, RGBColor color) void RGBController_AMDWraithPrism::UpdateLEDs() { -} \ No newline at end of file +} diff --git a/RGBController/RGBController_Aura.cpp b/RGBController/RGBController_Aura.cpp index cc969945..9132c2cc 100644 --- a/RGBController/RGBController_Aura.cpp +++ b/RGBController/RGBController_Aura.cpp @@ -61,9 +61,9 @@ void RGBController_Aura::SetAllZoneLEDs(int zone, RGBColor color) unsigned char grn = RGBGetGValue(color); unsigned char blu = RGBGetBValue(color); - for (int x = 0; x < zones[zone].map.size(); x++) + for (std::size_t x = 0; x < zones[zone].map.size(); x++) { - for (int y = 0; y < zones[zone].map[x].size(); y++) + for (std::size_t y = 0; y < zones[zone].map[x].size(); y++) { if (GetMode() == 0) { @@ -95,7 +95,7 @@ void RGBController_Aura::SetLED(int led, RGBColor color) void RGBController_Aura::UpdateLEDs() { - for(int led = 0; led < colors.size(); led++) + for(std::size_t led = 0; led < colors.size(); led++) { unsigned char red = RGBGetRValue(colors[led]); unsigned char grn = RGBGetGValue(colors[led]); @@ -149,12 +149,12 @@ RGBController_Aura::RGBController_Aura(AuraController * aura_ptr) aura_modes[13].name = "Chase Rainbow Pulse"; aura_modes[14].name = "Random Flicker"; - for (int i = 0; i < (AURA_NUMBER_MODES + 1); i++) + for (std::size_t i = 0; i < (AURA_NUMBER_MODES + 1); i++) { modes.push_back(aura_modes[i]); } - for (int i = 0; i < aura->GetLEDCount(); i++) + for (std::size_t i = 0; i < aura->GetLEDCount(); i++) { aura_channels.push_back(aura->GetChannel(i)); @@ -169,12 +169,12 @@ RGBController_Aura::RGBController_Aura(AuraController * aura_ptr) std::vector aura_zones; // Search through all LEDs and create zones for each channel type - for (int i = 0; i < aura_channels.size(); i++) + for (std::size_t i = 0; i < aura_channels.size(); i++) { bool matched = false; // Search through existing zones to make sure we don't create a duplicate zone - for (int j = 0; j < aura_zones.size(); j++) + for (std::size_t j = 0; j < aura_zones.size(); j++) { if (aura_channels[i] == aura_zones[j]) { @@ -192,7 +192,7 @@ RGBController_Aura::RGBController_Aura(AuraController * aura_ptr) new_zone->name = aura->GetChannelName(i); // Find all LEDs with this channel type and add them to zone - for (int j = 0; j < aura->GetLEDCount(); j++) + for (std::size_t j = 0; j < aura->GetLEDCount(); j++) { if (aura->GetChannel(j) == aura_channels[i]) { diff --git a/RGBController/RGBController_Corsair.cpp b/RGBController/RGBController_Corsair.cpp index 0ccffe6f..1b9d8af0 100644 --- a/RGBController/RGBController_Corsair.cpp +++ b/RGBController/RGBController_Corsair.cpp @@ -39,9 +39,9 @@ void RGBController_Corsair::SetAllZoneLEDs(int zone, RGBColor color) unsigned char grn = RGBGetGValue(color); unsigned char blu = RGBGetBValue(color); - for (int x = 0; x < zones[zone].map.size(); x++) + for (std::size_t x = 0; x < zones[zone].map.size(); x++) { - for (int y = 0; y < zones[zone].map[x].size(); y++) + for (std::size_t y = 0; y < zones[zone].map[x].size(); y++) { corsair->SetLEDColor(zones[zone].map[x][y], red, grn, blu); } @@ -82,7 +82,7 @@ RGBController_Corsair::RGBController_Corsair(CorsairController* corsair_ptr) modes.push_back(corsair_modes[i]); } - for (int i = 0; i < corsair->GetLEDCount(); i++) + for (unsigned int i = 0; i < corsair->GetLEDCount(); i++) { led* new_led = new led(); @@ -99,7 +99,7 @@ RGBController_Corsair::RGBController_Corsair(CorsairController* corsair_ptr) std::vector zone_row; - for (int i = 0; i < corsair->GetLEDCount(); i++) + for (unsigned int i = 0; i < corsair->GetLEDCount(); i++) { zone_row.push_back(i); } diff --git a/RGBController/RGBController_CorsairPro.cpp b/RGBController/RGBController_CorsairPro.cpp index a9b97a57..fc9fcc15 100644 --- a/RGBController/RGBController_CorsairPro.cpp +++ b/RGBController/RGBController_CorsairPro.cpp @@ -72,9 +72,9 @@ void RGBController_CorsairPro::SetAllZoneLEDs(int zone, RGBColor color) unsigned char grn = RGBGetGValue(color); unsigned char blu = RGBGetBValue(color); - for (int x = 0; x < zones[zone].map.size(); x++) + for (std::size_t x = 0; x < zones[zone].map.size(); x++) { - for (int y = 0; y < zones[zone].map[x].size(); y++) + for (std::size_t y = 0; y < zones[zone].map[x].size(); y++) { corsair->SetLEDColor(zones[zone].map[x][y], red, grn, blu); } @@ -125,7 +125,7 @@ RGBController_CorsairPro::RGBController_CorsairPro(CorsairProController* corsair modes.push_back(corsair_modes[i]); } - for (int i = 0; i < corsair->GetLEDCount(); i++) + for (unsigned int i = 0; i < corsair->GetLEDCount(); i++) { led* new_led = new led(); @@ -142,7 +142,7 @@ RGBController_CorsairPro::RGBController_CorsairPro(CorsairProController* corsair std::vector zone_row; - for (int i = 0; i < corsair->GetLEDCount(); i++) + for (unsigned int i = 0; i < corsair->GetLEDCount(); i++) { zone_row.push_back(i); } diff --git a/RGBController/RGBController_E131.cpp b/RGBController/RGBController_E131.cpp index 508a1e66..d2c8ec43 100644 --- a/RGBController/RGBController_E131.cpp +++ b/RGBController/RGBController_E131.cpp @@ -24,12 +24,12 @@ RGBController_E131::RGBController_E131(std::vector device_list) sockfd = e131_socket(); - for (int i = 0; i < devices.size(); i++) + for (std::size_t i = 0; i < devices.size(); i++) { /*-----------------------------------------*\ | Add LEDs | \*-----------------------------------------*/ - for (int led_idx = 0; led_idx < devices[i].num_leds; led_idx++) + for (unsigned int led_idx = 0; led_idx < devices[i].num_leds; led_idx++) { colors.push_back(0x00000000); led new_led; @@ -44,7 +44,7 @@ RGBController_E131::RGBController_E131(std::vector device_list) led_zone.name = devices[i].name; led_zone.type = devices[i].type; std::vector led_zone_map; - for (int led_idx = 0; led_idx < devices[i].num_leds; led_idx++) + for (unsigned int led_idx = 0; led_idx < devices[i].num_leds; led_idx++) { led_zone_map.push_back(led_zone_idx); led_zone_idx++; @@ -57,12 +57,12 @@ RGBController_E131::RGBController_E131(std::vector device_list) \*-----------------------------------------*/ unsigned int total_universes = ceil( ( ( devices[i].num_leds * 3 ) + devices[i].start_channel ) / 512.0f ); - for (int univ_idx = 0; univ_idx < total_universes; univ_idx++) + for (unsigned int univ_idx = 0; univ_idx < total_universes; univ_idx++) { unsigned int universe = devices[i].start_universe + univ_idx; bool universe_exists = false; - for (int pkt_idx = 0; pkt_idx < packets.size(); pkt_idx++) + for (std::size_t pkt_idx = 0; pkt_idx < packets.size(); pkt_idx++) { if(universes[pkt_idx] == universe) { @@ -91,7 +91,7 @@ int RGBController_E131::GetMode() return 0; } -void RGBController_E131::SetMode(int mode) +void RGBController_E131::SetMode(int /*mode*/) { } @@ -103,7 +103,7 @@ void RGBController_E131::SetCustomMode() void RGBController_E131::SetAllLEDs(RGBColor color) { - for (int i = 0; i < colors.size(); i++) + for (std::size_t i = 0; i < colors.size(); i++) { colors[i] = color; } @@ -113,9 +113,9 @@ void RGBController_E131::SetAllLEDs(RGBColor color) void RGBController_E131::SetAllZoneLEDs(int zone, RGBColor color) { - for (int x = 0; x < zones[zone].map.size(); x++) + for (std::size_t x = 0; x < zones[zone].map.size(); x++) { - for (int y = 0; y < zones[zone].map[x].size(); y++) + for (std::size_t y = 0; y < zones[zone].map[x].size(); y++) { colors[zones[zone].map[x][y]] = color; } @@ -135,7 +135,7 @@ void RGBController_E131::UpdateLEDs() { int color_idx = 0; - for(int device_idx = 0; device_idx < devices.size(); device_idx++) + for(std::size_t device_idx = 0; device_idx < devices.size(); device_idx++) { unsigned int total_universes = ceil( ( ( devices[device_idx].num_leds * 3 ) + devices[device_idx].start_channel ) / 512.0f ); unsigned int channel_idx = devices[device_idx].start_channel; @@ -143,11 +143,11 @@ void RGBController_E131::UpdateLEDs() unsigned int rgb_idx = 0; bool done = false; - for (int univ_idx = 0; univ_idx < total_universes; univ_idx++) + for (unsigned int univ_idx = 0; univ_idx < total_universes; univ_idx++) { unsigned int universe = devices[device_idx].start_universe + univ_idx; - for(int packet_idx = 0; packet_idx < packets.size(); packet_idx++) + for(std::size_t packet_idx = 0; packet_idx < packets.size(); packet_idx++) { if(!done && (universes[packet_idx] == universe)) { @@ -185,9 +185,9 @@ void RGBController_E131::UpdateLEDs() } } - for(int packet_idx = 0; packet_idx < packets.size(); packet_idx++) + for(std::size_t packet_idx = 0; packet_idx < packets.size(); packet_idx++) { e131_send(sockfd, &packets[packet_idx], &dest_addrs[packet_idx]); packets[packet_idx].frame.seq_number++; } -} \ No newline at end of file +} diff --git a/RGBController/RGBController_Hue2.cpp b/RGBController/RGBController_Hue2.cpp index dd0c8cf0..6823d71e 100644 --- a/RGBController/RGBController_Hue2.cpp +++ b/RGBController/RGBController_Hue2.cpp @@ -23,7 +23,7 @@ RGBController_Hue2::RGBController_Hue2(Hue2Controller* hue2_ptr) unsigned int led_idx = 0; - for (int channel_idx = 0; channel_idx < HUE_2_NUM_CHANNELS; channel_idx++) + for (unsigned int channel_idx = 0; channel_idx < HUE_2_NUM_CHANNELS; channel_idx++) { if(hue2->channel_leds[channel_idx] > 0) { @@ -38,7 +38,7 @@ RGBController_Hue2::RGBController_Hue2(Hue2Controller* hue2_ptr) std::vector *new_zone_map = new std::vector(); - for (int led_ch_idx = 0; led_ch_idx < hue2->channel_leds[channel_idx]; led_ch_idx++) + for (unsigned int led_ch_idx = 0; led_ch_idx < hue2->channel_leds[channel_idx]; led_ch_idx++) { colors.push_back(0x00000000); @@ -70,7 +70,7 @@ int RGBController_Hue2::GetMode() return 0; } -void RGBController_Hue2::SetMode(int mode) +void RGBController_Hue2::SetMode(int /*mode*/) { } @@ -82,7 +82,7 @@ void RGBController_Hue2::SetCustomMode() void RGBController_Hue2::SetAllLEDs(RGBColor color) { - for (int i = 0; i < colors.size(); i++) + for (std::size_t i = 0; i < colors.size(); i++) { colors[i] = color; } @@ -92,11 +92,11 @@ void RGBController_Hue2::SetAllLEDs(RGBColor color) void RGBController_Hue2::SetAllZoneLEDs(int zone, RGBColor color) { - int channel = zones_channel[zone]; + unsigned int channel = zones_channel[zone]; - for (int x = 0; x < zones[zone].map.size(); x++) + for (std::size_t x = 0; x < zones[zone].map.size(); x++) { - for (int y = 0; y < zones[zone].map[x].size(); y++) + for (std::size_t y = 0; y < zones[zone].map[x].size(); y++) { colors[zones[zone].map[x][y]] = color; } @@ -104,7 +104,7 @@ void RGBController_Hue2::SetAllZoneLEDs(int zone, RGBColor color) std::vector channel_colors; - for(int color = 0; color < colors.size(); color++) + for(std::size_t color = 0; color < colors.size(); color++) { if(leds_channel[color] == channel) { @@ -117,12 +117,12 @@ void RGBController_Hue2::SetAllZoneLEDs(int zone, RGBColor color) void RGBController_Hue2::SetLED(int led, RGBColor color) { - int channel = leds_channel[led]; + unsigned int channel = leds_channel[led]; colors[led] = color; std::vector channel_colors; - for(int color = 0; color < colors.size(); color++) + for(std::size_t color = 0; color < colors.size(); color++) { if(leds_channel[color] == channel) { @@ -136,9 +136,9 @@ void RGBController_Hue2::UpdateLEDs() { std::vector channel_colors; - for(int channel = 0; channel < HUE_2_NUM_CHANNELS; channel++) + for(unsigned int channel = 0; channel < HUE_2_NUM_CHANNELS; channel++) { - for(int color = 0; color < colors.size(); color++) + for(std::size_t color = 0; color < colors.size(); color++) { if(leds_channel[color] == channel) { diff --git a/RGBController/RGBController_HuePlus.cpp b/RGBController/RGBController_HuePlus.cpp index 114f998a..5564aec6 100644 --- a/RGBController/RGBController_HuePlus.cpp +++ b/RGBController/RGBController_HuePlus.cpp @@ -40,7 +40,7 @@ RGBController_HuePlus::RGBController_HuePlus(HuePlusController* hueplus_ptr) std::vector *new_zone_map = new std::vector(); - for (int led_ch_idx = 0; led_ch_idx < hueplus->channel_leds[channel_idx]; led_ch_idx++) + for (unsigned led_ch_idx = 0; led_ch_idx < hueplus->channel_leds[channel_idx]; led_ch_idx++) { colors.push_back(0x00000000); @@ -72,7 +72,7 @@ int RGBController_HuePlus::GetMode() return 0; } -void RGBController_HuePlus::SetMode(int mode) +void RGBController_HuePlus::SetMode(int /*mode*/) { } @@ -84,7 +84,7 @@ void RGBController_HuePlus::SetCustomMode() void RGBController_HuePlus::SetAllLEDs(RGBColor color) { - for (int i = 0; i < colors.size(); i++) + for (std::size_t i = 0; i < colors.size(); i++) { colors[i] = color; } @@ -94,11 +94,11 @@ void RGBController_HuePlus::SetAllLEDs(RGBColor color) void RGBController_HuePlus::SetAllZoneLEDs(int zone, RGBColor color) { - int channel = zones_channel[zone]; + unsigned int channel = zones_channel[zone]; - for (int x = 0; x < zones[zone].map.size(); x++) + for (std::size_t x = 0; x < zones[zone].map.size(); x++) { - for (int y = 0; y < zones[zone].map[x].size(); y++) + for (std::size_t y = 0; y < zones[zone].map[x].size(); y++) { colors[zones[zone].map[x][y]] = color; } @@ -106,7 +106,7 @@ void RGBController_HuePlus::SetAllZoneLEDs(int zone, RGBColor color) std::vector channel_colors; - for(int color = 0; color < colors.size(); color++) + for(std::size_t color = 0; color < colors.size(); color++) { if(leds_channel[color] == channel) { @@ -119,12 +119,12 @@ void RGBController_HuePlus::SetAllZoneLEDs(int zone, RGBColor color) void RGBController_HuePlus::SetLED(int led, RGBColor color) { - int channel = leds_channel[led]; + unsigned int channel = leds_channel[led]; colors[led] = color; std::vector channel_colors; - for(int color = 0; color < colors.size(); color++) + for(std::size_t color = 0; color < colors.size(); color++) { if(leds_channel[color] == channel) { diff --git a/RGBController/RGBController_HyperX.cpp b/RGBController/RGBController_HyperX.cpp index 233f3e49..dfdadf4b 100644 --- a/RGBController/RGBController_HyperX.cpp +++ b/RGBController/RGBController_HyperX.cpp @@ -49,9 +49,9 @@ void RGBController_HyperX::SetAllZoneLEDs(int zone, RGBColor color) if(hyperx->GetMode() == HYPERX_MODE_DIRECT) { - for (int x = 0; x < zones[zone].map.size(); x++) + for (std::size_t x = 0; x < zones[zone].map.size(); x++) { - for (int y = 0; y < zones[zone].map[x].size(); y++) + for (std::size_t y = 0; y < zones[zone].map[x].size(); y++) { hyperx->SetLEDColor(zones[zone].map[x][y], red, grn, blu); } @@ -112,7 +112,7 @@ RGBController_HyperX::RGBController_HyperX(HyperXController* hyperx_ptr) unsigned int led_idx = 0; - for(int slot = 0; slot < hyperx->GetSlotCount(); slot++) + for(unsigned int slot = 0; slot < hyperx->GetSlotCount(); slot++) { zone* new_zone = new zone; diff --git a/RGBController/RGBController_LEDStrip.cpp b/RGBController/RGBController_LEDStrip.cpp index dfac5d06..8dd9d266 100644 --- a/RGBController/RGBController_LEDStrip.cpp +++ b/RGBController/RGBController_LEDStrip.cpp @@ -46,7 +46,7 @@ int RGBController_LEDStrip::GetMode() return 0; } -void RGBController_LEDStrip::SetMode(int mode) +void RGBController_LEDStrip::SetMode(int /*mode*/) { } @@ -58,7 +58,7 @@ void RGBController_LEDStrip::SetCustomMode() void RGBController_LEDStrip::SetAllLEDs(RGBColor color) { - for (int i = 0; i < colors.size(); i++) + for (std::size_t i = 0; i < colors.size(); i++) { colors[i] = color; } @@ -66,9 +66,9 @@ void RGBController_LEDStrip::SetAllLEDs(RGBColor color) strip->SetLEDs(colors); } -void RGBController_LEDStrip::SetAllZoneLEDs(int zone, RGBColor color) +void RGBController_LEDStrip::SetAllZoneLEDs(int /*zone*/, RGBColor color) { - for (int i = 0; i < colors.size(); i++) + for (std::size_t i = 0; i < colors.size(); i++) { colors[i] = color; } diff --git a/RGBController/RGBController_OpenRazer.cpp b/RGBController/RGBController_OpenRazer.cpp index 0134a2bd..1e2c0270 100644 --- a/RGBController/RGBController_OpenRazer.cpp +++ b/RGBController/RGBController_OpenRazer.cpp @@ -100,7 +100,7 @@ void RGBController_OpenRazer::UpdateLEDs() { char update_value = 1; - for (int row = 0; row < matrix_rows; row++) + for (unsigned int row = 0; row < matrix_rows; row++) { unsigned int output_array_size; unsigned int output_offset; @@ -126,7 +126,7 @@ void RGBController_OpenRazer::UpdateLEDs() output_array[2] = matrix_cols - 1; } - for(int col = 0; col < matrix_cols; col++) + for(unsigned int col = 0; col < matrix_cols; col++) { unsigned int color_idx = col + row_offset; output_array[(col * 3) + 0 + output_offset] = (char)RGBGetRValue(colors[color_idx]); @@ -189,7 +189,7 @@ void RGBController_OpenRazer::UpdateLEDs() void RGBController_OpenRazer::SetAllLEDs(RGBColor color) { - for(int i = 0; i < colors.size(); i++) + for(std::size_t i = 0; i < colors.size(); i++) { colors[i] = color; } @@ -199,9 +199,9 @@ void RGBController_OpenRazer::SetAllLEDs(RGBColor color) void RGBController_OpenRazer::SetAllZoneLEDs(int zone, RGBColor color) { - for (int x = 0; x < zones[zone].map.size(); x++) + for (std::size_t x = 0; x < zones[zone].map.size(); x++) { - for (int y = 0; y < zones[zone].map[x].size(); y++) + for (std::size_t y = 0; y < zones[zone].map[x].size(); y++) { colors[zones[zone].map[x][y]] = color; } @@ -340,7 +340,7 @@ RGBController_OpenRazer::RGBController_OpenRazer(std::string dev_path) /*-----------------------------------------------------------------*\ | Loop through all known devices to look for a name match | \*-----------------------------------------------------------------*/ - for (int i = 0; i < RAZER_NUM_DEVICES; i++) + for (std::size_t i = 0; i < RAZER_NUM_DEVICES; i++) { if (device_list[i]->name == name) { @@ -395,11 +395,11 @@ RGBController_OpenRazer::RGBController_OpenRazer(std::string dev_path) new_zone.name = device_list[i]->zones[zone_id]->name; new_zone.type = device_list[i]->zones[zone_id]->type; - for (int row_id = 0; row_id < device_list[i]->zones[zone_id]->rows; row_id++) + for (unsigned int row_id = 0; row_id < device_list[i]->zones[zone_id]->rows; row_id++) { std::vector new_zone_map; - for (int col_id = 0; col_id < device_list[i]->zones[zone_id]->cols; col_id++) + for (unsigned int col_id = 0; col_id < device_list[i]->zones[zone_id]->cols; col_id++) { RGBColor new_color = 0x00000000; colors.push_back(new_color); @@ -420,4 +420,4 @@ RGBController_OpenRazer::RGBController_OpenRazer(std::string dev_path) } } } -} \ No newline at end of file +} diff --git a/RGBController/RGBController_Polychrome.cpp b/RGBController/RGBController_Polychrome.cpp index ca66fc96..f8219145 100644 --- a/RGBController/RGBController_Polychrome.cpp +++ b/RGBController/RGBController_Polychrome.cpp @@ -53,7 +53,7 @@ void RGBController_Polychrome::SetLED(int led, RGBColor color) void RGBController_Polychrome::UpdateLEDs() { - for (int led = 0; led < colors.size(); led++) + for (std::size_t led = 0; led < colors.size(); led++) { unsigned char red = RGBGetRValue(colors[led]); unsigned char grn = RGBGetGValue(colors[led]); @@ -86,7 +86,7 @@ RGBController_Polychrome::RGBController_Polychrome(PolychromeController* polychr } // Search through all LEDs and create zones for each channel type - for (int i = 0; i < polychrome->GetLEDCount(); i++) + for (unsigned int i = 0; i < polychrome->GetLEDCount(); i++) { zone* new_zone = new zone(); led* new_led = new led(); diff --git a/RGBController/RGBController_RGBFusion.cpp b/RGBController/RGBController_RGBFusion.cpp index 33ab3e3d..aed084de 100644 --- a/RGBController/RGBController_RGBFusion.cpp +++ b/RGBController/RGBController_RGBFusion.cpp @@ -53,7 +53,7 @@ void RGBController_RGBFusion::SetLED(int led, RGBColor color) void RGBController_RGBFusion::UpdateLEDs() { - for (int led = 0; led < colors.size(); led++) + for (std::size_t led = 0; led < colors.size(); led++) { unsigned char red = RGBGetRValue(colors[led]); unsigned char grn = RGBGetGValue(colors[led]); @@ -91,7 +91,7 @@ RGBController_RGBFusion::RGBController_RGBFusion(RGBFusionController* rgb_fusion } // Search through all LEDs and create zones for each channel type - for (int i = 0; i < rgb_fusion->GetLEDCount(); i++) + for (unsigned int i = 0; i < rgb_fusion->GetLEDCount(); i++) { zone* new_zone = new zone(); led* new_led = new led(); diff --git a/i2c_smbus/i2c_smbus.h b/i2c_smbus/i2c_smbus.h index e8759269..460e1327 100644 --- a/i2c_smbus/i2c_smbus.h +++ b/i2c_smbus/i2c_smbus.h @@ -54,6 +54,8 @@ class i2c_smbus_interface public: char device_name[512]; + virtual ~i2c_smbus_interface() = default; + //Functions derived from i2c-core.c s32 i2c_smbus_write_quick(u8 addr, u8 value); s32 i2c_smbus_read_byte(u8 addr); diff --git a/net_port/net_port.cpp b/net_port/net_port.cpp index e56b3168..9e4ad970 100644 --- a/net_port/net_port.cpp +++ b/net_port/net_port.cpp @@ -236,7 +236,7 @@ void net_port::tcp_close() connected = false; } -int net_port::tcp_listen(char * recv_data, int length) +int net_port::tcp_listen(char * recv_data, int /*length*/) { int ret = 0; int len = 0; diff --git a/qt/OpenRGBDevicePage.cpp b/qt/OpenRGBDevicePage.cpp index 9c8bcb04..6df8e4e5 100644 --- a/qt/OpenRGBDevicePage.cpp +++ b/qt/OpenRGBDevicePage.cpp @@ -66,7 +66,7 @@ OpenRGBDevicePage::OpenRGBDevicePage(RGBController *dev, QWidget *parent) : \*-----------------------------------------------------*/ ui->ModeBox->clear(); - for (int i = 0; i < device->modes.size(); i++) + for (std::size_t i = 0; i < device->modes.size(); i++) { ui->ModeBox->addItem(device->modes[i].name.c_str()); } @@ -75,7 +75,7 @@ OpenRGBDevicePage::OpenRGBDevicePage(RGBController *dev, QWidget *parent) : ui->ZoneBox->clear(); - for (int i = 0; i < device->zones.size(); i++) + for (std::size_t i = 0; i < device->zones.size(); i++) { ui->ZoneBox->addItem(device->zones[i].name.c_str()); } @@ -84,7 +84,7 @@ OpenRGBDevicePage::OpenRGBDevicePage(RGBController *dev, QWidget *parent) : ui->LEDBox->clear(); - for (int i = 0; i < device->leds.size(); i++) + for (std::size_t i = 0; i < device->leds.size(); i++) { ui->LEDBox->addItem(device->leds[i].name.c_str()); } @@ -97,17 +97,17 @@ OpenRGBDevicePage::~OpenRGBDevicePage() delete ui; } -void Ui::OpenRGBDevicePage::on_ZoneBox_currentIndexChanged(int index) +void Ui::OpenRGBDevicePage::on_ZoneBox_currentIndexChanged(int /*index*/) { } -void Ui::OpenRGBDevicePage::on_LEDBox_currentIndexChanged(int index) +void Ui::OpenRGBDevicePage::on_LEDBox_currentIndexChanged(int /*index*/) { } -void Ui::OpenRGBDevicePage::on_ModeBox_currentIndexChanged(int index) +void Ui::OpenRGBDevicePage::on_ModeBox_currentIndexChanged(int /*index*/) { /*-----------------------------------------------------*\ | Change device mode | @@ -274,32 +274,32 @@ void Ui::OpenRGBDevicePage::updateHSV() UpdatingColor = false; } -void Ui::OpenRGBDevicePage::on_RedSpinBox_valueChanged(int arg1) +void Ui::OpenRGBDevicePage::on_RedSpinBox_valueChanged(int /*arg1*/) { updateHSV(); } -void Ui::OpenRGBDevicePage::on_HueSpinBox_valueChanged(int arg1) +void Ui::OpenRGBDevicePage::on_HueSpinBox_valueChanged(int /*arg1*/) { updateRGB(); } -void Ui::OpenRGBDevicePage::on_GreenSpinBox_valueChanged(int arg1) +void Ui::OpenRGBDevicePage::on_GreenSpinBox_valueChanged(int /*arg1*/) { updateHSV(); } -void Ui::OpenRGBDevicePage::on_SatSpinBox_valueChanged(int arg1) +void Ui::OpenRGBDevicePage::on_SatSpinBox_valueChanged(int /*arg1*/) { updateRGB(); } -void Ui::OpenRGBDevicePage::on_BlueSpinBox_valueChanged(int arg1) +void Ui::OpenRGBDevicePage::on_BlueSpinBox_valueChanged(int /*arg1*/) { updateHSV(); } -void Ui::OpenRGBDevicePage::on_ValSpinBox_valueChanged(int arg1) +void Ui::OpenRGBDevicePage::on_ValSpinBox_valueChanged(int /*arg1*/) { updateRGB(); } diff --git a/qt/OpenRGBDialog.cpp b/qt/OpenRGBDialog.cpp index 07ccfbbd..ca423a54 100644 --- a/qt/OpenRGBDialog.cpp +++ b/qt/OpenRGBDialog.cpp @@ -53,7 +53,7 @@ OpenRGBDialog::OpenRGBDialog(std::vector& bus, std::vecto ui->ButtonMagenta->setFlat(true); ui->ButtonMagenta->update(); - for (int i = 0; i < controllers.size(); i++) + for (std::size_t i = 0; i < controllers.size(); i++) { ui->ComboDevices->addItem(controllers[i]->name.c_str()); } @@ -122,7 +122,7 @@ void Ui::OpenRGBDialog::on_ButtonSetAll_clicked() ui->EditLED0B->text().toInt() ); - for (int i = 0; i < controllers.size(); i++) + for (std::size_t i = 0; i < controllers.size(); i++) { controllers[i]->SetCustomMode(); controllers[i]->SetAllLEDs(color); @@ -162,11 +162,11 @@ void Ui::OpenRGBDialog::on_ButtonSetLED_clicked() controllers[ui->ComboDevices->currentIndex()]->SetLED(ui->ComboLEDs->currentIndex(), color); } -void Ui::OpenRGBDialog::on_ComboDevices_currentIndexChanged(int index) +void Ui::OpenRGBDialog::on_ComboDevices_currentIndexChanged() { ui->ComboModes->clear(); - for (int i = 0; i < controllers[ui->ComboDevices->currentIndex()]->modes.size(); i++) + for (std::size_t i = 0; i < controllers[ui->ComboDevices->currentIndex()]->modes.size(); i++) { ui->ComboModes->addItem(controllers[ui->ComboDevices->currentIndex()]->modes[i].name.c_str()); } @@ -175,7 +175,7 @@ void Ui::OpenRGBDialog::on_ComboDevices_currentIndexChanged(int index) ui->ComboZones->clear(); - for (int i = 0; i < controllers[ui->ComboDevices->currentIndex()]->zones.size(); i++) + for (std::size_t i = 0; i < controllers[ui->ComboDevices->currentIndex()]->zones.size(); i++) { ui->ComboZones->addItem(controllers[ui->ComboDevices->currentIndex()]->zones[i].name.c_str()); } @@ -184,7 +184,7 @@ void Ui::OpenRGBDialog::on_ComboDevices_currentIndexChanged(int index) ui->ComboLEDs->clear(); - for (int i = 0; i < controllers[ui->ComboDevices->currentIndex()]->leds.size(); i++) + for (std::size_t i = 0; i < controllers[ui->ComboDevices->currentIndex()]->leds.size(); i++) { ui->ComboLEDs->addItem(controllers[ui->ComboDevices->currentIndex()]->leds[i].name.c_str()); } @@ -192,7 +192,7 @@ void Ui::OpenRGBDialog::on_ComboDevices_currentIndexChanged(int index) ui->ComboLEDs->setCurrentIndex(0); } -void Ui::OpenRGBDialog::on_ComboModes_currentIndexChanged(int index) +void Ui::OpenRGBDialog::on_ComboModes_currentIndexChanged() { controllers[ui->ComboDevices->currentIndex()]->SetMode(ui->ComboModes->currentIndex()); } diff --git a/qt/OpenRGBDialog.h b/qt/OpenRGBDialog.h index b290c5f0..d37f2f81 100644 --- a/qt/OpenRGBDialog.h +++ b/qt/OpenRGBDialog.h @@ -48,9 +48,9 @@ private slots: void on_ButtonSetLED_clicked(); - void on_ComboDevices_currentIndexChanged(int index); + void on_ComboDevices_currentIndexChanged(); - void on_ComboModes_currentIndexChanged(int index); + void on_ComboModes_currentIndexChanged(); private: Ui::OpenRGBDialogUi *ui; diff --git a/qt/OpenRGBDialog2.cpp b/qt/OpenRGBDialog2.cpp index 5e5d2561..d75df291 100644 --- a/qt/OpenRGBDialog2.cpp +++ b/qt/OpenRGBDialog2.cpp @@ -19,7 +19,7 @@ OpenRGBDialog2::OpenRGBDialog2(std::vector& bus, std::vec \*-----------------------------------------------------*/ QTabBar *DevicesTabBar = ui->DevicesTabBar->tabBar(); - for(int dev_idx = 0; dev_idx < control.size(); dev_idx++) + for(std::size_t dev_idx = 0; dev_idx < control.size(); dev_idx++) { OpenRGBDevicePage *NewPage = new OpenRGBDevicePage(control[dev_idx]); ui->DevicesTabBar->addTab(NewPage, ""); @@ -79,7 +79,7 @@ OpenRGBDialog2::OpenRGBDialog2(std::vector& bus, std::vec \*-----------------------------------------------------*/ QTabBar *InformationTabBar = ui->InformationTabBar->tabBar(); - for(int dev_idx = 0; dev_idx < control.size(); dev_idx++) + for(std::size_t dev_idx = 0; dev_idx < control.size(); dev_idx++) { OpenRGBDeviceInfoPage *NewPage = new OpenRGBDeviceInfoPage(control[dev_idx]); ui->InformationTabBar->addTab(NewPage, ""); diff --git a/qt/OpenRGBSystemInfoPage.cpp b/qt/OpenRGBSystemInfoPage.cpp index f136ea2a..a3efff78 100644 --- a/qt/OpenRGBSystemInfoPage.cpp +++ b/qt/OpenRGBSystemInfoPage.cpp @@ -5,8 +5,8 @@ using namespace Ui; OpenRGBSystemInfoPage::OpenRGBSystemInfoPage(std::vector& bus, QWidget *parent) : QFrame(parent), - busses(bus), - ui(new Ui::OpenRGBSystemInfoPageUi) + ui(new Ui::OpenRGBSystemInfoPageUi), + busses(bus) { ui->setupUi(this); @@ -22,7 +22,7 @@ OpenRGBSystemInfoPage::OpenRGBSystemInfoPage(std::vector& \*-----------------------------------------------------*/ ui->SMBusAdaptersBox->clear(); - for (int i = 0; i < busses.size(); i++) + for (std::size_t i = 0; i < busses.size(); i++) { ui->SMBusAdaptersBox->addItem(busses[i]->device_name); }