summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-08-28 15:57:42 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-08-28 15:57:55 (GMT)
commit31affef31b3743a23cf6f099d6a8f72b371586b4 (patch)
tree2083c23d547ae703df66441e1cb7c03ed9849374 /src/corelib
parent7621eec3fb023c7e477080b57c0aba858627091b (diff)
downloadQt-31affef31b3743a23cf6f099d6a8f72b371586b4.zip
Qt-31affef31b3743a23cf6f099d6a8f72b371586b4.tar.gz
Qt-31affef31b3743a23cf6f099d6a8f72b371586b4.tar.bz2
Mark the QSharedPointer with Qt::Uninitialized explicit
That ensures we don't create ambiguities. QSharedPointer shouldn't have any implicit constructors. Suggested-By: Olivier Goffart
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/tools/qsharedpointer_impl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h
index 90ca34f..e4f7ba9 100644
--- a/src/corelib/tools/qsharedpointer_impl.h
+++ b/src/corelib/tools/qsharedpointer_impl.h
@@ -511,7 +511,7 @@ public:
QWeakPointer<T> toWeakRef() const;
protected:
- inline QSharedPointer(Qt::Initialization i) : BaseClass(i) {}
+ inline explicit QSharedPointer(Qt::Initialization i) : BaseClass(i) {}
public:
static inline QSharedPointer<T> create()