From e34294972aa44141595df1a67dc11f41a11c827c Mon Sep 17 00:00:00 2001
From: Christian Ehrlicher <ch.ehrlicher@gmx.de>
Date: Mon, 14 May 2007 19:46:21 +0000
Subject: [PATCH] fix for KLibrary changes

svn path=/trunk/KDE/kdebase/workspace/; revision=664745
---
 effects.cpp                               |  2 +-
 kcmkwin/kwindecoration/kwindecoration.cpp |  4 ++--
 lib/kdecoration_plugins_p.cpp             | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/effects.cpp b/effects.cpp
index 17d094f035..e5ee22d9ce 100644
--- a/effects.cpp
+++ b/effects.cpp
@@ -572,7 +572,7 @@ KLibrary* EffectsHandlerImpl::findEffectLibrary( const QString& effectname )
         libname = conf.readEntry( "X-KDE-Library", libname );
         }
 
-    KLibrary* library = KLibLoader::self()->library(QFile::encodeName(libname));
+    KLibrary* library = KLibLoader::self()->library(libname);
     if( !library )
         {
         kError( 1212 ) << k_funcinfo << "couldn't open library for effect '" <<
diff --git a/kcmkwin/kwindecoration/kwindecoration.cpp b/kcmkwin/kwindecoration/kwindecoration.cpp
index e55c14307a..9723a6171c 100644
--- a/kcmkwin/kwindecoration/kwindecoration.cpp
+++ b/kcmkwin/kwindecoration/kwindecoration.cpp
@@ -404,9 +404,9 @@ void KWinDecorationModule::resetPlugin( KConfigGroup& conf, const QString& curre
 
 	// Free the old library if possible
 	if (!oldLibraryName.isNull())
-		loader->unloadLibrary( QFile::encodeName(oldName) );
+		loader->unloadLibrary( oldName );
 
-	KLibrary* library = loader->library( QFile::encodeName(currentName) );
+	KLibrary* library = loader->library( currentName );
 	if (library != NULL)
 	{
                 KLibrary::void_function_ptr alloc_ptr = library->resolveFunction("allocate_config");
diff --git a/lib/kdecoration_plugins_p.cpp b/lib/kdecoration_plugins_p.cpp
index 026d76a544..50bee7e0b2 100644
--- a/lib/kdecoration_plugins_p.cpp
+++ b/lib/kdecoration_plugins_p.cpp
@@ -107,14 +107,14 @@ bool KDecorationPlugins::loadPlugin( QString nameStr )
     KLibrary *oldLibrary = library;
     KDecorationFactory* oldFactory = fact;
 
-    QString path = KLibLoader::findLibrary(QFile::encodeName(nameStr));
+    QString path = KLibLoader::findLibrary(nameStr);
 	kDebug() << "kwin : path " << path << " for " << nameStr << endl;
 
     // If the plugin was not found, try to find the default
     if (path.isEmpty())
         {
         nameStr = defaultPlugin;
-        path = KLibLoader::findLibrary(QFile::encodeName(nameStr));
+        path = KLibLoader::findLibrary(nameStr);
         }
 
     // If no library was found, exit kwin with an error message
@@ -129,7 +129,7 @@ bool KDecorationPlugins::loadPlugin( QString nameStr )
 	return true;
 
     // Try loading the requested plugin
-    library = KLibLoader::self()->library(QFile::encodeName(path));
+    library = KLibLoader::self()->library(path);
 
     // If that fails, fall back to the default plugin
     if (!library)
@@ -138,9 +138,9 @@ bool KDecorationPlugins::loadPlugin( QString nameStr )
         nameStr = defaultPlugin;
 	if ( pluginStr == nameStr )
 	    return true;
-        path = KLibLoader::findLibrary(QFile::encodeName(nameStr));
+        path = KLibLoader::findLibrary(nameStr);
 	if (!path.isEmpty())
-            library = KLibLoader::self()->library(QFile::encodeName(path));
+            library = KLibLoader::self()->library(path);
         }
 
     if (!library)