summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/yahoo/libkyahoo
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-24 13:48:31 -0600
committerTimothy Pearson <[email protected]>2013-01-24 13:48:31 -0600
commitc48e769eb275917717e2b55eb869f7e559293ac8 (patch)
tree8f650b907e21c918b826f854dbe1c8174cc2c0c6 /kopete/protocols/yahoo/libkyahoo
parent8011d84f483f3628f3f04ea5cb2c1c3c86b2dba7 (diff)
downloadtdenetwork-c48e769eb275917717e2b55eb869f7e559293ac8.tar.gz
tdenetwork-c48e769eb275917717e2b55eb869f7e559293ac8.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kopete/protocols/yahoo/libkyahoo')
-rw-r--r--kopete/protocols/yahoo/libkyahoo/webcamtask.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp b/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp
index 90245b29..e90b45f2 100644
--- a/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp
@@ -470,11 +470,11 @@ void WebcamTask::parseData( TQByteArray &data, KStreamSocket *socket )
file->writeBlock((info->buffer->buffer()).data(), info->buffer->size());
file->close();
- KProcess p;
+ TDEProcess p;
p << "jasper";
p << "--input" << jpcTmpImageFile.name() << "--output" << bmpTmpImageFile.name() << "--output-format" << "bmp";
- p.start( KProcess::Block );
+ p.start( TDEProcess::Block );
if( p.exitStatus() != 0 )
{
kdDebug(YAHOO_RAW_DEBUG) << " jasper exited with status " << p.exitStatus() << " " << info->sender << endl;