AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename QMimeDatabase method for consistency.

Browse Source 
Name is about mimetype names, while FileName is about, well, file names.

Task-number: QTBUG-25748
Change-Id: I34a9ac1a5fc06dc3e3855365e19c4dc7a1aa2671
Reviewed-by: Wolf-Michael Bolle <wolf-michael.bolle@nokia.com>
This commit is contained in:
David Faure 2012-05-14 19:42:10 +02:00 committed by Qt by Nokia
parent f3476d3ae2
commit c241d8921e
4 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/corelib/mimetypes/qmimedatabase.cpp
View File

@ -165,7 +165,7 @@ QMimeType QMimeDatabasePrivate::findByData(const QByteArray &data, int *accuracy
return mimeTypeForName(defaultMimeType());
}
QMimeType QMimeDatabasePrivate::mimeTypeForNameAndData(const QString &fileName, QIODevice *device, int *accuracyPtr)
QMimeType QMimeDatabasePrivate::mimeTypeForFileNameAndData(const QString &fileName, QIODevice *device, int *accuracyPtr)
{
// First, glob patterns are evaluated. If there is a match with max weight,
// this one is selected and we are done. Otherwise, the file contents are
@ -385,7 +385,7 @@ QMimeType QMimeDatabase::mimeTypeForFile(const QFileInfo &fileInfo, MatchMode mo
switch (mode) {
case MatchDefault:
file.open(QIODevice::ReadOnly); // isOpen() will be tested by method below
return d->mimeTypeForNameAndData(fileInfo.absoluteFilePath(), &file, &priority);
return d->mimeTypeForFileNameAndData(fileInfo.absoluteFilePath(), &file, &priority);
case MatchExtension:
locker.unlock();
return mimeTypeForFile(fileInfo.absoluteFilePath(), mode);
@ -437,7 +437,7 @@ QMimeType QMimeDatabase::mimeTypeForFile(const QString &fileName, MatchMode mode
This function does not try to open the file. To also use the content
when determining the MIME type, use mimeTypeForFile() or
mimeTypeForNameAndData() instead.
mimeTypeForFileNameAndData() instead.
\sa mimeTypeForFile
*/
@ -551,13 +551,13 @@ QMimeType QMimeDatabase::mimeTypeForUrl(const QUrl &url) const
but the contents will be used if the file extension is unknown, or
matches multiple MIME types.
*/
QMimeType QMimeDatabase::mimeTypeForNameAndData(const QString &fileName, QIODevice *device) const
QMimeType QMimeDatabase::mimeTypeForFileNameAndData(const QString &fileName, QIODevice *device) const
{
DBG() << "fileName" << fileName;
int accuracy = 0;
const bool openedByUs = !device->isOpen() && device->open(QIODevice::ReadOnly);
const QMimeType result = d->mimeTypeForNameAndData(fileName, device, &accuracy);
const QMimeType result = d->mimeTypeForFileNameAndData(fileName, device, &accuracy);
if (openedByUs)
device->close();
return result;
@ -579,14 +579,14 @@ QMimeType QMimeDatabase::mimeTypeForNameAndData(const QString &fileName, QIODevi
but the contents will be used if the file extension is unknown, or
matches multiple MIME types.
*/
QMimeType QMimeDatabase::mimeTypeForNameAndData(const QString &fileName, const QByteArray &data) const
QMimeType QMimeDatabase::mimeTypeForFileNameAndData(const QString &fileName, const QByteArray &data) const
{
DBG() << "fileName" << fileName;
QBuffer buffer(const_cast<QByteArray *>(&data));
buffer.open(QIODevice::ReadOnly);
int accuracy = 0;
return d->mimeTypeForNameAndData(fileName, &buffer, &accuracy);
return d->mimeTypeForFileNameAndData(fileName, &buffer, &accuracy);
}
/*!

13
src/corelib/mimetypes/qmimedatabase.h
View File

@ -77,8 +77,17 @@ public:
QMimeType mimeTypeForData(QIODevice *device) const;
QMimeType mimeTypeForUrl(const QUrl &url) const;
QMimeType mimeTypeForNameAndData(const QString &fileName, QIODevice *device) const;
QMimeType mimeTypeForNameAndData(const QString &fileName, const QByteArray &data) const;
QMimeType mimeTypeForFileNameAndData(const QString &fileName, QIODevice *device) const;
QMimeType mimeTypeForFileNameAndData(const QString &fileName, const QByteArray &data) const;
#if QT_DEPRECATED_SINCE(5,0)
QT_DEPRECATED QMimeType mimeTypeForNameAndData(const QString &fileName, QIODevice *device) const {
return mimeTypeForFileNameAndData(fileName, device);
}
QT_DEPRECATED QMimeType mimeTypeForNameAndData(const QString &fileName, const QByteArray &data) const {
return mimeTypeForFileNameAndData(fileName, data);
}
#endif
QString suffixForFileName(const QString &fileName) const;

2
src/corelib/mimetypes/qmimedatabase_p.h
View File

@ -75,7 +75,7 @@ public:
QMimeType mimeTypeForName(const QString &nameOrAlias);
QMimeType mimeTypeForNameAndData(const QString &fileName, QIODevice *device, int *priorityPtr);
QMimeType mimeTypeForFileNameAndData(const QString &fileName, QIODevice *device, int *priorityPtr);
QMimeType findByData(const QByteArray &data, int *priorityPtr);
QStringList mimeTypeForFileName(const QString &fileName, QString *foundSuffix = 0);

6
tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp
View File

@ -486,14 +486,14 @@ void tst_QMimeDatabase::mimeTypeForFileAndContent()
QFETCH(QString, expectedMimeTypeName);
QMimeDatabase db;
QCOMPARE(db.mimeTypeForNameAndData(name, data).name(), expectedMimeTypeName);
QCOMPARE(db.mimeTypeForFileNameAndData(name, data).name(), expectedMimeTypeName);
QBuffer buffer(&data);
QCOMPARE(db.mimeTypeForNameAndData(name, &buffer).name(), expectedMimeTypeName);
QCOMPARE(db.mimeTypeForFileNameAndData(name, &buffer).name(), expectedMimeTypeName);
QVERIFY(!buffer.isOpen()); // initial state was restored
QVERIFY(buffer.open(QIODevice::ReadOnly));
QCOMPARE(db.mimeTypeForNameAndData(name, &buffer).name(), expectedMimeTypeName);
QCOMPARE(db.mimeTypeForFileNameAndData(name, &buffer).name(), expectedMimeTypeName);
QVERIFY(buffer.isOpen());
QCOMPARE(buffer.pos(), qint64(0));
}