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

4 files changed, 20 insertions, 20 deletions

diff --git a/ksim/monitors/disk/ksimdisk.cpp b/ksim/monitors/disk/ksimdisk.cpp
index cccf0a5..6c91d00 100644
--- a/ksim/monitors/disk/ksimdisk.cpp
+++ b/ksim/monitors/disk/ksimdisk.cpp
@@ -216,13 +216,13 @@ void DiskView::updateDisplay()
     if (m_useSeperatly) {
       it.current()->first->setValue(diskData.readBlocks, diskData.writeBlocks);
       it.current()->first->setText(i18n("in: %1k")
-         .arg(KGlobal::locale()->formatNumber((float)diskData.readBlocks / 1024.0, 1)),
-         i18n("out: %1k").arg(KGlobal::locale()->formatNumber((float)diskData.writeBlocks / 1024.0, 1)));
+         .arg(TDEGlobal::locale()->formatNumber((float)diskData.readBlocks / 1024.0, 1)),
+         i18n("out: %1k").arg(TDEGlobal::locale()->formatNumber((float)diskData.writeBlocks / 1024.0, 1)));
     }
     else {
       it.current()->first->setValue(diff, 0);
       it.current()->first->setText(i18n("%1k")
-         .arg(KGlobal::locale()->formatNumber((float)diff / 1024.0, 1)));
+         .arg(TDEGlobal::locale()->formatNumber((float)diff / 1024.0, 1)));
     }
 
     it.current()->second->setMaxValue(it.current()->first->maxValue());
diff --git a/ksim/monitors/filesystem/filesystemwidget.cpp b/ksim/monitors/filesystem/filesystemwidget.cpp
index 7286e0f..b7ded52 100644
--- a/ksim/monitors/filesystem/filesystemwidget.cpp
+++ b/ksim/monitors/filesystem/filesystemwidget.cpp
@@ -169,16 +169,16 @@ bool FilesystemWidget::eventFilter(TQObject *o, TQEvent *e)
   return TQWidget::eventFilter(o, e);
 }
 
-void FilesystemWidget::receivedStderr(KProcess *, char *buffer, int length)
+void FilesystemWidget::receivedStderr(TDEProcess *, char *buffer, int length)
 {
   m_stderrString.setLatin1(buffer, length);
 }
 
-void FilesystemWidget::processExited(KProcess *)
+void FilesystemWidget::processExited(TDEProcess *)
 {
   delete m_process;
   m_process = 0;
-  kdDebug(2003) << "Deleting KProcess pointer" << endl;
+  kdDebug(2003) << "Deleting TDEProcess pointer" << endl;
 
   if (m_stderrString.isEmpty())
     return;
@@ -198,16 +198,16 @@ void FilesystemWidget::processExited(KProcess *)
 
 void FilesystemWidget::createProcess(const TQString &command, const TQString &point)
 {
-  m_process = new KProcess();
+  m_process = new TDEProcess();
   connect(m_process,
-     TQT_SIGNAL(receivedStderr(KProcess *, char *, int)),
-     TQT_SLOT(receivedStderr(KProcess *, char *, int)));
+     TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
+     TQT_SLOT(receivedStderr(TDEProcess *, char *, int)));
   connect(m_process,
-     TQT_SIGNAL(processExited(KProcess *)),
-     TQT_SLOT(processExited(KProcess *)));
+     TQT_SIGNAL(processExited(TDEProcess *)),
+     TQT_SLOT(processExited(TDEProcess *)));
 
   (*m_process) << command << point;
-  void(m_process->start(KProcess::NotifyOnExit, KProcess::Stderr));
+  void(m_process->start(TDEProcess::NotifyOnExit, TDEProcess::Stderr));
 }
 
 void FilesystemWidget::showMenu(uint id)
diff --git a/ksim/monitors/filesystem/filesystemwidget.h b/ksim/monitors/filesystem/filesystemwidget.h
index 9cd3f61..2a8f116 100644
--- a/ksim/monitors/filesystem/filesystemwidget.h
+++ b/ksim/monitors/filesystem/filesystemwidget.h
@@ -24,7 +24,7 @@
 
 #include <tqptrlist.h>
 
-class KProcess;
+class TDEProcess;
 class TQVBoxLayout;
 
 class FilesystemWidget : public TQWidget
@@ -44,8 +44,8 @@ class FilesystemWidget : public TQWidget
     bool eventFilter(TQObject *, TQEvent *);
 
   private slots:
-    void receivedStderr(KProcess *, char *, int);
-    void processExited(KProcess *);
+    void receivedStderr(TDEProcess *, char *, int);
+    void processExited(TDEProcess *);
 
   private:
     class Filesystem
@@ -73,7 +73,7 @@ class FilesystemWidget : public TQWidget
     typedef TQPtrList<Filesystem> ProgressList;
     ProgressList m_list;
     TQVBoxLayout *m_layout;
-    KProcess *m_process;
+    TDEProcess *m_process;
     TQString m_stderrString;
 };
 #endif
diff --git a/ksim/monitors/net/ksimnet.cpp b/ksim/monitors/net/ksimnet.cpp
index 2d3bd9c..a8e57ce 100644
--- a/ksim/monitors/net/ksimnet.cpp
+++ b/ksim/monitors/net/ksimnet.cpp
@@ -391,8 +391,8 @@ void NetView::updateGraph()
       ( *it ).chart()->setValue( receiveDiff, sendDiff );
       ( *it ).setMaxValue( ( *it ).chart()->maxValue() );
 
-      TQString receiveString = KGlobal::locale()->formatNumber( ( float ) receiveDiff / 1024.0, 1 );
-      TQString sendString = KGlobal::locale()->formatNumber( ( float ) sendDiff / 1024.0, 1 );
+      TQString receiveString = TDEGlobal::locale()->formatNumber( ( float ) receiveDiff / 1024.0, 1 );
+      TQString sendString = TDEGlobal::locale()->formatNumber( ( float ) sendDiff / 1024.0, 1 );
 
       ( *it ).chart()->setText( i18n( "in: %1k" ).arg( receiveString ),
          i18n( "out: %1k" ).arg( sendString ) );
@@ -402,8 +402,8 @@ void NetView::updateGraph()
       ( *it ).setData( NetData() );
       ( *it ).chart()->setValue( 0, 0 );
 
-      ( *it ).chart()->setText( i18n( "in: %1k" ).arg( KGlobal::locale()->formatNumber( 0.0, 1 ) ),
-         i18n( "out: %1k" ).arg( KGlobal::locale()->formatNumber( 0.0, 1 ) ) );
+      ( *it ).chart()->setText( i18n( "in: %1k" ).arg( TDEGlobal::locale()->formatNumber( 0.0, 1 ) ),
+         i18n( "out: %1k" ).arg( TDEGlobal::locale()->formatNumber( 0.0, 1 ) ) );
 
       if ( ( *it ).label() )
         ( *it ).label()->setText( i18n( "offline" ) );