Merge 15b918eb6a into 9a544c5715

clean: delete `gddebug`

.git-blame-ignore-revs

@@ -17,4 +17,7 @@ a11c9e3aeca4329e1982d8fe26bacbb21ab50ddf
 d15081e723756eef053550dc9e06e31d7828dec3
 
 # remove gd::toWString
-c8af0450f1f7f8188004db96e3f53e7e33e2ccad
+c8af0450f1f7f8188004db96e3f53e7e33e2ccad
+
+# remove gddebug.hh and associated functions
+76aaed116bdc3aeb53fd61553aedb877baf9b510

src/article_maker.cc

@@ -4,7 +4,6 @@
 #include "article_maker.hh"
 #include "config.hh"
 #include "folding.hh"
-#include "gddebug.hh"
 #include "globalbroadcaster.hh"
 #include "globalregex.hh"
 #include "htmlescape.hh"
@@ -540,7 +539,7 @@ void ArticleRequest::altSearchFinished()
         bodyRequests.push_back( r );
       }
       catch ( std::exception & e ) {
-        gdWarning( "getArticle request error (%s) in \"%s\"\n", e.what(), activeDict->getName().c_str() );
+        qWarning( "getArticle request error (%s) in \"%s\"", e.what(), activeDict->getName().c_str() );
       }
     }
 
@@ -618,7 +617,7 @@ void ArticleRequest::bodyFinished()
     return;
   }
 
-  GD_DPRINTF( "some body finished" );
+  qDebug( "some body finished" );
 
   bool wasUpdated = false;
 
@@ -628,7 +627,7 @@ void ArticleRequest::bodyFinished()
     if ( bodyRequests.front()->isFinished() ) {
       // Good
 
-      GD_DPRINTF( "one finished." );
+      qDebug( "one finished." );
 
       Dictionary::DataRequest & req = *bodyRequests.front();
 
@@ -718,7 +717,7 @@ void ArticleRequest::bodyFinished()
           }
         }
         catch ( std::exception & e ) {
-          gdWarning( "getDataSlice error: %s\n", e.what() );
+          qWarning( "getDataSlice error: %s", e.what() );
         }
 
         wasUpdated = true;
@@ -728,12 +727,12 @@ void ArticleRequest::bodyFinished()
         //signal finished dictionary for pronounciation
         GlobalBroadcaster::instance()->pronounce_engine.finishDictionary( dictId );
       }
-      GD_DPRINTF( "erasing.." );
+      qDebug( "erasing.." );
       bodyRequests.pop_front();
-      GD_DPRINTF( "erase done.." );
+      qDebug( "erase done.." );
     }
     else {
-      GD_DPRINTF( "one not finished." );
+      qDebug( "one not finished." );
       break;
     }
   }
@@ -976,7 +975,7 @@ void ArticleRequest::compoundSearchNextStep( bool lastSearchSucceeded )
 
   // Look it up
 
-  //  GD_DPRINTF( "Looking up %s\n", qPrintable( currentSplittedWordCompound ) );
+  //  qDebug( "Looking up %s", qPrintable( currentSplittedWordCompound ) );
 
   stemmedWordFinder->expressionMatch( currentSplittedWordCompound,
                                       activeDicts,

src/article_netmgr.cc

@@ -4,7 +4,6 @@
 #include <stdint.h>
 #include <QUrl>
 #include "article_netmgr.hh"
-#include "gddebug.hh"
 #include "utils.hh"
 #include <QNetworkAccessManager>
 #include "globalbroadcaster.hh"
@@ -93,7 +92,7 @@ QNetworkReply * ArticleNetworkAccessManager::getArticleReply( QNetworkRequest co
   //if not external url,can be blocked from here. no need to continue execute the following code.
   //such as bres://upload.wikimedia....  etc .
   if ( !Utils::isExternalLink( url ) ) {
-    gdWarning( R"(Blocking element "%s" as built-in link )", req.url().toEncoded().data() );
+    qWarning( R"(Blocking element "%s" as built-in link )", req.url().toEncoded().data() );
     return new BlockedNetworkReply( this );
   }
 
@@ -108,7 +107,7 @@ QNetworkReply * ArticleNetworkAccessManager::getArticleReply( QNetworkRequest co
     if ( !url.host().endsWith( refererUrl.host() )
          && Utils::Url::getHostBaseFromUrl( url ) != Utils::Url::getHostBaseFromUrl( refererUrl )
          && !url.scheme().startsWith( "data" ) ) {
-      gdWarning( R"(Blocking element "%s" due to not same domain)", url.toEncoded().data() );
+      qWarning( R"(Blocking element "%s" due to not same domain)", url.toEncoded().data() );
 
       return new BlockedNetworkReply( this );
     }
@@ -238,7 +237,7 @@ sptr< Dictionary::DataRequest > ArticleNetworkAccessManager::getResource( QUrl c
           return dictionary->getResource( Utils::Url::path( url ).mid( 1 ).toUtf8().data() );
         }
         catch ( std::exception & e ) {
-          gdWarning( "getResource request error (%s) in \"%s\"\n", e.what(), dictionary->getName().c_str() );
+          qWarning( "getResource request error (%s) in \"%s\"", e.what(), dictionary->getName().c_str() );
           return {};
         }
       }
@@ -284,7 +283,7 @@ ArticleResourceReply::ArticleResourceReply( QObject * parent,
 
     if ( req->isFinished() ) {
       emit finishedSignal();
-      GD_DPRINTF( "In-place finish.\n" );
+      qDebug( "In-place finish." );
     }
   }
 }
@@ -353,11 +352,11 @@ qint64 ArticleResourceReply::readData( char * out, qint64 maxSize )
     return 0;
   }
 
-  GD_DPRINTF( "====reading  %lld of (%lld) bytes, %lld bytes readed . Finish status: %d",
-              toRead,
-              avail,
-              alreadyRead,
-              finished );
+  qDebug( "====reading  %lld of (%lld) bytes, %lld bytes readed . Finish status: %d",
+          toRead,
+          avail,
+          alreadyRead,
+          finished );
 
   try {
     req->getDataSlice( alreadyRead, toRead, out );

src/audio/audiooutput.cc

@@ -1,7 +1,6 @@
 #include "audiooutput.hh"
 
-#include <QAudioFormat>
-#include <QtConcurrent/qtconcurrentrun.h>
+#include <QtConcurrentRun>
 #include <QFuture>
 #include <QWaitCondition>
 #include <QCoreApplication>

src/audio/audioplayerfactory.cc

@@ -8,7 +8,6 @@
 #include "ffmpegaudioplayer.hh"
 #include "multimediaaudioplayer.hh"
 #include "externalaudioplayer.hh"
-#include "gddebug.hh"
 
 AudioPlayerFactory::AudioPlayerFactory( bool useInternalPlayer,
                                         InternalPlayerBackend internalPlayerBackend,
@@ -41,7 +40,7 @@ void AudioPlayerFactory::setPreferences( bool new_useInternalPlayer,
       setAudioPlaybackProgram( *externalPlayer );
     }
     else {
-      gdWarning( "External player was expected, but it does not exist.\n" );
+      qWarning( "External player was expected, but it does not exist." );
     }
   }
 }

src/audio/ffmpegaudio.cc

@@ -2,7 +2,6 @@
 
   #include "audiooutput.hh"
   #include "ffmpegaudio.hh"
-  #include "gddebug.hh"
   #include "utils.hh"
   #include <QAudioDevice>
   #include <QDataStream>
@@ -88,7 +87,7 @@ static int readAudioData( void * opaque, unsigned char * buffer, int bufferSize
   // QDataStream::readRawData() returns 0 at EOF => return AVERROR_EOF in this case.
   // An error is unlikely here, so just print a warning and return AVERROR_EOF too.
   if ( bytesRead < 0 ) {
-    gdWarning( "readAudioData: error while reading raw data." );
+    qWarning( "readAudioData: error while reading raw data." );
   }
   return bytesRead > 0 ? bytesRead : AVERROR_EOF;
 }
@@ -170,11 +169,11 @@ bool DecoderContext::openCodec( QString & errorString )
 
   // 61 = FFmpeg 7.0 -> https://github.com/FFmpeg/FFmpeg/blob/release/7.0/libavcodec/version_major.h
   #if LIBAVCODEC_VERSION_MAJOR >= 61
-  gdDebug( "Codec open: %s: channels: %d, rate: %d, format: %s\n",
-           codec_->long_name,
-           codecContext_->ch_layout.nb_channels,
-           codecContext_->sample_rate,
-           av_get_sample_fmt_name( codecContext_->sample_fmt ) );
+  qDebug( "Codec open: %s: channels: %d, rate: %d, format: %s",
+          codec_->long_name,
+          codecContext_->ch_layout.nb_channels,
+          codecContext_->sample_rate,
+          av_get_sample_fmt_name( codecContext_->sample_fmt ) );
 
   if ( !av_channel_layout_check( &codecContext_->ch_layout ) ) {
     av_channel_layout_default( &codecContext_->ch_layout, codecContext_->ch_layout.nb_channels );
@@ -193,11 +192,11 @@ bool DecoderContext::openCodec( QString & errorString )
     qDebug() << "swr_alloc_set_opts2 failed.";
   }
   #else
-  gdDebug( "Codec open: %s: channels: %d, rate: %d, format: %s\n",
-           codec_->long_name,
-           codecContext_->channels,
-           codecContext_->sample_rate,
-           av_get_sample_fmt_name( codecContext_->sample_fmt ) );
+  qDebug( "Codec open: %s: channels: %d, rate: %d, format: %s",
+          codec_->long_name,
+          codecContext_->channels,
+          codecContext_->sample_rate,
+          av_get_sample_fmt_name( codecContext_->sample_fmt ) );
 
   auto layout = codecContext_->channel_layout;
   if ( !layout ) {
@@ -367,7 +366,7 @@ bool DecoderContext::normalizeAudio( AVFrame * frame, vector< uint8_t > & sample
     return false;
   }
   else {
-    //    qDebug( "out_count:%d, out_nb_samples:%d, frame->nb_samples:%d \n", out_count, out_nb_samples, frame->nb_samples );
+    //    qDebug( "out_count:%d, out_nb_samples:%d, frame->nb_samples:%d ", out_count, out_nb_samples, frame->nb_samples );
   }
 
   int actual_size = av_samples_get_buffer_size( nullptr, dst_channels, out_nb_samples, AV_SAMPLE_FMT_S16, 1 );

src/common/gddebug.cc

@@ -1,29 +0,0 @@
-/* This file is (c) 2013 Abs62
- * Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
-
-#include "gddebug.hh"
-#include <QDebug>
-#include <QString>
-#include <QtCore5Compat/QTextCodec>
-
-QFile * logFilePtr;
-
-void gdWarning( const char * msg, ... )
-{
-  va_list ap;
-  va_start( ap, msg );
-
-  qWarning() << QString().vasprintf( msg, ap );
-
-  va_end( ap );
-}
-
-void gdDebug( const char * msg, ... )
-{
-  va_list ap;
-  va_start( ap, msg );
-
-  qDebug().noquote() << QString().vasprintf( msg, ap );
-
-  va_end( ap );
-}

src/common/gddebug.hh

@@ -1,29 +0,0 @@
-#pragma once
-
-#include <QFile>
-
-#ifdef NO_CONSOLE
-  #define GD_DPRINTF( ... ) \
-    do {                    \
-    } while ( 0 )
-  #define GD_FDPRINTF( ... ) \
-    do {                     \
-    } while ( 0 )
-#else
-  #define GD_DPRINTF( ... )  gdDebug( __VA_ARGS__ )
-  #define GD_FDPRINTF( ... ) fprintf( __VA_ARGS__ )
-#endif
-
-void gdWarning( const char *, ... ) /* print warning message */
-#if defined( Q_CC_GNU ) && !defined( __INSURE__ )
-  __attribute__( ( format( printf, 1, 2 ) ) )
-#endif
-  ;
-
-void gdDebug( const char *, ... )
-#if defined( Q_CC_GNU ) && !defined( __INSURE__ )
-  __attribute__( ( format( printf, 1, 2 ) ) )
-#endif
-  ;
-
-extern QFile * logFilePtr;

src/common/logfileptr.cc

@@ -0,0 +1,2 @@
+#include "logfileptr.hh"
+QFile * logFilePtr;

src/common/logfileptr.hh

@@ -0,0 +1,3 @@
+#pragma once
+#include <QFile>
+extern QFile * logFilePtr;

src/config.cc

@@ -8,7 +8,6 @@
 #include <QtXml>
 #include <QApplication>
 #include <QStyle>
-#include "gddebug.hh"
 
 #ifdef Q_OS_WIN32
   //this is a windows header file.
@@ -130,9 +129,9 @@ QString Preferences::sanitizeInputPhrase( QString const & inputWord ) const
   }
 
   if ( limitInputPhraseLength && result.size() > inputPhraseLengthLimit ) {
-    gdDebug( "Ignoring an input phrase %lld symbols long. The configured maximum input phrase length is %d symbols.",
-             result.size(),
-             inputPhraseLengthLimit );
+    qDebug( "Ignoring an input phrase %lld symbols long. The configured maximum input phrase length is %d symbols.",
+            result.size(),
+            inputPhraseLengthLimit );
     return {};
   }
 
@@ -150,6 +149,7 @@ Preferences::Preferences():
   doubleClickTranslates( true ),
   selectWordBySingleClick( false ),
   autoScrollToTargetArticle( true ),
+  targetArticleAtFirst( false ),
   escKeyHidesMainWindow( false ),
   alwaysOnTop( false ),
   searchInDock( false ),
@@ -541,7 +541,7 @@ Class load()
   if ( !loadFromTemplate ) {
     // Load the config as usual
     if ( !dd.setContent( &configFile, false, &errorStr, &errorLine, &errorColumn ) ) {
-      GD_DPRINTF( "Error: %s at %d,%d\n", errorStr.toLocal8Bit().constData(), errorLine, errorColumn );
+      qDebug( "Error: %s at %d,%d", errorStr.toLocal8Bit().constData(), errorLine, errorColumn );
       throw exMalformedConfigFile();
     }
   }
@@ -554,7 +554,7 @@ Class load()
     QBuffer bufferedData( &data );
 
     if ( !dd.setContent( &bufferedData, false, &errorStr, &errorLine, &errorColumn ) ) {
-      GD_DPRINTF( "Error: %s at %d,%d\n", errorStr.toLocal8Bit().constData(), errorLine, errorColumn );
+      qDebug( "Error: %s at %d,%d", errorStr.toLocal8Bit().constData(), errorLine, errorColumn );
       throw exMalformedConfigFile();
     }
   }
@@ -878,6 +878,11 @@ Class load()
         ( preferences.namedItem( "autoScrollToTargetArticle" ).toElement().text() == "1" );
     }
 
+    if ( !preferences.namedItem( "targetArticleAtFirst" ).isNull() ) {
+      c.preferences.targetArticleAtFirst =
+        ( preferences.namedItem( "targetArticleAtFirst" ).toElement().text() == "1" );
+    }
+
     if ( !preferences.namedItem( "escKeyHidesMainWindow" ).isNull() ) {
       c.preferences.escKeyHidesMainWindow =
         ( preferences.namedItem( "escKeyHidesMainWindow" ).toElement().text() == "1" );
@@ -1815,6 +1820,10 @@ void save( Class const & c )
     opt.appendChild( dd.createTextNode( c.preferences.autoScrollToTargetArticle ? "1" : "0" ) );
     preferences.appendChild( opt );
 
+    opt = dd.createElement( "targetArticleAtFirst" );
+    opt.appendChild( dd.createTextNode( c.preferences.targetArticleAtFirst ? "1" : "0" ) );
+    preferences.appendChild( opt );
+
     opt = dd.createElement( "escKeyHidesMainWindow" );
     opt.appendChild( dd.createTextNode( c.preferences.escKeyHidesMainWindow ? "1" : "0" ) );
     preferences.appendChild( opt );

src/config.hh

@@ -297,6 +297,7 @@ struct Preferences
   bool doubleClickTranslates;
   bool selectWordBySingleClick;
   bool autoScrollToTargetArticle;
+  bool targetArticleAtFirst;
   bool escKeyHidesMainWindow;
   bool alwaysOnTop;
 

src/dict/aard.cc

@@ -8,7 +8,6 @@
 #include "chunkedstorage.hh"
 #include "langcoder.hh"
 #include "decompress.hh"
-#include "gddebug.hh"
 #include "ftshelpers.hh"
 #include "htmlescape.hh"
 
@@ -16,16 +15,11 @@
 #include <set>
 #include <string>
 
-
+#include <QDir>
 #include <QString>
-#include <QSemaphore>
-#include <QThreadPool>
 #include <QAtomicInt>
-#include <QDomDocument>
 #include <QtEndian>
 #include <QRegularExpression>
-#include "ufile.hh"
-#include "wstring_qt.hh"
 #include "utils.hh"
 
 namespace Aard {
@@ -411,7 +405,7 @@ void AardDictionary::loadArticle( quint32 address, string & articleText, bool ra
       df.read( &articleBody.front(), articleSize );
     }
     catch ( std::exception & ex ) {
-      gdWarning( "AARD: Failed loading article from \"%s\", reason: %s\n", getName().c_str(), ex.what() );
+      qWarning( "AARD: Failed loading article from \"%s\", reason: %s", getName().c_str(), ex.what() );
       break;
     }
     catch ( ... ) {
@@ -571,14 +565,14 @@ void AardDictionary::makeFTSIndex( QAtomicInt & isCancelled )
   }
 
 
-  gdDebug( "Aard: Building the full-text index for dictionary: %s\n", getName().c_str() );
+  qDebug( "Aard: Building the full-text index for dictionary: %s", getName().c_str() );
 
   try {
     FtsHelpers::makeFTSIndex( this, isCancelled );
     FTS_index_completed.ref();
   }
   catch ( std::exception & ex ) {
-    gdWarning( "Aard: Failed building full-text search index for \"%s\", reason: %s\n", getName().c_str(), ex.what() );
+    qWarning( "Aard: Failed building full-text search index for \"%s\", reason: %s", getName().c_str(), ex.what() );
     QFile::remove( QString::fromStdString( ftsIdxName ) );
   }
 }
@@ -594,7 +588,7 @@ void AardDictionary::getArticleText( uint32_t articleAddress, QString & headword
     text = Html::unescape( QString::fromUtf8( articleText.data(), articleText.size() ) );
   }
   catch ( std::exception & ex ) {
-    gdWarning( "Aard: Failed retrieving article from \"%s\", reason: %s\n", getName().c_str(), ex.what() );
+    qWarning( "Aard: Failed retrieving article from \"%s\", reason: %s", getName().c_str(), ex.what() );
   }
 }
 
@@ -785,12 +779,12 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
     if ( Dictionary::needToRebuildIndex( dictFiles, indexFile ) || indexIsOldOrBad( indexFile ) ) {
       try {
 
-        gdDebug( "Aard: Building the index for dictionary: %s\n", fileName.c_str() );
+        qDebug( "Aard: Building the index for dictionary: %s", fileName.c_str() );
 
         {
           QFileInfo info( QString::fromUtf8( fileName.c_str() ) );
           if ( static_cast< quint64 >( info.size() ) > ULONG_MAX ) {
-            gdWarning( "File %s is too large\n", fileName.c_str() );
+            qWarning( "File %s is too large", fileName.c_str() );
             continue;
           }
         }
@@ -804,7 +798,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
         if ( strncmp( dictHeader.signature, "aard", 4 )
              || ( !has64bitIndex && strncmp( dictHeader.indexItemFormat, ">LL", 4 ) )
              || strncmp( dictHeader.keyLengthFormat, ">H", 2 ) || strncmp( dictHeader.articleLengthFormat, ">L", 2 ) ) {
-          gdWarning( "File %s is not in supported aard format\n", fileName.c_str() );
+          qWarning( "File %s is not in supported aard format", fileName.c_str() );
           continue;
         }
 
@@ -812,7 +806,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
         quint32 size = qFromBigEndian( dictHeader.metaLength );
 
         if ( size == 0 ) {
-          gdWarning( "File %s has invalid metadata", fileName.c_str() );
+          qWarning( "File %s has invalid metadata", fileName.c_str() );
           continue;
         }
 
@@ -826,7 +820,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
         map< string, string > meta = parseMetaData( metaStr );
 
         if ( meta.empty() ) {
-          gdWarning( "File %s has invalid metadata", fileName.c_str() );
+          qWarning( "File %s has invalid metadata", fileName.c_str() );
           continue;
         }
 
@@ -980,11 +974,11 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
         idx.write( &idxHeader, sizeof( idxHeader ) );
       }
       catch ( std::exception & e ) {
-        gdWarning( "Aard dictionary indexing failed: %s, error: %s\n", fileName.c_str(), e.what() );
+        qWarning( "Aard dictionary indexing failed: %s, error: %s", fileName.c_str(), e.what() );
         continue;
       }
       catch ( ... ) {
-        gdWarning( "Aard dictionary indexing failed\n" );
+        qWarning( "Aard dictionary indexing failed" );
         continue;
       }
     } // if need to rebuild
@@ -992,7 +986,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
       dictionaries.push_back( std::make_shared< AardDictionary >( dictId, indexFile, dictFiles ) );
     }
     catch ( std::exception & e ) {
-      gdWarning( "Aard dictionary initializing failed: %s, error: %s\n", fileName.c_str(), e.what() );
+      qWarning( "Aard dictionary initializing failed: %s, error: %s", fileName.c_str(), e.what() );
       continue;
     }
   }

src/dict/bgl.cc

@@ -8,26 +8,22 @@
 #include "dictfile.hh"
 #include "folding.hh"
 #include "ftshelpers.hh"
-#include "gddebug.hh"
 #include "htmlescape.hh"
 #include "langcoder.hh"
 #include "language.hh"
 #include "utf8.hh"
 #include "utils.hh"
-
 #include <ctype.h>
 #include <list>
 #include <map>
 #include <set>
 #include <string.h>
 #include <zlib.h>
-
-
 #include <QAtomicInt>
+#include <QCryptographicHash>
+#include <QDir>
 #include <QPainter>
 #include <QRegularExpression>
-#include <QSemaphore>
-#include <QThreadPool>
 
 namespace Bgl {
 
@@ -413,7 +409,7 @@ void BglDictionary::getArticleText( uint32_t articleAddress, QString & headword,
     text = Html::unescape( QString::fromStdU32String( wstr ) );
   }
   catch ( std::exception & ex ) {
-    gdWarning( "BGL: Failed retrieving article from \"%s\", reason: %s\n", getName().c_str(), ex.what() );
+    qWarning( "BGL: Failed retrieving article from \"%s\", reason: %s", getName().c_str(), ex.what() );
   }
 }
 
@@ -429,14 +425,14 @@ void BglDictionary::makeFTSIndex( QAtomicInt & isCancelled )
   }
 
 
-  gdDebug( "Bgl: Building the full-text index for dictionary: %s\n", getName().c_str() );
+  qDebug( "Bgl: Building the full-text index for dictionary: %s", getName().c_str() );
 
   try {
     FtsHelpers::makeFTSIndex( this, isCancelled );
     FTS_index_completed.ref();
   }
   catch ( std::exception & ex ) {
-    gdWarning( "Bgl: Failed building full-text search index for \"%s\", reason: %s\n", getName().c_str(), ex.what() );
+    qWarning( "Bgl: Failed building full-text search index for \"%s\", reason: %s", getName().c_str(), ex.what() );
     QFile::remove( QString::fromStdString( ftsIdxName ) );
   }
 }
@@ -722,7 +718,7 @@ void BglArticleRequest::run()
 
     } // try
     catch ( std::exception & ex ) {
-      gdWarning( "BGL: Failed loading article from \"%s\", reason: %s\n", dict.getName().c_str(), ex.what() );
+      qWarning( "BGL: Failed loading article from \"%s\", reason: %s", dict.getName().c_str(), ex.what() );
     }
   }
 
@@ -918,7 +914,7 @@ void BglResourceRequest::run()
                        compressedData.size() )
              != Z_OK
            || decompressedLength != data.size() ) {
-        gdWarning( "Failed to decompress resource \"%s\", ignoring it.\n", name.c_str() );
+        qWarning( "Failed to decompress resource \"%s\", ignoring it.", name.c_str() );
       }
       else {
         hasAnyData = true;
@@ -996,14 +992,14 @@ protected:
 
 void ResourceHandler::handleBabylonResource( string const & filename, char const * data, size_t size )
 {
-  //GD_DPRINTF( "Handling resource file %s (%u bytes)\n", filename.c_str(), size );
+  //qDebug( "Handling resource file %s (%u bytes)", filename.c_str(), size );
 
   vector< unsigned char > compressedData( compressBound( size ) );
 
   unsigned long compressedSize = compressedData.size();
 
   if ( compress( &compressedData.front(), &compressedSize, (unsigned char const *)data, size ) != Z_OK ) {
-    gdWarning( "Failed to compress the body of resource \"%s\", dropping it.\n", filename.c_str() );
+    qWarning( "Failed to compress the body of resource \"%s\", dropping it.", filename.c_str() );
     return;
   }
 
@@ -1054,7 +1050,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
     if ( Dictionary::needToRebuildIndex( dictFiles, indexFile ) || indexIsOldOrBad( indexFile ) ) {
       // Building the index
 
-      gdDebug( "Bgl: Building the index for dictionary: %s\n", fileName.c_str() );
+      qDebug( "Bgl: Building the index for dictionary: %s", fileName.c_str() );
 
       try {
         Babylon b( fileName );
@@ -1066,7 +1062,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
         std::string sourceCharset, targetCharset;
 
         if ( !b.read( sourceCharset, targetCharset ) ) {
-          gdWarning( "Failed to start reading from %s, skipping it\n", fileName.c_str() );
+          qWarning( "Failed to start reading from %s, skipping it", fileName.c_str() );
           continue;
         }
 
@@ -1158,7 +1154,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
 
         idxHeader.chunksOffset = chunks.finish();
 
-        GD_DPRINTF( "Writing index...\n" );
+        qDebug( "Writing index..." );
 
         // Good. Now build the index
 
@@ -1194,7 +1190,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
         idx.write( &idxHeader, sizeof( idxHeader ) );
       }
       catch ( std::exception & e ) {
-        gdWarning( "BGL dictionary indexing failed: %s, error: %s\n", fileName.c_str(), e.what() );
+        qWarning( "BGL dictionary indexing failed: %s, error: %s", fileName.c_str(), e.what() );
       }
     }
 
@@ -1202,7 +1198,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
       dictionaries.push_back( std::make_shared< BglDictionary >( dictId, indexFile, fileName ) );
     }
     catch ( std::exception & e ) {
-      gdWarning( "BGL dictionary initializing failed: %s, error: %s\n", fileName.c_str(), e.what() );
+      qWarning( "BGL dictionary initializing failed: %s, error: %s", fileName.c_str(), e.what() );
     }
   }
 

src/dict/bgl_babylon.cc

@@ -23,7 +23,6 @@
 
 #include "bgl_babylon.hh"
 #include "dictionary.hh"
-#include "gddebug.hh"
 #include "globalregex.hh"
 #include "htmlescape.hh"
 #include "iconv.hh"
@@ -333,10 +332,10 @@ bool Babylon::read( const std::string & source_charset, const std::string & targ
   convertToUtf8( m_email, BGL_TARGET_CHARSET );
   convertToUtf8( m_copyright, BGL_TARGET_CHARSET );
   convertToUtf8( m_description, BGL_TARGET_CHARSET );
-  GD_DPRINTF( "Default charset: %s\nSource Charset: %s\nTargetCharset: %s\n",
-              m_defaultCharset.c_str(),
-              m_sourceCharset.c_str(),
-              m_targetCharset.c_str() );
+  qDebug( "Default charset: %s\nSource Charset: %s\nTargetCharset: %s",
+          m_defaultCharset.c_str(),
+          m_sourceCharset.c_str(),
+          m_targetCharset.c_str() );
   return true;
 }
 
@@ -498,7 +497,7 @@ bgl_entry Babylon::readEntry( ResourceHandler * resourceHandler )
             unsigned length = (unsigned char)block.data[ pos ] - 0x3F;
 
             if ( length > len - a - 2 ) {
-              GD_FDPRINTF( stderr, "Hidden displayed headword is too large %s\n", headword.c_str() );
+              qWarning( "Hidden displayed headword is too large %s", headword.c_str() );
               pos += len - a;
               break;
             }
@@ -511,7 +510,7 @@ bgl_entry Babylon::readEntry( ResourceHandler * resourceHandler )
             unsigned length = (unsigned char)block.data[ pos + 1 ];
 
             if ( length > len - a - 2 ) {
-              GD_FDPRINTF( stderr, "Displayed headword's length is too large for headword %s\n", headword.c_str() );
+              qWarning( "Displayed headword's length is too large for headword %s", headword.c_str() );
               pos += len - a;
               break;
             }
@@ -525,7 +524,7 @@ bgl_entry Babylon::readEntry( ResourceHandler * resourceHandler )
             unsigned length = qFromBigEndian( *reinterpret_cast< quint16 * >( block.data + pos + 1 ) );
 
             if ( length > len - a - 3 ) {
-              GD_FDPRINTF( stderr, "2-byte sized displayed headword for %s is too large\n", headword.c_str() );
+              qWarning( "2-byte sized displayed headword for %s is too large", headword.c_str() );
               pos += len - a;
               break;
             }
@@ -541,9 +540,7 @@ bgl_entry Babylon::readEntry( ResourceHandler * resourceHandler )
             unsigned length = (unsigned char)block.data[ pos + 2 ];
 
             if ( length > len - a - 3 ) {
-              GD_FDPRINTF( stderr,
-                           "1-byte-sized transcription's length is too large for headword %s\n",
-                           headword.c_str() );
+              qWarning( "1-byte-sized transcription's length is too large for headword %s\n", headword.c_str() );
               pos += len - a;
               break;
             }
@@ -553,7 +550,7 @@ bgl_entry Babylon::readEntry( ResourceHandler * resourceHandler )
                 transcription = Iconv::toUtf8( "Windows-1252", block.data + pos + 3, length );
               }
               catch ( Iconv::Ex & e ) {
-                qWarning( "Bgl: charset conversion error, no trancription processing's done: %s\n", e.what() );
+                qWarning( "Bgl: charset conversion error, no trancription processing's done: %s", e.what() );
                 transcription = std::string( block.data + pos + 3, length );
               }
             }
@@ -570,9 +567,7 @@ bgl_entry Babylon::readEntry( ResourceHandler * resourceHandler )
             unsigned length = qFromBigEndian( *reinterpret_cast< quint16 * >( block.data + pos + 2 ) );
 
             if ( length > len - a - 4 ) {
-              GD_FDPRINTF( stderr,
-                           "2-byte-sized transcription's length is too large for headword %s\n",
-                           headword.c_str() );
+              qWarning( "2-byte-sized transcription's length is too large for headword %s\n", headword.c_str() );
               pos += len - a;
               break;
             }
@@ -582,7 +577,7 @@ bgl_entry Babylon::readEntry( ResourceHandler * resourceHandler )
                 transcription = Iconv::toUtf8( "Windows-1252", block.data + pos + 4, length );
               }
               catch ( Iconv::Ex & e ) {
-                qWarning( "Bgl: charset conversion error, no transcription processing's done: %s\n", e.what() );
+                qWarning( "Bgl: charset conversion error, no transcription processing's done: %s", e.what() );
                 transcription = std::string( block.data + pos + 4, length );
               }
             }
@@ -600,7 +595,7 @@ bgl_entry Babylon::readEntry( ResourceHandler * resourceHandler )
             unsigned length = (unsigned char)block.data[ pos ] - 0x3F;
 
             if ( length > len - a - 2 ) {
-              GD_FDPRINTF( stderr, "Hidden transcription is too large %s\n", headword.c_str() );
+              qWarning( "Hidden transcription is too large %s", headword.c_str() );
               pos += len - a;
               break;
             }

src/dict/btreeidx.cc

@@ -4,13 +4,9 @@
 #include "btreeidx.hh"
 #include "folding.hh"
 #include "utf8.hh"
-#include <QRunnable>
-#include <QThreadPool>
-#include <QSemaphore>
 #include <math.h>
 #include <string.h>
 #include <stdlib.h>
-#include "gddebug.hh"
 #include "wstring_qt.hh"
 #include "utils.hh"
 
@@ -18,7 +14,7 @@
 #include "wildcard.hh"
 #include "globalbroadcaster.hh"
 
-#include <QtConcurrent>
+#include <QtConcurrentRun>
 #include <zlib.h>
 
 namespace BtreeIndexing {
@@ -91,11 +87,11 @@ BtreeIndex::findArticles( wstring const & search_word, bool ignoreDiacritics, ui
     }
   }
   catch ( std::exception & e ) {
-    gdWarning( "Articles searching failed, error: %s\n", e.what() );
+    qWarning( "Articles searching failed, error: %s", e.what() );
     result.clear();
   }
   catch ( ... ) {
-    qWarning( "Articles searching failed\n" );
+    qWarning( "Articles searching failed" );
     result.clear();
   }
 
@@ -268,7 +264,7 @@ void BtreeWordSearchRequest::findMatches()
             break;
           }
 
-          //GD_DPRINTF( "offset = %u, size = %u\n", chainOffset - &leaf.front(), leaf.size() );
+          //qDebug( "offset = %u, size = %u", chainOffset - &leaf.front(), leaf.size() );
 
           vector< WordArticleLink > chain = dict.readChain( chainOffset );
 
@@ -331,7 +327,7 @@ void BtreeWordSearchRequest::findMatches()
           if ( chainOffset >= leafEnd ) {
             // We're past the current leaf, fetch the next one
 
-            //GD_DPRINTF( "advancing\n" );
+            //qDebug( "advancing" );
 
             if ( nextLeaf ) {
               QMutexLocker _( dict.idxFileMutex );
@@ -345,7 +341,7 @@ void BtreeWordSearchRequest::findMatches()
               uint32_t leafEntries = *(uint32_t *)&leaf.front();
 
               if ( leafEntries == 0xffffFFFF ) {
-                //GD_DPRINTF( "bah!\n" );
+                //qDebug( "bah!" );
                 exit( 1 );
               }
             }
@@ -366,10 +362,10 @@ void BtreeWordSearchRequest::findMatches()
     }
   }
   catch ( std::exception & e ) {
-    qWarning( "Index searching failed: \"%s\", error: %s\n", dict.getName().c_str(), e.what() );
+    qWarning( "Index searching failed: \"%s\", error: %s", dict.getName().c_str(), e.what() );
   }
   catch ( ... ) {
-    gdWarning( "Index searching failed: \"%s\"\n", dict.getName().c_str() );
+    qWarning( "Index searching failed: \"%s\"", dict.getName().c_str() );
   }
 }
 
@@ -424,7 +420,7 @@ void BtreeIndex::readNode( uint32_t offset, vector< char > & out )
   uint32_t uncompressedSize = idxFile->read< uint32_t >();
   uint32_t compressedSize   = idxFile->read< uint32_t >();
 
-  //GD_DPRINTF( "%x,%x\n", uncompressedSize, compressedSize );
+  //qDebug( "%x,%x", uncompressedSize, compressedSize );
 
   out.resize( uncompressedSize );
 
@@ -505,7 +501,7 @@ char const * BtreeIndex::findChainOffsetExactOrPrefix(
     if ( leafEntries == 0xffffFFFF ) {
       // A node
 
-      //GD_DPRINTF( "=>a node\n" );
+      //qDebug( "=>a node" );
 
       uint32_t const * offsets = (uint32_t *)leaf + 1;
 
@@ -591,13 +587,13 @@ char const * BtreeIndex::findChainOffsetExactOrPrefix(
         currentNodeOffset = offsets[ entry + 1 ];
       }
 
-      //GD_DPRINTF( "reading node at %x\n", currentNodeOffset );
+      //qDebug( "reading node at %x", currentNodeOffset );
       readNode( currentNodeOffset, extLeaf );
       leaf    = &extLeaf.front();
       leafEnd = leaf + extLeaf.size();
     }
     else {
-      //GD_DPRINTF( "=>a leaf\n" );
+      //qDebug( "=>a leaf" );
       // A leaf
 
       // If this leaf is the root, there's no next leaf, it just can't be.
@@ -630,7 +626,7 @@ char const * BtreeIndex::findChainOffsetExactOrPrefix(
 
           memcpy( &chainSize, ptr, sizeof( uint32_t ) );
 
-          //GD_DPRINTF( "%s + %s\n", ptr + sizeof( uint32_t ), ptr + sizeof( uint32_t ) + strlen( ptr + sizeof( uint32_t ) ) + 1 );
+          //qDebug( "%s + %s", ptr + sizeof( uint32_t ), ptr + sizeof( uint32_t ) + strlen( ptr + sizeof( uint32_t ) ) + 1 );
 
           ptr += sizeof( uint32_t ) + chainSize;
         }
@@ -643,7 +639,7 @@ char const * BtreeIndex::findChainOffsetExactOrPrefix(
       unsigned windowSize  = chainOffsets.size();
 
       for ( ;; ) {
-        //GD_DPRINTF( "window = %u, ws = %u\n", window - &chainOffsets.front(), windowSize );
+        //qDebug( "window = %u, ws = %u", window - &chainOffsets.front(), windowSize );
 
         char const ** chainToCheck = window + windowSize / 2;
         ptr                        = *chainToCheck;
@@ -1059,7 +1055,7 @@ IndexInfo buildIndex( IndexedWords const & indexedWords, File::Index & file )
     btreeMaxElements = BtreeMaxElements;
   }
 
-  GD_DPRINTF( "Building a tree of %u elements\n", (unsigned)btreeMaxElements );
+  qDebug( "Building a tree of %u elements", (unsigned)btreeMaxElements );
 
 
   uint32_t lastLeafOffset = 0;
@@ -1419,7 +1415,7 @@ bool BtreeDictionary::getHeadwords( QStringList & headwords )
     }
   }
   catch ( std::exception & ex ) {
-    gdWarning( "Failed headwords retrieving for \"%s\", reason: %s\n", getName().c_str(), ex.what() );
+    qWarning( "Failed headwords retrieving for \"%s\", reason: %s", getName().c_str(), ex.what() );
   }
 
   return headwords.size() > 0;

src/dict/btreeidx.hh

@@ -5,17 +5,12 @@
 
 #include "dict/dictionary.hh"
 #include "dictfile.hh"
-
-#include <algorithm>
 #include <map>
 #include <stdint.h>
 #include <string>
 #include <vector>
-
 #include <QFuture>
 #include <QList>
-#include <QSet>
-#include <QList>
 
 
 /// A base for the dictionary which creates a btree index to look up

src/dict/dictdfiles.cc

@@ -7,7 +7,6 @@
 #include "utf8.hh"
 #include "dictzip.hh"
 #include "htmlescape.hh"
-
 #include "langcoder.hh"
 #include <map>
 #include <set>
@@ -16,8 +15,8 @@
 #include <list>
 #include <wctype.h>
 #include <stdlib.h>
-#include "gddebug.hh"
 #include "ftshelpers.hh"
+#include <QDir>
 #include <QUrl>
 
 
@@ -456,14 +455,14 @@ void DictdDictionary::makeFTSIndex( QAtomicInt & isCancelled )
   }
 
 
-  gdDebug( "DictD: Building the full-text index for dictionary: %s\n", getName().c_str() );
+  qDebug( "DictD: Building the full-text index for dictionary: %s", getName().c_str() );
 
   try {
     FtsHelpers::makeFTSIndex( this, isCancelled );
     FTS_index_completed.ref();
   }
   catch ( std::exception & ex ) {
-    gdWarning( "DictD: Failed building full-text search index for \"%s\", reason: %s\n", getName().c_str(), ex.what() );
+    qWarning( "DictD: Failed building full-text search index for \"%s\", reason: %s", getName().c_str(), ex.what() );
     QFile::remove( QString::fromStdString( ftsIdxName ) );
   }
 }
@@ -537,7 +536,7 @@ void DictdDictionary::getArticleText( uint32_t articleAddress, QString & headwor
     }
   }
   catch ( std::exception & ex ) {
-    gdWarning( "DictD: Failed retrieving article from \"%s\", reason: %s\n", getName().c_str(), ex.what() );
+    qWarning( "DictD: Failed retrieving article from \"%s\", reason: %s", getName().c_str(), ex.what() );
   }
 }
 
@@ -589,7 +588,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
         // Building the index
         string dictionaryName = nameFromFileName( dictFiles[ 0 ] );
 
-        gdDebug( "DictD: Building the index for dictionary: %s\n", dictionaryName.c_str() );
+        qDebug( "DictD: Building the index for dictionary: %s", dictionaryName.c_str() );
 
         initializing.indexingDictionary( dictionaryName );
 
@@ -628,7 +627,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
               if ( tab3 ) {
                 char * tab4 = strchr( tab3 + 1, '\t' );
                 if ( tab4 ) {
-                  GD_DPRINTF( "Warning: too many tabs present, skipping: %s\n", buf );
+                  qDebug( "Warning: too many tabs present, skipping: %s", buf );
                   continue;
                 }
 
@@ -673,7 +672,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
                         *endEol = 0;
                       }
 
-                      GD_DPRINTF( "DICT NAME: '%s'\n", eol );
+                      qDebug( "DICT NAME: '%s'", eol );
                       dictionaryName = eol;
                     }
                   }
@@ -685,12 +684,12 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
               }
             }
             else {
-              GD_DPRINTF( "Warning: only a single tab present, skipping: %s\n", buf );
+              qDebug( "Warning: only a single tab present, skipping: %s", buf );
               continue;
             }
           }
           else {
-            GD_DPRINTF( "Warning: no tabs present, skipping: %s\n", buf );
+            qDebug( "Warning: no tabs present, skipping: %s", buf );
             continue;
           }
 
@@ -734,7 +733,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
       dictionaries.push_back( std::make_shared< DictdDictionary >( dictId, indexFile, dictFiles ) );
     }
     catch ( std::exception & e ) {
-      gdWarning( "Dictd dictionary \"%s\" reading failed, error: %s\n", fileName.c_str(), e.what() );
+      qWarning( "Dictd dictionary \"%s\" reading failed, error: %s", fileName.c_str(), e.what() );
     }
   }
 

src/dict/dictserver.cc

@@ -7,11 +7,12 @@
 #include <QUrl>
 #include <QTcpSocket>
 #include <QString>
-#include <list>
 #include "htmlescape.hh"
-
+#include <QCryptographicHash>
+#include <QDir>
+#include <QFileInfo>
 #include <QRegularExpression>
-#include <QtConcurrent>
+#include <QtConcurrentRun>
 
 namespace DictServer {
 

src/dict/dsl.cc

@@ -11,44 +11,28 @@
 #include "htmlescape.hh"
 #include "iconv.hh"
 #include "filetype.hh"
-
 #include "audiolink.hh"
 #include "langcoder.hh"
 #include "wstring_qt.hh"
 #include "indexedzip.hh"
-#include "gddebug.hh"
 #include "tiff.hh"
 #include "ftshelpers.hh"
-
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 #include <list>
 #include <wctype.h>
-
-#include <QSemaphore>
 #include <QThreadPool>
 #include <QAtomicInt>
 #include <QUrl>
-
 #include <QDir>
 #include <QFileInfo>
 #include <QPainter>
-#include <QStringList>
-
 #include <QRegularExpression>
-
-// For TIFF conversion
-#include <QImage>
 #include <QByteArray>
-#include <QBuffer>
-
-// For SVG handling
-#include <QtSvg/QSvgRenderer>
-
-#include <QtConcurrent>
-
+#include <QSvgRenderer>
+#include <QtConcurrentRun>
 #include "utils.hh"
 
 namespace Dsl {
@@ -154,7 +138,6 @@ class DslDictionary: public BtreeIndexing::BtreeDictionary
   QAtomicInt deferredInitDone;
   QMutex deferredInitMutex;
   bool deferredInitRunnableStarted;
-  QSemaphore deferredInitRunnableExited;
 
   string initError;
 
@@ -391,7 +374,7 @@ void DslDictionary::doDeferredInit()
         memcpy( &total, abrvBlock, sizeof( uint32_t ) );
         abrvBlock += sizeof( uint32_t );
 
-        GD_DPRINTF( "Loading %u abbrv\n", total );
+        qDebug( "Loading %u abbrv", total );
 
         while ( total-- ) {
           uint32_t keySz;
@@ -511,7 +494,7 @@ void DslDictionary::loadArticle( uint32_t address,
     memcpy( &articleOffset, articleProps, sizeof( articleOffset ) );
     memcpy( &articleSize, articleProps + sizeof( articleOffset ), sizeof( articleSize ) );
 
-    GD_DPRINTF( "offset = %x\n", articleOffset );
+    qDebug( "offset = %x", articleOffset );
 
 
     char * articleBody;
@@ -1010,11 +993,11 @@ string DslDictionary::nodeToHtml( ArticleDom::Node const & node )
     result += "<br />";
   }
   else {
-    gdWarning( R"(DSL: Unknown tag "%s" with attributes "%s" found in "%s", article "%s".)",
-               QString::fromStdU32String( node.tagName ).toUtf8().data(),
-               QString::fromStdU32String( node.tagAttrs ).toUtf8().data(),
-               getName().c_str(),
-               QString::fromStdU32String( currentHeadword ).toUtf8().data() );
+    qWarning( R"(DSL: Unknown tag "%s" with attributes "%s" found in "%s", article "%s".)",
+              QString::fromStdU32String( node.tagName ).toUtf8().data(),
+              QString::fromStdU32String( node.tagAttrs ).toUtf8().data(),
+              getName().c_str(),
+              QString::fromStdU32String( currentHeadword ).toUtf8().data() );
 
     result += "<span class=\"dsl_unknown\">[" + string( QString::fromStdU32String( node.tagName ).toUtf8().data() );
     if ( !node.tagAttrs.empty() ) {
@@ -1122,14 +1105,14 @@ void DslDictionary::makeFTSIndex( QAtomicInt & isCancelled )
   }
 
 
-  gdDebug( "Dsl: Building the full-text index for dictionary: %s\n", getName().c_str() );
+  qDebug( "Dsl: Building the full-text index for dictionary: %s", getName().c_str() );
 
   try {
     FtsHelpers::makeFTSIndex( this, isCancelled );
     FTS_index_completed.ref();
   }
   catch ( std::exception & ex ) {
-    gdWarning( "DSL: Failed building full-text search index for \"%s\", reason: %s\n", getName().c_str(), ex.what() );
+    qWarning( "DSL: Failed building full-text search index for \"%s\", reason: %s", getName().c_str(), ex.what() );
     QFile::remove( ftsIdxName.c_str() );
   }
 }
@@ -1405,7 +1388,6 @@ class DslArticleRequest: public Dictionary::DataRequest
   bool ignoreDiacritics;
 
   QAtomicInt isCancelled;
-  QSemaphore hasExited;
   QFuture< void > f;
 
 public:
@@ -1551,7 +1533,7 @@ void DslArticleRequest::run()
       articleText += articleAfter;
     }
     catch ( std::exception & ex ) {
-      gdWarning( "DSL: Failed loading article from \"%s\", reason: %s\n", dict.getName().c_str(), ex.what() );
+      qWarning( "DSL: Failed loading article from \"%s\", reason: %s", dict.getName().c_str(), ex.what() );
       articleText =
         string( "<span class=\"dsl_article\">" ) + QObject::tr( "Article loading error" ).toStdString() + "</span>";
     }
@@ -1582,7 +1564,6 @@ class DslResourceRequest: public Dictionary::DataRequest
   string resourceName;
 
   QAtomicInt isCancelled;
-  QSemaphore hasExited;
   QFuture< void > f;
 
 public:
@@ -1627,7 +1608,7 @@ void DslResourceRequest::run()
 
   string n = dict.getContainingFolder().toStdString() + Utils::Fs::separator() + resourceName;
 
-  GD_DPRINTF( "dsl resource name is %s\n", n.c_str() );
+  qDebug( "dsl resource name is %s", n.c_str() );
 
   try {
     try {
@@ -1679,10 +1660,10 @@ void DslResourceRequest::run()
     hasAnyData = true;
   }
   catch ( std::exception & ex ) {
-    gdWarning( "DSL: Failed loading resource \"%s\" for \"%s\", reason: %s\n",
-               resourceName.c_str(),
-               dict.getName().c_str(),
-               ex.what() );
+    qWarning( "DSL: Failed loading resource \"%s\" for \"%s\", reason: %s",
+              resourceName.c_str(),
+              dict.getName().c_str(),
+              ex.what() );
     // Resource not loaded -- we don't set the hasAnyData flag then
   }
 
@@ -1787,8 +1768,8 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
           // Building the index
           initializing.indexingDictionary( Utf8::encode( scanner.getDictionaryName() ) );
 
-          gdDebug( "Dsl: Building the index for dictionary: %s\n",
-                   QString::fromStdU32String( scanner.getDictionaryName() ).toUtf8().data() );
+          qDebug( "Dsl: Building the index for dictionary: %s",
+                  QString::fromStdU32String( scanner.getDictionaryName() ).toUtf8().data() );
 
           File::Index idx( indexFile, QIODevice::WriteOnly );
 
@@ -1854,7 +1835,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
                   expandOptionalParts( curString, &keys );
 
                   if ( !abrvScanner.readNextLineWithoutComments( curString, curOffset ) || curString.empty() ) {
-                    gdWarning( "Premature end of file %s\n", abrvFileName.c_str() );
+                    qWarning( "Premature end of file %s", abrvFileName.c_str() );
                     eof = true;
                     break;
                   }
@@ -1893,7 +1874,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
               chunks.addToBlock( &sz, sizeof( uint32_t ) );
 
               for ( const auto & i : abrv ) {
-                //              GD_DPRINTF( "%s:%s\n", i->first.c_str(), i->second.c_str() );
+                //              qDebug( "%s:%s", i->first.c_str(), i->second.c_str() );
 
                 sz = i.first.size();
                 chunks.addToBlock( &sz, sizeof( uint32_t ) );
@@ -1904,7 +1885,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
               }
             }
             catch ( std::exception & e ) {
-              gdWarning( "Error reading abrv file \"%s\", error: %s. Skipping it.\n", abrvFileName.c_str(), e.what() );
+              qWarning( "Error reading abrv file \"%s\", error: %s. Skipping it.", abrvFileName.c_str(), e.what() );
             }
           }
 
@@ -1934,7 +1915,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
               // characters are blank, too.
               for ( size_t x = 1; x < curString.size(); ++x ) {
                 if ( !isDslWs( curString[ x ] ) ) {
-                  gdWarning( "Garbage string in %s at offset 0x%lX\n", fileName.c_str(), curOffset );
+                  qWarning( "Garbage string in %s at offset 0x%lX", fileName.c_str(), curOffset );
                   break;
                 }
               }
@@ -1950,13 +1931,13 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
 
             uint32_t articleOffset = curOffset;
 
-            //GD_DPRINTF( "Headword: %ls\n", curString.c_str() );
+            //qDebug( "Headword: %ls", curString.c_str() );
 
             // More headwords may follow
 
             for ( ;; ) {
               if ( !( hasString = scanner.readNextLineWithoutComments( curString, curOffset ) ) ) {
-                gdWarning( "Premature end of file %s\n", fileName.c_str() );
+                qWarning( "Premature end of file %s", fileName.c_str() );
                 break;
               }
 
@@ -2014,11 +1995,11 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
 
               if ( !hasString || ( curString.size() && !isDslWs( curString[ 0 ] ) ) ) {
                 if ( insideInsided ) {
-                  gdWarning( "Unclosed tag '@' at line %i", dogLine );
+                  qWarning( "Unclosed tag '@' at line %i", dogLine );
                   insidedCards.append( InsidedCard( offset, curOffset - offset, insidedHeadwords ) );
                 }
                 if ( noSignificantLines ) {
-                  gdWarning( "Orphan headword at line %i", headwordLine );
+                  qWarning( "Orphan headword at line %i", headwordLine );
                 }
 
                 break;
@@ -2032,7 +2013,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
               }
               else {
                 if ( wasEmptyLine && !Folding::applyWhitespaceOnly( curString ).empty() ) {
-                  gdWarning( "Orphan string at line %i", scanner.getLinesRead() - 1 );
+                  qWarning( "Orphan string at line %i", scanner.getLinesRead() - 1 );
                 }
               }
 
@@ -2053,7 +2034,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
               else {
                 // Embedded card tag must be placed at first position in line after spaces
                 if ( !isAtSignFirst( curString ) ) {
-                  gdWarning( "Unescaped '@' symbol at line %i", scanner.getLinesRead() - 1 );
+                  qWarning( "Unescaped '@' symbol at line %i", scanner.getLinesRead() - 1 );
 
                   if ( insideInsided ) {
                     linesInsideCard++;
@@ -2143,7 +2124,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
           // If there was a zip file, index it too
 
           if ( zipFileName.size() ) {
-            GD_DPRINTF( "Indexing zip file\n" );
+            qDebug( "Indexing zip file" );
 
             idxHeader.hasZipFile = 1;
 
@@ -2199,7 +2180,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
       dictionaries.push_back( std::make_shared< DslDictionary >( dictId, indexFile, dictFiles ) );
     }
     catch ( std::exception & e ) {
-      gdWarning( "DSL dictionary reading failed: %s:%u, error: %s\n", fileName.c_str(), atLine, e.what() );
+      qWarning( "DSL dictionary reading failed: %s:%u, error: %s", fileName.c_str(), atLine, e.what() );
     }
   }
 

src/dict/dsl_details.cc

@@ -5,7 +5,6 @@
 
 #include "folding.hh"
 #include "langcoder.hh"
-#include "gddebug.hh"
 #include "ufile.hh"
 #include "utf8.hh"
 
@@ -119,10 +118,10 @@ ArticleDom::ArticleDom( wstring const & str, string const & dictName, wstring co
         if ( !atSignFirstInLine() ) {
           // Not insided card
           if ( dictName.empty() ) {
-            gdWarning( "Unescaped '@' symbol found" );
+            qWarning( "Unescaped '@' symbol found" );
           }
           else {
-            gdWarning( "Unescaped '@' symbol found in \"%s\"", dictName.c_str() );
+            qWarning( "Unescaped '@' symbol found in \"%s\"", dictName.c_str() );
           }
         }
         else {
@@ -246,16 +245,16 @@ ArticleDom::ArticleDom( wstring const & str, string const & dictName, wstring co
         }
         catch ( std::exception & ex ) {
           if ( !dictionaryName.empty() ) {
-            gdWarning( R"(DSL: Unfinished tag "%s" with attributes "%s" found in "%s", article "%s".)",
-                       QString::fromStdU32String( name ).toUtf8().data(),
-                       QString::fromStdU32String( attrs ).toUtf8().data(),
-                       dictionaryName.c_str(),
-                       QString::fromStdU32String( headword ).toUtf8().data() );
+            qWarning( R"(DSL: Unfinished tag "%s" with attributes "%s" found in "%s", article "%s".)",
+                      QString::fromStdU32String( name ).toUtf8().data(),
+                      QString::fromStdU32String( attrs ).toUtf8().data(),
+                      dictionaryName.c_str(),
+                      QString::fromStdU32String( headword ).toUtf8().data() );
           }
           else {
-            gdWarning( R"(DSL: Unfinished tag "%s" with attributes "%s" found)",
-                       QString::fromStdU32String( name ).toUtf8().data(),
-                       QString::fromStdU32String( attrs ).toUtf8().data() );
+            qWarning( R"(DSL: Unfinished tag "%s" with attributes "%s" found)",
+                      QString::fromStdU32String( name ).toUtf8().data(),
+                      QString::fromStdU32String( attrs ).toUtf8().data() );
           }
 
           throw ex;
@@ -678,16 +677,16 @@ ArticleDom::ArticleDom( wstring const & str, string const & dictName, wstring co
     unsigned const unclosedTagCount = 1 + std::count_if( it, stack.end(), MustTagBeClosed() );
 
     if ( dictName.empty() ) {
-      gdWarning( "Warning: %u tag(s) were unclosed, first tag name \"%s\".\n",
-                 unclosedTagCount,
-                 firstTagName.constData() );
+      qWarning( "Warning: %u tag(s) were unclosed, first tag name \"%s\".",
+                unclosedTagCount,
+                firstTagName.constData() );
     }
     else {
-      gdWarning( "Warning: %u tag(s) were unclosed in \"%s\", article \"%s\", first tag name \"%s\".\n",
-                 unclosedTagCount,
-                 dictName.c_str(),
-                 QString::fromStdU32String( headword ).toUtf8().constData(),
-                 firstTagName.constData() );
+      qWarning( "Warning: %u tag(s) were unclosed in \"%s\", article \"%s\", first tag name \"%s\".",
+                unclosedTagCount,
+                dictName.c_str(),
+                QString::fromStdU32String( headword ).toUtf8().constData(),
+                firstTagName.constData() );
     }
   }
 }
@@ -787,14 +786,14 @@ void ArticleDom::closeTag( wstring const & name, list< Node * > & stack, bool wa
   }
   else if ( warn ) {
     if ( !dictionaryName.empty() ) {
-      gdWarning( R"(No corresponding opening tag for closing tag "%s" found in "%s", article "%s".)",
-                 QString::fromStdU32String( name ).toUtf8().data(),
-                 dictionaryName.c_str(),
-                 QString::fromStdU32String( headword ).toUtf8().data() );
+      qWarning( R"(No corresponding opening tag for closing tag "%s" found in "%s", article "%s".)",
+                QString::fromStdU32String( name ).toUtf8().data(),
+                dictionaryName.c_str(),
+                QString::fromStdU32String( headword ).toUtf8().data() );
     }
     else {
-      gdWarning( "No corresponding opening tag for closing tag \"%s\" found.",
-                 QString::fromStdU32String( name ).toUtf8().data() );
+      qWarning( "No corresponding opening tag for closing tag \"%s\" found.",
+                QString::fromStdU32String( name ).toUtf8().data() );
     }
   }
 }
@@ -975,7 +974,7 @@ DslScanner::DslScanner( string const & fileName ):
       // The encoding
       if ( !needExactEncoding ) {
         // We don't need that!
-        GD_FDPRINTF( stderr, "Warning: encoding was specified in a Unicode file, ignoring.\n" );
+        qWarning( "Warning: encoding was specified in a Unicode file, ignoring." );
       }
       else if ( !arg.compare( U"Latin" ) ) {
         encoding = Utf8::Windows1252;
@@ -1121,7 +1120,7 @@ void processUnsortedParts( wstring & str, bool strip )
       --refCount;
 
       if ( refCount < 0 ) {
-        GD_FDPRINTF( stderr, "Warning: an unmatched closing brace was encountered.\n" );
+        qWarning( "Warning: an unmatched closing brace was encountered." );
         refCount = 0;
         // But we remove that thing either way
         str.erase( x, 1 );
@@ -1146,7 +1145,7 @@ void processUnsortedParts( wstring & str, bool strip )
   }
 
   if ( strip && refCount ) {
-    GD_FDPRINTF( stderr, "Warning: unclosed brace(s) encountered.\n" );
+    qWarning( "Warning: unclosed brace(s) encountered." );
     str.erase( startPos );
   }
 }

src/dict/epwing.cc

@@ -1,26 +1,18 @@
 /* This file is (c) 2014 Abs62
  * Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
+#include <QDir>
 #ifndef NO_EPWING_SUPPORT
 
   #include "epwing_book.hh"
   #include "epwing.hh"
-
   #include <QByteArray>
-  #include <QDir>
-  #include <QRunnable>
-  #include <QSemaphore>
-
   #include <map>
-  #include <QtConcurrent>
+  #include <QtConcurrentRun>
   #include <set>
   #include <string>
-
   #include "btreeidx.hh"
   #include "folding.hh"
-  #include "gddebug.hh"
-
   #include "chunkedstorage.hh"
-  #include "wstring_qt.hh"
   #include "filetype.hh"
   #include "ftshelpers.hh"
   #include "globalregex.hh"
@@ -421,16 +413,14 @@ void EpwingDictionary::makeFTSIndex( QAtomicInt & isCancelled )
     return;
 
 
-  gdDebug( "Epwing: Building the full-text index for dictionary: %s\n", getName().c_str() );
+  qDebug( "Epwing: Building the full-text index for dictionary: %s", getName().c_str() );
 
   try {
     FtsHelpers::makeFTSIndex( this, isCancelled );
     FTS_index_completed.ref();
   }
   catch ( std::exception & ex ) {
-    gdWarning( "Epwing: Failed building full-text search index for \"%s\", reason: %s\n",
-               getName().c_str(),
-               ex.what() );
+    qWarning( "Epwing: Failed building full-text search index for \"%s\", reason: %s", getName().c_str(), ex.what() );
     QFile::remove( QString::fromStdString( ftsIdxName ) );
   }
 }
@@ -869,10 +859,10 @@ void EpwingResourceRequest::run()
     }
   }
   catch ( std::exception & ex ) {
-    gdWarning( "Epwing: Failed loading resource \"%s\" for \"%s\", reason: %s\n",
-               resourceName.c_str(),
-               dict.getName().c_str(),
-               ex.what() );
+    qWarning( "Epwing: Failed loading resource \"%s\" for \"%s\", reason: %s",
+              resourceName.c_str(),
+              dict.getName().c_str(),
+              ex.what() );
     // Resource not loaded -- we don't set the hasAnyData flag then
   }
 
@@ -1146,7 +1136,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
       subBooksNumber = dict.setBook( mainDirectory );
     }
     catch ( std::exception & e ) {
-      gdWarning( "Epwing dictionary initializing failed: %s, error: %s\n", mainDirectory.c_str(), e.what() );
+      qWarning( "Epwing dictionary initializing failed: %s, error: %s", mainDirectory.c_str(), e.what() );
       continue;
     }
 
@@ -1181,7 +1171,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
         string indexFile = indicesDir + dictId;
 
         if ( Dictionary::needToRebuildIndex( dictFiles, indexFile ) || indexIsOldOrBad( indexFile ) ) {
-          gdDebug( "Epwing: Building the index for dictionary in directory %s\n", dir.toUtf8().data() );
+          qDebug( "Epwing: Building the index for dictionary in directory %s", dir.toUtf8().data() );
 
           QString str         = dict.title();
           QByteArray nameData = str.toUtf8();
@@ -1261,7 +1251,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
         dictionaries.push_back( std::make_shared< EpwingDictionary >( dictId, indexFile, dictFiles, sb ) );
       }
       catch ( std::exception & e ) {
-        gdWarning( "Epwing dictionary initializing failed: %s, error: %s\n", dir.toUtf8().data(), e.what() );
+        qWarning( "Epwing dictionary initializing failed: %s, error: %s", dir.toUtf8().data(), e.what() );
         continue;
       }
     }

src/dict/epwing_book.cc

@@ -9,8 +9,6 @@
   #include <QTextStream>
   #include <QTextDocumentFragment>
   #include <QHash>
-  #include "gddebug.hh"
-
   #include "audiolink.hh"
   #include "wstring.hh"
   #include "wstring_qt.hh"
@@ -577,7 +575,7 @@ QString EpwingBook::createCacheDir( QString const & dirName )
   QFileInfo info( mainCacheDir );
   if ( !info.exists() || !info.isDir() ) {
     if ( !dir.mkdir( mainCacheDir ) ) {
-      gdWarning( "Epwing: can't create cache directory \"%s\"", mainCacheDir.toUtf8().data() );
+      qWarning( "Epwing: can't create cache directory \"%s\"", mainCacheDir.toUtf8().data() );
       return {};
     }
   }
@@ -586,7 +584,7 @@ QString EpwingBook::createCacheDir( QString const & dirName )
   info             = QFileInfo( cacheDir );
   if ( !info.exists() || !info.isDir() ) {
     if ( !dir.mkdir( cacheDir ) ) {
-      gdWarning( "Epwing: can't create cache directory \"%s\"", cacheDir.toUtf8().data() );
+      qWarning( "Epwing: can't create cache directory \"%s\"", cacheDir.toUtf8().data() );
       return {};
     }
   }
@@ -1263,7 +1261,7 @@ const char * EpwingBook::beginDecoration( unsigned int code )
       str = "<sup>";
       break;
     default:
-      gdWarning( "Epwing: Unknown decoration code %i", code );
+      qWarning( "Epwing: Unknown decoration code %i", code );
       code = UNKNOWN;
       break;
   }
@@ -1285,7 +1283,7 @@ const char * EpwingBook::endDecoration( unsigned int code )
     storedCode = decorationStack.pop();
 
   if ( storedCode != code ) {
-    gdWarning( "Epwing: tags mismatch detected" );
+    qWarning( "Epwing: tags mismatch detected" );
     if ( storedCode == UNKNOWN )
       storedCode = code;
   }
@@ -1405,7 +1403,7 @@ QByteArray EpwingBook::handleColorImage( EB_Hook_Code code, const unsigned int *
   EB_Error_Code ret = eb_set_binary_color_graphic( &book, &pos );
   if ( ret != EB_SUCCESS ) {
     setErrorString( "eb_set_binary_color_graphic", ret );
-    gdWarning( "Epwing image retrieve error: %s", error_string.toUtf8().data() );
+    qWarning( "Epwing image retrieve error: %s", error_string.toUtf8().data() );
     return QByteArray();
   }
 
@@ -1443,7 +1441,7 @@ QByteArray EpwingBook::handleColorImage( EB_Hook_Code code, const unsigned int *
         ret = eb_read_binary( &book, BinaryBufferSize, buffer.data(), &length );
         if ( ret != EB_SUCCESS ) {
           setErrorString( "eb_read_binary", ret );
-          gdWarning( "Epwing image retrieve error: %s", error_string.toUtf8().data() );
+          qWarning( "Epwing image retrieve error: %s", error_string.toUtf8().data() );
           break;
         }
 
@@ -1480,7 +1478,7 @@ QByteArray EpwingBook::handleMonoImage( EB_Hook_Code code, const unsigned int *
   EB_Error_Code ret = eb_set_binary_mono_graphic( &book, &pos, monoWidth, monoHeight );
   if ( ret != EB_SUCCESS ) {
     setErrorString( "eb_set_binary_mono_graphic", ret );
-    gdWarning( "Epwing image retrieve error: %s", error_string.toUtf8().data() );
+    qWarning( "Epwing image retrieve error: %s", error_string.toUtf8().data() );
     return QByteArray();
   }
 
@@ -1515,7 +1513,7 @@ QByteArray EpwingBook::handleMonoImage( EB_Hook_Code code, const unsigned int *
         ret = eb_read_binary( &book, BinaryBufferSize, buffer.data(), &length );
         if ( ret != EB_SUCCESS ) {
           setErrorString( "eb_read_binary", ret );
-          gdWarning( "Epwing image retrieve error: %s", error_string.toUtf8().data() );
+          qWarning( "Epwing image retrieve error: %s", error_string.toUtf8().data() );
           break;
         }
 
@@ -1585,7 +1583,7 @@ QByteArray EpwingBook::handleWave( EB_Hook_Code code, const unsigned int * argv
         EB_Error_Code ret = eb_read_binary( &book, BinaryBufferSize, buffer.data(), &length );
         if ( ret != EB_SUCCESS ) {
           setErrorString( "eb_read_binary", ret );
-          gdWarning( "Epwing sound retrieve error: %s", error_string.toUtf8().data() );
+          qWarning( "Epwing sound retrieve error: %s", error_string.toUtf8().data() );
           break;
         }
 
@@ -1652,7 +1650,7 @@ QByteArray EpwingBook::handleMpeg( EB_Hook_Code code, const unsigned int * argv
         EB_Error_Code ret = eb_read_binary( &book, BinaryBufferSize, buffer.data(), &length );
         if ( ret != EB_SUCCESS ) {
           setErrorString( "eb_read_binary", ret );
-          gdWarning( "Epwing movie retrieve error: %s", error_string.toUtf8().data() );
+          qWarning( "Epwing movie retrieve error: %s", error_string.toUtf8().data() );
           break;
         }
 
@@ -1720,7 +1718,7 @@ QByteArray EpwingBook::handleNarrowFont( const unsigned int * argv, bool text_on
     EB_Error_Code ret = eb_narrow_font_character_bitmap( &book, *argv, bitmap );
     if ( ret != EB_SUCCESS ) {
       setErrorString( "eb_narrow_font_character_bitmap", ret );
-      gdWarning( "Epwing: Font retrieve error: %s", error_string.toUtf8().data() );
+      qWarning( "Epwing: Font retrieve error: %s", error_string.toUtf8().data() );
       return QByteArray( "?" );
     }
 
@@ -1729,7 +1727,7 @@ QByteArray EpwingBook::handleNarrowFont( const unsigned int * argv, bool text_on
     ret = eb_bitmap_to_png( bitmap, 8, 16, buff, &nlen );
     if ( ret != EB_SUCCESS ) {
       setErrorString( "eb_bitmap_to_png", ret );
-      gdWarning( "Epwing: Font retrieve error: %s", error_string.toUtf8().data() );
+      qWarning( "Epwing: Font retrieve error: %s", error_string.toUtf8().data() );
       return QByteArray( "?" );
     }
 
@@ -1784,7 +1782,7 @@ QByteArray EpwingBook::handleWideFont( const unsigned int * argv, bool text_only
     EB_Error_Code ret = eb_wide_font_character_bitmap( &book, *argv, bitmap );
     if ( ret != EB_SUCCESS ) {
       setErrorString( "eb_wide_font_character_bitmap", ret );
-      gdWarning( "Epwing: Font retrieve error: %s", error_string.toUtf8().data() );
+      qWarning( "Epwing: Font retrieve error: %s", error_string.toUtf8().data() );
       return QByteArray( "?" );
     }
 
@@ -1793,7 +1791,7 @@ QByteArray EpwingBook::handleWideFont( const unsigned int * argv, bool text_only
     ret = eb_bitmap_to_png( bitmap, 16, 16, buff, &wlen );
     if ( ret != EB_SUCCESS ) {
       setErrorString( "eb_bitmap_to_png", ret );
-      gdWarning( "Epwing: Font retrieve error: %s", error_string.toUtf8().data() );
+      qWarning( "Epwing: Font retrieve error: %s", error_string.toUtf8().data() );
       return QByteArray( "?" );
     }
 
@@ -1873,14 +1871,14 @@ bool EpwingBook::getMatches( QString word, QList< QString > & matches )
     EB_Error_Code ret = eb_search_word( &book, bword.data() );
     if ( ret != EB_SUCCESS ) {
       setErrorString( "eb_search_word", ret );
-      gdWarning( "Epwing word search error: %s", error_string.toUtf8().data() );
+      qWarning( "Epwing word search error: %s", error_string.toUtf8().data() );
       return false;
     }
 
     ret = eb_hit_list( &book, 10, hits, &hitCount );
     if ( ret != EB_SUCCESS ) {
       setErrorString( "eb_hit_list", ret );
-      gdWarning( "Epwing word search error: %s", error_string.toUtf8().data() );
+      qWarning( "Epwing word search error: %s", error_string.toUtf8().data() );
       return false;
     }
   }
@@ -1889,14 +1887,14 @@ bool EpwingBook::getMatches( QString word, QList< QString > & matches )
     EB_Error_Code ret = eb_search_word( &book, bword2.data() );
     if ( ret != EB_SUCCESS ) {
       setErrorString( "eb_search_word", ret );
-      gdWarning( "Epwing word search error: %s", error_string.toUtf8().data() );
+      qWarning( "Epwing word search error: %s", error_string.toUtf8().data() );
       return false;
     }
 
     ret = eb_hit_list( &book, 10, hits, &hitCount );
     if ( ret != EB_SUCCESS ) {
       setErrorString( "eb_hit_list", ret );
-      gdWarning( "Epwing word search error: %s", error_string.toUtf8().data() );
+      qWarning( "Epwing word search error: %s", error_string.toUtf8().data() );
       return false;
     }
   }
@@ -1944,14 +1942,14 @@ bool EpwingBook::getArticlePos( QString word, QList< int > & pages, QList< int >
     EB_Error_Code ret = eb_search_exactword( &book, bword.data() );
     if ( ret != EB_SUCCESS ) {
       setErrorString( "eb_search_word", ret );
-      gdWarning( "Epwing word search error: %s", error_string.toUtf8().data() );
+      qWarning( "Epwing word search error: %s", error_string.toUtf8().data() );
       return false;
     }
 
     ret = eb_hit_list( &book, HitsBufferSize, hits, &hitCount );
     if ( ret != EB_SUCCESS ) {
       setErrorString( "eb_hit_list", ret );
-      gdWarning( "Epwing word search error: %s", error_string.toUtf8().data() );
+      qWarning( "Epwing word search error: %s", error_string.toUtf8().data() );
       return false;
     }
   }
@@ -1960,14 +1958,14 @@ bool EpwingBook::getArticlePos( QString word, QList< int > & pages, QList< int >
     EB_Error_Code ret = eb_search_exactword( &book, bword2.data() );
     if ( ret != EB_SUCCESS ) {
       setErrorString( "eb_search_word", ret );
-      gdWarning( "Epwing word search error: %s", error_string.toUtf8().data() );
+      qWarning( "Epwing word search error: %s", error_string.toUtf8().data() );
       return false;
     }
 
     ret = eb_hit_list( &book, HitsBufferSize, hits, &hitCount );
     if ( ret != EB_SUCCESS ) {
       setErrorString( "eb_hit_list", ret );
-      gdWarning( "Epwing word search error: %s", error_string.toUtf8().data() );
+      qWarning( "Epwing word search error: %s", error_string.toUtf8().data() );
       return false;
     }
   }

src/dict/forvo.cc

@@ -10,7 +10,6 @@
 #include "audiolink.hh"
 #include "htmlescape.hh"
 #include "utf8.hh"
-#include "gddebug.hh"
 
 namespace Forvo {
 
@@ -164,7 +163,7 @@ ForvoArticleRequest::ForvoArticleRequest( wstring const & str,
 
 void ForvoArticleRequest::addQuery( QNetworkAccessManager & mgr, wstring const & str )
 {
-  gdDebug( "Forvo: requesting article %s\n", QString::fromStdU32String( str ).toUtf8().data() );
+  qDebug( "Forvo: requesting article %s", QString::fromStdU32String( str ).toUtf8().data() );
 
   QString key = apiKey;
 
@@ -179,7 +178,7 @@ void ForvoArticleRequest::addQuery( QNetworkAccessManager & mgr, wstring const &
                                 + "/language/" + languageCode + "/order/rate-desc" )
                          .toUtf8() );
 
-  //  GD_DPRINTF( "req: %s\n", reqUrl.toEncoded().data() );
+  //  qDebug( "req: %s", reqUrl.toEncoded().data() );
 
   sptr< QNetworkReply > netReply = std::shared_ptr< QNetworkReply >( mgr.get( QNetworkRequest( reqUrl ) ) );
 
@@ -188,7 +187,7 @@ void ForvoArticleRequest::addQuery( QNetworkAccessManager & mgr, wstring const &
 
 void ForvoArticleRequest::requestFinished( QNetworkReply * r )
 {
-  GD_DPRINTF( "Finished.\n" );
+  qDebug( "Finished." );
 
   if ( isFinished() ) { // Was cancelled
     return;
@@ -227,7 +226,7 @@ void ForvoArticleRequest::requestFinished( QNetworkReply * r )
           QString( tr( "XML parse error: %1 at %2,%3" ).arg( errorStr ).arg( errorLine ).arg( errorColumn ) ) );
       }
       else {
-        //        GD_DPRINTF( "%s\n", dd.toByteArray().data() );
+        //        qDebug( "%s", dd.toByteArray().data() );
 
         QDomNode items = dd.namedItem( "items" );
 
@@ -330,7 +329,7 @@ void ForvoArticleRequest::requestFinished( QNetworkReply * r )
           setErrorString( text );
         }
       }
-      GD_DPRINTF( "done.\n" );
+      qDebug( "done." );
     }
     else {
       setErrorString( netReply->errorString() );

src/dict/gls.cc

@@ -8,7 +8,6 @@
 #include "ufile.hh"
 #include "btreeidx.hh"
 #include "folding.hh"
-#include "gddebug.hh"
 #include "utf8.hh"
 #include "wstring_qt.hh"
 #include "chunkedstorage.hh"
@@ -16,24 +15,16 @@
 #include "dictzip.hh"
 #include "indexedzip.hh"
 #include "ftshelpers.hh"
-
 #include "htmlescape.hh"
 #include "filetype.hh"
 #include "tiff.hh"
 #include "audiolink.hh"
-
 #include <QString>
-#include <QSemaphore>
-#include <QThreadPool>
 #include <QAtomicInt>
-// For TIFF conversion
-#include <QImage>
 #include <QByteArray>
-#include <QBuffer>
-
+#include <QDir>
 #include <QRegularExpression>
 #include <QtCore5Compat/QTextCodec>
-
 #include <string>
 #include <list>
 #include <map>
@@ -531,7 +522,7 @@ QString const & GlsDictionary::getDescription()
     }
   }
   catch ( std::exception & e ) {
-    gdWarning( "GLS dictionary description reading failed: %s, error: %s\n", getName().c_str(), e.what() );
+    qWarning( "GLS dictionary description reading failed: %s, error: %s", getName().c_str(), e.what() );
   }
 
   if ( dictionaryDescription.isEmpty() ) {
@@ -562,14 +553,14 @@ void GlsDictionary::makeFTSIndex( QAtomicInt & isCancelled )
   }
 
 
-  gdDebug( "Gls: Building the full-text index for dictionary: %s\n", getName().c_str() );
+  qDebug( "Gls: Building the full-text index for dictionary: %s", getName().c_str() );
 
   try {
     FtsHelpers::makeFTSIndex( this, isCancelled );
     FTS_index_completed.ref();
   }
   catch ( std::exception & ex ) {
-    gdWarning( "Gls: Failed building full-text search index for \"%s\", reason: %s\n", getName().c_str(), ex.what() );
+    qWarning( "Gls: Failed building full-text search index for \"%s\", reason: %s", getName().c_str(), ex.what() );
     QFile::remove( ftsIdxName.c_str() );
   }
 }
@@ -810,7 +801,7 @@ void GlsDictionary::getArticleText( uint32_t articleAddress, QString & headword,
     text = Html::unescape( QString::fromStdString( articleStr ) );
   }
   catch ( std::exception & ex ) {
-    gdWarning( "Gls: Failed retrieving article from \"%s\", reason: %s\n", getName().c_str(), ex.what() );
+    qWarning( "Gls: Failed retrieving article from \"%s\", reason: %s", getName().c_str(), ex.what() );
   }
 }
 
@@ -1090,7 +1081,7 @@ void GlsResourceRequest::run()
   try {
     string n = dict.getContainingFolder().toStdString() + Utils::Fs::separator() + resourceName;
 
-    GD_DPRINTF( "gls resource name is %s\n", n.c_str() );
+    qDebug( "gls resource name is %s", n.c_str() );
 
     try {
       QMutexLocker _( &dataMutex );
@@ -1175,10 +1166,10 @@ void GlsResourceRequest::run()
     hasAnyData = true;
   }
   catch ( std::exception & ex ) {
-    gdWarning( "GLS: Failed loading resource \"%s\" for \"%s\", reason: %s\n",
-               resourceName.c_str(),
-               dict.getName().c_str(),
-               ex.what() );
+    qWarning( "GLS: Failed loading resource \"%s\" for \"%s\", reason: %s",
+              resourceName.c_str(),
+              dict.getName().c_str(),
+              ex.what() );
     // Resource not loaded -- we don't set the hasAnyData flag then
   }
 
@@ -1255,8 +1246,8 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
           // Building the index
           initializing.indexingDictionary( Utf8::encode( scanner.getDictionaryName() ) );
 
-          gdDebug( "Gls: Building the index for dictionary: %s\n",
-                   QString::fromStdU32String( scanner.getDictionaryName() ).toUtf8().data() );
+          qDebug( "Gls: Building the index for dictionary: %s",
+                  QString::fromStdU32String( scanner.getDictionaryName() ).toUtf8().data() );
 
           File::Index idx( indexFile, QIODevice::WriteOnly );
 
@@ -1358,7 +1349,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
           // If there was a zip file, index it too
 
           if ( zipFileName.size() ) {
-            GD_DPRINTF( "Indexing zip file\n" );
+            qDebug( "Indexing zip file" );
 
             idxHeader.hasZipFile = 1;
 
@@ -1423,7 +1414,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
       dictionaries.push_back( std::make_shared< GlsDictionary >( dictId, indexFile, dictFiles ) );
     }
     catch ( std::exception & e ) {
-      gdWarning( "GLS dictionary reading failed: %s:%u, error: %s\n", fileName.c_str(), atLine, e.what() );
+      qWarning( "GLS dictionary reading failed: %s:%u, error: %s", fileName.c_str(), atLine, e.what() );
     }
   }
 

src/dict/hunspell.cc

@@ -6,30 +6,21 @@
 #include "htmlescape.hh"
 #include "iconv.hh"
 #include "folding.hh"
-#include "wstring_qt.hh"
 #include "language.hh"
 #include "langcoder.hh"
-
-#include <QRunnable>
-#include <QThreadPool>
-#include <QSemaphore>
-
 #include <QRegularExpression>
-
 #include <QDir>
 #include <QCoreApplication>
 #include <QFileInfo>
-
 #include <set>
+#include "utils.hh"
+#include <QtConcurrentRun>
+
 #ifndef INCLUDE_LIBRARY_PATH
   #include <hunspell.hxx>
 #else
   #include <hunspell/hunspell.hxx>
 #endif
-#include "gddebug.hh"
-
-#include "utils.hh"
-#include <QtConcurrent>
 
 namespace HunspellMorpho {
 
@@ -279,10 +270,10 @@ void HunspellArticleRequest::run()
     }
   }
   catch ( Iconv::Ex & e ) {
-    gdWarning( "Hunspell: charset conversion error, no processing's done: %s\n", e.what() );
+    qWarning( "Hunspell: charset conversion error, no processing's done: %s", e.what() );
   }
   catch ( std::exception & e ) {
-    gdWarning( "Hunspell: error: %s\n", e.what() );
+    qWarning( "Hunspell: error: %s", e.what() );
   }
 
   finish();
@@ -404,7 +395,7 @@ QList< wstring > suggest( wstring & word, QMutex & hunspellMutex, Hunspell & hun
           suggestion.chop( suggestion.length() - n );
         }
 
-        GD_DPRINTF( ">>>Sugg: %s\n", suggestion.toLocal8Bit().data() );
+        qDebug( ">>>Sugg: %s", suggestion.toLocal8Bit().data() );
 
         auto match = cutStem.match( suggestion.trimmed() );
         if ( match.hasMatch() ) {
@@ -419,7 +410,7 @@ QList< wstring > suggest( wstring & word, QMutex & hunspellMutex, Hunspell & hun
     }
   }
   catch ( Iconv::Ex & e ) {
-    gdWarning( "Hunspell: charset conversion error, no processing's done: %s\n", e.what() );
+    qWarning( "Hunspell: charset conversion error, no processing's done: %s", e.what() );
   }
 
   return result;
@@ -501,7 +492,7 @@ void HunspellPrefixMatchRequest::run()
     }
   }
   catch ( Iconv::Ex & e ) {
-    gdWarning( "Hunspell: charset conversion error, no processing's done: %s\n", e.what() );
+    qWarning( "Hunspell: charset conversion error, no processing's done: %s", e.what() );
   }
 
   finish();

src/dict/loaddictionaries.cc

@@ -11,17 +11,10 @@
 #include "dict/sounddir.hh"
 #include "dict/hunspell.hh"
 #include "dictdfiles.hh"
-#include "dict/romaji.hh"
-#include "dict/customtransliteration.hh"
-#include "dict/russiantranslit.hh"
-#include "dict/german.hh"
-#include "dict/greektranslit.hh"
-#include "dict/belarusiantranslit.hh"
 #include "dict/website.hh"
 #include "dict/forvo.hh"
 #include "dict/programs.hh"
 #include "dict/voiceengines.hh"
-#include "gddebug.hh"
 #include "dict/xdxf.hh"
 #include "dict/sdict.hh"
 #include "dict/aard.hh"
@@ -34,12 +27,19 @@
 #include "dict/lingualibre.hh"
 #include "metadata.hh"
 
+#include "dict/transliteration/belarusian.hh"
+#include "dict/transliteration/custom.hh"
+#include "dict/transliteration/german.hh"
+#include "dict/transliteration/greek.hh"
+#include "dict/transliteration/romaji.hh"
+#include "dict/transliteration/russian.hh"
+
 #ifndef NO_EPWING_SUPPORT
   #include "dict/epwing.hh"
 #endif
 
 #ifdef MAKE_CHINESE_CONVERSION_SUPPORT
-  #include "dict/chinese.hh"
+  #include "dict/transliteration/chinese.hh"
 #endif
 
 #include <QMessageBox>
@@ -243,10 +243,10 @@ void loadDictionaries( QWidget * parent,
   ///// We create transliterations synchronously since they are very simple
 
 #ifdef MAKE_CHINESE_CONVERSION_SUPPORT
-  addDicts( Chinese::makeDictionaries( cfg.transliteration.chinese ) );
+  addDicts( ChineseTranslit::makeDictionaries( cfg.transliteration.chinese ) );
 #endif
 
-  addDicts( Romaji::makeDictionaries( cfg.transliteration.romaji ) );
+  addDicts( RomajiTranslit::makeDictionaries( cfg.transliteration.romaji ) );
   addDicts( CustomTranslit::makeDictionaries( cfg.transliteration.customTrans ) );
 
   // Make Russian transliteration
@@ -280,7 +280,7 @@ void loadDictionaries( QWidget * parent,
   addDicts( DictServer::makeDictionaries( cfg.dictServers ) );
 
 
-  GD_DPRINTF( "Load done\n" );
+  qDebug( "Load done" );
 
   // Remove any stale index files
 
@@ -290,12 +290,12 @@ void loadDictionaries( QWidget * parent,
   for ( unsigned x = dictionaries.size(); x--; ) {
     ret = ids.insert( dictionaries[ x ]->getId() );
     if ( !ret.second ) {
-      gdWarning( R"(Duplicate dictionary ID found: ID=%s, name="%s", path="%s")",
-                 dictionaries[ x ]->getId().c_str(),
-                 dictionaries[ x ]->getName().c_str(),
-                 dictionaries[ x ]->getDictionaryFilenames().empty() ?
-                   "" :
-                   dictionaries[ x ]->getDictionaryFilenames()[ 0 ].c_str() );
+      qWarning( R"(Duplicate dictionary ID found: ID=%s, name="%s", path="%s")",
+                dictionaries[ x ]->getId().c_str(),
+                dictionaries[ x ]->getName().c_str(),
+                dictionaries[ x ]->getDictionaryFilenames().empty() ?
+                  "" :
+                  dictionaries[ x ]->getDictionaryFilenames()[ 0 ].c_str() );
     }
   }
 

src/dict/lsa.cc

@@ -9,7 +9,6 @@
 #include "btreeidx.hh"
 
 #include "audiolink.hh"
-#include "gddebug.hh"
 
 #include <set>
 #include <string>
@@ -464,13 +463,13 @@ sptr< Dictionary::DataRequest > LsaDictionary::getResource( string const & name
     long result = ov_read( &vf, ptr, left, 0, 2, 1, &bitstream );
 
     if ( result <= 0 ) {
-      gdWarning( "Failed to read Vorbis data (code = %ld)\n", result );
+      qWarning( "Failed to read Vorbis data (code = %ld)", result );
       memset( ptr, 0, left );
       break;
     }
 
     if ( result > left ) {
-      GD_FDPRINTF( stderr, "Warning: Vorbis decode returned more data than requested.\n" );
+      qWarning( "Warning: Vorbis decode returned more data than requested." );
 
       result = left;
     }
@@ -539,7 +538,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
       if ( Dictionary::needToRebuildIndex( dictFiles, indexFile ) || indexIsOldOrBad( indexFile ) ) {
         // Building the index
 
-        gdDebug( "Lsa: Building the index for dictionary: %s\n", i->c_str() );
+        qDebug( "Lsa: Building the index for dictionary: %s", i->c_str() );
 
         initializing.indexingDictionary( Utils::Fs::basename( *i ) );
 
@@ -559,7 +558,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
         /// XXX handle big-endian machines here!
         auto entriesCount = f.read< uint32_t >();
 
-        GD_DPRINTF( "%s: %u entries\n", i->c_str(), entriesCount );
+        qDebug( "%s: %u entries", i->c_str(), entriesCount );
 
         idxHeader.soundsCount = entriesCount;
 
@@ -574,7 +573,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
           // Remove the extension, no need for that in the index
           e.name = stripExtension( e.name );
 
-          GD_DPRINTF( "Read filename %s (%u at %u)<\n", e.name.c_str(), e.samplesLength, e.samplesOffset );
+          qDebug( "Read filename %s (%u at %u)<", e.name.c_str(), e.samplesLength, e.samplesOffset );
 
           // Insert new entry into an index
 
@@ -613,7 +612,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
       dictionaries.push_back( std::make_shared< LsaDictionary >( dictId, indexFile, dictFiles ) );
     }
     catch ( std::exception & e ) {
-      gdWarning( "Lingvo's LSA reading failed: %s, error: %s\n", i->c_str(), e.what() );
+      qWarning( "Lingvo's LSA reading failed: %s, error: %s", i->c_str(), e.what() );
     }
   }
 

src/dict/mdictparser.cc

@@ -35,7 +35,6 @@
 #include <QtCore5Compat/QTextCodec>
 
 #include "decompress.hh"
-#include "gddebug.hh"
 #include "ripemd.hh"
 #include "utils.hh"
 #include "htmlescape.hh"
@@ -118,7 +117,7 @@ bool MdictParser::open( const char * filename )
   filename_ = QString::fromUtf8( filename );
   file_     = new QFile( filename_ );
 
-  gdDebug( "MdictParser: open %s", filename );
+  qDebug( "MdictParser: open %s", filename );
 
   if ( file_.isNull() || !file_->exists() ) {
     return false;
@@ -233,7 +232,7 @@ bool MdictParser::parseCompressedBlock( qint64 compressedBlockSize,
     case 0x00000000:
       // No compression
       if ( !checkAdler32( buf, size, checksum ) ) {
-        gdWarning( "MDict: parseCompressedBlock: plain: checksum not match" );
+        qWarning( "MDict: parseCompressedBlock: plain: checksum not match" );
         return false;
       }
 
@@ -248,13 +247,13 @@ bool MdictParser::parseCompressedBlock( qint64 compressedBlockSize,
       result = lzo1x_decompress_safe( (const uchar *)buf, size, (uchar *)decompressedBlock.data(), &blockSize, NULL );
 
       if ( result != LZO_E_OK || blockSize != (lzo_uint)decompressedBlockSize ) {
-        gdWarning( "MDict: parseCompressedBlock: decompression failed" );
+        qWarning( "MDict: parseCompressedBlock: decompression failed" );
         return false;
       }
 
       if ( checksum
            != lzo_adler32( lzo_adler32( 0, NULL, 0 ), (const uchar *)decompressedBlock.constData(), blockSize ) ) {
-        gdWarning( "MDict: parseCompressedBlock: lzo: checksum does not match" );
+        qWarning( "MDict: parseCompressedBlock: lzo: checksum does not match" );
         return false;
       }
     } break;
@@ -263,12 +262,12 @@ bool MdictParser::parseCompressedBlock( qint64 compressedBlockSize,
       // zlib compression
       decompressedBlock = zlibDecompress( buf, size, checksum );
       if ( decompressedBlock.isEmpty() ) {
-        gdWarning( "MDict: parseCompressedBlock: zlib: failed to decompress or checksum does not match" );
+        qWarning( "MDict: parseCompressedBlock: zlib: failed to decompress or checksum does not match" );
         return false;
       }
       break;
     default:
-      gdWarning( "MDict: parseCompressedBlock: unknown type" );
+      qWarning( "MDict: parseCompressedBlock: unknown type" );
       return false;
   }
 
@@ -320,7 +319,7 @@ bool MdictParser::readHeader( QDataStream & in )
   in.setByteOrder( QDataStream::LittleEndian );
   in >> checksum;
   if ( !checkAdler32( headerTextUtf16.constData(), headerTextUtf16.size(), checksum ) ) {
-    gdWarning( "MDict: readHeader: checksum does not match" );
+    qWarning( "MDict: readHeader: checksum does not match" );
     return false;
   }
   headerTextUtf16.clear();

src/dict/mdx.cc

@@ -9,21 +9,17 @@
 #include "wstring.hh"
 #include "wstring_qt.hh"
 #include "chunkedstorage.hh"
-#include "gddebug.hh"
 #include "langcoder.hh"
-
 #include "audiolink.hh"
 #include "ex.hh"
 #include "mdictparser.hh"
 #include "filetype.hh"
 #include "ftshelpers.hh"
 #include "htmlescape.hh"
-
 #include <algorithm>
 #include <map>
 #include <set>
 #include <list>
-
 #include "globalregex.hh"
 #include "tiff.hh"
 #include "utils.hh"
@@ -32,8 +28,9 @@
 #include <QDir>
 #include <QRegularExpression>
 #include <QString>
+#include <QStringBuilder>
 #include <QThreadPool>
-#include <QtConcurrent>
+#include <QtConcurrentRun>
 
 namespace Mdx {
 
@@ -450,7 +447,7 @@ void MdxDictionary::makeFTSIndex( QAtomicInt & isCancelled )
   //    return;
 
 
-  gdDebug( "MDict: Building the full-text index for dictionary: %s", getName().c_str() );
+  qDebug( "MDict: Building the full-text index for dictionary: %s", getName().c_str() );
 
   try {
     auto _dict = std::make_shared< MdxDictionary >( this->getId(), idxFileName, this->getDictionaryFilenames() );
@@ -461,7 +458,7 @@ void MdxDictionary::makeFTSIndex( QAtomicInt & isCancelled )
     FTS_index_completed.ref();
   }
   catch ( std::exception & ex ) {
-    gdWarning( "MDict: Failed building full-text search index for \"%s\", reason: %s", getName().c_str(), ex.what() );
+    qWarning( "MDict: Failed building full-text search index for \"%s\", reason: %s", getName().c_str(), ex.what() );
     QFile::remove( ftsIdxName.c_str() );
   }
 }
@@ -476,7 +473,7 @@ void MdxDictionary::getArticleText( uint32_t articleAddress, QString & headword,
     text = Html::unescape( QString::fromUtf8( articleText.data(), articleText.size() ) );
   }
   catch ( std::exception & ex ) {
-    gdWarning( "MDict: Failed retrieving article from \"%s\", reason: %s", getName().c_str(), ex.what() );
+    qWarning( "MDict: Failed retrieving article from \"%s\", reason: %s", getName().c_str(), ex.what() );
   }
 }
 
@@ -1124,7 +1121,7 @@ QString MdxDictionary::getCachedFileName( QString filename )
   QFileInfo info( cacheDirName );
   if ( !info.exists() || !info.isDir() ) {
     if ( !dir.mkdir( cacheDirName ) ) {
-      gdWarning( "Mdx: can't create cache directory \"%s\"", cacheDirName.toUtf8().data() );
+      qWarning( "Mdx: can't create cache directory \"%s\"", cacheDirName.toUtf8().data() );
       return QString();
     }
   }
@@ -1142,7 +1139,7 @@ QString MdxDictionary::getCachedFileName( QString filename )
       QFileInfo dirInfo( dirName );
       if ( !dirInfo.exists() ) {
         if ( !dir.mkdir( dirName ) ) {
-          gdWarning( "Mdx: can't create cache directory \"%s\"", dirName.toUtf8().data() );
+          qWarning( "Mdx: can't create cache directory \"%s\"", dirName.toUtf8().data() );
           return QString();
         }
       }
@@ -1157,7 +1154,7 @@ QString MdxDictionary::getCachedFileName( QString filename )
   }
   QFile f( fullName );
   if ( !f.open( QFile::WriteOnly ) ) {
-    gdWarning( R"(Mdx: file "%s" creating error: "%s")", fullName.toUtf8().data(), f.errorString().toUtf8().data() );
+    qWarning( R"(Mdx: file "%s" creating error: "%s")", fullName.toUtf8().data(), f.errorString().toUtf8().data() );
     return QString();
   }
   gd::wstring resourceName = filename.toStdU32String();
@@ -1197,7 +1194,7 @@ QString MdxDictionary::getCachedFileName( QString filename )
   f.close();
 
   if ( n < (qint64)data.size() ) {
-    gdWarning( R"(Mdx: file "%s" writing error: "%s")", fullName.toUtf8().data(), f.errorString().toUtf8().data() );
+    qWarning( R"(Mdx: file "%s" writing error: "%s")", fullName.toUtf8().data(), f.errorString().toUtf8().data() );
     return QString();
   }
   return fullName;
@@ -1345,7 +1342,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
     if ( Dictionary::needToRebuildIndex( dictFiles, indexFile ) || indexIsOldOrBad( dictFiles, indexFile ) ) {
       // Building the index
 
-      gdDebug( "MDict: Building the index for dictionary: %s\n", fileName.c_str() );
+      qDebug( "MDict: Building the index for dictionary: %s", fileName.c_str() );
 
       MdictParser parser;
       list< sptr< MdictParser > > mddParsers;
@@ -1361,7 +1358,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
         if ( File::exists( *mddIter ) ) {
           sptr< MdictParser > mddParser = std::make_shared< MdictParser >();
           if ( !mddParser->open( mddIter->c_str() ) ) {
-            gdWarning( "Broken mdd (resource) file: %s\n", mddIter->c_str() );
+            qWarning( "Broken mdd (resource) file: %s", mddIter->c_str() );
             continue;
           }
           mddParsers.push_back( mddParser );
@@ -1436,7 +1433,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
       // Finish with the chunks
       idxHeader.chunksOffset = chunks.finish();
 
-      GD_DPRINTF( "Writing index...\n" );
+      qDebug( "Writing index..." );
 
       // Good. Now build the index
       IndexInfo idxInfo               = BtreeIndexing::buildIndex( indexedWords, idx );

src/dict/mediawiki.cc

@@ -9,7 +9,6 @@
 #include <QtXml>
 #include <algorithm>
 #include <list>
-#include "gddebug.hh"
 #include "audiolink.hh"
 #include "langcoder.hh"
 #include "utils.hh"
@@ -156,7 +155,7 @@ MediaWikiWordSearchRequest::MediaWikiWordSearchRequest( wstring const & str,
                                                         QNetworkAccessManager & mgr ):
   isCancelling( false )
 {
-  GD_DPRINTF( "wiki request begin\n" );
+  qDebug( "wiki request begin" );
   QUrl reqUrl( url + "/api.php?action=query&list=allpages&aplimit=40&format=xml" );
 
   GlobalBroadcaster::instance()->addWhitelist( reqUrl.host() );
@@ -180,7 +179,7 @@ MediaWikiWordSearchRequest::MediaWikiWordSearchRequest( wstring const & str,
 
 MediaWikiWordSearchRequest::~MediaWikiWordSearchRequest()
 {
-  GD_DPRINTF( "request end\n" );
+  qDebug( "request end" );
 }
 
 void MediaWikiWordSearchRequest::cancel()
@@ -194,7 +193,7 @@ void MediaWikiWordSearchRequest::cancel()
 
   finish();
 
-  GD_DPRINTF( "cancel the request" );
+  qDebug( "cancel the request" );
 }
 
 void MediaWikiWordSearchRequest::downloadFinished()
@@ -227,7 +226,7 @@ void MediaWikiWordSearchRequest::downloadFinished()
         }
       }
     }
-    GD_DPRINTF( "done.\n" );
+    qDebug( "done." );
   }
   else {
     setErrorString( netReply->errorString() );
@@ -258,11 +257,11 @@ public:
 
     QDomElement const sectionsElement = parseNode.firstChildElement( "sections" );
     if ( sectionsElement.isNull() ) {
-      gdWarning( "MediaWiki: empty table of contents and missing sections element." );
+      qWarning( "MediaWiki: empty table of contents and missing sections element." );
       return;
     }
 
-    gdDebug( "MediaWiki: generating table of contents from the sections element." );
+    qDebug( "MediaWiki: generating table of contents from the sections element." );
     MediaWikiSectionsParser parser;
     parser.generateTableOfContents( sectionsElement );
     articleString.replace( emptyTocPos, emptyTocIndicator.size(), parser.tableOfContents );
@@ -343,17 +342,17 @@ bool MediaWikiSectionsParser::addListLevel( QString const & levelString )
   int const level = levelString.toInt( &convertedToInt );
 
   if ( !convertedToInt ) {
-    gdWarning( "MediaWiki: sections level is not an integer: %s", levelString.toUtf8().constData() );
+    qWarning( "MediaWiki: sections level is not an integer: %s", levelString.toUtf8().constData() );
     return false;
   }
   if ( level <= 0 ) {
-    gdWarning( "MediaWiki: unsupported nonpositive sections level: %s", levelString.toUtf8().constData() );
+    qWarning( "MediaWiki: unsupported nonpositive sections level: %s", levelString.toUtf8().constData() );
     return false;
   }
   if ( level > previousLevel + 1 ) {
-    gdWarning( "MediaWiki: unsupported sections level increase by more than one: from %d to %s",
-               previousLevel,
-               levelString.toUtf8().constData() );
+    qWarning( "MediaWiki: unsupported sections level increase by more than one: from %d to %s",
+              previousLevel,
+              levelString.toUtf8().constData() );
     return false;
   }
 
@@ -466,7 +465,7 @@ MediaWikiArticleRequest::MediaWikiArticleRequest( wstring const & str,
 
 void MediaWikiArticleRequest::addQuery( QNetworkAccessManager & mgr, wstring const & str )
 {
-  gdDebug( "MediaWiki: requesting article %s\n", QString::fromStdU32String( str ).toUtf8().data() );
+  qDebug( "MediaWiki: requesting article %s", QString::fromStdU32String( str ).toUtf8().data() );
 
   QUrl reqUrl( url + "/api.php?action=parse&prop=text|revid|sections&format=xml&redirects" );
 
@@ -490,7 +489,7 @@ void MediaWikiArticleRequest::addQuery( QNetworkAccessManager & mgr, wstring con
 
 void MediaWikiArticleRequest::requestFinished( QNetworkReply * r )
 {
-  GD_DPRINTF( "Finished.\n" );
+  qDebug( "Finished." );
 
   if ( isFinished() ) { // Was cancelled
     return;
@@ -693,7 +692,7 @@ void MediaWikiArticleRequest::requestFinished( QNetworkReply * r )
           }
         }
       }
-      GD_DPRINTF( "done.\n" );
+      qDebug( "done." );
     }
     else {
       setErrorString( netReply->errorString() );

src/dict/sdict.cc

@@ -6,15 +6,14 @@
 #include "decompress.hh"
 #include "folding.hh"
 #include "ftshelpers.hh"
-#include "gddebug.hh"
 #include "htmlescape.hh"
 #include "langcoder.hh"
 #include "sdict.hh"
 #include "utf8.hh"
 #include <map>
 #include <QAtomicInt>
+#include <QDir>
 #include <QRegularExpression>
-#include <QSemaphore>
 #include <QString>
 #include <set>
 #include <string>
@@ -223,7 +222,7 @@ void SdictDictionary::loadIcon() noexcept
 
 string SdictDictionary::convert( string const & in )
 {
-  //    GD_DPRINTF( "Source>>>>>>>>>>: %s\n\n\n", in.c_str() );
+  //    qDebug( "Source>>>>>>>>>>: %s\n\n", in.c_str() );
 
   string inConverted;
 
@@ -374,14 +373,14 @@ void SdictDictionary::makeFTSIndex( QAtomicInt & isCancelled )
   }
 
 
-  gdDebug( "SDict: Building the full-text index for dictionary: %s\n", getName().c_str() );
+  qDebug( "SDict: Building the full-text index for dictionary: %s", getName().c_str() );
 
   try {
     FtsHelpers::makeFTSIndex( this, isCancelled );
     FTS_index_completed.ref();
   }
   catch ( std::exception & ex ) {
-    gdWarning( "SDict: Failed building full-text search index for \"%s\", reason: %s\n", getName().c_str(), ex.what() );
+    qWarning( "SDict: Failed building full-text search index for \"%s\", reason: %s", getName().c_str(), ex.what() );
     QFile::remove( ftsIdxName.c_str() );
   }
 }
@@ -402,7 +401,7 @@ void SdictDictionary::getArticleText( uint32_t articleAddress, QString & headwor
     }
   }
   catch ( std::exception & ex ) {
-    gdWarning( "SDict: Failed retrieving article from \"%s\", reason: %s\n", getName().c_str(), ex.what() );
+    qWarning( "SDict: Failed retrieving article from \"%s\", reason: %s", getName().c_str(), ex.what() );
   }
 }
 
@@ -526,7 +525,7 @@ void SdictArticleRequest::run()
       articlesIncluded.insert( x.articleOffset );
     }
     catch ( std::exception & ex ) {
-      gdWarning( "SDict: Failed loading article from \"%s\", reason: %s\n", dict.getName().c_str(), ex.what() );
+      qWarning( "SDict: Failed loading article from \"%s\", reason: %s", dict.getName().c_str(), ex.what() );
     }
   }
 
@@ -637,7 +636,7 @@ QString const & SdictDictionary::getDescription()
       QObject::tr( "Version: %1%2" ).arg( QString::fromUtf8( str.c_str(), str.size() ) ).arg( "\n\n" );
   }
   catch ( std::exception & ex ) {
-    gdWarning( "SDict: Failed description reading for \"%s\", reason: %s\n", getName().c_str(), ex.what() );
+    qWarning( "SDict: Failed description reading for \"%s\", reason: %s", getName().c_str(), ex.what() );
   }
 
   if ( dictionaryDescription.isEmpty() ) {
@@ -673,7 +672,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
 
     if ( Dictionary::needToRebuildIndex( dictFiles, indexFile ) || indexIsOldOrBad( indexFile ) ) {
       try {
-        gdDebug( "SDict: Building the index for dictionary: %s\n", fileName.c_str() );
+        qDebug( "SDict: Building the index for dictionary: %s", fileName.c_str() );
 
         File::Index df( fileName, QIODevice::ReadOnly );
 
@@ -681,7 +680,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
 
         df.read( &dictHeader, sizeof( dictHeader ) );
         if ( strncmp( dictHeader.signature, "sdct", 4 ) ) {
-          gdWarning( "File \"%s\" is not valid SDictionary file", fileName.c_str() );
+          qWarning( "File \"%s\" is not valid SDictionary file", fileName.c_str() );
           continue;
         }
         int compression = dictHeader.compression & 0x0F;
@@ -781,11 +780,11 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
         idx.write( &idxHeader, sizeof( idxHeader ) );
       }
       catch ( std::exception & e ) {
-        gdWarning( "Sdictionary dictionary indexing failed: %s, error: %s\n", fileName.c_str(), e.what() );
+        qWarning( "Sdictionary dictionary indexing failed: %s, error: %s", fileName.c_str(), e.what() );
         continue;
       }
       catch ( ... ) {
-        qWarning( "Sdictionary dictionary indexing failed\n" );
+        qWarning( "Sdictionary dictionary indexing failed" );
         continue;
       }
     } // if need to rebuild
@@ -793,7 +792,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
       dictionaries.push_back( std::make_shared< SdictDictionary >( dictId, indexFile, dictFiles ) );
     }
     catch ( std::exception & e ) {
-      gdWarning( "Sdictionary dictionary initializing failed: %s, error: %s\n", fileName.c_str(), e.what() );
+      qWarning( "Sdictionary dictionary initializing failed: %s, error: %s", fileName.c_str(), e.what() );
     }
   }
   return dictionaries;

src/dict/slob.cc

@@ -6,29 +6,25 @@
 #include "btreeidx.hh"
 
 #include "folding.hh"
-#include "gddebug.hh"
 #include "utf8.hh"
 #include "decompress.hh"
 #include "langcoder.hh"
-#include "wstring_qt.hh"
 #include "ftshelpers.hh"
 #include "htmlescape.hh"
 #include "filetype.hh"
 #include "tiff.hh"
 #include "utils.hh"
-
 #include "iconv.hh"
-
 #include <QString>
+#include <QStringBuilder>
 #include <QFile>
 #include <QFileInfo>
 #include <QDir>
 #include <QMap>
 #include <QProcess>
 #include <QList>
-
+#include <QtEndian>
 #include <QRegularExpression>
-
 #include <string>
 #include <vector>
 #include <utility>
@@ -939,7 +935,7 @@ void SlobDictionary::makeFTSIndex( QAtomicInt & isCancelled )
   }
 
 
-  gdDebug( "Slob: Building the full-text index for dictionary: %s\n", getName().c_str() );
+  qDebug( "Slob: Building the full-text index for dictionary: %s", getName().c_str() );
 
   try {
     const auto slob_dic = std::make_unique< SlobDictionary >( getId(), idxFileName, getDictionaryFilenames() );
@@ -947,7 +943,7 @@ void SlobDictionary::makeFTSIndex( QAtomicInt & isCancelled )
     FTS_index_completed.ref();
   }
   catch ( std::exception & ex ) {
-    gdWarning( "Slob: Failed building full-text search index for \"%s\", reason: %s\n", getName().c_str(), ex.what() );
+    qWarning( "Slob: Failed building full-text search index for \"%s\", reason: %s", getName().c_str(), ex.what() );
     QFile::remove( ftsIdxName.c_str() );
   }
 }
@@ -977,7 +973,7 @@ void SlobDictionary::getArticleText( uint32_t articleAddress, QString & headword
     }
   }
   catch ( std::exception & ex ) {
-    gdWarning( "Slob: Failed retrieving article from \"%s\", reason: %s\n", getName().c_str(), ex.what() );
+    qWarning( "Slob: Failed retrieving article from \"%s\", reason: %s", getName().c_str(), ex.what() );
   }
 }
 
@@ -1225,10 +1221,10 @@ void SlobResourceRequest::run()
     hasAnyData = true;
   }
   catch ( std::exception & ex ) {
-    gdWarning( "SLOB: Failed loading resource \"%s\" from \"%s\", reason: %s\n",
-               resourceName.c_str(),
-               dict.getName().c_str(),
-               ex.what() );
+    qWarning( "SLOB: Failed loading resource \"%s\" from \"%s\", reason: %s",
+              resourceName.c_str(),
+              dict.getName().c_str(),
+              ex.what() );
     // Resource not loaded -- we don't set the hasAnyData flag then
   }
 
@@ -1271,7 +1267,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
       if ( Dictionary::needToRebuildIndex( dictFiles, indexFile ) || indexIsOldOrBad( indexFile ) ) {
         SlobFile sf;
 
-        gdDebug( "Slob: Building the index for dictionary: %s\n", fileName.c_str() );
+        qDebug( "Slob: Building the index for dictionary: %s", fileName.c_str() );
 
         sf.open( firstName );
 
@@ -1365,11 +1361,11 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
       dictionaries.push_back( std::make_shared< SlobDictionary >( dictId, indexFile, dictFiles ) );
     }
     catch ( std::exception & e ) {
-      gdWarning( "Slob dictionary initializing failed: %s, error: %s\n", fileName.c_str(), e.what() );
+      qWarning( "Slob dictionary initializing failed: %s, error: %s", fileName.c_str(), e.what() );
       continue;
     }
     catch ( ... ) {
-      qWarning( "Slob dictionary initializing failed\n" );
+      qWarning( "Slob dictionary initializing failed" );
       continue;
     }
   }

src/dict/sources.cc

@@ -524,8 +524,8 @@ bool MediaWikisModel::setData( QModelIndex const & index, const QVariant & value
   }
 
   if ( role == Qt::CheckStateRole && !index.column() ) {
-    //GD_DPRINTF( "type = %d\n", (int)value.type() );
-    //GD_DPRINTF( "value = %d\n", (int)value.toInt() );
+    //qDebug( "type = %d", (int)value.type() );
+    //qDebug( "value = %d", (int)value.toInt() );
 
     // XXX it seems to be always passing Int( 2 ) as a value, so we just toggle
     mediawikis[ index.row() ].enabled = !mediawikis[ index.row() ].enabled;
@@ -713,8 +713,8 @@ bool WebSitesModel::setData( QModelIndex const & index, const QVariant & value,
   }
 
   if ( role == Qt::CheckStateRole && !index.column() ) {
-    //GD_DPRINTF( "type = %d\n", (int)value.type() );
-    //GD_DPRINTF( "value = %d\n", (int)value.toInt() );
+    //qDebug( "type = %d", (int)value.type() );
+    //qDebug( "value = %d", (int)value.toInt() );
 
     // XXX it seems to be always passing Int( 2 ) as a value, so we just toggle
     webSites[ index.row() ].enabled = !webSites[ index.row() ].enabled;

src/dict/stardict.cc

@@ -10,37 +10,30 @@
 #include "xdxf2html.hh"
 #include "htmlescape.hh"
 #include "langcoder.hh"
-#include "gddebug.hh"
-
 #include "filetype.hh"
 #include "indexedzip.hh"
 #include "tiff.hh"
 #include "ftshelpers.hh"
 #include "audiolink.hh"
-
 #include <zlib.h>
 #include <map>
 #include <set>
 #include <string>
+#include <QString>
+#include <QAtomicInt>
+#include <QDomDocument>
+#include "ufile.hh"
+#include "utils.hh"
+#include <QRegularExpression>
+#include "globalregex.hh"
+#include <QDir>
+#include <stdlib.h>
 
 #ifndef Q_OS_WIN
   #include <arpa/inet.h>
 #else
   #include <winsock.h>
 #endif
-#include <stdlib.h>
-
-
-#include <QString>
-#include <QSemaphore>
-#include <QAtomicInt>
-#include <QStringList>
-#include <QDomDocument>
-#include "ufile.hh"
-#include "utils.hh"
-
-#include <QRegularExpression>
-#include "globalregex.hh"
 
 namespace Stardict {
 
@@ -937,9 +930,7 @@ void StardictDictionary::loadArticle( uint32_t address, string & headword, strin
         entrySize = size;
       }
       else if ( !size ) {
-        gdWarning( "Stardict: short entry for the word %s encountered in \"%s\".\n",
-                   headword.c_str(),
-                   getName().c_str() );
+        qWarning( "Stardict: short entry for the word %s encountered in \"%s\".", headword.c_str(), getName().c_str() );
         break;
       }
 
@@ -952,9 +943,9 @@ void StardictDictionary::loadArticle( uint32_t address, string & headword, strin
         }
 
         if ( size < entrySize ) {
-          gdWarning( "Stardict: malformed entry for the word %s encountered in \"%s\".\n",
-                     headword.c_str(),
-                     getName().c_str() );
+          qWarning( "Stardict: malformed entry for the word %s encountered in \"%s\".",
+                    headword.c_str(),
+                    getName().c_str() );
           break;
         }
 
@@ -972,9 +963,9 @@ void StardictDictionary::loadArticle( uint32_t address, string & headword, strin
 
         if ( !entrySizeKnown ) {
           if ( size < sizeof( uint32_t ) ) {
-            gdWarning( "Stardict: malformed entry for the word %s encountered in \"%s\".\n",
-                       headword.c_str(),
-                       getName().c_str() );
+            qWarning( "Stardict: malformed entry for the word %s encountered in \"%s\".",
+                      headword.c_str(),
+                      getName().c_str() );
             break;
           }
 
@@ -987,9 +978,9 @@ void StardictDictionary::loadArticle( uint32_t address, string & headword, strin
         }
 
         if ( size < entrySize ) {
-          gdWarning( "Stardict: malformed entry for the word %s encountered in \"%s\".\n",
-                     headword.c_str(),
-                     getName().c_str() );
+          qWarning( "Stardict: malformed entry for the word %s encountered in \"%s\".",
+                    headword.c_str(),
+                    getName().c_str() );
           break;
         }
 
@@ -999,10 +990,10 @@ void StardictDictionary::loadArticle( uint32_t address, string & headword, strin
         size -= entrySize;
       }
       else {
-        gdWarning( "Stardict: non-alpha entry type 0x%x for the word %s encountered in \"%s\".\n",
-                   type,
-                   headword.c_str(),
-                   getName().c_str() );
+        qWarning( "Stardict: non-alpha entry type 0x%x for the word %s encountered in \"%s\".",
+                  type,
+                  headword.c_str(),
+                  getName().c_str() );
         break;
       }
     }
@@ -1015,9 +1006,9 @@ void StardictDictionary::loadArticle( uint32_t address, string & headword, strin
         size_t len = strlen( ptr + 1 );
 
         if ( size < len + 2 ) {
-          gdWarning( "Stardict: malformed entry for the word %s encountered in \"%s\".\n",
-                     headword.c_str(),
-                     getName().c_str() );
+          qWarning( "Stardict: malformed entry for the word %s encountered in \"%s\".",
+                    headword.c_str(),
+                    getName().c_str() );
           break;
         }
 
@@ -1029,9 +1020,9 @@ void StardictDictionary::loadArticle( uint32_t address, string & headword, strin
       else if ( isupper( *ptr ) ) {
         // An entry which havs its size before contents
         if ( size < sizeof( uint32_t ) + 1 ) {
-          gdWarning( "Stardict: malformed entry for the word %s encountered in \"%s\".\n",
-                     headword.c_str(),
-                     getName().c_str() );
+          qWarning( "Stardict: malformed entry for the word %s encountered in \"%s\".",
+                    headword.c_str(),
+                    getName().c_str() );
           break;
         }
 
@@ -1042,9 +1033,9 @@ void StardictDictionary::loadArticle( uint32_t address, string & headword, strin
         entrySize = ntohl( entrySize );
 
         if ( size < sizeof( uint32_t ) + 1 + entrySize ) {
-          gdWarning( "Stardict: malformed entry for the word %s encountered in \"%s\".\n",
-                     headword.c_str(),
-                     getName().c_str() );
+          qWarning( "Stardict: malformed entry for the word %s encountered in \"%s\".",
+                    headword.c_str(),
+                    getName().c_str() );
           break;
         }
 
@@ -1054,10 +1045,10 @@ void StardictDictionary::loadArticle( uint32_t address, string & headword, strin
         size -= sizeof( uint32_t ) + 1 + entrySize;
       }
       else {
-        gdWarning( "Stardict: non-alpha entry type 0x%x for the word %s encountered in \"%s\".\n",
-                   (unsigned)*ptr,
-                   headword.c_str(),
-                   getName().c_str() );
+        qWarning( "Stardict: non-alpha entry type 0x%x for the word %s encountered in \"%s\".",
+                  (unsigned)*ptr,
+                  headword.c_str(),
+                  getName().c_str() );
         break;
       }
     }
@@ -1132,16 +1123,14 @@ void StardictDictionary::makeFTSIndex( QAtomicInt & isCancelled )
   }
 
 
-  gdDebug( "Stardict: Building the full-text index for dictionary: %s\n", getName().c_str() );
+  qDebug( "Stardict: Building the full-text index for dictionary: %s", getName().c_str() );
 
   try {
     FtsHelpers::makeFTSIndex( this, isCancelled );
     FTS_index_completed.ref();
   }
   catch ( std::exception & ex ) {
-    gdWarning( "Stardict: Failed building full-text search index for \"%s\", reason: %s\n",
-               getName().c_str(),
-               ex.what() );
+    qWarning( "Stardict: Failed building full-text search index for \"%s\", reason: %s", getName().c_str(), ex.what() );
     QFile::remove( ftsIdxName.c_str() );
   }
 }
@@ -1157,7 +1146,7 @@ void StardictDictionary::getArticleText( uint32_t articleAddress, QString & head
     text = Html::unescape( QString::fromStdString( articleStr ) );
   }
   catch ( std::exception & ex ) {
-    gdWarning( "Stardict: Failed retrieving article from \"%s\", reason: %s\n", getName().c_str(), ex.what() );
+    qWarning( "Stardict: Failed retrieving article from \"%s\", reason: %s", getName().c_str(), ex.what() );
   }
 }
 
@@ -1570,7 +1559,7 @@ void StardictResourceRequest::run()
     string n =
       dict.getContainingFolder().toStdString() + Utils::Fs::separator() + "res" + Utils::Fs::separator() + resourceName;
 
-    GD_DPRINTF( "startdict resource name is %s\n", n.c_str() );
+    qDebug( "startdict resource name is %s", n.c_str() );
 
     try {
       QMutexLocker _( &dataMutex );
@@ -1647,10 +1636,10 @@ void StardictResourceRequest::run()
     hasAnyData = true;
   }
   catch ( std::exception & ex ) {
-    gdWarning( "Stardict: Failed loading resource \"%s\" for \"%s\", reason: %s\n",
-               resourceName.c_str(),
-               dict.getName().c_str(),
-               ex.what() );
+    qWarning( "Stardict: Failed loading resource \"%s\" for \"%s\", reason: %s",
+              resourceName.c_str(),
+              dict.getName().c_str(),
+              ex.what() );
     // Resource not loaded -- we don't set the hasAnyData flag then
   }
   catch ( ... ) {
@@ -1732,7 +1721,7 @@ static void handleIdxSynFile( string const & fileName,
     size_t wordLen = strlen( ptr );
 
     if ( ptr + wordLen + 1 + ( isSynFile ? sizeof( uint32_t ) : sizeof( uint32_t ) * 2 ) > &image.back() ) {
-      GD_FDPRINTF( stderr, "Warning: sudden end of file %s\n", fileName.c_str() );
+      qWarning( "Warning: sudden end of file %s", fileName.c_str() );
       break;
     }
 
@@ -1822,7 +1811,7 @@ static void handleIdxSynFile( string const & fileName,
     }
   }
 
-  GD_DPRINTF( "%u entires made\n", (unsigned)indexedWords.size() );
+  qDebug( "%u entires made", (unsigned)indexedWords.size() );
 }
 
 
@@ -1874,7 +1863,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
 
         Ifo ifo( QString::fromStdString( fileName ) );
 
-        gdDebug( "Stardict: Building the index for dictionary: %s\n", ifo.bookname.c_str() );
+        qDebug( "Stardict: Building the index for dictionary: %s", ifo.bookname.c_str() );
 
         if ( ifo.idxoffsetbits == 64 ) {
           throw ex64BitsNotSupported();
@@ -1886,20 +1875,20 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
 
         if ( synFileName.empty() ) {
           if ( ifo.synwordcount ) {
-            GD_DPRINTF(
+            qDebug(
               "Warning: dictionary has synwordcount specified, but no "
               "corresponding .syn file was found\n" );
             ifo.synwordcount = 0; // Pretend it wasn't there
           }
         }
         else if ( !ifo.synwordcount ) {
-          GD_DPRINTF( "Warning: ignoring .syn file %s, since there's no synwordcount in .ifo specified\n",
-                      synFileName.c_str() );
+          qDebug( "Warning: ignoring .syn file %s, since there's no synwordcount in .ifo specified",
+                  synFileName.c_str() );
         }
 
 
-        GD_DPRINTF( "bookname = %s\n", ifo.bookname.c_str() );
-        GD_DPRINTF( "wordcount = %u\n", ifo.wordcount );
+        qDebug( "bookname = %s", ifo.bookname.c_str() );
+        qDebug( "wordcount = %u", ifo.wordcount );
 
         initializing.indexingDictionary( ifo.bookname );
 
@@ -1984,7 +1973,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
         // If there was a zip file, index it too
 
         if ( zipFileName.size() ) {
-          GD_DPRINTF( "Indexing zip file\n" );
+          qDebug( "Indexing zip file" );
 
           idxHeader.hasZipFile = 1;
 
@@ -2023,7 +2012,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
       dictionaries.push_back( std::make_shared< StardictDictionary >( dictId, indexFile, dictFiles ) );
     }
     catch ( std::exception & e ) {
-      gdWarning( "Stardict dictionary initializing failed: %s, error: %s\n", fileName.c_str(), e.what() );
+      qWarning( "Stardict dictionary initializing failed: %s, error: %s", fileName.c_str(), e.what() );
     }
   }
 

src/dict/transliteration/README.md

@@ -0,0 +1 @@
+Translit

src/dict/transliteration/belarusian.cc

@@ -1,7 +1,7 @@
 /* This file is (c) 2013 Maksim Tamkovicz <quendimax@gmail.com>
  * Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
 
-#include "belarusiantranslit.hh"
+#include "belarusian.hh"
 #include "transliteration.hh"
 #include <QCoreApplication>
 

src/dict/transliteration/belarusian.hh

@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <vector>
 #include "dictionary.hh"
 
 // Support for Belarusian transliteration

src/dict/transliteration/chinese.cc

@@ -4,16 +4,12 @@
 #include "chinese.hh"
 #include <stdexcept>
 #include <QCoreApplication>
-// #ifdef Q_OS_MAC
 #include <opencc/opencc.h>
-// #endif
-// #include <opencc/SimpleConverter.hpp>
 #include "folding.hh"
-#include "gddebug.hh"
 #include "transliteration.hh"
 #include "utf8.hh"
 
-namespace Chinese {
+namespace ChineseTranslit {
 
 class CharacterConversionDictionary: public Transliteration::BaseTransliterationDictionary
 {
@@ -45,18 +41,18 @@ CharacterConversionDictionary::CharacterConversionDictionary( std::string const
     // #ifdef Q_OS_MAC
     converter = opencc_open( openccConfig.toLocal8Bit().constData() );
     if ( converter == reinterpret_cast< opencc_t >( -1 ) ) {
-      gdWarning( "CharacterConversionDictionary: failed to initialize OpenCC from config %s: %s\n",
-                 openccConfig.toLocal8Bit().constData(),
-                 opencc_error() );
+      qWarning( "CharacterConversionDictionary: failed to initialize OpenCC from config %s: %s",
+                openccConfig.toLocal8Bit().constData(),
+                opencc_error() );
     }
     // #else
     //     converter = new opencc::SimpleConverter( openccConfig.toLocal8Bit().constData() );
     // #endif
   }
   catch ( std::runtime_error & e ) {
-    gdWarning( "CharacterConversionDictionary: failed to initialize OpenCC from config %s: %s\n",
-               openccConfig.toLocal8Bit().constData(),
-               e.what() );
+    qWarning( "CharacterConversionDictionary: failed to initialize OpenCC from config %s: %s",
+              openccConfig.toLocal8Bit().constData(),
+              e.what() );
   }
 }
 
@@ -91,7 +87,7 @@ std::vector< gd::wstring > CharacterConversionDictionary::getAlternateWritings(
           opencc_convert_utf8_free( tmp );
         }
         else {
-          gdWarning( "OpenCC: conversion failed %s\n", opencc_error() );
+          qWarning( "OpenCC: conversion failed %s", opencc_error() );
         }
       }
       // #else
@@ -100,7 +96,7 @@ std::vector< gd::wstring > CharacterConversionDictionary::getAlternateWritings(
       result = Utf8::decode( output );
     }
     catch ( std::exception & ex ) {
-      gdWarning( "OpenCC: conversion failed %s\n", ex.what() );
+      qWarning( "OpenCC: conversion failed %s", ex.what() );
     }
 
     if ( !result.empty() && result != folded ) {
@@ -162,4 +158,4 @@ std::vector< sptr< Dictionary::Class > > makeDictionaries( Config::Chinese const
   return result;
 }
 
-} // namespace Chinese
+} // namespace ChineseTranslit

src/dict/transliteration/chinese.hh

@@ -3,12 +3,10 @@
 
 #pragma once
 
-#include <map>
-#include "config.hh"
 #include "dictionary.hh"
 
 /// Chinese character conversion support.
-namespace Chinese {
+namespace ChineseTranslit {
 
 std::vector< sptr< Dictionary::Class > > makeDictionaries( Config::Chinese const & );
 }

src/dict/transliteration/custom.cc

@@ -1,4 +1,4 @@
-#include "customtransliteration.hh"
+#include "custom.hh"
 #include "dictionary.hh"
 #include <QCoreApplication>
 

src/dict/transliteration/custom.hh

@@ -1,7 +1,6 @@
 #pragma once
 
 
-#include <vector>
 #include "transliteration.hh"
 
 // Support for Belarusian transliteration

src/dict/transliteration/greek.cc

@@ -1,7 +1,7 @@
 /* This file is (c) 2010 Jennie Petoumenou <epetoumenou@gmail.com>
  * Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
 
-#include "greektranslit.hh"
+#include "greek.hh"
 #include "transliteration.hh"
 #include <QCoreApplication>
 

src/dict/transliteration/romaji.cc

@@ -1,7 +1,9 @@
 #include "romaji.hh"
 #include <QCoreApplication>
 
-namespace Romaji {
+namespace RomajiTranslit {
+
+using std::vector;
 
 class HepburnHiragana: public Transliteration::Table
 {
@@ -375,4 +377,4 @@ vector< sptr< Dictionary::Class > > makeDictionaries( Config::Romaji const & r )
   return result;
 }
 
-} // namespace Romaji
+} // namespace RomajiTranslit

src/dict/transliteration/romaji.hh

@@ -4,12 +4,9 @@
 #pragma once
 
 #include "transliteration.hh"
-#include "config.hh"
 
 /// Japanese romanization (Romaji) support.
-namespace Romaji {
+namespace RomajiTranslit {
 
-using std::vector;
-
-vector< sptr< Dictionary::Class > > makeDictionaries( Config::Romaji const & );
-} // namespace Romaji
+std::vector< sptr< Dictionary::Class > > makeDictionaries( Config::Romaji const & );
+} // namespace RomajiTranslit

src/dict/transliteration/russian.cc

@@ -1,7 +1,7 @@
 /* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
  * Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
 
-#include "russiantranslit.hh"
+#include "russian.hh"
 #include "transliteration.hh"
 #include <QCoreApplication>
 

src/dict/transliteration/transliteration.cc

@@ -4,7 +4,6 @@
 #include "transliteration.hh"
 #include "utf8.hh"
 #include "folding.hh"
-#include "gddebug.hh"
 
 namespace Transliteration {
 
@@ -61,7 +60,7 @@ sptr< Dictionary::WordSearchRequest > BaseTransliterationDictionary::findHeadwor
 
   vector< wstring > alts = getAlternateWritings( str );
 
-  GD_DPRINTF( "alts = %u\n", (unsigned)alts.size() );
+  qDebug( "alts = %u", (unsigned)alts.size() );
 
   for ( const auto & alt : alts ) {
     result->getMatches().push_back( alt );

src/dict/utils/indexedzip.cc

@@ -4,7 +4,6 @@
 #include "indexedzip.hh"
 #include "zipfile.hh"
 #include <zlib.h>
-#include "gddebug.hh"
 #include "utf8.hh"
 #include "iconv.hh"
 #include "wstring_qt.hh"
@@ -67,7 +66,7 @@ bool IndexedZip::loadFile( uint32_t offset, vector< char > & data )
   if ( !ZipFile::readLocalHeader( zip, header ) ) {
     vector< string > zipFileNames;
     zip.getFilenames( zipFileNames );
-    GD_DPRINTF( "Failed to load header" );
+    qDebug( "Failed to load header" );
     string filename;
     if ( zip.getCurrentFile() < zipFileNames.size() ) {
       filename = zipFileNames.at( zip.getCurrentFile() );
@@ -81,7 +80,7 @@ bool IndexedZip::loadFile( uint32_t offset, vector< char > & data )
 
   switch ( header.compressionMethod ) {
     case ZipFile::Uncompressed:
-      GD_DPRINTF( "Uncompressed" );
+      qDebug( "Uncompressed" );
       data.resize( header.uncompressedSize );
       return (size_t)zip.read( &data.front(), data.size() ) == data.size();
 
@@ -111,7 +110,7 @@ bool IndexedZip::loadFile( uint32_t offset, vector< char > & data )
       }
 
       if ( inflate( &stream, Z_FINISH ) != Z_STREAM_END ) {
-        GD_DPRINTF( "Not zstream end!" );
+        qDebug( "Not zstream end!" );
 
         data.clear();
 
@@ -156,7 +155,7 @@ bool IndexedZip::indexFile( BtreeIndexing::IndexedWords & zipFileNames, quint32
 
   while ( ZipFile::readNextEntry( zip, entry ) ) {
     if ( entry.compressionMethod == ZipFile::Unsupported ) {
-      qWarning( "Zip warning: compression method unsupported -- skipping file \"%s\"\n", entry.fileName.data() );
+      qWarning( "Zip warning: compression method unsupported -- skipping file \"%s\"", entry.fileName.data() );
       continue;
     }
 

src/dict/website.cc

@@ -8,7 +8,6 @@
 #include <QTextCodec>
 #include <QDir>
 #include <QFileInfo>
-#include "gddebug.hh"
 #include "globalbroadcaster.hh"
 #include "fmt/compile.h"
 
@@ -300,9 +299,9 @@ void WebSiteArticleRequest::requestFinished( QNetworkReply * r )
   }
   else {
     if ( netReply->url().scheme() == "file" ) {
-      gdWarning( "WebSites: Failed loading article from \"%s\", reason: %s\n",
-                 dictPtr->getName().c_str(),
-                 netReply->errorString().toUtf8().data() );
+      qWarning( "WebSites: Failed loading article from \"%s\", reason: %s",
+                dictPtr->getName().c_str(),
+                netReply->errorString().toUtf8().data() );
     }
     else {
       setErrorString( netReply->errorString() );

src/dict/xdxf.cc

@@ -8,7 +8,6 @@
 #include "chunkedstorage.hh"
 #include "dictzip.hh"
 #include "htmlescape.hh"
-
 #include <map>
 #include <set>
 #include <string>
@@ -16,27 +15,19 @@
 #include <list>
 #include <wctype.h>
 #include <stdlib.h>
-#include "gddebug.hh"
-#include "wstring_qt.hh"
 #include "xdxf2html.hh"
 #include "ufile.hh"
-#include "dictzip.hh"
 #include "langcoder.hh"
 #include "indexedzip.hh"
 #include "filetype.hh"
 #include "tiff.hh"
 #include "ftshelpers.hh"
-
-
 #include <QIODevice>
 #include <QXmlStreamReader>
-#include <QTextDocument>
 #include <QFileInfo>
 #include <QDir>
 #include <QPainter>
 #include <QRegularExpression>
-#include <QSemaphore>
-#include <QThreadPool>
 #include <QAtomicInt>
 
 #include "utils.hh"
@@ -385,14 +376,14 @@ void XdxfDictionary::makeFTSIndex( QAtomicInt & isCancelled )
   }
 
 
-  gdDebug( "Xdxf: Building the full-text index for dictionary: %s\n", getName().c_str() );
+  qDebug( "Xdxf: Building the full-text index for dictionary: %s", getName().c_str() );
 
   try {
     FtsHelpers::makeFTSIndex( this, isCancelled );
     FTS_index_completed.ref();
   }
   catch ( std::exception & ex ) {
-    gdWarning( "Xdxf: Failed building full-text search index for \"%s\", reason: %s\n", getName().c_str(), ex.what() );
+    qWarning( "Xdxf: Failed building full-text search index for \"%s\", reason: %s", getName().c_str(), ex.what() );
     QFile::remove( ftsIdxName.c_str() );
   }
 }
@@ -406,7 +397,7 @@ void XdxfDictionary::getArticleText( uint32_t articleAddress, QString & headword
     text = Html::unescape( QString::fromStdString( articleStr ) );
   }
   catch ( std::exception & ex ) {
-    gdWarning( "Xdxf: Failed retrieving article from \"%s\", reason: %s\n", getName().c_str(), ex.what() );
+    qWarning( "Xdxf: Failed retrieving article from \"%s\", reason: %s", getName().c_str(), ex.what() );
   }
 }
 
@@ -530,7 +521,7 @@ void XdxfArticleRequest::run()
       articlesIncluded.insert( x.articleOffset );
     }
     catch ( std::exception & ex ) {
-      gdWarning( "XDXF: Failed loading article from \"%s\", reason: %s\n", dict.getName().c_str(), ex.what() );
+      qWarning( "XDXF: Failed loading article from \"%s\", reason: %s", dict.getName().c_str(), ex.what() );
     }
   }
 
@@ -871,7 +862,7 @@ void indexArticle( GzippedFile & gzFile,
 
       if ( words.empty() ) {
         // Nothing to index, this article didn't have any tags
-        gdWarning( "No <k> tags found in an article at offset 0x%x, article skipped.\n", (unsigned)articleOffset );
+        qWarning( "No <k> tags found in an article at offset 0x%x, article skipped.", (unsigned)articleOffset );
       }
       else {
         // Add an entry
@@ -891,7 +882,7 @@ void indexArticle( GzippedFile & gzFile,
         // Add also first header - it's needed for full-text search
         chunks.addToBlock( words.begin()->toUtf8().data(), words.begin()->toUtf8().length() + 1 );
 
-        //        GD_DPRINTF( "%x: %s\n", articleOffset, words.begin()->toUtf8().data() );
+        //        qDebug( "%x: %s", articleOffset, words.begin()->toUtf8().data() );
 
         // Add words to index
 
@@ -966,7 +957,7 @@ void XdxfResourceRequest::run()
 
   string n = dict.getContainingFolder().toStdString() + Utils::Fs::separator() + resourceName;
 
-  GD_DPRINTF( "xdxf resource name is %s\n", n.c_str() );
+  qDebug( "xdxf resource name is %s", n.c_str() );
 
   try {
     try {
@@ -1009,10 +1000,10 @@ void XdxfResourceRequest::run()
     hasAnyData = true;
   }
   catch ( std::exception & ex ) {
-    gdWarning( "XDXF: Failed loading resource \"%s\" for \"%s\", reason: %s\n",
-               resourceName.c_str(),
-               dict.getName().c_str(),
-               ex.what() );
+    qWarning( "XDXF: Failed loading resource \"%s\" for \"%s\", reason: %s",
+              resourceName.c_str(),
+              dict.getName().c_str(),
+              ex.what() );
     // Resource not loaded -- we don't set the hasAnyData flag then
   }
 
@@ -1066,7 +1057,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
       if ( Dictionary::needToRebuildIndex( dictFiles, indexFile ) || indexIsOldOrBad( indexFile ) ) {
         // Building the index
 
-        gdDebug( "Xdxf: Building the index for dictionary: %s\n", fileName.c_str() );
+        qDebug( "Xdxf: Building the index for dictionary: %s", fileName.c_str() );
 
         //initializing.indexingDictionary( nameFromFileName( dictFiles[ 0 ] ) );
 
@@ -1155,7 +1146,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
                       chunks.addToBlock( n.data(), n.size() );
                     }
                     else {
-                      GD_DPRINTF( "Warning: duplicate full_name in %s\n", dictFiles[ 0 ].c_str() );
+                      qDebug( "Warning: duplicate full_name in %s", dictFiles[ 0 ].c_str() );
                     }
                   }
                   else if ( stream.name() == u"description" ) {
@@ -1179,7 +1170,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
                       chunks.addToBlock( n.data(), n.size() );
                     }
                     else {
-                      GD_DPRINTF( "Warning: duplicate description in %s\n", dictFiles[ 0 ].c_str() );
+                      qDebug( "Warning: duplicate description in %s", dictFiles[ 0 ].c_str() );
                     }
                   }
                   else if ( stream.name() == u"languages" ) {
@@ -1305,7 +1296,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
               // If there was a zip file, index it too
 
               if ( zipFileName.size() ) {
-                GD_DPRINTF( "Indexing zip file\n" );
+                qDebug( "Indexing zip file" );
 
                 idxHeader.hasZipFile = 1;
 
@@ -1356,17 +1347,17 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
         }
 
         if ( stream.hasError() ) {
-          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() );
+          qWarning( "%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() );
         }
       }
 
       dictionaries.push_back( std::make_shared< XdxfDictionary >( dictId, indexFile, dictFiles ) );
     }
     catch ( std::exception & e ) {
-      gdWarning( "Xdxf dictionary initializing failed: %s, error: %s\n", fileName.c_str(), e.what() );
+      qWarning( "Xdxf dictionary initializing failed: %s, error: %s", fileName.c_str(), e.what() );
     }
   }
 

src/dict/xdxf2html.cc

@@ -3,7 +3,6 @@
 
 #include "xdxf2html.hh"
 #include <QtXml>
-#include "gddebug.hh"
 #include "utf8.hh"
 #include "wstring_qt.hh"
 #include "folding.hh"
@@ -131,21 +130,21 @@ string convert( string const & in,
 
 #if ( QT_VERSION < QT_VERSION_CHECK( 6, 5, 0 ) )
   if ( !dd.setContent( QByteArray( in_data.c_str() ), false, &errorStr, &errorLine, &errorColumn ) ) {
-    qWarning( "Xdxf2html error, xml parse failed: %s at %d,%d\n",
+    qWarning( "Xdxf2html error, xml parse failed: %s at %d,%d",
               errorStr.toLocal8Bit().constData(),
               errorLine,
               errorColumn );
-    gdWarning( "The input was: %s\n", in_data.c_str() );
+    qWarning( "The input was: %s", in_data.c_str() );
     return in;
   }
 #else
   auto setContentResult = dd.setContent( QByteArray::fromStdString( in_data ) );
   if ( !setContentResult ) {
-    qWarning( "Xdxf2html error, xml parse failed: %s at %lld,%lld\n",
+    qWarning( "Xdxf2html error, xml parse failed: %s at %lld,%lld",
               setContentResult.errorMessage.toStdString().c_str(),
               setContentResult.errorLine,
               setContentResult.errorColumn );
-    gdWarning( "The input was: %s\n", in_data.c_str() );
+    qWarning( "The input was: %s", in_data.c_str() );
     return in;
   }
 #endif

src/dict/zim.cc

@@ -5,9 +5,7 @@
 
   #include "zim.hh"
   #include "btreeidx.hh"
-
   #include "folding.hh"
-  #include "gddebug.hh"
   #include "utf8.hh"
   #include "langcoder.hh"
   #include "filetype.hh"
@@ -23,14 +21,12 @@
   #include <QAtomicInt>
   #include <QImage>
   #include <QDir>
-
   #include <QRegularExpression>
-
   #include <string>
   #include <set>
   #include <map>
   #include <algorithm>
-  #include <QtConcurrent>
+  #include <QtConcurrentRun>
   #include <utility>
   #include "globalregex.hh"
   #include <zim/zim.h>
@@ -287,7 +283,7 @@ void ZimDictionary::loadIcon() noexcept
     return;
   }
   catch ( zim::EntryNotFound & e ) {
-    gdDebug( "ZIM icon not loaded for: %s", dictionaryName.c_str() );
+    qDebug( "ZIM icon not loaded for: %s", dictionaryName.c_str() );
   }
 }
 
@@ -489,13 +485,13 @@ void ZimDictionary::makeFTSIndex( QAtomicInt & isCancelled )
     return;
   }
 
-  gdDebug( "Zim: Building the full-text index for dictionary: %s\n", getName().c_str() );
+  qDebug( "Zim: Building the full-text index for dictionary: %s", getName().c_str() );
   try {
     FtsHelpers::makeFTSIndex( this, isCancelled );
     FTS_index_completed.ref();
   }
   catch ( std::exception & ex ) {
-    gdWarning( "Zim: Failed building full-text search index for \"%s\", reason: %s\n", getName().c_str(), ex.what() );
+    qWarning( "Zim: Failed building full-text search index for \"%s\", reason: %s", getName().c_str(), ex.what() );
     QFile::remove( ftsIdxName.c_str() );
   }
 }
@@ -510,7 +506,7 @@ void ZimDictionary::getArticleText( uint32_t articleAddress, QString & headword,
     text = Html::unescape( QString::fromUtf8( articleText.data(), articleText.size() ) );
   }
   catch ( std::exception & ex ) {
-    gdWarning( "Zim: Failed retrieving article from \"%s\", reason: %s\n", getName().c_str(), ex.what() );
+    qWarning( "Zim: Failed retrieving article from \"%s\", reason: %s", getName().c_str(), ex.what() );
   }
 }
 
@@ -759,10 +755,10 @@ void ZimResourceRequest::run()
     hasAnyData = true;
   }
   catch ( std::exception & ex ) {
-    gdWarning( "ZIM: Failed loading resource \"%s\" from \"%s\", reason: %s\n",
-               resourceName.c_str(),
-               dict.getName().c_str(),
-               ex.what() );
+    qWarning( "ZIM: Failed loading resource \"%s\" from \"%s\", reason: %s",
+              resourceName.c_str(),
+              dict.getName().c_str(),
+              ex.what() );
     // Resource not loaded -- we don't set the hasAnyData flag then
   }
 
@@ -814,7 +810,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
     try {
       //only check zim file.
       if ( Dictionary::needToRebuildIndex( dictFiles, indexFile ) || indexIsOldOrBad( indexFile ) ) {
-        gdDebug( "Zim: Building the index for dictionary: %s\n", fileName.c_str() );
+        qDebug( "Zim: Building the index for dictionary: %s", fileName.c_str() );
 
         unsigned articleCount = df.getArticleCount();
         unsigned wordCount    = 0;
@@ -902,11 +898,11 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
       dictionaries.push_back( std::make_shared< ZimDictionary >( dictId, indexFile, dictFiles ) );
     }
     catch ( std::exception & e ) {
-      gdWarning( "Zim dictionary initializing failed: %s, error: %s\n", fileName.c_str(), e.what() );
+      qWarning( "Zim dictionary initializing failed: %s, error: %s", fileName.c_str(), e.what() );
       continue;
     }
     catch ( ... ) {
-      qWarning( "Zim dictionary initializing failed\n" );
+      qWarning( "Zim dictionary initializing failed" );
       continue;
     }
   }

src/dict/zipsounds.cc

@@ -10,7 +10,6 @@
 #include "audiolink.hh"
 #include "indexedzip.hh"
 #include "filetype.hh"
-#include "gddebug.hh"
 #include "chunkedstorage.hh"
 #include "htmlescape.hh"
 
@@ -400,7 +399,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
       string indexFile = indicesDir + dictId;
 
       if ( Dictionary::needToRebuildIndex( dictFiles, indexFile ) || indexIsOldOrBad( indexFile ) ) {
-        gdDebug( "Zips: Building the index for dictionary: %s\n", fileName.c_str() );
+        qDebug( "Zips: Building the index for dictionary: %s", fileName.c_str() );
 
         File::Index idx( indexFile, QIODevice::WriteOnly );
         IdxHeader idxHeader;
@@ -474,7 +473,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
       dictionaries.push_back( std::make_shared< ZipSoundsDictionary >( dictId, indexFile, dictFiles ) );
     }
     catch ( std::exception & e ) {
-      gdWarning( "Zipped sounds pack reading failed: %s, error: %s\n", fileName.c_str(), e.what() );
+      qWarning( "Zipped sounds pack reading failed: %s, error: %s", fileName.c_str(), e.what() );
     }
   }
 

src/externalviewer.cc

@@ -4,7 +4,6 @@
 #include <QDir>
 #include <QTimer>
 #include "externalviewer.hh"
-#include "gddebug.hh"
 
 ExternalViewer::ExternalViewer(
   const char * data, int size, QString const & extension, QString const & viewerCmdLine_, QObject * parent ):
@@ -26,7 +25,7 @@ ExternalViewer::ExternalViewer(
 
   tempFile.close();
 
-  GD_DPRINTF( "%s\n", tempFile.fileName().toLocal8Bit().data() );
+  qDebug( "%s", tempFile.fileName().toLocal8Bit().data() );
 }
 
 void ExternalViewer::start()

src/ftshelpers.cc

@@ -7,7 +7,6 @@
 #include "ftshelpers.hh"
 #include "wstring_qt.hh"
 #include "dictfile.hh"
-#include "gddebug.hh"
 #include "folding.hh"
 #include "utils.hh"
 
@@ -253,7 +252,7 @@ void FTSResultsRequest::run()
     qWarning() << e.get_description().c_str();
   }
   catch ( std::exception & ex ) {
-    gdWarning( "FTS: Failed full-text search for \"%s\", reason: %s\n", dict.getName().c_str(), ex.what() );
+    qWarning( "FTS: Failed full-text search for \"%s\", reason: %s", dict.getName().c_str(), ex.what() );
     // Results not loaded -- we don't set the hasAnyData flag then
   }
 

src/ftshelpers.hh

@@ -2,8 +2,7 @@
 
 #include <QString>
 #include <QList>
-#include <QtConcurrent>
-
+#include <QtConcurrentRun>
 #include "dict/dictionary.hh"
 #include "btreeidx.hh"
 #include "fulltextsearch.hh"

src/fulltextsearch.cc

@@ -1,14 +1,13 @@
 /* This file is (c) 2014 Abs62
  * Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
 
-#include "fulltextsearch.hh"
 #include "ftshelpers.hh"
-#include "gddebug.hh"
-#include "help.hh"
-
-#include <QThreadPool>
-#include <QMessageBox>
+#include "fulltextsearch.hh"
 #include "globalregex.hh"
+#include "help.hh"
+#include <QFutureSynchronizer>
+#include <QMessageBox>
+#include <QThreadPool>
 
 namespace FTS {
 
@@ -46,7 +45,7 @@ void Indexing::run()
     timerThread->wait();
   }
   catch ( std::exception & ex ) {
-    gdWarning( "Exception occurred while full-text search: %s", ex.what() );
+    qWarning( "Exception occurred while full-text search: %s", ex.what() );
   }
   emit sendNowIndexingName( QString() );
 }
@@ -389,7 +388,7 @@ void FullTextSearchDialog::searchReqFinished()
     std::list< sptr< Dictionary::DataRequest > >::iterator it;
     for ( it = searchReqs.begin(); it != searchReqs.end(); ++it ) {
       if ( ( *it )->isFinished() ) {
-        GD_DPRINTF( "one finished.\n" );
+        qDebug( "one finished." );
 
         QString errorString = ( *it )->getErrorString();
 
@@ -405,7 +404,7 @@ void FullTextSearchDialog::searchReqFinished()
               addSortedHeadwords( allHeadwords, hws );
             }
             catch ( std::exception & e ) {
-              gdWarning( "getDataSlice error: %s\n", e.what() );
+              qWarning( "getDataSlice error: %s", e.what() );
             }
           }
         }
@@ -413,9 +412,9 @@ void FullTextSearchDialog::searchReqFinished()
       }
     }
     if ( it != searchReqs.end() ) {
-      GD_DPRINTF( "erasing..\n" );
+      qDebug( "erasing.." );
       searchReqs.erase( it );
-      GD_DPRINTF( "erase done..\n" );
+      qDebug( "erase done.." );
       continue;
     }
     else {

src/fulltextsearch.hh

@@ -1,19 +1,10 @@
 #pragma once
 
-#include <QAbstractListModel>
-#include <QAction>
-#include <QList>
 #include <QTimer>
-#include <QThread>
 #include <QRunnable>
 #include <QSemaphore>
-#include <QStringList>
-
-#include <QRegularExpression>
-
 #include "dict/dictionary.hh"
 #include "ui_fulltextsearch.h"
-
 #include "config.hh"
 #include "instances.hh"
 #include "delegate.hh"

src/hotkeywrapper.cc

@@ -1,5 +1,4 @@
 #include "hotkeywrapper.hh"
-#include "gddebug.hh"
 #include <QTimer>
 #include <QSessionManager>
 #include <QWidget>
@@ -329,7 +328,7 @@ void HotkeyWrapper::init()
 void HotkeyWrapper::run() // Runs in a separate thread
 {
   if ( !XRecordEnableContext( dataDisplay, recordContext, recordEventCallback, (XPointer)this ) )
-    GD_DPRINTF( "Failed to enable record context\n" );
+    qDebug( "Failed to enable record context" );
 }
 
 
@@ -502,7 +501,7 @@ HotkeyWrapper::GrabbedKeys::iterator HotkeyWrapper::grabKey( quint32 keyCode, qu
     XGrabKey( displayID, keyCode, modifiers, DefaultRootWindow( displayID ), True, GrabModeAsync, GrabModeAsync );
 
     if ( errorHandler.isError() ) {
-      gdWarning( "Possible hotkeys conflict. Check your hotkeys options." );
+      qWarning( "Possible hotkeys conflict. Check your hotkeys options." );
       ungrabKey( result.first );
     }
   }
@@ -524,7 +523,7 @@ void HotkeyWrapper::ungrabKey( GrabbedKeys::iterator i )
   grabbedKeys.erase( i );
 
   if ( errorHandler.isError() ) {
-    gdWarning( "Cannot ungrab the hotkey" );
+    qWarning( "Cannot ungrab the hotkey" );
   }
 }
 

src/hotkeywrapper.hh

@@ -16,20 +16,14 @@
 #include "utils.hh"
 
 #ifdef HAVE_X11
-
+  #include <fixx11h.h>
   #include <set>
-
   #include <X11/Xlib.h>
   #include <X11/extensions/record.h>
-  #if ( QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) )
-    #include <QX11Info>
-  #endif
   #include <X11/Xlibint.h>
-
   #undef Bool
   #undef min
   #undef max
-
 #endif
 
 #ifdef Q_OS_WIN

src/main.cc

@@ -1,16 +1,24 @@
 /* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
  * Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
 
-#include <stdio.h>
-#include <QIcon>
-#include "mainwindow.hh"
 #include "config.hh"
-#include <QWebEngineProfile>
-#include "hotkeywrapper.hh"
+#include "logfileptr.hh"
+#include "mainwindow.hh"
+#include "termination.hh"
 #include "version.hh"
-#ifdef HAVE_X11
-  #include <fixx11h.h>
-#endif
+#include <QByteArray>
+#include <QCommandLineParser>
+#include <QFile>
+#include <QIcon>
+#include <QMessageBox>
+#include <QMutex>
+#include <QString>
+#include <QStringBuilder>
+#include <QtWebEngineCore/QWebEngineUrlScheme>
+#include <stdio.h>
+#include <QStyleFactory>
+
+#include "hotkeywrapper.hh" // X11 headers & fixer causes this file must be included last
 
 #if defined( Q_OS_UNIX )
   #include <clocale>
@@ -21,19 +29,6 @@
   #include <windows.h>
 #endif
 
-#include "termination.hh"
-#include <QByteArray>
-#include <QCommandLineParser>
-#include <QFile>
-#include <QMessageBox>
-#include <QString>
-#include <QStringBuilder>
-#include <QtWebEngineCore/QWebEngineUrlScheme>
-
-#include "gddebug.hh"
-#include <QMutex>
-#include <QStyleFactory>
-
 #if defined( USE_BREAKPAD )
   #if defined( Q_OS_MAC )
     #include "client/mac/handler/exception_handler.h"

src/termination.cc

@@ -2,10 +2,10 @@
 /* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
  * Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
 
+#include "logfileptr.hh"
 #include "termination.hh"
+#include <QDebug>
 #include <exception>
-#include <QtCore>
-
 
 static void termHandler()
 {

src/termination.hh

@@ -3,10 +3,6 @@
 
 #pragma once
 
-#include <QFile>
-
-extern QFile * logFilePtr;
-
 // Installs the termination handler which attempts to pop Qt's dialog showing
 // the exception and backtrace, and then aborts.
 void installTerminationHandler();

src/ui/articleview.cc

@@ -4,7 +4,6 @@
 #include "articleview.hh"
 #include "dict/programs.hh"
 #include "folding.hh"
-#include "gddebug.hh"
 #include "gestures.hh"
 #include "globalbroadcaster.hh"
 #include "speechclient.hh"

src/ui/dictheadwords.cc

@@ -2,7 +2,6 @@
  * Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
 
 #include "dictheadwords.hh"
-#include "gddebug.hh"
 #include "headwordsmodel.hh"
 #include <QDir>
 #include <QFileDialog>
@@ -255,7 +254,7 @@ QRegularExpression DictHeadwords::getFilterRegex() const
   QRegularExpression regExp = QRegularExpression( pattern, options );
 
   if ( !regExp.isValid() ) {
-    gdWarning( "Invalid regexp pattern: %s\n", pattern.toUtf8().data() );
+    qWarning( "Invalid regexp pattern: %s", pattern.toUtf8().data() );
   }
   return regExp;
 }
@@ -428,7 +427,7 @@ void DictHeadwords::saveHeadersToFile()
   progress.setValue( progress.maximum() );
   if ( progress.wasCanceled() ) {
     QMessageBox::warning( this, "GoldenDict", tr( "Export process is interrupted" ) );
-    gdWarning( "Headers export error: %s", file.errorString().toUtf8().data() );
+    qWarning( "Headers export error: %s", file.errorString().toUtf8().data() );
   }
   else {
     //completed.

src/ui/dictionarybar.cc

@@ -210,7 +210,7 @@ void DictionaryBar::showContextMenu( QContextMenuEvent * event, bool extended )
 
 void DictionaryBar::mutedDictionariesChanged()
 {
-  //GD_DPRINTF( "Muted dictionaries changed\n" );
+  //qDebug( "Muted dictionaries changed" );
 
   if ( !mutedDictionaries ) {
     return;

src/ui/favoritespanewidget.cc

@@ -17,9 +17,10 @@
 #include <functional>
 
 #include "favoritespanewidget.hh"
-#include "gddebug.hh"
 #include "globalbroadcaster.hh"
 
+#include <QFile>
+
 /************************************************** FavoritesPaneWidget *********************************************/
 
 void FavoritesPaneWidget::setUp( Config::Class * cfg, QMenu * menu )
@@ -644,7 +645,7 @@ void FavoritesModel::readData()
 
   QFile favoritesFile( m_favoritesFilename );
   if ( !favoritesFile.open( QFile::ReadOnly ) ) {
-    gdDebug( "No favorites file found" );
+    qDebug( "No favorites file found" );
     return;
   }
 
@@ -654,7 +655,7 @@ void FavoritesModel::readData()
 
   if ( !dom.setContent( &favoritesFile, false, &errorStr, &errorLine, &errorColumn ) ) {
     // Mailformed file
-    gdWarning( "Favorites file parsing error: %s at %d,%d\n", errorStr.toUtf8().data(), errorLine, errorColumn );
+    qWarning( "Favorites file parsing error: %s at %d,%d", errorStr.toUtf8().data(), errorLine, errorColumn );
 
     QMessageBox mb( QMessageBox::Warning, "GoldenDict", tr( "Error in favorities file" ), QMessageBox::Ok );
     mb.exec();
@@ -686,7 +687,7 @@ void FavoritesModel::saveData()
 
   QSaveFile tmpFile( m_favoritesFilename );
   if ( !tmpFile.open( QFile::WriteOnly ) ) {
-    gdWarning( "Can't write favorites file, error: %s", tmpFile.errorString().toUtf8().data() );
+    qWarning( "Can't write favorites file, error: %s", tmpFile.errorString().toUtf8().data() );
     return;
   }
 
@@ -699,7 +700,7 @@ void FavoritesModel::saveData()
   QByteArray result( dom.toByteArray() );
 
   if ( tmpFile.write( result ) != result.size() ) {
-    gdWarning( "Can't write favorites file, error: %s", tmpFile.errorString().toUtf8().data() );
+    qWarning( "Can't write favorites file, error: %s", tmpFile.errorString().toUtf8().data() );
     return;
   }
 
@@ -1145,7 +1146,7 @@ bool FavoritesModel::setDataFromXml( QString const & dataStr )
 
   if ( !dom.setContent( dataStr, false, &errorStr, &errorLine, &errorColumn ) ) {
     // Mailformed data
-    gdWarning( "XML parsing error: %s at %d,%d\n", errorStr.toUtf8().data(), errorLine, errorColumn );
+    qWarning( "XML parsing error: %s at %d,%d", errorStr.toUtf8().data(), errorLine, errorColumn );
     dom.clear();
     return false;
   }

src/ui/mainwindow.cc

@@ -43,7 +43,6 @@
 
 #include <set>
 #include <map>
-#include "gddebug.hh"
 
 #include "dictinfo.hh"
 #include "historypanewidget.hh"
@@ -1294,7 +1293,7 @@ void MainWindow::commitData()
       Config::save( cfg );
     }
     catch ( std::exception & e ) {
-      gdWarning( "Configuration saving failed, error: %s\n", e.what() );
+      qWarning( "Configuration saving failed, error: %s", e.what() );
     }
 
     // Save history
@@ -1304,7 +1303,7 @@ void MainWindow::commitData()
     ui.favoritesPaneWidget->saveData();
   }
   catch ( std::exception & e ) {
-    gdWarning( "Commit data failed, error: %s\n", e.what() );
+    qWarning( "Commit data failed, error: %s", e.what() );
   }
 }
 
@@ -1577,7 +1576,7 @@ void MainWindow::setupNetworkCache( int maxSize )
   QString cacheDirectory = Config::getCacheDir();
   if ( !QDir().mkpath( cacheDirectory ) ) {
     cacheDirectory = QStandardPaths::writableLocation( QStandardPaths::CacheLocation );
-    gdWarning( "Cannot create a cache directory %s. use default cache path.", cacheDirectory.toUtf8().constData() );
+    qWarning( "Cannot create a cache directory %s. use default cache path.", cacheDirectory.toUtf8().constData() );
   }
 
   QNetworkDiskCache * const diskCache = new QNetworkDiskCache( this );
@@ -4493,7 +4492,7 @@ void MainWindow::setGroupByName( QString const & name, bool main_window )
       }
     }
     if ( i >= groupList->count() ) {
-      gdWarning( "Group \"%s\" for main window is not found\n", name.toUtf8().data() );
+      qWarning( "Group \"%s\" for main window is not found", name.toUtf8().data() );
     }
   }
   else {

src/ui/preferences.cc

@@ -185,6 +185,7 @@ Preferences::Preferences( QWidget * parent, Config::Class & cfg_ ):
   ui.doubleClickTranslates->setChecked( p.doubleClickTranslates );
   ui.selectBySingleClick->setChecked( p.selectWordBySingleClick );
   ui.autoScrollToTargetArticle->setChecked( p.autoScrollToTargetArticle );
+  ui.targetArticleAtFirst->setChecked( p.targetArticleAtFirst );
   ui.escKeyHidesMainWindow->setChecked( p.escKeyHidesMainWindow );
 
   ui.darkMode->addItem( tr( "On" ), QVariant::fromValue( Config::Dark::On ) );
@@ -441,6 +442,7 @@ Config::Preferences Preferences::getPreferences()
   p.doubleClickTranslates      = ui.doubleClickTranslates->isChecked();
   p.selectWordBySingleClick    = ui.selectBySingleClick->isChecked();
   p.autoScrollToTargetArticle  = ui.autoScrollToTargetArticle->isChecked();
+  p.targetArticleAtFirst       = ui.targetArticleAtFirst->isChecked();
   p.escKeyHidesMainWindow      = ui.escKeyHidesMainWindow->isChecked();
 
   p.darkMode       = ui.darkMode->currentData().value< Config::Dark >();

src/ui/preferences.ui

@@ -169,6 +169,16 @@ however, the article from the topmost dictionary is shown.</string>
          </property>
         </widget>
        </item>
+       <item row="4" column="1">
+        <widget class="QCheckBox" name="targetArticleAtFirst">
+         <property name="text">
+          <string>Place the target article at the first place.</string>
+         </property>
+         <property name="checked">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
        <item row="1" column="0">
         <widget class="QGroupBox" name="enableTrayIcon">
          <property name="toolTip">

src/ui/scanpopup.cc

@@ -8,7 +8,6 @@
 #include <QBitmap>
 #include <QMenu>
 #include <QMouseEvent>
-#include "gddebug.hh"
 #include "gestures.hh"
 
 #ifdef Q_OS_MAC
@@ -51,7 +50,7 @@ static bool ownsClipboardMode( QClipboard::Mode mode )
       return clipboard.ownsFindBuffer();
   }
 
-  gdWarning( "Unknown clipboard mode: %d\n", static_cast< int >( mode ) );
+  qWarning( "Unknown clipboard mode: %d", static_cast< int >( mode ) );
   return false;
 }
 #endif
@@ -749,14 +748,14 @@ bool ScanPopup::eventFilter( QObject * watched, QEvent * event )
 void ScanPopup::reactOnMouseMove( QPointF const & p )
 {
   if ( geometry().contains( p.toPoint() ) ) {
-    //        GD_DPRINTF( "got inside\n" );
+    //        qDebug( "got inside" );
 
     hideTimer.stop();
     mouseEnteredOnce = true;
     uninterceptMouse();
   }
   else {
-    //        GD_DPRINTF( "outside\n" );
+    //        qDebug( "outside" );
     // We're in grab mode and outside the window - calculate the
     // distance from it. We might want to hide it.
 
@@ -1165,7 +1164,7 @@ void ScanPopup::setGroupByName( QString const & name ) const
     }
   }
   if ( i >= ui.groupList->count() ) {
-    gdWarning( "Group \"%s\" for popup window is not found\n", name.toUtf8().data() );
+    qWarning( "Group \"%s\" for popup window is not found", name.toUtf8().data() );
   }
 }
 

src/wordfinder.cc

@@ -5,7 +5,7 @@
 #include "folding.hh"
 #include "wstring_qt.hh"
 #include <map>
-#include "gddebug.hh"
+
 
 using std::vector;
 using std::list;
@@ -157,10 +157,10 @@ void WordFinder::startSearch()
         queuedRequests.push_back( sr );
       }
       catch ( std::exception & e ) {
-        gdWarning( "Word \"%s\" search error (%s) in \"%s\"\n",
-                   inputWord.toUtf8().data(),
-                   e.what(),
-                   inputDict->getName().c_str() );
+        qWarning( "Word \"%s\" search error (%s) in \"%s\"",
+                  inputWord.toUtf8().data(),
+                  e.what(),
+                  inputDict->getName().c_str() );
       }
     }
   }