| 1038 | } |
| 1039 | |
| 1040 | void KDiff3App::choose(e_SrcSelector choice) |
| 1041 | { |
| 1042 | if(!m_bTimerBlock) |
| 1043 | { |
| 1044 | if(m_pDirectoryMergeWindow->hasFocus()) |
| 1045 | { |
| 1046 | if(choice == e_SrcSelector::A) m_pDirectoryMergeWindow->slotCurrentChooseA(); |
| 1047 | if(choice == e_SrcSelector::B) m_pDirectoryMergeWindow->slotCurrentChooseB(); |
| 1048 | if(choice == e_SrcSelector::C) m_pDirectoryMergeWindow->slotCurrentChooseC(); |
| 1049 | |
| 1050 | chooseA->setChecked(false); |
| 1051 | chooseB->setChecked(false); |
| 1052 | chooseC->setChecked(false); |
| 1053 | } |
| 1054 | else |
| 1055 | { |
| 1056 | m_pMergeResultWindow->choose(choice); |
| 1057 | if(autoAdvance->isChecked()) |
| 1058 | { |
| 1059 | m_bTimerBlock = true; |
| 1060 | QTimer::singleShot(gOptions->m_autoAdvanceDelay, this, &KDiff3App::slotGoNextUnsolvedConflict); |
| 1061 | } |
| 1062 | } |
| 1063 | } |
| 1064 | } |
| 1065 | |
| 1066 | void KDiff3App::slotAutoSolve() |
| 1067 | { |
nothing calls this directly
no test coverage detected