From 9bff0f1b5cbbdcf39b453d12366a7141b775b4ed Mon Sep 17 00:00:00 2001
From: David Rosca <nowrep@gmail.com>
Date: Tue, 9 Jan 2018 17:57:29 +0100
Subject: [PATCH] Plugins: Remove no longer used Click2Flash settings

---
 src/lib/plugins/plugins.cpp         | 24 +-----------------------
 src/lib/plugins/plugins.h           | 13 +------------
 src/lib/preferences/preferences.cpp |  1 -
 3 files changed, 2 insertions(+), 36 deletions(-)

diff --git a/src/lib/plugins/plugins.cpp b/src/lib/plugins/plugins.cpp
index 32e84fb01..10b4dfd4d 100644
--- a/src/lib/plugins/plugins.cpp
+++ b/src/lib/plugins/plugins.cpp
@@ -1,6 +1,6 @@
 /* ============================================================
 * Falkon - Qt web browser
-* Copyright (C) 2010-2014  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2018 David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -97,37 +97,15 @@ void Plugins::loadSettings()
         for (int i = 0; i < m_allowedPlugins.count(); ++i)
             m_allowedPlugins[i] = dir.absoluteFilePath(QFileInfo(m_allowedPlugins[i]).fileName());
     }
-
-    c2f_loadSettings();
 }
 
 void Plugins::shutdown()
 {
-    c2f_saveSettings();
-
     foreach (PluginInterface* iPlugin, m_loadedPlugins) {
         iPlugin->unload();
     }
 }
 
-void Plugins::c2f_loadSettings()
-{
-    Settings settings;
-    settings.beginGroup("ClickToFlash");
-    c2f_whitelist = settings.value("whitelist", QStringList()).toStringList();
-    c2f_enabled = settings.value("Enabled", true).toBool();
-    settings.endGroup();
-}
-
-void Plugins::c2f_saveSettings()
-{
-    Settings settings;
-    settings.beginGroup("ClickToFlash");
-    settings.setValue("whitelist", c2f_whitelist);
-    settings.setValue("Enabled", c2f_enabled);
-    settings.endGroup();
-}
-
 void Plugins::loadPlugins()
 {
     if (!m_pluginsEnabled) {
diff --git a/src/lib/plugins/plugins.h b/src/lib/plugins/plugins.h
index 6e90d9059..f38d68bfc 100644
--- a/src/lib/plugins/plugins.h
+++ b/src/lib/plugins/plugins.h
@@ -1,6 +1,6 @@
 /* ============================================================
 * Falkon - Qt web browser
-* Copyright (C) 2010-2014  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2018 David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -66,15 +66,6 @@ public:
 
     void shutdown();
 
-    // CLick2Flash
-    void c2f_loadSettings();
-    void c2f_saveSettings();
-    void c2f_addWhitelist(QString page) { c2f_whitelist.append(page); }
-    void c2f_removeWhitelist(QString page) { c2f_whitelist.removeOne(page); }
-    void c2f_setEnabled(bool en) { c2f_enabled = en; }
-    bool c2f_isEnabled() { return c2f_enabled; }
-    QStringList c2f_getWhiteList() { return c2f_whitelist; }
-
     // SpeedDial
     SpeedDial* speedDial() { return m_speedDial; }
 
@@ -103,8 +94,6 @@ private:
     bool m_pluginsLoaded;
 
     SpeedDial* m_speedDial;
-    QStringList c2f_whitelist;
-    bool c2f_enabled;
 };
 
 Q_DECLARE_METATYPE(Plugins::Plugin)
diff --git a/src/lib/preferences/preferences.cpp b/src/lib/preferences/preferences.cpp
index bf36c21ce..bf8f58e1f 100644
--- a/src/lib/preferences/preferences.cpp
+++ b/src/lib/preferences/preferences.cpp
@@ -1066,7 +1066,6 @@ void Preferences::saveSettings()
     mApp->cookieJar()->loadSettings();
     mApp->history()->loadSettings();
     mApp->reloadSettings();
-    mApp->plugins()->c2f_saveSettings();
     mApp->desktopNotifications()->loadSettings();
     mApp->autoFill()->loadSettings();
     mApp->networkManager()->loadSettings();