diff --git a/MantidPlot/src/Mantid/FitParameterTie.cpp b/MantidPlot/src/Mantid/FitParameterTie.cpp index 02352d7bb47908bd2f504332f43ce228cc702bb5..d51c05a2719e20af3a1a3b23ed5faa1892044965 100644 --- a/MantidPlot/src/Mantid/FitParameterTie.cpp +++ b/MantidPlot/src/Mantid/FitParameterTie.cpp @@ -42,7 +42,7 @@ void FitParameterTie::set(const QString &estr) { // rx matches function identifiers in the parameter names and captures the // function index: // for f12.Sigma rx.cap(1).toInt() returns 12 - QRegExp rx("\\bf(\\d+)\\."); + QRegExp rx(R"(\bf(\d+)\.)"); if (rx.indexIn(parName) < 0) { throw std::invalid_argument( diff --git a/MantidPlot/src/importOPJ.cpp b/MantidPlot/src/importOPJ.cpp index a041ae55b1d52d7ad6f7ea0d2f68337b570bf99c..5c31a9bba3f721c67f1e7dbdce2a306d59a82534 100644 --- a/MantidPlot/src/importOPJ.cpp +++ b/MantidPlot/src/importOPJ.cpp @@ -501,7 +501,7 @@ bool ImportOPJ::importNotes(const OPJFile &opj) { int visible_count = 0; for (int n = 0; n < opj.numNotes(); n++) { QString name = opj.noteName(n); - QRegExp rx("^@\\((\\S+)\\)$"); + QRegExp rx(R"(^@\((\S+)\)$)"); if (rx.indexIn(name) == 0) name = rx.cap(1); @@ -1358,8 +1358,8 @@ QString ImportOPJ::parseOriginText(const QString &str) { QString ImportOPJ::parseOriginTags(const QString &str) { QString line = str; // Lookbehind conditions are not supported - so need to reverse string - QRegExp rx("\\)[^\\)\\(]*\\((?!\\s*[buig\\+\\-]\\s*\\\\)"); - QRegExp rxfont("\\)[^\\)\\(]*\\((?![^\\:]*\\:f\\s*\\\\)"); + QRegExp rx(R"(\)[^\)\(]*\((?!\s*[buig\+\-]\s*\\))"); + QRegExp rxfont(R"(\)[^\)\(]*\((?![^\:]*\:f\s*\\))"); QString linerev = strreverse(line); QString lBracket = strreverse("&lbracket;"); QString rBracket = strreverse("&rbracket;"); @@ -1396,10 +1396,10 @@ QString ImportOPJ::parseOriginTags(const QString &str) { // replace \b(...), \i(...), \u(...), \g(...), \+(...), \-(...), \f:font(...) // tags - QString rxstr[] = {"\\\\\\s*b\\s*\\(", "\\\\\\s*i\\s*\\(", - "\\\\\\s*u\\s*\\(", "\\\\\\s*g\\s*\\(", - "\\\\\\s*\\+\\s*\\(", "\\\\\\s*\\-\\s*\\(", - "\\\\\\s*f\\:[^\\(]*\\("}; + QString rxstr[] = {R"(\\\s*b\s*\()", R"(\\\s*i\s*\()", + R"(\\\s*u\s*\()", R"(\\\s*g\s*\()", + R"(\\\s*\+\s*\()", R"(\\\s*\-\s*\()", + R"(\\\s*f\:[^\(]*\()"}; int postag[] = {0, 0, 0, 0, 0, 0, 0}; QString ltag[] = {"<b>", "<i>", "<u>", "<font face=Symbol>", "<sup>", "<sub>", "<font face=%1>"}; @@ -1407,7 +1407,7 @@ QString ImportOPJ::parseOriginTags(const QString &str) { "</sup>", "</sub>", "</font>"}; QRegExp rxtags[7]; for (int i = 0; i < 7; ++i) - rxtags[i].setPattern(rxstr[i] + "[^\\(\\)]*\\)"); + rxtags[i].setPattern(rxstr[i] + R"([^\(\)]*\))"); bool flag = true; while (flag) { diff --git a/MantidPlot/src/lib/src/TextFormatButtons.cpp b/MantidPlot/src/lib/src/TextFormatButtons.cpp index 54a29ade87b5615596c8c3eb6c8906dc7c0828f4..12b6dae42efbd09574a79932c0fea5ba1f9a5988 100644 --- a/MantidPlot/src/lib/src/TextFormatButtons.cpp +++ b/MantidPlot/src/lib/src/TextFormatButtons.cpp @@ -457,10 +457,10 @@ void TextFormatButtons::addSymbol(const QString &letter) { else if (letter == QString(QChar(4 + s))) connectedTextEdit->textCursor().insertText("\\int"); else if (letter == QString(QChar(5 + s))) - connectedTextEdit->textCursor().insertText("\\int \\!\\!\\! \\int"); + connectedTextEdit->textCursor().insertText(R"(\int \!\!\! \int)"); else if (letter == QString(QChar(6 + s))) connectedTextEdit->textCursor().insertText( - "\\int \\!\\!\\! \\int \\!\\!\\! \\int"); + R"(\int \!\!\! \int \!\!\! \int)"); else if (letter == QString(QChar(7 + s))) connectedTextEdit->textCursor().insertText("\\oint");