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

remove redundant empty string checks in QCoreApplication::libraryPaths() and QCoreApplication::addLibraryPath()

Browse source 
if the path is empty, the canonical path is also empty

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2020-10-08 16:32:33 +03:00
parent 4e1f996d64
commit 74b09892e6
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/core/kernel/qcoreapplication.cpp
View file

@ -1803,14 +1803,14 @@ QStringList QCoreApplication::libraryPaths()
QStringList *app_libpaths = coreappdata()->app_libpaths = new QStringList;
QString installPathPlugins = QLibraryInfo::location(QLibraryInfo::PluginsPath);
if (QDir(installPathPlugins).exists()) {
if (!app_libpaths->contains(installPathPlugins))
app_libpaths->append(installPathPlugins);
if (QDir(installPathPlugins).exists()
&& !app_libpaths->contains(installPathPlugins)) {
app_libpaths->append(installPathPlugins);
}
installPathPlugins = QLibraryInfo::location(QLibraryInfo::LibrariesPath);
if (QDir(installPathPlugins).exists()) {
if (!app_libpaths->contains(installPathPlugins))
if (QDir(installPathPlugins).exists()
&& !app_libpaths->contains(installPathPlugins)) {
app_libpaths->append(installPathPlugins);
}
@ -1819,8 +1819,7 @@ QStringList QCoreApplication::libraryPaths()
const QStringList paths = QString::fromLatin1(libPathEnv.constData()).split(QLatin1Char(':'), QString::SkipEmptyParts);
foreach (const QString &it, paths) {
QString canonicalPath = QDir(it).canonicalPath();
if (!canonicalPath.isEmpty()
&& !app_libpaths->contains(canonicalPath)) {
if (!app_libpaths->contains(canonicalPath)) {
app_libpaths->append(canonicalPath);
}
}
@ -1880,8 +1879,7 @@ void QCoreApplication::addLibraryPath(const QString &path)
libraryPaths();
QString canonicalPath = QDir(path).canonicalPath();
if (!canonicalPath.isEmpty()
&& !coreappdata()->app_libpaths->contains(canonicalPath)) {
if (!coreappdata()->app_libpaths->contains(canonicalPath)) {
coreappdata()->app_libpaths->prepend(canonicalPath);
locker.unlock();
QFactoryLoader::refreshAll();