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/kio/cache.cpp              | 4 ++--
 kcontrol/kio/fakeuaprovider.cpp     | 2 +-
 kcontrol/kio/kcookiesmanagement.cpp | 2 +-
 kcontrol/kio/smbrodlg.cpp           | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'kcontrol/kio')

diff --git a/kcontrol/kio/cache.cpp b/kcontrol/kio/cache.cpp
index d98cba302..1537ade1d 100644
--- a/kcontrol/kio/cache.cpp
+++ b/kcontrol/kio/cache.cpp
@@ -117,9 +117,9 @@ void KCacheConfigDialog::configChanged()
 
 void KCacheConfigDialog::slotClearCache()
 {
-  KProcess process;
+  TDEProcess process;
   process << "kio_http_cache_cleaner" << "--clear-all";
-  process.start(KProcess::DontCare);
+  process.start(TDEProcess::DontCare);
   // Cleaning up might take a while. Better detach.
   process.detach();
 }
diff --git a/kcontrol/kio/fakeuaprovider.cpp b/kcontrol/kio/fakeuaprovider.cpp
index b3eec5340..e00c63862 100644
--- a/kcontrol/kio/fakeuaprovider.cpp
+++ b/kcontrol/kio/fakeuaprovider.cpp
@@ -94,7 +94,7 @@ void FakeUASProvider::parseDescription()
       tmp.replace( QFL("appSysRelease"), TQString(utsn.release) );
       tmp.replace( QFL("appMachineType"), TQString(utsn.machine) );
 
-      TQStringList languageList = KGlobal::locale()->languageList();
+      TQStringList languageList = TDEGlobal::locale()->languageList();
       if ( languageList.count() )
       {
         TQStringList::Iterator it = languageList.find( TQString::fromLatin1("C") );
diff --git a/kcontrol/kio/kcookiesmanagement.cpp b/kcontrol/kio/kcookiesmanagement.cpp
index 9a4f6eb2c..e825fd2a4 100644
--- a/kcontrol/kio/kcookiesmanagement.cpp
+++ b/kcontrol/kio/kcookiesmanagement.cpp
@@ -334,7 +334,7 @@ bool KCookiesManagement::cookieDetails(CookieProp *cookie)
   {
     TQDateTime expDate;
     expDate.setTime_t(tmp);
-    cookie->expireDate = KGlobal::locale()->formatDateTime(expDate);
+    cookie->expireDate = TDEGlobal::locale()->formatDateTime(expDate);
   }
 
   tmp = (*c).toUInt();
diff --git a/kcontrol/kio/smbrodlg.cpp b/kcontrol/kio/smbrodlg.cpp
index 90dfd9170..1b0a4fea8 100644
--- a/kcontrol/kio/smbrodlg.cpp
+++ b/kcontrol/kio/smbrodlg.cpp
@@ -63,7 +63,7 @@ SMBRoOptions::SMBRoOptions(TQWidget *parent)
    layout->addMultiCellWidget(m_showHiddenShares,4,4,0,1);
 
    m_encodingList = new KComboBox( false, this );
-   TQStringList _strList = KGlobal::charsets()->availableEncodingNames();
+   TQStringList _strList = TDEGlobal::charsets()->availableEncodingNames();
    m_encodingList->insertStringList( _strList );
 
    label = new TQLabel( m_encodingList, i18n( "MS Windows encoding:" ), this );
@@ -99,7 +99,7 @@ void SMBRoOptions::load()
 //   m_workgroupLe->setText(cfg->readEntry("Workgroup"));
 //   m_showHiddenShares->setChecked(cfg->readBoolEntry("ShowHiddenShares",false));
 
-//   TQStringList _strList = KGlobal::charsets()->availableEncodingNames();
+//   TQStringList _strList = TDEGlobal::charsets()->availableEncodingNames();
 //   TQString m_encoding = TQTextCodec::codecForLocale()->name();
 //   m_encodingList->setCurrentItem( _strList.findIndex( cfg->readEntry( "Encoding", m_encoding.lower() ) ) );
 
-- 
cgit v1.2.1