| 220 | } |
| 221 | |
| 222 | void KDiff3FileItemAction::slotMergeWith() |
| 223 | { |
| 224 | if(m_list.count() > 0 && s_pHistory && !s_pHistory->empty()) |
| 225 | { |
| 226 | QStringList args = { |
| 227 | s_pHistory->first(), |
| 228 | Utils::urlToString(m_list.first()), |
| 229 | ("-o" + Utils::urlToString(m_list.first())) |
| 230 | }; |
| 231 | QProcess::startDetached("kdiff3", args); |
| 232 | } |
| 233 | } |
| 234 | |
| 235 | void KDiff3FileItemAction::slotMergeThreeWay() |
| 236 | { |
nothing calls this directly
no outgoing calls
no test coverage detected