From de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 01:02:02 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- kcontrol/kio/CMakeLists.txt | 2 +- kcontrol/kio/Makefile.am | 2 +- kcontrol/kio/cache.cpp | 2 +- kcontrol/kio/cache.desktop | 2 +- kcontrol/kio/cookies.desktop | 2 +- kcontrol/kio/kcookiespolicies.cpp | 2 +- kcontrol/kio/kioslave.kcfg | 44 --------------------------------------- kcontrol/kio/kioslave.kcfgc | 5 ----- kcontrol/kio/kmanualproxydlg.cpp | 2 +- kcontrol/kio/ksaveioconfig.cpp | 6 +++--- kcontrol/kio/ksaveioconfig.h | 2 +- kcontrol/kio/lanbrowser.desktop | 2 +- kcontrol/kio/netpref.cpp | 4 ++-- kcontrol/kio/netpref.desktop | 2 +- kcontrol/kio/proxy.desktop | 2 +- kcontrol/kio/smb.desktop | 2 +- kcontrol/kio/smbrodlg.cpp | 6 +++--- kcontrol/kio/socks.cpp | 2 +- kcontrol/kio/tdeioslave.kcfg | 44 +++++++++++++++++++++++++++++++++++++++ kcontrol/kio/tdeioslave.kcfgc | 5 +++++ kcontrol/kio/useragent.desktop | 2 +- kcontrol/kio/useragentdlg.cpp | 4 ++-- 22 files changed, 73 insertions(+), 73 deletions(-) delete mode 100644 kcontrol/kio/kioslave.kcfg delete mode 100644 kcontrol/kio/kioslave.kcfgc create mode 100644 kcontrol/kio/tdeioslave.kcfg create mode 100644 kcontrol/kio/tdeioslave.kcfgc (limited to 'kcontrol/kio') diff --git a/kcontrol/kio/CMakeLists.txt b/kcontrol/kio/CMakeLists.txt index aa0d185e3..c807b075e 100644 --- a/kcontrol/kio/CMakeLists.txt +++ b/kcontrol/kio/CMakeLists.txt @@ -50,6 +50,6 @@ tde_add_kpart( kcm_kio AUTOMOC kproxydlg_ui.ui kcookiesmanagementdlg_ui.ui kcookiespoliciesdlg_ui.ui policydlg_ui.ui useragentdlg_ui.ui uagentproviderdlg_ui.ui manualproxy_ui.ui envvarproxy_ui.ui cache_ui.ui - LINK kio-shared tdeutils-shared + LINK tdeio-shared tdeutils-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/kio/Makefile.am b/kcontrol/kio/Makefile.am index 29f0cf30f..e2d8d7ae5 100644 --- a/kcontrol/kio/Makefile.am +++ b/kcontrol/kio/Makefile.am @@ -23,7 +23,7 @@ messages: rc.cpp $(XGETTEXT) *.cpp -o $(podir)/kcmkio.pot update_DATA = socks.upd -updatedir = $(kde_datadir)/kconf_update +updatedir = $(kde_datadir)/tdeconf_update servicetypes_DATA = uasprovider.desktop servicetypesdir = $(kde_servicetypesdir) diff --git a/kcontrol/kio/cache.cpp b/kcontrol/kio/cache.cpp index eab4e54dd..db831ca6f 100644 --- a/kcontrol/kio/cache.cpp +++ b/kcontrol/kio/cache.cpp @@ -33,7 +33,7 @@ #include #include "ksaveioconfig.h" -#include +#include #include "cache.h" #include "cache_ui.h" diff --git a/kcontrol/kio/cache.desktop b/kcontrol/kio/cache.desktop index 315b0a450..affcb30bf 100644 --- a/kcontrol/kio/cache.desktop +++ b/kcontrol/kio/cache.desktop @@ -2,7 +2,7 @@ Type=Application DocPath=kcontrol/cache/index.html Icon=cache -Exec=kcmshell cache +Exec=tdecmshell cache X-TDE-Library=kio diff --git a/kcontrol/kio/cookies.desktop b/kcontrol/kio/cookies.desktop index 4bfae61e8..433be9a18 100644 --- a/kcontrol/kio/cookies.desktop +++ b/kcontrol/kio/cookies.desktop @@ -2,7 +2,7 @@ Type=Application DocPath=kcontrol/cookies/index.html Icon=cookie -Exec=kcmshell cookies +Exec=tdecmshell cookies X-TDE-Library=kio diff --git a/kcontrol/kio/kcookiespolicies.cpp b/kcontrol/kio/kcookiespolicies.cpp index 30f1859c4..ad32eef3e 100644 --- a/kcontrol/kio/kcookiespolicies.cpp +++ b/kcontrol/kio/kcookiespolicies.cpp @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include "ksaveioconfig.h" diff --git a/kcontrol/kio/kioslave.kcfg b/kcontrol/kio/kioslave.kcfg deleted file mode 100644 index 4dcce7191..000000000 --- a/kcontrol/kio/kioslave.kcfg +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - false - - - 10 - 2 - 3600 - - - 20 - 2 - 3600 - - - 15 - 2 - 3600 - - - 600 - 2 - 3600 - - - - - - - - - - - - - - - diff --git a/kcontrol/kio/kioslave.kcfgc b/kcontrol/kio/kioslave.kcfgc deleted file mode 100644 index 7b5ca780f..000000000 --- a/kcontrol/kio/kioslave.kcfgc +++ /dev/null @@ -1,5 +0,0 @@ -File=kio_ftprc.kcfg -ClassName=KioFtp -Singleton=true -Mutators=true - diff --git a/kcontrol/kio/kmanualproxydlg.cpp b/kcontrol/kio/kmanualproxydlg.cpp index f240791c2..dd5dcfd16 100644 --- a/kcontrol/kio/kmanualproxydlg.cpp +++ b/kcontrol/kio/kmanualproxydlg.cpp @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include "manualproxy_ui.h" #include "kmanualproxydlg.h" diff --git a/kcontrol/kio/ksaveioconfig.cpp b/kcontrol/kio/ksaveioconfig.cpp index 63e444b3b..b624cfa69 100644 --- a/kcontrol/kio/ksaveioconfig.cpp +++ b/kcontrol/kio/ksaveioconfig.cpp @@ -18,11 +18,11 @@ */ #include -#include +#include #include #include #include -#include +#include #include "ksaveioconfig.h" @@ -57,7 +57,7 @@ TDEConfig* KSaveIOConfig::config() d = new KSaveIOConfigPrivate; if (!d->config) - d->config = new TDEConfig("kioslaverc", false, false); + d->config = new TDEConfig("tdeioslaverc", false, false); return d->config; } diff --git a/kcontrol/kio/ksaveioconfig.h b/kcontrol/kio/ksaveioconfig.h index 27df8c51d..f14e98e22 100644 --- a/kcontrol/kio/ksaveioconfig.h +++ b/kcontrol/kio/ksaveioconfig.h @@ -29,7 +29,7 @@ class KSaveIOConfig { public: - /* Reload config file (kioslaverc) */ + /* Reload config file (tdeioslaverc) */ static void reparseConfiguration(); diff --git a/kcontrol/kio/lanbrowser.desktop b/kcontrol/kio/lanbrowser.desktop index b8ce5b10f..04e83e402 100644 --- a/kcontrol/kio/lanbrowser.desktop +++ b/kcontrol/kio/lanbrowser.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Icon=samba -Exec=kcmshell lanbrowser +Exec=tdecmshell lanbrowser X-TDE-Library=kio diff --git a/kcontrol/kio/netpref.cpp b/kcontrol/kio/netpref.cpp index b5788c973..b5879d0bd 100644 --- a/kcontrol/kio/netpref.cpp +++ b/kcontrol/kio/netpref.cpp @@ -3,11 +3,11 @@ #include #include -#include +#include #include #include #include -#include +#include #include "ksaveioconfig.h" #include "netpref.h" diff --git a/kcontrol/kio/netpref.desktop b/kcontrol/kio/netpref.desktop index 62f95bd5e..22f51170b 100644 --- a/kcontrol/kio/netpref.desktop +++ b/kcontrol/kio/netpref.desktop @@ -75,7 +75,7 @@ Comment[xh]=Qwalasela iinketho zomsebenzi womnatha ka wonke-wonke, njengamaxabis Comment[zh_CN]=配置通用网络首选项，例如超时值 Comment[zh_TW]=設定一般網路喜好設定，例如逾時值 Comment[zu]=Hlanganisela okuncanyelwa uwonkewonke koxhumano olusazekile, njengamanani esikhathi sokuphuma -Exec=kcmshell netpref +Exec=tdecmshell netpref Icon=network Keywords=timeout,iopref,netpref,network preferences,ftp Keywords[be]=Тэрмін чакання,Уласцівасці сеткі,timeout,iopref,netpref,network preferences,ftp diff --git a/kcontrol/kio/proxy.desktop b/kcontrol/kio/proxy.desktop index 937753bdc..81325dd6d 100644 --- a/kcontrol/kio/proxy.desktop +++ b/kcontrol/kio/proxy.desktop @@ -2,7 +2,7 @@ Type=Application DocPath=kcontrol/proxy/index.html Icon=proxy -Exec=kcmshell proxy +Exec=tdecmshell proxy X-TDE-Library=kio diff --git a/kcontrol/kio/smb.desktop b/kcontrol/kio/smb.desktop index b00a6b213..0e9cd2863 100644 --- a/kcontrol/kio/smb.desktop +++ b/kcontrol/kio/smb.desktop @@ -2,7 +2,7 @@ Type=Application DocPath=kcontrol/smb/index.html Icon=samba -Exec=kcmshell smb +Exec=tdecmshell smb X-TDE-Library=kio diff --git a/kcontrol/kio/smbrodlg.cpp b/kcontrol/kio/smbrodlg.cpp index 8ad181df6..9962555e7 100644 --- a/kcontrol/kio/smbrodlg.cpp +++ b/kcontrol/kio/smbrodlg.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include #include @@ -91,7 +91,7 @@ SMBRoOptions::~SMBRoOptions() void SMBRoOptions::load() { - TDEConfig *cfg = new TDEConfig("kioslaverc"); + TDEConfig *cfg = new TDEConfig("tdeioslaverc"); TQString tmp; cfg->setGroup( "Browser Settings/SMBro" ); @@ -124,7 +124,7 @@ void SMBRoOptions::load() void SMBRoOptions::save() { - TDEConfig *cfg = new TDEConfig("kioslaverc"); + TDEConfig *cfg = new TDEConfig("tdeioslaverc"); cfg->setGroup( "Browser Settings/SMBro" ); cfg->writeEntry( "User", m_userLe->text()); diff --git a/kcontrol/kio/socks.cpp b/kcontrol/kio/socks.cpp index ef77a93c3..50c5f8003 100644 --- a/kcontrol/kio/socks.cpp +++ b/kcontrol/kio/socks.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include diff --git a/kcontrol/kio/tdeioslave.kcfg b/kcontrol/kio/tdeioslave.kcfg new file mode 100644 index 000000000..4dcce7191 --- /dev/null +++ b/kcontrol/kio/tdeioslave.kcfg @@ -0,0 +1,44 @@ + + + + + + false + + + 10 + 2 + 3600 + + + 20 + 2 + 3600 + + + 15 + 2 + 3600 + + + 600 + 2 + 3600 + + + + + + + + + + + + + + + diff --git a/kcontrol/kio/tdeioslave.kcfgc b/kcontrol/kio/tdeioslave.kcfgc new file mode 100644 index 000000000..7b5ca780f --- /dev/null +++ b/kcontrol/kio/tdeioslave.kcfgc @@ -0,0 +1,5 @@ +File=kio_ftprc.kcfg +ClassName=KioFtp +Singleton=true +Mutators=true + diff --git a/kcontrol/kio/useragent.desktop b/kcontrol/kio/useragent.desktop index 56ba4a0a4..200f7b883 100644 --- a/kcontrol/kio/useragent.desktop +++ b/kcontrol/kio/useragent.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Icon=agent -Exec=kcmshell useragent +Exec=tdecmshell useragent DocPath=kcontrol/useragent/index.html diff --git a/kcontrol/kio/useragentdlg.cpp b/kcontrol/kio/useragentdlg.cpp index 29181f0a9..991200dd0 100644 --- a/kcontrol/kio/useragentdlg.cpp +++ b/kcontrol/kio/useragentdlg.cpp @@ -32,12 +32,12 @@ #include #include -#include +#include #include #include #include #include -#include +#include #include "ksaveioconfig.h" #include "fakeuaprovider.h" -- cgit v1.2.1