diff options
| author | Sami Merila <sami.merila@nokia.com> | 2010-02-25 15:10:18 (GMT) |
|---|---|---|
| committer | Sami Merila <sami.merila@nokia.com> | 2010-02-25 15:10:18 (GMT) |
| commit | 1b9f273c3d0e10cb14a35a9a058b379b8777b5d8 (patch) | |
| tree | 704575e93d35698f55d359c843f310d20de2dab8 /doc/src/snippets/code | |
| parent | d996f6707a8733a8d151dcad59981cbb0f2f03f1 (diff) | |
| parent | d8465414e6fd543cfc20e732030dedd8d2bc685f (diff) | |
| download | Qt-1b9f273c3d0e10cb14a35a9a058b379b8777b5d8.zip Qt-1b9f273c3d0e10cb14a35a9a058b379b8777b5d8.tar.gz Qt-1b9f273c3d0e10cb14a35a9a058b379b8777b5d8.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6
Diffstat (limited to 'doc/src/snippets/code')
| -rw-r--r-- | doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp b/doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp index c068ba9..4158388 100644 --- a/doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp +++ b/doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp @@ -128,7 +128,7 @@ private: QScopedPointer<int, QScopedPointerArrayDeleter<int> > arrayPointer(new int[42]); // this QScopedPointer frees its data using free(): -QScopedPointer<int, QScopedPointerPodDeleter<int> > podPointer(reinterpret_cast<int *>(malloc(42))); +QScopedPointer<int, QScopedPointerPodDeleter> podPointer(reinterpret_cast<int *>(malloc(42))); // this struct calls "myCustomDeallocator" to delete the pointer struct ScopedPointerCustomDeleter |