From dcded20d840ec1dd532854c84e209651f265f203 Mon Sep 17 00:00:00 2001 From: Kevin Ottens Date: Wed, 10 Nov 2010 16:42:52 +0000 Subject: [PATCH] Cleanup KLibLoader use. svn path=/trunk/KDE/kdebase/workspace/; revision=1195243 --- lib/kdecoration_plugins_p.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/kdecoration_plugins_p.cpp b/lib/kdecoration_plugins_p.cpp index 13da247ccb..2d764b57a0 100644 --- a/lib/kdecoration_plugins_p.cpp +++ b/lib/kdecoration_plugins_p.cpp @@ -29,7 +29,7 @@ DEALINGS IN THE SOFTWARE. #include #include #include -#include +#include #include #include @@ -116,14 +116,16 @@ bool KDecorationPlugins::loadPlugin( QString nameStr ) KLibrary *oldLibrary = library; KDecorationFactory* oldFactory = fact; - QString path = KLibLoader::findLibrary(nameStr); + KLibrary libToFind(nameStr); + QString path = libToFind.fileName(); kDebug(1212) << "kwin : path " << path << " for " << nameStr; // If the plugin was not found, try to find the default if (path.isEmpty()) { nameStr = defaultPlugin; - path = KLibLoader::findLibrary(nameStr); + KLibrary libToFind(nameStr); + path = libToFind.fileName(); } // If no library was found, exit kwin with an error message @@ -148,7 +150,8 @@ trydefaultlib: nameStr = defaultPlugin; if ( pluginStr == nameStr ) return true; - path = KLibLoader::findLibrary(nameStr); + KLibrary libToFind(nameStr); + path = libToFind.fileName(); if (!path.isEmpty()) library = new KLibrary(path); }