Remove globals.h

It only included other files which are already included where needed. Signed-off-by: Stefan Weil <sw@weilnetz.de>
tesseract-ocr · Mar 11, 2019 · 5202208 · 5202208
1 parent e78b5f2
commit 5202208
Show file tree

Hide file tree

Showing 17 changed files with 1 addition and 49 deletions.
diff --git a/src/ccmain/control.cpp b/src/ccmain/control.cpp
@@ -35,7 +35,6 @@
 #include "drawfx.h"
 #include "fixspace.h"
 #endif
-#include "globals.h"
 #include "lstmrecognizer.h"
 #include "ocrclass.h"
 #include "output.h"

diff --git a/src/ccmain/docqual.cpp b/src/ccmain/docqual.cpp
@@ -22,7 +22,6 @@
 #include          "reject.h"
 #include          "tesscallback.h"
 #include          "tessvars.h"
-#include          "globals.h"
 #include          "tesseractclass.h"
 
 namespace tesseract{

diff --git a/src/ccmain/output.cpp b/src/ccmain/output.cpp
@@ -26,7 +26,6 @@
 #include "reject.h"
 #include "docqual.h"
 #include "output.h"
-#include "globals.h"
 #include "tesseractclass.h"
 
 #define EPAPER_EXT      ".ep"

diff --git a/src/ccmain/reject.cpp b/src/ccmain/reject.cpp
@@ -46,7 +46,6 @@ int16_t Tesseract::safe_dict_word(const WERD_RES *werd_res) {
 #include "control.h"
 #include "docqual.h"
 #include "globaloc.h"  // For err_exit.
-#include "globals.h"
 #include "helpers.h"
 
 #include "tesseractclass.h"

diff --git a/src/ccmain/tessedit.cpp b/src/ccmain/tessedit.cpp
@@ -37,7 +37,6 @@
 #include "intmatcher.h"
 #include "chop.h"
 #endif
-#include "globals.h"
 #ifndef ANDROID_BUILD
 #include "lstmrecognizer.h"
 #endif

diff --git a/src/ccmain/tesseractclass.cpp b/src/ccmain/tesseractclass.cpp
@@ -44,7 +44,6 @@
 #include "allheaders.h"
 #include "edgblob.h"
 #include "equationdetect.h"
-#include "globals.h"
 #ifndef ANDROID_BUILD
 #include "lstmrecognizer.h"
 #endif

diff --git a/src/classify/adaptive.cpp b/src/classify/adaptive.cpp
@@ -21,7 +21,6 @@
 ----------------------------------------------------------------------------*/
 #include "adaptive.h"
 #include "emalloc.h"
-#include "globals.h"
 #include "classify.h"
 
 #include <cassert>

diff --git a/src/classify/cutoffs.cpp b/src/classify/cutoffs.cpp
@@ -23,7 +23,6 @@
 #include <cstdio>
 
 #include "classify.h"
-#include "globals.h"
 #include "helpers.h"
 #include "serialis.h"
 #include "unichar.h"

diff --git a/src/classify/intmatcher.cpp b/src/classify/intmatcher.cpp
@@ -29,7 +29,6 @@
 #include "callcpp.h"
 #include "scrollview.h"
 #include "float2int.h"
-#include "globals.h"
 #include "helpers.h"
 #include "classify.h"
 #include "shapetable.h"

diff --git a/src/classify/intproto.cpp b/src/classify/intproto.cpp
@@ -29,7 +29,6 @@
 #include "emalloc.h"
 #include "fontinfo.h"
 #include "genericvector.h"
-#include "globals.h"
 #include "helpers.h"
 #include "intproto.h"
 #include "mfoutline.h"

diff --git a/src/classify/normmatch.cpp b/src/classify/normmatch.cpp
@@ -26,7 +26,6 @@
 #include "classify.h"
 #include "clusttool.h"
 #include "emalloc.h"
-#include "globals.h"
 #include "helpers.h"
 #include "normfeat.h"
 #include "unicharset.h"

diff --git a/src/classify/protos.cpp b/src/classify/protos.cpp
@@ -23,7 +23,6 @@
 #include "emalloc.h"
 #include "callcpp.h"
 #include "tprintf.h"
-#include "globals.h"
 #include "classify.h"
 #include "params.h"
 #include "intproto.h"

diff --git a/src/cutil/Makefile.am b/src/cutil/Makefile.am
@@ -9,7 +9,7 @@ endif
 
 noinst_HEADERS = \
     bitvec.h callcpp.h cutil.h cutil_class.h \
-    emalloc.h globals.h \
+    emalloc.h \
     oldlist.h structures.h
 
 noinst_LTLIBRARIES = libtesseract_cutil.la

diff --git a/src/cutil/globals.h b/src/cutil/globals.h
diff --git a/src/dict/permdawg.cpp b/src/dict/permdawg.cpp
@@ -27,7 +27,6 @@
 ----------------------------------------------------------------------*/
 
 #include "dawg.h"
-#include "globals.h"
 #include "stopper.h"
 #include "tprintf.h"
 #include "params.h"

diff --git a/src/training/commontraining.cpp b/src/training/commontraining.cpp
@@ -71,7 +71,6 @@ void ParseArguments(int* argc, char ***argv) {
 #include "emalloc.h"
 #include "featdefs.h"
 #include "fontinfo.h"
-#include "globals.h"
 #include "intfeaturespace.h"
 #include "mastertrainer.h"
 #include "mf.h"

diff --git a/src/wordrec/tface.cpp b/src/wordrec/tface.cpp
@@ -18,7 +18,6 @@
 
 #include "callcpp.h"
 #include "chop.h"
-#include "globals.h"
 #include "pageres.h"
 #include "wordrec.h"
 #include "featdefs.h"