| 111 | } |
| 112 | |
| 113 | bool MergeFileInfos::conflictingFileTypes() const |
| 114 | { |
| 115 | if((m_pFileInfoA != nullptr && !m_pFileInfoA->isNormal()) || (m_pFileInfoB != nullptr && !m_pFileInfoB->isNormal()) || (m_pFileInfoC != nullptr && !m_pFileInfoC->isNormal())) |
| 116 | return true; |
| 117 | // Now check if file/dir-types fit. |
| 118 | if(isLinkA() || isLinkB() || isLinkC()) |
| 119 | { |
| 120 | if((existsInA() && !isLinkA()) || |
| 121 | (existsInB() && !isLinkB()) || |
| 122 | (existsInC() && !isLinkC())) |
| 123 | { |
| 124 | return true; |
| 125 | } |
| 126 | } |
| 127 | |
| 128 | if(isDirA() || isDirB() || isDirC()) |
| 129 | { |
| 130 | if((existsInA() && !isDirA()) || |
| 131 | (existsInB() && !isDirB()) || |
| 132 | (existsInC() && !isDirC())) |
| 133 | { |
| 134 | return true; |
| 135 | } |
| 136 | } |
| 137 | return false; |
| 138 | } |
| 139 | |
| 140 | QString MergeFileInfos::fullNameA() const |
| 141 | { |
no test coverage detected