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

---
 kioslave/http/http.cc                   | 4 ++--
 kioslave/http/http_cache_cleaner.cpp    | 2 +-
 kioslave/http/kcookiejar/kcookiewin.cpp | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'kioslave/http')

diff --git a/kioslave/http/http.cc b/kioslave/http/http.cc
index 8c732d823..f6e714988 100644
--- a/kioslave/http/http.cc
+++ b/kioslave/http/http.cc
@@ -100,7 +100,7 @@ int kdemain( int argc, char **argv )
 {
   KLocale::setMainCatalogue("tdelibs");
   TDEInstance instance( "kio_http" );
-  ( void ) KGlobal::locale();
+  ( void ) TDEGlobal::locale();
 
   if (argc != 4)
   {
@@ -5120,7 +5120,7 @@ void HTTPProtocol::configAuth( char *p, bool isForProxy )
     {
       //for sites like lib.homelinux.org
       TQTextCodec* oldCodec=TQTextCodec::codecForCStrings();
-      if (KGlobal::locale()->language().contains("ru"))
+      if (TDEGlobal::locale()->language().contains("ru"))
         TQTextCodec::setCodecForCStrings(TQTextCodec::codecForName("CP1251"));
 
       p += 6;
diff --git a/kioslave/http/http_cache_cleaner.cpp b/kioslave/http/http_cache_cleaner.cpp
index 4a140262e..554d221d5 100644
--- a/kioslave/http/http_cache_cleaner.cpp
+++ b/kioslave/http/http_cache_cleaner.cpp
@@ -220,7 +220,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
    if (deleteAll)
       m_maxCacheSize = -1;
 
-   TQString strCacheDir = KGlobal::dirs()->saveLocation("cache", "http");
+   TQString strCacheDir = TDEGlobal::dirs()->saveLocation("cache", "http");
 
    TQDir cacheDir( strCacheDir );
    if (!cacheDir.exists())
diff --git a/kioslave/http/kcookiejar/kcookiewin.cpp b/kioslave/http/kcookiejar/kcookiewin.cpp
index ca86e0a16..57a22f62c 100644
--- a/kioslave/http/kcookiejar/kcookiewin.cpp
+++ b/kioslave/http/kcookiejar/kcookiewin.cpp
@@ -357,7 +357,7 @@ void KCookieDetail::slotNextCookie()
         TQDateTime cookiedate;
         cookiedate.setTime_t( m_cookie->expireDate() );
         if ( m_cookie->expireDate() )
-          m_expires->setText( KGlobal::locale()->formatDateTime(cookiedate) );
+          m_expires->setText( TDEGlobal::locale()->formatDateTime(cookiedate) );
         else
           m_expires->setText( i18n("End of Session") );
         TQString sec;
-- 
cgit v1.2.1