summaryrefslogtreecommitdiffstats
path: root/parts/diff/diffpart.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-24 13:51:01 -0600
committerTimothy Pearson <[email protected]>2013-01-24 13:51:01 -0600
commitb9e542d0c805e9adee3a67e44532d5321032e21e (patch)
treee82d85b9035cc2ca322911e8a6e38a3bd8b1d431 /parts/diff/diffpart.cpp
parent7a392a04059bd904dab4c78910a6d34aa0b37798 (diff)
downloadtdevelop-b9e542d0c805e9adee3a67e44532d5321032e21e.tar.gz
tdevelop-b9e542d0c805e9adee3a67e44532d5321032e21e.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'parts/diff/diffpart.cpp')
-rw-r--r--parts/diff/diffpart.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/parts/diff/diffpart.cpp b/parts/diff/diffpart.cpp
index 647a5cc5..97adaf4f 100644
--- a/parts/diff/diffpart.cpp
+++ b/parts/diff/diffpart.cpp
@@ -149,22 +149,22 @@ void DiffPart::localDiff()
resultBuffer = resultErr = TQString();
delete proc;
- proc = new KProcess();
+ proc = new TDEProcess();
*proc << "diff";
*proc << "-u" << popupFile.path() << "-";
proc->setWorkingDirectory( popupFile.directory() );
- connect( proc, TQT_SIGNAL(processExited( KProcess* )),
- this, TQT_SLOT(processExited( KProcess* )) );
- connect( proc, TQT_SIGNAL(receivedStdout( KProcess*, char*, int )),
- this, TQT_SLOT(receivedStdout( KProcess*, char*, int )) );
- connect( proc, TQT_SIGNAL(receivedStderr( KProcess*, char*, int )),
- this, TQT_SLOT(receivedStderr( KProcess*, char*, int )) );
- connect( proc, TQT_SIGNAL(wroteStdin( KProcess* )),
- this, TQT_SLOT(wroteStdin( KProcess* )) );
+ connect( proc, TQT_SIGNAL(processExited( TDEProcess* )),
+ this, TQT_SLOT(processExited( TDEProcess* )) );
+ connect( proc, TQT_SIGNAL(receivedStdout( TDEProcess*, char*, int )),
+ this, TQT_SLOT(receivedStdout( TDEProcess*, char*, int )) );
+ connect( proc, TQT_SIGNAL(receivedStderr( TDEProcess*, char*, int )),
+ this, TQT_SLOT(receivedStderr( TDEProcess*, char*, int )) );
+ connect( proc, TQT_SIGNAL(wroteStdin( TDEProcess* )),
+ this, TQT_SLOT(wroteStdin( TDEProcess* )) );
- if ( !proc->start( KProcess::NotifyOnExit, KProcess::All ) ) {
+ if ( !proc->start( TDEProcess::NotifyOnExit, TDEProcess::All ) ) {
KMessageBox::error( 0, i18n( "Could not invoke the \"diff\" command." ) );
delete proc;
proc = 0;
@@ -173,7 +173,7 @@ void DiffPart::localDiff()
proc->writeStdin( buffer.data(), buffer.length() );
}
-void DiffPart::processExited( KProcess* p )
+void DiffPart::processExited( TDEProcess* p )
{
// diff has exit status 0 and 1 for success
if ( p->normalExit() && ( p->exitStatus() == 0 || p->exitStatus() == 1 ) ) {
@@ -189,18 +189,18 @@ void DiffPart::processExited( KProcess* p )
proc = 0;
}
-void DiffPart::receivedStdout( KProcess* /* p */, char* buf, int buflen )
+void DiffPart::receivedStdout( TDEProcess* /* p */, char* buf, int buflen )
{
resultBuffer += TQString::fromLocal8Bit( buf, buflen );
}
-void DiffPart::receivedStderr( KProcess* /* p */, char* buf, int buflen )
+void DiffPart::receivedStderr( TDEProcess* /* p */, char* buf, int buflen )
{
kdDebug(9033) << "received Stderr: " << TQString(TQString::fromLocal8Bit( buf, buflen )).ascii() << endl;
resultErr += TQString::fromLocal8Bit( buf, buflen );
}
-void DiffPart::wroteStdin( KProcess* p )
+void DiffPart::wroteStdin( TDEProcess* p )
{
buffer = 0L;
p->closeStdin();