Merge remote-tracking branch 'origin/master' into api_changes

[profile/ivi/qtbase.git] / src / corelib / tools / qscopedpointer.cpp

diff --git a/src/corelib/tools/qscopedpointer.cpp b/src/corelib/tools/qscopedpointer.cpp
index a954686..5ecca89 100644 (file)
--- a/src/corelib/tools/qscopedpointer.cpp
+++ b/src/corelib/tools/qscopedpointer.cpp
@@ -1,8 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: http://www.qt-project.org/
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
@@ -35,6 +34,7 @@
 **
 **
 **
+**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -89,10 +89,10 @@ QT_BEGIN_NAMESPACE
     The following custom cleanup handlers exist:
 
     \list
-    \i QScopedPointerDeleter - the default, deletes the pointer using \c delete
-    \i QScopedPointerArrayDeleter - deletes the pointer using \c{delete []}. Use
+    \li QScopedPointerDeleter - the default, deletes the pointer using \c delete
+    \li QScopedPointerArrayDeleter - deletes the pointer using \c{delete []}. Use
        this handler for pointers that were allocated with \c{new []}.
-    \i QScopedPointerPodDeleter - deletes the pointer using \c{free()}. Use this
+    \li QScopedPointerPodDeleter - deletes the pointer using \c{free()}. Use this
        handler for pointers that were allocated with \c{malloc()}.
     \endlist