Replace remaining STRING by std::string in src/viewer and src/wordrec

Signed-off-by: Stefan Weil <sw@weilnetz.de>

src/viewer/svmnode.h

@@ -27,7 +27,7 @@
 #ifndef TESSERACT_VIEWER_SVMNODE_H_
 #define TESSERACT_VIEWER_SVMNODE_H_
 
-#include "strngs.h"
+#include <string>
 
 namespace tesseract {
 
@@ -86,11 +86,11 @@ private:
   // The command event associated with a specific menu node. Should be unique.
   int cmd_event_;
   // The caption associated with a specific menu node.
-  STRING text_;
+  std::string text_;
   // The value of the menu node. (optional)
-  STRING value_;
+   std::string value_;
   // A description_ of the value. (optional)
-  STRING description_;
+   std::string description_;
 };
 
 } // namespace tesseract

src/wordrec/language_model.cpp

@@ -1195,7 +1195,7 @@ void LanguageModel::UpdateBestChoice(ViterbiStateEntry *vse, LMPainPoints *pain_
       ConstructWord(vse, word_res, &best_choice_bundle->fixpt, blamer_bundle, &truth_path);
   ASSERT_HOST(word != nullptr);
   if (dict_->stopper_debug_level >= 1) {
-    STRING word_str;
+    std::string word_str;
     word->string_and_lengths(&word_str, nullptr);
     vse->Print(word_str.c_str());
   }

src/wordrec/language_model.h

@@ -31,8 +31,6 @@
 #include "ratngs.h"         // for BLOB_CHOICE (ptr only), BLOB_CHOICE_LIST...
 #include "stopper.h"        // for DANGERR
 
-#include "strngs.h" // for STRING
-
 #include <cmath> // for exp
 
 namespace tesseract {
@@ -358,7 +356,7 @@ protected:
   // String representation of the classification of the previous word
   // (since this is only used by the character ngram model component,
   // only the last language_model_ngram_order of the word are stored).
-  STRING prev_word_str_;
+  std::string prev_word_str_;
   int prev_word_unichar_step_len_ = 0;
   // Active dawg vector.
   DawgPositionVector very_beginning_active_dawgs_; // includes continuation

src/wordrec/lm_state.h

@@ -27,7 +27,6 @@
 #include "lm_consistency.h"    // for LMConsistencyInfo
 #include "ratngs.h"            // for BLOB_CHOICE, PermuterType
 #include "stopper.h"           // for DANGERR
-#include "strngs.h"            // for STRING
 #include "unicharset.h"        // for UNICHARSET
 
 namespace tesseract {
@@ -73,7 +72,7 @@ struct LanguageModelNgramInfo {
       , pruned(p)
       , ngram_cost(nc)
       , ngram_and_classifier_cost(ncc) {}
-  STRING context; ///< context string
+  std::string context; ///< context string
   /// Length of the context measured by advancing using UNICHAR::utf8_step()
   /// (should be at most the order of the character ngram model used).
   int context_unichar_step_len;
@@ -110,7 +109,7 @@ struct ViterbiStateEntry : public ELIST_LINK {
       , associate_stats(as)
       , top_choice_flags(tcf)
       , updated(true) {
-    debug_str = (debug_uch == nullptr) ? nullptr : new STRING();
+    debug_str = (debug_uch == nullptr) ? nullptr : new std::string();
     if (pe != nullptr) {
       ratings_sum += pe->ratings_sum;
       if (pe->min_certainty < min_certainty) {
@@ -172,7 +171,7 @@ struct ViterbiStateEntry : public ELIST_LINK {
 
   /// UTF8 string representing the path corresponding to this vse.
   /// Populated only in when language_model_debug_level > 0.
-  STRING *debug_str;
+  std::string *debug_str;
 
   /// The cost is an adjusted ratings sum, that is adjusted by all the language
   /// model components that use Viterbi search.

src/wordrec/params_model.h

@@ -21,7 +21,6 @@
 
 #include "genericvector.h"           // for GenericVector
 #include "params_training_featdef.h" // for PTRAIN_NUM_FEATURE_TYPES
-#include "strngs.h"                  // for STRING
 
 namespace tesseract {
 
@@ -79,7 +78,7 @@ public:
 private:
   bool ParseLine(char *line, char **key, float *val);
 
-  STRING lang_;
+  std::string lang_;
   // Set to the current pass type and used to determine which set of weights
   // should be used for ComputeCost() and other functions.
   PassEnum pass_;

src/wordrec/segsearch.cpp

@@ -26,7 +26,6 @@
 #include "pageres.h"        // for WERD_RES
 #include "params.h"         // for BoolParam, IntParam, DoubleParam
 #include "ratngs.h"         // for BLOB_CHOICE_LIST, BLOB_CHOICE_IT
-#include "strngs.h"         // for STRING
 #include "tprintf.h"        // for tprintf
 #include "wordrec.h"        // for Wordrec, SegSearchPending (ptr only)
 
@@ -65,7 +64,7 @@ void Wordrec::SegSearch(WERD_RES *word_res, BestChoiceBundle *best_choice_bundle
   MATRIX_COORD pain_point;
   float pain_point_priority;
   int num_futile_classifications = 0;
-  STRING blamer_debug;
+  std::string blamer_debug;
   while (wordrec_enable_assoc &&
          (!SegSearchDone(num_futile_classifications) ||
           (blamer_bundle != nullptr && blamer_bundle->GuidedSegsearchStillGoing()))) {

src/wordrec/wordrec.h

@@ -89,7 +89,6 @@ namespace tesseract {
 
 class EDGEPT_CLIST;
 class MATRIX;
-class STRING;
 class TBOX;
 class UNICHARSET;
 class WERD_RES;