diff options
| author | Jesus Sanchez-Palencia <jesus.palencia@openbossa.org> | 2009-05-28 20:20:36 (GMT) |
|---|---|---|
| committer | Eduardo M. Fleury <eduardo.fleury@openbossa.org> | 2009-07-22 18:04:00 (GMT) |
| commit | 2f002ef720412dc834daac46843d1439dc49680f (patch) | |
| tree | e39f4892450004ace4f097be97b36ba1c2465677 | |
| parent | 0b0fd15c04486ad098d93e2cbedc23497f3ec110 (diff) | |
| download | Qt-2f002ef720412dc834daac46843d1439dc49680f.zip Qt-2f002ef720412dc834daac46843d1439dc49680f.tar.gz Qt-2f002ef720412dc834daac46843d1439dc49680f.tar.bz2 | |
QGraphicsAnchorLayout: Making private class inherit from QGraphicsLayoutPrivate
Signed-off-by: Jesus Sanchez-Palencia <jesus.palencia@openbossa.org>
| -rw-r--r-- | src/gui/graphicsview/qgraphicsanchorlayout.cpp | 8 | ||||
| -rw-r--r-- | src/gui/graphicsview/qgraphicsanchorlayout.h | 1 | ||||
| -rw-r--r-- | src/gui/graphicsview/qgraphicsanchorlayout_p.h | 4 |
3 files changed, 5 insertions, 8 deletions
diff --git a/src/gui/graphicsview/qgraphicsanchorlayout.cpp b/src/gui/graphicsview/qgraphicsanchorlayout.cpp index d737e36..d91b4ab 100644 --- a/src/gui/graphicsview/qgraphicsanchorlayout.cpp +++ b/src/gui/graphicsview/qgraphicsanchorlayout.cpp @@ -42,12 +42,10 @@ #include "qgraphicsanchorlayout_p.h" QGraphicsAnchorLayout::QGraphicsAnchorLayout(QGraphicsLayoutItem *parent) - : QGraphicsLayout(parent), d_ptr(new QGraphicsAnchorLayoutPrivate()) + : QGraphicsLayout(*new QGraphicsAnchorLayoutPrivate(), parent) { - // ### REMOVE THAT - d_ptr->q_ptr = this; - - d_ptr->createLayoutEdges(); + Q_D(QGraphicsAnchorLayout); + d->createLayoutEdges(); } QGraphicsAnchorLayout::~QGraphicsAnchorLayout() diff --git a/src/gui/graphicsview/qgraphicsanchorlayout.h b/src/gui/graphicsview/qgraphicsanchorlayout.h index 288aec1..2093b15 100644 --- a/src/gui/graphicsview/qgraphicsanchorlayout.h +++ b/src/gui/graphicsview/qgraphicsanchorlayout.h @@ -89,7 +89,6 @@ public: ///////// DEBUG ///////// void dumpGraph(); - QGraphicsAnchorLayoutPrivate *d_ptr; //### TO REMOVE protected: private: diff --git a/src/gui/graphicsview/qgraphicsanchorlayout_p.h b/src/gui/graphicsview/qgraphicsanchorlayout_p.h index e8f5783..65315fb 100644 --- a/src/gui/graphicsview/qgraphicsanchorlayout_p.h +++ b/src/gui/graphicsview/qgraphicsanchorlayout_p.h @@ -41,6 +41,7 @@ #include <QGraphicsWidget> +#include "qgraphicslayout_p.h" #include "qgraphicsanchorlayout.h" #include "qgraph_p.h" #include "qsimplex_p.h" @@ -196,10 +197,9 @@ public: QGraphicsAnchorLayout private methods and attributes. */ -class QGraphicsAnchorLayoutPrivate +class QGraphicsAnchorLayoutPrivate : public QGraphicsLayoutPrivate { Q_DECLARE_PUBLIC(QGraphicsAnchorLayout) - QGraphicsAnchorLayout *q_ptr; public: // When the layout geometry is different from its Minimum, Preferred |