[frameworks/kio] /: Remove the cache KCM

David Faure null at kde.org
Fri May 7 11:06:09 BST 2021


Git commit 581fab08ff4d5539e4684adcffc74ec3517ce29d by David Faure, on behalf of Nicolas Fella.
Committed on 07/05/2021 at 10:05.
Pushed by dfaure into branch 'master'.

Remove the cache KCM

Same reasoning as for
https://invent.kde.org/frameworks/kio/-/merge_requests/438.

It is very targeted towards KIO-based browsers which don't really exist
any more.

The setting is also global to everything that uses KIO and it's a bit
questionable whether for example webdav browsing in Dolphin should
automatically have the same cache settings as network access in Choqok.

It being part of system settings is also confusing for users since it
gives the false impression of true globality. They might expect it to
affect Firefox or Webengine-based Konqueror which it does not.

M  +0    -1    docs/kcontrol5/CMakeLists.txt
D  +0    -2    docs/kcontrol5/cache/CMakeLists.txt
D  +0    -66   docs/kcontrol5/cache/index.docbook
M  +1    -3    src/kcms/kio/CMakeLists.txt
D  +0    -116  src/kcms/kio/cache.cpp
D  +0    -195  src/kcms/kio/cache.desktop
D  +0    -38   src/kcms/kio/cache.h
D  +0    -221  src/kcms/kio/cache.ui
M  +1    -3    src/kcms/kio/main.cpp

https://invent.kde.org/frameworks/kio/commit/581fab08ff4d5539e4684adcffc74ec3517ce29d

diff --git a/docs/kcontrol5/CMakeLists.txt b/docs/kcontrol5/CMakeLists.txt
index 2dd1ae16a..6c2f21b07 100644
--- a/docs/kcontrol5/CMakeLists.txt
+++ b/docs/kcontrol5/CMakeLists.txt
@@ -1,4 +1,3 @@
-add_subdirectory(cache)
 add_subdirectory(cookies)
 add_subdirectory(netpref)
 add_subdirectory(proxy)
diff --git a/docs/kcontrol5/cache/CMakeLists.txt b/docs/kcontrol5/cache/CMakeLists.txt
deleted file mode 100644
index 3a6336e20..000000000
--- a/docs/kcontrol5/cache/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-########### install files ###############
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol5/cache)
diff --git a/docs/kcontrol5/cache/index.docbook b/docs/kcontrol5/cache/index.docbook
deleted file mode 100644
index 155c90b83..000000000
--- a/docs/kcontrol5/cache/index.docbook
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN"
-"dtd/kdedbx45.dtd" [
-<!ENTITY % addindex "IGNORE">
-<!ENTITY % English "INCLUDE" > <!-- change language only here -->
-]>
-
-<article id="cache" lang="&language;">
-<title>Cache</title>
-<articleinfo>
-
-<authorgroup>
-<author><firstname>Lauri</firstname><surname>Watts</surname></author>
-
-<!-- TRANS:ROLES_OF_TRANSLATORS -->
-</authorgroup>
-
-<date>2016-11-10</date>
-<releaseinfo>Frameworks 5.29</releaseinfo>
-
-<keywordset>
-<keyword>KDE</keyword>
-<keyword>Systemsettings</keyword>
-<keyword>Konqueror</keyword>
-<keyword>Cache</keyword>
-</keywordset>
-</articleinfo>
-
-<para>This module allows you to control the size of the local cache
-folder used by &konqueror;. Note that each user account on your
-computer has a separate cache folder, and this folder is not
-shared with other web browsers such as &firefox;.</para>
-
-<para>Storing local copies of web pages that you have visited allows
-&konqueror; to quickly load their contents on subsequent visits. It
-will only be necessary to reload the contents from the original site
-if they have changed since your last visit, or if you click the reload
-button in &konqueror;.</para>
-
-<para>If you really do not want any of the web pages you visit to be
-stored on your computer, you can disable &konqueror;'s disk cache by
-clearing the checkbox labeled <guilabel>Use cache</guilabel>.</para>
-
-<para>You can set here how aggressively &konqueror; keeps the cache up
-to date. <guilabel>Keep cache in sync</guilabel> means that &konqueror;
-will hit the cache for all objects, downloading them if they are not
-there, and then display the item from the cache.  <guilabel>Use cache
-whenever possible</guilabel> means that &konqueror; will try the cache,
-and if an object is not there, it will directly download it for display.
-<guilabel>Offline browsing mode</guilabel> means that &konqueror; will
-try the cache, and if an object is not there, it will not attempt to
-download it from the Internet.</para>
-
-<para>You can control the size of the cache by typing a number into the
-text box labeled <guilabel>Disk cache size:</guilabel>.  This is the
-average amount of space in kilobytes that the cache folder is allowed
-to use. When the cache grows too large, &konqueror; will delete older
-files to reduce the size of the cache folder.</para>
-
-<para>This is however, only an average, and during a browsing session
-the cache could become substantially larger.</para>
-
-<para>You can use the <guibutton>Clear Cache</guibutton> button to empty
-the cache at any time.</para>
-
-</article>
diff --git a/src/kcms/kio/CMakeLists.txt b/src/kcms/kio/CMakeLists.txt
index 11cd239f2..5281fc7dc 100644
--- a/src/kcms/kio/CMakeLists.txt
+++ b/src/kcms/kio/CMakeLists.txt
@@ -12,11 +12,9 @@ set(kcm_kio_PART_SRCS
     smbrodlg.cpp
     kproxydlg.cpp
     netpref.cpp
-    cache.cpp
     ksaveioconfig.cpp)
 
 ki18n_wrap_ui(kcm_kio_PART_SRCS
-    cache.ui
     kproxydlg.ui
     kcookiespolicies.ui
     kcookiesmanagement.ui
@@ -41,5 +39,5 @@ install(TARGETS kcm_kio  DESTINATION ${KDE_INSTALL_PLUGINDIR} )
 
 ########### install files ###############
 
-install( FILES smb.desktop cookies.desktop cache.desktop
+install( FILES smb.desktop cookies.desktop
     netpref.desktop proxy.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
diff --git a/src/kcms/kio/cache.cpp b/src/kcms/kio/cache.cpp
deleted file mode 100644
index 6d5e75ccb..000000000
--- a/src/kcms/kio/cache.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
-    cache.cpp - Proxy configuration dialog
-    SPDX-FileCopyrightText: 2001, 2002, 2003 Dawit Alemayehu <adawit at kde.org>
-    SPDX-License-Identifier: LGPL-2.0-only
-*/
-
-// Own
-#include "cache.h"
-
-// Qt
-#include <QCheckBox>
-#include <QPushButton>
-#include <QStandardPaths>
-
-// KDE
-#include <KLocalizedString>
-#include <KPluginFactory>
-#include <KProcess>
-#include <config-kiocore.h>
-#include <http_slave_defaults.h>
-
-// Local
-#include "ksaveioconfig.h"
-
-K_PLUGIN_FACTORY_DECLARATION(KioConfigFactory)
-
-CacheConfigModule::CacheConfigModule(QWidget *parent, const QVariantList &)
-    : KCModule(parent)
-{
-    ui.setupUi(this);
-
-    connect(ui.clearCacheButton, &QAbstractButton::clicked, this, &CacheConfigModule::clearCache);
-}
-
-CacheConfigModule::~CacheConfigModule()
-{
-}
-
-void CacheConfigModule::load()
-{
-    ui.cbUseCache->setChecked(KProtocolManager::useCache());
-    ui.sbMaxCacheSize->setValue(KProtocolManager::maxCacheSize());
-
-    KIO::CacheControl cc = KProtocolManager::cacheControl();
-
-    if (cc == KIO::CC_Verify)
-        ui.rbVerifyCache->setChecked(true);
-    else if (cc == KIO::CC_Refresh)
-        ui.rbVerifyCache->setChecked(true);
-    else if (cc == KIO::CC_CacheOnly)
-        ui.rbOfflineMode->setChecked(true);
-    else if (cc == KIO::CC_Cache)
-        ui.rbCacheIfPossible->setChecked(true);
-
-    // Config changed notifications...
-    connect(ui.cbUseCache, &QAbstractButton::toggled, this, &CacheConfigModule::configChanged);
-    connect(ui.rbVerifyCache, &QAbstractButton::toggled, this, &CacheConfigModule::configChanged);
-    connect(ui.rbOfflineMode, &QAbstractButton::toggled, this, &CacheConfigModule::configChanged);
-    connect(ui.rbCacheIfPossible, &QAbstractButton::toggled, this, &CacheConfigModule::configChanged);
-    connect(ui.sbMaxCacheSize, QOverload<int>::of(&QSpinBox::valueChanged), this, &CacheConfigModule::configChanged);
-    Q_EMIT changed(false);
-}
-
-void CacheConfigModule::save()
-{
-    KSaveIOConfig::setUseCache(ui.cbUseCache->isChecked());
-    KSaveIOConfig::setMaxCacheSize(ui.sbMaxCacheSize->value());
-
-    if (!ui.cbUseCache->isChecked())
-        KSaveIOConfig::setCacheControl(KIO::CC_Refresh);
-    else if (ui.rbVerifyCache->isChecked())
-        KSaveIOConfig::setCacheControl(KIO::CC_Refresh);
-    else if (ui.rbOfflineMode->isChecked())
-        KSaveIOConfig::setCacheControl(KIO::CC_CacheOnly);
-    else if (ui.rbCacheIfPossible->isChecked())
-        KSaveIOConfig::setCacheControl(KIO::CC_Cache);
-
-    KProtocolManager::reparseConfiguration();
-
-    // Update running io-slaves...
-    KSaveIOConfig::updateRunningIOSlaves(this);
-
-    Q_EMIT changed(false);
-}
-
-void CacheConfigModule::defaults()
-{
-    ui.cbUseCache->setChecked(true);
-    ui.rbVerifyCache->setChecked(true);
-    ui.sbMaxCacheSize->setValue(DEFAULT_MAX_CACHE_SIZE);
-}
-
-QString CacheConfigModule::quickHelp() const
-{
-    return i18n(
-        "<h1>Cache</h1><p>This module lets you configure your cache settings.</p>"
-        "<p>This specific cache is an area on the disk where recently "
-        "read web pages are stored. If you want to retrieve a web "
-        "page again that you have recently read, it will not be "
-        "downloaded from the Internet, but rather retrieved from the "
-        "cache, which is a lot faster.</p>");
-}
-
-void CacheConfigModule::configChanged()
-{
-    Q_EMIT changed(true);
-}
-
-void CacheConfigModule::clearCache()
-{
-    const QString exe = QFile::decodeName(KDE_INSTALL_FULL_LIBEXECDIR_KF5 "/kio_http_cache_cleaner");
-
-    if (QFile::exists(exe)) {
-        QProcess::startDetached(exe, QStringList(QStringLiteral("--clear-all")));
-    }
-}
diff --git a/src/kcms/kio/cache.desktop b/src/kcms/kio/cache.desktop
deleted file mode 100644
index 6357556f1..000000000
--- a/src/kcms/kio/cache.desktop
+++ /dev/null
@@ -1,195 +0,0 @@
-[Desktop Entry]
-Type=Service
-X-KDE-ServiceTypes=KCModule
-X-DocPath=kcontrol5/cache/index.html
-Icon=preferences-web-browser-cache
-
-X-KDE-Library=kcm_kio
-X-KDE-PluginKeyword=cache
-X-KDE-ParentApp=kcontrol
-
-X-KDE-System-Settings-Parent-Category=networksettings
-X-KDE-Weight=80
-
-Name=Cache
-Name[af]=Kas
-Name[ar]=الخبيئة
-Name[as]=কেছে
-Name[ast]=Caché
-Name[az]=Keş
-Name[be]=Кэш
-Name[be at latin]=Padručnaja pamiać
-Name[bg]=Временна памет
-Name[bn]=ক্যাশে (Cache)
-Name[bn_IN]=ক্যাশে
-Name[br]=Krubuilh
-Name[ca]=Memòria cau
-Name[ca at valencia]=Memòria cau
-Name[cs]=Mezipaměť
-Name[csb]=Cache
-Name[cy]=Cache
-Name[da]=Cache
-Name[de]=Zwischenspeicher
-Name[el]=Λανθάνουσα μνήμη
-Name[en_GB]=Cache
-Name[eo]=Tenejo
-Name[es]=Caché
-Name[et]=Puhver
-Name[eu]=Cachea
-Name[fa]=نهانگاه
-Name[fi]=Välimuisti
-Name[fr]=Cache
-Name[fy]=Lyts ûnthâld
-Name[ga]=Taisce
-Name[gd]=Tasgadan
-Name[gl]=Caché
-Name[gu]=કૅશ
-Name[he]=מטמון
-Name[hne]=कैस
-Name[hr]=Pohrana
-Name[hsb]=Temporarny pomjatk
-Name[hu]=Gyorsítótár
-Name[ia]=Cache
-Name[id]=Cache
-Name[it]=Cache
-Name[ja]=キャッシュ
-Name[kk]=Кэш
-Name[kn]=ಸಿದ್ಧಸ್ಮೃತಿ (ಕ್ಯಾಶೆ)
-Name[ko]=캐시
-Name[ku]=Pêşbîr
-Name[lt]=Podėlis
-Name[mai]=कैश
-Name[mk]=Кеш
-Name[ml]=കാഷ്
-Name[mr]=कैश
-Name[ms]=Cache
-Name[nb]=Mellomlager
-Name[nds]=Twischenspieker
-Name[ne]=क्यास
-Name[nl]=Cache
-Name[nn]=Mellomlager
-Name[oc]=Escondedor
-Name[or]=କ୍ୟାଶେ
-Name[pa]=ਕੈਸ਼
-Name[pl]=Bufor
-Name[pt]='Cache'
-Name[pt_BR]=Cache
-Name[ro]=Cache
-Name[ru]=Кэш
-Name[se]=Gaskarájus
-Name[si]=කැච්
-Name[sk]=Vyrovnávacia pamäť
-Name[sl]=Predpomnilnik
-Name[sr]=Кеш
-Name[sr at ijekavian]=Кеш
-Name[sr at ijekavianlatin]=Keš
-Name[sr at latin]=Keš
-Name[sv]=Cache
-Name[ta]=தற்காலிக நினைவிடம்
-Name[te]=క్యాచి
-Name[tg]=Зерҳофиза
-Name[th]=แคช
-Name[tr]=Önbellek
-Name[uk]=Кеш
-Name[uz]=Kesh
-Name[uz at cyrillic]=Кэш
-Name[vi]=Bộ nhớ sẵn
-Name[wa]=Muchete
-Name[xh]=Indawo yokugcina efihlakeleyo
-Name[x-test]=xxCachexx
-Name[zh_CN]=缓存
-Name[zh_TW]=快取
-
-Comment=Configure web cache settings
-Comment[ar]=إعدادات ضبط خبيئة الوبّ
-Comment[az]=Veb keş ayarlarını tənzimlə
-Comment[ca]=Configura les opcions per a la memòria cau del web
-Comment[ca at valencia]=Configura les opcions per a la memòria cau del web
-Comment[cs]=Nastavení mezipaměti pro webové stránky
-Comment[da]=Indstil web-cache
-Comment[de]=Einstellungen zum Zwischenspeicher vornehmen
-Comment[el]=Διαμόρφωση ρυθμίσεων web cache
-Comment[en_GB]=Configure web cache settings
-Comment[es]=Configurar las preferencias de la caché web
-Comment[et]=Veebi vahemälu seadistamine
-Comment[eu]=Konfiguratu web-cache ezarpenak
-Comment[fi]=Välimuistin asetukset
-Comment[fr]=Configuration des paramètres du cache Web
-Comment[gd]=Rèitich roghainnean an tasgadain-lìn
-Comment[gl]=Configurar as opcións da caché web
-Comment[hu]=A webes gyorsítótár beállításai
-Comment[ia]=Configura le preferentias del cache del web
-Comment[id]=Konfigurasikan pengaturan cache web
-Comment[it]=Configura le impostazioni della cache del Web
-Comment[ja]=ウェブキャッシュの設定
-Comment[ko]=웹 캐시 설정
-Comment[lt]=Konfigūruoti saityno podėlio nuostatas
-Comment[nb]=Tilpass innstillinger for nett-mellomlager
-Comment[nl]=Hier kunt u de webcache instellen
-Comment[nn]=Oppsett av vevmellomlager
-Comment[pl]=Ustawienia pamięci podręcznej sieci
-Comment[pt]=Configurar as opções de 'cache' da Web
-Comment[pt_BR]=Configura as opções de cache da Internet
-Comment[ro]=Configurează opțiunile cache-ului web
-Comment[ru]=Настройка кэша
-Comment[sk]=Nastavenie vyrovnávacej pamäte pre WWW
-Comment[sl]=Nastavitve spletnega predpomnilnika
-Comment[sr]=Подешавање веб кеша
-Comment[sr at ijekavian]=Подешавање веб кеша
-Comment[sr at ijekavianlatin]=Podešavanje veb keša
-Comment[sr at latin]=Podešavanje veb keša
-Comment[sv]=Anpassa webbcacheinställningar
-Comment[ta]=இணைய தற்காலிக நினைவிடத்தை அமை
-Comment[tg]=Танзимоти зерҳофизаи танзими сомона
-Comment[tr]=Ağ önbellek ayarlarını yapılandırın
-Comment[uk]=Налаштування параметрів кешу сторінок інтернету
-Comment[vi]=Cấu hình thiết lập bộ nhớ sẵn web
-Comment[x-test]=xxConfigure web cache settingsxx
-Comment[zh_CN]=配置网页缓存设置
-Comment[zh_TW]=設定網頁快取設定
-
-X-KDE-Keywords=Cache,History,Browsing History,Ports,Size
-X-KDE-Keywords[ast]=Caché,Historial,Historial de restolar,Puertos,Tamañu
-X-KDE-Keywords[az]=Keş Tarix, Baxış Tarixi, Portlar, Ölçü
-X-KDE-Keywords[ca]=Memòria cau,Historial,Historial del navegador,Ports,Mida
-X-KDE-Keywords[ca at valencia]=Memòria cau,Historial,Historial del navegador,Ports,Mida
-X-KDE-Keywords[da]=Cache,historik,browserhistorik,porte,størrelse
-X-KDE-Keywords[de]=Cache,Verlauf,History,Ports,Zwischenspeicher,Größe
-X-KDE-Keywords[el]=Cache, Ιστορικό,Περιήγηση ιστορικού,Θύρες,Μέγεθος
-X-KDE-Keywords[en_GB]=Cache,History,Browsing History,Ports,Size
-X-KDE-Keywords[es]=Caché,Historial,Historial de navegación,Puertos,Tamaño
-X-KDE-Keywords[et]=Puhver,Vahemälu,Ajalugu,Sirvimisajalugu,Pordid,Suurus
-X-KDE-Keywords[eu]=Cache,Historia,Historia arakatu,Atakak,Neurria
-X-KDE-Keywords[fi]=Välimuisti,Historia,Selaushistoria,Portit,Koko
-X-KDE-Keywords[fr]=Cache, historique, historique de navigation, ports, taille
-X-KDE-Keywords[gd]=Cache,History,Browsing History,Ports,Size,tasgadan,eachdraidh,eachdraidh brabhsaidh,port,puirt,meud
-X-KDE-Keywords[gl]=Caché,historial,historial de navegación,portos,tamaño
-X-KDE-Keywords[hu]=Gyorsítótár,Előzmények,Böngészési előzmények,Portok,Méret
-X-KDE-Keywords[ia]=Cache,Historia,Historia de navigation,Portos,Grandor
-X-KDE-Keywords[id]=Cache,Histori,Histori Penelusuran,Port,Ukuran
-X-KDE-Keywords[it]=Cache,cronologia,cronologia di navigazione,porte,dimensione
-X-KDE-Keywords[ko]=Cache,History,Browsing History,Ports,Size,캐시,과거 기록,히스토리,포트,크기
-X-KDE-Keywords[lt]=Podėlis,Podelis,Naršymo praeitis,Narsymo praeitis,Naršymo žurnalas,Narsymo zurnalas,Naršymo istorija,Narsymo istorija,Prievadai,Dydis
-X-KDE-Keywords[nb]=Mellomlager,Historie,Nettleserhistorie,Porter,Størrelse
-X-KDE-Keywords[nl]=Cache,geschiedenis,browse geschiedenis,poorten,grootte
-X-KDE-Keywords[nn]=hurtiglager,historikk,surfehistorikk,portar,storleik
-X-KDE-Keywords[pl]=Pamięć podręczna,Historia,Historia przeglądania,Porty,Rozmiar
-X-KDE-Keywords[pt]=Cache,Histórico,Histórico de Navegação,Portos,Tamanho
-X-KDE-Keywords[pt_BR]=Cache,Histórico,Histórico de navegação,Portas,Tamanho
-X-KDE-Keywords[ro]=Cache,Istoric,Istoric navigare,Porturi,Dimensiune
-X-KDE-Keywords[ru]=Cache,History,Browsing History,Ports,Size,кэш,история,журнал,порты,размер
-X-KDE-Keywords[sk]=Cache,História,História surfovania,Porty,Veľkosť
-X-KDE-Keywords[sl]=Predpomnilnik,Zgodovina,Zgodovina brskanja,Vrata,Velikost
-X-KDE-Keywords[sr]=Cache,History,Browsing History,Ports,Size,кеш,историјат,прегледање,портови,величина
-X-KDE-Keywords[sr at ijekavian]=Cache,History,Browsing History,Ports,Size,кеш,историјат,прегледање,портови,величина
-X-KDE-Keywords[sr at ijekavianlatin]=Cache,History,Browsing History,Ports,Size,keš,istorijat,pregledanje,portovi,veličina
-X-KDE-Keywords[sr at latin]=Cache,History,Browsing History,Ports,Size,keš,istorijat,pregledanje,portovi,veličina
-X-KDE-Keywords[sv]=Cache,Historik,Webbläsningshistorik,Portar,Storlek
-X-KDE-Keywords[ta]=Cache,History,Browsing History,Ports,Size,உலாவல் வரலாறு,தற்காலிக நினைவிடம்,புறை,அளவு
-X-KDE-Keywords[tg]=Зерҳофиза,Таърих,Таърихи тамошо,бандарҳо,Андоза
-X-KDE-Keywords[tr]=Önbellek,Geçmiş,Tarayıcı Geçmişi,Portlar,Boyut
-X-KDE-Keywords[uk]=Cache,History,Browsing History,Ports,Size,кеш,журнал,історія,перегляд,порти,розмір
-X-KDE-Keywords[vi]=Cache,History,Browsing History,Ports,Size,Bộ nhớ sẵn,Lịch sử,Lịch sử duyệt,Cổng,Kích thước
-X-KDE-Keywords[x-test]=xxCachexx,xxHistoryxx,xxBrowsing Historyxx,xxPortsxx,xxSizexx
-X-KDE-Keywords[zh_CN]=Cache,History,Browsing History,Ports,Size,缓存,历史,浏览历史,端口,大小
-X-KDE-Keywords[zh_TW]=Cache,History,Browsing History,Ports,Size
diff --git a/src/kcms/kio/cache.h b/src/kcms/kio/cache.h
deleted file mode 100644
index 1e2460596..000000000
--- a/src/kcms/kio/cache.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-    cache.h - Proxy configuration dialog
-    SPDX-FileCopyrightText: 2001, 2002, 2003 Dawit Alemayehu <adawit at kde.org>
-
-    SPDX-License-Identifier: LGPL-2.0-only
-*/
-
-#ifndef CACHECONFIGMODULE_H
-#define CACHECONFIGMODULE_H
-
-// KDE
-#include <KCModule>
-
-// Local
-#include "ui_cache.h"
-
-class CacheConfigModule : public KCModule
-{
-    Q_OBJECT
-
-public:
-    CacheConfigModule(QWidget *parent, const QVariantList &args);
-    ~CacheConfigModule();
-
-    void load() override;
-    void save() override;
-    void defaults() override;
-    QString quickHelp() const override;
-
-private Q_SLOTS:
-    void configChanged();
-    void clearCache();
-
-private:
-    Ui::CacheConfigUI ui;
-};
-
-#endif // CACHE_H
diff --git a/src/kcms/kio/cache.ui b/src/kcms/kio/cache.ui
deleted file mode 100644
index cc2c85b76..000000000
--- a/src/kcms/kio/cache.ui
+++ /dev/null
@@ -1,221 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>CacheConfigUI</class>
- <widget class="QWidget" name="CacheConfigUI">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>349</width>
-    <height>234</height>
-   </rect>
-  </property>
-  <layout class="QGridLayout">
-   <item row="0" column="0" colspan="5">
-    <widget class="QCheckBox" name="cbUseCache">
-     <property name="whatsThis">
-      <string>Check this box if you want the web pages you visit to be stored on your hard disk for quicker access. The stored pages will only be updated as needed instead of on every visit to that site. This is especially useful if you have a slow connection to the Internet.</string>
-     </property>
-     <property name="text">
-      <string>&Use cache</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0">
-    <spacer>
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Fixed</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>16</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="1" column="1" colspan="4">
-    <widget class="QGroupBox" name="bgCachePolicy">
-     <property name="enabled">
-      <bool>false</bool>
-     </property>
-     <property name="title">
-      <string>Policy</string>
-     </property>
-     <layout class="QVBoxLayout">
-      <item>
-       <widget class="QRadioButton" name="rbVerifyCache">
-        <property name="whatsThis">
-         <string>Verify whether the cached web page is valid before attempting to fetch the web page again.</string>
-        </property>
-        <property name="text">
-         <string>&Keep cache in sync</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QRadioButton" name="rbCacheIfPossible">
-        <property name="whatsThis">
-         <string>Always use documents from the cache when available. You can still use the reload button to synchronize the cache with the remote host.</string>
-        </property>
-        <property name="text">
-         <string>Use cache whenever &possible</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QRadioButton" name="rbOfflineMode">
-        <property name="whatsThis">
-         <string>Do not fetch web pages that are not already stored in the cache. Offline mode prevents you from viewing pages that you have not previously visited.</string>
-        </property>
-        <property name="text">
-         <string>O&ffline browsing mode</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="2" column="1">
-    <widget class="QLabel" name="lbMaxCacheSize">
-     <property name="enabled">
-      <bool>false</bool>
-     </property>
-     <property name="text">
-      <string>Disk cache &size:</string>
-     </property>
-     <property name="buddy">
-      <cstring>sbMaxCacheSize</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="2">
-    <widget class="QSpinBox" name="sbMaxCacheSize">
-     <property name="enabled">
-      <bool>false</bool>
-     </property>
-     <property name="maximum">
-      <number>999999</number>
-     </property>
-     <property name="suffix">
-      <string> KiB</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="3">
-    <widget class="QPushButton" name="clearCacheButton">
-     <property name="enabled">
-      <bool>false</bool>
-     </property>
-     <property name="text">
-      <string>C&lear Cache</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="4">
-    <spacer>
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>0</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="3" column="0" colspan="5">
-    <spacer>
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>16</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
- </customwidgets>
- <resources/>
- <connections>
-  <connection>
-   <sender>cbUseCache</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>bgCachePolicy</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>20</x>
-     <y>20</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>60</x>
-     <y>60</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>cbUseCache</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>lbMaxCacheSize</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>20</x>
-     <y>20</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>60</x>
-     <y>181</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>cbUseCache</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>sbMaxCacheSize</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>20</x>
-     <y>20</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>164</x>
-     <y>181</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>cbUseCache</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>clearCacheButton</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>20</x>
-     <y>20</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>284</x>
-     <y>181</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>
diff --git a/src/kcms/kio/main.cpp b/src/kcms/kio/main.cpp
index 8bacb10ca..2c0ebc29b 100644
--- a/src/kcms/kio/main.cpp
+++ b/src/kcms/kio/main.cpp
@@ -13,7 +13,6 @@
 #include <KPluginFactory>
 
 // Local
-#include "cache.h"
 #include "kcookiesmain.h"
 #include "kproxydlg.h"
 #include "netpref.h"
@@ -21,7 +20,6 @@
 
 K_PLUGIN_FACTORY(KioConfigFactory, registerPlugin<SMBRoOptions>(QStringLiteral("smb")); registerPlugin<KIOPreferences>(QStringLiteral("netpref"));
                  registerPlugin<KProxyDialog>(QStringLiteral("proxy"));
-                 registerPlugin<KCookiesMain>(QStringLiteral("cookie"));
-                 registerPlugin<CacheConfigModule>(QStringLiteral("cache"));)
+                 registerPlugin<KCookiesMain>(QStringLiteral("cookie"));)
 
 #include "main.moc"


More information about the kde-doc-english mailing list