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

8 files changed, 25 insertions, 25 deletions

diff --git a/lib/widgets/kcomboview.cpp b/lib/widgets/kcomboview.cpp
index 2576ed0c..93a6612f 100644
--- a/lib/widgets/kcomboview.cpp
+++ b/lib/widgets/kcomboview.cpp
@@ -31,7 +31,7 @@ KComboView::KComboView( bool rw, int defaultWidth, TQWidget* parent, const char*
     if (rw)
     {
         KLineEdit *ed = new KLineEdit(this, "combo edit");
-        ed->setCompletionMode(KGlobalSettings::CompletionPopup);
+        ed->setCompletionMode(TDEGlobalSettings::CompletionPopup);
         ed->setCompletionObject(m_comp);
         ed->completionBox()->setHScrollBarMode(TQListBox::Auto);
         setLineEdit(ed);
diff --git a/lib/widgets/kdevhtmlpart.cpp b/lib/widgets/kdevhtmlpart.cpp
index d0406c4e..323c2cc7 100644
--- a/lib/widgets/kdevhtmlpart.cpp
+++ b/lib/widgets/kdevhtmlpart.cpp
@@ -78,7 +78,7 @@ KDevHTMLPart::KDevHTMLPart()
 //END documentation history stuff  
   
   //settings:
-  KConfig *appConfig = KGlobal::config();
+  KConfig *appConfig = TDEGlobal::config();
   appConfig->setGroup("KHTMLPart");
   setStandardFont(appConfig->readEntry("StandardFont",
       settings()->stdFontName()));
diff --git a/lib/widgets/kdevtabwidget.cpp b/lib/widgets/kdevtabwidget.cpp
index a7d12348..fc45f704 100644
--- a/lib/widgets/kdevtabwidget.cpp
+++ b/lib/widgets/kdevtabwidget.cpp
@@ -30,7 +30,7 @@ KTabBar::KTabBar(TQWidget *parent, const char *name) : TQTabBar(parent,name)
 {
   m_pPopupMenu = new TQPopupMenu(this);
 
-  TQPixmap closePixmap = KGlobal::instance()->iconLoader()->loadIcon( "tab_remove", KIcon::Small, 0, KIcon::DefaultState, 0, true ); 
+  TQPixmap closePixmap = TDEGlobal::instance()->iconLoader()->loadIcon( "tab_remove", KIcon::Small, 0, KIcon::DefaultState, 0, true ); 
   if (closePixmap.isNull())
     closePixmap = SmallIcon("fileclose");
 
diff --git a/lib/widgets/klistviewaction.cpp b/lib/widgets/klistviewaction.cpp
index 0a219da5..adedc5a4 100644
--- a/lib/widgets/klistviewaction.cpp
+++ b/lib/widgets/klistviewaction.cpp
@@ -28,7 +28,7 @@
 
 KListViewAction::~KListViewAction()
 {
-    KConfig *config = KGlobal::config();
+    KConfig *config = TDEGlobal::config();
     if (config && m_view->name())
     {
         config->setGroup("KListViewAction");
@@ -76,7 +76,7 @@ void KListViewAction::setWhatsThis( const TQString & str )
 
 void KListViewAction::loadComboWidth( )
 {
-    KConfig *config = KGlobal::config();
+    KConfig *config = TDEGlobal::config();
     if (config && m_view->name())
     {
         config->setGroup("KListViewAction");
diff --git a/lib/widgets/processlinemaker.cpp b/lib/widgets/processlinemaker.cpp
index 8fdbc5d2..113b206b 100644
--- a/lib/widgets/processlinemaker.cpp
+++ b/lib/widgets/processlinemaker.cpp
@@ -26,13 +26,13 @@ ProcessLineMaker::ProcessLineMaker()
 {
 }
 
-ProcessLineMaker::ProcessLineMaker( const KProcess* proc )
+ProcessLineMaker::ProcessLineMaker( const TDEProcess* proc )
 {
-    connect(proc, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)),
-            this, TQT_SLOT(slotReceivedStdout(KProcess*,char*,int)) );
+    connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
+            this, TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int)) );
 
-    connect(proc, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),
-            this, TQT_SLOT(slotReceivedStderr(KProcess*,char*,int)) );
+    connect(proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),
+            this, TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int)) );
 }
 
 void ProcessLineMaker::slotReceivedStdout( const char *buffer )
@@ -50,7 +50,7 @@ void ProcessLineMaker::slotReceivedStdout( const char *buffer )
     }
 }
 
-void ProcessLineMaker::slotReceivedStdout( KProcess*, char *buffer, int )
+void ProcessLineMaker::slotReceivedStdout( TDEProcess*, char *buffer, int )
 {
     slotReceivedStdout(buffer); // It is zero-terminated
 }
@@ -71,7 +71,7 @@ void ProcessLineMaker::slotReceivedStderr( const char *buffer )
     }
 }
 
-void ProcessLineMaker::slotReceivedStderr( KProcess*, char *buffer, int )
+void ProcessLineMaker::slotReceivedStderr( TDEProcess*, char *buffer, int )
 {
     slotReceivedStderr(buffer); // It is zero-terminated
 }
diff --git a/lib/widgets/processlinemaker.h b/lib/widgets/processlinemaker.h
index e75824cd..19f714fa 100644
--- a/lib/widgets/processlinemaker.h
+++ b/lib/widgets/processlinemaker.h
@@ -27,10 +27,10 @@
 Utility objects for process output views.
 */
 
-class KProcess;
+class TDEProcess;
 
 /**
-Convenience class to catch output of KProcess.
+Convenience class to catch output of TDEProcess.
 */
 class ProcessLineMaker : public TQObject
 {
@@ -39,7 +39,7 @@ Q_OBJECT
 
 public:
 	ProcessLineMaker();
-	ProcessLineMaker( const KProcess* );
+	ProcessLineMaker( const TDEProcess* );
 
 	void clearBuffers();
 	void flush();
@@ -49,8 +49,8 @@ public slots:
 	void slotReceivedStderr(const char*);
 
 protected slots:
-	void slotReceivedStdout(KProcess *, char *buffer, int buflen);
-	void slotReceivedStderr(KProcess *, char *buffer, int buflen);
+	void slotReceivedStdout(TDEProcess *, char *buffer, int buflen);
+	void slotReceivedStderr(TDEProcess *, char *buffer, int buflen);
 
 signals:
 	void receivedStdoutLine( const TQCString& line );
diff --git a/lib/widgets/processwidget.cpp b/lib/widgets/processwidget.cpp
index f28e4ec7..1f2e1a5e 100644
--- a/lib/widgets/processwidget.cpp
+++ b/lib/widgets/processwidget.cpp
@@ -112,7 +112,7 @@ ProcessWidget::ProcessWidget(TQWidget *parent, const char *name)
     // the background ourselves (see ProcessListBoxItem::paint).
 
 
-    childproc = new KProcess();
+    childproc = new TDEProcess();
     childproc->setUseShell(true);
 
     procLineMaker = new ProcessLineMaker( childproc );
@@ -126,8 +126,8 @@ ProcessWidget::ProcessWidget(TQWidget *parent, const char *name)
     connect( procLineMaker, TQT_SIGNAL(receivedPartialStderrLine(const TQCString&)),
              this, TQT_SLOT(addPartialStderrLine(const TQCString&) ));
 
-    connect(childproc, TQT_SIGNAL(processExited(KProcess*)),
-            this, TQT_SLOT(slotProcessExited(KProcess*) )) ;
+    connect(childproc, TQT_SIGNAL(processExited(TDEProcess*)),
+            this, TQT_SLOT(slotProcessExited(TDEProcess*) )) ;
 }
 
 
@@ -151,7 +151,7 @@ void ProcessWidget::startJob(const TQString &dir, const TQString &command)
     }
 
     *childproc << command;
-    childproc->start(KProcess::OwnGroup, KProcess::AllOutput);
+    childproc->start(TDEProcess::OwnGroup, TDEProcess::AllOutput);
 }
 
 
@@ -169,7 +169,7 @@ bool ProcessWidget::isRunning()
 }
 
 
-void ProcessWidget::slotProcessExited(KProcess *)
+void ProcessWidget::slotProcessExited(TDEProcess *)
 {
     procLineMaker->flush();
     if( !stdoutbuf.isEmpty() ) 
diff --git a/lib/widgets/processwidget.h b/lib/widgets/processwidget.h
index 935c7456..b0ad10f7 100644
--- a/lib/widgets/processwidget.h
+++ b/lib/widgets/processwidget.h
@@ -105,7 +105,7 @@ protected:
     virtual void childFinished(bool normal, int status);
 
 signals:
-    void processExited(KProcess *);
+    void processExited(TDEProcess *);
     void rowSelected(int row);
 
 protected:
@@ -113,10 +113,10 @@ protected:
     void maybeScrollToBottom();
 
 protected slots:
-    void slotProcessExited(KProcess*);
+    void slotProcessExited(TDEProcess*);
 
 private:
-    KProcess *childproc;
+    TDEProcess *childproc;
     ProcessLineMaker* procLineMaker;
     TQCString stderrbuf;
     TQCString stdoutbuf;