diff options
| author | David Faure <david.faure@kdab.com> | 2012-11-19 14:54:37 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-20 11:35:31 +0100 |
| commit | 6cac729ae4181414f0b80361cdae3c30a3c99ca1 (patch) | |
| tree | 5a2e4630dc48479b96aa5618bee7a3f686717aec | |
| parent | a890c78980a7457e0fd32d57f07e447f9e8e4409 (diff) | |
QMimeDatabase: remove deprecated API
c241d8921ea6384c30a1731a036aec8edc7609ab renamed the methods but kept
the old ones "for a week or two" at Thiago's request.
Change-Id: I0747c032b549e45f6c8201db577d84863f39f599
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| -rw-r--r-- | src/corelib/mimetypes/qmimedatabase.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/corelib/mimetypes/qmimedatabase.h b/src/corelib/mimetypes/qmimedatabase.h index 40a9018032..a1c17369d7 100644 --- a/src/corelib/mimetypes/qmimedatabase.h +++ b/src/corelib/mimetypes/qmimedatabase.h @@ -81,15 +81,6 @@ public: 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; QList<QMimeType> allMimeTypes() const; |