diff options
Diffstat (limited to 'src/document/io/LilyPondExporter.cpp')
| -rw-r--r-- | src/document/io/LilyPondExporter.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/document/io/LilyPondExporter.cpp b/src/document/io/LilyPondExporter.cpp index f5e5ff9..b445a41 100644 --- a/src/document/io/LilyPondExporter.cpp +++ b/src/document/io/LilyPondExporter.cpp @@ -351,15 +351,15 @@ LilyPondExporter::protectIllegalChars(std::string inStr) TQString tmpStr = strtoqstr(inStr); - tmpStr.tqreplace(TQRegExp("&"), "\\&"); - tmpStr.tqreplace(TQRegExp("\\^"), "\\^"); - tmpStr.tqreplace(TQRegExp("%"), "\\%"); - tmpStr.tqreplace(TQRegExp("<"), "\\<"); - tmpStr.tqreplace(TQRegExp(">"), "\\>"); - tmpStr.tqreplace(TQRegExp("\\["), ""); - tmpStr.tqreplace(TQRegExp("\\]"), ""); - tmpStr.tqreplace(TQRegExp("\\{"), ""); - tmpStr.tqreplace(TQRegExp("\\}"), ""); + tmpStr.replace(TQRegExp("&"), "\\&"); + tmpStr.replace(TQRegExp("\\^"), "\\^"); + tmpStr.replace(TQRegExp("%"), "\\%"); + tmpStr.replace(TQRegExp("<"), "\\<"); + tmpStr.replace(TQRegExp(">"), "\\>"); + tmpStr.replace(TQRegExp("\\["), ""); + tmpStr.replace(TQRegExp("\\]"), ""); + tmpStr.replace(TQRegExp("\\{"), ""); + tmpStr.replace(TQRegExp("\\}"), ""); // // LilyPond uses utf8 encoding. @@ -389,11 +389,11 @@ LilyPondExporter::write() TQString baseName = nfo.fileName(); // sed LilyPond-choking chars out of the filename proper - bool illegalFilename = (baseName.tqcontains(' ') || baseName.tqcontains("\\")); - baseName.tqreplace(TQRegExp(" "), ""); - baseName.tqreplace(TQRegExp("\\\\"), ""); - baseName.tqreplace(TQRegExp("'"), ""); - baseName.tqreplace(TQRegExp("\""), ""); + bool illegalFilename = (baseName.contains(' ') || baseName.contains("\\")); + baseName.replace(TQRegExp(" "), ""); + baseName.replace(TQRegExp("\\\\"), ""); + baseName.replace(TQRegExp("'"), ""); + baseName.replace(TQRegExp("\""), ""); // cat back together tmpName = dirName + '/' + baseName; @@ -1181,7 +1181,7 @@ LilyPondExporter::write() text += " "; TQString syllable(strtoqstr(ssyllable)); - syllable.tqreplace(TQRegExp("\\s+"), ""); + syllable.replace(TQRegExp("\\s+"), ""); text += "\"" + syllable + "\""; haveLyric = true; } else if (verse > lastVerse) { @@ -1190,8 +1190,8 @@ LilyPondExporter::write() } } - text.tqreplace( TQRegExp(" _+([^ ])") , " \\1" ); - text.tqreplace( "\"_\"" , " " ); + text.replace( TQRegExp(" _+([^ ])") , " \\1" ); + text.replace( "\"_\"" , " " ); // Do not create empty context for lyrics. // Does this save some vertical space, as was written |