Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 18:32:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kdecore: remove TODO related to KPluginLoader

Browse source 
the property shall not be removed

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2023-08-11 17:27:32 +03:00
parent 59b1d3da2d
commit fe00f4058f
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
kdecore/util/kpluginloader.cpp
View file

@ -69,8 +69,9 @@ static QString findLibraryInternal(const QString &name, const KComponentData &cD
} }
// If it is a absolute path just return it // If it is a absolute path just return it
if (!QDir::isRelativePath(libname)) if (!QDir::isRelativePath(libname)) {
return libname; return libname;
}
// Check for kde modules/plugins? // Check for kde modules/plugins?
QString libfile = cData.dirs()->findResource("module", libname); QString libfile = cData.dirs()->findResource("module", libname);
@ -168,8 +169,8 @@ KPluginFactory* KPluginLoader::factory()
kDebug() << "Expected a KPluginFactory, got a" << obj->metaObject()->className(); kDebug() << "Expected a KPluginFactory, got a" << obj->metaObject()->className();
delete obj; delete obj;
d->errorString = i18n("The library %1 does not offer a KDE 4 compatible factory.", d->name); d->errorString = i18n("The library %1 does not offer a KDE 4 compatible factory.", d->name);
return nullptr;
} }
return factory; return factory;
} }

2
kdecore/util/kpluginloader.h
View file

@ -76,7 +76,7 @@ class KPluginLoaderPrivate;
class KDECORE_EXPORT KPluginLoader : public QPluginLoader class KDECORE_EXPORT KPluginLoader : public QPluginLoader
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(QString pluginName READ pluginName) // KDE5: REMOVE? Q_PROPERTY(QString pluginName READ pluginName)
public: public:
/** /**
* Used this constructor to load a plugin with a given library name. Plugin libraries shouldn't have a 'lib' prefix. * Used this constructor to load a plugin with a given library name. Plugin libraries shouldn't have a 'lib' prefix.