diff options
| author | David Faure <faure@kde.org> | 2009-05-20 10:45:16 (GMT) |
|---|---|---|
| committer | David Faure <faure@kde.org> | 2009-05-20 10:45:16 (GMT) |
| commit | bc21fb2449ec80da39ee3f533f8f76b2ae726f50 (patch) | |
| tree | f6f843a6ed4957eba3176a279eaa1114dca6ed7d /doc/src/snippets/code | |
| parent | 7c77f60643d14864e579eeddb95ec54c8c963fd9 (diff) | |
| parent | e9dec649afc2e513354c79f6e38ca53b6943cccc (diff) | |
| download | Qt-bc21fb2449ec80da39ee3f533f8f76b2ae726f50.zip Qt-bc21fb2449ec80da39ee3f533f8f76b2ae726f50.tar.gz Qt-bc21fb2449ec80da39ee3f533f8f76b2ae726f50.tar.bz2 | |
Merge branch 'master' of git://gitorious.org/qt/qt
Diffstat (limited to 'doc/src/snippets/code')
| -rw-r--r-- | doc/src/snippets/code/doc_src_layout.qdoc | 6 | ||||
| -rw-r--r-- | doc/src/snippets/code/src_gui_image_qpixmapcache.cpp | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/doc/src/snippets/code/doc_src_layout.qdoc b/doc/src/snippets/code/doc_src_layout.qdoc index fedcf0c..60f36b0 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] diff --git a/doc/src/snippets/code/src_gui_image_qpixmapcache.cpp b/doc/src/snippets/code/src_gui_image_qpixmapcache.cpp index c4b6353..2a04f64 100644 --- a/doc/src/snippets/code/src_gui_image_qpixmapcache.cpp +++ b/doc/src/snippets/code/src_gui_image_qpixmapcache.cpp @@ -13,7 +13,7 @@ painter->drawPixmap(0, 0, p); //! [1] QPixmap pm; -if (!QPixmapCache::find("my_big_image", pm)) { +if (!QPixmapCache::find("my_big_image", &pm)) { pm.load("bigimage.png"); QPixmapCache::insert("my_big_image", pm); } |