Port away from KLibLoader. Tested (configuring a kwin deco).

svn path=/trunk/KDE/kdebase/workspace/; revision=1193175
This commit is contained in:
David Faure 2010-11-04 22:45:33 +00:00
parent 65cf6ec8f7
commit d019d36bf5

View file

@ -22,7 +22,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <QDBusConnection> #include <QDBusConnection>
#include <QDBusMessage> #include <QDBusMessage>
#include <KLibLoader> #include <KLibrary>
#include <KVBox> #include <KVBox>
namespace KWin namespace KWin
@ -67,12 +67,10 @@ KWinDecorationConfigDialog::KWinDecorationConfigDialog( QString deco, const QLis
QVBoxLayout* layout = new QVBoxLayout; QVBoxLayout* layout = new QVBoxLayout;
layout->addWidget( m_ui ); layout->addWidget( m_ui );
// Use klibloader for library manipulation KLibrary library( styleToConfigLib( deco ) );
KLibLoader* loader = KLibLoader::self(); if (library.load())
KLibrary* library = loader->library( styleToConfigLib( deco ) );
if (library != NULL)
{ {
KLibrary::void_function_ptr alloc_ptr = library->resolveFunction("allocate_config"); KLibrary::void_function_ptr alloc_ptr = library.resolveFunction("allocate_config");
if (alloc_ptr != NULL) if (alloc_ptr != NULL)
{ {
allocatePlugin = (QObject* (*)(KConfigGroup& conf, QWidget* parent))alloc_ptr; allocatePlugin = (QObject* (*)(KConfigGroup& conf, QWidget* parent))alloc_ptr;