diff --git a/SerialPrograms/Source/Controllers/ControllerSelectorWidget.cpp b/SerialPrograms/Source/Controllers/ControllerSelectorWidget.cpp index 9fe9264626..4e2f6f8bc1 100644 --- a/SerialPrograms/Source/Controllers/ControllerSelectorWidget.cpp +++ b/SerialPrograms/Source/Controllers/ControllerSelectorWidget.cpp @@ -47,8 +47,8 @@ ControllerSelectorWidget::ControllerSelectorWidget(QWidget& parent, ControllerSe layout1->addLayout(m_dropdowns, CONSOLE_SETTINGS_STRETCH_L1_BODY); layout1->addSpacing(5); - interface_dropdown = new NoWheelCompactComboBox(this); - m_dropdowns->addWidget(interface_dropdown); + m_interface_dropdown = new NoWheelCompactComboBox(this); + m_dropdowns->addWidget(m_interface_dropdown); // Add all the supported interfaces. @@ -61,10 +61,10 @@ ControllerSelectorWidget::ControllerSelectorWidget(QWidget& parent, ControllerSe for (ControllerInterface item : m_interface_list){ - interface_dropdown->addItem(QString::fromStdString(CONTROLLER_INTERFACE_STRINGS.get_string(item))); + m_interface_dropdown->addItem(QString::fromStdString(CONTROLLER_INTERFACE_STRINGS.get_string(item))); } -// interface_dropdown->setHidden(true); +// m_interface_dropdown->setHidden(true); auto current = session.descriptor(); if (current == nullptr || current->interface_type == ControllerInterface::None){ @@ -110,7 +110,7 @@ ControllerSelectorWidget::ControllerSelectorWidget(QWidget& parent, ControllerSe setFocusPolicy(Qt::StrongFocus); connect( - interface_dropdown, static_cast(&QComboBox::activated), + m_interface_dropdown, static_cast(&QComboBox::activated), this, [this](int index){ index = std::max(index, 0); // index = std::min(index, (int)m_device_list.size() - 1); @@ -159,7 +159,7 @@ void ControllerSelectorWidget::update_interface_dropdown(ControllerInterface int } for (size_t index = 0; index < m_interface_list.size(); index++){ if (interface_type == m_interface_list[index]){ - interface_dropdown->setCurrentIndex((int)index); + m_interface_dropdown->setCurrentIndex((int)index); break; } } @@ -247,7 +247,7 @@ void ControllerSelectorWidget::post_status_text_changed(const std::string& text) void ControllerSelectorWidget::options_locked(bool locked){ QMetaObject::invokeMethod(this, [this, locked]{ m_selector->setEnabled(!locked); - interface_dropdown->setEnabled(!locked); + m_interface_dropdown->setEnabled(!locked); m_controllers_dropdown->setEnabled(!locked); m_reset_button->setEnabled(!locked); }); diff --git a/SerialPrograms/Source/Controllers/ControllerSelectorWidget.h b/SerialPrograms/Source/Controllers/ControllerSelectorWidget.h index 0d011bc7a9..fa642c6170 100644 --- a/SerialPrograms/Source/Controllers/ControllerSelectorWidget.h +++ b/SerialPrograms/Source/Controllers/ControllerSelectorWidget.h @@ -62,7 +62,7 @@ class ControllerSelectorWidget : public QWidget, private ControllerSession::List QHBoxLayout* m_dropdowns; QWidget* m_selector = nullptr; - QComboBox* interface_dropdown = nullptr; + QComboBox* m_interface_dropdown = nullptr; QComboBox* m_controllers_dropdown = nullptr; QLabel* m_status_text = nullptr; QPushButton* m_reset_button = nullptr;