1. 15 Sep, 2019 3 commits
    • Michael Reeves's avatar
      Fix '-L' parameter handling · b4b2c970
      Michael Reeves authored
      BUG:410962
      FIXED-IN:1.8.2
      b4b2c970
    • Michael Reeves's avatar
      Make --auto optional · ed30b73e
      Michael Reeves authored
      Accdiently release kdiff3 with a hack hard disabling --auto. Now you
      can do that with a cmake option if you want. The use of --auto is enabled by
      default like with the 0.9x.  This patch adds a short string used only if
      ENABLE_AUTO = off.
      ed30b73e
    • Michael Reeves's avatar
      Fix missing menu items. · 3828f2e7
      Michael Reeves authored
      Make sure all menu related actions are created before calling  KXMLGUIClient::setXMLFile.
      The actual signal connections can happen later.
      
      Perfer having MergeResultWindow handle the creation and connection
      of merge related actions that depend on it to function. Avoids potential
      nullptr issue if one is triggered unexpectedly early in startup.  This also
      improves readability KDiff3App is quite large even without this and would
      just have small wrapper functions for these actions.
      
      Thanks turtle@think-electric.com for spotting the bug.
      
      BUG: 411602
      FIXED-IN: 1.8.2
      3828f2e7
  2. 29 Mar, 2019 1 commit
  3. 17 Mar, 2019 1 commit
  4. 14 Mar, 2019 1 commit
  5. 13 Mar, 2019 2 commits
  6. 12 Mar, 2019 1 commit
  7. 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
  8. 18 Feb, 2019 1 commit
  9. 17 Feb, 2019 1 commit
  10. 11 Feb, 2019 1 commit
  11. 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
  12. 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
  13. 20 Jan, 2019 1 commit
  14. 23 Dec, 2018 2 commits
  15. 21 Dec, 2018 2 commits
  16. 17 Dec, 2018 2 commits
  17. 14 Dec, 2018 2 commits
  18. 09 Dec, 2018 4 commits
  19. 07 Dec, 2018 2 commits
  20. 30 Nov, 2018 1 commit
  21. 18 Nov, 2018 1 commit
  22. 28 Oct, 2018 1 commit
  23. 27 Oct, 2018 2 commits
  24. 10 Aug, 2018 1 commit
    • Michael Reeves's avatar
      Fix -wshadow warnings · 5d55f0be
      Michael Reeves authored
      *resolved on two collisions between unrelated variables, about 80
      duplicate definitions for locals.
      5d55f0be
  25. 03 Aug, 2018 2 commits
  26. 29 Jul, 2018 2 commits