Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-25 03:12:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove unused QLibraryPrivate::fullVersion member

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2021-11-26 15:05:34 +02:00
parent 5b16824bc3
commit 90961de14c
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/core/plugin/qlibrary.cpp
View file

@ -222,11 +222,13 @@ static LibraryMap *libraryMap()
return data ? &data->libraryMap : nullptr; return data ? &data->libraryMap : nullptr;
} }
QLibraryPrivate::QLibraryPrivate(const QString &canonicalFileName, const QString &version) QLibraryPrivate::QLibraryPrivate(const QString &canonicalFileName)
: did_load(false), pHnd(0), fileName(canonicalFileName), fullVersion(version), : did_load(false), pHnd(0), fileName(canonicalFileName),
instance(0), qt_version(0), libraryRefCount(1), libraryUnloadCount(0), instance(0), qt_version(0), libraryRefCount(1), libraryUnloadCount(0),
pluginState(MightBeAPlugin) pluginState(MightBeAPlugin)
{ libraryMap()->insert(canonicalFileName, this); } {
libraryMap()->insert(canonicalFileName, this);
}
QLibraryPrivate *QLibraryPrivate::findOrCreate(const QString &fileName, const QString &version) QLibraryPrivate *QLibraryPrivate::findOrCreate(const QString &fileName, const QString &version)
{ {
@ -271,12 +273,12 @@ QLibraryPrivate *QLibraryPrivate::findOrCreate(const QString &fileName, const QS
const QString attempt = path + prefix + name + suffix; const QString attempt = path + prefix + name + suffix;
const QStatInfo statinfo(attempt); const QStatInfo statinfo(attempt);
if (statinfo.isFile()) { if (statinfo.isFile()) {
return new QLibraryPrivate(attempt, version); return new QLibraryPrivate(attempt);
} }
} }
} }
return new QLibraryPrivate(fileName, version); return new QLibraryPrivate(fileName);
} }
QLibraryPrivate::~QLibraryPrivate() QLibraryPrivate::~QLibraryPrivate()

3
src/core/plugin/qlibrary_p.h
View file

@ -53,7 +53,6 @@ public:
QString fileName; QString fileName;
QString qualifiedFileName; QString qualifiedFileName;
QString fullVersion;
bool load(); bool load();
bool loadPlugin(); // loads and resolves instance bool loadPlugin(); // loads and resolves instance
@ -74,7 +73,7 @@ public:
bool isPlugin(); bool isPlugin();
private: private:
explicit QLibraryPrivate(const QString &canonicalFileName, const QString &version); explicit QLibraryPrivate(const QString &canonicalFileName);
~QLibraryPrivate(); ~QLibraryPrivate();
bool load_sys(); bool load_sys();