From 28edc0aa2ab09297288186f5bc15765eb7be58c0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:47:22 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- tdecore/ksimpleconfig.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tdecore/ksimpleconfig.cpp') diff --git a/tdecore/ksimpleconfig.cpp b/tdecore/ksimpleconfig.cpp index 6b4e13a14..5c17b665d 100644 --- a/tdecore/ksimpleconfig.cpp +++ b/tdecore/ksimpleconfig.cpp @@ -43,7 +43,7 @@ KSimpleConfig::KSimpleConfig(const TQString &fileName, bool bReadOnly) // the difference between KConfig and KSimpleConfig is just that // for KSimpleConfig an absolute filename is guaranteed if (!fileName.isNull() && TQDir::isRelativePath(fileName)) { - backEnd->changeFileName( KGlobal::dirs()-> + backEnd->changeFileName( TDEGlobal::dirs()-> saveLocation("config", TQString::null, !bReadOnly)+fileName, "config", false); } else { backEnd->changeFileName(fileName, "config", false); -- cgit v1.2.1 From 703fb0c89c2eee56a1e613e67a446db9d4287929 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:35:07 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- tdecore/ksimpleconfig.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'tdecore/ksimpleconfig.cpp') diff --git a/tdecore/ksimpleconfig.cpp b/tdecore/ksimpleconfig.cpp index 5c17b665d..5c0203a9f 100644 --- a/tdecore/ksimpleconfig.cpp +++ b/tdecore/ksimpleconfig.cpp @@ -38,9 +38,9 @@ #include "ksimpleconfig.h" KSimpleConfig::KSimpleConfig(const TQString &fileName, bool bReadOnly) - : KConfig(TQString::fromLatin1(""), bReadOnly, false) + : TDEConfig(TQString::fromLatin1(""), bReadOnly, false) { - // the difference between KConfig and KSimpleConfig is just that + // the difference between TDEConfig and KSimpleConfig is just that // for KSimpleConfig an absolute filename is guaranteed if (!fileName.isNull() && TQDir::isRelativePath(fileName)) { backEnd->changeFileName( TDEGlobal::dirs()-> @@ -52,16 +52,16 @@ KSimpleConfig::KSimpleConfig(const TQString &fileName, bool bReadOnly) reparseConfiguration(); } -KSimpleConfig::KSimpleConfig(KConfigBackEnd *backEnd, bool bReadOnly) - : KConfig(backEnd, bReadOnly) +KSimpleConfig::KSimpleConfig(TDEConfigBackEnd *backEnd, bool bReadOnly) + : TDEConfig(backEnd, bReadOnly) {} KSimpleConfig::~KSimpleConfig() { // we need to call the KSimpleConfig version of sync. Relying on the - // regular KConfig sync is bad, because the KSimpleConfig sync has + // regular TDEConfig sync is bad, because the KSimpleConfig sync has // different behavior. Syncing here will insure that the sync() call - // in the KConfig destructor doesn't actually do anything. + // in the TDEConfig destructor doesn't actually do anything. sync(); } @@ -76,6 +76,6 @@ void KSimpleConfig::sync() } void KSimpleConfig::virtual_hook( int id, void* data ) -{ KConfig::virtual_hook( id, data ); } +{ TDEConfig::virtual_hook( id, data ); } #include "ksimpleconfig.moc" -- cgit v1.2.1 From 5159cd2beb2e87806a5b54e9991b7895285c9d3e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 01:04:16 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- tdecore/ksimpleconfig.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tdecore/ksimpleconfig.cpp') diff --git a/tdecore/ksimpleconfig.cpp b/tdecore/ksimpleconfig.cpp index 5c0203a9f..55cf7485b 100644 --- a/tdecore/ksimpleconfig.cpp +++ b/tdecore/ksimpleconfig.cpp @@ -33,7 +33,7 @@ #include "kglobal.h" #include "kstandarddirs.h" -#include "kconfigbackend.h" +#include "tdeconfigbackend.h" #include "ksimpleconfig.h" -- cgit v1.2.1 From ed99a30644c19b0a3cf0d2147243532df4daa16b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 15 Feb 2013 21:57:54 -0600 Subject: Rename additional header files to avoid conflicts with KDE4 --- tdecore/ksimpleconfig.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tdecore/ksimpleconfig.cpp') diff --git a/tdecore/ksimpleconfig.cpp b/tdecore/ksimpleconfig.cpp index 55cf7485b..dc359f17e 100644 --- a/tdecore/ksimpleconfig.cpp +++ b/tdecore/ksimpleconfig.cpp @@ -31,7 +31,7 @@ #include #include -#include "kglobal.h" +#include "tdeglobal.h" #include "kstandarddirs.h" #include "tdeconfigbackend.h" -- cgit v1.2.1