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

9 files changed, 35 insertions, 35 deletions

diff --git a/libtdegames/README b/libtdegames/README
index b96c1772..df28c8f6 100644
--- a/libtdegames/README
+++ b/libtdegames/README
@@ -19,7 +19,7 @@ Contents:
          of classes which are explained in the kgame docu (as soon as it is
          written)
 if you use libtdegames in your game please also add
-KGlobal::locale()->insertCatalogue("libtdegames");
+TDEGlobal::locale()->insertCatalogue("libtdegames");
 to main()
 This will add libtdegames.pot to your game and therefore all libtdegames 
 strings get translated.
diff --git a/libtdegames/highscore/kexthighscore_item.cpp b/libtdegames/highscore/kexthighscore_item.cpp
index 5a7b9826..c7e294c1 100644
--- a/libtdegames/highscore/kexthighscore_item.cpp
+++ b/libtdegames/highscore/kexthighscore_item.cpp
@@ -132,7 +132,7 @@ TQString Item::pretty(uint, const TQVariant &value) const
         return timeFormat(value.toUInt());
     case DateTime:
         if ( value.toDateTime().isNull() ) return "--";
-        return KGlobal::locale()->formatDateTime(value.toDateTime());
+        return TDEGlobal::locale()->formatDateTime(value.toDateTime());
     case NoSpecial:
         break;
     }
diff --git a/libtdegames/kcarddialog.cpp b/libtdegames/kcarddialog.cpp
index 937eb26b..4a2c4168 100644
--- a/libtdegames/kcarddialog.cpp
+++ b/libtdegames/kcarddialog.cpp
@@ -226,7 +226,7 @@ TQString KCardDialog::getDefaultCardDir()
     KCardDialog::init();
 
     TQString file = KCARD_DEFAULTCARDDIR + KCARD_DEFAULTCARD;
-    return KGlobal::dirs()->findResourceDir("cards",file) + KCARD_DEFAULTCARDDIR;
+    return TDEGlobal::dirs()->findResourceDir("cards",file) + KCARD_DEFAULTCARDDIR;
 }
 
 TQString KCardDialog::getCardPath(const TQString &carddir, int index)
@@ -452,7 +452,7 @@ void KCardDialog::setupDialog(bool showResizeBox)
 
 void KCardDialog::insertCardIcons()
 {
-    TQStringList list = KGlobal::dirs()->findAllResources("cards", "card*/index.desktop", false, true);
+    TQStringList list = TDEGlobal::dirs()->findAllResources("cards", "card*/index.desktop", false, true);
     // kdDebug(11000) << "insert " << list.count() << endl;
     if (list.isEmpty())
         return;
@@ -488,7 +488,7 @@ void KCardDialog::insertCardIcons()
 
 void KCardDialog::insertDeckIcons()
 {
-    TQStringList list = KGlobal::dirs()->findAllResources("cards", "decks/*.desktop", false, true);
+    TQStringList list = TDEGlobal::dirs()->findAllResources("cards", "decks/*.desktop", false, true);
     if (list.isEmpty())
         return;
 
@@ -575,7 +575,7 @@ TQString KCardDialog::getRandomDeck()
 {
     KCardDialog::init();
 
-    TQStringList list = KGlobal::dirs()->findAllResources("cards", "decks/*.desktop");
+    TQStringList list = TDEGlobal::dirs()->findAllResources("cards", "decks/*.desktop");
     if (list.isEmpty())
         return TQString();
 
@@ -587,7 +587,7 @@ TQString KCardDialog::getRandomCardDir()
 {
     KCardDialog::init();
 
-    TQStringList list = KGlobal::dirs()->findAllResources("cards", "card*/index.desktop");
+    TQStringList list = TDEGlobal::dirs()->findAllResources("cards", "card*/index.desktop");
     if (list.isEmpty())
         return TQString();
 
@@ -799,9 +799,9 @@ void KCardDialog::init()
     static bool _inited = false;
     if (_inited)
         return;
-    KGlobal::dirs()->addResourceType("cards", KStandardDirs::kde_default("data") + TQString::fromLatin1("carddecks/"));
+    TDEGlobal::dirs()->addResourceType("cards", KStandardDirs::kde_default("data") + TQString::fromLatin1("carddecks/"));
 
-    KGlobal::locale()->insertCatalogue("libtdegames");
+    TDEGlobal::locale()->insertCatalogue("libtdegames");
     _inited = true;
 }
 
diff --git a/libtdegames/kchatbase.cpp b/libtdegames/kchatbase.cpp
index 64434668..771975ca 100644
--- a/libtdegames/kchatbase.cpp
+++ b/libtdegames/kchatbase.cpp
@@ -222,7 +222,7 @@ void KChatBase::init(bool noComboBox)
  d->mEdit->setHandleSignals(false);
  d->mEdit->setTrapReturnKey(true);
  d->mEdit->completionObject(); // add the completion object
- d->mEdit->setCompletionMode(KGlobalSettings::CompletionNone);
+ d->mEdit->setCompletionMode(TDEGlobalSettings::CompletionNone);
  connect(d->mEdit, TQT_SIGNAL(returnPressed(const TQString&)), this, TQT_SLOT(slotReturnPressed(const TQString&)));
  h->addWidget(d->mEdit);
 
@@ -414,7 +414,7 @@ void KChatBase::slotClear()
  d->mBox->clear();
 }
 
-void KChatBase::setCompletionMode(KGlobalSettings::Completion mode)
+void KChatBase::setCompletionMode(TDEGlobalSettings::Completion mode)
 { d->mEdit->setCompletionMode(mode); }
 
 void KChatBase::setNameFont(const TQFont& font)
diff --git a/libtdegames/kchatbase.h b/libtdegames/kchatbase.h
index 9753cc8d..5c28f6a7 100644
--- a/libtdegames/kchatbase.h
+++ b/libtdegames/kchatbase.h
@@ -290,7 +290,7 @@ public:
 	/**
 	 * See KLineEdit::setCompletionMode
 	 **/
-	void setCompletionMode(KGlobalSettings::Completion mode);
+	void setCompletionMode(TDEGlobalSettings::Completion mode);
 
 	/**
 	 * Set the font that used used for the name part of a message. See also
diff --git a/libtdegames/kgame/kgameio.h b/libtdegames/kgame/kgameio.h
index e0118b8b..1478f632 100644
--- a/libtdegames/kgame/kgameio.h
+++ b/libtdegames/kgame/kgameio.h
@@ -28,7 +28,7 @@
 #include <kdemacros.h>
 class KPlayer;
 class KGame;
-class KProcess;
+class TDEProcess;
 
 /**
  *  \short Base class for IO devices for games
diff --git a/libtdegames/kgame/kgameprocess.h b/libtdegames/kgame/kgameprocess.h
index 609ee1fd..092acd0f 100644
--- a/libtdegames/kgame/kgameprocess.h
+++ b/libtdegames/kgame/kgameprocess.h
@@ -35,7 +35,7 @@ class KMessageFilePipe;
 
 /**
  * This is the process class used on the computer player
- * side to communicate with its counterpart KProcessIO class.
+ * side to communicate with its counterpart TDEProcessIO class.
  * Using these two classes will give fully transparent communication
  * via TQDataStreams.
  */
@@ -222,7 +222,7 @@ class KDE_EXPORT KGameProcess:  public TQObject
      /**
       * This signal is emmited when the process is initialized, i.e. added
       * to a KPlayer. Initial initialisation can be performed here be reacting
-      * to the KProcessIO signal signalIOAdded and retrieving the data here
+      * to the TDEProcessIO signal signalIOAdded and retrieving the data here
       * from the stream. 
       * It works just as the signalTurn() but is only send when the player is
       * added to the game, i.e. it needs some initialization data
diff --git a/libtdegames/kgame/kmessageio.cpp b/libtdegames/kgame/kmessageio.cpp
index 37fbcc1f..6067d9e5 100644
--- a/libtdegames/kgame/kmessageio.cpp
+++ b/libtdegames/kgame/kmessageio.cpp
@@ -243,20 +243,20 @@ KMessageProcess::KMessageProcess(TQObject *parent, TQString file) : KMessageIO(p
   // Start process
   kdDebug(11001) << "@@@KMessageProcess::Start process" << endl;
   mProcessName=file;
-  mProcess=new KProcess;
+  mProcess=new TDEProcess;
   int id=0;
   *mProcess << mProcessName << TQString("%1").arg(id);
   kdDebug(11001) << "@@@KMessageProcess::Init:Id= " << id << endl;
   kdDebug(11001) << "@@@KMessgeProcess::Init:Processname: " << mProcessName << endl;
-  connect(mProcess, TQT_SIGNAL(receivedStdout(KProcess *, char *, int )),
-                        this, TQT_SLOT(slotReceivedStdout(KProcess *, char * , int )));
-  connect(mProcess, TQT_SIGNAL(receivedStderr(KProcess *, char *, int )),
-                        this, TQT_SLOT(slotReceivedStderr(KProcess *, char * , int )));
-  connect(mProcess, TQT_SIGNAL(processExited(KProcess *)),
-                        this, TQT_SLOT(slotProcessExited(KProcess *)));
-  connect(mProcess, TQT_SIGNAL(wroteStdin(KProcess *)),
-                        this, TQT_SLOT(slotWroteStdin(KProcess *)));
-  mProcess->start(KProcess::NotifyOnExit,KProcess::All);
+  connect(mProcess, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int )),
+                        this, TQT_SLOT(slotReceivedStdout(TDEProcess *, char * , int )));
+  connect(mProcess, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int )),
+                        this, TQT_SLOT(slotReceivedStderr(TDEProcess *, char * , int )));
+  connect(mProcess, TQT_SIGNAL(processExited(TDEProcess *)),
+                        this, TQT_SLOT(slotProcessExited(TDEProcess *)));
+  connect(mProcess, TQT_SIGNAL(wroteStdin(TDEProcess *)),
+                        this, TQT_SLOT(slotWroteStdin(TDEProcess *)));
+  mProcess->start(TDEProcess::NotifyOnExit,TDEProcess::All);
   mSendBuffer=0;
   mReceiveCount=0;
   mReceiveBuffer.resize(1024);
@@ -300,7 +300,7 @@ void KMessageProcess::writeToProcess()
   mProcess->writeStdin(mSendBuffer->data(),mSendBuffer->size());
 
 }
-void KMessageProcess::slotWroteStdin(KProcess * )
+void KMessageProcess::slotWroteStdin(TDEProcess * )
 {
   kdDebug(11001) << k_funcinfo << endl;
   if (mSendBuffer)
@@ -311,7 +311,7 @@ void KMessageProcess::slotWroteStdin(KProcess * )
   writeToProcess();
 }
 
-void KMessageProcess::slotReceivedStderr(KProcess * proc, char *buffer, int buflen)
+void KMessageProcess::slotReceivedStderr(TDEProcess * proc, char *buffer, int buflen)
 {
   int pid=0;
   int len;
@@ -341,7 +341,7 @@ void KMessageProcess::slotReceivedStderr(KProcess * proc, char *buffer, int bufl
 }
 
 
-void KMessageProcess::slotReceivedStdout(KProcess * , char *buffer, int buflen)
+void KMessageProcess::slotReceivedStdout(TDEProcess * , char *buffer, int buflen)
 {
   kdDebug(11001) << "$$$$$$ " << k_funcinfo << ": Received " << buflen << " bytes over inter process communication" << endl;
 
@@ -387,7 +387,7 @@ void KMessageProcess::slotReceivedStdout(KProcess * , char *buffer, int buflen)
   }
 }
 
-void KMessageProcess::slotProcessExited(KProcess * /*p*/)
+void KMessageProcess::slotProcessExited(TDEProcess * /*p*/)
 {
   kdDebug(11001) << "Process exited (slot)" << endl;
   emit connectionBroken();
diff --git a/libtdegames/kgame/kmessageio.h b/libtdegames/kgame/kmessageio.h
index 16dea633..0a8d4172 100644
--- a/libtdegames/kgame/kmessageio.h
+++ b/libtdegames/kgame/kmessageio.h
@@ -33,7 +33,7 @@
 #include <kdebug.h>
 
 class TQSocket;
-class KProcess;
+class TDEProcess;
 //class TQFile;
 
 
@@ -373,14 +373,14 @@ class KMessageProcess : public KMessageIO
 
 
   public slots:
-  void  slotReceivedStdout(KProcess *proc, char *buffer, int buflen);
-  void  slotReceivedStderr(KProcess *proc, char *buffer, int buflen);
-  void  slotProcessExited(KProcess *p);
-  void  slotWroteStdin(KProcess *p);
+  void  slotReceivedStdout(TDEProcess *proc, char *buffer, int buflen);
+  void  slotReceivedStderr(TDEProcess *proc, char *buffer, int buflen);
+  void  slotProcessExited(TDEProcess *p);
+  void  slotWroteStdin(TDEProcess *p);
 
   private:
     TQString mProcessName;
-    KProcess *mProcess;
+    TDEProcess *mProcess;
     TQPtrQueue <TQByteArray> mQueue;
     TQByteArray *mSendBuffer;
     TQByteArray mReceiveBuffer;