Convert all UI files to match Qt standards

main.cpp

@@ -273,7 +273,7 @@ int main(int argc, char* argv[])
         /*---------------------------------------------------------*\
         | Main UI widget                                            |
         \*---------------------------------------------------------*/
-        Ui::OpenRGBDialog dlg;
+        OpenRGBDialog dlg;
         LOG_TRACE("[main] Dialog created");
 
         if(ret_flags & RET_FLAG_I2C_TOOLS)

qt/OpenRGBClientInfoPage/OpenRGBClientInfoPage.cpp

@@ -13,8 +13,7 @@
 #include "OpenRGBClientInfoPage.h"
 #include "ResourceManager.h"
 #include "SettingsManager.h"
-
+#include "ui_OpenRGBClientInfoPage.h"
-using namespace Ui;
 
 static void UpdateInfoCallback(void * this_ptr)
 {
@@ -32,7 +31,7 @@ public:
 
 OpenRGBClientInfoPage::OpenRGBClientInfoPage(QWidget *parent) :
     QFrame(parent),
-    ui(new Ui::OpenRGBClientInfoPageUi)
+    ui(new Ui::OpenRGBClientInfoPage)
 {
     /*-----------------------------------------------------*\
     | Set initial values for GUI fields                     |
@@ -235,7 +234,7 @@ void OpenRGBClientInfoPage::UpdateInfo()
     }
 }
 
-void Ui::OpenRGBClientInfoPage::on_ClientConnectButton_clicked()
+void OpenRGBClientInfoPage::on_ClientConnectButton_clicked()
 {
     /*-----------------------------------------------------*\
     | Read the new client IP and Port values from the UI    |
@@ -265,7 +264,7 @@ void Ui::OpenRGBClientInfoPage::on_ClientConnectButton_clicked()
     rgb_client->RegisterClientInfoChangeCallback(UpdateInfoCallback, this);
 }
 
-void Ui::OpenRGBClientInfoPage::onClientDisconnectButton_clicked(QObject * arg)
+void OpenRGBClientInfoPage::onClientDisconnectButton_clicked(QObject * arg)
 {
     /*-----------------------------------------------------*\
     | Get the pointer to the disconnecting client from args |
@@ -279,7 +278,7 @@ void Ui::OpenRGBClientInfoPage::onClientDisconnectButton_clicked(QObject * arg)
     ResourceManager::get()->UnregisterNetworkClient(disconnect_client);
 }
 
-void Ui::OpenRGBClientInfoPage::onClientSaveCheckBox_clicked(QObject * arg)
+void OpenRGBClientInfoPage::onClientSaveCheckBox_clicked(QObject * arg)
 {
     /*-----------------------------------------------------*\
     | Get the pointer to the client from args               |

qt/OpenRGBClientInfoPage/OpenRGBClientInfoPage.h

@@ -11,7 +11,6 @@
 
 #include <QFrame>
 #include "RGBController.h"
-#include "ui_OpenRGBClientInfoPage.h"
 #include "NetworkClient.h"
 
 namespace Ui
@@ -19,7 +18,7 @@ namespace Ui
     class OpenRGBClientInfoPage;
 }
 
-class Ui::OpenRGBClientInfoPage : public QFrame
+class OpenRGBClientInfoPage : public QFrame
 {
     Q_OBJECT
 
@@ -39,5 +38,5 @@ private slots:
     void onClientSaveCheckBox_clicked(QObject * arg);
 
 private:
-    Ui::OpenRGBClientInfoPageUi *ui;
+    Ui::OpenRGBClientInfoPage *ui;
 };

qt/OpenRGBClientInfoPage/OpenRGBClientInfoPage.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>OpenRGBClientInfoPageUi</class>
+ <class>OpenRGBClientInfoPage</class>
- <widget class="QFrame" name="OpenRGBClientInfoPageUi">
+ <widget class="QFrame" name="OpenRGBClientInfoPage">
   <property name="geometry">
    <rect>
     <x>0</x>

qt/OpenRGBConsolePage/OpenRGBConsolePage.cpp

@@ -7,15 +7,13 @@
 |   SPDX-License-Identifier: GPL-2.0-only                   |
 \*---------------------------------------------------------*/
 
-#include <stdio.h>
 #include "OpenRGBConsolePage.h"
+#include "ui_OpenRGBConsolePage.h"
 #include "LogManager.h"
 
-using namespace Ui;
-
 OpenRGBConsolePage::OpenRGBConsolePage(QWidget *parent) :
     QFrame(parent),
-    ui(new Ui::OpenRGBConsolePageUi)
+    ui(new Ui::OpenRGBConsolePage)
 {
     ui->setupUi(this);
 

qt/OpenRGBConsolePage/OpenRGBConsolePage.h

@@ -10,14 +10,13 @@
 #pragma once
 
 #include <QFrame>
-#include "ui_OpenRGBConsolePage.h"
 
 namespace Ui
 {
     class OpenRGBConsolePage;
 }
 
-class Ui::OpenRGBConsolePage : public QFrame
+class OpenRGBConsolePage : public QFrame
 {
     Q_OBJECT
 
@@ -32,7 +31,7 @@ private slots:
     void on_refresh_clicked();
 
 private:
-    Ui::OpenRGBConsolePageUi *ui;
+    Ui::OpenRGBConsolePage *ui;
 
     void Refresh();
 };

qt/OpenRGBConsolePage/OpenRGBConsolePage.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>OpenRGBConsolePageUi</class>
+ <class>OpenRGBConsolePage</class>
- <widget class="QFrame" name="OpenRGBConsolePageUi">
+ <widget class="QFrame" name="OpenRGBConsolePage">
   <property name="geometry">
    <rect>
     <x>0</x>

qt/OpenRGBDMXSettingsPage/OpenRGBDMXSettingsEntry.cpp

@@ -10,11 +10,9 @@
 #include "OpenRGBDMXSettingsEntry.h"
 #include "ui_OpenRGBDMXSettingsEntry.h"
 
-using namespace Ui;
-
 OpenRGBDMXSettingsEntry::OpenRGBDMXSettingsEntry(QWidget *parent) :
     BaseManualDeviceEntry(parent),
-    ui(new Ui::OpenRGBDMXSettingsEntryUi)
+    ui(new Ui::OpenRGBDMXSettingsEntry)
 {
     ui->setupUi(this);
 }

qt/OpenRGBDMXSettingsPage/OpenRGBDMXSettingsEntry.h

@@ -14,10 +14,9 @@
 namespace Ui
 {
     class OpenRGBDMXSettingsEntry;
-    class OpenRGBDMXSettingsEntryUi;
 }
 
-class Ui::OpenRGBDMXSettingsEntry : public BaseManualDeviceEntry
+class OpenRGBDMXSettingsEntry : public BaseManualDeviceEntry
 {
     Q_OBJECT
 
@@ -29,7 +28,7 @@ public:
     const char* settingsSection();
 
 private:
-    Ui::OpenRGBDMXSettingsEntryUi *ui;
+    Ui::OpenRGBDMXSettingsEntry *ui;
 
 private slots:
     void changeEvent(QEvent *event);

qt/OpenRGBDMXSettingsPage/OpenRGBDMXSettingsEntry.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>OpenRGBDMXSettingsEntryUi</class>
+ <class>OpenRGBDMXSettingsEntry</class>
- <widget class="QWidget" name="OpenRGBDMXSettingsEntryUi">
+ <widget class="QWidget" name="OpenRGBDMXSettingsEntry">
   <property name="geometry">
    <rect>
     <x>0</x>

qt/OpenRGBDMXSettingsPage/OpenRGBDMXSettingsPage.cpp

@@ -12,11 +12,9 @@
 #include "ResourceManager.h"
 #include "SettingsManager.h"
 
-using namespace Ui;
-
 OpenRGBDMXSettingsPage::OpenRGBDMXSettingsPage(QWidget *parent) :
     QWidget(parent),
-    ui(new Ui::OpenRGBDMXSettingsPageUi)
+    ui(new Ui::OpenRGBDMXSettingsPage)
 {
     ui->setupUi(this);
 
@@ -64,7 +62,7 @@ void OpenRGBDMXSettingsPage::changeEvent(QEvent *event)
     }
 }
 
-void Ui::OpenRGBDMXSettingsPage::on_AddDMXDeviceButton_clicked()
+void OpenRGBDMXSettingsPage::on_AddDMXDeviceButton_clicked()
 {
     OpenRGBDMXSettingsEntry* entry = new OpenRGBDMXSettingsEntry;
     entries.push_back(entry);
@@ -78,7 +76,7 @@ void Ui::OpenRGBDMXSettingsPage::on_AddDMXDeviceButton_clicked()
     ui->DMXDeviceList->show();
 }
 
-void Ui::OpenRGBDMXSettingsPage::on_RemoveDMXDeviceButton_clicked()
+void OpenRGBDMXSettingsPage::on_RemoveDMXDeviceButton_clicked()
 {
     int cur_row = ui->DMXDeviceList->currentRow();
 
@@ -96,7 +94,7 @@ void Ui::OpenRGBDMXSettingsPage::on_RemoveDMXDeviceButton_clicked()
     entries.erase(entries.begin() + cur_row);
 }
 
-void Ui::OpenRGBDMXSettingsPage::on_SaveDMXConfigurationButton_clicked()
+void OpenRGBDMXSettingsPage::on_SaveDMXConfigurationButton_clicked()
 {
     json                dmx_settings;
 

qt/OpenRGBDMXSettingsPage/OpenRGBDMXSettingsPage.h

@@ -10,7 +10,6 @@
 #pragma once
 
 #include <QWidget>
-#include "ui_OpenRGBDMXSettingsPage.h"
 #include "OpenRGBDMXSettingsEntry.h"
 
 namespace Ui
@@ -18,7 +17,7 @@ namespace Ui
     class OpenRGBDMXSettingsPage;
 }
 
-class Ui::OpenRGBDMXSettingsPage : public QWidget
+class OpenRGBDMXSettingsPage : public QWidget
 {
     Q_OBJECT
 
@@ -35,7 +34,7 @@ private slots:
     void on_SaveDMXConfigurationButton_clicked();
 
 private:
-    Ui::OpenRGBDMXSettingsPageUi*           ui;
+    Ui::OpenRGBDMXSettingsPage*           ui;
-    std::vector<OpenRGBDMXSettingsEntry*>   entries;
+    std::vector<OpenRGBDMXSettingsEntry*> entries;
 
 };

qt/OpenRGBDMXSettingsPage/OpenRGBDMXSettingsPage.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>OpenRGBDMXSettingsPageUi</class>
+ <class>OpenRGBDMXSettingsPage</class>
- <widget class="QWidget" name="OpenRGBDMXSettingsPageUi">
+ <widget class="QWidget" name="OpenRGBDMXSettingsPage">
   <property name="geometry">
    <rect>
     <x>0</x>

qt/OpenRGBDeviceInfoPage/OpenRGBDeviceInfoPage.cpp

@@ -8,12 +8,11 @@
 \*---------------------------------------------------------*/
 
 #include "OpenRGBDeviceInfoPage.h"
-
+#include "ui_OpenRGBDeviceInfoPage.h"
-using namespace Ui;
 
 OpenRGBDeviceInfoPage::OpenRGBDeviceInfoPage(RGBController *dev, QWidget *parent) :
     QFrame(parent),
-    ui(new Ui::OpenRGBDeviceInfoPageUi)
+    ui(new Ui::OpenRGBDeviceInfoPage)
 {
     controller = dev;
 

qt/OpenRGBDeviceInfoPage/OpenRGBDeviceInfoPage.h

@@ -11,14 +11,13 @@
 
 #include <QFrame>
 #include "RGBController.h"
-#include "ui_OpenRGBDeviceInfoPage.h"
 
 namespace Ui
 {
     class OpenRGBDeviceInfoPage;
 }
 
-class Ui::OpenRGBDeviceInfoPage : public QFrame
+class OpenRGBDeviceInfoPage : public QFrame
 {
     Q_OBJECT
 
@@ -29,8 +28,8 @@ public:
     RGBController* GetController();
 
 private:
-    RGBController*                  controller;
+    RGBController*             controller;
-    Ui::OpenRGBDeviceInfoPageUi*    ui;
+    Ui::OpenRGBDeviceInfoPage* ui;
 
 private slots:
     void changeEvent(QEvent *event);

qt/OpenRGBDeviceInfoPage/OpenRGBDeviceInfoPage.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>OpenRGBDeviceInfoPageUi</class>
+ <class>OpenRGBDeviceInfoPage</class>
- <widget class="QFrame" name="OpenRGBDeviceInfoPageUi">
+ <widget class="QFrame" name="OpenRGBDeviceInfoPage">
   <property name="geometry">
    <rect>
     <x>0</x>

qt/OpenRGBDevicePage/OpenRGBDevicePage.cpp

@@ -13,8 +13,7 @@
 #include "ResourceManager.h"
 #include "SettingsManager.h"
 #include "hsv.h"
-
+#include "ui_OpenRGBDevicePage.h"
-using namespace Ui;
 
 static void UpdateCallback(void * this_ptr)
 {
@@ -57,7 +56,7 @@ QString OpenRGBDevicePage::ModeDescription(const mode& m)
 
 OpenRGBDevicePage::OpenRGBDevicePage(RGBController *dev, QWidget *parent) :
     QFrame(parent),
-    ui(new Ui::OpenRGBDevicePageUi)
+    ui(new Ui::OpenRGBDevicePage)
 {
     ui->setupUi(this);
 
@@ -167,12 +166,12 @@ void OpenRGBDevicePage::changeEvent(QEvent *event)
     }
 }
 
-RGBController* Ui::OpenRGBDevicePage::GetController()
+RGBController* OpenRGBDevicePage::GetController()
 {
     return device;
 }
 
-void Ui::OpenRGBDevicePage::on_ZoneBox_currentIndexChanged(int index)
+void OpenRGBDevicePage::on_ZoneBox_currentIndexChanged(int index)
 {
     /*-----------------------------------------------------*\
     | Read selected mode                                    |
@@ -415,7 +414,7 @@ void Ui::OpenRGBDevicePage::on_ZoneBox_currentIndexChanged(int index)
     }
 }
 
-void Ui::OpenRGBDevicePage::on_LEDBox_currentIndexChanged(int index)
+void OpenRGBDevicePage::on_LEDBox_currentIndexChanged(int index)
 {
     /*-----------------------------------------------------*\
     | Read selected mode                                    |
@@ -707,7 +706,7 @@ void Ui::OpenRGBDevicePage::on_LEDBox_currentIndexChanged(int index)
 
 }
 
-void Ui::OpenRGBDevicePage::on_ModeBox_currentIndexChanged(int index)
+void OpenRGBDevicePage::on_ModeBox_currentIndexChanged(int index)
 {
     /*-----------------------------------------------------*\
     | Update mode user interface elements                   |
@@ -727,7 +726,7 @@ void Ui::OpenRGBDevicePage::on_ModeBox_currentIndexChanged(int index)
 
 }
 
-void Ui::OpenRGBDevicePage::on_PerLEDCheck_clicked()
+void OpenRGBDevicePage::on_PerLEDCheck_clicked()
 {
     /*-----------------------------------------------------*\
     | Change device mode                                    |
@@ -740,7 +739,7 @@ void Ui::OpenRGBDevicePage::on_PerLEDCheck_clicked()
     UpdateModeUi();
 }
 
-void Ui::OpenRGBDevicePage::on_ModeSpecificCheck_clicked()
+void OpenRGBDevicePage::on_ModeSpecificCheck_clicked()
 {
     /*-----------------------------------------------------*\
     | Change device mode                                    |
@@ -753,7 +752,7 @@ void Ui::OpenRGBDevicePage::on_ModeSpecificCheck_clicked()
     UpdateModeUi();
 }
 
-void Ui::OpenRGBDevicePage::on_RandomCheck_clicked()
+void OpenRGBDevicePage::on_RandomCheck_clicked()
 {
     /*-----------------------------------------------------*\
     | Change device mode                                    |
@@ -766,7 +765,7 @@ void Ui::OpenRGBDevicePage::on_RandomCheck_clicked()
     UpdateModeUi();
 }
 
-void Ui::OpenRGBDevicePage::on_BrightnessSlider_valueChanged(int /*value*/)
+void OpenRGBDevicePage::on_BrightnessSlider_valueChanged(int /*value*/)
 {
     /*-----------------------------------------------------*\
     | Change device mode                                    |
@@ -774,7 +773,7 @@ void Ui::OpenRGBDevicePage::on_BrightnessSlider_valueChanged(int /*value*/)
     UpdateMode();
 }
 
-void Ui::OpenRGBDevicePage::on_SpeedSlider_valueChanged(int /*value*/)
+void OpenRGBDevicePage::on_SpeedSlider_valueChanged(int /*value*/)
 {
     /*-----------------------------------------------------*\
     | Change device mode                                    |
@@ -782,7 +781,7 @@ void Ui::OpenRGBDevicePage::on_SpeedSlider_valueChanged(int /*value*/)
     UpdateMode();
 }
 
-void Ui::OpenRGBDevicePage::on_DirectionBox_currentIndexChanged(int /*index*/)
+void OpenRGBDevicePage::on_DirectionBox_currentIndexChanged(int /*index*/)
 {
     /*-----------------------------------------------------*\
     | Change device mode                                    |
@@ -790,13 +789,13 @@ void Ui::OpenRGBDevicePage::on_DirectionBox_currentIndexChanged(int /*index*/)
     UpdateMode();
 }
 
-void Ui::OpenRGBDevicePage::UpdateInterface()
+void OpenRGBDevicePage::UpdateInterface()
 {
     //UpdateModeUi();
     ui->DeviceViewBox->repaint();
 }
 
-void Ui::OpenRGBDevicePage::UpdateModeUi()
+void OpenRGBDevicePage::UpdateModeUi()
 {
     /*-----------------------------------------------------*\
     | Read selected mode                                    |
@@ -1123,7 +1122,7 @@ void Ui::OpenRGBDevicePage::UpdateModeUi()
     }
 }
 
-void Ui::OpenRGBDevicePage::UpdateMode()
+void OpenRGBDevicePage::UpdateMode()
 {
     /*-----------------------------------------------------*\
     | Read selected mode                                    |
@@ -1262,7 +1261,7 @@ void Ui::OpenRGBDevicePage::UpdateMode()
     }
 }
 
-void Ui::OpenRGBDevicePage::SetDevice(unsigned char red, unsigned char green, unsigned char blue)
+void OpenRGBDevicePage::SetDevice(unsigned char red, unsigned char green, unsigned char blue)
 {
     current_color.setRgb(red, green, blue);
 
@@ -1272,7 +1271,7 @@ void Ui::OpenRGBDevicePage::SetDevice(unsigned char red, unsigned char green, un
     colorChanged();
 }
 
-void Ui::OpenRGBDevicePage::UpdateDevice()
+void OpenRGBDevicePage::UpdateDevice()
 {
     ui->ModeBox->blockSignals(true);
     ui->ModeBox->setCurrentIndex(device->active_mode);
@@ -1281,7 +1280,7 @@ void Ui::OpenRGBDevicePage::UpdateDevice()
     UpdateMode();
 }
 
-void Ui::OpenRGBDevicePage::SetCustomMode(unsigned char red, unsigned char green, unsigned char blue)
+void OpenRGBDevicePage::SetCustomMode(unsigned char red, unsigned char green, unsigned char blue)
 {
     RGBColor color = ToRGBColor(red, green, blue);
     /*-----------------------------------------------------*\
@@ -1328,7 +1327,7 @@ void Ui::OpenRGBDevicePage::SetCustomMode(unsigned char red, unsigned char green
     UpdateMode();
 }
 
-void Ui::OpenRGBDevicePage::on_SwatchBox_swatchChanged(const QColor color)
+void OpenRGBDevicePage::on_SwatchBox_swatchChanged(const QColor color)
 {
     /*-----------------------------------------------------*\
     | Store the swatch color to the current color QColor    |
@@ -1341,7 +1340,7 @@ void Ui::OpenRGBDevicePage::on_SwatchBox_swatchChanged(const QColor color)
     colorChanged();
 }
 
-void Ui::OpenRGBDevicePage::on_ColorWheelBox_colorChanged(const QColor color)
+void OpenRGBDevicePage::on_ColorWheelBox_colorChanged(const QColor color)
 {
     /*-----------------------------------------------------*\
     | Store the wheel color to the current color QColor     |
@@ -1354,12 +1353,12 @@ void Ui::OpenRGBDevicePage::on_ColorWheelBox_colorChanged(const QColor color)
     colorChanged();
 }
 
-bool Ui::OpenRGBDevicePage::autoUpdateEnabled()
+bool OpenRGBDevicePage::autoUpdateEnabled()
 {
     return !(device->modes[device->active_mode].flags & MODE_FLAG_AUTOMATIC_SAVE);
 }
 
-void Ui::OpenRGBDevicePage::on_RedSpinBox_valueChanged(int red)
+void OpenRGBDevicePage::on_RedSpinBox_valueChanged(int red)
 {
     /*-----------------------------------------------------*\
     | Update the current color QColor red channel           |
@@ -1372,7 +1371,7 @@ void Ui::OpenRGBDevicePage::on_RedSpinBox_valueChanged(int red)
     colorChanged();
 }
 
-void Ui::OpenRGBDevicePage::on_HueSpinBox_valueChanged(int hue)
+void OpenRGBDevicePage::on_HueSpinBox_valueChanged(int hue)
 {
     /*-----------------------------------------------------*\
     | Read the saturation and value box values              |
@@ -1391,7 +1390,7 @@ void Ui::OpenRGBDevicePage::on_HueSpinBox_valueChanged(int hue)
     colorChanged();
 }
 
-void Ui::OpenRGBDevicePage::on_GreenSpinBox_valueChanged(int green)
+void OpenRGBDevicePage::on_GreenSpinBox_valueChanged(int green)
 {
     /*-----------------------------------------------------*\
     | Update the current color QColor green channel         |
@@ -1404,7 +1403,7 @@ void Ui::OpenRGBDevicePage::on_GreenSpinBox_valueChanged(int green)
     colorChanged();
 }
 
-void Ui::OpenRGBDevicePage::on_SatSpinBox_valueChanged(int sat)
+void OpenRGBDevicePage::on_SatSpinBox_valueChanged(int sat)
 {
     /*-----------------------------------------------------*\
     | Read the hue and value box values                     |
@@ -1423,7 +1422,7 @@ void Ui::OpenRGBDevicePage::on_SatSpinBox_valueChanged(int sat)
     colorChanged();
 }
 
-void Ui::OpenRGBDevicePage::on_BlueSpinBox_valueChanged(int blue)
+void OpenRGBDevicePage::on_BlueSpinBox_valueChanged(int blue)
 {
     /*-----------------------------------------------------*\
     | Update the current color QColor blue channel          |
@@ -1436,7 +1435,7 @@ void Ui::OpenRGBDevicePage::on_BlueSpinBox_valueChanged(int blue)
     colorChanged();
 }
 
-void Ui::OpenRGBDevicePage::on_ValSpinBox_valueChanged(int val)
+void OpenRGBDevicePage::on_ValSpinBox_valueChanged(int val)
 {
     /*-----------------------------------------------------*\
     | Read the hue and saturation box values                |
@@ -1455,7 +1454,7 @@ void Ui::OpenRGBDevicePage::on_ValSpinBox_valueChanged(int val)
     colorChanged();
 }
 
-void Ui::OpenRGBDevicePage::on_HexLineEdit_textChanged(const QString &arg1)
+void OpenRGBDevicePage::on_HexLineEdit_textChanged(const QString &arg1)
 {
     /*-----------------------------------------------------*\
     | Make an editable copy of the string                   |
@@ -1499,7 +1498,7 @@ void Ui::OpenRGBDevicePage::on_HexLineEdit_textChanged(const QString &arg1)
     UpdateHex = true;
 }
 
-void Ui::OpenRGBDevicePage::on_DeviceViewBox_selectionChanged(QVector<int> indices)
+void OpenRGBDevicePage::on_DeviceViewBox_selectionChanged(QVector<int> indices)
 {
     if(device->modes[device->active_mode].color_mode == MODE_COLORS_PER_LED)
     {
@@ -1544,12 +1543,12 @@ void Ui::OpenRGBDevicePage::on_DeviceViewBox_selectionChanged(QVector<int> indic
     }
 }
 
-void Ui::OpenRGBDevicePage::on_SetAllButton_clicked()
+void OpenRGBDevicePage::on_SetAllButton_clicked()
 {
     emit SetAllDevices(current_color.red(), current_color.green(), current_color.blue());
 }
 
-void Ui::OpenRGBDevicePage::on_EditZoneButton_clicked()
+void OpenRGBDevicePage::on_EditZoneButton_clicked()
 {
     switch(device->modes[device->active_mode].color_mode)
     {
@@ -1686,7 +1685,7 @@ void Ui::OpenRGBDevicePage::on_EditZoneButton_clicked()
     }
 }
 
-void Ui::OpenRGBDevicePage::ShowDeviceView()
+void OpenRGBDevicePage::ShowDeviceView()
 {
     /*-----------------------------------------------------*\
     | Read selected mode                                    |
@@ -1708,7 +1707,7 @@ void Ui::OpenRGBDevicePage::ShowDeviceView()
     }
 }
 
-void Ui::OpenRGBDevicePage::HideDeviceView()
+void OpenRGBDevicePage::HideDeviceView()
 {
     /*-----------------------------------------------------*\
     | Set device view showing flag to False                 |
@@ -1721,7 +1720,7 @@ void Ui::OpenRGBDevicePage::HideDeviceView()
     ui->DeviceViewBoxFrame->hide();
 }
 
-void Ui::OpenRGBDevicePage::on_ApplyColorsButton_clicked()
+void OpenRGBDevicePage::on_ApplyColorsButton_clicked()
 {
     /*-----------------------------------------------------*\
     | Read selected mode                                    |
@@ -1763,7 +1762,7 @@ void Ui::OpenRGBDevicePage::on_ApplyColorsButton_clicked()
     }
 }
 
-void Ui::OpenRGBDevicePage::on_SelectAllLEDsButton_clicked()
+void OpenRGBDevicePage::on_SelectAllLEDsButton_clicked()
 {
     if(device->modes[device->active_mode].color_mode == MODE_COLORS_PER_LED)
     {
@@ -1773,7 +1772,7 @@ void Ui::OpenRGBDevicePage::on_SelectAllLEDsButton_clicked()
     }
 }
 
-void Ui::OpenRGBDevicePage::on_DeviceSaveButton_clicked()
+void OpenRGBDevicePage::on_DeviceSaveButton_clicked()
 {
     if(device->modes[device->active_mode].flags & MODE_FLAG_MANUAL_SAVE)
     {
@@ -1781,7 +1780,7 @@ void Ui::OpenRGBDevicePage::on_DeviceSaveButton_clicked()
     }
 }
 
-void Ui::OpenRGBDevicePage::colorChanged()
+void OpenRGBDevicePage::colorChanged()
 {
     updateColorUi();
 
@@ -1815,7 +1814,7 @@ void Ui::OpenRGBDevicePage::colorChanged()
     }
 }
 
-void Ui::OpenRGBDevicePage::updateColorUi()
+void OpenRGBDevicePage::updateColorUi()
 {
     /*-----------------------------------------------------*\
     | Update colorwheel                                     |

qt/OpenRGBDevicePage/OpenRGBDevicePage.h

@@ -10,7 +10,6 @@
 #pragma once
 
 #include <QFrame>
-#include "ui_OpenRGBDevicePage.h"
 #include "RGBController.h"
 
 namespace Ui
@@ -18,7 +17,7 @@ namespace Ui
     class OpenRGBDevicePage;
 }
 
-class Ui::OpenRGBDevicePage : public QFrame
+class OpenRGBDevicePage : public QFrame
 {
     Q_OBJECT
 
@@ -70,7 +69,7 @@ private slots:
     void on_DeviceSaveButton_clicked();
 
 private:
-    Ui::OpenRGBDevicePageUi *ui;
+    Ui::OpenRGBDevicePage *ui;
     RGBController *device;
 
     bool InvertedSpeed      = false;

qt/OpenRGBDevicePage/OpenRGBDevicePage.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>OpenRGBDevicePageUi</class>
+ <class>OpenRGBDevicePage</class>
- <widget class="QFrame" name="OpenRGBDevicePageUi">
+ <widget class="QFrame" name="OpenRGBDevicePage">
   <property name="geometry">
    <rect>
     <x>0</x>

qt/OpenRGBDialog/OpenRGBDialog.cpp

@@ -7,8 +7,6 @@
 |   SPDX-License-Identifier: GPL-2.0-only                   |
 \*---------------------------------------------------------*/
 
-#include <string>
-#include <functional>
 #include "OpenRGBDialog.h"
 #include "LogManager.h"
 #include "PluginManager.h"
@@ -23,20 +21,26 @@
 #include "TabLabel.h"
 #include "OpenRGBZonesBulkResizer.h"
 #include "OpenRGBThemeManager.h"
+#include "OpenRGBFont.h"
+
+#include "ui_OpenRGBDialog.h"
+
 #include <QLabel>
 #include <QTabBar>
 #include <QMessageBox>
 #include <QCloseEvent>
 #include <QStyleFactory>
 #include <QKeyEvent>
-#include "OpenRGBFont.h"
+#include <QCheckBox>
+#include <QSpinBox>
+
+#include <string>
+#include <functional>
 
 #ifdef __APPLE__
 #include "macutils.h"
 #endif
 
-using namespace Ui;
-
 static int GetIcon(device_type type)
 {
     /*-----------------------------------------------------*\
@@ -174,7 +178,7 @@ bool OpenRGBDialog::IsMinimizeOnClose()
     return false;
 }
 
-OpenRGBDialog::OpenRGBDialog(QWidget *parent) : QMainWindow(parent), ui(new OpenRGBDialogUi)
+OpenRGBDialog::OpenRGBDialog(QWidget *parent) : QMainWindow(parent), ui(new Ui::OpenRGBDialog)
 {
     ui->setupUi(this);
 
@@ -1329,7 +1333,7 @@ void OpenRGBDialog::UpdateDevicesList()
             | If type is a device info page, check it               |
             \*-----------------------------------------------------*/
             std::string type_str = ui->InformationTabBar->widget(tab_idx)->metaObject()->className();
-            if(type_str == "Ui::OpenRGBDeviceInfoPage")
+            if(type_str == "OpenRGBDeviceInfoPage")
             {
                 OpenRGBDeviceInfoPage* page = (OpenRGBDeviceInfoPage*) ui->InformationTabBar->widget(tab_idx);
 
@@ -1400,7 +1404,7 @@ void OpenRGBDialog::UpdateDevicesList()
         for(std::size_t tab_idx = controllers.size(); tab_idx < (std::size_t)ui->InformationTabBar->count(); tab_idx++)
         {
             std::string type_str = ui->InformationTabBar->widget(base_tab)->metaObject()->className();
-            if(type_str == "Ui::OpenRGBDeviceInfoPage")
+            if(type_str == "OpenRGBDeviceInfoPage")
             {
                 found = true;
                 QWidget* tab_widget = ui->InformationTabBar->widget(base_tab);
@@ -1713,7 +1717,7 @@ void OpenRGBDialog::on_ReShow(QSystemTrayIcon::ActivationReason reason)
     }
 }
 
-void Ui::OpenRGBDialog::on_ProfileSelected()
+void OpenRGBDialog::on_ProfileSelected()
 {
     ProfileManager* profile_manager = ResourceManager::get()->GetProfileManager();
 
@@ -1739,7 +1743,7 @@ void Ui::OpenRGBDialog::on_ProfileSelected()
     }
 }
 
-void Ui::OpenRGBDialog::on_ButtonLoadProfile_clicked()
+void OpenRGBDialog::on_ButtonLoadProfile_clicked()
 {
     ProfileManager* profile_manager = ResourceManager::get()->GetProfileManager();
 
@@ -1763,7 +1767,7 @@ void Ui::OpenRGBDialog::on_ButtonLoadProfile_clicked()
     }
 }
 
-void Ui::OpenRGBDialog::on_ButtonDeleteProfile_clicked()
+void OpenRGBDialog::on_ButtonDeleteProfile_clicked()
 {
     ProfileManager* profile_manager = ResourceManager::get()->GetProfileManager();
 
@@ -1792,7 +1796,7 @@ void Ui::OpenRGBDialog::on_ButtonDeleteProfile_clicked()
     }
 }
 
-void Ui::OpenRGBDialog::on_ButtonToggleDeviceView_clicked()
+void OpenRGBDialog::on_ButtonToggleDeviceView_clicked()
 {
     if(device_view_showing)
     {
@@ -1804,7 +1808,7 @@ void Ui::OpenRGBDialog::on_ButtonToggleDeviceView_clicked()
     }
 }
 
-void Ui::OpenRGBDialog::ShowLEDView()
+void OpenRGBDialog::ShowLEDView()
 {
     for(int device = 0; device < ui->DevicesTabBar->count(); device++)
     {
@@ -1817,7 +1821,7 @@ void Ui::OpenRGBDialog::ShowLEDView()
     device_view_showing = true;
 }
 
-void Ui::OpenRGBDialog::HideLEDView()
+void OpenRGBDialog::HideLEDView()
 {
     for(int device = 0; device < ui->DevicesTabBar->count(); device++)
     {
@@ -1827,7 +1831,7 @@ void Ui::OpenRGBDialog::HideLEDView()
 }
 
 
-void Ui::OpenRGBDialog::on_ButtonStopDetection_clicked()
+void OpenRGBDialog::on_ButtonStopDetection_clicked()
 {
     /*---------------------------------------------------------*\
     | Notify the detection thread that it has to die            |
@@ -1840,7 +1844,7 @@ void Ui::OpenRGBDialog::on_ButtonStopDetection_clicked()
     SetDetectionViewState(false);
 }
 
-void Ui::OpenRGBDialog::SetDetectionViewState(bool detection_showing)
+void OpenRGBDialog::SetDetectionViewState(bool detection_showing)
 {
     if(detection_showing)
     {
@@ -1939,7 +1943,7 @@ void OpenRGBDialog::SaveProfileAs()
     }
 }
 
-void Ui::OpenRGBDialog::on_ButtonRescan_clicked()
+void OpenRGBDialog::on_ButtonRescan_clicked()
 {
     /*---------------------------------------------------------*\
     | Hide devices view on rescan so it stops handling paint    |
@@ -1964,7 +1968,7 @@ void Ui::OpenRGBDialog::on_ButtonRescan_clicked()
     ResourceManager::get()->DetectDevices();
 }
 
-void Ui::OpenRGBDialog::on_ActionSaveProfile_triggered()
+void OpenRGBDialog::on_ActionSaveProfile_triggered()
 {
     if(ui->ProfileBox->currentIndex() >= 0)
     {
@@ -1976,33 +1980,33 @@ void Ui::OpenRGBDialog::on_ActionSaveProfile_triggered()
     }
 }
 
-void Ui::OpenRGBDialog::on_ActionSaveProfileAs_triggered()
+void OpenRGBDialog::on_ActionSaveProfileAs_triggered()
 {
     SaveProfileAs();
 }
 
 
-void Ui::OpenRGBDialog::on_InformationTabBar_currentChanged(int tab_idx)
+void OpenRGBDialog::on_InformationTabBar_currentChanged(int tab_idx)
 {
     TogglePluginsVisibility(tab_idx, ui->InformationTabBar);
 }
 
-void Ui::OpenRGBDialog::on_DevicesTabBar_currentChanged(int tab_idx)
+void OpenRGBDialog::on_DevicesTabBar_currentChanged(int tab_idx)
 {
     TogglePluginsVisibility(tab_idx, ui->DevicesTabBar);
 }
 
-void Ui::OpenRGBDialog::on_MainTabBar_currentChanged(int tab_idx)
+void OpenRGBDialog::on_MainTabBar_currentChanged(int tab_idx)
 {
     TogglePluginsVisibility(tab_idx, ui->MainTabBar);
 }
 
-void Ui::OpenRGBDialog::on_SettingsTabBar_currentChanged(int tab_idx)
+void OpenRGBDialog::on_SettingsTabBar_currentChanged(int tab_idx)
 {
     TogglePluginsVisibility(tab_idx, ui->SettingsTabBar);
 }
 
-void Ui::OpenRGBDialog::TogglePluginsVisibility(int tab_idx, QTabWidget* tabBar)
+void OpenRGBDialog::TogglePluginsVisibility(int tab_idx, QTabWidget* tabBar)
 {
     /*---------------------------------------------------------*\
     | Hide all plugins                                          |
@@ -2038,7 +2042,7 @@ void Ui::OpenRGBDialog::TogglePluginsVisibility(int tab_idx, QTabWidget* tabBar)
     }
 }
 
-void Ui::OpenRGBDialog::AddConsolePage()
+void OpenRGBDialog::AddConsolePage()
 {
     OpenRGBConsolePage* page = new OpenRGBConsolePage();
 

qt/OpenRGBDialog/OpenRGBDialog.h

@@ -17,8 +17,6 @@
 #include <QMenu>
 #include <QSlider>
 
-#include "ui_OpenRGBDialog.h"
-
 #include "OpenRGBClientInfoPage.h"
 #include "OpenRGBPluginsPage/OpenRGBPluginsPage.h"
 #include "OpenRGBSoftwareInfoPage.h"
@@ -53,7 +51,7 @@ namespace Ui
     class OpenRGBDialog;
 }
 
-class Ui::OpenRGBDialog : public QMainWindow, private SuspendResumeListener
+class OpenRGBDialog : public QMainWindow, private SuspendResumeListener
 {
     Q_OBJECT
 
@@ -89,7 +87,7 @@ protected:
     void keyPressEvent(QKeyEvent *event) override;
 
 private:
-    const char* context = "Ui::OpenRGBDialog";
+    const char* context = "OpenRGBDialog";
 
     /*-------------------------------------*\
     | Page pointers                         |
@@ -127,7 +125,7 @@ private:
     /*-------------------------------------*\
     | User interface                        |
     \*-------------------------------------*/
-    Ui::OpenRGBDialogUi *ui;
+    Ui::OpenRGBDialog *ui;
 
     void AddSoftwareInfoPage();
     void AddSupportedDevicesPage();

qt/OpenRGBDialog/OpenRGBDialog.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>OpenRGBDialogUi</class>
+ <class>OpenRGBDialog</class>
- <widget class="QMainWindow" name="OpenRGBDialogUi">
+ <widget class="QMainWindow" name="OpenRGBDialog">
   <property name="geometry">
    <rect>
     <x>0</x>

qt/OpenRGBE131SettingsPage/OpenRGBE131SettingsEntry.cpp

@@ -10,11 +10,9 @@
 #include "OpenRGBE131SettingsEntry.h"
 #include "ui_OpenRGBE131SettingsEntry.h"
 
-using namespace Ui;
-
 OpenRGBE131SettingsEntry::OpenRGBE131SettingsEntry(QWidget *parent) :
     BaseManualDeviceEntry(parent),
-    ui(new Ui::OpenRGBE131SettingsEntryUi)
+    ui(new Ui::OpenRGBE131SettingsEntry)
 {
     ui->setupUi(this);
 
@@ -54,7 +52,7 @@ void OpenRGBE131SettingsEntry::changeEvent(QEvent *event)
     }
 }
 
-void Ui::OpenRGBE131SettingsEntry::HideMatrixSettings()
+void OpenRGBE131SettingsEntry::HideMatrixSettings()
 {
     ui->MatrixWidthLabel->setDisabled(true);
     ui->MatrixWidthEdit->setDisabled(true);
@@ -66,7 +64,7 @@ void Ui::OpenRGBE131SettingsEntry::HideMatrixSettings()
     ui->MatrixOrderComboBox->setDisabled(true);
 }
 
-void Ui::OpenRGBE131SettingsEntry::ShowMatrixSettings()
+void OpenRGBE131SettingsEntry::ShowMatrixSettings()
 {
     ui->MatrixWidthLabel->setDisabled(false);
     ui->MatrixWidthEdit->setDisabled(false);
@@ -78,7 +76,7 @@ void Ui::OpenRGBE131SettingsEntry::ShowMatrixSettings()
     ui->MatrixOrderComboBox->setDisabled(false);
 }
 
-void Ui::OpenRGBE131SettingsEntry::on_TypeComboBox_currentIndexChanged(int index)
+void OpenRGBE131SettingsEntry::on_TypeComboBox_currentIndexChanged(int index)
 {
     if(index == 2)
     {

qt/OpenRGBE131SettingsPage/OpenRGBE131SettingsEntry.h

@@ -14,10 +14,9 @@
 namespace Ui
 {
     class OpenRGBE131SettingsEntry;
-    class OpenRGBE131SettingsEntryUi;
 }
 
-class Ui::OpenRGBE131SettingsEntry : public BaseManualDeviceEntry
+class OpenRGBE131SettingsEntry : public BaseManualDeviceEntry
 {
     Q_OBJECT
 
@@ -29,7 +28,7 @@ public:
     const char* settingsSection();
 
 private:
-    Ui::OpenRGBE131SettingsEntryUi *ui;
+    Ui::OpenRGBE131SettingsEntry *ui;
 
 private:
     void HideMatrixSettings();

qt/OpenRGBE131SettingsPage/OpenRGBE131SettingsEntry.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>OpenRGBE131SettingsEntryUi</class>
+ <class>OpenRGBE131SettingsEntry</class>
- <widget class="QWidget" name="OpenRGBE131SettingsEntryUi">
+ <widget class="QWidget" name="OpenRGBE131SettingsEntry">
   <property name="geometry">
    <rect>
     <x>0</x>

qt/OpenRGBE131SettingsPage/OpenRGBE131SettingsPage.cpp

@@ -12,11 +12,9 @@
 #include "ResourceManager.h"
 #include "SettingsManager.h"
 
-using namespace Ui;
-
 OpenRGBE131SettingsPage::OpenRGBE131SettingsPage(QWidget *parent) :
     QWidget(parent),
-    ui(new Ui::OpenRGBE131SettingsPageUi)
+    ui(new Ui::OpenRGBE131SettingsPage)
 {
     ui->setupUi(this);
 
@@ -64,7 +62,7 @@ void OpenRGBE131SettingsPage::changeEvent(QEvent *event)
     }
 }
 
-void Ui::OpenRGBE131SettingsPage::on_AddE131DeviceButton_clicked()
+void OpenRGBE131SettingsPage::on_AddE131DeviceButton_clicked()
 {
     OpenRGBE131SettingsEntry* entry = new OpenRGBE131SettingsEntry;
     entries.push_back(entry);
@@ -78,7 +76,7 @@ void Ui::OpenRGBE131SettingsPage::on_AddE131DeviceButton_clicked()
     ui->E131DeviceList->show();
 }
 
-void Ui::OpenRGBE131SettingsPage::on_RemoveE131DeviceButton_clicked()
+void OpenRGBE131SettingsPage::on_RemoveE131DeviceButton_clicked()
 {
     int cur_row = ui->E131DeviceList->currentRow();
 
@@ -96,7 +94,7 @@ void Ui::OpenRGBE131SettingsPage::on_RemoveE131DeviceButton_clicked()
     entries.erase(entries.begin() + cur_row);
 }
 
-void Ui::OpenRGBE131SettingsPage::on_SaveE131ConfigurationButton_clicked()
+void OpenRGBE131SettingsPage::on_SaveE131ConfigurationButton_clicked()
 {
     json                e131_settings;
 

qt/OpenRGBE131SettingsPage/OpenRGBE131SettingsPage.h

@@ -18,7 +18,7 @@ namespace Ui
     class OpenRGBE131SettingsPage;
 }
 
-class Ui::OpenRGBE131SettingsPage : public QWidget
+class OpenRGBE131SettingsPage : public QWidget
 {
     Q_OBJECT
 
@@ -35,6 +35,6 @@ private slots:
     void on_SaveE131ConfigurationButton_clicked();
 
 private:
-    Ui::OpenRGBE131SettingsPageUi *ui;
+    Ui::OpenRGBE131SettingsPage *ui;
     std::vector<OpenRGBE131SettingsEntry*> entries;
 };

qt/OpenRGBE131SettingsPage/OpenRGBE131SettingsPage.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>OpenRGBE131SettingsPageUi</class>
+ <class>OpenRGBE131SettingsPage</class>
- <widget class="QWidget" name="OpenRGBE131SettingsPageUi">
+ <widget class="QWidget" name="OpenRGBE131SettingsPage">
   <property name="geometry">
    <rect>
     <x>0</x>

qt/OpenRGBElgatoKeyLightSettingsPage/OpenRGBElgatoKeyLightSettingsEntry.cpp

@@ -10,11 +10,9 @@
 #include "OpenRGBElgatoKeyLightSettingsEntry.h"
 #include "ui_OpenRGBElgatoKeyLightSettingsEntry.h"
 
-using namespace Ui;
-
 OpenRGBElgatoKeyLightSettingsEntry::OpenRGBElgatoKeyLightSettingsEntry(QWidget *parent) :
     BaseManualDeviceEntry(parent),
-    ui(new Ui::OpenRGBElgatoKeyLightSettingsEntryUi)
+    ui(new Ui::OpenRGBElgatoKeyLightSettingsEntry)
 {
     ui->setupUi(this);
     setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);

qt/OpenRGBElgatoKeyLightSettingsPage/OpenRGBElgatoKeyLightSettingsEntry.h

@@ -14,10 +14,9 @@
 namespace Ui
 {
     class OpenRGBElgatoKeyLightSettingsEntry;
-    class OpenRGBElgatoKeyLightSettingsEntryUi;
 }
 
-class Ui::OpenRGBElgatoKeyLightSettingsEntry : public BaseManualDeviceEntry
+class OpenRGBElgatoKeyLightSettingsEntry : public BaseManualDeviceEntry
 {
     Q_OBJECT
 
@@ -29,7 +28,7 @@ public:
     const char* settingsSection();
 
 private:
-    Ui::OpenRGBElgatoKeyLightSettingsEntryUi *ui;
+    Ui::OpenRGBElgatoKeyLightSettingsEntry *ui;
 
 private slots:
     void changeEvent(QEvent *event);

qt/OpenRGBElgatoKeyLightSettingsPage/OpenRGBElgatoKeyLightSettingsEntry.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>OpenRGBElgatoKeyLightSettingsEntryUi</class>
+ <class>OpenRGBElgatoKeyLightSettingsEntry</class>
- <widget class="QWidget" name="OpenRGBElgatoKeyLightSettingsEntryUi">
+ <widget class="QWidget" name="OpenRGBElgatoKeyLightSettingsEntry">
   <property name="geometry">
    <rect>
     <x>0</x>

qt/OpenRGBElgatoKeyLightSettingsPage/OpenRGBElgatoKeyLightSettingsPage.cpp

@@ -12,11 +12,9 @@
 #include "ResourceManager.h"
 #include "SettingsManager.h"
 
-using namespace Ui;
-
 OpenRGBElgatoKeyLightSettingsPage::OpenRGBElgatoKeyLightSettingsPage(QWidget *parent) :
     QWidget(parent),
-    ui(new Ui::OpenRGBElgatoKeyLightSettingsPageUi)
+    ui(new Ui::OpenRGBElgatoKeyLightSettingsPage)
 {
     ui->setupUi(this);
 
@@ -61,7 +59,7 @@ void OpenRGBElgatoKeyLightSettingsPage::changeEvent(QEvent *event)
     }
 }
 
-void Ui::OpenRGBElgatoKeyLightSettingsPage::on_AddElgatoKeyLightDeviceButton_clicked()
+void OpenRGBElgatoKeyLightSettingsPage::on_AddElgatoKeyLightDeviceButton_clicked()
 {
     OpenRGBElgatoKeyLightSettingsEntry* entry = new OpenRGBElgatoKeyLightSettingsEntry;
     entries.push_back(entry);
@@ -75,7 +73,7 @@ void Ui::OpenRGBElgatoKeyLightSettingsPage::on_AddElgatoKeyLightDeviceButton_cli
     ui->ElgatoKeyLightDeviceList->show();
 }
 
-void Ui::OpenRGBElgatoKeyLightSettingsPage::on_RemoveElgatoKeyLightDeviceButton_clicked()
+void OpenRGBElgatoKeyLightSettingsPage::on_RemoveElgatoKeyLightDeviceButton_clicked()
 {
     int cur_row = ui->ElgatoKeyLightDeviceList->currentRow();
 
@@ -93,7 +91,7 @@ void Ui::OpenRGBElgatoKeyLightSettingsPage::on_RemoveElgatoKeyLightDeviceButton_
     entries.erase(entries.begin() + cur_row);
 }
 
-void Ui::OpenRGBElgatoKeyLightSettingsPage::on_SaveElgatoKeyLightConfigurationButton_clicked()
+void OpenRGBElgatoKeyLightSettingsPage::on_SaveElgatoKeyLightConfigurationButton_clicked()
 {
     json                elgato_keylight_settings;
 

qt/OpenRGBElgatoKeyLightSettingsPage/OpenRGBElgatoKeyLightSettingsPage.h

@@ -15,10 +15,9 @@
 namespace Ui
 {
     class OpenRGBElgatoKeyLightSettingsPage;
-    class OpenRGBElgatoKeyLightSettingsPageUi;
 }
 
-class Ui::OpenRGBElgatoKeyLightSettingsPage : public QWidget
+class OpenRGBElgatoKeyLightSettingsPage : public QWidget
 {
     Q_OBJECT
 
@@ -35,6 +34,6 @@ private slots:
     void on_SaveElgatoKeyLightConfigurationButton_clicked();
 
 private:
-    Ui::OpenRGBElgatoKeyLightSettingsPageUi *ui;
+    Ui::OpenRGBElgatoKeyLightSettingsPage *ui;
     std::vector<OpenRGBElgatoKeyLightSettingsEntry*> entries;
 };

qt/OpenRGBElgatoKeyLightSettingsPage/OpenRGBElgatoKeyLightSettingsPage.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>OpenRGBElgatoKeyLightSettingsPageUi</class>
+ <class>OpenRGBElgatoKeyLightSettingsPage</class>
- <widget class="QWidget" name="OpenRGBElgatoKeyLightSettingsPageUi">
+ <widget class="QWidget" name="OpenRGBElgatoKeyLightSettingsPage">
   <property name="geometry">
    <rect>
     <x>0</x>

qt/OpenRGBElgatoLightStripSettingsPage/OpenRGBElgatoLightStripSettingsEntry.cpp

@@ -10,11 +10,9 @@
 #include "OpenRGBElgatoLightStripSettingsEntry.h"
 #include "ui_OpenRGBElgatoLightStripSettingsEntry.h"
 
-using namespace Ui;
-
 OpenRGBElgatoLightStripSettingsEntry::OpenRGBElgatoLightStripSettingsEntry(QWidget *parent) :
     BaseManualDeviceEntry(parent),
-    ui(new Ui::OpenRGBElgatoLightStripSettingsEntryUi)
+    ui(new Ui::OpenRGBElgatoLightStripSettingsEntry)
 {
     ui->setupUi(this);
     setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);

qt/OpenRGBElgatoLightStripSettingsPage/OpenRGBElgatoLightStripSettingsEntry.h

@@ -14,23 +14,22 @@
 namespace Ui
 {
     class OpenRGBElgatoLightStripSettingsEntry;
-    class OpenRGBElgatoLightStripSettingsEntryUi;
 }
 
-class Ui::OpenRGBElgatoLightStripSettingsEntry : public BaseManualDeviceEntry
+class OpenRGBElgatoLightStripSettingsEntry : public BaseManualDeviceEntry
 {
     Q_OBJECT
 
-    public:
+public:
-        explicit OpenRGBElgatoLightStripSettingsEntry(QWidget *parent = nullptr);
+    explicit OpenRGBElgatoLightStripSettingsEntry(QWidget *parent = nullptr);
-        ~OpenRGBElgatoLightStripSettingsEntry();
+    ~OpenRGBElgatoLightStripSettingsEntry();
-        void loadFromSettings(const json& data);
+    void loadFromSettings(const json& data);
-        json saveSettings();
+    json saveSettings();
-        const char* settingsSection();
+    const char* settingsSection();
 
-    private:
+private:
-        Ui::OpenRGBElgatoLightStripSettingsEntryUi *ui;
+    Ui::OpenRGBElgatoLightStripSettingsEntry *ui;
 
-    private slots:
+private slots:
-        void changeEvent(QEvent *event);
+    void changeEvent(QEvent *event);
 };

qt/OpenRGBElgatoLightStripSettingsPage/OpenRGBElgatoLightStripSettingsEntry.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>OpenRGBElgatoLightStripSettingsEntryUi</class>
+ <class>OpenRGBElgatoLightStripSettingsEntry</class>
- <widget class="QWidget" name="OpenRGBElgatoLightStripSettingsEntryUi">
+ <widget class="QWidget" name="OpenRGBElgatoLightStripSettingsEntry">
   <property name="geometry">
    <rect>
     <x>0</x>

qt/OpenRGBElgatoLightStripSettingsPage/OpenRGBElgatoLightStripSettingsPage.cpp

@@ -12,11 +12,9 @@
 #include "ResourceManager.h"
 #include "SettingsManager.h"
 
-using namespace Ui;
-
 OpenRGBElgatoLightStripSettingsPage::OpenRGBElgatoLightStripSettingsPage(QWidget *parent) :
     QWidget(parent),
-    ui(new Ui::OpenRGBElgatoLightStripSettingsPageUi)
+    ui(new Ui::OpenRGBElgatoLightStripSettingsPage)
 {
     ui->setupUi(this);
 
@@ -61,7 +59,7 @@ void OpenRGBElgatoLightStripSettingsPage::changeEvent(QEvent *event)
     }
 }
 
-void Ui::OpenRGBElgatoLightStripSettingsPage::on_AddElgatoLightStripDeviceButton_clicked()
+void OpenRGBElgatoLightStripSettingsPage::on_AddElgatoLightStripDeviceButton_clicked()
 {
     OpenRGBElgatoLightStripSettingsEntry* entry = new OpenRGBElgatoLightStripSettingsEntry;
     entries.push_back(entry);
@@ -75,7 +73,7 @@ void Ui::OpenRGBElgatoLightStripSettingsPage::on_AddElgatoLightStripDeviceButton
     ui->ElgatoLightStripDeviceList->show();
 }
 
-void Ui::OpenRGBElgatoLightStripSettingsPage::on_RemoveElgatoLightStripDeviceButton_clicked()
+void OpenRGBElgatoLightStripSettingsPage::on_RemoveElgatoLightStripDeviceButton_clicked()
 {
     int cur_row = ui->ElgatoLightStripDeviceList->currentRow();
 
@@ -93,7 +91,7 @@ void Ui::OpenRGBElgatoLightStripSettingsPage::on_RemoveElgatoLightStripDeviceBut
     entries.erase(entries.begin() + cur_row);
 }
 
-void Ui::OpenRGBElgatoLightStripSettingsPage::on_SaveElgatoLightStripConfigurationButton_clicked()
+void OpenRGBElgatoLightStripSettingsPage::on_SaveElgatoLightStripConfigurationButton_clicked()
 {
     json elgato_lightstrip_settings;
 

qt/OpenRGBElgatoLightStripSettingsPage/OpenRGBElgatoLightStripSettingsPage.h

@@ -10,7 +10,6 @@
 #pragma once
 
 #include <QWidget>
-#include "ui_OpenRGBElgatoLightStripSettingsPage.h"
 #include "OpenRGBElgatoLightStripSettingsEntry.h"
 
 namespace Ui
@@ -18,7 +17,7 @@ namespace Ui
     class OpenRGBElgatoLightStripSettingsPage;
 }
 
-class Ui::OpenRGBElgatoLightStripSettingsPage : public QWidget
+class OpenRGBElgatoLightStripSettingsPage : public QWidget
 {
     Q_OBJECT
 
@@ -35,6 +34,6 @@ private slots:
     void on_SaveElgatoLightStripConfigurationButton_clicked();
 
 private:
-    Ui::OpenRGBElgatoLightStripSettingsPageUi *ui;
+    Ui::OpenRGBElgatoLightStripSettingsPage *ui;
     std::vector<OpenRGBElgatoLightStripSettingsEntry*> entries;
 };

qt/OpenRGBElgatoLightStripSettingsPage/OpenRGBElgatoLightStripSettingsPage.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>OpenRGBElgatoLightStripSettingsPageUi</class>
+ <class>OpenRGBElgatoLightStripSettingsPage</class>
- <widget class="QWidget" name="OpenRGBElgatoLightStripSettingsPageUi">
+ <widget class="QWidget" name="OpenRGBElgatoLightStripSettingsPage">
   <property name="geometry">
    <rect>
     <x>0</x>

qt/OpenRGBGoveeSettingsPage/OpenRGBGoveeSettingsEntry.cpp

@@ -12,11 +12,9 @@
 #include "OpenRGBGoveeSettingsEntry.h"
 #include "ui_OpenRGBGoveeSettingsEntry.h"
 
-using namespace Ui;
-
 OpenRGBGoveeSettingsEntry::OpenRGBGoveeSettingsEntry(QWidget *parent) :
     BaseManualDeviceEntry(parent),
-    ui(new Ui::OpenRGBGoveeSettingsEntryUi)
+    ui(new Ui::OpenRGBGoveeSettingsEntry)
 {
     ui->setupUi(this);
 }

qt/OpenRGBGoveeSettingsPage/OpenRGBGoveeSettingsEntry.h

@@ -16,10 +16,9 @@
 namespace Ui
 {
     class OpenRGBGoveeSettingsEntry;
-    class OpenRGBGoveeSettingsEntryUi;
 }
 
-class Ui::OpenRGBGoveeSettingsEntry : public BaseManualDeviceEntry
+class OpenRGBGoveeSettingsEntry : public BaseManualDeviceEntry
 {
     Q_OBJECT
 
@@ -31,7 +30,7 @@ public:
     const char* settingsSection();
 
 private:
-    Ui::OpenRGBGoveeSettingsEntryUi *ui;
+    Ui::OpenRGBGoveeSettingsEntry *ui;
 
 private slots:
     void changeEvent(QEvent *event);

qt/OpenRGBGoveeSettingsPage/OpenRGBGoveeSettingsEntry.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>OpenRGBGoveeSettingsEntryUi</class>
+ <class>OpenRGBGoveeSettingsEntry</class>
- <widget class="QWidget" name="OpenRGBGoveeSettingsEntryUi">
+ <widget class="QWidget" name="OpenRGBGoveeSettingsEntry">
   <property name="geometry">
    <rect>
     <x>0</x>

qt/OpenRGBGoveeSettingsPage/OpenRGBGoveeSettingsPage.cpp

@@ -14,11 +14,9 @@
 #include "ResourceManager.h"
 #include "SettingsManager.h"
 
-using namespace Ui;
-
 OpenRGBGoveeSettingsPage::OpenRGBGoveeSettingsPage(QWidget *parent) :
     QWidget(parent),
-    ui(new Ui::OpenRGBGoveeSettingsPageUi)
+    ui(new Ui::OpenRGBGoveeSettingsPage)
 {
     ui->setupUi(this);
 
@@ -66,7 +64,7 @@ void OpenRGBGoveeSettingsPage::changeEvent(QEvent *event)
     }
 }
 
-void Ui::OpenRGBGoveeSettingsPage::on_AddGoveeDeviceButton_clicked()
+void OpenRGBGoveeSettingsPage::on_AddGoveeDeviceButton_clicked()
 {
     OpenRGBGoveeSettingsEntry* entry = new OpenRGBGoveeSettingsEntry;
     entries.push_back(entry);
@@ -80,7 +78,7 @@ void Ui::OpenRGBGoveeSettingsPage::on_AddGoveeDeviceButton_clicked()
     ui->GoveeDeviceList->show();
 }
 
-void Ui::OpenRGBGoveeSettingsPage::on_RemoveGoveeDeviceButton_clicked()
+void OpenRGBGoveeSettingsPage::on_RemoveGoveeDeviceButton_clicked()
 {
     int cur_row = ui->GoveeDeviceList->currentRow();
 
@@ -98,7 +96,7 @@ void Ui::OpenRGBGoveeSettingsPage::on_RemoveGoveeDeviceButton_clicked()
     entries.erase(entries.begin() + cur_row);
 }
 
-void Ui::OpenRGBGoveeSettingsPage::on_SaveGoveeConfigurationButton_clicked()
+void OpenRGBGoveeSettingsPage::on_SaveGoveeConfigurationButton_clicked()
 {
     json                govee_settings;
 

qt/OpenRGBGoveeSettingsPage/OpenRGBGoveeSettingsPage.h

@@ -12,7 +12,6 @@
 #pragma once
 
 #include <QWidget>
-#include "ui_OpenRGBGoveeSettingsPage.h"
 #include "OpenRGBGoveeSettingsEntry.h"
 
 namespace Ui
@@ -20,7 +19,7 @@ namespace Ui
     class OpenRGBGoveeSettingsPage;
 }
 
-class Ui::OpenRGBGoveeSettingsPage : public QWidget
+class OpenRGBGoveeSettingsPage : public QWidget
 {
     Q_OBJECT
 
@@ -37,7 +36,7 @@ private slots:
     void on_SaveGoveeConfigurationButton_clicked();
 
 private:
-    Ui::OpenRGBGoveeSettingsPageUi *ui;
+    Ui::OpenRGBGoveeSettingsPage *ui;
     std::vector<OpenRGBGoveeSettingsEntry*> entries;
 
 };

qt/OpenRGBGoveeSettingsPage/OpenRGBGoveeSettingsPage.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>OpenRGBGoveeSettingsPageUi</class>
+ <class>OpenRGBGoveeSettingsPage</class>
- <widget class="QWidget" name="OpenRGBGoveeSettingsPageUi">
+ <widget class="QWidget" name="OpenRGBGoveeSettingsPage">
   <property name="geometry">
    <rect>
     <x>0</x>

qt/OpenRGBHardwareIDsDialog/OpenRGBHardwareIDsDialog.cpp

@@ -16,9 +16,9 @@
 #include "ResourceManager.h"
 #include "StringUtils.h"
 
-Ui::OpenRGBHardwareIDsDialog::OpenRGBHardwareIDsDialog(QWidget *parent) :
+OpenRGBHardwareIDsDialog::OpenRGBHardwareIDsDialog(QWidget *parent) :
     QDialog(parent),
-    ui(new Ui::OpenRGBHardwareIDsDialogUi)
+    ui(new Ui::OpenRGBHardwareIDsDialog)
 {
     ui->setupUi(this);
     setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
@@ -27,12 +27,12 @@ Ui::OpenRGBHardwareIDsDialog::OpenRGBHardwareIDsDialog(QWidget *parent) :
     ui->HardwareIdsList->header()->resizeSection(2 /*column index*/, 100 /*width*/);
 }
 
-Ui::OpenRGBHardwareIDsDialog::~OpenRGBHardwareIDsDialog()
+OpenRGBHardwareIDsDialog::~OpenRGBHardwareIDsDialog()
 {
     delete ui;
 }
 
-int Ui::OpenRGBHardwareIDsDialog::show()
+int OpenRGBHardwareIDsDialog::show()
 {
     /*---------------------------------------------------------*\
     | Add i2c busses infos                                      |
@@ -137,7 +137,7 @@ int Ui::OpenRGBHardwareIDsDialog::show()
     return this->exec();
 }
 
-void Ui::OpenRGBHardwareIDsDialog::on_CopyToClipboardButton_clicked()
+void OpenRGBHardwareIDsDialog::on_CopyToClipboardButton_clicked()
 {
     QClipboard *clipboard = QGuiApplication::clipboard();
     clipboard->setText(strings.join("\n"));

qt/OpenRGBHardwareIDsDialog/OpenRGBHardwareIDsDialog.h

@@ -10,14 +10,13 @@
 #pragma once
 
 #include <QDialog>
-#include "ui_OpenRGBHardwareIDsDialog.h"
 
 namespace Ui
 {
     class OpenRGBHardwareIDsDialog;
 }
 
-class Ui::OpenRGBHardwareIDsDialog : public QDialog
+class OpenRGBHardwareIDsDialog : public QDialog
 {
     Q_OBJECT
 
@@ -31,6 +30,6 @@ private slots:
     void on_CopyToClipboardButton_clicked();
 
 private:
-    Ui::OpenRGBHardwareIDsDialogUi *ui;
+    Ui::OpenRGBHardwareIDsDialog *ui;
     QStringList strings;
 };

qt/OpenRGBHardwareIDsDialog/OpenRGBHardwareIDsDialog.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>OpenRGBHardwareIDsDialogUi</class>
+ <class>OpenRGBHardwareIDsDialog</class>
- <widget class="QWidget" name="OpenRGBHardwareIDsDialogUi">
+ <widget class="QWidget" name="OpenRGBHardwareIDsDialog">
   <property name="geometry">
    <rect>
     <x>0</x>

qt/OpenRGBKasaSmartSettingsPage/OpenRGBKasaSmartSettingsEntry.cpp

@@ -10,11 +10,9 @@
 #include "OpenRGBKasaSmartSettingsEntry.h"
 #include "ui_OpenRGBKasaSmartSettingsEntry.h"
 
-using namespace Ui;
-
 OpenRGBKasaSmartSettingsEntry::OpenRGBKasaSmartSettingsEntry(QWidget *parent) :
     BaseManualDeviceEntry(parent),
-    ui(new Ui::OpenRGBKasaSmartSettingsEntryUi)
+    ui(new Ui::OpenRGBKasaSmartSettingsEntry)
 {
     ui->setupUi(this);
 }

qt/OpenRGBKasaSmartSettingsPage/OpenRGBKasaSmartSettingsEntry.h

@@ -14,10 +14,9 @@
 namespace Ui
 {
     class OpenRGBKasaSmartSettingsEntry;
-    class OpenRGBKasaSmartSettingsEntryUi;
 }
 
-class Ui::OpenRGBKasaSmartSettingsEntry : public BaseManualDeviceEntry
+class OpenRGBKasaSmartSettingsEntry : public BaseManualDeviceEntry
 {
     Q_OBJECT
 
@@ -30,7 +29,7 @@ public:
     void setName(QString name);
 
 private:
-    Ui::OpenRGBKasaSmartSettingsEntryUi *ui;
+    Ui::OpenRGBKasaSmartSettingsEntry *ui;
 
 private slots:
     void changeEvent(QEvent *event);

qt/OpenRGBKasaSmartSettingsPage/OpenRGBKasaSmartSettingsEntry.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>OpenRGBKasaSmartSettingsEntryUi</class>
+ <class>OpenRGBKasaSmartSettingsEntry</class>
- <widget class="QWidget" name="OpenRGBKasaSmartSettingsEntryUi">
+ <widget class="QWidget" name="OpenRGBKasaSmartSettingsEntry">
   <property name="geometry">
    <rect>
     <x>0</x>

qt/OpenRGBKasaSmartSettingsPage/OpenRGBKasaSmartSettingsPage.cpp

@@ -12,11 +12,9 @@
 #include "ResourceManager.h"
 #include "SettingsManager.h"
 
-using namespace Ui;
-
 OpenRGBKasaSmartSettingsPage::OpenRGBKasaSmartSettingsPage(QWidget *parent) :
     QWidget(parent),
-    ui(new Ui::OpenRGBKasaSmartSettingsPageUi)
+    ui(new Ui::OpenRGBKasaSmartSettingsPage)
 {
     ui->setupUi(this);
 
@@ -64,7 +62,7 @@ void OpenRGBKasaSmartSettingsPage::changeEvent(QEvent *event)
     }
 }
 
-void Ui::OpenRGBKasaSmartSettingsPage::on_AddKasaSmartDeviceButton_clicked()
+void OpenRGBKasaSmartSettingsPage::on_AddKasaSmartDeviceButton_clicked()
 {
     OpenRGBKasaSmartSettingsEntry* entry = new OpenRGBKasaSmartSettingsEntry;
 
@@ -81,7 +79,7 @@ void Ui::OpenRGBKasaSmartSettingsPage::on_AddKasaSmartDeviceButton_clicked()
     ui->KasaSmartDeviceList->show();
 }
 
-void Ui::OpenRGBKasaSmartSettingsPage::on_RemoveKasaSmartDeviceButton_clicked()
+void OpenRGBKasaSmartSettingsPage::on_RemoveKasaSmartDeviceButton_clicked()
 {
     int cur_row = ui->KasaSmartDeviceList->currentRow();
 
@@ -99,7 +97,7 @@ void Ui::OpenRGBKasaSmartSettingsPage::on_RemoveKasaSmartDeviceButton_clicked()
     entries.erase(entries.begin() + cur_row);
 }
 
-void Ui::OpenRGBKasaSmartSettingsPage::on_SaveKasaSmartConfigurationButton_clicked()
+void OpenRGBKasaSmartSettingsPage::on_SaveKasaSmartConfigurationButton_clicked()
 {
     json                KasaSmart_settings;
 

qt/OpenRGBKasaSmartSettingsPage/OpenRGBKasaSmartSettingsPage.h

@@ -8,7 +8,6 @@
 \*---------------------------------------------------------*/
 
 #include <QWidget>
-#include "ui_OpenRGBKasaSmartSettingsPage.h"
 #include "OpenRGBKasaSmartSettingsEntry.h"
 
 namespace Ui
@@ -16,7 +15,7 @@ namespace Ui
     class OpenRGBKasaSmartSettingsPage;
 }
 
-class Ui::OpenRGBKasaSmartSettingsPage : public QWidget
+class OpenRGBKasaSmartSettingsPage : public QWidget
 {
     Q_OBJECT
 
@@ -33,7 +32,7 @@ private slots:
     void on_SaveKasaSmartConfigurationButton_clicked();
 
 private:
-    Ui::OpenRGBKasaSmartSettingsPageUi *ui;
+    Ui::OpenRGBKasaSmartSettingsPage *ui;
     std::vector<OpenRGBKasaSmartSettingsEntry*> entries;
 
 };

qt/OpenRGBKasaSmartSettingsPage/OpenRGBKasaSmartSettingsPage.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>OpenRGBKasaSmartSettingsPageUi</class>
+ <class>OpenRGBKasaSmartSettingsPage</class>
- <widget class="QWidget" name="OpenRGBKasaSmartSettingsPageUi">
+ <widget class="QWidget" name="OpenRGBKasaSmartSettingsPage">
   <property name="geometry">
    <rect>
     <x>0</x>

qt/OpenRGBLIFXSettingsPage/OpenRGBLIFXSettingsEntry.cpp

@@ -10,11 +10,9 @@
 #include "OpenRGBLIFXSettingsEntry.h"
 #include "ui_OpenRGBLIFXSettingsEntry.h"
 
-using namespace Ui;
-
 OpenRGBLIFXSettingsEntry::OpenRGBLIFXSettingsEntry(QWidget *parent) :
     BaseManualDeviceEntry(parent),
-    ui(new Ui::OpenRGBLIFXSettingsEntryUi)
+    ui(new Ui::OpenRGBLIFXSettingsEntry)
 {
     ui->setupUi(this);
 }

qt/OpenRGBLIFXSettingsPage/OpenRGBLIFXSettingsEntry.h

@@ -12,10 +12,9 @@
 namespace Ui
 {
     class OpenRGBLIFXSettingsEntry;
-    class OpenRGBLIFXSettingsEntryUi;
 }
 
-class Ui::OpenRGBLIFXSettingsEntry : public BaseManualDeviceEntry
+class OpenRGBLIFXSettingsEntry : public BaseManualDeviceEntry
 {
     Q_OBJECT
 
@@ -28,7 +27,7 @@ public:
     void setName(QString name);
 
 private:
-    Ui::OpenRGBLIFXSettingsEntryUi *ui;
+    Ui::OpenRGBLIFXSettingsEntry *ui;
 
 private slots:
     void changeEvent(QEvent *event);

qt/OpenRGBLIFXSettingsPage/OpenRGBLIFXSettingsEntry.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>OpenRGBLIFXSettingsEntryUi</class>
+ <class>OpenRGBLIFXSettingsEntry</class>
- <widget class="QWidget" name="OpenRGBLIFXSettingsEntryUi">
+ <widget class="QWidget" name="OpenRGBLIFXSettingsEntry">
   <property name="geometry">
    <rect>
     <x>0</x>

qt/OpenRGBLIFXSettingsPage/OpenRGBLIFXSettingsPage.cpp

@@ -12,11 +12,9 @@
 #include "ResourceManager.h"
 #include "SettingsManager.h"
 
-using namespace Ui;
-
 OpenRGBLIFXSettingsPage::OpenRGBLIFXSettingsPage(QWidget *parent) :
     QWidget(parent),
-    ui(new Ui::OpenRGBLIFXSettingsPageUi)
+    ui(new Ui::OpenRGBLIFXSettingsPage)
 {
     ui->setupUi(this);
 
@@ -64,7 +62,7 @@ void OpenRGBLIFXSettingsPage::changeEvent(QEvent *event)
     }
 }
 
-void Ui::OpenRGBLIFXSettingsPage::on_AddLIFXDeviceButton_clicked()
+void OpenRGBLIFXSettingsPage::on_AddLIFXDeviceButton_clicked()
 {
     OpenRGBLIFXSettingsEntry* entry = new OpenRGBLIFXSettingsEntry;
 
@@ -81,7 +79,7 @@ void Ui::OpenRGBLIFXSettingsPage::on_AddLIFXDeviceButton_clicked()
     ui->LIFXDeviceList->show();
 }
 
-void Ui::OpenRGBLIFXSettingsPage::on_RemoveLIFXDeviceButton_clicked()
+void OpenRGBLIFXSettingsPage::on_RemoveLIFXDeviceButton_clicked()
 {
     int cur_row = ui->LIFXDeviceList->currentRow();
 
@@ -99,7 +97,7 @@ void Ui::OpenRGBLIFXSettingsPage::on_RemoveLIFXDeviceButton_clicked()
     entries.erase(entries.begin() + cur_row);
 }
 
-void Ui::OpenRGBLIFXSettingsPage::on_SaveLIFXConfigurationButton_clicked()
+void OpenRGBLIFXSettingsPage::on_SaveLIFXConfigurationButton_clicked()
 {
     json                lifx_settings;
 

qt/OpenRGBLIFXSettingsPage/OpenRGBLIFXSettingsPage.h

@@ -10,7 +10,6 @@
 #pragma once
 
 #include <QWidget>
-#include "ui_OpenRGBLIFXSettingsPage.h"
 #include "OpenRGBLIFXSettingsEntry.h"
 
 namespace Ui
@@ -18,7 +17,7 @@ namespace Ui
     class OpenRGBLIFXSettingsPage;
 }
 
-class Ui::OpenRGBLIFXSettingsPage : public QWidget
+class OpenRGBLIFXSettingsPage : public QWidget
 {
     Q_OBJECT
 
@@ -35,7 +34,7 @@ private slots:
     void on_SaveLIFXConfigurationButton_clicked();
 
 private:
-    Ui::OpenRGBLIFXSettingsPageUi *ui;
+    Ui::OpenRGBLIFXSettingsPage *ui;
     std::vector<OpenRGBLIFXSettingsEntry*> entries;
 
 };

qt/OpenRGBLIFXSettingsPage/OpenRGBLIFXSettingsPage.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>OpenRGBLIFXSettingsPageUi</class>
+ <class>OpenRGBLIFXSettingsPage</class>
- <widget class="QWidget" name="OpenRGBLIFXSettingsPageUi">
+ <widget class="QWidget" name="OpenRGBLIFXSettingsPage">
   <property name="geometry">
    <rect>
     <x>0</x>

qt/OpenRGBNanoleafSettingsPage/OpenRGBNanoleafNewDeviceDialog.cpp

@@ -16,20 +16,20 @@
 #include <QSettings>
 #endif
 
-Ui::OpenRGBNanoleafNewDeviceDialog::OpenRGBNanoleafNewDeviceDialog(QWidget *parent) :
+OpenRGBNanoleafNewDeviceDialog::OpenRGBNanoleafNewDeviceDialog(QWidget *parent) :
-    QDialog(parent), ui(new Ui::OpenRGBNanoleafNewDeviceDialogUi)
+    QDialog(parent), ui(new Ui::OpenRGBNanoleafNewDeviceDialog)
 {
     ui->setupUi(this);
     setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
     ui->devicePortEdit->setText("16021");
 }
 
-Ui::OpenRGBNanoleafNewDeviceDialog::~OpenRGBNanoleafNewDeviceDialog()
+OpenRGBNanoleafNewDeviceDialog::~OpenRGBNanoleafNewDeviceDialog()
 {
     delete ui;
 }
 
-void Ui::OpenRGBNanoleafNewDeviceDialog::changeEvent(QEvent *event)
+void OpenRGBNanoleafNewDeviceDialog::changeEvent(QEvent *event)
 {
     if(event->type() == QEvent::LanguageChange)
     {
@@ -37,7 +37,7 @@ void Ui::OpenRGBNanoleafNewDeviceDialog::changeEvent(QEvent *event)
     }
 }
 
-NanoleafDevice Ui::OpenRGBNanoleafNewDeviceDialog::show()
+NanoleafDevice OpenRGBNanoleafNewDeviceDialog::show()
 {
     NanoleafDevice return_device;
 

qt/OpenRGBNanoleafSettingsPage/OpenRGBNanoleafNewDeviceDialog.h

@@ -8,7 +8,6 @@
 \*---------------------------------------------------------*/
 
 #include <QDialog>
-#include "ui_OpenRGBNanoleafNewDeviceDialog.h"
 #include "OpenRGBDialog.h"
 
 struct NanoleafDevice
@@ -22,7 +21,7 @@ namespace Ui
 class OpenRGBNanoleafNewDeviceDialog;
 }
 
-class Ui::OpenRGBNanoleafNewDeviceDialog : public QDialog
+class OpenRGBNanoleafNewDeviceDialog : public QDialog
 {
     Q_OBJECT
 
@@ -33,7 +32,7 @@ public:
     NanoleafDevice show();
 
 private:
-    Ui::OpenRGBNanoleafNewDeviceDialogUi *ui;
+    Ui::OpenRGBNanoleafNewDeviceDialog *ui;
 
 private slots:
     void changeEvent(QEvent *event);

qt/OpenRGBNanoleafSettingsPage/OpenRGBNanoleafNewDeviceDialog.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>OpenRGBNanoleafNewDeviceDialogUi</class>
+ <class>OpenRGBNanoleafNewDeviceDialog</class>
- <widget class="QDialog" name="OpenRGBNanoleafNewDeviceDialogUi">
+ <widget class="QDialog" name="OpenRGBNanoleafNewDeviceDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -57,7 +57,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
-   <receiver>OpenRGBNanoleafNewDeviceDialogUi</receiver>
+   <receiver>OpenRGBNanoleafNewDeviceDialog</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -73,7 +73,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
-   <receiver>OpenRGBNanoleafNewDeviceDialogUi</receiver>
+   <receiver>OpenRGBNanoleafNewDeviceDialog</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">

qt/OpenRGBNanoleafSettingsPage/OpenRGBNanoleafSettingsEntry.cpp

@@ -14,11 +14,9 @@
 #include "SettingsManager.h"
 #include "NanoleafController.h"
 
-using namespace Ui;
-
 OpenRGBNanoleafSettingsEntry::OpenRGBNanoleafSettingsEntry(QWidget *parent) :
     BaseManualDeviceEntry(parent),
-    ui(new Ui::OpenRGBNanoleafSettingsEntryUi),
+    ui(new Ui::OpenRGBNanoleafSettingsEntry),
     paired(false)
 {
     ui->setupUi(this);

qt/OpenRGBNanoleafSettingsPage/OpenRGBNanoleafSettingsEntry.h

@@ -10,16 +10,14 @@
 #pragma once
 
 #include "BaseManualDeviceEntry.h"
-#include "ui_OpenRGBNanoleafSettingsEntry.h"
 #include "OpenRGBNanoleafScanningThread.h"
 
 namespace Ui
 {
     class OpenRGBNanoleafSettingsEntry;
-    class OpenRGBNanoleafSettingsEntryUi;
 }
 
-class Ui::OpenRGBNanoleafSettingsEntry : public BaseManualDeviceEntry
+class OpenRGBNanoleafSettingsEntry : public BaseManualDeviceEntry
 {
     Q_OBJECT
 
@@ -35,7 +33,7 @@ public:
     int port;
 
 private:
-    Ui::OpenRGBNanoleafSettingsEntryUi *ui;
+    Ui::OpenRGBNanoleafSettingsEntry *ui;
 
 private slots:
     void changeEvent(QEvent *event);

qt/OpenRGBNanoleafSettingsPage/OpenRGBNanoleafSettingsEntry.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>OpenRGBNanoleafSettingsEntryUi</class>
+ <class>OpenRGBNanoleafSettingsEntry</class>
- <widget class="QWidget" name="OpenRGBNanoleafSettingsEntryUi">
+ <widget class="QWidget" name="OpenRGBNanoleafSettingsEntry">
   <property name="geometry">
    <rect>
     <x>0</x>

qt/OpenRGBNanoleafSettingsPage/OpenRGBNanoleafSettingsPage.cpp

@@ -16,11 +16,9 @@
 
 using json = nlohmann::json;
 
-using namespace Ui;
-
 OpenRGBNanoleafSettingsPage::OpenRGBNanoleafSettingsPage(QWidget *parent) :
     QWidget(parent),
-    ui(new Ui::OpenRGBNanoleafSettingsPageUi)
+    ui(new Ui::OpenRGBNanoleafSettingsPage)
 {
     ui->setupUi(this);
 
@@ -64,7 +62,7 @@ void OpenRGBNanoleafSettingsPage::changeEvent(QEvent *event)
     }
 }
 
-void Ui::OpenRGBNanoleafSettingsPage::on_AddNanoleafDeviceButton_clicked()
+void OpenRGBNanoleafSettingsPage::on_AddNanoleafDeviceButton_clicked()
 {
     /*-----------------------------------------------------*\
     | Open a popup to manually add a device by setting ip   |
@@ -100,7 +98,7 @@ void Ui::OpenRGBNanoleafSettingsPage::on_AddNanoleafDeviceButton_clicked()
     }
 }
 
-void Ui::OpenRGBNanoleafSettingsPage::on_RemoveNanoleafDeviceButton_clicked()
+void OpenRGBNanoleafSettingsPage::on_RemoveNanoleafDeviceButton_clicked()
 {
     /*-------------------------------------------------*\
     | Remove the selected device                        |
@@ -129,7 +127,7 @@ void Ui::OpenRGBNanoleafSettingsPage::on_RemoveNanoleafDeviceButton_clicked()
     ResourceManager::get()->GetSettingsManager()->SaveSettings();
 }
 
-void Ui::OpenRGBNanoleafSettingsPage::on_ScanForNanoleafDevicesButton_clicked()
+void OpenRGBNanoleafSettingsPage::on_ScanForNanoleafDevicesButton_clicked()
 {
     /*-----------------------------------------------------*\
     | Create a worker thread for the mDNS query and hookup  |
@@ -146,7 +144,7 @@ void Ui::OpenRGBNanoleafSettingsPage::on_ScanForNanoleafDevicesButton_clicked()
     scanThread->start();
 }
 
-void Ui::OpenRGBNanoleafSettingsPage::on_DeviceFound(QString address, int port)
+void OpenRGBNanoleafSettingsPage::on_DeviceFound(QString address, int port)
 {
     std::string location = address.toStdString()+":"+std::to_string(port);
 

qt/OpenRGBNanoleafSettingsPage/OpenRGBNanoleafSettingsPage.h

@@ -10,7 +10,6 @@
 #pragma once
 
 #include <QWidget>
-#include "ui_OpenRGBNanoleafSettingsPage.h"
 #include "OpenRGBNanoleafSettingsEntry.h"
 
 namespace Ui
@@ -18,7 +17,7 @@ namespace Ui
     class OpenRGBNanoleafSettingsPage;
 }
 
-class Ui::OpenRGBNanoleafSettingsPage : public QWidget
+class OpenRGBNanoleafSettingsPage : public QWidget
 {
     Q_OBJECT
 
@@ -34,6 +33,6 @@ private slots:
     void on_DeviceFound(QString address, int port);
 
 private:
-    Ui::OpenRGBNanoleafSettingsPageUi *ui;
+    Ui::OpenRGBNanoleafSettingsPage *ui;
     std::map<std::string, OpenRGBNanoleafSettingsEntry*> entries;
 };

qt/OpenRGBNanoleafSettingsPage/OpenRGBNanoleafSettingsPage.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>OpenRGBNanoleafSettingsPageUi</class>
+ <class>OpenRGBNanoleafSettingsPage</class>
- <widget class="QWidget" name="OpenRGBNanoleafSettingsPageUi">
+ <widget class="QWidget" name="OpenRGBNanoleafSettingsPage">
   <property name="geometry">
    <rect>
     <x>0</x>

qt/OpenRGBPhilipsHueSettingsPage/OpenRGBPhilipsHueSettingsEntry.cpp

@@ -10,11 +10,9 @@
 #include "OpenRGBPhilipsHueSettingsEntry.h"
 #include "ui_OpenRGBPhilipsHueSettingsEntry.h"
 
-using namespace Ui;
-
 OpenRGBPhilipsHueSettingsEntry::OpenRGBPhilipsHueSettingsEntry(QWidget *parent) :
     BaseManualDeviceEntry(parent),
-    ui(new Ui::OpenRGBPhilipsHueSettingsEntryUi)
+    ui(new Ui::OpenRGBPhilipsHueSettingsEntry)
 {
     ui->setupUi(this);
 }
@@ -32,7 +30,7 @@ void OpenRGBPhilipsHueSettingsEntry::changeEvent(QEvent *event)
     }
 }
 
-void Ui::OpenRGBPhilipsHueSettingsEntry::on_UnpairButton_clicked()
+void OpenRGBPhilipsHueSettingsEntry::on_UnpairButton_clicked()
 {
     ui->UsernameValue->setText("");
     ui->ClientKeyValue->setText("");

qt/OpenRGBPhilipsHueSettingsPage/OpenRGBPhilipsHueSettingsEntry.h

@@ -14,10 +14,9 @@
 namespace Ui
 {
     class OpenRGBPhilipsHueSettingsEntry;
-    class OpenRGBPhilipsHueSettingsEntryUi;
 }
 
-class Ui::OpenRGBPhilipsHueSettingsEntry : public BaseManualDeviceEntry
+class OpenRGBPhilipsHueSettingsEntry : public BaseManualDeviceEntry
 {
     Q_OBJECT
 
@@ -29,7 +28,7 @@ public:
     const char* settingsSection();
 
 private:
-    Ui::OpenRGBPhilipsHueSettingsEntryUi *ui;
+    Ui::OpenRGBPhilipsHueSettingsEntry *ui;
 
 private slots:
     void changeEvent(QEvent *event);

qt/OpenRGBPhilipsHueSettingsPage/OpenRGBPhilipsHueSettingsEntry.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>OpenRGBPhilipsHueSettingsEntryUi</class>
+ <class>OpenRGBPhilipsHueSettingsEntry</class>
- <widget class="QWidget" name="OpenRGBPhilipsHueSettingsEntryUi">
+ <widget class="QWidget" name="OpenRGBPhilipsHueSettingsEntry">
   <property name="geometry">
    <rect>
     <x>0</x>

qt/OpenRGBPhilipsHueSettingsPage/OpenRGBPhilipsHueSettingsPage.cpp

@@ -12,11 +12,9 @@
 #include "ResourceManager.h"
 #include "SettingsManager.h"
 
-using namespace Ui;
-
 OpenRGBPhilipsHueSettingsPage::OpenRGBPhilipsHueSettingsPage(QWidget *parent) :
     QWidget(parent),
-    ui(new Ui::OpenRGBPhilipsHueSettingsPageUi)
+    ui(new Ui::OpenRGBPhilipsHueSettingsPage)
 {
     ui->setupUi(this);
 
@@ -64,7 +62,7 @@ void OpenRGBPhilipsHueSettingsPage::changeEvent(QEvent *event)
     }
 }
 
-void Ui::OpenRGBPhilipsHueSettingsPage::on_AddPhilipsHueDeviceButton_clicked()
+void OpenRGBPhilipsHueSettingsPage::on_AddPhilipsHueDeviceButton_clicked()
 {
     OpenRGBPhilipsHueSettingsEntry* entry = new OpenRGBPhilipsHueSettingsEntry;
     entries.push_back(entry);
@@ -78,7 +76,7 @@ void Ui::OpenRGBPhilipsHueSettingsPage::on_AddPhilipsHueDeviceButton_clicked()
     ui->PhilipsHueDeviceList->show();
 }
 
-void Ui::OpenRGBPhilipsHueSettingsPage::on_RemovePhilipsHueDeviceButton_clicked()
+void OpenRGBPhilipsHueSettingsPage::on_RemovePhilipsHueDeviceButton_clicked()
 {
     int cur_row = ui->PhilipsHueDeviceList->currentRow();
 
@@ -96,7 +94,7 @@ void Ui::OpenRGBPhilipsHueSettingsPage::on_RemovePhilipsHueDeviceButton_clicked(
     entries.erase(entries.begin() + cur_row);
 }
 
-void Ui::OpenRGBPhilipsHueSettingsPage::on_SavePhilipsHueConfigurationButton_clicked()
+void OpenRGBPhilipsHueSettingsPage::on_SavePhilipsHueConfigurationButton_clicked()
 {
     json                hue_settings;
 

qt/OpenRGBPhilipsHueSettingsPage/OpenRGBPhilipsHueSettingsPage.h

@@ -10,7 +10,6 @@
 #pragma once
 
 #include <QWidget>
-#include "ui_OpenRGBPhilipsHueSettingsPage.h"
 #include "OpenRGBPhilipsHueSettingsEntry.h"
 
 namespace Ui
@@ -18,7 +17,7 @@ namespace Ui
     class OpenRGBPhilipsHueSettingsPage;
 }
 
-class Ui::OpenRGBPhilipsHueSettingsPage : public QWidget
+class OpenRGBPhilipsHueSettingsPage : public QWidget
 {
     Q_OBJECT
 
@@ -35,6 +34,6 @@ private slots:
     void on_SavePhilipsHueConfigurationButton_clicked();
 
 private:
-    Ui::OpenRGBPhilipsHueSettingsPageUi *ui;
+    Ui::OpenRGBPhilipsHueSettingsPage *ui;
     std::vector<OpenRGBPhilipsHueSettingsEntry*> entries;
 };

qt/OpenRGBPhilipsHueSettingsPage/OpenRGBPhilipsHueSettingsPage.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>OpenRGBPhilipsHueSettingsPageUi</class>
+ <class>OpenRGBPhilipsHueSettingsPage</class>
- <widget class="QWidget" name="OpenRGBPhilipsHueSettingsPageUi">
+ <widget class="QWidget" name="OpenRGBPhilipsHueSettingsPage">
   <property name="geometry">
    <rect>
     <x>0</x>

qt/OpenRGBPhilipsWizSettingsPage/OpenRGBPhilipsWizSettingsEntry.cpp

@@ -10,11 +10,9 @@
 #include "OpenRGBPhilipsWizSettingsEntry.h"
 #include "ui_OpenRGBPhilipsWizSettingsEntry.h"
 
-using namespace Ui;
-
 OpenRGBPhilipsWizSettingsEntry::OpenRGBPhilipsWizSettingsEntry(QWidget *parent) :
     BaseManualDeviceEntry(parent),
-    ui(new Ui::OpenRGBPhilipsWizSettingsEntryUi)
+    ui(new Ui::OpenRGBPhilipsWizSettingsEntry)
 {
     ui->setupUi(this);
 

qt/OpenRGBPhilipsWizSettingsPage/OpenRGBPhilipsWizSettingsEntry.h

@@ -14,10 +14,9 @@
 namespace Ui
 {
     class OpenRGBPhilipsWizSettingsEntry;
-    class OpenRGBPhilipsWizSettingsEntryUi;
 }
 
-class Ui::OpenRGBPhilipsWizSettingsEntry : public BaseManualDeviceEntry
+class OpenRGBPhilipsWizSettingsEntry : public BaseManualDeviceEntry
 {
     Q_OBJECT
 
@@ -29,7 +28,7 @@ public:
     const char* settingsSection();
 
 private:
-    Ui::OpenRGBPhilipsWizSettingsEntryUi *ui;
+    Ui::OpenRGBPhilipsWizSettingsEntry *ui;
 
 private slots:
     void changeEvent(QEvent *event);

qt/OpenRGBPhilipsWizSettingsPage/OpenRGBPhilipsWizSettingsEntry.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>OpenRGBPhilipsWizSettingsEntryUi</class>
+ <class>OpenRGBPhilipsWizSettingsEntry</class>
- <widget class="QWidget" name="OpenRGBPhilipsWizSettingsEntryUi">
+ <widget class="QWidget" name="OpenRGBPhilipsWizSettingsEntry">
   <property name="geometry">
    <rect>
     <x>0</x>

qt/OpenRGBPhilipsWizSettingsPage/OpenRGBPhilipsWizSettingsPage.cpp

@@ -12,11 +12,9 @@
 #include "ResourceManager.h"
 #include "SettingsManager.h"
 
-using namespace Ui;
-
 OpenRGBPhilipsWizSettingsPage::OpenRGBPhilipsWizSettingsPage(QWidget *parent) :
     QWidget(parent),
-    ui(new Ui::OpenRGBPhilipsWizSettingsPageUi)
+    ui(new Ui::OpenRGBPhilipsWizSettingsPage)
 {
     ui->setupUi(this);
 
@@ -64,7 +62,7 @@ void OpenRGBPhilipsWizSettingsPage::changeEvent(QEvent *event)
     }
 }
 
-void Ui::OpenRGBPhilipsWizSettingsPage::on_AddPhilipsWizDeviceButton_clicked()
+void OpenRGBPhilipsWizSettingsPage::on_AddPhilipsWizDeviceButton_clicked()
 {
     OpenRGBPhilipsWizSettingsEntry* entry = new OpenRGBPhilipsWizSettingsEntry;
     entries.push_back(entry);
@@ -78,7 +76,7 @@ void Ui::OpenRGBPhilipsWizSettingsPage::on_AddPhilipsWizDeviceButton_clicked()
     ui->PhilipsWizDeviceList->show();
 }
 
-void Ui::OpenRGBPhilipsWizSettingsPage::on_RemovePhilipsWizDeviceButton_clicked()
+void OpenRGBPhilipsWizSettingsPage::on_RemovePhilipsWizDeviceButton_clicked()
 {
     int cur_row = ui->PhilipsWizDeviceList->currentRow();
 
@@ -96,7 +94,7 @@ void Ui::OpenRGBPhilipsWizSettingsPage::on_RemovePhilipsWizDeviceButton_clicked(
     entries.erase(entries.begin() + cur_row);
 }
 
-void Ui::OpenRGBPhilipsWizSettingsPage::on_SavePhilipsWizConfigurationButton_clicked()
+void OpenRGBPhilipsWizSettingsPage::on_SavePhilipsWizConfigurationButton_clicked()
 {
     json                wiz_settings;
 

qt/OpenRGBPhilipsWizSettingsPage/OpenRGBPhilipsWizSettingsPage.h

@@ -10,7 +10,6 @@
 #pragma once
 
 #include <QWidget>
-#include "ui_OpenRGBPhilipsWizSettingsPage.h"
 #include "OpenRGBPhilipsWizSettingsEntry.h"
 
 namespace Ui
@@ -18,7 +17,7 @@ namespace Ui
     class OpenRGBPhilipsWizSettingsPage;
 }
 
-class Ui::OpenRGBPhilipsWizSettingsPage : public QWidget
+class OpenRGBPhilipsWizSettingsPage : public QWidget
 {
     Q_OBJECT
 
@@ -35,7 +34,7 @@ private slots:
     void on_SavePhilipsWizConfigurationButton_clicked();
 
 private:
-    Ui::OpenRGBPhilipsWizSettingsPageUi *ui;
+    Ui::OpenRGBPhilipsWizSettingsPage *ui;
     std::vector<OpenRGBPhilipsWizSettingsEntry*> entries;
 
 };

qt/OpenRGBPhilipsWizSettingsPage/OpenRGBPhilipsWizSettingsPage.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>OpenRGBPhilipsWizSettingsPageUi</class>
+ <class>OpenRGBPhilipsWizSettingsPage</class>
- <widget class="QWidget" name="OpenRGBPhilipsWizSettingsPageUi">
+ <widget class="QWidget" name="OpenRGBPhilipsWizSettingsPage">
   <property name="geometry">
    <rect>
     <x>0</x>

qt/OpenRGBPluginContainer/OpenRGBPluginContainer.cpp

@@ -10,9 +10,9 @@
 #include "OpenRGBPluginContainer.h"
 #include "ui_OpenRGBPluginContainer.h"
 
-Ui::OpenRGBPluginContainer::OpenRGBPluginContainer(QWidget *plugin, QWidget *parent) :
+OpenRGBPluginContainer::OpenRGBPluginContainer(QWidget *plugin, QWidget *parent) :
     QWidget(parent),
-    ui(new Ui::OpenRGBPluginContainerUi)
+    ui(new Ui::OpenRGBPluginContainer)
 {
     ui->setupUi(this);
 
@@ -24,12 +24,12 @@ Ui::OpenRGBPluginContainer::OpenRGBPluginContainer(QWidget *plugin, QWidget *par
     Hide();
 }
 
-Ui::OpenRGBPluginContainer::~OpenRGBPluginContainer()
+OpenRGBPluginContainer::~OpenRGBPluginContainer()
 {
     delete ui;
 }
 
-void Ui::OpenRGBPluginContainer::changeEvent(QEvent *event)
+void OpenRGBPluginContainer::changeEvent(QEvent *event)
 {
     if(event->type() == QEvent::LanguageChange)
     {
@@ -37,13 +37,13 @@ void Ui::OpenRGBPluginContainer::changeEvent(QEvent *event)
     }
 }
 
-void Ui::OpenRGBPluginContainer::Hide()
+void OpenRGBPluginContainer::Hide()
 {
     plugin_widget->hide();
     ui->PluginContainerLayout->layout()->invalidate();
 }
 
-void Ui::OpenRGBPluginContainer::Show()
+void OpenRGBPluginContainer::Show()
 {
     plugin_widget->show();
     ui->PluginContainerLayout->layout()->invalidate();

qt/OpenRGBPluginContainer/OpenRGBPluginContainer.h

@@ -10,14 +10,13 @@
 #pragma once
 
 #include <QWidget>
-#include "ui_OpenRGBPluginContainer.h"
 
 namespace Ui
 {
     class OpenRGBPluginContainer;
 }
 
-class Ui::OpenRGBPluginContainer : public QWidget
+class OpenRGBPluginContainer : public QWidget
 {
     Q_OBJECT
 
@@ -30,7 +29,7 @@ public:
     QWidget* plugin_widget;
 
 private:
-    Ui::OpenRGBPluginContainerUi *ui;
+    Ui::OpenRGBPluginContainer *ui;
 
 private slots:
     void changeEvent(QEvent *event);

qt/OpenRGBPluginContainer/OpenRGBPluginContainer.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>OpenRGBPluginContainerUi</class>
+ <class>OpenRGBPluginContainer</class>
- <widget class="QWidget" name="OpenRGBPluginContainerUi">
+ <widget class="QWidget" name="OpenRGBPluginContainer">
   <property name="geometry">
    <rect>
     <x>0</x>

qt/OpenRGBPluginsPage/OpenRGBPluginsEntry.cpp

@@ -11,11 +11,9 @@
 #include "ui_OpenRGBPluginsEntry.h"
 #include "PluginManager.h"
 
-using namespace Ui;
-
 OpenRGBPluginsEntry::OpenRGBPluginsEntry(QWidget *parent) :
     QWidget(parent),
-    ui(new Ui::OpenRGBPluginsEntryUi)
+    ui(new Ui::OpenRGBPluginsEntry)
 {
     ui->setupUi(this);
 
@@ -110,7 +108,7 @@ void OpenRGBPluginsEntry::RegisterEnableClickCallback(EnableClickCallback new_ca
     EnableClickCallbackArg  = new_callback_arg;
 }
 
-void Ui::OpenRGBPluginsEntry::on_EnabledCheckBox_stateChanged(int /*checked*/)
+void OpenRGBPluginsEntry::on_EnabledCheckBox_stateChanged(int /*checked*/)
 {
     /*-------------------------------------------------*\
     | Call the callbacks                                |

qt/OpenRGBPluginsPage/OpenRGBPluginsEntry.h

@@ -14,14 +14,13 @@
 namespace Ui
 {
     class OpenRGBPluginsEntry;
-    class OpenRGBPluginsEntryUi;
 }
 
 typedef void (*EnableClickCallback)(void *, void *);
 
 struct OpenRGBPluginEntry;
 
-class Ui::OpenRGBPluginsEntry : public QWidget
+class OpenRGBPluginsEntry : public QWidget
 {
     Q_OBJECT
 
@@ -45,6 +44,6 @@ private slots:
 private:
     EnableClickCallback EnableClickCallbackVal;
     void *              EnableClickCallbackArg;
-    Ui::OpenRGBPluginsEntryUi * ui;
+    Ui::OpenRGBPluginsEntry * ui;
-    bool                        is_system;
+    bool                      is_system;
 };

qt/OpenRGBPluginsPage/OpenRGBPluginsEntry.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>OpenRGBPluginsEntryUi</class>
+ <class>OpenRGBPluginsEntry</class>
- <widget class="QWidget" name="OpenRGBPluginsEntryUi">
+ <widget class="QWidget" name="OpenRGBPluginsEntry">
   <property name="geometry">
    <rect>
     <x>0</x>

qt/OpenRGBPluginsPage/OpenRGBPluginsPage.cpp

@@ -20,14 +20,14 @@
 
 void EnableClickCallbackFunction(void* this_ptr, void* entry_ptr)
 {
-    Ui::OpenRGBPluginsPage* this_page = (Ui::OpenRGBPluginsPage*)this_ptr;
+    OpenRGBPluginsPage* this_page = (OpenRGBPluginsPage*)this_ptr;
 
-    this_page->on_EnableButton_clicked((Ui::OpenRGBPluginsEntry*)entry_ptr);
+    this_page->on_EnableButton_clicked((OpenRGBPluginsEntry*)entry_ptr);
 }
 
-Ui::OpenRGBPluginsPage::OpenRGBPluginsPage(PluginManager* plugin_manager_ptr, QWidget *parent) :
+OpenRGBPluginsPage::OpenRGBPluginsPage(PluginManager* plugin_manager_ptr, QWidget *parent) :
     QWidget(parent),
-    ui(new Ui::OpenRGBPluginsPageUi)
+    ui(new Ui::OpenRGBPluginsPage)
 {
     plugin_manager = plugin_manager_ptr;
     ui->setupUi(this);
@@ -35,12 +35,12 @@ Ui::OpenRGBPluginsPage::OpenRGBPluginsPage(PluginManager* plugin_manager_ptr, QW
     RefreshList();
 }
 
-Ui::OpenRGBPluginsPage::~OpenRGBPluginsPage()
+OpenRGBPluginsPage::~OpenRGBPluginsPage()
 {
     delete ui;
 }
 
-void Ui::OpenRGBPluginsPage::changeEvent(QEvent *event)
+void OpenRGBPluginsPage::changeEvent(QEvent *event)
 {
     if(event->type() == QEvent::LanguageChange)
     {
@@ -48,7 +48,7 @@ void Ui::OpenRGBPluginsPage::changeEvent(QEvent *event)
     }
 }
 
-void Ui::OpenRGBPluginsPage::RefreshList()
+void OpenRGBPluginsPage::RefreshList()
 {
     ui->PluginsList->clear();
     entries.clear();
@@ -78,7 +78,7 @@ void Ui::OpenRGBPluginsPage::RefreshList()
     }
 }
 
-void Ui::OpenRGBPluginsPage::on_InstallPluginButton_clicked()
+void OpenRGBPluginsPage::on_InstallPluginButton_clicked()
 {
     /*-----------------------------------------------------*\
     | Open a file selection prompt to choose the plugin file|
@@ -93,7 +93,7 @@ void Ui::OpenRGBPluginsPage::on_InstallPluginButton_clicked()
     }
 }
 
-bool Ui::OpenRGBPluginsPage::InstallPlugin(std::string install_file)
+bool OpenRGBPluginsPage::InstallPlugin(std::string install_file)
 {
     filesystem::path from_path = filesystem::u8path(install_file);
     filesystem::path to_path   = ResourceManager::get()->GetConfigurationDirectory() / "plugins" / from_path.filename();
@@ -151,7 +151,7 @@ bool Ui::OpenRGBPluginsPage::InstallPlugin(std::string install_file)
     return false;
 }
 
-void Ui::OpenRGBPluginsPage::on_RemovePluginButton_clicked()
+void OpenRGBPluginsPage::on_RemovePluginButton_clicked()
 {
     QMessageBox::StandardButton reply;
 
@@ -221,7 +221,7 @@ void Ui::OpenRGBPluginsPage::on_RemovePluginButton_clicked()
     QMessageBox::information(this, tr("Restart Needed"), tr("The plugin will be fully removed after restarting OpenRGB."), QMessageBox::Ok);
 }
 
-void Ui::OpenRGBPluginsPage::on_EnableButton_clicked(OpenRGBPluginsEntry* entry)
+void OpenRGBPluginsPage::on_EnableButton_clicked(OpenRGBPluginsEntry* entry)
 {
     /*-----------------------------------------------------*\
     | Open plugin list and check if plugin is in the list   |
@@ -297,7 +297,7 @@ void Ui::OpenRGBPluginsPage::on_EnableButton_clicked(OpenRGBPluginsEntry* entry)
     }
 }
 
-void Ui::OpenRGBPluginsPage::on_PluginsList_itemSelectionChanged()
+void OpenRGBPluginsPage::on_PluginsList_itemSelectionChanged()
 {
     /*-----------------------------------------------------*\
     | Get index of selected plugin entry                    |
@@ -329,7 +329,7 @@ void Ui::OpenRGBPluginsPage::on_PluginsList_itemSelectionChanged()
     }
 }
 
-void Ui::OpenRGBPluginsPage::on_PluginsList_PluginsDropped(std::vector<std::string> path_list)
+void OpenRGBPluginsPage::on_PluginsList_PluginsDropped(std::vector<std::string> path_list)
 {
     bool installed = false;
 

qt/OpenRGBPluginsPage/OpenRGBPluginsPage.h

@@ -16,10 +16,9 @@
 namespace Ui
 {
     class OpenRGBPluginsPage;
-    class OpenRGBPluginsPageUi;
 }
 
-class Ui::OpenRGBPluginsPage : public QWidget
+class OpenRGBPluginsPage : public QWidget
 {
     Q_OBJECT
 
@@ -41,7 +40,7 @@ private slots:
     void on_PluginsList_PluginsDropped(std::vector<std::string>);
 
 private:
-    Ui::OpenRGBPluginsPageUi*   ui;
+    Ui::OpenRGBPluginsPage*     ui;
     PluginManager*              plugin_manager;
     std::vector<OpenRGBPluginsEntry*> entries;
 

qt/OpenRGBPluginsPage/OpenRGBPluginsPage.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>OpenRGBPluginsPageUi</class>
+ <class>OpenRGBPluginsPage</class>
- <widget class="QWidget" name="OpenRGBPluginsPageUi">
+ <widget class="QWidget" name="OpenRGBPluginsPage">
   <property name="geometry">
    <rect>
     <x>0</x>

qt/OpenRGBProfileSaveDialog/OpenRGBProfileSaveDialog.cpp

@@ -18,8 +18,8 @@
 #include <QSettings>
 #endif
 
-Ui::OpenRGBProfileSaveDialog::OpenRGBProfileSaveDialog(QWidget *parent) :
+OpenRGBProfileSaveDialog::OpenRGBProfileSaveDialog(QWidget *parent) :
-    QDialog(parent), ui(new Ui::OpenRGBProfileSaveDialogUi)
+    QDialog(parent), ui(new Ui::OpenRGBProfileSaveDialog)
 {
     ui->setupUi(this);
     setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
@@ -44,12 +44,12 @@ Ui::OpenRGBProfileSaveDialog::OpenRGBProfileSaveDialog(QWidget *parent) :
     }
 }
 
-Ui::OpenRGBProfileSaveDialog::~OpenRGBProfileSaveDialog()
+OpenRGBProfileSaveDialog::~OpenRGBProfileSaveDialog()
 {
     delete ui;
 }
 
-void Ui::OpenRGBProfileSaveDialog::changeEvent(QEvent *event)
+void OpenRGBProfileSaveDialog::changeEvent(QEvent *event)
 {
     if(event->type() == QEvent::LanguageChange)
     {
@@ -57,7 +57,7 @@ void Ui::OpenRGBProfileSaveDialog::changeEvent(QEvent *event)
     }
 }
 
-std::string Ui::OpenRGBProfileSaveDialog::show()
+std::string OpenRGBProfileSaveDialog::show()
 {
     std::string return_string;
 

qt/OpenRGBProfileSaveDialog/OpenRGBProfileSaveDialog.h

@@ -10,7 +10,6 @@
 #pragma once
 
 #include <QDialog>
-#include "ui_OpenRGBProfileSaveDialog.h"
 #include "OpenRGBDialog.h"
 
 namespace Ui
@@ -18,7 +17,7 @@ namespace Ui
     class OpenRGBProfileSaveDialog;
 }
 
-class Ui::OpenRGBProfileSaveDialog : public QDialog
+class OpenRGBProfileSaveDialog : public QDialog
 {
     Q_OBJECT
 
@@ -29,7 +28,7 @@ public:
     std::string show();
 
 private:
-    Ui::OpenRGBProfileSaveDialogUi *ui;
+    Ui::OpenRGBProfileSaveDialog *ui;
 
 private slots:
     void changeEvent(QEvent *event);

qt/OpenRGBProfileSaveDialog/OpenRGBProfileSaveDialog.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>OpenRGBProfileSaveDialogUi</class>
+ <class>OpenRGBProfileSaveDialog</class>
- <widget class="QDialog" name="OpenRGBProfileSaveDialogUi">
+ <widget class="QDialog" name="OpenRGBProfileSaveDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -57,7 +57,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
-   <receiver>OpenRGBProfileSaveDialogUi</receiver>
+   <receiver>OpenRGBProfileSaveDialog</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -73,7 +73,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
-   <receiver>OpenRGBProfileSaveDialogUi</receiver>
+   <receiver>OpenRGBProfileSaveDialog</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">

qt/OpenRGBQMKORGBSettingsPage/OpenRGBQMKORGBSettingsEntry.cpp

@@ -10,11 +10,9 @@
 #include "OpenRGBQMKORGBSettingsEntry.h"
 #include "ui_OpenRGBQMKORGBSettingsEntry.h"
 
-using namespace Ui;
-
 OpenRGBQMKORGBSettingsEntry::OpenRGBQMKORGBSettingsEntry(QWidget *parent) :
     BaseManualDeviceEntry(parent),
-    ui(new Ui::OpenRGBQMKORGBSettingsEntryUi)
+    ui(new Ui::OpenRGBQMKORGBSettingsEntry)
 {
     ui->setupUi(this);
 }

qt/OpenRGBQMKORGBSettingsPage/OpenRGBQMKORGBSettingsEntry.h

@@ -14,10 +14,9 @@
 namespace Ui
 {
     class OpenRGBQMKORGBSettingsEntry;
-    class OpenRGBQMKORGBSettingsEntryUi;
 }
 
-class Ui::OpenRGBQMKORGBSettingsEntry : public BaseManualDeviceEntry
+class OpenRGBQMKORGBSettingsEntry : public BaseManualDeviceEntry
 {
     Q_OBJECT
 
@@ -32,5 +31,5 @@ public:
     const char* settingsSection();
 
 private:
-    Ui::OpenRGBQMKORGBSettingsEntryUi *ui;
+    Ui::OpenRGBQMKORGBSettingsEntry *ui;
 };

qt/OpenRGBQMKORGBSettingsPage/OpenRGBQMKORGBSettingsEntry.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>OpenRGBQMKORGBSettingsEntryUi</class>
+ <class>OpenRGBQMKORGBSettingsEntry</class>
- <widget class="QWidget" name="OpenRGBQMKORGBSettingsEntryUi">
+ <widget class="QWidget" name="OpenRGBQMKORGBSettingsEntry">
   <property name="geometry">
    <rect>
     <x>0</x>

qt/OpenRGBQMKORGBSettingsPage/OpenRGBQMKORGBSettingsPage.cpp

@@ -12,11 +12,9 @@
 #include "ResourceManager.h"
 #include "SettingsManager.h"
 
-using namespace Ui;
-
 OpenRGBQMKORGBSettingsPage::OpenRGBQMKORGBSettingsPage(QWidget *parent) :
     QWidget(parent),
-    ui(new Ui::OpenRGBQMKORGBSettingsPageUi)
+    ui(new Ui::OpenRGBQMKORGBSettingsPage)
 {
     ui->setupUi(this);
 
@@ -64,7 +62,7 @@ void OpenRGBQMKORGBSettingsPage::changeEvent(QEvent *event)
     }
 }
 
-void Ui::OpenRGBQMKORGBSettingsPage::on_AddQMKORGBDeviceButton_clicked()
+void OpenRGBQMKORGBSettingsPage::on_AddQMKORGBDeviceButton_clicked()
 {
     OpenRGBQMKORGBSettingsEntry* entry = new OpenRGBQMKORGBSettingsEntry;
     entries.push_back(entry);
@@ -78,7 +76,7 @@ void Ui::OpenRGBQMKORGBSettingsPage::on_AddQMKORGBDeviceButton_clicked()
     ui->QMKORGBDeviceList->show();
 }
 
-void Ui::OpenRGBQMKORGBSettingsPage::on_RemoveQMKORGBDeviceButton_clicked()
+void OpenRGBQMKORGBSettingsPage::on_RemoveQMKORGBDeviceButton_clicked()
 {
     int cur_row = ui->QMKORGBDeviceList->currentRow();
 
@@ -96,7 +94,7 @@ void Ui::OpenRGBQMKORGBSettingsPage::on_RemoveQMKORGBDeviceButton_clicked()
     entries.erase(entries.begin() + cur_row);
 }
 
-void Ui::OpenRGBQMKORGBSettingsPage::on_SaveQMKORGBConfigurationButton_clicked()
+void OpenRGBQMKORGBSettingsPage::on_SaveQMKORGBConfigurationButton_clicked()
 {
     json                qmk_settings;
 

qt/OpenRGBQMKORGBSettingsPage/OpenRGBQMKORGBSettingsPage.h

@@ -15,10 +15,9 @@
 namespace Ui
 {
     class OpenRGBQMKORGBSettingsPage;
-    class OpenRGBQMKORGBSettingsPageUi;
 }
 
-class Ui::OpenRGBQMKORGBSettingsPage : public QWidget
+class OpenRGBQMKORGBSettingsPage : public QWidget
 {
     Q_OBJECT
 
@@ -35,7 +34,7 @@ private slots:
     void on_SaveQMKORGBConfigurationButton_clicked();
 
 private:
-    Ui::OpenRGBQMKORGBSettingsPageUi *ui;
+    Ui::OpenRGBQMKORGBSettingsPage *ui;
     std::vector<OpenRGBQMKORGBSettingsEntry*> entries;
 
 };

qt/OpenRGBQMKORGBSettingsPage/OpenRGBQMKORGBSettingsPage.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>OpenRGBQMKORGBSettingsPageUi</class>
+ <class>OpenRGBQMKORGBSettingsPage</class>
- <widget class="QWidget" name="OpenRGBQMKORGBSettingsPageUi">
+ <widget class="QWidget" name="OpenRGBQMKORGBSettingsPage">
   <property name="geometry">
    <rect>
     <x>0</x>