diff --git a/src/gui/parttablewidget.cpp b/src/gui/parttablewidget.cpp index 9d3c70c..c8320f7 100644 --- a/src/gui/parttablewidget.cpp +++ b/src/gui/parttablewidget.cpp @@ -31,8 +31,7 @@ @param parent pointer to the parent widget */ PartTableWidget::PartTableWidget(QWidget* parent) : - QWidget(parent), - PartWidgetBase(), + PartWidgetBase(parent), m_PartitionTable(NULL), m_LabelEmpty(i18nc("@info", "Please select a device."), this), m_ReadOnly(false) diff --git a/src/gui/parttablewidget.h b/src/gui/parttablewidget.h index 96b3337..58146e4 100644 --- a/src/gui/parttablewidget.h +++ b/src/gui/parttablewidget.h @@ -23,7 +23,6 @@ #include "gui/partwidgetbase.h" -#include #include #include @@ -36,7 +35,7 @@ class QMouseEvent; /** @brief Widget that represents a PartitionTable. @author vl@fidra.de */ -class PartTableWidget : public QWidget, public PartWidgetBase +class PartTableWidget : public PartWidgetBase { Q_OBJECT Q_DISABLE_COPY(PartTableWidget) diff --git a/src/gui/partwidget.cpp b/src/gui/partwidget.cpp index 5e43b49..509a166 100644 --- a/src/gui/partwidget.cpp +++ b/src/gui/partwidget.cpp @@ -37,8 +37,7 @@ @param p pointer to the Partition this widget will show. must not be NULL. */ PartWidget::PartWidget(QWidget* parent, const Partition* p) : - QWidget(parent), - PartWidgetBase(), + PartWidgetBase(parent), m_Partition(p), m_Active(false) { diff --git a/src/gui/partwidget.h b/src/gui/partwidget.h index 0434c48..b4eb79f 100644 --- a/src/gui/partwidget.h +++ b/src/gui/partwidget.h @@ -25,8 +25,6 @@ #include -#include - class Partition; class QPaintEvent; @@ -38,7 +36,7 @@ class QResizeEvent; @author vl@fidra.de */ -class PartWidget : public QWidget, public PartWidgetBase +class PartWidget : public PartWidgetBase { Q_OBJECT diff --git a/src/gui/partwidgetbase.h b/src/gui/partwidgetbase.h index dfa29f5..986257b 100644 --- a/src/gui/partwidgetbase.h +++ b/src/gui/partwidgetbase.h @@ -24,6 +24,7 @@ #include "core/partitionnode.h" #include +#include class Partition; class PartWidget; @@ -32,12 +33,13 @@ class QWidget; /** @brief Base class for all widgets that need to position Partitions. @author vl@fidra.de */ -class PartWidgetBase +class PartWidgetBase : public QWidget { + Q_OBJECT Q_DISABLE_COPY(PartWidgetBase) protected: - PartWidgetBase() {} + PartWidgetBase(QWidget* parent) : QWidget(parent) {} virtual ~PartWidgetBase() {} public: