replace deprecated C++ headers (reported by clan-tidy) - partially supersedes PR #1605

src/api/baseapi.cpp

@@ -24,7 +24,7 @@
 
 #include "baseapi.h"
 #ifdef __linux__
-#include <signal.h>            // for sigaction, SA_RESETHAND, SIGBUS, SIGFPE
+#include <csignal>            // for sigaction, SA_RESETHAND, SIGBUS, SIGFPE
 #endif
 
 #if defined(_WIN32)

src/api/pdfrenderer.cpp

@@ -23,9 +23,9 @@
 #include <memory>  // std::unique_ptr
 #include "allheaders.h"
 #include "baseapi.h"
-#include "math.h"
+#include <cmath>
 #include "renderer.h"
-#include "strngs.h"
+#include <cstring>
 #include "tprintf.h"
 
 /*

src/ccmain/adaptions.cpp

@@ -18,7 +18,7 @@
  *
  **********************************************************************/
 
-#include <ctype.h>
+#include <cctype>
 #include <cstring>
 #include "tessvars.h"
 #include "reject.h"

src/ccmain/applybox.cpp

@@ -17,8 +17,8 @@
  *
  **********************************************************************/
 
-#include <ctype.h>
+#include <cctype>
-#include <errno.h>
+#include <cerrno>
 #include <cstring>
 #include "allheaders.h"
 #include "boxread.h"

src/ccmain/docqual.cpp

@@ -17,7 +17,7 @@
  *
  **********************************************************************/
 
-#include          <ctype.h>
+#include          <cctype>
 #include          "docqual.h"
 #include          "reject.h"
 #include          "tesscallback.h"

src/ccmain/equationdetect.cpp

@@ -22,7 +22,7 @@
 #endif
 
 #include <algorithm>
-#include <float.h>
+#include <cfloat>
 #include <limits>
 #include <memory>
 

src/ccmain/fixxht.cpp

@@ -19,7 +19,7 @@
 
 #include <algorithm>
 #include <cstring>
-#include <ctype.h>
+#include <cctype>
 #include "params.h"
 #include "float2int.h"
 #include "tesseractclass.h"

src/ccmain/output.cpp

@@ -17,8 +17,8 @@
  *
  **********************************************************************/
 
-#include <ctype.h>
+#include <cctype>
-#include <errno.h>
+#include <cerrno>
 #include <cstring>
 #include "helpers.h"
 #include "tessvars.h"

src/ccmain/paragraphs.cpp

@@ -18,11 +18,11 @@
  **********************************************************************/
 
 #include "paragraphs.h"
-#include <ctype.h>                // for isspace
+#include <cctype>                 // for isspace
-#include <math.h>                 // for abs
+#include <cmath>                  // for abs
-#include <stdio.h>                // for snprintf
+#include <cstdio>                 // for snprintf
-#include <stdlib.h>               // for abs
+#include <cstdlib>                // for abs
-#include <string.h>               // for strchr, strlen
+#include <cstring>                // for strchr, strlen
 #include <algorithm>              // for max
 #include <memory>                 // for unique_ptr
 #include "genericvector.h"        // for GenericVector, GenericVectorEqEq

src/ccmain/pgedit.cpp

@@ -24,8 +24,8 @@
 
 #include          "pgedit.h"
 
-#include          <ctype.h>
+#include          <cctype>
-#include          <math.h>
+#include          <cmath>
 
 #include "blread.h"
 #include "control.h"

src/ccmain/reject.cpp

@@ -38,8 +38,8 @@ int16_t Tesseract::safe_dict_word(const WERD_RES *werd_res) {
 #else
 
 #include "tessvars.h"
-#include <ctype.h>
+#include <cctype>
-#include <errno.h>
+#include <cerrno>
 #include <cstring>
 #include "genericvector.h"
 #include "reject.h"

src/ccstruct/blamer.cpp

@@ -19,8 +19,8 @@
 ///////////////////////////////////////////////////////////////////////
 
 #include "blamer.h"
-#include <math.h>          // for abs
+#include <cmath>           // for abs
-#include <stdlib.h>        // for abs
+#include <cstdlib>         // for abs
 #include "blobs.h"         // for TPOINT, TWERD, TBLOB
 #include "errcode.h"       // for ASSERT_HOST
 #include "matrix.h"        // for MATRIX

src/ccstruct/linlsq.cpp

@@ -17,8 +17,8 @@
  *
  **********************************************************************/
 
-#include <stdio.h>
+#include <cstdio>
-#include <math.h>
+#include <cmath>
 #include "errcode.h"
 #include "linlsq.h"
 

src/ccstruct/points.cpp

@@ -22,7 +22,7 @@
 #endif  // _MSC_VER
 
 #include <algorithm>
-#include <stdlib.h>
+#include <cstdlib>
 #include "helpers.h"
 #include "serialis.h"
 #include "points.h"

src/ccstruct/polyblk.cpp

@@ -16,7 +16,7 @@
  **********************************************************************/
 
 #include "polyblk.h"
-#include <ctype.h>
+#include <cctype>
 #include <cmath>
 #include <cstdio>
 #include <memory>  // std::unique_ptr

src/ccstruct/statistc.cpp

@@ -24,8 +24,8 @@
 
 #include "statistc.h"
 #include <cstring>
-#include <math.h>
+#include <cmath>
-#include <stdlib.h>
+#include <cstdlib>
 #include "errcode.h"
 #include "helpers.h"
 #include "scrollview.h"

src/ccutil/basedir.cpp

@@ -18,7 +18,7 @@
 
 #include          "basedir.h"
 
-#include          <stdlib.h>
+#include          <cstdlib>
 
 // Assuming that code_path is the name of some file in a desired directory,
 // returns the given code_path stripped back to the last slash, leaving

src/ccutil/errcode.cpp

@@ -17,9 +17,9 @@
  *
  **********************************************************************/
 
-#include <stdio.h>
+#include <cstdio>
-#include <stdlib.h>
+#include <cstdlib>
-#include <stdarg.h>
+#include <cstdarg>
 #include <cstring>
 #include "tprintf.h"
 #include "errcode.h"

src/ccutil/globaloc.cpp

@@ -18,7 +18,7 @@
  **********************************************************************/
 
 #include "globaloc.h"
-#include <signal.h>
+#include <csignal>
 #ifdef __linux__
 #include <sys/syscall.h>   // For SYS_gettid.
 #include <unistd.h>        // For syscall itself.

src/ccutil/params.cpp

@@ -17,9 +17,9 @@
  *
  **********************************************************************/
 
-#include <stdio.h>
+#include <cstdio>
 #include <cstring>
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "genericvector.h"
 #include "tprintf.h"

src/ccutil/params.h

@@ -20,7 +20,7 @@
 #ifndef           PARAMS_H
 #define           PARAMS_H
 
-#include          <stdio.h>
+#include          <cstdio>
 
 #include          "genericvector.h"
 #include          "strngs.h"

src/ccutil/platform.h

@@ -38,7 +38,7 @@
 #endif
 #endif /* defined(_MSC_VER) */
 #else
-#include <limits.h>
+#include <climits>
 #ifndef PATH_MAX
 #define MAX_PATH 4096
 #else

src/dict/permdawg.cpp

@@ -33,7 +33,7 @@
 #include "params.h"
 
 #include <algorithm>
-#include <ctype.h>
+#include <cctype>
 #include "dict.h"
 
 /*----------------------------------------------------------------------

src/opencl/openclwrapper.cpp

@@ -13,7 +13,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 #endif
-#include <float.h>
+#include <cfloat>
 
 #include "oclkernels.h"
 #include "openclwrapper.h"
@@ -2414,7 +2414,7 @@ static double getLineMasksMorphMicroBench(GPUEnv* env,
  * Device Selection
  *****************************************************************************/
 
-#include "stdlib.h"
+#include <cstdlib>
 
 // encode score object as byte string
 static ds_status serializeScore(ds_device* device, void** serializedScore,

src/opencl/openclwrapper.h

@@ -63,7 +63,7 @@
 #endif
 
 #if ON_LINUX
-#include <time.h>
+#include <ctime>
 #endif
 
 /************************************************************************************

src/textord/blkocc.cpp

@@ -28,7 +28,7 @@
 ----------------------------------------------------------------------
 */
 
-#include <ctype.h>
+#include <cctype>
 #include <cmath>
 #include "errcode.h"
 #include "drawtord.h"

src/textord/pithsync.cpp

@@ -17,7 +17,7 @@
  *
  **********************************************************************/
 
-#include <math.h>
+#include <cmath>
 #include <cfloat>       // for FLT_MAX
 #include <vector>       // for std::vector
 #include "makerow.h"

src/textord/tordmain.h

@@ -20,7 +20,7 @@
 #ifndef           TORDMAIN_H
 #define           TORDMAIN_H
 
-#include          <time.h>
+#include          <ctime>
 #include          "params.h"
 #include          "ocrblock.h"
 #include          "blobs.h"

src/viewer/svutil.cpp

@@ -36,7 +36,7 @@ struct addrinfo {
 #include <netinet/in.h>
 #include <pthread.h>
 #include <semaphore.h>
-#include <signal.h>
+#include <csignal>
 #include <cstdlib>
 #include <cstring>
 #include <sys/select.h>

src/wordrec/params_model.cpp

@@ -19,7 +19,7 @@
 
 #include "params_model.h"
 
-#include <ctype.h>
+#include <cctype>
 #include <cmath>
 #include <cstdio>
 

src/wordrec/segsearch.cpp

@@ -17,7 +17,7 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#include <stdint.h>          // for INT32_MAX
+#include <cstdint>           // for INT32_MAX
 #include "blamer.h"          // for BlamerBundle
 #include "errcode.h"         // for ASSERT_HOST
 #include "genericvector.h"   // for GenericVector