mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

43 lines
1.4 KiB

  1. --- ./krita/core/kis_perspective_math.cpp.orig 2008-06-13 09:30:26.000000000 +0200
  2. +++ ./krita/core/kis_perspective_math.cpp 2008-06-13 11:22:38.000000000 +0200
  3. @@ -24,13 +24,15 @@
  4. #if 1
  5. -#include <iostream.h>
  6. +#include <iostream>
  7. #include <stdlib.h>
  8. #include <math.h>
  9. //#define NDEBUG // uncomment to remove checking of assert()
  10. #include <assert.h>
  11. #define DEFAULT_ALLOC 2
  12. +using namespace std;
  13. +
  14. namespace math { // TODO: use eigen
  15. template <class ElType> class matrix;
  16. --- ./kspread/plugins/scripting/kspreadcore/krs_cell.cpp.orig 2008-06-14 01:52:57.000000000 +0200
  17. +++ ./kspread/plugins/scripting/kspreadcore/krs_cell.cpp 2008-06-14 01:58:12.000000000 +0200
  18. @@ -174,7 +174,9 @@
  19. return m_cell->text();
  20. }
  21. -bool Cell::setText(const QString& text, bool asString) {
  22. +bool Cell::setText(const QString& text) {
  23. +
  24. + bool asString = false;
  25. //FIXME: there is some problem with asString parameter, when it's set
  26. //to true KSpread says: ASSERT: "f" in Dependencies.cpp (621)
  27. --- ./kspread/plugins/scripting/kspreadcore/krs_cell.h.orig 2008-06-14 01:58:23.000000000 +0200
  28. +++ ./kspread/plugins/scripting/kspreadcore/krs_cell.h 2008-06-14 01:58:34.000000000 +0200
  29. @@ -135,7 +135,7 @@
  30. * will be handled as string else we try to parse the
  31. * string to the expected value.
  32. */
  33. - bool setText(const QString& text, bool asString = false);
  34. + bool setText(const QString& text);
  35. /**
  36. * Return the textcolor as RGB-value in the format "#RRGGBB".