summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDavid Faure <faure@kde.org>2011-12-11 16:07:43 +0100
committerDavid Faure <faure@kde.org>2011-12-12 19:49:20 +0100
commitd9704be38cd9445b8cd1022d19ab109f6cbbeb7a (patch)
tree03abf437b73d6851de709a77f17511a2fc40b16f /src
parent66eb331d5686c5da090a12f0586d4b3ed1515c43 (diff)
Fix compilation with QT_NO_CAST_FROM_ASCII
Diffstat (limited to 'src')
-rw-r--r--src/mimetypes/qmimedatabase.cpp2
-rw-r--r--src/mimetypes/qmimeprovider.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mimetypes/qmimedatabase.cpp b/src/mimetypes/qmimedatabase.cpp
index f9f7b88..7925807 100644
--- a/src/mimetypes/qmimedatabase.cpp
+++ b/src/mimetypes/qmimedatabase.cpp
@@ -382,7 +382,7 @@ QMimeType QMimeDatabase::findByFile(const QFileInfo &fileInfo) const
// Cannot access statBuf.st_mode from the filesystem engine, so we have to stat again.
const QByteArray nativeFilePath = QFile::encodeName(file.fileName());
QT_STATBUF statBuffer;
- if (QT_LSTAT(nativeFilePath, &statBuffer) == 0) {
+ if (QT_LSTAT(nativeFilePath.constData(), &statBuffer) == 0) {
if (S_ISCHR(statBuffer.st_mode))
return d->mimeTypeForName(QLatin1String("inode/chardevice"));
if (S_ISBLK(statBuffer.st_mode))
diff --git a/src/mimetypes/qmimeprovider.cpp b/src/mimetypes/qmimeprovider.cpp
index e8f3161..5c8c75a 100644
--- a/src/mimetypes/qmimeprovider.cpp
+++ b/src/mimetypes/qmimeprovider.cpp
@@ -387,7 +387,7 @@ QList<QMimeType> QMimeBinaryProvider::allMimeTypes()
while (!file.atEnd()) {
QByteArray line = file.readLine();
line.chop(1);
- mimetypes.insert(QString::fromLatin1(line));
+ mimetypes.insert(QString::fromLatin1(line.constData(), line.size()));
}
}
}