From 9848c8b92c70006e55a7fa569d06d62efaf5ccc1 Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@kdab.com>
Date: Mon, 5 Mar 2012 18:27:10 +0100
Subject: QDirIterator: don't inherit from QDir

Remove the inheritance hack used in
QDirIterator to gain access to QDir's
d-pointer by simply making QDirIterator
a friend of QDir.

This allows to turn QDir into a final class.

Change-Id: I97efef8714bb194d62b9fe5192ce240a90f2bf97
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/corelib/io/qdir.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/corelib/io/qdir.h')

diff --git a/src/corelib/io/qdir.h b/src/corelib/io/qdir.h
index 5551ecd2fb..a5105fe2fb 100644
--- a/src/corelib/io/qdir.h
+++ b/src/corelib/io/qdir.h
@@ -52,6 +52,7 @@ QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 
+class QDirIterator;
 class QDirPrivate;
 
 class Q_CORE_EXPORT QDir
@@ -210,6 +211,7 @@ protected:
     QSharedDataPointer<QDirPrivate> d_ptr;
 
 private:
+    friend class QDirIterator;
     // Q_DECLARE_PRIVATE equivalent for shared data pointers
     QDirPrivate* d_func();
     inline const QDirPrivate* d_func() const
-- 
cgit v1.2.1