make PartWidgetBase a QWidget

svn path=/trunk/extragear/sysadmin/partitionmanager/; revision=1114049

src/gui/parttablewidget.cpp

@@ -31,8 +31,7 @@
 	@param parent pointer to the parent widget
 */
 PartTableWidget::PartTableWidget(QWidget* parent) :
-	QWidget(parent),
+	PartWidgetBase(parent),
-	PartWidgetBase(),
 	m_PartitionTable(NULL),
 	m_LabelEmpty(i18nc("@info", "Please select a device."), this),
 	m_ReadOnly(false)

src/gui/parttablewidget.h

@@ -23,7 +23,6 @@
 
 #include "gui/partwidgetbase.h"
 
-#include <QWidget>
 #include <QList>
 #include <QLabel>
 
@@ -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)

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(parent),
-	PartWidgetBase(),
 	m_Partition(p),
 	m_Active(false)
 {

src/gui/partwidget.h

@@ -25,8 +25,6 @@
 
 #include <kdebug.h>
 
-#include <QWidget>
-
 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
 

src/gui/partwidgetbase.h

@@ -24,6 +24,7 @@
 #include "core/partitionnode.h"
 
 #include <QList>
+#include <QWidget>
 
 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: