summaryrefslogtreecommitdiffstats
path: root/kpf
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:36:20 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:36:20 -0600
commitf21aaec952493cb5688c73de6e82a569ddbd7fb2 (patch)
tree78ccb5117063da3e08e3277e11054b912a9f2ae7 /kpf
parentc48e769eb275917717e2b55eb869f7e559293ac8 (diff)
downloadtdenetwork-f21aaec952493cb5688c73de6e82a569ddbd7fb2.tar.gz
tdenetwork-f21aaec952493cb5688c73de6e82a569ddbd7fb2.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kpf')
-rw-r--r--kpf/src/ErrorMessageConfigDialog.cpp4
-rw-r--r--kpf/src/PropertiesDialogPlugin.cpp2
-rw-r--r--kpf/src/Response.cpp2
-rw-r--r--kpf/src/WebServer.cpp4
-rw-r--r--kpf/src/WebServerManager.cpp4
5 files changed, 8 insertions, 8 deletions
diff --git a/kpf/src/ErrorMessageConfigDialog.cpp b/kpf/src/ErrorMessageConfigDialog.cpp
index b7962b07..05a082bb 100644
--- a/kpf/src/ErrorMessageConfigDialog.cpp
+++ b/kpf/src/ErrorMessageConfigDialog.cpp
@@ -90,7 +90,7 @@ namespace KPF
TQString pattern(i18n("%1 %2"));
- KConfig config(Config::name());
+ TDEConfig config(Config::name());
config.setGroup("ErrorMessageOverrideFiles");
@@ -130,7 +130,7 @@ namespace KPF
void
ErrorMessageConfigDialog::accept()
{
- KConfig config(Config::name());
+ TDEConfig config(Config::name());
config.setGroup("ErrorMessageOverrideFiles");
diff --git a/kpf/src/PropertiesDialogPlugin.cpp b/kpf/src/PropertiesDialogPlugin.cpp
index d3a0a7c9..929bd2a9 100644
--- a/kpf/src/PropertiesDialogPlugin.cpp
+++ b/kpf/src/PropertiesDialogPlugin.cpp
@@ -661,7 +661,7 @@ namespace KPF
{
TQString noWarningKey("DoNotWarnAboutSharingDirectoriesViaHTTP");
- KConfig * config(TDEGlobal::config());
+ TDEConfig * config(TDEGlobal::config());
if (config->readBoolEntry(noWarningKey, false))
return true;
diff --git a/kpf/src/Response.cpp b/kpf/src/Response.cpp
index 85621ff8..7802df5f 100644
--- a/kpf/src/Response.cpp
+++ b/kpf/src/Response.cpp
@@ -120,7 +120,7 @@ namespace KPF
{
TQString contentType = "Content-Type: text/html; charset=utf-8\r\n";
- KConfig config(Config::name());
+ TDEConfig config(Config::name());
config.setGroup("General");
diff --git a/kpf/src/WebServer.cpp b/kpf/src/WebServer.cpp
index 0e7e20e3..e12ebcd2 100644
--- a/kpf/src/WebServer.cpp
+++ b/kpf/src/WebServer.cpp
@@ -585,7 +585,7 @@ namespace KPF
WebServer::loadConfig()
{
kpfDebug << "WebServer(" << d->root << "): Loading configuration" << endl;
- KConfig c(Config::name());
+ TDEConfig c(Config::name());
c.setGroup(Config::key(Config::GroupPrefix) + d->root);
@@ -623,7 +623,7 @@ namespace KPF
WebServer::saveConfig()
{
kpfDebug << "WebServer(" << d->root << "): Saving configuration" << endl;
- KConfig c(Config::name());
+ TDEConfig c(Config::name());
c.setGroup(Config::key(Config::GroupPrefix) + d->root);
diff --git a/kpf/src/WebServerManager.cpp b/kpf/src/WebServerManager.cpp
index 08075fe8..1fa58b63 100644
--- a/kpf/src/WebServerManager.cpp
+++ b/kpf/src/WebServerManager.cpp
@@ -108,7 +108,7 @@ namespace KPF
void
WebServerManager::loadConfig()
{
- KConfig config(Config::name());
+ TDEConfig config(Config::name());
config.setGroup("General");
@@ -128,7 +128,7 @@ namespace KPF
void
WebServerManager::saveConfig() const
{
- KConfig config(Config::name());
+ TDEConfig config(Config::name());
config.setGroup("General");