yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix for KLibrary changes

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=664745
This commit is contained in:
Christian Ehrlicher 2007-05-14 19:46:21 +00:00
parent 848b003877
commit e34294972a
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
effects.cpp
View file

@ -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 '" <<

4
kcmkwin/kwindecoration/kwindecoration.cpp
View file

@ -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");

10
lib/kdecoration_plugins_p.cpp
View file

@ -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)