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

Use GetName instead of directly accessing the RGBController::name member outside of Controllers

Browse source
This commit is contained in:
Adam Honse 2025-08-01 11:32:55 -05:00
parent 1318d23401
commit 30f9b84d5f
6 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
qt/OpenRGBClientInfoPage/OpenRGBClientInfoPage.cpp
View file

@ -195,7 +195,7 @@ void OpenRGBClientInfoPage::UpdateInfo()
| names in them |
\*-----------------------------------------------------*/
QTreeWidgetItem* new_item = new QTreeWidgetItem(new_top_item);
new_item->setText(0, QString::fromStdString(ResourceManager::get()->GetClients()[client_idx]->server_controllers[dev_idx]->name));
new_item->setText(0, QString::fromStdString(ResourceManager::get()->GetClients()[client_idx]->server_controllers[dev_idx]->GetName()));
/*-----------------------------------------------------*\
| Add child items for each zone in the device |

8
qt/OpenRGBDialog/OpenRGBDialog.cpp
View file

@ -1062,10 +1062,10 @@ void OpenRGBDialog::UpdateDevicesList()
/*---------------------------------------------*\
| Create the tab label |
\*---------------------------------------------*/
TabLabel* NewTabLabel = new TabLabel(GetIcon(controllers[controller_idx]->type), QString::fromStdString(controllers[controller_idx]->name), (char *)controllers[controller_idx]->name.c_str(), (char *)context);
TabLabel* NewTabLabel = new TabLabel(GetIcon(controllers[controller_idx]->type), QString::fromStdString(controllers[controller_idx]->GetName()), (char *)controllers[controller_idx]->GetName().c_str(), (char *)context);
ui->DevicesTabBar->tabBar()->setTabButton(ui->DevicesTabBar->count() - 1, QTabBar::LeftSide, NewTabLabel);
ui->DevicesTabBar->tabBar()->setTabToolTip(ui->DevicesTabBar->count() - 1, QString::fromStdString(controllers[controller_idx]->name));
ui->DevicesTabBar->tabBar()->setTabToolTip(ui->DevicesTabBar->count() - 1, QString::fromStdString(controllers[controller_idx]->GetName()));
/*---------------------------------------------*\
| Now move the new tab to the correct position |
@ -1115,10 +1115,10 @@ void OpenRGBDialog::UpdateDevicesList()
/*---------------------------------------------*\
| Create the tab label |
\*---------------------------------------------*/
TabLabel* NewTabLabel = new TabLabel(GetIcon(controllers[controller_idx]->type), QString::fromStdString(controllers[controller_idx]->name), (char *)controllers[controller_idx]->name.c_str(), (char *)context);
TabLabel* NewTabLabel = new TabLabel(GetIcon(controllers[controller_idx]->type), QString::fromStdString(controllers[controller_idx]->GetName()), (char *)controllers[controller_idx]->GetName().c_str(), (char *)context);
ui->InformationTabBar->tabBar()->setTabButton(ui->InformationTabBar->count() - 1, QTabBar::LeftSide, NewTabLabel);
ui->InformationTabBar->tabBar()->setTabToolTip(ui->InformationTabBar->count() - 1, QString::fromStdString(controllers[controller_idx]->name));
ui->InformationTabBar->tabBar()->setTabToolTip(ui->InformationTabBar->count() - 1, QString::fromStdString(controllers[controller_idx]->GetName()));
/*---------------------------------------------*\
| Now move the new tab to the correct position |

2
qt/OpenRGBZonesBulkResizer/OpenRGBZonesBulkResizer.cpp
View file

@ -142,7 +142,7 @@ void OpenRGBZonesBulkResizer::CreateZoneWidget(RGBController* controller, unsign
| Labels: controller name + zone name |
\*---------------------------------------------------------*/
QLabel* controller_label = new QLabel(this);
controller_label->setText(QString::fromStdString(controller->name));
controller_label->setText(QString::fromStdString(controller->GetName()));
QLabel* zone_label = new QLabel(this);
zone_label->setText(QString::fromStdString(controller->zones[zone_index].name));