QMime: Remove the remaining commented out code.

Change-Id: I50d843f5da0a3becfd85462877c148fbf16ee58a
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Wolf-Michael Bolle <wolf-michael.bolle@nokia.com>

7 files changed, 3 insertions, 99 deletions

diff --git a/src/mimetypes/qmimedatabase.cpp b/src/mimetypes/qmimedatabase.cpp
index 531efdd..1139e00 100644
--- a/src/mimetypes/qmimedatabase.cpp
+++ b/src/mimetypes/qmimedatabase.cpp
@@ -222,23 +222,6 @@ QMimeType QMimeDatabasePrivate::mimeTypeForNameAndData(const QString &fileName,
 
 // ------------------------------------------------------------------------------------------------
 
-#if 0
-QStringList QMimeDatabasePrivate::filterStrings() const
-{
-    QStringList rc;
-
-    foreach (const MimeTypeMapEntry *entry, nameMimeTypeMap) {
-        const QString filterString = entry->type.filterString();
-        if (!filterString.isEmpty())
-            rc += filterString;
-    }
-
-    return rc;
-}
-#endif
-
-// ------------------------------------------------------------------------------------------------
-
 QList<QMimeType> QMimeDatabasePrivate::allMimeTypes()
 {
     return provider()->allMimeTypes();
@@ -633,48 +616,6 @@ QList<QMimeType> QMimeDatabase::allMimeTypes() const
 
 // ------------------------------------------------------------------------------------------------
 
-// TODO: needed?
-#if 0
-QStringList QMimeDatabase::filterStrings() const
-{
-    QMutexLocker locker(&d->mutex);
-
-    return d->filterStrings();
-}
-
-// ------------------------------------------------------------------------------------------------
-
-/*!
-    Returns a string with all the possible file filters, for use with file dialogs
-*/
-QString QMimeDatabase::allFiltersString(QString *allFilesFilter) const
-{
-    if (allFilesFilter)
-        allFilesFilter->clear();
-
-    // Compile list of filter strings, sort, and remove duplicates (different MIME types might
-    // generate the same filter).
-    QStringList filters = filterStrings();
-    if (filters.empty())
-        return QString();
-    filters.sort();
-    filters.erase(std::unique(filters.begin(), filters.end()), filters.end());
-
-    static const QString allFiles = QObject::tr("All Files (*)", "QMimeDatabase");
-    if (allFilesFilter)
-        *allFilesFilter = allFiles;
-
-    // Prepend all files filter (instead of appending to work around a bug in Qt/Mac).
-    filters.prepend(allFiles);
-
-    return filters.join(QLatin1String(";;"));
-}
-#endif
-
-// ------------------------------------------------------------------------------------------------
-
 #undef DBG
 
-// ------------------------------------------------------------------------------------------------
-
 QT_END_NAMESPACE
diff --git a/src/mimetypes/qmimedatabase.h b/src/mimetypes/qmimedatabase.h
index ca1a4bb..9ea850a 100644
--- a/src/mimetypes/qmimedatabase.h
+++ b/src/mimetypes/qmimedatabase.h
@@ -68,12 +68,6 @@ public:
 
     QList<QMimeType> allMimeTypes() const;
 
-#if 0
-    // This must be a huge list, why would anyone ever want this?
-    QStringList filterStrings() const;
-    QString allFiltersString(QString *allFilesFilter = 0) const;
-#endif
-
     QMimeDatabasePrivate *data_ptr() { return d; }
 
 private:
diff --git a/src/mimetypes/qmimedatabase_p.h b/src/mimetypes/qmimedatabase_p.h
index 106ad7a..f2d4220 100644
--- a/src/mimetypes/qmimedatabase_p.h
+++ b/src/mimetypes/qmimedatabase_p.h
@@ -49,10 +49,6 @@ struct QMimeDatabasePrivate
 
     QString defaultMimeType() const { return m_defaultMimeType; }
 
-#if 0
-    QStringList filterStrings() const;
-#endif
-
     bool inherits(const QString &mime, const QString &parent);
 
     QList<QMimeType> allMimeTypes();
diff --git a/src/mimetypes/qmimemagicrulematcher.cpp b/src/mimetypes/qmimemagicrulematcher.cpp
index 43168a6..2ffa926 100644
--- a/src/mimetypes/qmimemagicrulematcher.cpp
+++ b/src/mimetypes/qmimemagicrulematcher.cpp
@@ -84,11 +84,4 @@ unsigned QMimeMagicRuleMatcher::priority() const
     return m_priority;
 }
 
-#if 0 // unused
-void QMimeMagicRuleMatcher::setPriority(unsigned thePriority)
-{
-    m_priority = thePriority;
-}
-#endif
-
 QT_END_NAMESPACE
diff --git a/src/mimetypes/qmimemagicrulematcher_p.h b/src/mimetypes/qmimemagicrulematcher_p.h
index f52849f..a706210 100644
--- a/src/mimetypes/qmimemagicrulematcher_p.h
+++ b/src/mimetypes/qmimemagicrulematcher_p.h
@@ -18,8 +18,8 @@
 **
 **************************************************************************/
 
-#ifndef MAGICMATCHER_H
-#define MAGICMATCHER_H
+#ifndef QMIMEMAGICRULEMATCHER_P_H
+#define QMIMEMAGICRULEMATCHER_P_H
 
 #include "qmime_global.h"
 
@@ -47,9 +47,6 @@ public:
     bool matches(const QByteArray &data) const;
 
     unsigned priority() const;
-#if 0
-    void setPriority(unsigned priority);
-#endif
 
     QString mimetype() const { return m_mimetype; }
 
@@ -61,4 +58,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // MAGICMATCHER_H
+#endif // QMIMEMAGICRULEMATCHER_P_H
diff --git a/src/mimetypes/qmimetype.cpp b/src/mimetypes/qmimetype.cpp
index dd9290d..fb79ac7 100644
--- a/src/mimetypes/qmimetype.cpp
+++ b/src/mimetypes/qmimetype.cpp
@@ -312,20 +312,6 @@ QString QMimeType::name() const
 
 // ------------------------------------------------------------------------------------------------
 
-#if 0
-/*!
-    \fn QStringList QMimeType::aliases() const;
-    \brief Returns the aliases of the MIME type.
- */
-// What is the use case for this? [apart from mimetypeviewer.cpp ...]
-QStringList QMimeType::aliases() const
-{
-    return d->aliases;
-}
-#endif
-
-// ------------------------------------------------------------------------------------------------
-
 /*!
     \brief Returns the description of the MIME type to be displayed on user interfaces.
 
diff --git a/src/mimetypes/qmimetype.h b/src/mimetypes/qmimetype.h
index 8627b98..83d2185 100644
--- a/src/mimetypes/qmimetype.h
+++ b/src/mimetypes/qmimetype.h
@@ -69,9 +69,6 @@ public:
     bool isDefault() const;
 
     QString name() const;
-#if 0
-    QStringList aliases() const;
-#endif
     QString comment() const;
     QString genericIconName() const;
     QString iconName() const;