From c0031eb4f30a060f7dcfce3a9e9d60846dab9bd7 Mon Sep 17 00:00:00 2001
From: Benjamin Wolsey <bwy@benjaminwolsey.de>
Date: Wed, 24 Jun 2009 19:53:05 +0200
Subject: [PATCH] Use non-deprecated standard headers.

---
 src/Geom.h                      | 2 +-
 src/SWFAction.cpp               | 2 +-
 src/SWFFile.cpp                 | 4 ++--
 src/SWFGlyphList.cpp            | 2 +-
 src/SWFIdItem.h                 | 2 +-
 src/SWFImportExport.cpp         | 2 +-
 src/SWFItem.cpp                 | 4 ++--
 src/SWFList.h                   | 2 +-
 src/SWFReader.cpp               | 2 +-
 src/SWFReader.h                 | 2 +-
 src/SWFShapeItem.cpp            | 2 +-
 src/SWFShapeMaker.h             | 4 ++--
 src/SWFStackItem.cpp            | 2 +-
 src/SWFStyle.cpp                | 2 +-
 src/SWFTag.cpp                  | 2 +-
 src/SWFTrait.cpp                | 2 +-
 src/SWFWriter.cpp               | 4 ++--
 src/SWFWriter.h                 | 2 +-
 src/swfmill.cpp                 | 4 ++--
 src/swft/Parser.cpp             | 2 +-
 src/swft/SVGGradient.cpp        | 2 +-
 src/swft/SVGPathParser.h        | 4 ++--
 src/swft/SVGPointsParser.cpp    | 2 +-
 src/swft/SVGStyle.cpp           | 2 +-
 src/swft/swft.cpp               | 4 ++--
 src/swft/swft_import.cpp        | 2 +-
 src/swft/swft_import_binary.cpp | 2 +-
 src/swft/swft_import_jpeg.cpp   | 2 +-
 src/swft/swft_import_mp3.cpp    | 2 +-
 src/swft/swft_import_png.cpp    | 2 +-
 src/swft/swft_import_ttf.cpp    | 4 ++--
 src/swft/swft_import_wav.cpp    | 2 +-
 src/xslt/xslt_pack.cpp          | 2 +-
 33 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/src/Geom.h b/src/Geom.h
index 25be1ea..25d251e 100644
--- a/src/Geom.h
+++ b/src/Geom.h
@@ -2,7 +2,7 @@
 #define GEOM_H
 
 #include <libxml/tree.h>
-#include <math.h>
+#include <cmath>
 
 using namespace std;
 
diff --git a/src/SWFAction.cpp b/src/SWFAction.cpp
index 847af9f..2f6379e 100644
--- a/src/SWFAction.cpp
+++ b/src/SWFAction.cpp
@@ -1,6 +1,6 @@
 #include <SWFAction.h>
 #include "SWF.h"
-#include <string.h>
+#include <cstring>
 
 namespace SWF {
 
diff --git a/src/SWFFile.cpp b/src/SWFFile.cpp
index 2c3398c..aa6447d 100644
--- a/src/SWFFile.cpp
+++ b/src/SWFFile.cpp
@@ -1,8 +1,8 @@
 #include "SWFFile.h"
 #include "SWFReader.h"
 #include "SWFWriter.h"
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 #include <zlib.h>
 
 namespace SWF {
diff --git a/src/SWFGlyphList.cpp b/src/SWFGlyphList.cpp
index 3361093..25a4f85 100644
--- a/src/SWFGlyphList.cpp
+++ b/src/SWFGlyphList.cpp
@@ -1,7 +1,7 @@
 #include "SWFGlyphList.h"
 #include <SWFShapeItem.h>
 #include "SWF.h"
-#include <string.h>
+#include <cstring>
 
 namespace SWF {
 
diff --git a/src/SWFIdItem.h b/src/SWFIdItem.h
index 9511429..c13caf3 100644
--- a/src/SWFIdItem.h
+++ b/src/SWFIdItem.h
@@ -2,7 +2,7 @@
 #define SWF_IDITEM_H
 
 #include <SWFItem.h>
-#include <string.h>
+#include <cstring>
 
 namespace SWF {
 
diff --git a/src/SWFImportExport.cpp b/src/SWFImportExport.cpp
index b9f1c5e..9a96d83 100644
--- a/src/SWFImportExport.cpp
+++ b/src/SWFImportExport.cpp
@@ -1,6 +1,6 @@
 #include "SWFImportExport.h"
 #include "SWF.h"
-#include <string.h>
+#include <cstring>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
diff --git a/src/SWFItem.cpp b/src/SWFItem.cpp
index 715de80..f14f39a 100644
--- a/src/SWFItem.cpp
+++ b/src/SWFItem.cpp
@@ -1,6 +1,6 @@
 #include "SWFItem.h"
-#include <string.h>
-#include <ctype.h>
+#include <cstring>
+#include <cctype>
 #include "base64.h"
 #include <sys/types.h>
 
diff --git a/src/SWFList.h b/src/SWFList.h
index 4ce8cc6..e372852 100644
--- a/src/SWFList.h
+++ b/src/SWFList.h
@@ -1,7 +1,7 @@
 #ifndef F_List_H
 #define F_List_H
 
-#include <stdio.h>
+#include <cstdio>
 #define WARNING printf
 
 namespace SWF {
diff --git a/src/SWFReader.cpp b/src/SWFReader.cpp
index 09de74f..8e7bede 100644
--- a/src/SWFReader.cpp
+++ b/src/SWFReader.cpp
@@ -1,7 +1,7 @@
 #include "SWFReader.h"
 #include "SWFTag.h"
 #include "SWFAction.h"
-#include <string.h>
+#include <cstring>
 
 namespace SWF {
 
diff --git a/src/SWFReader.h b/src/SWFReader.h
index cb9cd86..beb9480 100644
--- a/src/SWFReader.h
+++ b/src/SWFReader.h
@@ -1,7 +1,7 @@
 #ifndef SWF_Reader_H
 #define SWF_Reader_H
 
-#include <stdio.h>
+#include <cstdio>
 #include <stdint.h>
 #include "SWFBasic.h"
 
diff --git a/src/SWFShapeItem.cpp b/src/SWFShapeItem.cpp
index 08c8579..a73afa1 100644
--- a/src/SWFShapeItem.cpp
+++ b/src/SWFShapeItem.cpp
@@ -1,6 +1,6 @@
 #include <SWFShapeItem.h>
 #include "SWF.h"
-#include <string.h>
+#include <cstring>
 
 namespace SWF {
 
diff --git a/src/SWFShapeMaker.h b/src/SWFShapeMaker.h
index 318d7d3..35e0704 100644
--- a/src/SWFShapeMaker.h
+++ b/src/SWFShapeMaker.h
@@ -2,9 +2,9 @@
 #define SWF_SHAPEMAKER_H
 
 #include "Geom.h"
-#include <stdio.h>
+#include <cstdio>
 #include <libxml/tree.h>
-#include <math.h>
+#include <cmath>
 
 namespace SWF {
 
diff --git a/src/SWFStackItem.cpp b/src/SWFStackItem.cpp
index 0e409ab..7675815 100644
--- a/src/SWFStackItem.cpp
+++ b/src/SWFStackItem.cpp
@@ -1,6 +1,6 @@
 #include <SWFStackItem.h>
 #include "SWF.h"
-#include <string.h>
+#include <cstring>
 
 namespace SWF {
 
diff --git a/src/SWFStyle.cpp b/src/SWFStyle.cpp
index 0b70e2e..ff6deb3 100644
--- a/src/SWFStyle.cpp
+++ b/src/SWFStyle.cpp
@@ -1,5 +1,5 @@
 #include <SWFStyle.h>
-#include <string.h>
+#include <cstring>
 
 namespace SWF {
 
diff --git a/src/SWFTag.cpp b/src/SWFTag.cpp
index 7265938..0e9d0d7 100644
--- a/src/SWFTag.cpp
+++ b/src/SWFTag.cpp
@@ -1,6 +1,6 @@
 #include <SWFTag.h>
 #include "SWF.h"
-#include <string.h>
+#include <cstring>
 
 namespace SWF {
 
diff --git a/src/SWFTrait.cpp b/src/SWFTrait.cpp
index 0c2ec90..091d79d 100644
--- a/src/SWFTrait.cpp
+++ b/src/SWFTrait.cpp
@@ -1,6 +1,6 @@
 #include <SWFAction.h>
 #include "SWF.h"
-#include <string.h>
+#include <cstring>
 
 namespace SWF {
 
diff --git a/src/SWFWriter.cpp b/src/SWFWriter.cpp
index e342a0d..5bc8c63 100644
--- a/src/SWFWriter.cpp
+++ b/src/SWFWriter.cpp
@@ -1,6 +1,6 @@
 #include "SWFWriter.h"
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 
 namespace SWF {
 
diff --git a/src/SWFWriter.h b/src/SWFWriter.h
index e71d461..fcc7c26 100644
--- a/src/SWFWriter.h
+++ b/src/SWFWriter.h
@@ -1,7 +1,7 @@
 #ifndef SWF_Writer_H
 #define SWF_Writer_H
 
-#include <stdio.h>
+#include <cstdio>
 #include <stdint.h>
 #include "SWFBasic.h"
 
diff --git a/src/swfmill.cpp b/src/swfmill.cpp
index 505322d..1164af1 100644
--- a/src/swfmill.cpp
+++ b/src/swfmill.cpp
@@ -2,8 +2,8 @@
 #include "SWFFile.h"
 #include "swft.h"
 #include "xslt.h"
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
diff --git a/src/swft/Parser.cpp b/src/swft/Parser.cpp
index 39f7d0f..6af045a 100644
--- a/src/swft/Parser.cpp
+++ b/src/swft/Parser.cpp
@@ -1,5 +1,5 @@
 #include "Parser.h"
-#include <string.h>
+#include <cstring>
 
 namespace SWF {
 
diff --git a/src/swft/SVGGradient.cpp b/src/swft/SVGGradient.cpp
index 67e7c58..31de484 100644
--- a/src/swft/SVGGradient.cpp
+++ b/src/swft/SVGGradient.cpp
@@ -1,6 +1,6 @@
 #include "SVGGradient.h"
 #include "SVGTransformParser.h"
-#include <string.h>
+#include <cstring>
 
 #define TMP_STRLEN 0xFF
 
diff --git a/src/swft/SVGPathParser.h b/src/swft/SVGPathParser.h
index 3a7f7ab..9009f2b 100644
--- a/src/swft/SVGPathParser.h
+++ b/src/swft/SVGPathParser.h
@@ -5,8 +5,8 @@
 #include <vector>
 #include <iostream>
 #include <libxml/tree.h>
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 #include "SWFShapeMaker.h"
 #include "SWF.h"
 
diff --git a/src/swft/SVGPointsParser.cpp b/src/swft/SVGPointsParser.cpp
index ca83b23..f5c874a 100644
--- a/src/swft/SVGPointsParser.cpp
+++ b/src/swft/SVGPointsParser.cpp
@@ -1,7 +1,7 @@
 #include "SVGPointsParser.h"
 
 #include <iostream>
-#include <string.h>
+#include <cstring>
 
 namespace SWF {
 
diff --git a/src/swft/SVGStyle.cpp b/src/swft/SVGStyle.cpp
index a1f13c9..97a9de7 100644
--- a/src/swft/SVGStyle.cpp
+++ b/src/swft/SVGStyle.cpp
@@ -1,6 +1,6 @@
 #include "SVGStyle.h"
 #include "SVGAttributeParser.h"
-#include <string.h>
+#include <cstring>
 
 #define TMP_STRLEN 0xFF
 
diff --git a/src/swft/swft.cpp b/src/swft/swft.cpp
index 9ef841f..c462da6 100644
--- a/src/swft/swft.cpp
+++ b/src/swft/swft.cpp
@@ -3,8 +3,8 @@
 #include <libxslt/xsltutils.h>
 #include <libxslt/variables.h>
 #include <libxml/xpathInternals.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "swft.h"
 
 #define TMP_STRLEN 0xFF
diff --git a/src/swft/swft_import.cpp b/src/swft/swft_import.cpp
index 4df634f..ead3662 100644
--- a/src/swft/swft_import.cpp
+++ b/src/swft/swft_import.cpp
@@ -2,7 +2,7 @@
 #include <libxslt/xsltutils.h>
 #include <libxml/xpathInternals.h>
 #include "base64.h"
-#include <string.h>
+#include <cstring>
 
 void swft_addFileName( xmlNodePtr node, const char *filename ) {
 	char *name, *b;
diff --git a/src/swft/swft_import_binary.cpp b/src/swft/swft_import_binary.cpp
index 6bf7cee..0bb446e 100644
--- a/src/swft/swft_import_binary.cpp
+++ b/src/swft/swft_import_binary.cpp
@@ -5,7 +5,7 @@
 #include "swft.h"
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <string.h>
+#include <cstring>
 #include "readpng.h"
 #include <zlib.h>
 
diff --git a/src/swft/swft_import_jpeg.cpp b/src/swft/swft_import_jpeg.cpp
index 506aba2..e1afbad 100644
--- a/src/swft/swft_import_jpeg.cpp
+++ b/src/swft/swft_import_jpeg.cpp
@@ -5,7 +5,7 @@
 #include "swft.h"
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <string.h>
+#include <cstring>
 #include "readpng.h"
 #include <zlib.h>
 
diff --git a/src/swft/swft_import_mp3.cpp b/src/swft/swft_import_mp3.cpp
index 1706a97..9ee4602 100644
--- a/src/swft/swft_import_mp3.cpp
+++ b/src/swft/swft_import_mp3.cpp
@@ -5,7 +5,7 @@
 #include "swft.h"
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <string.h>
+#include <cstring>
 
 #define TMP_STRLEN 0xff
 
diff --git a/src/swft/swft_import_png.cpp b/src/swft/swft_import_png.cpp
index 1059709..de1339f 100644
--- a/src/swft/swft_import_png.cpp
+++ b/src/swft/swft_import_png.cpp
@@ -5,7 +5,7 @@
 #include "swft.h"
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <string.h>
+#include <cstring>
 #include "readpng.h"
 #include <zlib.h>
 
diff --git a/src/swft/swft_import_ttf.cpp b/src/swft/swft_import_ttf.cpp
index 31b242e..c9cd183 100644
--- a/src/swft/swft_import_ttf.cpp
+++ b/src/swft/swft_import_ttf.cpp
@@ -5,8 +5,8 @@
 #include "swft.h"
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <string.h>
-#include <math.h>
+#include <cstring>
+#include <cmath>
 
 #include "SWF.h"
 #include <ft2build.h>
diff --git a/src/swft/swft_import_wav.cpp b/src/swft/swft_import_wav.cpp
index 9df6096..6e160a9 100644
--- a/src/swft/swft_import_wav.cpp
+++ b/src/swft/swft_import_wav.cpp
@@ -5,7 +5,7 @@
 #include "swft.h"
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <string.h>
+#include <cstring>
 
 #define TMP_STRLEN 0xff
 
diff --git a/src/xslt/xslt_pack.cpp b/src/xslt/xslt_pack.cpp
index 7b700a8..4708587 100644
--- a/src/xslt/xslt_pack.cpp
+++ b/src/xslt/xslt_pack.cpp
@@ -1,5 +1,5 @@
 #include "xslt.h"
-#include <string.h>
+#include <cstring>
 
 namespace SWF {