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

8 files changed, 32 insertions, 32 deletions

diff --git a/kpackage/debAptInterface.cpp b/kpackage/debAptInterface.cpp
index f7c6ee0..bf922ea 100644
--- a/kpackage/debAptInterface.cpp
+++ b/kpackage/debAptInterface.cpp
@@ -432,10 +432,10 @@ TQString DEBAPT::install(int installFlags, TQPtrList<packageInfo> *p,
     TQString fname = i->fetchFilename();
 
     if (!file.isEmpty()) {
-      files += KProcess::quote(file);
+      files += TDEProcess::quote(file);
       files += " ";
     } else if (!fname.isEmpty()) {
-      packs += KProcess::quote(fname);
+      packs += TDEProcess::quote(fname);
       packs += " ";
     }
   }
diff --git a/kpackage/debInterface.cpp b/kpackage/debInterface.cpp
index 74ef515..70acb23 100644
--- a/kpackage/debInterface.cpp
+++ b/kpackage/debInterface.cpp
@@ -275,7 +275,7 @@ packageInfo *DEB::getUPackageInfo( const TQString &name)
   packageInfo *pki = 0;
 
   TQString s = "dpkg --info ";
-  s += KProcess::quote(name);
+  s += TDEProcess::quote(name);
 
   TQStringList list =  kpty->run(s);
   for ( TQStringList::Iterator it = list.begin();  it != list.end(); ++it ) {
@@ -566,7 +566,7 @@ TQString DEB::install(int installFlags, TQPtrList<packageInfo> *p,
   for (i = p->first(); i!= 0; i = p->next())  {
     TQString fname = i->fetchFilename();
     if (!fname.isEmpty()) {
-      packs += KProcess::quote(fname);
+      packs += TDEProcess::quote(fname);
       packs += " ";
     }
   }
diff --git a/kpackage/kpPty.cpp b/kpackage/kpPty.cpp
index 23eb15f..e442130 100644
--- a/kpackage/kpPty.cpp
+++ b/kpackage/kpPty.cpp
@@ -61,14 +61,14 @@ kpKProcIO::~kpKProcIO()
 bool kpKProcIO::sstart (RunMode runmode)
 {
 
-  connect (this, TQT_SIGNAL (receivedStdout (KProcess *, char *, int)),
-	   this, TQT_SLOT (received (KProcess *, char *, int)));
+  connect (this, TQT_SIGNAL (receivedStdout (TDEProcess *, char *, int)),
+	   this, TQT_SLOT (received (TDEProcess *, char *, int)));
 
 
-  connect (this, TQT_SIGNAL (wroteStdin(KProcess *)),
-	   this, TQT_SLOT (sent (KProcess *)));
+  connect (this, TQT_SIGNAL (wroteStdin(TDEProcess *)),
+	   this, TQT_SLOT (sent (TDEProcess *)));
 
-  return KProcess::start (runmode,( KProcess::Communication) ( KProcess::Stdin |  KProcess::Stdout));
+  return TDEProcess::start (runmode,( TDEProcess::Communication) ( TDEProcess::Stdin |  TDEProcess::Stdout));
 }
 
 //////////////////////////////////////////////////////////////////////////////
@@ -76,11 +76,11 @@ bool kpKProcIO::sstart (RunMode runmode)
 kpPty::kpPty() : TQObject()
 {
   pty = new kpKProcIO();
-  pty->setUsePty(KProcess::All, false);
+  pty->setUsePty(TDEProcess::All, false);
 
   connect(pty, TQT_SIGNAL(readReady(KProcIO *)), this,
 		   TQT_SLOT(readLines()));
-  connect(pty, TQT_SIGNAL(processExited(KProcess *)), this,
+  connect(pty, TQT_SIGNAL(processExited(TDEProcess *)), this,
 		   TQT_SLOT(done()));
   pty->pty()->setWinSize(0,80);
   tm = new TQTimer(this);
@@ -166,7 +166,7 @@ bool kpPty::startSession(bool needRoot)
       passMsg = i18n("The action you requested needs root privileges. Please enter your SUDO password.\n");
       startSudo();
     }
-    pty->sstart(KProcess::NotifyOnExit);
+    pty->sstart(TDEProcess::NotifyOnExit);
 
   RESTART:
     tm->start(6*1000, TRUE);
@@ -289,7 +289,7 @@ TQStringList kpPty::run(const TQString &cmd, bool inLoop, bool needRoot)
     pty->resetAll();
     breakUpCmd(cmd);
     pty->setEnvironment("TERM", "dumb");
-    if (!pty->sstart(KProcess::NotifyOnExit)) {
+    if (!pty->sstart(TDEProcess::NotifyOnExit)) {
       kdDebug() << " kpPty::run execute=0\n";
       return 0;
     }
@@ -322,7 +322,7 @@ void kpPty::close() {
 
   pty->closeAll();
   while(pty->isRunning()) {
-    KProcessController::theKProcessController->waitForProcessExit(1);
+    TDEProcessController::theTDEProcessController->waitForProcessExit(1);
   }
   inSession = false;
 }
diff --git a/kpackage/kpTerm.cpp b/kpackage/kpTerm.cpp
index c7e99b6..aaaae29 100644
--- a/kpackage/kpTerm.cpp
+++ b/kpackage/kpTerm.cpp
@@ -42,7 +42,7 @@ kpTerm::kpTerm(kpPty *pt, TQWidget * parent,  const char * name ) :
   TQTextEdit(parent,name)
 {
   pty = pt;
-  setFont(KGlobalSettings::fixedFont());
+  setFont(TDEGlobalSettings::fixedFont());
   //  setMinimumWidth(fontMetrics().maxWidth()*80 +
   //      minimumSizeHint().width());
   setWordWrap(NoWrap);
@@ -175,7 +175,7 @@ kpRun::kpRun( TQWidget *parent)
 {
   TQVBox *page = makeVBoxMainWidget();
   title = new TQLabel("", page);
-  TQFont f( KGlobalSettings::generalFont());
+  TQFont f( TDEGlobalSettings::generalFont());
   f.setBold(true);
   f.setPointSize(f.pointSize()+4);
   title->setFont(f);
diff --git a/kpackage/pkgInterface.cpp b/kpackage/pkgInterface.cpp
index 435e830..c3f9a7e 100644
--- a/kpackage/pkgInterface.cpp
+++ b/kpackage/pkgInterface.cpp
@@ -108,7 +108,7 @@ TQString pkgInterface::doInstall(int, const TQString &, bool &) {return 0;}
 ////////////////////////////////////////////////////////////////////////////
 
 bool pkgInterface::ifExe(TQString exe) {
-  if (!KGlobal::dirs()->findExe( exe ).isNull()) {
+  if (!TDEGlobal::dirs()->findExe( exe ).isNull()) {
     return TRUE;
   } else {
     kdDebug() << "Program not found: " << exe << "\n";
diff --git a/kpackage/pkgOptions.cpp b/kpackage/pkgOptions.cpp
index 9d62f2f..67d2a7a 100644
--- a/kpackage/pkgOptions.cpp
+++ b/kpackage/pkgOptions.cpp
@@ -75,7 +75,7 @@ void pkgOptions::setupWidgets(TQPtrList<param> &pars)
 
   // Create widgets
   title = new TQLabel("", this);
-  TQFont f( KGlobalSettings::generalFont());
+  TQFont f( TDEGlobalSettings::generalFont());
   f.setBold(true);
   f.setPointSize(f.pointSize()+6);
   title->setFont(f);
diff --git a/kpackage/procbuf.cpp b/kpackage/procbuf.cpp
index 568e651..8da355a 100644
--- a/kpackage/procbuf.cpp
+++ b/kpackage/procbuf.cpp
@@ -60,19 +60,19 @@ procbuf::~procbuf()
 void procbuf::setup(TQString cmd)
 {
   buf.truncate(0);
-  proc = new KProcess();
-  connect(proc, TQT_SIGNAL( receivedStdout(KProcess *, char *, int)), 
-			this, TQT_SLOT(slotReadInfo(KProcess *, char *, int)));
-  connect(proc, TQT_SIGNAL( receivedStderr(KProcess *, char *, int)), 
-			this, TQT_SLOT(slotReadInfo(KProcess *, char *, int)));
-  connect(proc, TQT_SIGNAL( processExited(KProcess *)), 
-			this, TQT_SLOT(slotExited(KProcess *)));
+  proc = new TDEProcess();
+  connect(proc, TQT_SIGNAL( receivedStdout(TDEProcess *, char *, int)), 
+			this, TQT_SLOT(slotReadInfo(TDEProcess *, char *, int)));
+  connect(proc, TQT_SIGNAL( receivedStderr(TDEProcess *, char *, int)), 
+			this, TQT_SLOT(slotReadInfo(TDEProcess *, char *, int)));
+  connect(proc, TQT_SIGNAL( processExited(TDEProcess *)), 
+			this, TQT_SLOT(slotExited(TDEProcess *)));
   proc->clearArguments();
   *proc << cmd;
   command = cmd;
 }
 
-void procbuf::slotReadInfo(KProcess *, char *buffer, int buflen)
+void procbuf::slotReadInfo(TDEProcess *, char *buffer, int buflen)
 {
    char last;
 
@@ -88,7 +88,7 @@ void procbuf::slotReadInfo(KProcess *, char *buffer, int buflen)
    }
 }
 
-void procbuf::slotExited(KProcess *)
+void procbuf::slotExited(TDEProcess *)
 {
   if (m) {
     m->terminate();
@@ -115,8 +115,8 @@ int procbuf::start (TQString  msg, bool errorDlg,
     timed = true;
   }
 
-  if (!proc->start(!msg.isNull() ? KProcess::NotifyOnExit : KProcess::Block,
-		   KProcess::All)) {
+  if (!proc->start(!msg.isNull() ? TDEProcess::NotifyOnExit : TDEProcess::Block,
+		   TDEProcess::All)) {
     if (errorDlg) {
       KpMsgE(i18n("Kprocess Failure"),TRUE);
     }
diff --git a/kpackage/procbuf.h b/kpackage/procbuf.h
index 76063b2..b502621 100644
--- a/kpackage/procbuf.h
+++ b/kpackage/procbuf.h
@@ -56,15 +56,15 @@ public:
 	    int timeout=0, TQString timeMsg = "");
 
   TQString buf;
-  KProcess *proc; 
+  TDEProcess *proc; 
   Modal *m;
   TQString command;
   bool timed;
   TQTimer *tm;
 
 public slots:
-  void slotReadInfo(KProcess *, char *, int);
-  void slotExited(KProcess *);
+  void slotReadInfo(TDEProcess *, char *, int);
+  void slotExited(TDEProcess *);
   void slotTimeout();
 };
 #endif