Reverting QDir::detach introduced earlier

From the client API it is a broken concept, because it could leave the
user with an uninitialized file engine. Fixing to initialize the file
engine, would mean it is useless for internal use where file engines are
initialized separately.

In the end, removing both the QDir::detach introduced earlier and
throwing away the private d_func'tions altogether is a binary-compatible
change that should allow us to push this change in a patch release
(fingers crossed!)

Reviewed-by: Thiago Macieira

1 files changed, 0 insertions, 13 deletions

diff --git a/src/corelib/io/qdir.h b/src/corelib/io/qdir.h
index abfe3873c4..7e5fbac420 100644
--- a/src/corelib/io/qdir.h
+++ b/src/corelib/io/qdir.h
@@ -59,17 +59,6 @@ class Q_CORE_EXPORT QDir
 {
 protected:
     QSharedDataPointer<QDirPrivate> d_ptr;
-private:
-    inline QDirPrivate* d_func()
-    {
-        detach();
-        return const_cast<QDirPrivate *>(d_ptr.constData());
-    }
-
-    inline const QDirPrivate* d_func() const
-    {
-        return d_ptr.constData();
-    }
 
 public:
     enum Filter { Dirs        = 0x001,
@@ -140,8 +129,6 @@ public:
     QDir &operator=(const QDir &);
     QDir &operator=(const QString &path);
 
-    void detach();
-
     void setPath(const QString &path);
     QString path() const;
     QString absolutePath() const;