refactor: reorganize dictionary processing related code

CMakeLists.txt

@@ -167,6 +167,7 @@ target_include_directories(${GOLDENDICT} PRIVATE
         ${PROJECT_SOURCE_DIR}/src/
         ${PROJECT_SOURCE_DIR}/src/common
         ${PROJECT_SOURCE_DIR}/src/dict
+        ${PROJECT_SOURCE_DIR}/src/dict/utils
         ${PROJECT_SOURCE_DIR}/src/ui
         )
 

src/dict/bgl.cc

@@ -5,7 +5,7 @@
 #include "bgl_babylon.hh"
 #include "btreeidx.hh"
 #include "chunkedstorage.hh"
-#include "file.hh"
+#include "dictfile.hh"
 #include "folding.hh"
 #include "ftshelpers.hh"
 #include "gddebug.hh"

src/dict/btreeidx.hh

@@ -5,7 +5,7 @@
 #define __BTREEIDX_HH_INCLUDED__
 
 #include "dict/dictionary.hh"
-#include "file.hh"
+#include "dictfile.hh"
 
 #include <algorithm>
 #include <map>

src/dict/chunkedstorage.hh

@@ -5,7 +5,7 @@
 #define __CHUNKEDSTORAGE_HH_INCLUDED__
 
 #include "ex.hh"
-#include "file.hh"
+#include "dictfile.hh"
 
 #include <vector>
 #include <stdint.h>

src/dict/lsa.cc

@@ -2,7 +2,7 @@
  * Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
 
 #include "lsa.hh"
-#include "file.hh"
+#include "dictfile.hh"
 #include "iconv.hh"
 #include "folding.hh"
 #include "utf8.hh"

src/dict/mdx.cc

@@ -5,7 +5,7 @@
 #include "btreeidx.hh"
 #include "folding.hh"
 #include "utf8.hh"
-#include "file.hh"
+#include "dictfile.hh"
 #include "wstring.hh"
 #include "wstring_qt.hh"
 #include "chunkedstorage.hh"

src/dict/sounddir.cc

@@ -2,7 +2,6 @@
  * Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
 
 #include "sounddir.hh"
-#include "file.hh"
 #include "folding.hh"
 #include "utf8.hh"
 #include "btreeidx.hh"

src/dict/utils/dictfile.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 "file.hh"
+#include "dictfile.hh"
 
 #include "zipfile.hh"
 

src/dict/utils/dictzip.c

@@ -1,4 +1,4 @@
-/* Made up from data.c and other supplementary files of dictd-1.0.11 for the
+/* Made up from data.c and other supplementary files of dictd-1.11.0 for the
  * GoldenDict program.
  */
 

src/dict/utils/ufile.hh

@@ -1,6 +1,9 @@
 #ifndef UFILE_HH_INCLUDED
 #define UFILE_HH_INCLUDED
 
+// Don't use this thing.
+// Use QFile instead.
+
 #ifdef __WIN32
 
   #include "zlib.h"

src/dict/xdxf2html.cc

@@ -9,7 +9,7 @@
 #include "folding.hh"
 
 #include "audiolink.hh"
-#include "file.hh"
+#include "dictfile.hh"
 #include "filetype.hh"
 #include "htmlescape.hh"
 #include "utils.hh"

src/dict/zim.cc

@@ -11,7 +11,7 @@
   #include "utf8.hh"
   #include "langcoder.hh"
   #include "filetype.hh"
-  #include "file.hh"
+  #include "dictfile.hh"
   #include "utils.hh"
   #include "tiff.hh"
   #include "ftshelpers.hh"

src/dict/zipsounds.cc

@@ -2,7 +2,7 @@
  * Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
 
 #include "zipsounds.hh"
-#include "file.hh"
+#include "dictfile.hh"
 #include "folding.hh"
 #include "utf8.hh"
 #include "btreeidx.hh"

src/ftshelpers.cc

@@ -6,7 +6,7 @@
 #include "fulltextsearch.hh"
 #include "ftshelpers.hh"
 #include "wstring_qt.hh"
-#include "file.hh"
+#include "dictfile.hh"
 #include "gddebug.hh"
 #include "folding.hh"
 #include "utils.hh"