tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add missing const on the plugin loader

Browse source
This commit is contained in:
Aleix Pol 2013-10-12 01:54:08 +02:00
parent faa3daa585
commit 83b7ac0aba
2 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
kded/plugins/pluginloader.cpp
View file

@ -37,19 +37,19 @@ PluginLoader* PluginLoader::instance()
PluginLoader::PluginLoader()
{
KService::List offers = KServiceTypeTrader::self()->query("KdeConnect/Plugin");
for(KService::List::const_iterator iter = offers.begin(); iter < offers.end(); ++iter) {
for(KService::List::const_iterator iter = offers.constBegin(); iter != offers.constEnd(); ++iter) {
KService::Ptr service = *iter;
plugins[service->library()] = service;
}
}
QStringList PluginLoader::getPluginList()
QStringList PluginLoader::getPluginList() const
{
return plugins.keys();
}
KPluginInfo PluginLoader::getPluginInfo(const QString& name) {
KPluginInfo PluginLoader::getPluginInfo(const QString& name) const
{
KService::Ptr service = plugins[name];
if (!service) {
qDebug() << "Plugin unknown" << name;
@ -59,8 +59,8 @@ KPluginInfo PluginLoader::getPluginInfo(const QString& name) {
return KPluginInfo(service);
}
KdeConnectPlugin* PluginLoader::instantiatePluginForDevice(const QString& name, Device* device) {
KdeConnectPlugin* PluginLoader::instantiatePluginForDevice(const QString& name, Device* device) const
{
KService::Ptr service = plugins[name];
if (!service) {
qDebug() << "Plugin unknown" << name;
@ -73,8 +73,7 @@ KdeConnectPlugin* PluginLoader::instantiatePluginForDevice(const QString& name,
return NULL;
}
QVariant deviceVariant;
deviceVariant.setValue<Device*>(device);
QVariant deviceVariant = QVariant::fromValue<Device*>(device);
//FIXME: create<KdeConnectPlugin> return NULL
QObject *plugin = factory->create<QObject>(device, QVariantList() << deviceVariant);

6
kded/plugins/pluginloader.h
View file

@ -38,9 +38,9 @@ class PluginLoader
public:
static PluginLoader* instance();
QStringList getPluginList();
KPluginInfo getPluginInfo(const QString& name);
KdeConnectPlugin* instantiatePluginForDevice(const QString& name, Device* device);
QStringList getPluginList() const;
KPluginInfo getPluginInfo(const QString& name) const;
KdeConnectPlugin* instantiatePluginForDevice(const QString& name, Device* device) const;
private:
PluginLoader();