Skip to content

Commit 65615e2

Browse files
CalcProgrammer1CalcProgrammer1
committed
Use string get functions in the Qt UI
1 parent 27cac89 commit 65615e2

File tree

3 files changed

+20
-20
lines changed

3 files changed

+20
-20
lines changed

‎qt/DeviceView.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -388,18 +388,18 @@ void DeviceView::InitDeviceView()
388388
\*-----------------------------------------------------*/
389389
if(led_x < map->width - 1 && map->map[map_idx + 1] == 0xFFFFFFFF)
390390
{
391-
if( ( controller->leds[color_idx].name == KEY_EN_TAB )
392-
|| ( controller->leds[color_idx].name == KEY_EN_CAPS_LOCK )
393-
|| ( controller->leds[color_idx].name == KEY_EN_LEFT_SHIFT )
394-
|| ( controller->leds[color_idx].name == KEY_EN_RIGHT_SHIFT)
395-
|| ( controller->leds[color_idx].name == KEY_EN_BACKSPACE )
396-
|| ( controller->leds[color_idx].name == KEY_EN_NUMPAD_0 ) )
391+
if( ( controller->GetLEDName(color_idx) == KEY_EN_TAB )
392+
|| ( controller->GetLEDName(color_idx) == KEY_EN_CAPS_LOCK )
393+
|| ( controller->GetLEDName(color_idx) == KEY_EN_LEFT_SHIFT )
394+
|| ( controller->GetLEDName(color_idx) == KEY_EN_RIGHT_SHIFT)
395+
|| ( controller->GetLEDName(color_idx) == KEY_EN_BACKSPACE )
396+
|| ( controller->GetLEDName(color_idx) == KEY_EN_NUMPAD_0 ) )
397397
{
398398
led_pos[color_idx].matrix_w += 1.0f;
399399
}
400400
}
401-
if( ( controller->leds[color_idx].name == KEY_EN_NUMPAD_ENTER )
402-
|| ( controller->leds[color_idx].name == KEY_EN_NUMPAD_PLUS ) )
401+
if( ( controller->GetLEDName(color_idx) == KEY_EN_NUMPAD_ENTER )
402+
|| ( controller->GetLEDName(color_idx) == KEY_EN_NUMPAD_PLUS ) )
403403
{
404404
if(led_y < map->height - 1 && map->map[map_idx + map->width] == 0xFFFFFFFF)
405405
{
@@ -412,7 +412,7 @@ void DeviceView::InitDeviceView()
412412
led_pos[color_idx].matrix_h += 1.0f;
413413
}
414414
}
415-
else if(controller->leds[color_idx].name == KEY_EN_SPACE)
415+
else if(controller->GetLEDName(color_idx) == KEY_EN_SPACE)
416416
{
417417
for(unsigned int map_idx2 = map_idx - 1; map_idx2 > led_y * map->width && map->map[map_idx2] == 0xFFFFFFFF; map_idx2--)
418418
{
@@ -498,7 +498,7 @@ void DeviceView::InitDeviceView()
498498
\*-----------------------------------------------------*/
499499
for(std::size_t led_idx = 0; led_idx < controller->leds.size(); led_idx++)
500500
{
501-
std::map<std::string, led_label>::const_iterator it = led_label_lookup.find(controller->leds[led_idx].name);
501+
std::map<std::string, led_label>::const_iterator it = led_label_lookup.find(controller->GetLEDName(led_idx));
502502

503503
if(it != led_label_lookup.end())
504504
{
@@ -824,7 +824,7 @@ void DeviceView::paintEvent(QPaintEvent* /* event */)
824824
{
825825
painter.setPen(palette().windowText().color());
826826
}
827-
painter.drawText(posx, posy + posh, QString(controller->zones[zone_idx].name.c_str()));
827+
painter.drawText(posx, posy + posh, QString(controller->GetZoneName(zone_idx).c_str()));
828828

829829
for(std::size_t segment_idx = 0; segment_idx < controller->zones[zone_idx].segments.size(); segment_idx++)
830830
{

‎qt/OpenRGBDeviceInfoPage/OpenRGBDeviceInfoPage.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ OpenRGBDeviceInfoPage::OpenRGBDeviceInfoPage(RGBController *dev, QWidget *parent
2121

2222
ui->TypeValue->setText(device_type_to_str(dev->type).c_str());
2323

24-
ui->NameValue->setText(QString::fromStdString(dev->name));
25-
ui->VendorValue->setText(QString::fromStdString(dev->vendor));
26-
ui->DescriptionValue->setText(QString::fromStdString(dev->description));
27-
ui->VersionValue->setText(QString::fromStdString(dev->version));
28-
ui->LocationValue->setText(QString::fromStdString(dev->location));
29-
ui->SerialValue->setText(QString::fromStdString(dev->serial));
24+
ui->NameValue->setText(QString::fromStdString(dev->GetName()));
25+
ui->VendorValue->setText(QString::fromStdString(dev->GetVendor()));
26+
ui->DescriptionValue->setText(QString::fromStdString(dev->GetDescription()));
27+
ui->VersionValue->setText(QString::fromStdString(dev->GetVersion()));
28+
ui->LocationValue->setText(QString::fromStdString(dev->GetLocation()));
29+
ui->SerialValue->setText(QString::fromStdString(dev->GetSerial()));
3030
}
3131

3232
OpenRGBDeviceInfoPage::~OpenRGBDeviceInfoPage()

‎qt/OpenRGBDevicePage/OpenRGBDevicePage.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ OpenRGBDevicePage::OpenRGBDevicePage(RGBController *dev, QWidget *parent) :
116116

117117
for(std::size_t i = 0; i < device->modes.size(); i++)
118118
{
119-
ui->ModeBox->addItem(device->modes[i].name.c_str());
119+
ui->ModeBox->addItem(device->GetModeName(i).c_str());
120120
ui->ModeBox->setItemData((int)i, ModeDescription(device->modes[i]), Qt::ToolTipRole);
121121
}
122122

@@ -285,7 +285,7 @@ void Ui::OpenRGBDevicePage::on_ZoneBox_currentIndexChanged(int index)
285285
\*-------------------------------------*/
286286
for(std::size_t i = 0; i < device->leds.size(); i++)
287287
{
288-
ui->LEDBox->addItem(device->leds[i].name.c_str());
288+
ui->LEDBox->addItem(device->GetLEDName(i).c_str());
289289
}
290290

291291
/*-------------------------------------*\
@@ -1062,7 +1062,7 @@ void Ui::OpenRGBDevicePage::UpdateModeUi()
10621062

10631063
for(std::size_t zone_idx = 0; zone_idx < device->zones.size(); zone_idx++)
10641064
{
1065-
ui->ZoneBox->addItem(device->zones[zone_idx].name.c_str());
1065+
ui->ZoneBox->addItem(device->GetZoneName(zone_idx).c_str());
10661066

10671067
for(std::size_t segment_idx = 0; segment_idx < device->zones[zone_idx].segments.size(); segment_idx++)
10681068
{

0 commit comments

Comments
 (0)