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

6 files changed, 35 insertions, 35 deletions

diff --git a/ksysv/OldView.cpp b/ksysv/OldView.cpp
index 1f8d454..d3357ad 100644
--- a/ksysv/OldView.cpp
+++ b/ksysv/OldView.cpp
@@ -82,7 +82,7 @@ KSVContent::KSVContent (KPopupMenu* openWithMenu, KSVTopLevel* parent, const cha
 	mOrigin (0L),
     mOpenWithMenu (openWithMenu), m_buffer( TQCString() )
 {
-  setOpaqueResize( KGlobalSettings::opaqueResize() );
+  setOpaqueResize( TDEGlobalSettings::opaqueResize() );
 
   KXMLGUIFactory* factory = parent->factory();
   mItemMenu = static_cast<KPopupMenu*> (factory->container ("item_menu", parent));
@@ -201,7 +201,7 @@ void KSVContent::initLList()
 						"<p>To stop one, do the same for the <em>Stop</em> section.</p>"));
 
 
-  TQFont bold_font = TQFont(KGlobalSettings::generalFont());
+  TQFont bold_font = TQFont(TDEGlobalSettings::generalFont());
   bold_font.setBold(TRUE);
   servL->setFont(bold_font);
 
@@ -603,20 +603,20 @@ void KSVContent::stopService ()
 
 void KSVContent::stopService (const TQString& path)
 {
-  KProcess *_proc = new KProcess();
+  TDEProcess *_proc = new TDEProcess();
   _proc->clearArguments();
 
   *_proc << path << "stop";
 
-  connect(_proc, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotExitedProcess(KProcess*)));
-  connect(_proc, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), this, TQT_SLOT(slotOutputOrError(KProcess*, char*, int)));
-  connect(_proc, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), this, TQT_SLOT(slotOutputOrError(KProcess*, char*, int)));
+  connect(_proc, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotExitedProcess(TDEProcess*)));
+  connect(_proc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), this, TQT_SLOT(slotOutputOrError(TDEProcess*, char*, int)));
+  connect(_proc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), this, TQT_SLOT(slotOutputOrError(TDEProcess*, char*, int)));
 
   // refresh textDisplay
   appendLog(i18n("** <stop>Stopping</stop> <cmd>%1</cmd> **<br/>").arg(path),
 			i18n("** Stopping %1 **").arg(path));
 
-  _proc->start(KProcess::NotifyOnExit, KProcess::AllOutput);
+  _proc->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput);
 
   // notify parent
   emit sigRun(path + i18n(" stop"));
@@ -629,20 +629,20 @@ void KSVContent::startService ()
 
 void KSVContent::startService (const TQString& path)
 {
-  KProcess* _proc = new KProcess();
+  TDEProcess* _proc = new TDEProcess();
   _proc->clearArguments();
 
   *_proc << path << "start";
 
-  connect(_proc, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotExitedProcess(KProcess*)));
-  connect(_proc, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), this, TQT_SLOT(slotOutputOrError(KProcess*, char*, int)));
-  connect(_proc, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), this, TQT_SLOT(slotOutputOrError(KProcess*, char*, int)));
+  connect(_proc, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotExitedProcess(TDEProcess*)));
+  connect(_proc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), this, TQT_SLOT(slotOutputOrError(TDEProcess*, char*, int)));
+  connect(_proc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), this, TQT_SLOT(slotOutputOrError(TDEProcess*, char*, int)));
 
   // refresh textDisplay
   appendLog(i18n("** <start>Starting</start> <cmd>%1</cmd> **<br/>").arg(path),
 			i18n("** Starting %1 **").arg(path));
 
-  _proc->start(KProcess::NotifyOnExit, KProcess::AllOutput);
+  _proc->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput);
 
   // notify parent
   emit sigRun(path + i18n(" start"));
@@ -669,33 +669,33 @@ void KSVContent::restartService ()
 void KSVContent::restartService (const TQString& path)
 {
   // restarting
-  KProcess *_proc = new KProcess();
+  TDEProcess *_proc = new TDEProcess();
   _proc->clearArguments();
 
   *_proc << path << "restart";
 
-  connect(_proc, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotExitDuringRestart(KProcess*)));
-  connect(_proc, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), this, TQT_SLOT(slotOutputOrError(KProcess*, char*, int)));
-  connect(_proc, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), this, TQT_SLOT(slotOutputOrError(KProcess*, char*, int)));
+  connect(_proc, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotExitDuringRestart(TDEProcess*)));
+  connect(_proc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), this, TQT_SLOT(slotOutputOrError(TDEProcess*, char*, int)));
+  connect(_proc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), this, TQT_SLOT(slotOutputOrError(TDEProcess*, char*, int)));
 
   // refresh textDisplay
   appendLog(i18n("** Re-starting <cmd>%1</cmd> **</br>").arg(path),
 			i18n("** Re-starting %1 **").arg(path));
 
-  _proc->start(KProcess::NotifyOnExit, KProcess::AllOutput);
+  _proc->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput);
 
   // notify parent
   emit sigRun(path + i18n(" restart"));
 }
 
-void KSVContent::slotOutputOrError( KProcess*, char* _buffer, int _buflen) {
+void KSVContent::slotOutputOrError( TDEProcess*, char* _buffer, int _buflen) {
   if (_buflen > 0) {
     m_buffer += TQCString( _buffer, _buflen + 1 );
     appendLog( m_buffer );
   }
 }
 
-void KSVContent::slotExitedProcess( KProcess* proc ) {
+void KSVContent::slotExitedProcess( TDEProcess* proc ) {
   appendLog("<hr/>", "--------------");
 
   emit sigStop();
@@ -730,18 +730,18 @@ void KSVContent::slotScriptProperties(TQListViewItem* item)
   //  delete prop;
 }
 
-void KSVContent::slotExitDuringRestart( KProcess* proc )
+void KSVContent::slotExitDuringRestart( TDEProcess* proc )
 {
   delete proc;
-  proc = new KProcess(); // necessary because otherwise we still have some
+  proc = new TDEProcess(); // necessary because otherwise we still have some
                          // signals connected that screw up our output
   proc->clearArguments();
 
-  connect(proc, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotExitedProcess(KProcess*)));
-  connect(proc, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), this, TQT_SLOT(slotOutputOrError(KProcess*, char*, int)));
-  connect(proc, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), this, TQT_SLOT(slotOutputOrError(KProcess*, char*, int)));
+  connect(proc, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotExitedProcess(TDEProcess*)));
+  connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), this, TQT_SLOT(slotOutputOrError(TDEProcess*, char*, int)));
+  connect(proc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), this, TQT_SLOT(slotOutputOrError(TDEProcess*, char*, int)));
 
-  proc->start(KProcess::NotifyOnExit, KProcess::AllOutput);
+  proc->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput);
 }
 
 KSVDragList* KSVContent::getOrigin()
diff --git a/ksysv/OldView.h b/ksysv/OldView.h
index 2bda6b7..acf319d 100644
--- a/ksysv/OldView.h
+++ b/ksysv/OldView.h
@@ -32,7 +32,7 @@ class TQPixmap;
 class TQLayout;
 
 class KScroller;
-class KProcess;
+class TDEProcess;
 class KListView;
 class TQSplitter;
 class KPopupMenu;
@@ -93,11 +93,11 @@ private slots:
   void restartService (const TQString& path);
   void editService();
   void editService (const TQString& path);
-  void slotOutputOrError( KProcess* _p, char* _buffer, int _buflen );
-  void slotExitedProcess(KProcess* proc);
+  void slotOutputOrError( TDEProcess* _p, char* _buffer, int _buflen );
+  void slotExitedProcess(TDEProcess* proc);
   void slotScriptsNotRemovable();
   void slotDoubleClick (TQListViewItem*);
-  void slotExitDuringRestart(KProcess* proc);
+  void slotExitDuringRestart(TDEProcess* proc);
   void appendLog(const TQString& rich, const TQString& plain);
   void appendLog(const TQCString& _buffer);
   void fwdCannotGenerateNumber();
diff --git a/ksysv/TopWidget.cpp b/ksysv/TopWidget.cpp
index 29ae128..26bea71 100644
--- a/ksysv/TopWidget.cpp
+++ b/ksysv/TopWidget.cpp
@@ -775,7 +775,7 @@ void KSVTopLevel::printLog()
 
         y += tmp_h;
 
-        TQSimpleRichText rdate (i18n("<h3>Printed on %1</h3><br/><br/>").arg(KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime())),
+        TQSimpleRichText rdate (i18n("<h3>Printed on %1</h3><br/><br/>").arg(TDEGlobal::locale()->formatDateTime(TQDateTime::currentDateTime())),
                                TQFont("times"), TQString(), ksv::styleSheet(),
                                TQMimeSourceFactory::defaultFactory());
         rdate.setWidth (&p, width);
diff --git a/ksysv/ksv_conf.cpp b/ksysv/ksv_conf.cpp
index 7ad9090..0b63438 100644
--- a/ksysv/ksv_conf.cpp
+++ b/ksysv/ksv_conf.cpp
@@ -23,7 +23,7 @@
 #include "ksv_conf.h"
 
 KSVConfig::KSVConfig ()
-  : mConfig (KGlobal::config())
+  : mConfig (TDEGlobal::config())
 {
   readSettings();
 }
@@ -53,9 +53,9 @@ void KSVConfig::readSettings()
   mChangedSelectedColor = mConfig->readColorEntry ("Changed Selected Text", &TQt::red); 
 
   mConfig->setGroup("Fonts");
-  TQFont tmp = KGlobalSettings::generalFont();
+  TQFont tmp = TDEGlobalSettings::generalFont();
   mServiceFont = mConfig->readFontEntry ("Service Font", &tmp);
-  tmp = KGlobalSettings::fixedFont();
+  tmp = TDEGlobalSettings::fixedFont();
   mNumberFont = mConfig->readFontEntry ("Number Font", &tmp);
 
   readRunlevels();
diff --git a/ksysv/ksv_core.cpp b/ksysv/ksv_core.cpp
index bc9c2d8..e980f69 100644
--- a/ksysv/ksv_core.cpp
+++ b/ksysv/ksv_core.cpp
@@ -115,7 +115,7 @@ TQStyleSheet* ksv::styleSheet ()
 	  item->setLogicalFontSizeStep (1);
 
 	  item = new TQStyleSheetItem (&style, "cmd"); // command line
-	  item->setFontFamily (KGlobalSettings::fixedFont().family());
+	  item->setFontFamily (TDEGlobalSettings::fixedFont().family());
 	}
 
   return &style;
diff --git a/ksysv/trash.cpp b/ksysv/trash.cpp
index aab746c..a397bfb 100644
--- a/ksysv/trash.cpp
+++ b/ksysv/trash.cpp
@@ -31,7 +31,7 @@
 
 KSVTrash::KSVTrash (TQWidget* parent, const char* name)
   : TQFrame (parent, name),
-    mKIL (KGlobal::iconLoader()),
+    mKIL (TDEGlobal::iconLoader()),
     mLabel (new TQLabel(this)),
     mOpen (false)
 {