diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2015-03-05 22:25:45 -0800 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2015-07-20 15:54:19 +0000 |
commit | 28f5207ca08bed5c16474091a205bc8351574584 (patch) | |
tree | 28512396f684a5e57eaedf18614a0e08456f4b49 /src/corelib/io | |
parent | 826a83937da18616ca5358f66598ad991b7c2cee (diff) |
QtCore: Fix const correctness in old style casts
Found with GCC's -Wcast-qual.
Change-Id: Ia0aac2f09e9245339951ffff13c8d4b2920a11fb
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/io')
-rw-r--r-- | src/corelib/io/qbuffer.cpp | 2 | ||||
-rw-r--r-- | src/corelib/io/qfsfileengine.cpp | 4 | ||||
-rw-r--r-- | src/corelib/io/qresource.cpp | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/corelib/io/qbuffer.cpp b/src/corelib/io/qbuffer.cpp index 680f832909..fd74681663 100644 --- a/src/corelib/io/qbuffer.cpp +++ b/src/corelib/io/qbuffer.cpp @@ -425,7 +425,7 @@ qint64 QBuffer::writeData(const char *data, qint64 len) } } - memcpy(d->buf->data() + pos(), (uchar *)data, int(len)); + memcpy(d->buf->data() + pos(), data, int(len)); #ifndef QT_NO_QOBJECT d->writtenSinceLastEmit += len; diff --git a/src/corelib/io/qfsfileengine.cpp b/src/corelib/io/qfsfileengine.cpp index ddbd24338b..429c40da1a 100644 --- a/src/corelib/io/qfsfileengine.cpp +++ b/src/corelib/io/qfsfileengine.cpp @@ -819,13 +819,13 @@ bool QFSFileEngine::extension(Extension extension, const ExtensionOption *option return feof(d->fh); if (extension == MapExtension) { - const MapExtensionOption *options = (MapExtensionOption*)(option); + const MapExtensionOption *options = (const MapExtensionOption*)(option); MapExtensionReturn *returnValue = static_cast<MapExtensionReturn*>(output); returnValue->address = d->map(options->offset, options->size, options->flags); return (returnValue->address != 0); } if (extension == UnMapExtension) { - UnMapExtensionOption *options = (UnMapExtensionOption*)option; + const UnMapExtensionOption *options = (const UnMapExtensionOption*)option; return d->unmap(options->address); } diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp index 4b85645a90..6671333ffb 100644 --- a/src/corelib/io/qresource.cpp +++ b/src/corelib/io/qresource.cpp @@ -956,7 +956,7 @@ public: } else #endif { - delete [] (uchar *)mappingBuffer(); + delete [] mappingBuffer(); } } QString mappingFile() const { return fileName; } @@ -1450,13 +1450,13 @@ bool QResourceFileEngine::extension(Extension extension, const ExtensionOption * { Q_D(QResourceFileEngine); if (extension == MapExtension) { - const MapExtensionOption *options = (MapExtensionOption*)(option); + const MapExtensionOption *options = (const MapExtensionOption*)(option); MapExtensionReturn *returnValue = static_cast<MapExtensionReturn*>(output); returnValue->address = d->map(options->offset, options->size, options->flags); return (returnValue->address != 0); } if (extension == UnMapExtension) { - UnMapExtensionOption *options = (UnMapExtensionOption*)option; + const UnMapExtensionOption *options = (const UnMapExtensionOption*)option; return d->unmap(options->address); } return false; |