diff --git a/openhantek/src/docks/HorizontalDock.h b/openhantek/src/docks/HorizontalDock.h index 8e604a1..bd0586d 100644 --- a/openhantek/src/docks/HorizontalDock.h +++ b/openhantek/src/docks/HorizontalDock.h @@ -5,6 +5,7 @@ #include #include +#include #include "definitions.h" #include "settings.h" @@ -14,8 +15,8 @@ class QComboBox; class SiSpinBox; -//////////////////////////////////////////////////////////////////////////////// -/// \class HorizontalDock dockwindows.h +Q_DECLARE_METATYPE(std::vector) + /// \brief Dock window for the horizontal axis. /// It contains the settings for the timebase and the display format. class HorizontalDock : public QDockWidget { diff --git a/openhantek/src/docks/SpectrumDock.cpp b/openhantek/src/docks/SpectrumDock.cpp index fdf0a8f..23435e9 100644 --- a/openhantek/src/docks/SpectrumDock.cpp +++ b/openhantek/src/docks/SpectrumDock.cpp @@ -64,9 +64,6 @@ SpectrumDock::SpectrumDock(DsoSettings *settings, QWidget *parent, Qt::WindowFla } } -/// \brief Cleans up everything. -SpectrumDock::~SpectrumDock() {} - /// \brief Don't close the dock, just hide it /// \param event The close event that should be handled. void SpectrumDock::closeEvent(QCloseEvent *event) { diff --git a/openhantek/src/docks/SpectrumDock.h b/openhantek/src/docks/SpectrumDock.h index e8fb06f..1c13ea2 100644 --- a/openhantek/src/docks/SpectrumDock.h +++ b/openhantek/src/docks/SpectrumDock.h @@ -14,8 +14,6 @@ class QComboBox; class SiSpinBox; -//////////////////////////////////////////////////////////////////////////////// -/// \class SpectrumDock dockwindows.h /// \brief Dock window for the spectrum view. /// It contains the magnitude for all channels and allows to enable/disable the /// channels. @@ -24,7 +22,6 @@ class SpectrumDock : public QDockWidget { public: SpectrumDock(DsoSettings *settings, QWidget *parent, Qt::WindowFlags flags = 0); - ~SpectrumDock(); int setMagnitude(int channel, double magnitude); int setUsed(int channel, bool used); diff --git a/openhantek/src/docks/TriggerDock.cpp b/openhantek/src/docks/TriggerDock.cpp index 9c5b05c..25a02aa 100644 --- a/openhantek/src/docks/TriggerDock.cpp +++ b/openhantek/src/docks/TriggerDock.cpp @@ -72,9 +72,6 @@ TriggerDock::TriggerDock(DsoSettings *settings, const QStringList *specialTrigge this->setSource(settings->scope.trigger.special, settings->scope.trigger.source); } -/// \brief Cleans up everything. -TriggerDock::~TriggerDock() {} - /// \brief Don't close the dock, just hide it /// \param event The close event that should be handled. void TriggerDock::closeEvent(QCloseEvent *event) { diff --git a/openhantek/src/docks/TriggerDock.h b/openhantek/src/docks/TriggerDock.h index daf906a..ce7e914 100644 --- a/openhantek/src/docks/TriggerDock.h +++ b/openhantek/src/docks/TriggerDock.h @@ -14,8 +14,6 @@ class QComboBox; class SiSpinBox; -//////////////////////////////////////////////////////////////////////////////// -/// \class TriggerDock dockwindows.h /// \brief Dock window for the trigger settings. /// It contains the settings for the trigger mode, source and slope. class TriggerDock : public QDockWidget { @@ -23,7 +21,6 @@ class TriggerDock : public QDockWidget { public: TriggerDock(DsoSettings *settings, const QStringList *specialTriggers, QWidget *parent, Qt::WindowFlags flags = 0); - ~TriggerDock(); int setMode(Dso::TriggerMode mode); int setSource(bool special, unsigned int id); diff --git a/openhantek/src/docks/VoltageDock.cpp b/openhantek/src/docks/VoltageDock.cpp index eb97e40..239ace8 100644 --- a/openhantek/src/docks/VoltageDock.cpp +++ b/openhantek/src/docks/VoltageDock.cpp @@ -84,9 +84,6 @@ VoltageDock::VoltageDock(DsoSettings *settings, QWidget *parent, Qt::WindowFlags } } -/// \brief Cleans up everything. -VoltageDock::~VoltageDock() {} - /// \brief Don't close the dock, just hide it /// \param event The close event that should be handled. void VoltageDock::closeEvent(QCloseEvent *event) { diff --git a/openhantek/src/docks/VoltageDock.h b/openhantek/src/docks/VoltageDock.h index e4ca394..1ea618c 100644 --- a/openhantek/src/docks/VoltageDock.h +++ b/openhantek/src/docks/VoltageDock.h @@ -14,8 +14,6 @@ class QComboBox; class SiSpinBox; -//////////////////////////////////////////////////////////////////////////////// -/// \class VoltageDock dockwindows.h /// \brief Dock window for the voltage channel settings. /// It contains the settings for gain and coupling for both channels and /// allows to enable/disable the channels. @@ -24,7 +22,6 @@ class VoltageDock : public QDockWidget { public: VoltageDock(DsoSettings *settings, QWidget *parent, Qt::WindowFlags flags = 0); - ~VoltageDock(); int setCoupling(int channel, Dso::Coupling coupling); int setGain(int channel, double gain); diff --git a/openhantek/src/docks/dockwindows.cpp b/openhantek/src/docks/dockwindows.cpp index e1b9ec4..156742c 100644 --- a/openhantek/src/docks/dockwindows.cpp +++ b/openhantek/src/docks/dockwindows.cpp @@ -28,4 +28,5 @@ void registerDockMetaTypes() { qRegisterMetaType(); qRegisterMetaType(); qRegisterMetaType(); + qRegisterMetaType >(); }