| 1718 | } |
| 1719 | |
| 1720 | void KDiff3App::slotMergeCurrentFile() |
| 1721 | { |
| 1722 | if(m_bDirCompare && m_pDirectoryMergeWindow->isVisible() && m_pDirectoryMergeWindow->isFileSelected()) |
| 1723 | { |
| 1724 | m_pDirectoryMergeWindow->mergeCurrentFile(); |
| 1725 | } |
| 1726 | else if(m_pMainWidget->isVisible()) |
| 1727 | { |
| 1728 | if(!canContinue()) return; |
| 1729 | |
| 1730 | if(m_outputFilename.isEmpty()) |
| 1731 | { |
| 1732 | if(!m_sd3->isEmpty() && !m_sd3->isFromBuffer()) |
| 1733 | { |
| 1734 | m_outputFilename = m_sd3->getFilename(); |
| 1735 | } |
| 1736 | else if(!m_sd2->isEmpty() && !m_sd2->isFromBuffer()) |
| 1737 | { |
| 1738 | m_outputFilename = m_sd2->getFilename(); |
| 1739 | } |
| 1740 | else if(!m_sd1->isEmpty() && !m_sd1->isFromBuffer()) |
| 1741 | { |
| 1742 | m_outputFilename = m_sd1->getFilename(); |
| 1743 | } |
| 1744 | else |
| 1745 | { |
| 1746 | m_outputFilename = "unnamed.txt"; |
| 1747 | m_bDefaultFilename = true; |
| 1748 | } |
| 1749 | } |
| 1750 | mainInit(m_totalDiffStatus); |
| 1751 | } |
| 1752 | } |
| 1753 | |
| 1754 | void KDiff3App::slotWinFocusNext() |
| 1755 | { |
nothing calls this directly
no test coverage detected