Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 18:32:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kdecore: use QCache for the standard directories cache

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2016-02-20 16:21:10 +02:00
parent ca67972e3f
commit fea84d5570
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
kdecore/kernel/kstandarddirs.cpp
View file

@ -56,6 +56,7 @@
#include <QtCore/QMutex>
#include <QtCore/QRegExp>
#include <QtCore/QDir>
#include <QtCore/QCache>
#include <QtCore/QFileInfo>
#include <QtCore/QSettings>
@ -70,7 +71,7 @@ public:
m_checkRestrictions(true),
m_cacheMutex(QMutex::Recursive), // resourceDirs is recursive
q(qq)
{ m_infocache.reserve(max_file_info); }
{ m_infocache.setMaxCost(max_file_info); }
bool hasDataRestrictions(const QString &relPath) const;
QStringList resourceDirs(const char* type, const QString& subdirForRestrictions);
@ -94,7 +95,7 @@ public:
// Caches (protected by mutex in const methods, cf ctor docu)
QMap<QByteArray, QStringList> m_dircache;
QMap<QByteArray, QString> m_savelocations;
QHash<QString, QFileInfo> m_infocache;
QCache<QString, QFileInfo> m_infocache;
QMutex m_cacheMutex;
KStandardDirs* q;
@ -553,23 +554,20 @@ bool KStandardDirs::exists(const QString &fullPath) const
bool KStandardDirs::KStandardDirsPrivate::exists(const QString &fullPath)
{
if(m_infocache.count() == max_file_info) {
m_infocache.clear();
}
QFileInfo fileinfo;
QFileInfo *fileinfo;
if(m_infocache.contains(fullPath)) {
fileinfo = m_infocache.value(fullPath);
fileinfo = m_infocache.object(fullPath);
} else {
fileinfo = QFileInfo(fullPath);
fileinfo = new QFileInfo(fullPath);
m_infocache.insert(fullPath, fileinfo);
}
if (!fileinfo.isReadable()) {
if (!fileinfo->isReadable()) {
return false;
} else if (!fullPath.endsWith(QLatin1Char('/'))) {
return !fileinfo.isDir() && fileinfo.exists();
return !fileinfo->isDir() && fileinfo->exists();
} else {
return fileinfo.isDir() && fileinfo.exists();
return fileinfo->isDir() && fileinfo->exists();
}
}