ETM-Schurig
/
nymea
mirror of https://github.com/nymea/nymea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

little cleanup

pull/164/head
Michael Zanetti 2019-05-19 22:14:55 +02:00
parent 4539058e11
commit a8092d6faf
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libnymea-core/platform/platform.cpp
View File

@ -36,9 +36,8 @@ Platform::Platform(QObject *parent) : QObject(parent)
{ {
foreach (const QString &path, pluginSearchDirs()) { foreach (const QString &path, pluginSearchDirs()) {
QDir dir(path); QDir dir(path);
qCDebug(dcPlatform) << "Loading plugins from:" << dir.absolutePath(); qCDebug(dcPlatform) << "Loading platform plugins from:" << dir.absolutePath();
foreach (const QString &entry, dir.entryList(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot)) { foreach (const QString &entry, dir.entryList(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot)) {
qCDebug(dcPlatform()) << "Found dir entry" << entry;
QFileInfo fi(path + "/" + entry); QFileInfo fi(path + "/" + entry);
if (fi.isFile()) { if (fi.isFile()) {
if (entry.startsWith("libnymea_systemplugin") && entry.endsWith(".so")) { if (entry.startsWith("libnymea_systemplugin") && entry.endsWith(".so")) {
@ -49,8 +48,8 @@ Platform::Platform(QObject *parent) : QObject(parent)
} else if (fi.isDir()) { } else if (fi.isDir()) {
if (QFileInfo::exists(path + "/" + entry + "/libnymea_systemplugin" + entry + ".so")) { if (QFileInfo::exists(path + "/" + entry + "/libnymea_systemplugin" + entry + ".so")) {
loadSystemPlugin(path + "/" + entry + "/libnymea_systemplugin" + entry + ".so"); loadSystemPlugin(path + "/" + entry + "/libnymea_systemplugin" + entry + ".so");
} else if (QFileInfo::exists(path + "/" + entry + "/libnymea_platformplugin" + entry + ".so")) { } else if (QFileInfo::exists(path + "/" + entry + "/libnymea_updateplugin" + entry + ".so")) {
loadUpdatePlugin(path + "/" + entry + "/libnymea_platformplugin" + entry + ".so"); loadUpdatePlugin(path + "/" + entry + "/libnymea_updateplugin" + entry + ".so");
} }
} }
} }