diff --git a/dsl.cc b/dsl.cc index 2e921a76..ad8c3fc7 100644 --- a/dsl.cc +++ b/dsl.cc @@ -2100,7 +2100,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( if ( !abrvScanner.readNextLineWithoutComments( curString, curOffset ) || curString.empty() ) { - gdWarning( "Warning: premature end of file %s\n", abrvFileName.c_str() ); + gdWarning( "Premature end of file %s\n", abrvFileName.c_str() ); eof = true; break; } @@ -2186,7 +2186,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( { if ( !isDslWs( curString[ x ] ) ) { - gdWarning( "Warning: garbage string in %s at offset 0x%lX\n", i->c_str(), (unsigned long) curOffset ); + gdWarning( "Garbage string in %s at offset 0x%lX\n", i->c_str(), (unsigned long) curOffset ); break; } } @@ -2210,7 +2210,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( { if ( ! ( hasString = scanner.readNextLineWithoutComments( curString, curOffset ) ) ) { - gdWarning( "Warning: premature end of file %s\n", i->c_str() ); + gdWarning( "Premature end of file %s\n", i->c_str() ); break; } diff --git a/dsl_details.cc b/dsl_details.cc index c3be6ae2..88fd0f52 100644 --- a/dsl_details.cc +++ b/dsl_details.cc @@ -724,11 +724,11 @@ void ArticleDom::closeTag( wstring const & name, if ( warn ) { if( !dictionaryName.empty() ) - gdWarning( "Warning: no corresponding opening tag for closing tag \"%s\" found in \"%s\", article \"%s\".", + gdWarning( "No corresponding opening tag for closing tag \"%s\" found in \"%s\", article \"%s\".", gd::toQString( name ).toUtf8().data(), dictionaryName.c_str(), gd::toQString( headword ).toUtf8().data() ); else - gdWarning( "Warning: no corresponding opening tag for closing tag \"%s\" found.", + gdWarning( "No corresponding opening tag for closing tag \"%s\" found.", gd::toQString( name ).toUtf8().data() ); } } diff --git a/hotkeywrapper.cc b/hotkeywrapper.cc index 267e0be1..6c496231 100644 --- a/hotkeywrapper.cc +++ b/hotkeywrapper.cc @@ -717,7 +717,7 @@ HotkeyWrapper::GrabbedKeys::iterator HotkeyWrapper::grabKey( quint32 keyCode, if ( errorHandler.isError() ) { - qDebug() << "Warning: Possible hotkeys conflict. Check your hotkeys options."; + gdWarning( "Possible hotkeys conflict. Check your hotkeys options." ); ungrabKey( result.first ); } } @@ -734,7 +734,7 @@ void HotkeyWrapper::ungrabKey( GrabbedKeys::iterator i ) if ( errorHandler.isError() ) { - qDebug() << "Warning: Cannot ungrab the hotkey"; + gdWarning( "Cannot ungrab the hotkey" ); } } diff --git a/lsa.cc b/lsa.cc index 1f2e692d..20583030 100644 --- a/lsa.cc +++ b/lsa.cc @@ -471,7 +471,7 @@ sptr< Dictionary::DataRequest > LsaDictionary::getResource( string const & name if ( result <= 0 ) { - qWarning( "Warning: failed to read Vorbis data (code = %ld)\n", result ); + gdWarning( "Failed to read Vorbis data (code = %ld)\n", result ); memset( ptr, 0, left ); break; } diff --git a/mdx.cc b/mdx.cc index 7792344c..16568fcd 100644 --- a/mdx.cc +++ b/mdx.cc @@ -1259,7 +1259,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f sptr< MdictParser > mddParser = new MdictParser(); if ( !mddParser->open( mddIter->c_str() ) ) { - gdWarning( "Warning: Broken mdd (resource) file: %s\n", mddIter->c_str() ); + gdWarning( "Broken mdd (resource) file: %s\n", mddIter->c_str() ); continue; } mddParsers.push_back( mddParser ); diff --git a/xdxf.cc b/xdxf.cc index 7a39557b..c856cbf7 100644 --- a/xdxf.cc +++ b/xdxf.cc @@ -908,7 +908,7 @@ void indexArticle( GzippedFile & gzFile, if ( words.empty() ) { // Nothing to index, this article didn't have any tags - qWarning( "Warning: no tags found in an article at offset 0x%x, article skipped.\n", + gdWarning( "No tags found in an article at offset 0x%x, article skipped.\n", (unsigned) articleOffset ); } else @@ -1462,7 +1462,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( if ( stream.hasError() ) { - gdWarning( "Warning: %s had a parse error %s at line %lu, and therefore was indexed only up to the point of error.", + gdWarning( "%s had a parse error %s at line %lu, and therefore was indexed only up to the point of error.", dictFiles[ 0 ].c_str(), stream.errorString().toUtf8().data(), (unsigned long) stream.lineNumber() ); }