Global Functions now integrated inside Companion - Fixes #502

This commit is contained in:
bsongis
2014-09-18 15:32:55 +02:00
parent 343e395652
commit ef7bbea285
45 changed files with 685 additions and 687 deletions
+6 -10
View File
@@ -11,15 +11,11 @@ namespace Ui {
class GeneralPanel : public GenericPanel
{
Q_OBJECT
public:
GeneralPanel(QWidget *parent, GeneralSettings & generalSettings, FirmwareInterface * firmware);
virtual ~GeneralPanel();
protected:
GeneralSettings & generalSettings;
FirmwareInterface * firmware;
GeneralPanel(QWidget *parent, GeneralSettings & generalSettings, FirmwareInterface * firmware):
GenericPanel(parent, NULL, generalSettings, firmware)
{
}
};
class GeneralEdit : public QDialog
@@ -52,8 +48,8 @@ class GeneralEdit : public QDialog
private:
FirmwareInterface * firmware;
QVector<GeneralPanel *> panels;
void addTab(GeneralPanel *panel, QString text);
QVector<GenericPanel *> panels;
void addTab(GenericPanel *panel, QString text);
};