From 87f1342a3b13c0151650c8c0b0a21ace49deaece Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Fri, 30 Aug 2024 11:37:39 +0200
Subject: [PATCH] Update mime database from Qt

qtbase/c8db469fd584cfd2bee34b572601b19bfb2cd921
  QMimeBinaryProvider: move CacheFile up in the file

Change-Id: I8233e745594147d6b5a33379784355feca205f2c
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
---
 src/libs/utils/mimetypes2/mimeprovider.cpp | 54 +++++++++++-----------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/libs/utils/mimetypes2/mimeprovider.cpp b/src/libs/utils/mimetypes2/mimeprovider.cpp
index 0385735be3f..0fcf68a8ccd 100644
--- a/src/libs/utils/mimetypes2/mimeprovider.cpp
+++ b/src/libs/utils/mimetypes2/mimeprovider.cpp
@@ -51,6 +51,33 @@ using namespace Qt::StringLiterals;
 
 namespace Utils {
 
+struct MimeBinaryProvider::CacheFile
+{
+    CacheFile(const QString &fileName);
+    ~CacheFile();
+
+    bool isValid() const { return m_valid; }
+    inline quint16 getUint16(int offset) const
+    {
+        return qFromBigEndian(*reinterpret_cast<quint16 *>(data + offset));
+    }
+    inline quint32 getUint32(int offset) const
+    {
+        return qFromBigEndian(*reinterpret_cast<quint32 *>(data + offset));
+    }
+    inline const char *getCharStar(int offset) const
+    {
+        return reinterpret_cast<const char *>(data + offset);
+    }
+    bool load();
+    bool reload();
+
+    QFile file;
+    uchar *data;
+    QDateTime m_mtime;
+    bool m_valid;
+};
+
 static inline void appendIfNew(QStringList &list, const QString &str)
 {
     if (!list.contains(str))
@@ -88,33 +115,6 @@ MimeBinaryProvider::MimeBinaryProvider(MimeDatabasePrivate *db, const QString &d
     ensureLoaded();
 }
 
-struct MimeBinaryProvider::CacheFile
-{
-    CacheFile(const QString &fileName);
-    ~CacheFile();
-
-    bool isValid() const { return m_valid; }
-    inline quint16 getUint16(int offset) const
-    {
-        return qFromBigEndian(*reinterpret_cast<quint16 *>(data + offset));
-    }
-    inline quint32 getUint32(int offset) const
-    {
-        return qFromBigEndian(*reinterpret_cast<quint32 *>(data + offset));
-    }
-    inline const char *getCharStar(int offset) const
-    {
-        return reinterpret_cast<const char *>(data + offset);
-    }
-    bool load();
-    bool reload();
-
-    QFile file;
-    uchar *data;
-    QDateTime m_mtime;
-    bool m_valid;
-};
-
 MimeBinaryProvider::CacheFile::CacheFile(const QString &fileName)
     : file(fileName), m_valid(false)
 {