From 6cac729ae4181414f0b80361cdae3c30a3c99ca1 Mon Sep 17 00:00:00 2001 From: David Faure Date: Mon, 19 Nov 2012 14:54:37 +0100 Subject: 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 --- src/corelib/mimetypes/qmimedatabase.h | 9 --------- 1 file changed, 9 deletions(-) (limited to 'src') 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 allMimeTypes() const; -- cgit v1.2.3