From 83a89c2b9fb32e580d8d88396ac010b3b3d644a9 Mon Sep 17 00:00:00 2001 From: gcoco Date: Fri, 1 Nov 2013 11:44:43 -0400 Subject: [PATCH] Get rid of qwt compile error about format string. Author: KURASHIKI Satoru Taken from Debian patches for GC 3.0.3 --- qwt/textengines/mathml/qwt_mml_document.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/qwt/textengines/mathml/qwt_mml_document.cpp b/qwt/textengines/mathml/qwt_mml_document.cpp index 0bb36cc1c..d571d0a03 100644 --- a/qwt/textengines/mathml/qwt_mml_document.cpp +++ b/qwt/textengines/mathml/qwt_mml_document.cpp @@ -3122,7 +3122,7 @@ void QwtMmlDocument::_dump( const QwtMmlNode *node, QString &indent ) const { if ( node == 0 ) return; - qWarning( ( indent + node->toStr() ).toLatin1().data() ); + qWarning( "%s", ( indent + node->toStr() ).toLatin1().data() ); indent += " "; const QwtMmlNode *child = node->firstChild(); @@ -3702,7 +3702,7 @@ int QwtMmlNode::scriptlevel( const QwtMmlNode * ) const } else { - qWarning( ( "QwtMmlNode::scriptlevel(): bad value " + expl_sl_str ).toLatin1().data() ); + qWarning( "%s", ( "QwtMmlNode::scriptlevel(): bad value " + expl_sl_str ).toLatin1().data() ); return parent_sl; } } @@ -3719,7 +3719,7 @@ int QwtMmlNode::scriptlevel( const QwtMmlNode * ) const return parent_sl - 1; else { - qWarning( ( "QwtMmlNode::scriptlevel(): could not parse value: \"" + expl_sl_str + "\"" ).toLatin1().data() ); + qWarning( "%s", ( "QwtMmlNode::scriptlevel(): could not parse value: \"" + expl_sl_str + "\"" ).toLatin1().data() ); return parent_sl; } } @@ -5637,7 +5637,7 @@ static QString decodeEntityValue( QString literal ) if ( !literal.startsWith( "&#" ) ) { - qWarning( ( "decodeEntityValue(): bad entity literal: \"" + literal + "\"" ).toLatin1().data() ); + qWarning( "%s", ( "decodeEntityValue(): bad entity literal: \"" + literal + "\"" ).toLatin1().data() ); return QString::null; } @@ -5646,7 +5646,7 @@ static QString decodeEntityValue( QString literal ) int i = literal.indexOf( ';' ); if ( i == -1 ) { - qWarning( ( "decodeEntityValue(): bad entity literal: \"" + literal + "\"" ).toLatin1().data() ); + qWarning( "%s", ( "decodeEntityValue(): bad entity literal: \"" + literal + "\"" ).toLatin1().data() ); return QString::null; } @@ -5655,7 +5655,7 @@ static QString decodeEntityValue( QString literal ) if ( char_code.isEmpty() ) { - qWarning( ( "decodeEntityValue(): bad entity literal: \"" + literal + "\"" ).toLatin1().data() ); + qWarning( "%s", ( "decodeEntityValue(): bad entity literal: \"" + literal + "\"" ).toLatin1().data() ); return QString::null; } @@ -5666,7 +5666,7 @@ static QString decodeEntityValue( QString literal ) unsigned c = char_code.toUInt( &ok, 16 ); if ( !ok ) { - qWarning( ( "decodeEntityValue(): bad entity literal: \"" + literal + "\"" ).toLatin1().data() ); + qWarning( "%s", ( "decodeEntityValue(): bad entity literal: \"" + literal + "\"" ).toLatin1().data() ); return QString::null; } result += QChar( c ); @@ -5677,7 +5677,7 @@ static QString decodeEntityValue( QString literal ) unsigned c = char_code.toUInt( &ok, 10 ); if ( !ok ) { - qWarning( ( "decodeEntityValue(): bad entity literal: \"" + literal + "\"" ).toLatin1().data() ); + qWarning( "%s", ( "decodeEntityValue(): bad entity literal: \"" + literal + "\"" ).toLatin1().data() ); return QString::null; } result += QChar( c );