|
|
|
@ -165,7 +165,7 @@ void KDiff3Plugin::slotCompareWith()
|
|
|
|
|
TQStringList args;
|
|
|
|
|
args << s_pHistory->front();
|
|
|
|
|
args << m_list.front();
|
|
|
|
|
kapp->tdeinitExec ("kdiff3", args);
|
|
|
|
|
tdeApp->tdeinitExec ("kdiff3", args);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -177,7 +177,7 @@ void KDiff3Plugin::slotCompareWithHistoryItem()
|
|
|
|
|
TQStringList args;
|
|
|
|
|
args << pAction->text();
|
|
|
|
|
args << m_list.front();
|
|
|
|
|
kapp->tdeinitExec ("kdiff3", args);
|
|
|
|
|
tdeApp->tdeinitExec ("kdiff3", args);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -188,7 +188,7 @@ void KDiff3Plugin::slotCompareTwoFiles()
|
|
|
|
|
TQStringList args;
|
|
|
|
|
args << m_list.front();
|
|
|
|
|
args << m_list.back();
|
|
|
|
|
kapp->tdeinitExec ("kdiff3", args);
|
|
|
|
|
tdeApp->tdeinitExec ("kdiff3", args);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -200,7 +200,7 @@ void KDiff3Plugin::slotCompareThreeFiles()
|
|
|
|
|
args << m_list[0];
|
|
|
|
|
args << m_list[1];
|
|
|
|
|
args << m_list[2];
|
|
|
|
|
kapp->tdeinitExec ("kdiff3", args);
|
|
|
|
|
tdeApp->tdeinitExec ("kdiff3", args);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -212,7 +212,7 @@ void KDiff3Plugin::slotMergeWith()
|
|
|
|
|
args << s_pHistory->front();
|
|
|
|
|
args << m_list.front();
|
|
|
|
|
args << ( "-o" + m_list.front() );
|
|
|
|
|
kapp->tdeinitExec ("kdiff3", args);
|
|
|
|
|
tdeApp->tdeinitExec ("kdiff3", args);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -225,7 +225,7 @@ void KDiff3Plugin::slotMergeThreeWay()
|
|
|
|
|
args << (*s_pHistory)[0];
|
|
|
|
|
args << m_list.front();
|
|
|
|
|
args << ("-o" + m_list.front());
|
|
|
|
|
kapp->tdeinitExec ("kdiff3", args);
|
|
|
|
|
tdeApp->tdeinitExec ("kdiff3", args);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|