We forgot to change the VARIANT on X3!

This commit is contained in:
Bertrand Songis
2019-05-09 11:13:04 +02:00
parent f6a0db16e7
commit 2784caf10d
8 changed files with 357 additions and 12 deletions
+21 -8
View File
@@ -47,7 +47,7 @@ class SimulatedUIWidget : public QWidget
protected:
explicit SimulatedUIWidget(SimulatorInterface * simulator, QWidget * parent = NULL);
explicit SimulatedUIWidget(SimulatorInterface * simulator, QWidget * parent = nullptr);
public:
@@ -104,6 +104,7 @@ class SimulatedUIWidget : public QWidget
// Each subclass is responsible for its own Ui
namespace Ui {
class SimulatedUIWidget9X;
class SimulatedUIWidgetX3;
class SimulatedUIWidgetX7;
class SimulatedUIWidgetX9;
class SimulatedUIWidgetXLITE;
@@ -117,7 +118,7 @@ class SimulatedUIWidget9X: public SimulatedUIWidget
Q_OBJECT
public:
explicit SimulatedUIWidget9X(SimulatorInterface * simulator, QWidget * parent = NULL);
explicit SimulatedUIWidget9X(SimulatorInterface * simulator, QWidget * parent = nullptr);
virtual ~SimulatedUIWidget9X();
protected:
@@ -128,12 +129,24 @@ class SimulatedUIWidget9X: public SimulatedUIWidget
};
class SimulatedUIWidgetX3: public SimulatedUIWidget
{
Q_OBJECT
public:
explicit SimulatedUIWidgetX3(SimulatorInterface * simulator, QWidget * parent = nullptr);
virtual ~SimulatedUIWidgetX3();
private:
Ui::SimulatedUIWidgetX3 * ui;
};
class SimulatedUIWidgetX7: public SimulatedUIWidget
{
Q_OBJECT
public:
explicit SimulatedUIWidgetX7(SimulatorInterface * simulator, QWidget * parent = NULL);
explicit SimulatedUIWidgetX7(SimulatorInterface * simulator, QWidget * parent = nullptr);
virtual ~SimulatedUIWidgetX7();
private:
@@ -145,7 +158,7 @@ class SimulatedUIWidgetX9: public SimulatedUIWidget
Q_OBJECT
public:
explicit SimulatedUIWidgetX9(SimulatorInterface * simulator, QWidget * parent = NULL);
explicit SimulatedUIWidgetX9(SimulatorInterface * simulator, QWidget * parent = nullptr);
virtual ~SimulatedUIWidgetX9();
private:
@@ -157,7 +170,7 @@ class SimulatedUIWidgetXLITE: public SimulatedUIWidget
Q_OBJECT
public:
explicit SimulatedUIWidgetXLITE(SimulatorInterface * simulator, QWidget * parent = NULL);
explicit SimulatedUIWidgetXLITE(SimulatorInterface * simulator, QWidget * parent = nullptr);
virtual ~SimulatedUIWidgetXLITE();
private:
@@ -169,7 +182,7 @@ class SimulatedUIWidgetX9E: public SimulatedUIWidget
Q_OBJECT
public:
explicit SimulatedUIWidgetX9E(SimulatorInterface * simulator, QWidget * parent = NULL);
explicit SimulatedUIWidgetX9E(SimulatorInterface * simulator, QWidget * parent = nullptr);
virtual ~SimulatedUIWidgetX9E();
private:
@@ -181,7 +194,7 @@ class SimulatedUIWidgetX10: public SimulatedUIWidget
Q_OBJECT
public:
explicit SimulatedUIWidgetX10(SimulatorInterface * simulator, QWidget * parent = NULL);
explicit SimulatedUIWidgetX10(SimulatorInterface * simulator, QWidget * parent = nullptr);
virtual ~SimulatedUIWidgetX10();
private:
@@ -193,7 +206,7 @@ class SimulatedUIWidgetX12: public SimulatedUIWidget
Q_OBJECT
public:
explicit SimulatedUIWidgetX12(SimulatorInterface * simulator, QWidget * parent = NULL);
explicit SimulatedUIWidgetX12(SimulatorInterface * simulator, QWidget * parent = nullptr);
virtual ~SimulatedUIWidgetX12();
private: