diff options
| author | Prasanth Ullattil <prasanth.ullattil@nokia.com> | 2010-08-25 14:35:10 +0200 |
|---|---|---|
| committer | João Abecasis <joao.abecasis@nokia.com> | 2010-09-07 14:16:59 +0200 |
| commit | f3c3b63764f50151f373ff280bd4b77093b371db (patch) | |
| tree | 78ebe230c404d81a6329a30607426dce3e9d8b50 /src/corelib/io/qfileinfo.h | |
| parent | 960444ea8973fa7ca68108d253516df3abfd5f38 (diff) | |
Refactor QFileInfoPrivate::Data (Round 2)
The QFileInfoPrivate::Data member class is removed now. All the methods
moved to QFileInfoPrivate. QFileInfoPrivate becomes a QSharedData type.
Reviewed-by: Joao
Diffstat (limited to 'src/corelib/io/qfileinfo.h')
| -rw-r--r-- | src/corelib/io/qfileinfo.h | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/corelib/io/qfileinfo.h b/src/corelib/io/qfileinfo.h index 7e82aed843..f0128b1c56 100644 --- a/src/corelib/io/qfileinfo.h +++ b/src/corelib/io/qfileinfo.h @@ -44,7 +44,7 @@ #include <QtCore/qfile.h> #include <QtCore/qlist.h> -#include <QtCore/qscopedpointer.h> +#include <QtCore/qshareddata.h> QT_BEGIN_HEADER @@ -166,10 +166,20 @@ public: #endif protected: - QScopedPointer<QFileInfoPrivate> d_ptr; + QSharedDataPointer<QFileInfoPrivate> d_ptr; private: - Q_DECLARE_PRIVATE(QFileInfo) + inline QFileInfoPrivate* d_func() + { + detach(); + return const_cast<QFileInfoPrivate *>(d_ptr.constData()); + } + + inline const QFileInfoPrivate* d_func() const + { + return d_ptr.constData(); + } }; + Q_DECLARE_TYPEINFO(QFileInfo, Q_MOVABLE_TYPE); #ifdef QT3_SUPPORT |