QMimeDatabase: move recheck test up from the mime providers

This is actually simpler (two calls to ensureLoaded are enough,
rather than one in every implementation method) and is necessary
for further refactoring steps (which will instanciate more provider
instances).

Change-Id: I9fb8acf3556515babecb88ba88e25af43937af5a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

1 files changed, 3 insertions, 8 deletions

diff --git a/src/corelib/mimetypes/qmimeprovider_p.h b/src/corelib/mimetypes/qmimeprovider_p.h
index 3eae672823..7344d8b453 100644
--- a/src/corelib/mimetypes/qmimeprovider_p.h
+++ b/src/corelib/mimetypes/qmimeprovider_p.h
@@ -59,7 +59,6 @@
 #include "qmimeglobpattern_p.h"
 #include <QtCore/qdatetime.h>
 #include <QtCore/qset.h>
-#include <QtCore/qelapsedtimer.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -82,11 +81,9 @@ public:
     virtual void loadMimeTypePrivate(QMimeTypePrivate &) {}
     virtual void loadIcon(QMimeTypePrivate &) {}
     virtual void loadGenericIcon(QMimeTypePrivate &) {}
+    virtual void ensureLoaded() {}
 
     QMimeDatabasePrivate *m_db;
-protected:
-    bool shouldCheck();
-    QElapsedTimer m_lastCheck;
 };
 
 /*
@@ -109,6 +106,7 @@ public:
     virtual void loadMimeTypePrivate(QMimeTypePrivate &) override;
     virtual void loadIcon(QMimeTypePrivate &) override;
     virtual void loadGenericIcon(QMimeTypePrivate &) override;
+    void ensureLoaded() override;
 
 private:
     struct CacheFile;
@@ -118,7 +116,6 @@ private:
     bool matchMagicRule(CacheFile *cacheFile, int numMatchlets, int firstOffset, const QByteArray &data);
     QLatin1String iconForMime(CacheFile *cacheFile, int posListOffset, const QByteArray &inputMime);
     void loadMimeTypeList();
-    void checkCache();
 
     class CacheFileList : public QList<CacheFile *>
     {
@@ -149,6 +146,7 @@ public:
     virtual QStringList listAliases(const QString &name) override;
     virtual QMimeType findByMagic(const QByteArray &data, int *accuracyPtr) override;
     virtual QList<QMimeType> allMimeTypes() override;
+    void ensureLoaded() override;
 
     bool load(const QString &fileName, QString *errorMessage);
 
@@ -160,11 +158,8 @@ public:
     void addMagicMatcher(const QMimeMagicRuleMatcher &matcher);
 
 private:
-    void ensureLoaded();
     void load(const QString &fileName);
 
-    bool m_loaded;
-
     typedef QHash<QString, QMimeType> NameMimeTypeMap;
     NameMimeTypeMap m_nameMimeTypeMap;