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: remove redundant KMimeGlobsFileParser::parseGlobFiles() method

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2024-03-14 22:36:48 +02:00
parent 5aedcbe444
commit 2bee5fa7e2
3 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
kdecore/services/kmimeglobsfileparser.cpp
View file

@ -38,13 +38,7 @@ KMimeGlobsFileParser::AllGlobs KMimeGlobsFileParser::parseGlobs()
return parseGlobs(globFiles);
}
KMimeGlobsFileParser::AllGlobs KMimeGlobsFileParser::parseGlobs(const QStringList& globFiles)
{
QStringList parsedFiles;
return parseGlobFiles(globFiles, parsedFiles);
}
KMimeGlobsFileParser::AllGlobs KMimeGlobsFileParser::parseGlobFiles(const QStringList& globFiles, QStringList& parsedFiles)
KMimeGlobsFileParser::AllGlobs KMimeGlobsFileParser::parseGlobs(const QStringList &globFiles)
{
KMimeGlobsFileParser::AllGlobs allGlobs;
QListIterator<QString> globIter(globFiles);
@ -59,7 +53,6 @@ KMimeGlobsFileParser::AllGlobs KMimeGlobsFileParser::parseGlobFiles(const QStrin
fileName = fileNamev2;
format = Globs2WithWeight;
}
parsedFiles << fileName;
QFile globFile(fileName);
//kDebug() << "Now parsing" << fileName;
parseGlobFile(&globFile, format, allGlobs);

15
kdecore/services/kmimeglobsfileparser_p.h
View file

@ -37,13 +37,13 @@ public:
class AllGlobs;
// Read globs (patterns) files
AllGlobs parseGlobs();
static AllGlobs parseGlobs();
// Separate method, for unit test
AllGlobs parseGlobs(const QStringList&);
static AllGlobs parseGlobs(const QStringList &globFiles);
struct Glob {
Glob(const QString& mime, int w = 50, const QString& pat = QString(), bool cs = false)
Glob(const QString &mime, int w = 50, const QString &pat = QString(), bool cs = false)
: weight(w), casesensitive(cs), pattern(pat), mimeType(mime) {}
int weight;
bool casesensitive;
@ -54,7 +54,7 @@ public:
class GlobList : public QList<Glob>
{
public:
bool hasPattern(const QString& mime, const QString& pattern) const {
bool hasPattern(const QString &mime, const QString &pattern) const {
const_iterator it = begin();
const const_iterator myend = end();
for (; it != myend; ++it)
@ -85,8 +85,8 @@ public:
class AllGlobs
{
public:
void addGlob(const Glob& glob);
void removeMime(const QString& mime);
void addGlob(const Glob &glob);
void removeMime(const QString &mime);
PatternsMap patternsMap() const; // for KMimeTypeFactory
GlobList m_highWeightGlobs; // >= 50 patterns
@ -94,8 +94,7 @@ public:
};
enum Format { OldGlobs, Globs2WithWeight };
static AllGlobs parseGlobFiles(const QStringList& globFiles, QStringList& parsedFiles);
static bool parseGlobFile(QIODevice* file, Format format, AllGlobs& globs);
static bool parseGlobFile(QIODevice *file, Format format, AllGlobs &globs);
private:
AllGlobs m_mimeTypeGlobs;

3
kdecore/tests/kmimeglobsfileparsertest.cpp
View file

@ -196,8 +196,7 @@ private Q_SLOTS:
// Prepare m_allGlobs
const QStringList globFiles = KGlobal::dirs()->findAllResources("xdgdata-mime", "globs");
QStringList parsedFiles;
m_allGlobs = KMimeGlobsFileParser::parseGlobFiles(globFiles, parsedFiles);
m_allGlobs = KMimeGlobsFileParser::parseGlobs(globFiles);
m_patternsMap = m_allGlobs.patternsMap();
const int patCount = m_allGlobs.m_highWeightGlobs.count() + m_allGlobs.m_lowWeightGlobs.count();
kDebug() << m_patternsMap.count() << "mimetypes," << patCount << "patterns";