1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QResource: move the internal classes to unnamed namespaces

Browse Source 
So the compiler has more opportunities to inline and to not emit out-of-
line copies.

Change-Id: I6979d02a7395405cbf23fffd17c9101b2b52472a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
(cherry picked from commit fe6dda9bb9310878b408b2421f60acb7135bd8ba)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Thiago Macieira 2024-04-23 17:34:01 -07:00 committed by Qt Cherry-pick Bot
parent 06bb5f19bf
commit 17cfe9b2cf
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/corelib/io/qresource.cpp
View File

@ -65,6 +65,7 @@ RCC_FEATURE_SYMBOL(Zstd)
#undef RCC_FEATURE_SYMBOL #undef RCC_FEATURE_SYMBOL
namespace {
class QStringSplitter class QStringSplitter
{ {
public: public:
@ -159,15 +160,18 @@ static QString cleanPath(const QString &_path)
path.remove(0, 1); path.remove(0, 1);
return path; return path;
} }
} // unnamed namespace
Q_DECLARE_TYPEINFO(QResourceRoot, Q_RELOCATABLE_TYPE); Q_DECLARE_TYPEINFO(QResourceRoot, Q_RELOCATABLE_TYPE);
typedef QList<QResourceRoot*> ResourceList; typedef QList<QResourceRoot*> ResourceList;
namespace {
struct QResourceGlobalData struct QResourceGlobalData
{ {
QRecursiveMutex resourceMutex; QRecursiveMutex resourceMutex;
ResourceList resourceList; ResourceList resourceList;
}; };
}
Q_GLOBAL_STATIC(QResourceGlobalData, resourceGlobalData) Q_GLOBAL_STATIC(QResourceGlobalData, resourceGlobalData)
static inline QRecursiveMutex &resourceMutex() static inline QRecursiveMutex &resourceMutex()
@ -1031,8 +1035,8 @@ Q_CORE_EXPORT bool qUnregisterResourceData(int version, const unsigned char *tre
return false; return false;
} }
namespace {
// run time resource creation // run time resource creation
class QDynamicBufferResourceRoot : public QResourceRoot class QDynamicBufferResourceRoot : public QResourceRoot
{ {
QString root; QString root;
@ -1131,6 +1135,7 @@ public:
bool registerSelf(const QString &f); bool registerSelf(const QString &f);
}; };
} // unnamed namespace
#ifndef MAP_FILE #ifndef MAP_FILE
# define MAP_FILE 0 # define MAP_FILE 0