Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

4 files changed, 12 insertions, 12 deletions

diff --git a/kcron/ctcron.cpp b/kcron/ctcron.cpp
index f5cb04c..538ec34 100644
--- a/kcron/ctcron.cpp
+++ b/kcron/ctcron.cpp
@@ -49,15 +49,15 @@ CTCron::CTCron(bool _syscron, string _login) :
   {
     if (syscron)
     {
-      readCommand  = "cat /etc/crontab > " + KProcess::quote(tmpFileName);
-      writeCommand = "cat " + KProcess::quote(tmpFileName) + " > /etc/crontab";
+      readCommand  = "cat /etc/crontab > " + TDEProcess::quote(tmpFileName);
+      writeCommand = "cat " + TDEProcess::quote(tmpFileName) + " > /etc/crontab";
       login = (const char *)i18n("(System Crontab)").local8Bit();
       name = "";
     }
     else
     {
-      readCommand  = TQString("crontab -u ") + _login.c_str() + " -l > " + KProcess::quote(tmpFileName);
-      writeCommand = TQString("crontab -u ") + _login.c_str() + " " + KProcess::quote(tmpFileName);
+      readCommand  = TQString("crontab -u ") + _login.c_str() + " -l > " + TDEProcess::quote(tmpFileName);
+      writeCommand = TQString("crontab -u ") + _login.c_str() + " " + TDEProcess::quote(tmpFileName);
       if (!initFromPasswd(getpwnam(_login.c_str())))
       {
          error = i18n("No password entry found for user '%1'").arg(_login.c_str());
@@ -67,8 +67,8 @@ CTCron::CTCron(bool _syscron, string _login) :
   else
   // regular user, so provide user's own crontab
   {
-    readCommand  = "crontab -l > " + KProcess::quote(tmpFileName);
-    writeCommand = "crontab "      + KProcess::quote(tmpFileName);
+    readCommand  = "crontab -l > " + TDEProcess::quote(tmpFileName);
+    writeCommand = "crontab "      + TDEProcess::quote(tmpFileName);
     if (!initFromPasswd(getpwuid(uid)))
     {
       error = i18n("No password entry found for uid '%1'").arg(uid);
@@ -106,8 +106,8 @@ CTCron::CTCron(const struct passwd *pwd) :
   tmp.close();
   tmpFileName = tmp.name();  
 
-  TQString readCommand  = TQString("crontab -u ") + TQString(pwd->pw_name) + " -l > " + KProcess::quote(tmpFileName);
-  writeCommand = TQString("crontab -u ") + TQString(pwd->pw_name) + " " + KProcess::quote(tmpFileName);
+  TQString readCommand  = TQString("crontab -u ") + TQString(pwd->pw_name) + " -l > " + TDEProcess::quote(tmpFileName);
+  writeCommand = TQString("crontab -u ") + TQString(pwd->pw_name) + " " + TDEProcess::quote(tmpFileName);
 
   initFromPasswd(pwd);
 
diff --git a/kcron/ktlisttasks.cpp b/kcron/ktlisttasks.cpp
index 88e344e..9be9231 100644
--- a/kcron/ktlisttasks.cpp
+++ b/kcron/ktlisttasks.cpp
@@ -70,7 +70,7 @@ void KTListTasks::print (KTPrint& printer) const
 
   stnd = printer.getFont();
 
-  printer.setFont(TQFont( KGlobalSettings::generalFont().family(), 10, TQFont::Bold ));
+  printer.setFont(TQFont( TDEGlobalSettings::generalFont().family(), 10, TQFont::Bold ));
   printer.print (i18n("Task name:"), 1, KTPrint::alignTextLeft);
   printer.print (i18n("Program:"), 2, KTPrint::alignTextCenter);
   printer.print (i18n("Description:"),3,KTPrint::alignTextRight);
diff --git a/kcron/ktlistvars.cpp b/kcron/ktlistvars.cpp
index 96b4aae..f5ccf95 100644
--- a/kcron/ktlistvars.cpp
+++ b/kcron/ktlistvars.cpp
@@ -65,7 +65,7 @@ void KTListVars::print(KTPrint& printer) const
   TQFont stnd;
 
   stnd = printer.getFont() ;
-  printer.setFont(TQFont( KGlobalSettings::generalFont().family(), 10, TQFont::Bold ));
+  printer.setFont(TQFont( TDEGlobalSettings::generalFont().family(), 10, TQFont::Bold ));
 
   printer.print(i18n("Variable:"), 1, KTPrint::alignTextLeft);
   printer.print(i18n("Value:"), 2, KTPrint::alignTextCenter);
diff --git a/kcron/ktview.cpp b/kcron/ktview.cpp
index f661cee..a8709cc 100644
--- a/kcron/ktview.cpp
+++ b/kcron/ktview.cpp
@@ -278,11 +278,11 @@ void KTView :: pageHeading (KTListItem* user, KTPrint &printer) const
     .arg(TQString::fromLocal8Bit(hostName));
 
   stnd = printer.getFont();
-  printer.setFont(TQFont( KGlobalSettings::generalFont().family(), 14, TQFont::Bold ));
+  printer.setFont(TQFont( TDEGlobalSettings::generalFont().family(), 14, TQFont::Bold ));
 
   printer.print (i18n("Scheduled Tasks"), 2, KTPrint::alignTextCenter, false);
   printer.print (logonInfo, 2, KTPrint::alignTextCenter, false);
-  printer.print (KGlobal::locale()->formatDateTime(now), 2, KTPrint::alignTextCenter, false);
+  printer.print (TDEGlobal::locale()->formatDateTime(now), 2, KTPrint::alignTextCenter, false);
   printer.setFont(stnd);
 
   printer.levelColumns(20);