audiofilename-class.patch 1.6 KB

12345678910111213141516171819202122232425262728293031323334353637383940
  1. diff -Naur a/src/AudioFilename.cpp b/src/AudioFilename.cpp
  2. --- a/src/AudioFilename.cpp 2014-07-25 01:35:40.000000000 +0000
  3. +++ b/src/AudioFilename.cpp 2022-02-04 05:04:13.086368320 +0000
  4. @@ -240,7 +240,7 @@
  5. }
  6. else {
  7. input_decompose.assign(&input[i],input.extent(i));
  8. - input_decompose = decompose(input_decompose,DecomposeCompat);
  9. + input_decompose = FXString::decompose(input_decompose,DecomposeCompat);
  10. for (j=0;j<input_decompose.length();j=input_decompose.inc(j)){
  11. len = codec->utf2mb(&c,1,&input_decompose[j],input_decompose.extent(j));
  12. if (len>0 && c!=0x1A) {
  13. @@ -256,7 +256,7 @@
  14. static FXString convert_and_decompose(const FXString & input) {
  15. register FXint i=0;
  16. FXString result;
  17. - FXString in = decompose(input,DecomposeCanonical);
  18. + FXString in = FXString::decompose(input,DecomposeCanonical);
  19. for (i=0;i<in.length();i=in.inc(i)){
  20. if (Ascii::isAscii(in[i]) && Ascii::isPrint(in[i]) ) {
  21. result+=in[i];
  22. @@ -273,7 +273,7 @@
  23. result = filter(input,forbidden,opts);
  24. /// Make sure it is properly composed. Should we do this?
  25. - result = compose(result,DecomposeCompat);
  26. + result = FXString::compose(result,DecomposeCompat);
  27. /// convert to given codec.
  28. if (dynamic_cast<FXUTF8Codec*>(codec)==NULL)
  29. @@ -290,7 +290,7 @@
  30. result = filter(input,forbidden,opts);
  31. /// Make sure it is properly composed. Should we do this?
  32. - result = compose(result,DecomposeCompat);
  33. + result = FXString::compose(result,DecomposeCompat);
  34. /// convert to given codec.
  35. result = convert_and_decompose(result);