diff --git a/qt/BaseManualDeviceEntry.h b/qt/BaseManualDeviceEntry.h new file mode 100644 index 00000000..82950560 --- /dev/null +++ b/qt/BaseManualDeviceEntry.h @@ -0,0 +1,26 @@ +/*-----------------------------------------------------------------*\ +| BaseManualDeviceEntry.h | +| | +| Base class to all user-defined device settings entries | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-only | +\*-----------------------------------------------------------------*/ + +#pragma once + +#include +#include "nlohmann/json.hpp" + +using json = nlohmann::json; + +class BaseManualDeviceEntry: public QWidget +{ + Q_OBJECT + +public: + explicit BaseManualDeviceEntry(QWidget *parent = nullptr): QWidget(parent) {} + virtual void loadFromSettings(const json& data) = 0; + virtual json saveSettings() = 0; + virtual const char* settingsSection() = 0; +}; diff --git a/qt/OpenRGBDMXSettingsPage/OpenRGBDMXSettingsEntry.cpp b/qt/OpenRGBDMXSettingsPage/OpenRGBDMXSettingsEntry.cpp index 5ae68764..152b1fcd 100644 --- a/qt/OpenRGBDMXSettingsPage/OpenRGBDMXSettingsEntry.cpp +++ b/qt/OpenRGBDMXSettingsPage/OpenRGBDMXSettingsEntry.cpp @@ -13,7 +13,7 @@ using namespace Ui; OpenRGBDMXSettingsEntry::OpenRGBDMXSettingsEntry(QWidget *parent) : - QWidget(parent), + BaseManualDeviceEntry(parent), ui(new Ui::OpenRGBDMXSettingsEntryUi) { ui->setupUi(this); diff --git a/qt/OpenRGBDMXSettingsPage/OpenRGBDMXSettingsEntry.h b/qt/OpenRGBDMXSettingsPage/OpenRGBDMXSettingsEntry.h index 91342cd7..a0253df3 100644 --- a/qt/OpenRGBDMXSettingsPage/OpenRGBDMXSettingsEntry.h +++ b/qt/OpenRGBDMXSettingsPage/OpenRGBDMXSettingsEntry.h @@ -9,10 +9,7 @@ #pragma once -#include -#include "nlohmann/json.hpp" - -using json = nlohmann::json; +#include "BaseManualDeviceEntry.h" namespace Ui { @@ -20,7 +17,7 @@ namespace Ui class OpenRGBDMXSettingsEntryUi; } -class Ui::OpenRGBDMXSettingsEntry : public QWidget +class Ui::OpenRGBDMXSettingsEntry : public BaseManualDeviceEntry { Q_OBJECT diff --git a/qt/OpenRGBE131SettingsPage/OpenRGBE131SettingsEntry.cpp b/qt/OpenRGBE131SettingsPage/OpenRGBE131SettingsEntry.cpp index b1246725..7e194781 100644 --- a/qt/OpenRGBE131SettingsPage/OpenRGBE131SettingsEntry.cpp +++ b/qt/OpenRGBE131SettingsPage/OpenRGBE131SettingsEntry.cpp @@ -13,7 +13,7 @@ using namespace Ui; OpenRGBE131SettingsEntry::OpenRGBE131SettingsEntry(QWidget *parent) : - QWidget(parent), + BaseManualDeviceEntry(parent), ui(new Ui::OpenRGBE131SettingsEntryUi) { ui->setupUi(this); diff --git a/qt/OpenRGBE131SettingsPage/OpenRGBE131SettingsEntry.h b/qt/OpenRGBE131SettingsPage/OpenRGBE131SettingsEntry.h index 8e4f780f..08b26810 100644 --- a/qt/OpenRGBE131SettingsPage/OpenRGBE131SettingsEntry.h +++ b/qt/OpenRGBE131SettingsPage/OpenRGBE131SettingsEntry.h @@ -9,10 +9,7 @@ #pragma once -#include -#include "nlohmann/json.hpp" - -using json = nlohmann::json; +#include "BaseManualDeviceEntry.h" namespace Ui { @@ -20,7 +17,7 @@ namespace Ui class OpenRGBE131SettingsEntryUi; } -class Ui::OpenRGBE131SettingsEntry : public QWidget +class Ui::OpenRGBE131SettingsEntry : public BaseManualDeviceEntry { Q_OBJECT diff --git a/qt/OpenRGBElgatoKeyLightSettingsPage/OpenRGBElgatoKeyLightSettingsEntry.cpp b/qt/OpenRGBElgatoKeyLightSettingsPage/OpenRGBElgatoKeyLightSettingsEntry.cpp index b754fda2..33661bef 100644 --- a/qt/OpenRGBElgatoKeyLightSettingsPage/OpenRGBElgatoKeyLightSettingsEntry.cpp +++ b/qt/OpenRGBElgatoKeyLightSettingsPage/OpenRGBElgatoKeyLightSettingsEntry.cpp @@ -13,7 +13,7 @@ using namespace Ui; OpenRGBElgatoKeyLightSettingsEntry::OpenRGBElgatoKeyLightSettingsEntry(QWidget *parent) : - QDialog(parent), + BaseManualDeviceEntry(parent), ui(new Ui::OpenRGBElgatoKeyLightSettingsEntryUi) { ui->setupUi(this); diff --git a/qt/OpenRGBElgatoKeyLightSettingsPage/OpenRGBElgatoKeyLightSettingsEntry.h b/qt/OpenRGBElgatoKeyLightSettingsPage/OpenRGBElgatoKeyLightSettingsEntry.h index c1abe45a..239ca526 100644 --- a/qt/OpenRGBElgatoKeyLightSettingsPage/OpenRGBElgatoKeyLightSettingsEntry.h +++ b/qt/OpenRGBElgatoKeyLightSettingsPage/OpenRGBElgatoKeyLightSettingsEntry.h @@ -9,10 +9,7 @@ #pragma once -#include -#include "nlohmann/json.hpp" - -using json = nlohmann::json; +#include "BaseManualDeviceEntry.h" namespace Ui { @@ -20,7 +17,7 @@ namespace Ui class OpenRGBElgatoKeyLightSettingsEntryUi; } -class Ui::OpenRGBElgatoKeyLightSettingsEntry : public QDialog +class Ui::OpenRGBElgatoKeyLightSettingsEntry : public BaseManualDeviceEntry { Q_OBJECT diff --git a/qt/OpenRGBElgatoKeyLightSettingsPage/OpenRGBElgatoKeyLightSettingsEntry.ui b/qt/OpenRGBElgatoKeyLightSettingsPage/OpenRGBElgatoKeyLightSettingsEntry.ui index d83ef1cc..ca772131 100644 --- a/qt/OpenRGBElgatoKeyLightSettingsPage/OpenRGBElgatoKeyLightSettingsEntry.ui +++ b/qt/OpenRGBElgatoKeyLightSettingsPage/OpenRGBElgatoKeyLightSettingsEntry.ui @@ -1,7 +1,7 @@ OpenRGBElgatoKeyLightSettingsEntryUi - + 0 diff --git a/qt/OpenRGBElgatoLightStripSettingsPage/OpenRGBElgatoLightStripSettingsEntry.cpp b/qt/OpenRGBElgatoLightStripSettingsPage/OpenRGBElgatoLightStripSettingsEntry.cpp index 0761b7ac..3bd91f8e 100644 --- a/qt/OpenRGBElgatoLightStripSettingsPage/OpenRGBElgatoLightStripSettingsEntry.cpp +++ b/qt/OpenRGBElgatoLightStripSettingsPage/OpenRGBElgatoLightStripSettingsEntry.cpp @@ -13,7 +13,7 @@ using namespace Ui; OpenRGBElgatoLightStripSettingsEntry::OpenRGBElgatoLightStripSettingsEntry(QWidget *parent) : - QDialog(parent), + BaseManualDeviceEntry(parent), ui(new Ui::OpenRGBElgatoLightStripSettingsEntryUi) { ui->setupUi(this); diff --git a/qt/OpenRGBElgatoLightStripSettingsPage/OpenRGBElgatoLightStripSettingsEntry.h b/qt/OpenRGBElgatoLightStripSettingsPage/OpenRGBElgatoLightStripSettingsEntry.h index 6be208a1..f71196ca 100644 --- a/qt/OpenRGBElgatoLightStripSettingsPage/OpenRGBElgatoLightStripSettingsEntry.h +++ b/qt/OpenRGBElgatoLightStripSettingsPage/OpenRGBElgatoLightStripSettingsEntry.h @@ -9,10 +9,7 @@ #pragma once -#include -#include "nlohmann/json.hpp" - -using json = nlohmann::json; +#include "BaseManualDeviceEntry.h" namespace Ui { @@ -20,7 +17,7 @@ namespace Ui class OpenRGBElgatoLightStripSettingsEntryUi; } -class Ui::OpenRGBElgatoLightStripSettingsEntry : public QDialog +class Ui::OpenRGBElgatoLightStripSettingsEntry : public BaseManualDeviceEntry { Q_OBJECT diff --git a/qt/OpenRGBElgatoLightStripSettingsPage/OpenRGBElgatoLightStripSettingsEntry.ui b/qt/OpenRGBElgatoLightStripSettingsPage/OpenRGBElgatoLightStripSettingsEntry.ui index faa49278..44df7711 100644 --- a/qt/OpenRGBElgatoLightStripSettingsPage/OpenRGBElgatoLightStripSettingsEntry.ui +++ b/qt/OpenRGBElgatoLightStripSettingsPage/OpenRGBElgatoLightStripSettingsEntry.ui @@ -1,7 +1,7 @@ OpenRGBElgatoLightStripSettingsEntryUi - + 0 diff --git a/qt/OpenRGBGoveeSettingsPage/OpenRGBGoveeSettingsEntry.cpp b/qt/OpenRGBGoveeSettingsPage/OpenRGBGoveeSettingsEntry.cpp index 4b4760c6..7dc24746 100644 --- a/qt/OpenRGBGoveeSettingsPage/OpenRGBGoveeSettingsEntry.cpp +++ b/qt/OpenRGBGoveeSettingsPage/OpenRGBGoveeSettingsEntry.cpp @@ -15,7 +15,7 @@ using namespace Ui; OpenRGBGoveeSettingsEntry::OpenRGBGoveeSettingsEntry(QWidget *parent) : - QWidget(parent), + BaseManualDeviceEntry(parent), ui(new Ui::OpenRGBGoveeSettingsEntryUi) { ui->setupUi(this); diff --git a/qt/OpenRGBGoveeSettingsPage/OpenRGBGoveeSettingsEntry.h b/qt/OpenRGBGoveeSettingsPage/OpenRGBGoveeSettingsEntry.h index 6619a485..1d9b7b43 100644 --- a/qt/OpenRGBGoveeSettingsPage/OpenRGBGoveeSettingsEntry.h +++ b/qt/OpenRGBGoveeSettingsPage/OpenRGBGoveeSettingsEntry.h @@ -11,10 +11,7 @@ #pragma once -#include -#include "nlohmann/json.hpp" - -using json = nlohmann::json; +#include "BaseManualDeviceEntry.h" namespace Ui { @@ -22,7 +19,7 @@ namespace Ui class OpenRGBGoveeSettingsEntryUi; } -class Ui::OpenRGBGoveeSettingsEntry : public QWidget +class Ui::OpenRGBGoveeSettingsEntry : public BaseManualDeviceEntry { Q_OBJECT diff --git a/qt/OpenRGBKasaSmartSettingsPage/OpenRGBKasaSmartSettingsEntry.cpp b/qt/OpenRGBKasaSmartSettingsPage/OpenRGBKasaSmartSettingsEntry.cpp index e4970570..1b803461 100644 --- a/qt/OpenRGBKasaSmartSettingsPage/OpenRGBKasaSmartSettingsEntry.cpp +++ b/qt/OpenRGBKasaSmartSettingsPage/OpenRGBKasaSmartSettingsEntry.cpp @@ -13,7 +13,7 @@ using namespace Ui; OpenRGBKasaSmartSettingsEntry::OpenRGBKasaSmartSettingsEntry(QWidget *parent) : - QWidget(parent), + BaseManualDeviceEntry(parent), ui(new Ui::OpenRGBKasaSmartSettingsEntryUi) { ui->setupUi(this); diff --git a/qt/OpenRGBKasaSmartSettingsPage/OpenRGBKasaSmartSettingsEntry.h b/qt/OpenRGBKasaSmartSettingsPage/OpenRGBKasaSmartSettingsEntry.h index ea2993af..2b7f66a6 100644 --- a/qt/OpenRGBKasaSmartSettingsPage/OpenRGBKasaSmartSettingsEntry.h +++ b/qt/OpenRGBKasaSmartSettingsPage/OpenRGBKasaSmartSettingsEntry.h @@ -9,11 +9,7 @@ #pragma once -#include -#include -#include "nlohmann/json.hpp" - -using json = nlohmann::json; +#include "BaseManualDeviceEntry.h" namespace Ui { @@ -21,7 +17,7 @@ namespace Ui class OpenRGBKasaSmartSettingsEntryUi; } -class Ui::OpenRGBKasaSmartSettingsEntry : public QWidget +class Ui::OpenRGBKasaSmartSettingsEntry : public BaseManualDeviceEntry { Q_OBJECT diff --git a/qt/OpenRGBLIFXSettingsPage/OpenRGBLIFXSettingsEntry.cpp b/qt/OpenRGBLIFXSettingsPage/OpenRGBLIFXSettingsEntry.cpp index d19f7f86..0b7a1354 100644 --- a/qt/OpenRGBLIFXSettingsPage/OpenRGBLIFXSettingsEntry.cpp +++ b/qt/OpenRGBLIFXSettingsPage/OpenRGBLIFXSettingsEntry.cpp @@ -13,7 +13,7 @@ using namespace Ui; OpenRGBLIFXSettingsEntry::OpenRGBLIFXSettingsEntry(QWidget *parent) : - QWidget(parent), + BaseManualDeviceEntry(parent), ui(new Ui::OpenRGBLIFXSettingsEntryUi) { ui->setupUi(this); diff --git a/qt/OpenRGBLIFXSettingsPage/OpenRGBLIFXSettingsEntry.h b/qt/OpenRGBLIFXSettingsPage/OpenRGBLIFXSettingsEntry.h index 2db6eca4..a6fd5604 100644 --- a/qt/OpenRGBLIFXSettingsPage/OpenRGBLIFXSettingsEntry.h +++ b/qt/OpenRGBLIFXSettingsPage/OpenRGBLIFXSettingsEntry.h @@ -7,10 +7,7 @@ | SPDX-License-Identifier: GPL-2.0-only | \*---------------------------------------------------------*/ -#include -#include "nlohmann/json.hpp" - -using json = nlohmann::json; +#include "BaseManualDeviceEntry.h" namespace Ui { @@ -18,7 +15,7 @@ namespace Ui class OpenRGBLIFXSettingsEntryUi; } -class Ui::OpenRGBLIFXSettingsEntry : public QWidget +class Ui::OpenRGBLIFXSettingsEntry : public BaseManualDeviceEntry { Q_OBJECT diff --git a/qt/OpenRGBNanoleafSettingsPage/OpenRGBNanoleafSettingsEntry.cpp b/qt/OpenRGBNanoleafSettingsPage/OpenRGBNanoleafSettingsEntry.cpp index 9bc7ba4f..2e12f528 100644 --- a/qt/OpenRGBNanoleafSettingsPage/OpenRGBNanoleafSettingsEntry.cpp +++ b/qt/OpenRGBNanoleafSettingsPage/OpenRGBNanoleafSettingsEntry.cpp @@ -17,7 +17,7 @@ using namespace Ui; OpenRGBNanoleafSettingsEntry::OpenRGBNanoleafSettingsEntry(QWidget *parent) : - QWidget(parent), + BaseManualDeviceEntry(parent), ui(new Ui::OpenRGBNanoleafSettingsEntryUi), paired(false) { diff --git a/qt/OpenRGBNanoleafSettingsPage/OpenRGBNanoleafSettingsEntry.h b/qt/OpenRGBNanoleafSettingsPage/OpenRGBNanoleafSettingsEntry.h index fc5ad035..615be359 100644 --- a/qt/OpenRGBNanoleafSettingsPage/OpenRGBNanoleafSettingsEntry.h +++ b/qt/OpenRGBNanoleafSettingsPage/OpenRGBNanoleafSettingsEntry.h @@ -9,12 +9,9 @@ #pragma once -#include +#include "BaseManualDeviceEntry.h" #include "ui_OpenRGBNanoleafSettingsEntry.h" #include "OpenRGBNanoleafScanningThread.h" -#include "nlohmann/json.hpp" - -using json = nlohmann::json; namespace Ui { @@ -22,7 +19,7 @@ namespace Ui class OpenRGBNanoleafSettingsEntryUi; } -class Ui::OpenRGBNanoleafSettingsEntry : public QWidget +class Ui::OpenRGBNanoleafSettingsEntry : public BaseManualDeviceEntry { Q_OBJECT diff --git a/qt/OpenRGBPhilipsHueSettingsPage/OpenRGBPhilipsHueSettingsEntry.cpp b/qt/OpenRGBPhilipsHueSettingsPage/OpenRGBPhilipsHueSettingsEntry.cpp index 7bb1eb4a..7fc7f713 100644 --- a/qt/OpenRGBPhilipsHueSettingsPage/OpenRGBPhilipsHueSettingsEntry.cpp +++ b/qt/OpenRGBPhilipsHueSettingsPage/OpenRGBPhilipsHueSettingsEntry.cpp @@ -13,7 +13,7 @@ using namespace Ui; OpenRGBPhilipsHueSettingsEntry::OpenRGBPhilipsHueSettingsEntry(QWidget *parent) : - QWidget(parent), + BaseManualDeviceEntry(parent), ui(new Ui::OpenRGBPhilipsHueSettingsEntryUi) { ui->setupUi(this); diff --git a/qt/OpenRGBPhilipsHueSettingsPage/OpenRGBPhilipsHueSettingsEntry.h b/qt/OpenRGBPhilipsHueSettingsPage/OpenRGBPhilipsHueSettingsEntry.h index a4ea5133..40579ddf 100644 --- a/qt/OpenRGBPhilipsHueSettingsPage/OpenRGBPhilipsHueSettingsEntry.h +++ b/qt/OpenRGBPhilipsHueSettingsPage/OpenRGBPhilipsHueSettingsEntry.h @@ -9,10 +9,7 @@ #pragma once -#include -#include "nlohmann/json.hpp" - -using json = nlohmann::json; +#include "BaseManualDeviceEntry.h" namespace Ui { @@ -20,7 +17,7 @@ namespace Ui class OpenRGBPhilipsHueSettingsEntryUi; } -class Ui::OpenRGBPhilipsHueSettingsEntry : public QWidget +class Ui::OpenRGBPhilipsHueSettingsEntry : public BaseManualDeviceEntry { Q_OBJECT diff --git a/qt/OpenRGBPhilipsWizSettingsPage/OpenRGBPhilipsWizSettingsEntry.cpp b/qt/OpenRGBPhilipsWizSettingsPage/OpenRGBPhilipsWizSettingsEntry.cpp index 974c8165..245ff2c0 100644 --- a/qt/OpenRGBPhilipsWizSettingsPage/OpenRGBPhilipsWizSettingsEntry.cpp +++ b/qt/OpenRGBPhilipsWizSettingsPage/OpenRGBPhilipsWizSettingsEntry.cpp @@ -13,7 +13,7 @@ using namespace Ui; OpenRGBPhilipsWizSettingsEntry::OpenRGBPhilipsWizSettingsEntry(QWidget *parent) : - QWidget(parent), + BaseManualDeviceEntry(parent), ui(new Ui::OpenRGBPhilipsWizSettingsEntryUi) { ui->setupUi(this); diff --git a/qt/OpenRGBPhilipsWizSettingsPage/OpenRGBPhilipsWizSettingsEntry.h b/qt/OpenRGBPhilipsWizSettingsPage/OpenRGBPhilipsWizSettingsEntry.h index d3600786..bb76fc4d 100644 --- a/qt/OpenRGBPhilipsWizSettingsPage/OpenRGBPhilipsWizSettingsEntry.h +++ b/qt/OpenRGBPhilipsWizSettingsPage/OpenRGBPhilipsWizSettingsEntry.h @@ -9,10 +9,7 @@ #pragma once -#include -#include "nlohmann/json.hpp" - -using json = nlohmann::json; +#include "BaseManualDeviceEntry.h" namespace Ui { @@ -20,7 +17,7 @@ namespace Ui class OpenRGBPhilipsWizSettingsEntryUi; } -class Ui::OpenRGBPhilipsWizSettingsEntry : public QWidget +class Ui::OpenRGBPhilipsWizSettingsEntry : public BaseManualDeviceEntry { Q_OBJECT diff --git a/qt/OpenRGBQMKORGBSettingsPage/OpenRGBQMKORGBSettingsEntry.cpp b/qt/OpenRGBQMKORGBSettingsPage/OpenRGBQMKORGBSettingsEntry.cpp index 620372c9..e50126ec 100644 --- a/qt/OpenRGBQMKORGBSettingsPage/OpenRGBQMKORGBSettingsEntry.cpp +++ b/qt/OpenRGBQMKORGBSettingsPage/OpenRGBQMKORGBSettingsEntry.cpp @@ -13,7 +13,7 @@ using namespace Ui; OpenRGBQMKORGBSettingsEntry::OpenRGBQMKORGBSettingsEntry(QWidget *parent) : - QWidget(parent), + BaseManualDeviceEntry(parent), ui(new Ui::OpenRGBQMKORGBSettingsEntryUi) { ui->setupUi(this); diff --git a/qt/OpenRGBQMKORGBSettingsPage/OpenRGBQMKORGBSettingsEntry.h b/qt/OpenRGBQMKORGBSettingsPage/OpenRGBQMKORGBSettingsEntry.h index 40c16249..c04b0e35 100644 --- a/qt/OpenRGBQMKORGBSettingsPage/OpenRGBQMKORGBSettingsEntry.h +++ b/qt/OpenRGBQMKORGBSettingsPage/OpenRGBQMKORGBSettingsEntry.h @@ -9,10 +9,7 @@ #pragma once -#include -#include "nlohmann/json.hpp" - -using json = nlohmann::json; +#include "BaseManualDeviceEntry.h" namespace Ui { @@ -20,7 +17,7 @@ namespace Ui class OpenRGBQMKORGBSettingsEntryUi; } -class Ui::OpenRGBQMKORGBSettingsEntry : public QWidget +class Ui::OpenRGBQMKORGBSettingsEntry : public BaseManualDeviceEntry { Q_OBJECT diff --git a/qt/OpenRGBSerialSettingsPage/OpenRGBSerialSettingsEntry.cpp b/qt/OpenRGBSerialSettingsPage/OpenRGBSerialSettingsEntry.cpp index 82a30d9b..4640837e 100644 --- a/qt/OpenRGBSerialSettingsPage/OpenRGBSerialSettingsEntry.cpp +++ b/qt/OpenRGBSerialSettingsPage/OpenRGBSerialSettingsEntry.cpp @@ -13,7 +13,7 @@ using namespace Ui; OpenRGBSerialSettingsEntry::OpenRGBSerialSettingsEntry(QWidget *parent) : - QWidget(parent), + BaseManualDeviceEntry(parent), ui(new Ui::OpenRGBSerialSettingsEntryUi) { ui->setupUi(this); diff --git a/qt/OpenRGBSerialSettingsPage/OpenRGBSerialSettingsEntry.h b/qt/OpenRGBSerialSettingsPage/OpenRGBSerialSettingsEntry.h index 0ef85f8c..a8fce419 100644 --- a/qt/OpenRGBSerialSettingsPage/OpenRGBSerialSettingsEntry.h +++ b/qt/OpenRGBSerialSettingsPage/OpenRGBSerialSettingsEntry.h @@ -9,10 +9,7 @@ #pragma once -#include -#include "nlohmann/json.hpp" - -using json = nlohmann::json; +#include "BaseManualDeviceEntry.h" namespace Ui { @@ -20,7 +17,7 @@ namespace Ui class OpenRGBSerialSettingsEntryUi; } -class Ui::OpenRGBSerialSettingsEntry : public QWidget +class Ui::OpenRGBSerialSettingsEntry : public BaseManualDeviceEntry { Q_OBJECT diff --git a/qt/OpenRGBYeelightSettingsPage/OpenRGBYeelightSettingsEntry.cpp b/qt/OpenRGBYeelightSettingsPage/OpenRGBYeelightSettingsEntry.cpp index 86c3644b..499e4d06 100644 --- a/qt/OpenRGBYeelightSettingsPage/OpenRGBYeelightSettingsEntry.cpp +++ b/qt/OpenRGBYeelightSettingsPage/OpenRGBYeelightSettingsEntry.cpp @@ -15,7 +15,7 @@ using namespace Ui; OpenRGBYeelightSettingsEntry::OpenRGBYeelightSettingsEntry(QWidget *parent) : - QWidget(parent), + BaseManualDeviceEntry(parent), ui(new Ui::OpenRGBYeelightSettingsEntryUi) { ui->setupUi(this); diff --git a/qt/OpenRGBYeelightSettingsPage/OpenRGBYeelightSettingsEntry.h b/qt/OpenRGBYeelightSettingsPage/OpenRGBYeelightSettingsEntry.h index ea71ce8d..135f3a2f 100644 --- a/qt/OpenRGBYeelightSettingsPage/OpenRGBYeelightSettingsEntry.h +++ b/qt/OpenRGBYeelightSettingsPage/OpenRGBYeelightSettingsEntry.h @@ -9,10 +9,7 @@ #pragma once -#include -#include "nlohmann/json.hpp" - -using json = nlohmann::json; +#include "BaseManualDeviceEntry.h" namespace Ui { @@ -20,7 +17,7 @@ namespace Ui class OpenRGBYeelightSettingsEntryUi; } -class Ui::OpenRGBYeelightSettingsEntry : public QWidget +class Ui::OpenRGBYeelightSettingsEntry : public BaseManualDeviceEntry { Q_OBJECT