10 changes: 5 additions & 5 deletions mythtv/libs/libmythtv/xine_demux_sputext.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -481,15 +481,15 @@ static subtitle_t *sub_read_line_rt(demux_sputext_t *demuxstr,subtitle_t *curren
* TODO: it seems that format of time is not easily determined, it may be 1:12, 1:12.0 or 0:1:12.0
* to describe the same moment in time. Maybe there are even more formats in use.
*/
if (sscanf (line, "<Time Begin=\"%d:%d:%d.%d\" End=\"%d:%d:%d.%d\"",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4) < 8)
if (sscanf (line, R"(<Time Begin="%d:%d:%d.%d" End="%d:%d:%d.%d")",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4) < 8)

plen=a1=a2=a3=a4=b1=b2=b3=b4=0;
if (
(sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d\" %*[Ee]nd=\"%d:%d\"%*[^<]<clear/>%n",&a2,&a3,&b2,&b3,&plen) < 4) &&
(sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d\" %*[Ee]nd=\"%d:%d.%d\"%*[^<]<clear/>%n",&a2,&a3,&b2,&b3,&b4,&plen) < 5) &&
(sscanf (line, R"(<%*[tT]ime %*[bB]egin="%d:%d" %*[Ee]nd="%d:%d"%*[^<]<clear/>%n)",&a2,&a3,&b2,&b3,&plen) < 4) &&
(sscanf (line, R"(<%*[tT]ime %*[bB]egin="%d:%d" %*[Ee]nd="%d:%d.%d"%*[^<]<clear/>%n)",&a2,&a3,&b2,&b3,&b4,&plen) < 5) &&
/* (sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d.%d\" %*[Ee]nd=\"%d:%d\"%*[^<]<clear/>%n",&a2,&a3,&a4,&b2,&b3,&plen) < 5) && */
(sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d.%d\" %*[Ee]nd=\"%d:%d.%d\"%*[^<]<clear/>%n",&a2,&a3,&a4,&b2,&b3,&b4,&plen) < 6) &&
(sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d:%d.%d\" %*[Ee]nd=\"%d:%d:%d.%d\"%*[^<]<clear/>%n",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4,&plen) < 8)
(sscanf (line, R"(<%*[tT]ime %*[bB]egin="%d:%d.%d" %*[Ee]nd="%d:%d.%d"%*[^<]<clear/>%n)",&a2,&a3,&a4,&b2,&b3,&b4,&plen) < 6) &&
(sscanf (line, R"(<%*[tT]ime %*[bB]egin="%d:%d:%d.%d" %*[Ee]nd="%d:%d:%d.%d"%*[^<]<clear/>%n)",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4,&plen) < 8)
)
continue;
current->start = a1*360000+a2*6000+a3*100+a4/10;
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythui/mythuibuttonlist.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3701,7 +3701,7 @@ void MythUIButtonListItem::SetToRealButton(MythUIStateType *button, bool selecte

QString newText = text->GetTemplateText();

QRegExp regexp("%(([^\\|%]+)?\\||\\|(.))?([\\w#]+)(\\|(.+))?%");
QRegExp regexp(R"(%(([^\|%]+)?\||\|(.))?([\w#]+)(\|(.+))?%)");
regexp.setMinimal(true);

if (!newText.isEmpty() && newText.contains(regexp))
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythui/mythuihelper.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -860,7 +860,7 @@ void MythUIHelper::GetScreenSettings(QRect &Rect, float &XFactor, float &YFactor
void MythUIHelper::ParseGeometryOverride(const QString &geometry)
{
QRegExp sre("^(\\d+)x(\\d+)$");
QRegExp lre("^(\\d+)x(\\d+)([+-]\\d+)([+-]\\d+)$");
QRegExp lre(R"(^(\d+)x(\d+)([+-]\d+)([+-]\d+)$)");
QStringList geo;
bool longForm = false;

Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythui/mythuitext.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ void MythUIText::ResetMap(const InfoMap &map)
if (newText.isEmpty())
newText = GetDefaultText();

QRegExp regexp("%(([^\\|%]+)?\\||\\|(.))?([\\w#]+)(\\|(.+))?%");
QRegExp regexp(R"(%(([^\|%]+)?\||\|(.))?([\w#]+)(\|(.+))?%)");
regexp.setMinimal(true);

bool replaced = map.contains(objectName());
Expand Down Expand Up @@ -162,7 +162,7 @@ void MythUIText::SetTextFromMap(const InfoMap &map)
if (newText.isEmpty())
newText = GetDefaultText();

QRegExp regexp("%(([^\\|%]+)?\\||\\|(.))?([\\w#]+)(\\|(.+))?%");
QRegExp regexp(R"(%(([^\|%]+)?\||\|(.))?([\w#]+)(\|(.+))?%)");
regexp.setMinimal(true);

if (!newText.isEmpty() && newText.contains(regexp))
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythupnp/httprequest.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,7 @@ void HTTPRequest::FormatErrorResponse( bool bServerError,

QTextStream stream( &m_response );

stream << "<?xml version=\"1.0\" encoding=\"utf-8\"?>";
stream << R"(<?xml version="1.0" encoding="utf-8"?>)";

QString sWhere = ( bServerError ) ? "s:Server" : "s:Client";

Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythupnp/serializers/xmlplistSerializer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ void XmlPListSerializer::BeginSerialize(QString &/*sName*/)
m_pXmlWriter->setAutoFormatting(true);
m_pXmlWriter->setAutoFormattingIndent(4);
m_pXmlWriter->writeStartDocument("1.0");
m_pXmlWriter->writeDTD("<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">");
m_pXmlWriter->writeDTD(R"(<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">)");
m_pXmlWriter->writeStartElement("plist");
m_pXmlWriter->writeAttribute("version", "1.0");
m_pXmlWriter->writeStartElement("dict"); // top level node
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythupnp/serverSideScripting.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ bool ServerSideScripting::EvaluatePage( QTextStream *pOutStream, const QString &
// word characters and numbers, _ and $
// They must not start with a number - to simplify the regexp, we
// restrict the first character to the English alphabet
QRegExp validChars = QRegExp("^([a-zA-Z]|_|\\$)(\\w|\\$)+$");
QRegExp validChars = QRegExp(R"(^([a-zA-Z]|_|\$)(\w|\$)+$)");

QVariantMap params;
QString prevArrayName = "";
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythupnp/upnpcds.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ static UPnpCDSClientException clientExceptions[] = {
// Sony Blu-ray players
{ CDS_ClientSonyDB,
"X-AV-Client-Info",
"cn=\"Sony Corporation\"; mn=\"Blu-ray Disc Player\"" },
R"(cn="Sony Corporation"; mn="Blu-ray Disc Player")" },
};
static uint clientExceptionCount = sizeof(clientExceptions) /
sizeof(clientExceptions[0]);
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythupnp/wsdl.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ bool Wsdl::GetWSDL( HTTPRequest *pRequest )
if (!pRequest->m_mapParams.contains( "raw" ))
{
appendChild( createProcessingInstruction( "xml-stylesheet",
"type=\"text/xsl\" href=\"/xslt/service.xslt\"" ));
R"(type="text/xsl" href="/xslt/service.xslt")" ));
}

QDomElement oNode;
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythupnp/xsd.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ bool Xsd::GetEnumXSD( HTTPRequest *pRequest, const QString& sEnumName )
if (!pRequest->m_mapParams.contains( "raw" ))
{
appendChild( createProcessingInstruction( "xml-stylesheet",
"type=\"text/xsl\" href=\"/xslt/enum.xslt\"" ));
R"(type="text/xsl" href="/xslt/enum.xslt")" ));
}

// ----------------------------------------------------------------------
Expand Down Expand Up @@ -258,7 +258,7 @@ bool Xsd::GetXSD( HTTPRequest *pRequest, QString sTypeName )
if (!pRequest->m_mapParams.contains( "raw" ))
{
appendChild( createProcessingInstruction( "xml-stylesheet",
"type=\"text/xsl\" href=\"/xslt/class.xslt\"" ));
R"(type="text/xsl" href="/xslt/class.xslt")" ));
}

if (bIsArray)
Expand Down