1. 26 Jul, 2019 1 commit
  2. 23 Feb, 2019 1 commit
  3. 22 Feb, 2019 1 commit
    • Michael Reeves's avatar
      cleanup · b081e103
      Michael Reeves authored
      *consoldate QString->QUrl convertion code. Reduces number of possiable failure points.
      *correct usage of QUrl API.
      *avoid uneeded convertion to/from QUrl.
      *try to avoid empty m_name.
      b081e103
  4. 18 Feb, 2019 1 commit
  5. 17 Feb, 2019 1 commit
  6. 03 Feb, 2019 1 commit
  7. 02 Feb, 2019 1 commit
    • Michael Reeves's avatar
      Revert problematic commit · 20c458d9
      Michael Reeves authored
      Revert "use QSharedPointer for TotalDiffStatusInsure that
      TotalDiffStatus object does not get distroyed while it isstill needed."
      
      This reverts commit b4980131.
      This reverts commit 2d4d6218.
      
      BUG: 403799
      FIXED-IN:1.7.95
      
      unbreak full anyalisis
      20c458d9
  8. 01 Feb, 2019 1 commit
    • Michael Reeves's avatar
      Fix diff status handling. · b4980131
      Michael Reeves authored
      *Never allow m_totalDiffStatus to be null
      *set MergeFileInfo structure correctly
      *drop uneeded const value parameter
      
      BUG: 403799
      b4980131
  9. 25 Jan, 2019 2 commits
  10. 24 Jan, 2019 4 commits
  11. 20 Jan, 2019 5 commits
  12. 18 Jan, 2019 2 commits
    • Michael Reeves's avatar
      Add assert in init routine. · 792fc43d
      Michael Reeves authored
      792fc43d
    • Michael Reeves's avatar
      fix fastFileComparison for network files · 13922740
      Michael Reeves authored
      BUG: 403089
      FIXED-IN:1.7.90
      
      This fixes the handling of tempfiles created during network comparsion.
      Previously these would be accessed by name alone causing an error.
      Now QTemparyFile is used were needed.
      Direct use of QFile for file operations is now depriated as this is
      diffcualt to get right given the use of a tempFile in some cases.
      *open,close, read routines created in FileAccess to currectly handle the
      tempfile logic and error messages.
      *Fix this issue exists within FileAccess::readFile() as well.
      13922740
  13. 13 Jan, 2019 1 commit
    • Michael Reeves's avatar
      Mimic TempRemover name handling correctly. · c5122300
      Michael Reeves authored
      Fix regression in local file handling during compare.
      Behavior should now match old KDiff3 handling.
      This still is not correct for handling tempfiles created during network compares.
      This case requires more invasive changes.
      c5122300
  14. 11 Jan, 2019 1 commit
  15. 24 Dec, 2018 1 commit
  16. 23 Dec, 2018 1 commit
    • Michael Reeves's avatar
      Cleanup · 5ae58248
      Michael Reeves authored
      *reconcile parameter names in definition and declaration
      *use const referance where applicable
      5ae58248
  17. 21 Dec, 2018 2 commits
  18. 17 Dec, 2018 3 commits
  19. 14 Dec, 2018 1 commit
  20. 09 Dec, 2018 4 commits
  21. 08 Dec, 2018 2 commits
  22. 07 Dec, 2018 3 commits