comparison widgets/TipDialog.cpp @ 1324:13d9b422f7fe zoom

Merge from default branch
author Chris Cannam
date Mon, 17 Sep 2018 13:51:31 +0100
parents a34a2a25907c
children c8a6fd3f9dff
comparison
equal deleted inserted replaced
1183:57d192e26331 1324:13d9b422f7fe
274 274
275 bool 275 bool
276 TipDialog::TipFileParser::error(const QXmlParseException &exception) 276 TipDialog::TipFileParser::error(const QXmlParseException &exception)
277 { 277 {
278 QString errorString = 278 QString errorString =
279 QString("ERROR: TipFileParser: %1 at line %2, column %3") 279 QString("ERROR: TipFileParser: %1 at line %2, column %3")
280 .arg(exception.message()) 280 .arg(exception.message())
281 .arg(exception.lineNumber()) 281 .arg(exception.lineNumber())
282 .arg(exception.columnNumber()); 282 .arg(exception.columnNumber());
283 cerr << errorString << endl; 283 cerr << errorString << endl;
284 return QXmlDefaultHandler::error(exception); 284 return QXmlDefaultHandler::error(exception);
285 } 285 }
286 286
287 bool 287 bool
288 TipDialog::TipFileParser::fatalError(const QXmlParseException &exception) 288 TipDialog::TipFileParser::fatalError(const QXmlParseException &exception)
289 { 289 {
290 QString errorString = 290 QString errorString =
291 QString("FATAL ERROR: TipFileParser: %1 at line %2, column %3") 291 QString("FATAL ERROR: TipFileParser: %1 at line %2, column %3")
292 .arg(exception.message()) 292 .arg(exception.message())
293 .arg(exception.lineNumber()) 293 .arg(exception.lineNumber())
294 .arg(exception.columnNumber()); 294 .arg(exception.columnNumber());
295 cerr << errorString << endl; 295 cerr << errorString << endl;
296 return QXmlDefaultHandler::fatalError(exception); 296 return QXmlDefaultHandler::fatalError(exception);
297 } 297 }