refactor: move all dictionary parsers to /src/dict/

If a file contains `makeDictionaries` then it belongs to there

about.hh

@@ -6,7 +6,7 @@
 
 #include "ui_about.h"
 #include "sptr.hh"
-#include "dictionary.hh"
+#include "dict/dictionary.hh"
 #include <QDialog>
 #include <vector>
 

article_maker.hh

@@ -9,7 +9,7 @@
 #include <set>
 #include <list>
 #include "config.hh"
-#include "dictionary.hh"
+#include "dict/dictionary.hh"
 #include "instances.hh"
 #include "wordfinder.hh"
 

article_netmgr.hh

@@ -13,7 +13,7 @@
 #include <QWebEngineUrlRequestJob>
 #include <QNetworkAccessManager>
 
-#include "dictionary.hh"
+#include "dict/dictionary.hh"
 #include "article_maker.hh"
 
 using std::vector;

btreeidx.hh

@@ -4,7 +4,7 @@
 #ifndef __BTREEIDX_HH_INCLUDED__
 #define __BTREEIDX_HH_INCLUDED__
 
-#include "dictionary.hh"
+#include "dict/dictionary.hh"
 #include "file.hh"
 
 #include <string>

dictdfiles.hh

@@ -4,7 +4,7 @@
 #ifndef __DICTDFILES_HH_INCLUDED__
 #define __DICTDFILES_HH_INCLUDED__
 
-#include "dictionary.hh"
+#include "dict/dictionary.hh"
 
 /// Support for the dictd (.index/dict.dz) files.
 namespace DictdFiles {

dictheadwords.hh

@@ -11,7 +11,7 @@
 
 #include "config.hh"
 #include "ui_dictheadwords.h"
-#include "dictionary.hh"
+#include "dict/dictionary.hh"
 #include "delegate.hh"
 #include "headwordsmodel.hh"
 

dictinfo.hh

@@ -3,7 +3,7 @@
 
 #include <QDialog>
 #include "ui_dictinfo.h"
-#include "dictionary.hh"
+#include "dict/dictionary.hh"
 #include "config.hh"
 
 class DictInfo: public QDialog

dictionarybar.hh

@@ -6,7 +6,7 @@
 #include <QList>
 #include <QString>
 #include <QTimer>
-#include "dictionary.hh"
+#include "dict/dictionary.hh"
 #include "config.hh"
 
 /// A bar containing dictionary icons of the currently chosen group.

dictserver.hh

@@ -1,7 +1,7 @@
 #ifndef __DICTSERVER_HH__INCLUDED__
 #define __DICTSERVER_HH__INCLUDED__
 
-#include "dictionary.hh"
+#include "dict/dictionary.hh"
 #include "config.hh"
 
 /// Support for servers supporting DICT protocol.

editdictionaries.hh

@@ -4,10 +4,10 @@
 #ifndef __EDITDICTIONARIES_HH_INCLUDED__
 #define __EDITDICTIONARIES_HH_INCLUDED__
 
-#include "dictionary.hh"
+#include "dict/dictionary.hh"
 #include "config.hh"
 #include "ui_editdictionaries.h"
-#include "sources.hh"
+#include "dict/sources.hh"
 #include "orderandprops.hh"
 #include "groups.hh"
 #include "instances.hh"

epwing.hh

@@ -1,7 +1,7 @@
 #ifndef __EPWING_HH__INCLUDED__
 #define __EPWING_HH__INCLUDED__
 
-#include "dictionary.hh"
+#include "dict/dictionary.hh"
 #include "epwing_book.hh"
 #include "btreeidx.hh"
 #include "chunkedstorage.hh"

epwing_book.hh

@@ -7,7 +7,7 @@
 #define _FILE_OFFSET_BITS 64
 #endif
 
-#include "dictionary.hh"
+#include "dict/dictionary.hh"
 #include "ex.hh"
 #include "mutex.hh"
 

ftshelpers.hh

@@ -12,7 +12,7 @@
 #include <QList>
 #include <QtConcurrent>
 
-#include "dictionary.hh"
+#include "dict/dictionary.hh"
 #include "btreeidx.hh"
 #include "fulltextsearch.hh"
 #include "chunkedstorage.hh"

fulltextsearch.hh

@@ -12,7 +12,7 @@
 #include <QList>
 #include <QAction>
 
-#include "dictionary.hh"
+#include "dict/dictionary.hh"
 #include "ui_fulltextsearch.h"
 #include "mutex.hh"
 #include "config.hh"

goldendict.pro

@@ -274,252 +274,254 @@ mac {
 DEFINES += PROGRAM_VERSION=\\\"$$VERSION\\\"
 
 # Input
-HEADERS += folding.hh \
+HEADERS += \
+    about.hh \
     ankiconnector.hh \
     article_inspect.hh \
+    article_maker.hh \
+    article_netmgr.hh \
     articlewebpage.hh \
+    articlewebview.hh \
+    atomic_rename.hh \
+    audiolink.hh \
+    audioplayerfactory.hh \
+    audioplayerinterface.hh \
     base/globalregex.hh \
     base_type.hh \
+    btreeidx.hh \
+    chunkedstorage.hh \
+    config.hh \
+    country.hh \
+    decompress.hh \
+    delegate.hh \
+    dictdfiles.hh \
+    dictheadwords.hh \
+    dictinfo.hh \
+    dictionarybar.hh \
+    dictserver.hh \
+    dictspanewidget.hh \
     dictzip.hh \
+    editdictionaries.hh \
+    ex.hh \
+    externalaudioplayer.hh \
+    externalviewer.hh \
+    favoritespanewidget.hh \
+    ffmpegaudio.hh \
+    ffmpegaudioplayer.hh \
+    file.hh \
+    filetype.hh \
+    folding.hh \
+    fsencoding.hh \
+    ftshelpers.hh \
+    fulltextsearch.hh \
+    gdappstyle.hh \
+    gddebug.hh \
+    gestures.hh \
     globalbroadcaster.h \
+    groupcombobox.hh \
+    groups.hh \
+    groups_widgets.hh \
     headwordsmodel.hh \
+    history.hh \
+    historypanewidget.hh \
+    hotkeywrapper.hh \
+    htmlescape.hh \
+    iconv.hh \
     iframeschemehandler.hh \
     inc_case_folding.hh \
     inc_diacritic_folding.hh \
+    indexedzip.hh \
+    initializing.hh \
+    instances.hh \
+    keyboardstate.hh \
+    langcoder.hh \
+    language.hh \
+    loaddictionaries.hh \
+    mainstatusbar.hh \
+    maintabwidget.hh \
     mainwindow.hh \
+    mdictparser.hh \
+    mruqmenu.hh \
+    multimediaaudioplayer.hh \
+    mutex.hh \
+    orderandprops.hh \
+    parsecmdline.hh \
+    preferences.hh \
     resourceschemehandler.hh \
+    ripemd.hh \
+    scanpopup.hh \
+    searchpanewidget.hh \
+    splitfile.hh \
     sptr.hh \
-    dictionary.hh \
-    ex.hh \
-    config.hh \
-    sources.hh \
+    src/dict/aard.hh \
+    src/dict/belarusiantranslit.hh \
+    src/dict/bgl.hh \
+    src/dict/bgl_babylon.hh \
+    src/dict/dictionary.hh \
+    src/dict/dsl.hh \
+    src/dict/dsl_details.hh \
+    src/dict/forvo.hh \
+    src/dict/german.hh \
+    src/dict/gls.hh \
+    src/dict/greektranslit.hh \
     src/dict/lingualibre.hh \
+    src/dict/lsa.hh \
+    src/dict/mdx.hh \
+    src/dict/mediawiki.hh \
+    src/dict/programs.hh \
+    src/dict/romaji.hh \
+    src/dict/russiantranslit.hh \
+    src/dict/sdict.hh \
+    src/dict/slob.hh \
+    src/dict/sounddir.hh \
+    src/dict/sources.hh \
+    src/dict/stardict.hh \
+    src/dict/transliteration.hh \
+    src/dict/voiceengines.hh \
+    src/dict/website.hh \
+    src/dict/xdxf.hh \
+    src/dict/xdxf2html.hh \
+    src/dict/zim.hh \
+    src/dict/zipsounds.hh \
+    src/hunspell.hh \
     src/ui/articleview.hh \
     src/ui/ftssearchpanel.hh \
     src/ui/searchpanel.hh \
+    stylescombobox.hh \
+    termination.hh \
+    tiff.hh \
+    translatebox.hh \
+    ufile.hh \
     utf8.hh \
-    file.hh \
-    bgl_babylon.hh \
-    bgl.hh \
-    initializing.hh \
-    article_netmgr.hh \
-    btreeidx.hh \
-    stardict.hh \
-    chunkedstorage.hh \
+    utils.hh \
+    webmultimediadownload.hh \
     weburlrequestinterceptor.h \
-    xdxf2html.hh \
-    iconv.hh \
-    lsa.hh \
-    htmlescape.hh \
-    dsl.hh \
-    dsl_details.hh \
-    filetype.hh \
-    fsencoding.hh \
-    groups.hh \
-    groups_widgets.hh \
-    instances.hh \
-    article_maker.hh \
-    scanpopup.hh \
-    audioplayerinterface.hh \
-    audioplayerfactory.hh \
-    ffmpegaudioplayer.hh \
-    multimediaaudioplayer.hh \
-    externalaudioplayer.hh \
-    externalviewer.hh \
     wordfinder.hh \
-    groupcombobox.hh \
-    keyboardstate.hh \
-    preferences.hh \
-    mutex.hh \
-    mediawiki.hh \
-    sounddir.hh \
-    hunspell.hh \
-    dictdfiles.hh \
-    audiolink.hh \
+    wordlist.hh \
     wstring.hh \
     wstring_qt.hh \
-    hotkeywrapper.hh \
-    searchpanewidget.hh \
-    langcoder.hh \
-    editdictionaries.hh \
-    loaddictionaries.hh \
-    transliteration.hh \
-    romaji.hh \
-    belarusiantranslit.hh \
-    russiantranslit.hh \
-    german.hh \
-    website.hh \
-    orderandprops.hh \
-    language.hh \
-    dictionarybar.hh \
-    history.hh \
-    atomic_rename.hh \
-    articlewebview.hh \
-    zipfile.hh \
-    indexedzip.hh \
-    termination.hh \
-    greektranslit.hh \
-    webmultimediadownload.hh \
-    forvo.hh \
-    country.hh \
-    about.hh \
-    programs.hh \
-    parsecmdline.hh \
-    dictspanewidget.hh \
-    maintabwidget.hh \
-    mainstatusbar.hh \
-    gdappstyle.hh \
-    ufile.hh \
-    xdxf.hh \
-    sdict.hh \
-    decompress.hh \
-    aard.hh \
-    mruqmenu.hh \
-    dictinfo.hh \
-    zipsounds.hh \
-    stylescombobox.hh \
-    translatebox.hh \
-    historypanewidget.hh \
-    wordlist.hh \
-    mdictparser.hh \
-    mdx.hh \
-    voiceengines.hh \
-    ffmpegaudio.hh \
-    delegate.hh \
-    zim.hh \
-    gddebug.hh \
-    utils.hh \
-    gestures.hh \
-    tiff.hh \
-    dictheadwords.hh \
-    fulltextsearch.hh \
-    ftshelpers.hh \
-    dictserver.hh \
-    slob.hh \
-    ripemd.hh \
-    gls.hh \
-    splitfile.hh \
-    favoritespanewidget.hh
+    zipfile.hh
 
 FORMS += $$files(src/ui/*.ui)
 
-SOURCES += folding.cc \
+SOURCES += \
+    about.cc \
     ankiconnector.cc \
     article_inspect.cc \
+    article_maker.cc \
+    article_netmgr.cc \
     articlewebpage.cc \
+    articlewebview.cc \
+    atomic_rename.cc \
+    audiolink.cc \
+    audioplayerfactory.cc \
     base/globalregex.cc \
-    globalbroadcaster.cc \
-    headwordsmodel.cc \
-    iframeschemehandler.cc \
-    main.cc \
-    dictionary.cc \
+    btreeidx.cc \
+    chunkedstorage.cc \
     config.cc \
-    resourceschemehandler.cc \
-    sources.cc \
+    country.cc \
+    decompress.cc \
+    delegate.cc \
+    dictdfiles.cc \
+    dictheadwords.cc \
+    dictinfo.cc \
+    dictionarybar.cc \
+    dictserver.cc \
+    dictzip.c \
+    editdictionaries.cc \
+    externalaudioplayer.cc \
+    externalviewer.cc \
+    favoritespanewidget.cc \
+    ffmpegaudio.cc \
+    file.cc \
+    filetype.cc \
+    folding.cc \
+    fsencoding.cc \
+    ftshelpers.cc \
+    fulltextsearch.cc \
+    gdappstyle.cc \
+    gddebug.cc \
+    gestures.cc \
+    globalbroadcaster.cc \
+    groupcombobox.cc \
+    groups.cc \
+    groups_widgets.cc \
+    headwordsmodel.cc \
+    history.cc \
+    historypanewidget.cc \
+    hotkeywrapper.cc \
+    htmlescape.cc \
+    iconv.cc \
+    iframeschemehandler.cc \
+    indexedzip.cc \
+    initializing.cc \
+    instances.cc \
+    keyboardstate.cc \
+    langcoder.cc \
+    language.cc \
+    loaddictionaries.cc \
+    main.cc \
+    mainstatusbar.cc \
+    maintabwidget.cc \
     mainwindow.cc \
+    mdictparser.cc \
+    mruqmenu.cc \
+    multimediaaudioplayer.cc \
+    mutex.cc \
+    orderandprops.cc \
+    parsecmdline.cc \
+    preferences.cc \
+    resourceschemehandler.cc \
+    ripemd.cc \
+    scanpopup.cc \
+    splitfile.cc \
+    src/dict/aard.cc \
+    src/dict/belarusiantranslit.cc \
+    src/dict/bgl.cc \
+    src/dict/bgl_babylon.cc \
+    src/dict/dictionary.cc \
+    src/dict/dsl.cc \
+    src/dict/dsl_details.cc \
+    src/dict/forvo.cc \
+    src/dict/german.cc \
+    src/dict/gls.cc \
+    src/dict/greektranslit.cc \
+    src/dict/hunspell.cc \
     src/dict/lingualibre.cc \
+    src/dict/lsa.cc \
+    src/dict/mdx.cc \
+    src/dict/mediawiki.cc \
+    src/dict/programs.cc \
+    src/dict/romaji.cc \
+    src/dict/russiantranslit.cc \
+    src/dict/sdict.cc \
+    src/dict/slob.cc \
+    src/dict/sounddir.cc \
+    src/dict/sources.cc \
+    src/dict/stardict.cc \
+    src/dict/transliteration.cc \
+    src/dict/voiceengines.cc \
+    src/dict/website.cc \
+    src/dict/xdxf.cc \
+    src/dict/xdxf2html.cc \
+    src/dict/zim.cc \
+    src/dict/zipsounds.cc \
     src/ui/articleview.cc \
     src/ui/ftssearchpanel.cc \
     src/ui/searchpanel.cc \
-    utf8.cc \
-    file.cc \
-    bgl_babylon.cc \
-    bgl.cc \
-    initializing.cc \
-    article_netmgr.cc \
-    dictzip.c \
-    btreeidx.cc \
-    stardict.cc \
-    chunkedstorage.cc \
-    utils.cc \
-    weburlrequestinterceptor.cc \
-    xdxf2html.cc \
-    iconv.cc \
-    lsa.cc \
-    htmlescape.cc \
-    dsl.cc \
-    dsl_details.cc \
-    filetype.cc \
-    fsencoding.cc \
-    groups.cc \
-    groups_widgets.cc \
-    instances.cc \
-    article_maker.cc \
-    scanpopup.cc \
-    audioplayerfactory.cc \
-    multimediaaudioplayer.cc \
-    externalaudioplayer.cc \
-    externalviewer.cc \
-    wordfinder.cc \
-    groupcombobox.cc \
-    keyboardstate.cc \
-    preferences.cc \
-    mutex.cc \
-    mediawiki.cc \
-    sounddir.cc \
-    hunspell.cc \
-    dictdfiles.cc \
-    audiolink.cc \
-    wstring_qt.cc \
-    hotkeywrapper.cc \
-    langcoder.cc \
-    editdictionaries.cc \
-    loaddictionaries.cc \
-    transliteration.cc \
-    romaji.cc \
-    belarusiantranslit.cc \
-    russiantranslit.cc \
-    german.cc \
-    website.cc \
-    orderandprops.cc \
-    language.cc \
-    dictionarybar.cc \
-    history.cc \
-    atomic_rename.cc \
-    articlewebview.cc \
-    zipfile.cc \
-    indexedzip.cc \
-    termination.cc \
-    greektranslit.cc \
-    webmultimediadownload.cc \
-    forvo.cc \
-    country.cc \
-    about.cc \
-    programs.cc \
-    parsecmdline.cc \
-    maintabwidget.cc \
-    mainstatusbar.cc \
-    gdappstyle.cc \
-    ufile.cc \
-    xdxf.cc \
-    sdict.cc \
-    decompress.cc \
-    aard.cc \
-    mruqmenu.cc \
-    dictinfo.cc \
-    zipsounds.cc \
     stylescombobox.cc \
-    translatebox.cc \
-    historypanewidget.cc \
-    wordlist.cc \
-    mdictparser.cc \
-    mdx.cc \
-    voiceengines.cc \
-    ffmpegaudio.cc \
-    delegate.cc \
-    zim.cc \
-    gddebug.cc \
-    gestures.cc \
+    termination.cc \
     tiff.cc \
-    dictheadwords.cc \
-    fulltextsearch.cc \
-    ftshelpers.cc \
-    dictserver.cc \
-    slob.cc \
-    ripemd.cc \
-    gls.cc \
-    splitfile.cc \
-    favoritespanewidget.cc
+    translatebox.cc \
+    ufile.cc \
+    utf8.cc \
+    utils.cc \
+    webmultimediadownload.cc \
+    weburlrequestinterceptor.cc \
+    wordfinder.cc \
+    wordlist.cc \
+    wstring_qt.cc \
+    zipfile.cc
 
 #speech to text
 SOURCES += speechclient.cc \

groups.cc

@@ -3,7 +3,7 @@
 
 #include "groups.hh"
 #include "instances.hh"
-#include "dictionary.hh"
+#include "dict/dictionary.hh"
 #include <QMessageBox>
 #include <QInputDialog>
 

groups.hh

@@ -6,7 +6,7 @@
 
 #include "ui_groups.h"
 #include "config.hh"
-#include "dictionary.hh"
+#include "dict/dictionary.hh"
 #include "groups_widgets.hh"
 #include <QToolButton>
 #include <QMenu>

groups_widgets.hh

@@ -14,7 +14,7 @@
 #include <QSortFilterProxyModel>
 
 #include "config.hh"
-#include "dictionary.hh"
+#include "dict/dictionary.hh"
 
 /// A model to be projected into the view, according to Qt's MVC model
 class DictListModel: public QAbstractListModel

headwordsmodel.hh

@@ -1,7 +1,7 @@
 #ifndef HEADWORDSMODEL_H
 #define HEADWORDSMODEL_H
 
-#include "dictionary.hh"
+#include "dict/dictionary.hh"
 
 #include <QAbstractListModel>
 #include <QStringList>

instances.hh

@@ -5,7 +5,7 @@
 #define __INSTANCES_HH_INCLUDED__
 
 #include "config.hh"
-#include "dictionary.hh"
+#include "dict/dictionary.hh"
 #include <QIcon>
 #include <limits.h>
 

loaddictionaries.cc

@@ -3,33 +3,33 @@
 
 #include "loaddictionaries.hh"
 #include "initializing.hh"
-#include "bgl.hh"
-#include "stardict.hh"
-#include "lsa.hh"
-#include "dsl.hh"
-#include "mediawiki.hh"
-#include "sounddir.hh"
-#include "hunspell.hh"
+#include "dict/bgl.hh"
+#include "dict/stardict.hh"
+#include "dict/lsa.hh"
+#include "dict/dsl.hh"
+#include "dict/mediawiki.hh"
+#include "dict/sounddir.hh"
+#include "dict/hunspell.hh"
 #include "dictdfiles.hh"
-#include "romaji.hh"
-#include "russiantranslit.hh"
-#include "german.hh"
-#include "greektranslit.hh"
-#include "belarusiantranslit.hh"
-#include "website.hh"
-#include "forvo.hh"
-#include "programs.hh"
-#include "voiceengines.hh"
+#include "dict/romaji.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 "xdxf.hh"
-#include "sdict.hh"
-#include "aard.hh"
-#include "zipsounds.hh"
-#include "mdx.hh"
-#include "zim.hh"
+#include "dict/xdxf.hh"
+#include "dict/sdict.hh"
+#include "dict/aard.hh"
+#include "dict/zipsounds.hh"
+#include "dict/mdx.hh"
+#include "dict/zim.hh"
 #include "dictserver.hh"
-#include "slob.hh"
-#include "gls.hh"
+#include "dict/slob.hh"
+#include "dict/gls.hh"
 #include "dict/lingualibre.hh"
 
 #ifndef NO_EPWING_SUPPORT

loaddictionaries.hh

@@ -6,7 +6,7 @@
 
 #include "initializing.hh"
 #include "config.hh"
-#include "dictionary.hh"
+#include "dict/dictionary.hh"
 
 #include <QThread>
 #include <QNetworkAccessManager>

mainwindow.hh

@@ -13,7 +13,7 @@
 #include "ui_mainwindow.h"
 #include "folding.hh"
 #include "config.hh"
-#include "dictionary.hh"
+#include "dict/dictionary.hh"
 #include "article_netmgr.hh"
 #include "audioplayerfactory.hh"
 #include "instances.hh"

src/ui/articleview.cc

@@ -6,7 +6,7 @@
 #include "fulltextsearch.hh"
 #include "gddebug.hh"
 #include "gestures.hh"
-#include "programs.hh"
+#include "dict/programs.hh"
 #include "utils.hh"
 #include "webmultimediadownload.hh"
 #include "weburlrequestinterceptor.h"

webmultimediadownload.hh

@@ -1,7 +1,7 @@
 #ifndef WEBMULTIMEDIADOWNLOAD_HH
 #define WEBMULTIMEDIADOWNLOAD_HH
 
-#include "dictionary.hh"
+#include "dict/dictionary.hh"
 #include <QtNetwork>
 
 namespace Dictionary {

wordfinder.hh

@@ -11,7 +11,7 @@
 #include <QMutex>
 #include <QWaitCondition>
 #include <QRunnable>
-#include "dictionary.hh"
+#include "dict/dictionary.hh"
 
 /// This component takes care of finding words. The search is asynchronous.
 /// This means the GUI doesn't get blocked during the sometimes lenghtly