From 5b20f58c19fb7473785452a11187321a579cc7c1 Mon Sep 17 00:00:00 2001
From: Volker Hilsheimer <volker.hilsheimer@qt.io>
Date: Wed, 30 Oct 2019 14:17:32 +0100
Subject: Unify QFSFileEngine implementations on Windows and Unix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The functions for standard file system operations simply delegate to
the static functions in QFileSystemEngine, which are then implemented
separately for each platform. There is no need for the wrappers in
QFSFileEngine to be separately implemented as well.

The only noticeable difference between Unix and Windows versions was
the clearing of the meta data in QFSFileEngine::remove, which was only
done on Unix. This is now also done on Windows.

As a fly-by fix, correct the (internal only) documentation about case
sensitivity.

Change-Id: I274b34d5407fdfff2e0a2157bb5220607740a92a
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
---
 src/corelib/io/qfsfileengine_unix.cpp | 77 -----------------------------------
 1 file changed, 77 deletions(-)

(limited to 'src/corelib/io/qfsfileengine_unix.cpp')

diff --git a/src/corelib/io/qfsfileengine_unix.cpp b/src/corelib/io/qfsfileengine_unix.cpp
index d4983c72af..4610e9306c 100644
--- a/src/corelib/io/qfsfileengine_unix.cpp
+++ b/src/corelib/io/qfsfileengine_unix.cpp
@@ -304,54 +304,6 @@ bool QFSFileEnginePrivate::nativeIsSequential() const
     return isSequentialFdFh();
 }
 
-bool QFSFileEngine::remove()
-{
-    Q_D(QFSFileEngine);
-    QSystemError error;
-    bool ret = QFileSystemEngine::removeFile(d->fileEntry, error);
-    d->metaData.clear();
-    if (!ret) {
-        setError(QFile::RemoveError, error.toString());
-    }
-    return ret;
-}
-
-bool QFSFileEngine::copy(const QString &newName)
-{
-    Q_D(QFSFileEngine);
-    QSystemError error;
-    bool ret = QFileSystemEngine::copyFile(d->fileEntry, QFileSystemEntry(newName), error);
-    if (!ret) {
-        setError(QFile::CopyError, error.toString());
-    }
-    return ret;
-}
-
-bool QFSFileEngine::renameOverwrite(const QString &newName)
-{
-    Q_D(QFSFileEngine);
-    QSystemError error;
-    bool ret = QFileSystemEngine::renameOverwriteFile(d->fileEntry, QFileSystemEntry(newName), error);
-
-    if (!ret)
-        setError(QFile::RenameError, error.toString());
-
-    return ret;
-}
-
-bool QFSFileEngine::rename(const QString &newName)
-{
-    Q_D(QFSFileEngine);
-    QSystemError error;
-    bool ret = QFileSystemEngine::renameFile(d->fileEntry, QFileSystemEntry(newName), error);
-
-    if (!ret) {
-        setError(QFile::RenameError, error.toString());
-    }
-
-    return ret;
-}
-
 bool QFSFileEngine::link(const QString &newName)
 {
     Q_D(QFSFileEngine);
@@ -368,45 +320,16 @@ qint64 QFSFileEnginePrivate::nativeSize() const
     return sizeFdFh();
 }
 
-bool QFSFileEngine::mkdir(const QString &name, bool createParentDirectories) const
-{
-    return QFileSystemEngine::createDirectory(QFileSystemEntry(name), createParentDirectories);
-}
-
-bool QFSFileEngine::rmdir(const QString &name, bool recurseParentDirectories) const
-{
-    return QFileSystemEngine::removeDirectory(QFileSystemEntry(name), recurseParentDirectories);
-}
-
 bool QFSFileEngine::caseSensitive() const
 {
     return true;
 }
 
-bool QFSFileEngine::setCurrentPath(const QString &path)
-{
-    return QFileSystemEngine::setCurrentPath(QFileSystemEntry(path));
-}
-
 QString QFSFileEngine::currentPath(const QString &)
 {
     return QFileSystemEngine::currentPath().filePath();
 }
 
-QString QFSFileEngine::homePath()
-{
-    return QFileSystemEngine::homePath();
-}
-
-QString QFSFileEngine::rootPath()
-{
-    return QFileSystemEngine::rootPath();
-}
-
-QString QFSFileEngine::tempPath()
-{
-    return QFileSystemEngine::tempPath();
-}
 
 QFileInfoList QFSFileEngine::drives()
 {
-- 
cgit v1.2.3