[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [cantor] src: When loading plugins, don't try to load "." and "..".
From:       Alexander Semke <alexander.semke () web ! de>
Date:       2016-11-21 7:06:02
Message-ID: E1c8ify-0007Tw-VT () code ! kde ! org
[Download RAW message or body]

Git commit e09489c57a06b0a5d2abb46019bd71061573c424 by Alexander Semke.
Committed on 21/11/2016 at 07:05.
Pushed by asemke into branch 'master'.

When loading plugins, don't try to load "." and "..".

M  +3    -0    src/cantor_part.cpp
M  +3    -0    src/lib/backend.cpp
M  +3    -0    src/lib/panelpluginhandler.cpp

http://commits.kde.org/cantor/e09489c57a06b0a5d2abb46019bd71061573c424

diff --git a/src/cantor_part.cpp b/src/cantor_part.cpp
index bf822e3..5df3ac8 100644
--- a/src/cantor_part.cpp
+++ b/src/cantor_part.cpp
@@ -645,6 +645,9 @@ void CantorPart::loadAssistants()
         assistants = assistantDir.entryList();
 
         foreach (const QString &assistant, assistants){
+            if (assistant==QLatin1String(".") || assistant==QLatin1String(".."))
+                continue;
+
             loader.setFileName(dir + QDir::separator() + assistant);
 
             if (!loader.load()){
diff --git a/src/lib/backend.cpp b/src/lib/backend.cpp
index 966eee0..2c03541 100644
--- a/src/lib/backend.cpp
+++ b/src/lib/backend.cpp
@@ -133,6 +133,9 @@ QList<Backend*> Backend::availableBackends()
         plugins = pluginDir.entryList();
 
         foreach (const QString &plugin, plugins){
+            if (plugin==QLatin1String(".") || plugin==QLatin1String(".."))
+                continue;
+
             loader.setFileName(dir + QDir::separator() + plugin);
 
             if (!loader.load()){
diff --git a/src/lib/panelpluginhandler.cpp b/src/lib/panelpluginhandler.cpp
index e860804..6b62aac 100644
--- a/src/lib/panelpluginhandler.cpp
+++ b/src/lib/panelpluginhandler.cpp
@@ -71,6 +71,9 @@ void PanelPluginHandler::loadPlugins()
         panels = panelDir.entryList();
 
         foreach (const QString &panel, panels){
+            if (panel==QLatin1String(".") || panel==QLatin1String(".."))
+                continue;
+
             loader.setFileName(dir + QDir::separator() + panel);
 
             if (!loader.load()){

[prev in list] [next in list] [prev in thread] [next in thread]