Commit 409d6e17 authored by Joachim Eibl's avatar Joachim Eibl
Browse files

Use KProcess::startDetached instead of execute to avoid blocking

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@113 c8aa9fed-2811-0410-8543-893ada326672
parent 95ac4b64
...@@ -184,7 +184,7 @@ void KDiff3Plugin::slotCompareWith() ...@@ -184,7 +184,7 @@ void KDiff3Plugin::slotCompareWith()
QStringList args; QStringList args;
args << s_pHistory->front(); args << s_pHistory->front();
args << m_list.front(); args << m_list.front();
KProcess::execute("kdiff3", args); KProcess::startDetached("kdiff3", args);
} }
} }
...@@ -196,7 +196,7 @@ void KDiff3Plugin::slotCompareWithHistoryItem() ...@@ -196,7 +196,7 @@ void KDiff3Plugin::slotCompareWithHistoryItem()
QStringList args; QStringList args;
args << pAction->text(); args << pAction->text();
args << m_list.front(); args << m_list.front();
KProcess::execute ("kdiff3", args); KProcess::startDetached ("kdiff3", args);
} }
} }
...@@ -207,7 +207,7 @@ void KDiff3Plugin::slotCompareTwoFiles() ...@@ -207,7 +207,7 @@ void KDiff3Plugin::slotCompareTwoFiles()
QStringList args; QStringList args;
args << m_list.front(); args << m_list.front();
args << m_list.back(); args << m_list.back();
KProcess::execute ("kdiff3", args); KProcess::startDetached ("kdiff3", args);
} }
} }
...@@ -219,7 +219,7 @@ void KDiff3Plugin::slotCompareThreeFiles() ...@@ -219,7 +219,7 @@ void KDiff3Plugin::slotCompareThreeFiles()
args << m_list[0]; args << m_list[0];
args << m_list[1]; args << m_list[1];
args << m_list[2]; args << m_list[2];
KProcess::execute ("kdiff3", args); KProcess::startDetached ("kdiff3", args);
} }
} }
...@@ -231,7 +231,7 @@ void KDiff3Plugin::slotMergeWith() ...@@ -231,7 +231,7 @@ void KDiff3Plugin::slotMergeWith()
args << s_pHistory->front(); args << s_pHistory->front();
args << m_list.front(); args << m_list.front();
args << ( "-o" + m_list.front() ); args << ( "-o" + m_list.front() );
KProcess::execute ("kdiff3", args); KProcess::startDetached ("kdiff3", args);
} }
} }
...@@ -244,7 +244,7 @@ void KDiff3Plugin::slotMergeThreeWay() ...@@ -244,7 +244,7 @@ void KDiff3Plugin::slotMergeThreeWay()
args << (*s_pHistory)[0]; args << (*s_pHistory)[0];
args << m_list.front(); args << m_list.front();
args << ("-o" + m_list.front()); args << ("-o" + m_list.front());
KProcess::execute ("kdiff3", args); KProcess::startDetached ("kdiff3", args);
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment