diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2009-05-15 11:43:09 +0200 |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2009-05-15 11:43:24 +0200 |
| commit | 9c3f5040bc9b80619ebe167c352ac8f0394f9b41 (patch) | |
| tree | 070f0c0a315afcbe088402799886366c31308022 | |
| parent | ad679a7993042f1df8da8c2d90d325be3cf0113d (diff) | |
Cleaning bug in custom layout example.
The example was using deleteAllItems() to delete items from the layout. This method is now part of the QT3_SUPPORT and shold not be used if not needed. Replaced by deleting all items one by one.
Task-number: 220656
Rev-by: janarve
| -rw-r--r-- | doc/src/layout.qdoc | 6 | ||||
| -rw-r--r-- | doc/src/snippets/code/doc_src_layout.qdoc | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/doc/src/layout.qdoc b/doc/src/layout.qdoc index 196999be1c..d97fcfc1d2 100644 --- a/doc/src/layout.qdoc +++ b/doc/src/layout.qdoc @@ -343,9 +343,9 @@ \snippet doc/src/snippets/code/doc_src_layout.qdoc 4 The layout takes over responsibility of the items added. Since QLayoutItem - does not inherit QObject, we must delete the items manually. The function - QLayout::deleteAllItems() uses \c{takeAt()} defined above to delete all the - items in the layout. + does not inherit QObject, we must delete the items manually. In the + destructor, we remove each item from the list using \c{takeAt()}, and + then delete it. \snippet doc/src/snippets/code/doc_src_layout.qdoc 5 diff --git a/doc/src/snippets/code/doc_src_layout.qdoc b/doc/src/snippets/code/doc_src_layout.qdoc index fedcf0c04c..60f36b0b9a 100644 --- a/doc/src/snippets/code/doc_src_layout.qdoc +++ b/doc/src/snippets/code/doc_src_layout.qdoc @@ -67,7 +67,9 @@ void CardLayout::addItem(QLayoutItem *item) //! [5] CardLayout::~CardLayout() { - deleteAllItems(); + QLayoutItem *item; + while ((item = takeAt(0))) + delete item; } //! [5] @@ -121,4 +123,4 @@ QSize CardLayout::minimumSize() const } return s + n*QSize(spacing(), spacing()); } -//! [7]
\ No newline at end of file +//! [7] |