get rid of unused map options

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/core/io/qabstractfileengine.cpp b/src/core/io/qabstractfileengine.cpp
index 553853d..d4c17c1 100644 (file)
--- a/src/core/io/qabstractfileengine.cpp
+++ b/src/core/io/qabstractfileengine.cpp
@@ -757,17 +757,14 @@ bool QAbstractFileEngine::atEnd() const
     MapExtensionOption. If the engine does not support this extension, 0 is
     returned.
 
-    \a flags is currently not used, but could be used in the future.
-
     \sa unmap(), supportsExtension()
  */
 
-uchar *QAbstractFileEngine::map(qint64 offset, qint64 size, QFile::MemoryMapFlags flags)
+uchar *QAbstractFileEngine::map(qint64 offset, qint64 size)
 {
     MapExtensionOption option;
     option.offset = offset;
     option.size = size;
-    option.flags = flags;
     MapExtensionReturn r;
     if (!extension(MapExtension, &option, &r))
         return 0;

diff --git a/src/core/io/qabstractfileengine.h b/src/core/io/qabstractfileengine.h
index cefcf53..280f095 100644 (file)
--- a/src/core/io/qabstractfileengine.h
+++ b/src/core/io/qabstractfileengine.h
@@ -137,7 +137,7 @@ public:
     virtual void setFileName(const QString &file);
     virtual int handle() const;
     bool atEnd() const;
-    uchar *map(qint64 offset, qint64 size, QFile::MemoryMapFlags flags);
+    uchar *map(qint64 offset, qint64 size);
     bool unmap(uchar *ptr);
 
     typedef QAbstractFileEngineIterator Iterator;
@@ -166,7 +166,6 @@ public:
     public:
         qint64 offset;
         qint64 size;
-        QFile::MemoryMapFlags flags;
     };
     class MapExtensionReturn : public ExtensionReturn {
     public:

diff --git a/src/core/io/qfile.cpp b/src/core/io/qfile.cpp
index beb4a79..d547447 100644 (file)
--- a/src/core/io/qfile.cpp
+++ b/src/core/io/qfile.cpp
@@ -1144,16 +1144,6 @@ int QFile::handle() const
 }
 
 /*!
-    \enum QFile::MemoryMapFlags
-    \since 4.4
-
-    This enum describes special options that may be used by the map()
-    function.
-
-    \value NoOptions        No options.
-*/
-
-/*!
     \since 4.4
     Maps \a size bytes of the file into memory starting at \a offset.  A file
     should be open for a map to succeed but the file does not need to stay
@@ -1161,19 +1151,17 @@ int QFile::handle() const
     or a new file is opened with this object, any maps that have not been
     unmapped will automatically be unmapped.
 
-    Any mapping options can be passed through \a flags.
-
     Returns a pointer to the memory or 0 if there is an error.
 
     \sa unmap(), QAbstractFileEngine::supportsExtension()
  */
-uchar *QFile::map(qint64 offset, qint64 size, MemoryMapFlags flags)
+uchar *QFile::map(qint64 offset, qint64 size)
 {
     Q_D(QFile);
     if (fileEngine()
             && d->fileEngine->supportsExtension(QAbstractFileEngine::MapExtension)) {
         unsetError();
-        uchar *address = d->fileEngine->map(offset, size, flags);
+        uchar *address = d->fileEngine->map(offset, size);
         if (address == 0)
             d->setError(d->fileEngine->error(), d->fileEngine->errorString());
         return address;

diff --git a/src/core/io/qfile.h b/src/core/io/qfile.h
index acd4607..0ac7a83 100644 (file)
--- a/src/core/io/qfile.h
+++ b/src/core/io/qfile.h
@@ -161,11 +161,7 @@ public:
 
     int handle() const;
 
-    enum MemoryMapFlags {
-        NoOptions = 0
-    };
-
-    uchar *map(qint64 offset, qint64 size, MemoryMapFlags flags = NoOptions);
+    uchar *map(qint64 offset, qint64 size);
     bool unmap(uchar *address);
 
     virtual QAbstractFileEngine *fileEngine() const;

diff --git a/src/core/io/qfsfileengine.cpp b/src/core/io/qfsfileengine.cpp
index 36c4f7c..89f4b91 100644 (file)
--- a/src/core/io/qfsfileengine.cpp
+++ b/src/core/io/qfsfileengine.cpp
@@ -757,7 +757,7 @@ bool QFSFileEngine::extension(Extension extension, const ExtensionOption *option
     if (extension == MapExtension) {
         const MapExtensionOption *options = (MapExtensionOption*)(option);
         MapExtensionReturn *returnValue = static_cast<MapExtensionReturn*>(output);
-        returnValue->address = d->map(options->offset, options->size, options->flags);
+        returnValue->address = d->map(options->offset, options->size);
         return (returnValue->address != 0);
     }
     if (extension == UnMapExtension) {

diff --git a/src/core/io/qfsfileengine_p.h b/src/core/io/qfsfileengine_p.h
index 68d484f..90900b6 100644 (file)
--- a/src/core/io/qfsfileengine_p.h
+++ b/src/core/io/qfsfileengine_p.h
@@ -96,7 +96,7 @@ public:
     bool nativeIsSequential() const;
     bool isSequentialFdFh() const;
 
-    uchar *map(qint64 offset, qint64 size, QFile::MemoryMapFlags flags);
+    uchar *map(qint64 offset, qint64 size);
     bool unmap(uchar *ptr);
 
     mutable QFileSystemMetaData metaData;

diff --git a/src/core/io/qfsfileengine_unix.cpp b/src/core/io/qfsfileengine_unix.cpp
index 16eeccd..cb0c0d6 100644 (file)
--- a/src/core/io/qfsfileengine_unix.cpp
+++ b/src/core/io/qfsfileengine_unix.cpp
@@ -638,10 +638,9 @@ QDateTime QFSFileEngine::fileTime(FileTime time) const
     return QDateTime();
 }
 
-uchar *QFSFileEnginePrivate::map(qint64 offset, qint64 size, QFile::MemoryMapFlags flags)
+uchar *QFSFileEnginePrivate::map(qint64 offset, qint64 size)
 {
     Q_Q(QFSFileEngine);
-    Q_UNUSED(flags);
     if (openMode == QIODevice::NotOpen) {
         q->setError(QFile::PermissionsError, qt_error_string(int(EACCES)));
         return 0;

diff --git a/src/core/io/qresource.cpp b/src/core/io/qresource.cpp
index 6d06754..4b4b4b1 100644 (file)
--- a/src/core/io/qresource.cpp
+++ b/src/core/io/qresource.cpp
@@ -1096,7 +1096,7 @@ class QResourceFileEnginePrivate : public QAbstractFileEnginePrivate
 protected:
     Q_DECLARE_PUBLIC(QResourceFileEngine)
 private:
-    uchar *map(qint64 offset, qint64 size, QFile::MemoryMapFlags flags);
+    uchar *map(qint64 offset, qint64 size);
     bool unmap(uchar *ptr);
     qint64 offset;
     QResource resource;
@@ -1363,7 +1363,7 @@ bool QResourceFileEngine::extension(Extension extension, const ExtensionOption *
     if (extension == MapExtension) {
         const MapExtensionOption *options = (MapExtensionOption*)(option);
         MapExtensionReturn *returnValue = static_cast<MapExtensionReturn*>(output);
-        returnValue->address = d->map(options->offset, options->size, options->flags);
+        returnValue->address = d->map(options->offset, options->size);
         return (returnValue->address != 0);
     }
     if (extension == UnMapExtension) {
@@ -1378,10 +1378,9 @@ bool QResourceFileEngine::supportsExtension(Extension extension) const
     return (extension == UnMapExtension || extension == MapExtension);
 }
 
-uchar *QResourceFileEnginePrivate::map(qint64 offset, qint64 size, QFile::MemoryMapFlags flags)
+uchar *QResourceFileEnginePrivate::map(qint64 offset, qint64 size)
 {
     Q_Q(QResourceFileEngine);
-    Q_UNUSED(flags);
     if (offset < 0 || size <= 0 || !resource.isValid() || offset + size > resource.size()) {
         q->setError(QFile::UnspecifiedError, QString());
         return 0;