summaryrefslogtreecommitdiffstats
path: root/libtdegames/kgame
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-24 13:45:16 -0600
committerTimothy Pearson <[email protected]>2013-01-24 13:45:16 -0600
commitf3141fbf4b9ff6dd0f37e08aa552ab71e8f391c7 (patch)
treeb312fd7d5b7a34b88941b2fc50661431637b78b4 /libtdegames/kgame
parent23a5c62758c4898e3afc1b8bb4c3ae78f4b526ac (diff)
downloadtdegames-f3141fbf4b9ff6dd0f37e08aa552ab71e8f391c7.tar.gz
tdegames-f3141fbf4b9ff6dd0f37e08aa552ab71e8f391c7.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'libtdegames/kgame')
-rw-r--r--libtdegames/kgame/kgameio.h2
-rw-r--r--libtdegames/kgame/kgameprocess.h4
-rw-r--r--libtdegames/kgame/kmessageio.cpp28
-rw-r--r--libtdegames/kgame/kmessageio.h12
4 files changed, 23 insertions, 23 deletions
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;