summaryrefslogtreecommitdiffstats
path: root/parts/valgrind
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:51:01 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:51:01 -0600
commitb9e542d0c805e9adee3a67e44532d5321032e21e (patch)
treee82d85b9035cc2ca322911e8a6e38a3bd8b1d431 /parts/valgrind
parent7a392a04059bd904dab4c78910a6d34aa0b37798 (diff)
downloadtdevelop-b9e542d0c805e9adee3a67e44532d5321032e21e.tar.gz
tdevelop-b9e542d0c805e9adee3a67e44532d5321032e21e.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'parts/valgrind')
-rw-r--r--parts/valgrind/valgrind_dialog.cpp4
-rw-r--r--parts/valgrind/valgrind_part.cpp24
-rw-r--r--parts/valgrind/valgrind_part.h10
3 files changed, 19 insertions, 19 deletions
diff --git a/parts/valgrind/valgrind_dialog.cpp b/parts/valgrind/valgrind_dialog.cpp
index 3413feff..3e936c18 100644
--- a/parts/valgrind/valgrind_dialog.cpp
+++ b/parts/valgrind/valgrind_dialog.cpp
@@ -193,10 +193,10 @@ void ValgrindDialog::setKcExecutable( const TQString& ke )
bool ValgrindDialog::isNewValgrindVersion( ) const
{
- KProcess *proc = new KProcess;
+ TDEProcess *proc = new TDEProcess;
proc->setUseShell(true);
*proc << "test \"valgrind-20\" == `valgrind --version | awk -F \\. '{print $1$2}'`";
- proc->start(KProcess::Block);
+ proc->start(TDEProcess::Block);
if (proc->normalExit())
return proc->exitStatus();
return true;
diff --git a/parts/valgrind/valgrind_part.cpp b/parts/valgrind/valgrind_part.cpp
index 5aaf66aa..287dd7ec 100644
--- a/parts/valgrind/valgrind_part.cpp
+++ b/parts/valgrind/valgrind_part.cpp
@@ -33,12 +33,12 @@ ValgrindPart::ValgrindPart( TQObject *parent, const char *name, const TQStringLi
setXMLFile( "kdevpart_valgrind.rc" );
proc = new KShellProcess();
- 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(processExited( KProcess* )),
- this, TQT_SLOT(processExited( KProcess* )) );
+ 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(processExited( TDEProcess* )),
+ this, TQT_SLOT(processExited( TDEProcess* )) );
connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)),
this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) );
connect( core(), TQT_SIGNAL(projectOpened()),
@@ -238,7 +238,7 @@ void ValgrindPart::runValgrind( const TQString& exec, const TQString& params, co
}
*proc << envVarList.join("") << valExec << valParams << exec << params;
- proc->start( KProcess::NotifyOnExit, KProcess::AllOutput );
+ proc->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput );
mainWindow()->raiseView( m_widget );
core()->running( this, true );
@@ -246,12 +246,12 @@ void ValgrindPart::runValgrind( const TQString& exec, const TQString& params, co
_lastParams = params;
}
-void ValgrindPart::receivedStdout( KProcess*, char* /* msg */, int /* len */ )
+void ValgrindPart::receivedStdout( TDEProcess*, char* /* msg */, int /* len */ )
{
//kdDebug() << "got StdOut: " <<TQString::fromLocal8Bit( msg, len ) << endl;
}
-void ValgrindPart::receivedStderr( KProcess*, char* msg, int len )
+void ValgrindPart::receivedStderr( TDEProcess*, char* msg, int len )
{
receivedString( TQString::fromLocal8Bit( msg, len ) );
}
@@ -299,7 +299,7 @@ void ValgrindPart::appendMessages( const TQStringList& lines )
}
}
-void ValgrindPart::processExited( KProcess* p )
+void ValgrindPart::processExited( TDEProcess* p )
{
if ( p == proc ) {
appendMessage( currentMessage + lastPiece );
@@ -309,11 +309,11 @@ void ValgrindPart::processExited( KProcess* p )
if (kcInfo.runKc)
{
- KProcess *kcProc = new KProcess;
+ TDEProcess *kcProc = new TDEProcess;
// kcProc->setWorkingDirectory(kcInfo.kcWorkDir);
*kcProc << kcInfo.kcPath;
*kcProc << TQString("callgrind.out.%1").arg(p->pid());
- kcProc->start(KProcess::DontCare);
+ kcProc->start(TDEProcess::DontCare);
}
}
}
diff --git a/parts/valgrind/valgrind_part.h b/parts/valgrind/valgrind_part.h
index ad1a22d3..8c4e66e2 100644
--- a/parts/valgrind/valgrind_part.h
+++ b/parts/valgrind/valgrind_part.h
@@ -11,7 +11,7 @@
#include <kdevplugin.h>
class ValgrindWidget;
-class KProcess;
+class TDEProcess;
class ValgrindPart : public KDevPlugin
{
@@ -32,9 +32,9 @@ private slots:
void slotExecCalltree();
void slotKillValgrind();
void slotStopButtonClicked( KDevPlugin* which );
- void receivedStdout( KProcess*, char*, int );
- void receivedStderr( KProcess*, char*, int );
- void processExited( KProcess* );
+ void receivedStdout( TDEProcess*, char*, int );
+ void receivedStderr( TDEProcess*, char*, int );
+ void processExited( TDEProcess* );
void loadOutput();
void projectOpened();
@@ -46,7 +46,7 @@ private:
void clear();
TQString _lastExec, _lastParams, _lastValExec, _lastValParams,
_lastCtExec, _lastCtParams, _lastKcExec;
- KProcess* proc;
+ TDEProcess* proc;
TQString currentMessage;
TQString lastPiece;
TQStringList activeFiles;