diff options
author | Timothy Pearson <[email protected]> | 2013-01-24 13:43:14 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-24 13:43:14 -0600 |
commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /kcontrol/clock/dtime.cpp | |
parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/clock/dtime.cpp')
-rw-r--r-- | kcontrol/clock/dtime.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
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 |