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/clock/dtime.cpp | 18 +++++++++---------
 kcontrol/clock/main.cpp  |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'kcontrol/clock')

diff --git a/kcontrol/clock/dtime.cpp b/kcontrol/clock/dtime.cpp
index 109e436c4..e291387c0 100644
--- a/kcontrol/clock/dtime.cpp
+++ b/kcontrol/clock/dtime.cpp
@@ -195,9 +195,9 @@ void Dtime::serverTimeCheck() {
 }
 
 void Dtime::findNTPutility(){
-  KProcess proc;
+  TDEProcess proc;
   proc << "which" << "ntpdate";
-  proc.start(KProcess::Block);
+  proc.start(TDEProcess::Block);
   if(proc.exitStatus() == 0) {
     ntpUtility = "ntpdate";
     kdDebug() << "ntpUtility = " << ntpUtility.latin1() << endl;
@@ -205,7 +205,7 @@ void Dtime::findNTPutility(){
   }
   proc.clearArguments();
   proc << "which" << "rdate";
-  proc.start(KProcess::Block);
+  proc.start(TDEProcess::Block);
   if(proc.exitStatus() == 0) {
     ntpUtility = "rdate";
     kdDebug() << "ntpUtility = " << ntpUtility.latin1() << endl;
@@ -289,9 +289,9 @@ void Dtime::save()
       timeServer.replace( TQRegExp("\\).*"), "" );
       // Would this be better?: s/^.*\(([^)]*)\).*$/\1/
     }
-    KProcess proc;
+    TDEProcess proc;
     proc << ntpUtility << timeServer;
-    proc.start( KProcess::Block );
+    proc.start( TDEProcess::Block );
     if( proc.exitStatus() != 0 ){
       KMessageBox::error( this, i18n(TQString("Unable to contact time server: %1.").arg(timeServer).latin1()));
       setDateTimeAuto->setChecked( false );
@@ -303,7 +303,7 @@ void Dtime::save()
   }
   else {
     // User time setting
-    KProcess c_proc;
+    TDEProcess c_proc;
 
   // BSD systems reverse year compared to Susv3
 #if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
@@ -321,7 +321,7 @@ void Dtime::save()
     kdDebug() << "Set date " << BufS << endl;
 
     c_proc << "date" << BufS;
-    c_proc.start( KProcess::Block );
+    c_proc.start( TDEProcess::Block );
     int result = c_proc.exitStatus();
     if (result != 0
 #if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
@@ -333,9 +333,9 @@ void Dtime::save()
     }
 
     // try to set hardware clock. We do not care if it fails
-    KProcess hwc_proc;
+    TDEProcess hwc_proc;
     hwc_proc << "hwclock" << "--systohc";
-    hwc_proc.start(KProcess::Block);
+    hwc_proc.start(TDEProcess::Block);
   }
 
   // restart time
diff --git a/kcontrol/clock/main.cpp b/kcontrol/clock/main.cpp
index 69fece8e3..5885c2594 100644
--- a/kcontrol/clock/main.cpp
+++ b/kcontrol/clock/main.cpp
@@ -57,7 +57,7 @@ KclockModule::KclockModule(TQWidget *parent, const char *name, const TQStringLis
     " the root password, but feel the system time should be corrected, please contact your system"
     " administrator."));
 
-  KGlobal::locale()->insertCatalogue("timezones"); // For time zone translations
+  TDEGlobal::locale()->insertCatalogue("timezones"); // For time zone translations
 
   TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
 
-- 
cgit v1.2.1