summaryrefslogtreecommitdiffstats
path: root/tdm/kfrontend/tdmshutdown.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-24 13:43:14 -0600
committerTimothy Pearson <[email protected]>2013-01-24 13:43:14 -0600
commit79b21d47bce1ee428affc97534cd8b257232a871 (patch)
tree0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /tdm/kfrontend/tdmshutdown.cpp
parent9a898d493f493adbc404f7223043c85f3817472b (diff)
downloadtdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz
tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'tdm/kfrontend/tdmshutdown.cpp')
-rw-r--r--tdm/kfrontend/tdmshutdown.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tdm/kfrontend/tdmshutdown.cpp b/tdm/kfrontend/tdmshutdown.cpp
index e546f62b6..c93dfbfaa 100644
--- a/tdm/kfrontend/tdmshutdown.cpp
+++ b/tdm/kfrontend/tdmshutdown.cpp
@@ -329,7 +329,7 @@ get_date( const char *str )
{
KProcIO prc;
prc << "/bin/date" << "+%s" << "-d" << str;
- prc.start( KProcess::Block, false );
+ prc.start( TDEProcess::Block, false );
TQString dstr;
if (prc.readln( dstr, false, 0 ) < 0)
return -1;
@@ -472,7 +472,7 @@ TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent )
{
setCaption(i18n("Shutdown TDE"));
- bool doUbuntuLogout = KConfigGroup(KGlobal::config(), "Shutdown").readBoolEntry("doUbuntuLogout", false);
+ bool doUbuntuLogout = KConfigGroup(TDEGlobal::config(), "Shutdown").readBoolEntry("doUbuntuLogout", false);
TQFrame* lfrm = new TQFrame( this );
TQHBoxLayout* hbuttonbox;