From 79b21d47bce1ee428affc97534cd8b257232a871 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 24 Jan 2013 13:43:14 -0600
Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

---
 kcontrol/privacy/kprivacymanager.cpp | 6 +++---
 kcontrol/privacy/privacy.cpp         | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'kcontrol/privacy')

diff --git a/kcontrol/privacy/kprivacymanager.cpp b/kcontrol/privacy/kprivacymanager.cpp
index 257dc6e27..e8da79f48 100644
--- a/kcontrol/privacy/kprivacymanager.cpp
+++ b/kcontrol/privacy/kprivacymanager.cpp
@@ -110,9 +110,9 @@ bool KPrivacyManager::clearFormCompletion() const
 
 bool KPrivacyManager::clearWebCache() const
 {
-    KProcess process;
+    TDEProcess process;
     process << "kio_http_cache_cleaner" << "--clear-all";
-    return process.start(KProcess::DontCare);
+    return process.start(TDEProcess::DontCare);
 }
 
 bool KPrivacyManager::clearRecentDocuments() const
@@ -143,7 +143,7 @@ bool KPrivacyManager::clearWebHistory()
 
 bool KPrivacyManager::clearFavIcons()
 {
-  TQDir favIconDir(KGlobal::dirs()->saveLocation( "cache", "favicons/" ));
+  TQDir favIconDir(TDEGlobal::dirs()->saveLocation( "cache", "favicons/" ));
   favIconDir.setFilter( TQDir::Files );
   
   TQStringList entries = favIconDir.entryList();
diff --git a/kcontrol/privacy/privacy.cpp b/kcontrol/privacy/privacy.cpp
index bc25083a6..55b4246cb 100644
--- a/kcontrol/privacy/privacy.cpp
+++ b/kcontrol/privacy/privacy.cpp
@@ -311,7 +311,7 @@ extern "C"
 
   KDE_EXPORT KCModule *create_privacy(TQWidget *parent, const char * /*name*/)
   {
-    KGlobal::locale()->insertCatalogue("privacy");
+    TDEGlobal::locale()->insertCatalogue("privacy");
     return new Privacy(parent, "Privacy");
   }
 }
-- 
cgit v1.2.1