]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Port konsolepart loading to use KPluginLoader directly
authorNicolas Fella <nicolas.fella@gmx.de>
Sat, 3 Jul 2021 18:13:39 +0000 (20:13 +0200)
committerElvis Angelaccio <elvis.angelaccio@kde.org>
Sun, 4 Jul 2021 09:13:01 +0000 (09:13 +0000)
No need to go via KService

src/panels/terminal/terminalpanel.cpp

index fdc6c64bb409677ae68f9b463d01a73bcc723864..3af2cdcad87d355129510c53938e4084327188ef 100644 (file)
@@ -17,7 +17,6 @@
 #include <KPluginFactory>
 #include <KPluginLoader>
 #include <KProtocolInfo>
-#include <KService>
 #include <KShell>
 #include <kde_terminal_interface.h>
 
@@ -130,11 +129,8 @@ void TerminalPanel::showEvent(QShowEvent* event)
 
     if (!m_terminal) {
         m_clearTerminal = true;
-        KPluginFactory* factory = nullptr;
-        KService::Ptr service = KService::serviceByDesktopName(QStringLiteral("konsolepart"));
-        if (service) {
-            factory = KPluginLoader(service->library()).factory();
-        }
+        KPluginLoader loader(QStringLiteral("konsolepart"));
+        KPluginFactory* factory = loader.factory();
         m_konsolePart = factory ? (factory->create<KParts::ReadOnlyPart>(this)) : nullptr;
         if (m_konsolePart) {
             connect(m_konsolePart, &KParts::ReadOnlyPart::destroyed, this, &TerminalPanel::terminalExited);