Rename KDESupport -> KDEFrameworksIntegration plugin

CMakeLists.txt

@@ -105,13 +105,16 @@ endif()
 # Optional: KWallet, KIO, KCrash, KCoreAddons
 set(KF5_MIN_VERSION "5.27.0")
 find_package(KF5Wallet ${KF5_MIN_VERSION} CONFIG)
-set_package_properties(KF5Wallet PROPERTIES DESCRIPTION "KDESupport plugin" TYPE OPTIONAL)
+set_package_properties(KF5Wallet PROPERTIES DESCRIPTION "KDE Frameworks Integration plugin" TYPE OPTIONAL)
 find_package(KF5KIO ${KF5_MIN_VERSION} CONFIG)
-set_package_properties(KF5KIO PROPERTIES DESCRIPTION "KDESupport plugin" TYPE OPTIONAL)
+set_package_properties(KF5KIO PROPERTIES DESCRIPTION "KDE Frameworks Integration plugin" TYPE OPTIONAL)
 find_package(KF5Crash ${KF5_MIN_VERSION} CONFIG)
-set_package_properties(KF5Crash PROPERTIES DESCRIPTION "KDESupport plugin" TYPE OPTIONAL)
+set_package_properties(KF5Crash PROPERTIES DESCRIPTION "KDE Frameworks Integration plugin" TYPE OPTIONAL)
 find_package(KF5CoreAddons ${KF5_MIN_VERSION} CONFIG)
-set_package_properties(KF5CoreAddons PROPERTIES DESCRIPTION "KDESupport plugin" TYPE OPTIONAL)
+set_package_properties(KF5CoreAddons PROPERTIES DESCRIPTION "KDE Frameworks Integration plugin" TYPE OPTIONAL)
+if (KF5Wallet_FOUND AND KF5KIO_FOUND AND KF5Crash_FOUND AND KF5CoreAddons_FOUND)
+    set(ENABLE_KDE_FRAMEWORKS_INTEGRATION_PLUGIN TRUE)
+endif()
 
 # Optional: PySide2
 find_package(PySide2 "2.0.0")

src/plugins/CMakeLists.txt

@@ -13,8 +13,8 @@ if (GNOME_KEYRING_FOUND)
     add_subdirectory(GnomeKeyringPasswords)
 endif()
 
-if (KF5Wallet_FOUND AND KF5KIO_FOUND AND KF5Crash_FOUND AND KF5CoreAddons_FOUND)
+if (ENABLE_KDE_FRAMEWORKS_INTEGRATION_PLUGIN)
-    add_subdirectory(KDESupport)
+    add_subdirectory(KDEFrameworksIntegration)
 endif()
 
 if (ENABLE_PYTHON_PLUGINS)

src/plugins/KDEFrameworksIntegration/CMakeLists.txt

@@ -0,0 +1,23 @@
+set(KDEFrameworksIntegration_SRCS
+    kdeframeworksintegrationplugin.cpp
+    kwalletpasswordbackend.cpp
+    kioschemehandler.cpp
+)
+
+ecm_create_qm_loader(KDEFrameworksIntegration_SRCS falkon_kdeframeworksintegration_qt)
+
+set(KDEFrameworksIntegration_RSCS
+    kdeframeworksintegration.qrc
+)
+qt5_add_resources(RSCS ${KDEFrameworksIntegration_RSCS})
+
+add_library(KDEFrameworksIntegration MODULE ${KDEFrameworksIntegration_SRCS} ${RSCS})
+install(TARGETS KDEFrameworksIntegration DESTINATION ${FALKON_INSTALL_PLUGINDIR})
+target_link_libraries(KDEFrameworksIntegration
+    FalkonPrivate
+    KF5::Wallet
+    KF5::KIOCore
+    KF5::KIOWidgets
+    KF5::Crash
+    KF5::CoreAddons
+)

src/plugins/KDEFrameworksIntegration/Messages.sh

@@ -1,2 +1,2 @@
 #! /bin/sh
-$EXTRACT_TR_STRINGS `find . -name '*.cpp' -o -name '*.h' -o -name '*.ui'` -o $podir/falkon_kdesupport_qt.pot
+$EXTRACT_TR_STRINGS `find . -name '*.cpp' -o -name '*.h' -o -name '*.ui'` -o $podir/falkon_kdeframeworksintegration_qt.pot

src/plugins/KDEFrameworksIntegration/kdeframeworksintegration.qrc

@@ -1,5 +1,5 @@
 <RCC>
-    <qresource prefix="/kdesupport">
+    <qresource prefix="/kdeframeworksintegration">
         <file>metadata.desktop</file>
         <file>data/icon.svg</file>
     </qresource>

src/plugins/KDEFrameworksIntegration/kdeframeworksintegrationplugin.cpp

@@ -1,5 +1,5 @@
 /* ============================================================
-* KDESupport - KDE support plugin for Falkon
+* KDEFrameworksIntegration - KDE support plugin for Falkon
 * Copyright (C) 2013-2018 David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
@@ -15,7 +15,7 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * ============================================================ */
-#include "kdesupportplugin.h"
+#include "kdeframeworksintegrationplugin.h"
 #include "kwalletpasswordbackend.h"
 #include "pluginproxy.h"
 #include "browserwindow.h"
@@ -33,18 +33,18 @@
 
 #include <QWebEngineProfile>
 
-KDESupportPlugin::KDESupportPlugin()
+KDEFrameworksIntegrationPlugin::KDEFrameworksIntegrationPlugin()
     : QObject()
     , m_backend(0)
 {
 }
 
-DesktopFile KDESupportPlugin::metaData() const
+DesktopFile KDEFrameworksIntegrationPlugin::metaData() const
 {
-    return DesktopFile(QSL(":kdesupport/metadata.desktop"));
+    return DesktopFile(QSL(":kdeframeworksintegration/metadata.desktop"));
 }
 
-void KDESupportPlugin::init(InitState state, const QString &settingsPath)
+void KDEFrameworksIntegrationPlugin::init(InitState state, const QString &settingsPath)
 {
     Q_UNUSED(state);
     Q_UNUSED(settingsPath);
@@ -70,7 +70,7 @@ void KDESupportPlugin::init(InitState state, const QString &settingsPath)
     KCrash::setFlags(KCrash::KeepFDs);
 }
 
-void KDESupportPlugin::unload()
+void KDEFrameworksIntegrationPlugin::unload()
 {
     mApp->autoFill()->passwordManager()->unregisterBackend(m_backend);
     delete m_backend;
@@ -83,7 +83,7 @@ void KDESupportPlugin::unload()
     m_kioSchemeHandlers.clear();
 }
 
-bool KDESupportPlugin::testPlugin()
+bool KDEFrameworksIntegrationPlugin::testPlugin()
 {
     // Require the version that the plugin was built with
     return (Qz::VERSION == QLatin1String(FALKON_VERSION));

src/plugins/KDEFrameworksIntegration/kdeframeworksintegrationplugin.h

@@ -1,5 +1,5 @@
 /* ============================================================
-* KDESupport - KDE support plugin for Falkon
+* KDEFrameworksIntegration - KDE support plugin for Falkon
 * Copyright (C) 2013-2018 David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
@@ -15,22 +15,21 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * ============================================================ */
-#ifndef KDESUPPORTPLUGIN_H
+#pragma once
-#define KDESUPPORTPLUGIN_H
 
 #include "plugininterface.h"
 
 class KWalletPasswordBackend;
 class KIOSchemeHandler;
 
-class KDESupportPlugin : public QObject, public PluginInterface
+class KDEFrameworksIntegrationPlugin : public QObject, public PluginInterface
 {
     Q_OBJECT
     Q_INTERFACES(PluginInterface)
-    Q_PLUGIN_METADATA(IID "Falkon.Browser.plugin.KDESupport")
+    Q_PLUGIN_METADATA(IID "Falkon.Browser.plugin.KDEFrameworksIntegration")
 
 public:
-    explicit KDESupportPlugin();
+    explicit KDEFrameworksIntegrationPlugin();
 
     DesktopFile metaData() const override;
     void init(InitState state, const QString &settingsPath) override;
@@ -41,5 +40,3 @@ private:
     KWalletPasswordBackend* m_backend;
     QVector<KIOSchemeHandler*> m_kioSchemeHandlers;
 };
-
-#endif // KDESUPPORTPLUGIN_H

src/plugins/KDEFrameworksIntegration/kioschemehandler.cpp

@@ -1,5 +1,5 @@
 /* ============================================================
-* KDESupport - KDE support plugin for Falkon
+* KDEFrameworksIntegration - KDE support plugin for Falkon
 * Copyright (C) 2018 David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify

src/plugins/KDEFrameworksIntegration/kioschemehandler.h

@@ -1,5 +1,5 @@
 /* ============================================================
-* KDESupport - KDE support plugin for Falkon
+* KDEFrameworksIntegration - KDE support plugin for Falkon
 * Copyright (C) 2018 David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify

src/plugins/KDEFrameworksIntegration/kwalletpasswordbackend.cpp

@@ -1,5 +1,5 @@
 /* ============================================================
-* KDESupport - KDE support plugin for Falkon
+* KDEFrameworksIntegration - KDE support plugin for Falkon
 * Copyright (C) 2013-2018 David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
@@ -16,7 +16,7 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * ============================================================ */
 #include "kwalletpasswordbackend.h"
-#include "kdesupportplugin.h"
+#include "kdeframeworksintegrationplugin.h"
 #include "mainapplication.h"
 #include "browserwindow.h"
 
@@ -48,7 +48,7 @@ KWalletPasswordBackend::KWalletPasswordBackend()
 
 QString KWalletPasswordBackend::name() const
 {
-    return KDESupportPlugin::tr("KWallet");
+    return KDEFrameworksIntegrationPlugin::tr("KWallet");
 }
 
 QVector<PasswordEntry> KWalletPasswordBackend::getEntries(const QUrl &url)

src/plugins/KDEFrameworksIntegration/kwalletpasswordbackend.h

@@ -1,5 +1,5 @@
 /* ============================================================
-* KDESupport - KDE support plugin for Falkon
+* KDEFrameworksIntegration - KDE support plugin for Falkon
 * Copyright (C) 2013-2014  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify

src/plugins/KDEFrameworksIntegration/metadata.desktop

@@ -1,13 +1,5 @@
 [Desktop Entry]
-Name=KDE Support
+Name=KDE Frameworks Integration
-Name[ca]=Suport pel KDE
-Name[ca@valencia]=Suport pel KDE
-Name[en_GB]=KDE Support
-Name[nl]=KDE ondersteuning
-Name[pt]=Suporte ao KDE
-Name[sv]=KDE-stöd
-Name[uk]=Підтримка KDE
-Name[x-test]=xxKDE Supportxx
 Comment=Provides support for KIO and storing passwords in KWallet
 Comment[ca]=Proporciona suport pel KIO i per emmagatzemar contrasenyes al KWallet
 Comment[ca@valencia]=Proporciona suport pel KIO i per emmagatzemar contrasenyes al KWallet
@@ -18,10 +10,10 @@ Comment[sv]=Tillhandahåller stöd KIO och för att lagra lösenord i plånboken
 Comment[uk]=Забезпечує підтримку засобів введення-виведення KIO і зберігання паролів у KWallet
 Comment[x-test]=xxProvides support for KIO and storing passwords in KWalletxx
 
-Icon=:kdesupport/data/icon.svg
+Icon=:kdeframeworksintegration/data/icon.svg
 Type=Service
 
 X-Falkon-Author=David Rosca
 X-Falkon-Email=nowrep@gmail.com
-X-Falkon-Version=0.2.0
+X-Falkon-Version=0.3.0
 X-Falkon-Settings=false

src/plugins/KDESupport/CMakeLists.txt

@@ -1,23 +0,0 @@
-set(KDESupport_SRCS
-    kdesupportplugin.cpp
-    kwalletpasswordbackend.cpp
-    kioschemehandler.cpp
-)
-
-ecm_create_qm_loader(KDESupport_SRCS falkon_kdesupport_qt)
-
-set(KDESupport_RSCS
-    kdesupport.qrc
-)
-qt5_add_resources(RSCS ${KDESupport_RSCS})
-
-add_library(KDESupport MODULE ${KDESupport_SRCS} ${RSCS})
-install(TARGETS KDESupport DESTINATION ${FALKON_INSTALL_PLUGINDIR})
-target_link_libraries(KDESupport
-    FalkonPrivate
-    KF5::Wallet
-    KF5::KIOCore
-    KF5::KIOWidgets
-    KF5::Crash
-    KF5::CoreAddons
-)