jalr/OpenRGB
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix even more warnings

Browse source
This commit is contained in:
Adam Honse 2024-04-28 17:35:48 -05:00
parent 06ca1448d1
commit fb963f4ab2
22 changed files with 91 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Controllers/CoolerMasterController/CMKeyboardV1Controller.cpp
View file

@ -392,7 +392,7 @@ void CMKeyboardV1Controller::SetLeds(std::vector<led> leds, std::vector<RGBColor
std::vector<uint8_t> data;
data.push_back(0xC0);
data.push_back(0x02);
data.push_back(i*2);
data.push_back((uint8_t)(i * 2));
data.push_back(0x00);
for(size_t j = 0; j < 16; j++)

2
Controllers/CoolerMasterController/CMKeyboardV2Controller.cpp
View file

@ -258,7 +258,7 @@ void CMKeyboardV2Controller::SetLeds(std::vector<led> leds, std::vector<RGBColor
data.clear();
data.push_back(0x56);
data.push_back(0x83);
data.push_back(i);
data.push_back((uint8_t)i);
data.push_back(0x00);
for(size_t j = 0; j < 60; j++)

2
Controllers/CoolerMasterController/CoolerMasterControllerDetect.cpp
View file

@ -85,7 +85,7 @@ void DetectCoolerMasterARGB(hid_device_info* info, const std::string&)
\*-------------------------------------------------*/
std::shared_ptr<std::mutex> cm_mutex = std::make_shared<std::mutex>();
for(std::size_t i = 0; i < CM_ARGB_HEADER_DATA_SIZE; i++)
for(unsigned char i = 0; i < CM_ARGB_HEADER_DATA_SIZE; i++)
{
CMARGBController* controller = new CMARGBController(dev, info->path, i, cm_mutex);
RGBController_CMARGBController* rgb_controller = new RGBController_CMARGBController(controller);

10
Controllers/CoolerMasterController/RGBController_CMARGBController.cpp
View file

@ -270,7 +270,7 @@ RGBController_CMARGBController::RGBController_CMARGBController(CMARGBController*
SetupZones();
int temp_mode = controller->GetMode();
for(std::size_t mode_idx = 0; mode_idx < modes.size() ; mode_idx++)
for(int mode_idx = 0; mode_idx < (int)modes.size() ; mode_idx++)
{
if (temp_mode == modes[mode_idx].value)
{
@ -382,7 +382,7 @@ void RGBController_CMARGBController::DeviceUpdateLEDs()
{
uint8_t end_zone = last_zone(cmargb->GetZoneIndex());
for(std::size_t zone_idx = first_zone(cmargb->GetZoneIndex()); zone_idx < end_zone; zone_idx++)
for(int zone_idx = first_zone(cmargb->GetZoneIndex()); zone_idx < end_zone; zone_idx++)
{
UpdateZoneLEDs(zone_idx);
}
@ -400,7 +400,7 @@ void RGBController_CMARGBController::UpdateSingleLED(int led)
void RGBController_CMARGBController::SetCustomMode()
{
for(std::size_t mode_idx = 0; mode_idx < modes.size() ; mode_idx++)
for(int mode_idx = 0; mode_idx < (int)modes.size() ; mode_idx++)
{
if (modes[mode_idx].value == CM_ARGB_MODE_DIRECT)
{
@ -423,12 +423,12 @@ int RGBController_CMARGBController::GetLED_Zone(int led_idx)
/*---------------------------------------------------------*\
| This may be more useful in the abstract RGBController.cpp |
\*---------------------------------------------------------*/
for(size_t zone_idx = 0; zone_idx < zones.size(); zone_idx++)
for(int zone_idx = 0; zone_idx < (int)zones.size(); zone_idx++)
{
int zone_start = zones[zone_idx].start_idx;
int zone_end = zone_start + zones[zone_idx].leds_count - 1;
if( zone_start <= led_idx && zone_end >= led_idx)
if(zone_start <= led_idx && zone_end >= led_idx)
{
return(zone_idx);
}

14
Controllers/CoolerMasterController/RGBController_CMMM711Controller.cpp
View file

@ -107,16 +107,16 @@ RGBController_CMMM711Controller::RGBController_CMMM711Controller(CMMM711Controll
uint8_t temp_mode = controller->GetMode();
for(std::size_t mode_index = 0; mode_index < modes.size(); mode_index++)
for(int mode_index = 0; mode_index < (int)modes.size(); mode_index++)
{
if (modes[mode_index].value == temp_mode)
if(modes[mode_index].value == temp_mode)
{
active_mode = mode_index;
break;
}
}
if (modes[active_mode].color_mode == MODE_COLORS_MODE_SPECIFIC)
if(modes[active_mode].color_mode == MODE_COLORS_MODE_SPECIFIC)
{
modes[active_mode].colors[0] = ToRGBColor(controller->GetLedRed(),controller->GetLedGreen(),controller->GetLedBlue());
}
@ -184,9 +184,9 @@ void RGBController_CMMM711Controller::UpdateSingleLED(int /*led*/)
void RGBController_CMMM711Controller::SetCustomMode()
{
for(std::size_t mode_index = 0; mode_index < modes.size(); mode_index++)
for(int mode_index = 0; mode_index < (int)modes.size(); mode_index++)
{
if (modes[mode_index].value == CM_MM711_MODE_CUSTOM)
if(modes[mode_index].value == CM_MM711_MODE_CUSTOM)
{
active_mode = mode_index;
break;
@ -198,9 +198,9 @@ void RGBController_CMMM711Controller::DeviceUpdateMode()
{
RGBColor colour = 0;
if (modes[active_mode].value != CM_MM711_MODE_CUSTOM)
if(modes[active_mode].value != CM_MM711_MODE_CUSTOM)
{
if( modes[active_mode].color_mode == MODE_COLORS_MODE_SPECIFIC )
if(modes[active_mode].color_mode == MODE_COLORS_MODE_SPECIFIC )
{
colour = modes[active_mode].colors[0];
}

4
Controllers/CoolerMasterController/RGBController_CMMMController.cpp
View file

@ -135,7 +135,7 @@ RGBController_CMMMController::RGBController_CMMMController(CMMMController* contr
uint8_t temp_mode = controller->GetMode();
for(std::size_t mode_index = 0; mode_index < modes.size(); mode_index++)
for(int mode_index = 0; mode_index < (int)modes.size(); mode_index++)
{
if(modes[mode_index].value == temp_mode)
{
@ -249,7 +249,7 @@ void RGBController_CMMMController::UpdateSingleLED(int /*led*/)
void RGBController_CMMMController::SetCustomMode()
{
for(std::size_t mode_index = 0; mode_index < modes.size(); mode_index++)
for(int mode_index = 0; mode_index < (int)modes.size(); mode_index++)
{
if(modes[mode_index].value == CM_MM_MODE_CUSTOM)
{

12
Controllers/CoolerMasterController/RGBController_CMRGBController.cpp
View file

@ -158,7 +158,7 @@ void RGBController_CMRGBController::ReadAllModeConfigsFromDevice()
{
int device_mode = controller->GetMode();
for(std::size_t mode_idx = 0; mode_idx < modes.size(); mode_idx++)
for(int mode_idx = 0; mode_idx < (int)modes.size(); mode_idx++)
{
if(device_mode == modes[mode_idx].value)
{
@ -188,14 +188,14 @@ void RGBController_CMRGBController::ReadAllModeConfigsFromDevice()
void RGBController_CMRGBController::LoadConfigFromDeviceController(int mode_idx)
{
for(std::size_t color_idx = 0; color_idx < modes[mode_idx].colors.size(); color_idx++)
for(int color_idx = 0; color_idx < (int)modes[mode_idx].colors.size(); color_idx++)
{
modes[mode_idx].colors[0] = controller->GetModeColor(color_idx);
}
if(modes[mode_idx].flags & MODE_FLAG_HAS_PER_LED_COLOR)
{
for (std::size_t led_idx = 0; led_idx < leds.size(); led_idx++)
for(int led_idx = 0; led_idx < (int)leds.size(); led_idx++)
{
SetLED(led_idx, controller->GetPortColor(led_idx));
}
@ -248,7 +248,7 @@ void RGBController_CMRGBController::ResizeZone(int /*zone*/, int /*new_size*/)
void RGBController_CMRGBController::DeviceUpdateLEDs()
{
for(size_t zone_idx = 0; zone_idx < zones.size(); zone_idx++)
for(int zone_idx = 0; zone_idx < (int)zones.size(); zone_idx++)
{
UpdateZoneLEDs(zone_idx);
}
@ -265,9 +265,9 @@ void RGBController_CMRGBController::UpdateSingleLED(int /*led*/)
void RGBController_CMRGBController::SetCustomMode()
{
for(std::size_t mode_idx = 0; mode_idx < modes.size() ; mode_idx++)
for(int mode_idx = 0; mode_idx < (int)modes.size() ; mode_idx++)
{
if (modes[mode_idx].value == CM_RGBC_MODE_MULTIPLE)
if(modes[mode_idx].value == CM_RGBC_MODE_MULTIPLE)
{
active_mode = mode_idx;
break;

6
Controllers/CoolerMasterController/RGBController_CMSmallARGBController.cpp
View file

@ -155,9 +155,9 @@ RGBController_CMSmallARGBController::RGBController_CMSmallARGBController(CMSmall
int temp_mode = controller->GetMode();
for(std::size_t mode_idx = 0; mode_idx < modes.size() ; mode_idx++)
for(int mode_idx = 0; mode_idx < (int)modes.size() ; mode_idx++)
{
if (temp_mode == modes[mode_idx].value)
if(temp_mode == modes[mode_idx].value)
{
active_mode = mode_idx;
break;
@ -259,7 +259,7 @@ void RGBController_CMSmallARGBController::ResizeZone(int zone, int new_size)
void RGBController_CMSmallARGBController::DeviceUpdateLEDs()
{
for(size_t zone_idx = 0; zone_idx < zones.size(); zone_idx++)
for(int zone_idx = 0; zone_idx < (int)zones.size(); zone_idx++)
{
UpdateZoneLEDs(zone_idx);
}