Applying fixes for gcc 4.3 build issues (closes LP: #169115)

diff --git a/src/color-profile.cpp b/src/color-profile.cpp
index a9503992810587049b87027e292f28ff73c5b128..ecc0bcd4e37520a7eb2f6f9005f3947f540b322f 100644 (file)
--- a/src/color-profile.cpp
+++ b/src/color-profile.cpp
@@ -10,6 +10,8 @@
 #include <gtk/gtkmessagedialog.h>
 #endif // DEBUG_LCMS
 
+#include <cstring>
+#include <string>
 #include "xml/repr.h"
 #include "color-profile.h"
 #include "color-profile-fns.h"

diff --git a/src/conn-avoid-ref.cpp b/src/conn-avoid-ref.cpp
index 0bbefa3c015d194af8f777d7ad72c255e037f0c1..997e316b52e7e8cd640107356c96c9f7a6c0df28 100644 (file)
--- a/src/conn-avoid-ref.cpp
+++ b/src/conn-avoid-ref.cpp
@@ -10,6 +10,8 @@
  */
 
 
+#include <cstring>
+#include <string>
 
 #include "sp-item.h"
 #include "conn-avoid-ref.h"

diff --git a/src/connector-context.cpp b/src/connector-context.cpp
index 3e04883b7853a9a335007261d9afc69e05d42626..6da465f2a48691557a97d0ffb71f5bbd95bc4030 100644 (file)
--- a/src/connector-context.cpp
+++ b/src/connector-context.cpp
@@ -42,6 +42,8 @@
  */
 
 #include <gdk/gdkkeysyms.h>
+#include <string>
+#include <cstring>
 
 #include "connector-context.h"
 #include "pixmaps/cursor-connector.xpm"

diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp
index fe388ded39b26b066b88e9af5c750ef50020ff65..7ff2be2c880b15d1462cdab9e054abffd737a2c6 100644 (file)
--- a/src/desktop-style.cpp
+++ b/src/desktop-style.cpp
@@ -12,6 +12,9 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <string>
+#include <cstring>
+
 #include "desktop.h"
 #include "color-rgba.h"
 #include "svg/css-ostringstream.h"

diff --git a/src/dialogs/object-attributes.cpp b/src/dialogs/object-attributes.cpp
index f23e986b123b00a1fad7a28903507dce17aeccbd..475e8dce6300c7e7588fdd82170b6c1569dba342 100644 (file)
--- a/src/dialogs/object-attributes.cpp
+++ b/src/dialogs/object-attributes.cpp
@@ -16,8 +16,9 @@
 # include "config.h"
 #endif
 
-#include <string.h>
 #include <glibmm/i18n.h>
+#include <string>
+#include <cstring>
 
 #include "helper/window.h"
 #include "macros.h"

diff --git a/src/dir-util.cpp b/src/dir-util.cpp
index b2a7c97f6fcd630a005bc77c8b2a8fdb8feab3b7..7cc69f89df3b90a7502e9610577db60b14e5c6c3 100644 (file)
--- a/src/dir-util.cpp
+++ b/src/dir-util.cpp
@@ -3,7 +3,8 @@
 #define DIR_UTIL_C
 
 #include <errno.h>
-#include <string.h>
+#include <string>
+#include <cstring>
 #include <glib/gutils.h>
 #include <glib/gmem.h>
 #include <glib/gerror.h>

diff --git a/src/display/canvas-grid.h b/src/display/canvas-grid.h
index c201fa7df8e794f91a59f14c16efbbe579dae654..8ae26d4c48928db4eff047462ac68b8c53cfc7d4 100644 (file)
--- a/src/display/canvas-grid.h
+++ b/src/display/canvas-grid.h
@@ -11,21 +11,20 @@
  *
  */
 
-#include <display/sp-canvas.h>
-#include "xml/repr.h"
-#include <gtkmm/box.h>
-
+#include <cstring>
+#include <string>
 
+#include <gtkmm/box.h>
 #include <gtkmm.h>
+
+#include "display/sp-canvas.h"
+#include "xml/repr.h"
 #include "ui/widget/color-picker.h"
 #include "ui/widget/scalar-unit.h"
-
 #include "ui/widget/registered-widget.h"
 #include "ui/widget/registry.h"
 #include "ui/widget/tolerance-slider.h"
-
 #include "xml/node-event-vector.h"
-
 #include "snapper.h"
 #include "line-snapper.h"
 

diff --git a/src/display/curve.cpp b/src/display/curve.cpp
index 01148c44c834bb5d2ccc99ee95af91bfa2d863b0..9b59a3c452d39d32f00ead6b23ef77e95d532c73 100644 (file)
--- a/src/display/curve.cpp
+++ b/src/display/curve.cpp
@@ -21,6 +21,8 @@
 #include <libnr/n-art-bpath.h>
 #include <libnr/nr-point-matrix-ops.h>
 #include <libnr/nr-translate-ops.h>
+#include <cstring>
+#include <string>
 
 #define SP_CURVE_LENSTEP 32
 

diff --git a/src/display/nr-arena-item.cpp b/src/display/nr-arena-item.cpp
index c78a0eca534ffd76bb57f602cf02ea6ad5d884b5..95b0c0eae69328aea84ec3d15d79cf7258142005 100644 (file)
--- a/src/display/nr-arena-item.cpp
+++ b/src/display/nr-arena-item.cpp
@@ -15,6 +15,8 @@
 #define noNR_ARENA_ITEM_VERBOSE
 #define noNR_ARENA_ITEM_DEBUG_CASCADE
 
+#include <cstring>
+#include <string>
 
 #include <libnr/nr-blit.h>
 #include <libnr/nr-pixops.h>

diff --git a/src/display/nr-filter-gaussian.cpp b/src/display/nr-filter-gaussian.cpp
index a3fa37bd76ed7d9ae61ec70bb857dade288f43ca..b4d1fb00dd3fd69ddf811f9fac0391fe379b3a23 100644 (file)
--- a/src/display/nr-filter-gaussian.cpp
+++ b/src/display/nr-filter-gaussian.cpp
@@ -17,6 +17,7 @@
 #include <cmath>
 #include <complex>
 #include <glib.h>
+#include <cstdlib>
 #include <limits>
 
 #include "isnan.h"

diff --git a/src/display/nr-filter.cpp b/src/display/nr-filter.cpp
index 84e8180bc80c2fcbf44e7f3f128c2194124b65e9..6027b5f27e4bf187b54b0c9d73c1ceda9789d524 100644 (file)
--- a/src/display/nr-filter.cpp
+++ b/src/display/nr-filter.cpp
@@ -13,6 +13,8 @@
 
 #include <glib.h>
 #include <cmath>
+#include <cstring>
+#include <string>
 
 #include "display/nr-filter.h"
 #include "display/nr-filter-primitive.h"

diff --git a/src/document-undo.cpp b/src/document-undo.cpp
index 7df4943b7ab2c15345c219d13d2893a596becda4..ae1c82e71f4e4d2e02b4ab2e6e480599ac26096f 100644 (file)
--- a/src/document-undo.cpp
+++ b/src/document-undo.cpp
@@ -58,6 +58,8 @@
 #if HAVE_STDLIB_H
 #endif
 
+#include <string>
+#include <cstring>
 #include "xml/repr.h"
 #include "document-private.h"
 #include "inkscape.h"

diff --git a/src/document.cpp b/src/document.cpp
index bb63db52b31f28557133c94ecc7131ff5c49eb3a..fb160fd9ef5de74432c883de046928ebe386832c 100644 (file)
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -38,6 +38,8 @@
 # include "config.h"
 #endif
 #include <gtk/gtkmain.h>
+#include <string>
+#include <cstring>
 #include "application/application.h"
 #include "application/editor.h"
 #include "libnr/nr-matrix-fns.h"

diff --git a/src/dyna-draw-context.cpp b/src/dyna-draw-context.cpp
index 7a229883ec175937959e676b76ada827efeb0ac0..666ea4d2da0132db2bb9ea3b55df7c03be703b0b 100644 (file)
--- a/src/dyna-draw-context.cpp
+++ b/src/dyna-draw-context.cpp
@@ -28,7 +28,8 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <glibmm/i18n.h>
-
+#include <string>
+#include <cstring>
 #include <numeric>
 
 #include "svg/svg.h"

diff --git a/src/event-context.cpp b/src/event-context.cpp
index 146237346b1360899a7e97afecb2f8381ccbd096..f482c99fb0dc6d0880591e0c37e4d19f6ee9fde8 100644 (file)
--- a/src/event-context.cpp
+++ b/src/event-context.cpp
@@ -32,6 +32,8 @@
 #include <gtk/gtkmain.h>
 #include <gtk/gtkmenu.h>
 #include <glibmm/i18n.h>
+#include <cstring>
+#include <string>
 
 #include "display/sp-canvas.h"
 #include "xml/node-event-vector.h"

diff --git a/src/gc.cpp b/src/gc.cpp
index 248a324bda7b86d220fd3ddd328094383ecd36cb..8a55a3b15eb6a970dcd7560a8493e98d4b699f27 100644 (file)
--- a/src/gc.cpp
+++ b/src/gc.cpp
@@ -11,6 +11,8 @@
 
 #include "gc-core.h"
 #include <stdexcept>
+#include <cstring>
+#include <string>
 #include <glib/gmessages.h>
 #include <sigc++/functors/ptr_fun.h>
 #include <glibmm/main.h>

diff --git a/src/gradient-drag.cpp b/src/gradient-drag.cpp
index 11cc3cf3b036673a4ef2a7d9c5132a3870c14465..a557209ea162954a937a3a5cf457e1edaba53967 100644 (file)
--- a/src/gradient-drag.cpp
+++ b/src/gradient-drag.cpp
@@ -18,6 +18,8 @@
 #endif
 
 #include <glibmm/i18n.h>
+#include <cstring>
+#include <string>
 
 #include "desktop-handles.h"
 #include "selection.h"

diff --git a/src/graphlayout/graphlayout.cpp b/src/graphlayout/graphlayout.cpp
index ffab82362eb404bf615011b97ae9b35f2f9a7598..9285e9618cc510350104cb8f3d758c2852cf9bd9 100644 (file)
--- a/src/graphlayout/graphlayout.cpp
+++ b/src/graphlayout/graphlayout.cpp
@@ -14,6 +14,8 @@
 #include <map>
 #include <vector>
 #include <algorithm>
+#include <cstring>
+#include <cstdlib>
 #include <float.h>
 
 #include "desktop.h"

diff --git a/src/inkjar/jar.cpp b/src/inkjar/jar.cpp
index 655f11cbbbaf98d76f572d01b77f5ba3c63dec61..d78fcf0cd6f736cc6b506c64a12dbcb74cfe7dc1 100644 (file)
--- a/src/inkjar/jar.cpp
+++ b/src/inkjar/jar.cpp
@@ -42,7 +42,9 @@
 #include <fcntl.h>
 //#endif
 
-
+#include <cstring>
+#include <string>
+#include <cstdlib>
 #include <glib.h>
 
 #include "jar.h"

diff --git a/src/inkscape.cpp b/src/inkscape.cpp
index cd176c0cfbc7c883d9da135bde77211713fd4f08..388b8fb1f87f6030679d7edf7a12e071aff317c5 100644 (file)
--- a/src/inkscape.cpp
+++ b/src/inkscape.cpp
@@ -43,6 +43,8 @@ using Inkscape::Extension::Internal::PrintWin32;
 #include <gtk/gtkmessagedialog.h>
 
 #include <glibmm/i18n.h>
+#include <string>
+#include <cstring>
 #include "helper/sp-marshal.h"
 #include "dialogs/debugdialog.h"
 #include "application/application.h"

diff --git a/src/io/gzipstream.cpp b/src/io/gzipstream.cpp
index 02309ecdd3aeaf5cc4c601631f8271c0da1e229f..f19fd327d1ea8123183dfa32d45ebe14e5d297a5 100644 (file)
--- a/src/io/gzipstream.cpp
+++ b/src/io/gzipstream.cpp
@@ -14,7 +14,8 @@
  */
 
 #include "gzipstream.h"
-
+#include <cstring>
+#include <string>
 
 namespace Inkscape
 {

diff --git a/src/io/simple-sax.cpp b/src/io/simple-sax.cpp
index 2ba103cd3435f4206225c3fedbc1ed8a9a03477e..d8733858b5cfe9c09801d24f2e567595d3a0a7d8 100644 (file)
--- a/src/io/simple-sax.cpp
+++ b/src/io/simple-sax.cpp
@@ -9,7 +9,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-
+#include <string>
+#include <cstring>
 #include "simple-sax.h"
 
 namespace Inkscape {

diff --git a/src/io/uristream.cpp b/src/io/uristream.cpp
index 9787620dbd27b2eca2135103385fb3b7420e7948..f529c7f8bc19de009581298a2842c9d6a9695fd6 100644 (file)
--- a/src/io/uristream.cpp
+++ b/src/io/uristream.cpp
@@ -13,6 +13,8 @@
 
 #include "uristream.h"
 #include "sys.h"
+#include <string>
+#include <cstring>
 
 #ifdef WIN32
 // For now to get at is_os_wide().

diff --git a/src/libavoid/connector.cpp b/src/libavoid/connector.cpp
index 3526b3f1594b3b37e8ca52c53416ffe706d104dd..6473033718981abbd7a53bb0c627bacbed8e8102 100644 (file)
--- a/src/libavoid/connector.cpp
+++ b/src/libavoid/connector.cpp
@@ -17,9 +17,10 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * 
+ *
 */
 
+#include <cstdlib>
 #include "libavoid/graph.h"
 #include "libavoid/connector.h"
 #include "libavoid/makepath.h"
@@ -30,7 +31,6 @@
 
 namespace Avoid {
 
-    
 ConnRef::ConnRef(Router *router, const unsigned int id)
     : _router(router)
     , _id(id)

diff --git a/src/libavoid/makepath.cpp b/src/libavoid/makepath.cpp
index 9a4f7beaac28eb9dd9cbf2263d9b351c960aa0d3..56d3a257e2e61e40852cf6e483d836a43608360c 100644 (file)
--- a/src/libavoid/makepath.cpp
+++ b/src/libavoid/makepath.cpp
@@ -33,6 +33,7 @@
 #include "libavoid/router.h"
 #include <algorithm>
 #include <vector>
+#include <climits>
 #include <limits.h>
 #include <math.h>
 

diff --git a/src/libavoid/router.cpp b/src/libavoid/router.cpp
index 4b1652ca0f52dcff26a99688b00c2483ded4b50c..df0bacd0266e848fd15e7f889c85397897dc45dc 100644 (file)
--- a/src/libavoid/router.cpp
+++ b/src/libavoid/router.cpp
@@ -17,9 +17,10 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * 
+ *
 */
 
+#include <cstdlib>
 #include "libavoid/shape.h"
 #include "libavoid/router.h"
 #include "libavoid/visibility.h"
@@ -636,7 +637,7 @@ void Router::markConnectors(ShapeRef *shape)
                 if (((int) r_p2.y) != 0)
                 {
                     printf("r_p2.y: %f != 0\n", r_p2.y);
-                    abort();
+                    std::abort();
                 }
                 // This might be slightly off.
                 r_p2.y = 0;

diff --git a/src/libavoid/visibility.cpp b/src/libavoid/visibility.cpp
index 58df94d9272b7c600db7a2535ffb77dcd637375b..d2b0576435c365c4a7c798679b1c961b6869c0d8 100644 (file)
--- a/src/libavoid/visibility.cpp
+++ b/src/libavoid/visibility.cpp
@@ -20,7 +20,6 @@
  *
 */
 
-
 #include <algorithm>
 #include <cfloat>
 

diff --git a/src/libcola/straightener.cpp b/src/libcola/straightener.cpp
index 6b062eb32bf3252cb3db50bee2e67a6d24ff1ee6..e237c03c3fec73d287432423383400b98c7298eb 100644 (file)
--- a/src/libcola/straightener.cpp
+++ b/src/libcola/straightener.cpp
@@ -1,5 +1,5 @@
 /*
-** vim: set cindent 
+** vim: set cindent
 ** vim: ts=4 sw=4 et tw=0 wm=0
 */
 /**
@@ -20,6 +20,7 @@
 #include "straightener.h"
 #include <iostream>
 #include <cmath>
+#include <cstdlib>
 
 using std::set;
 using std::vector;

diff --git a/src/libnr/n-art-bpath.h b/src/libnr/n-art-bpath.h
index 0f0f690fc3996f7aada6bc84def140d4dcf74475..fdb9855be06c9bc84a79e07c4f401bc4adc4c2fc 100644 (file)
--- a/src/libnr/n-art-bpath.h
+++ b/src/libnr/n-art-bpath.h
@@ -9,6 +9,7 @@
 
 #include "libnr/nr-point.h"
 #include "libnr/nr-path-code.h"
+#include <cstdlib>
 
 /**
  * Old-style path segment.
@@ -31,7 +32,7 @@ public:
             case 1: return NR::Point(x1, y1);
             case 2: return NR::Point(x2, y2);
             case 3: return NR::Point(x3, y3);
-            default: abort();
+            default: std::abort();
         }
     }
 
@@ -43,7 +44,7 @@ public:
             case 1: x1 = p[X]; y1 = p[Y]; break;
             case 2: x2 = p[X]; y2 = p[Y]; break;
             case 3: x3 = p[X]; y3 = p[Y]; break;
-            default: abort();
+            default: std::abort();
         }
     }
 };

diff --git a/src/libnr/nr-matrix.cpp b/src/libnr/nr-matrix.cpp
index 12a2f2fcbd7e8f75f3e584ce0f8ac17d8761b8a5..db01b966edd19bdedd2329a1a9377028caa43925 100644 (file)
--- a/src/libnr/nr-matrix.cpp
+++ b/src/libnr/nr-matrix.cpp
@@ -11,6 +11,7 @@
  * This code is in public domain
  */
 
+#include <cstdlib>
 #include "nr-matrix.h"
 
 
@@ -605,7 +606,7 @@ void assert_close(Matrix const &a, Matrix const &b)
                 a[0], a[1], b[0], b[1],
                 a[2], a[3], b[2], b[3],
                 a[4], a[5], b[4], b[5]);
-        abort();
+        std::abort();
     }
 }
 

diff --git a/src/libnr/nr-pixblock.cpp b/src/libnr/nr-pixblock.cpp
index 2f103d7d126981215f62a65d9f7646c7a488ff73..8d2e930efa8a89508e6996f6e025d66729d572f2 100644 (file)
--- a/src/libnr/nr-pixblock.cpp
+++ b/src/libnr/nr-pixblock.cpp
@@ -9,6 +9,9 @@
  * This code is in the Public Domain
  */
 
+#include <cstring>
+#include <string>
+#include <string.h>
 #include <glib/gmem.h>
 #include "nr-pixblock.h"
 

diff --git a/src/libvpsc/csolve_VPSC.cpp b/src/libvpsc/csolve_VPSC.cpp
index bd7db5ab21ffb0b41d7d3f1b4bd4a2a3ec8a979e..5176242d5f08c451e41fc1b3674729ff11da7c38 100644 (file)
--- a/src/libvpsc/csolve_VPSC.cpp
+++ b/src/libvpsc/csolve_VPSC.cpp
@@ -10,6 +10,7 @@
  */
 #include <iostream>
 #include <cassert>
+#include <cstdlib>
 #include "variable.h"
 #include "constraint.h"
 #include "generate-constraints.h"

diff --git a/src/libvpsc/generate-constraints.cpp b/src/libvpsc/generate-constraints.cpp
index 3b69e7968a25d4de31c4bae6689e6992dbecf4e3..3574a2743b3ac1f39ee4698e8a7f9bae106f06d1 100644 (file)
--- a/src/libvpsc/generate-constraints.cpp
+++ b/src/libvpsc/generate-constraints.cpp
@@ -12,6 +12,7 @@
 
 #include <set>
 #include <cassert>
+#include <cstdlib>
 #include "generate-constraints.h"
 #include "constraint.h"
 

diff --git a/src/livarot/BitLigne.cpp b/src/livarot/BitLigne.cpp
index d6196d29e7135e6c76f9604466116f14f06f0b39..c4c134615b24e00e18f40bde7fa538b3b3d68b88 100644 (file)
--- a/src/livarot/BitLigne.cpp
+++ b/src/livarot/BitLigne.cpp
@@ -10,8 +10,11 @@
 #include "BitLigne.h"
 
 #include <math.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstring>
+#include <cstdlib>
+#include <string>
+#include <cmath>
+#include <cstdio>
 #include <glib/gmem.h>
 
 BitLigne::BitLigne(int ist,int ien,float iScale)

diff --git a/src/livarot/PathCutting.cpp b/src/livarot/PathCutting.cpp
index 276c9b260f4796b6a0ec8e9642e6a3153fdb36e9..7bc1114a38fa76ecb63e2f1ce94ef1141098a762 100644 (file)
--- a/src/livarot/PathCutting.cpp
+++ b/src/livarot/PathCutting.cpp
@@ -13,6 +13,10 @@
  *  Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <cstring>
+#include <string>
+#include <cstdio>
+
 #include "Path.h"
 #include "style.h"
 #include "livarot/path-description.h"
@@ -25,11 +29,11 @@ void  Path::DashPolyline(float head,float tail,float body,int nbD,float *dashs,b
 
   std::vector<path_lineto> orig_pts = pts;
   pts.clear();
-  
+
   int       lastMI=-1;
   int curP = 0;
   int lastMP = -1;
-  
+
   for (int i = 0; i < int(orig_pts.size()); i++) {
     if ( orig_pts[curP].isMoveTo == polyline_moveto ) {
       if ( lastMI >= 0 && lastMI < i-1 ) { // au moins 2 points

diff --git a/src/livarot/Shape.cpp b/src/livarot/Shape.cpp
index c694cdd2776b958e2369a6e9f3b24ed921e42f97..d03940f2f7fe01268ecb6df0506460e997e20efa 100644 (file)
--- a/src/livarot/Shape.cpp
+++ b/src/livarot/Shape.cpp
@@ -6,6 +6,8 @@
  *
  */
 
+#include <cstdio>
+#include <cstdlib>
 #include <glib/gmem.h>
 #include "Shape.h"
 #include "livarot/sweep-event-queue.h"

diff --git a/src/livarot/ShapeDraw.cpp b/src/livarot/ShapeDraw.cpp
index 07e46afc70637d8549fe63ec96973da346a1a867..f3a8dbd1fdf7cd16c548fef01705c20fb7c81e5a 100644 (file)
--- a/src/livarot/ShapeDraw.cpp
+++ b/src/livarot/ShapeDraw.cpp
@@ -6,6 +6,9 @@
  *
  */
 
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "Shape.h"
 //#include <ApplicationServices/ApplicationServices.h>
 

diff --git a/src/livarot/ShapeMisc.cpp b/src/livarot/ShapeMisc.cpp
index 12b8d84910226ea145069b48e6396e097e5629a6..2b398ef7c34b4621a221be5fe35bbd5a445004f0 100644 (file)
--- a/src/livarot/ShapeMisc.cpp
+++ b/src/livarot/ShapeMisc.cpp
@@ -11,6 +11,9 @@
 #include "livarot/Path.h"
 #include "livarot/path-description.h"
 #include <glib.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 /*
  * polygon offset and polyline to path reassembling (when using back data)

diff --git a/src/livarot/ShapeSweep.cpp b/src/livarot/ShapeSweep.cpp
index 70f33af2c77c129b43317790a6575ab259d2e284..18f8e3a69ee0209bd3a813a0eaa8d21bd1062511 100644 (file)
--- a/src/livarot/ShapeSweep.cpp
+++ b/src/livarot/ShapeSweep.cpp
@@ -6,6 +6,9 @@
  *
  */
 
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <glib/gmem.h>
 #include "Shape.h"
 #include "livarot/sweep-event-queue.h"

diff --git a/src/livarot/float-line.cpp b/src/livarot/float-line.cpp
index afa3b6032cb2361dc8bdc17e38daa624f429ff16..95914313808ab59dce30bf76900cc86483f019da 100644 (file)
--- a/src/livarot/float-line.cpp
+++ b/src/livarot/float-line.cpp
@@ -2,7 +2,7 @@
  *  \file livarot/float-line.cpp
  *
  * Implementation of coverage with floating-point values.
- * 
+ *
  *  \author Fred
  *
  *  public domain
@@ -14,6 +14,7 @@
 #endif
 #include "livarot/float-line.h"
 #include "livarot/int-line.h"
+#include <cstdio>
 
 FloatLigne::FloatLigne()
 {
@@ -23,7 +24,6 @@ FloatLigne::FloatLigne()
 
 FloatLigne::~FloatLigne()
 {
-    
 }
 
 /// Reset the line to  empty (boundaries and runs).

diff --git a/src/livarot/int-line.cpp b/src/livarot/int-line.cpp
index fabe8d01c52dc86decfe606923d2bfc07896f2e0..c1e388fe2ea7ba6d158f266489d65739e3ad3353 100644 (file)
--- a/src/livarot/int-line.cpp
+++ b/src/livarot/int-line.cpp
@@ -11,6 +11,10 @@
 
 #include <glib/gmem.h>
 #include <cmath>
+#include <cstring>
+#include <string>
+#include <cstdlib>
+#include <cstdio>
 #include "livarot/int-line.h"
 #include "livarot/float-line.h"
 #include "livarot/BitLigne.h"

diff --git a/src/main.cpp b/src/main.cpp
index f5e76a6324cefe02ff54761449954042c63a78cb..4580b7271a4e1cef1f7e27ec3b66d82c785a5285 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -33,7 +33,8 @@
 #ifdef HAVE_IEEEFP_H
 #include <ieeefp.h>
 #endif
-#include <string.h>
+#include <cstring>
+#include <string>
 #include <locale.h>
 
 #include <popt.h>

diff --git a/src/marker.cpp b/src/marker.cpp
index 15b85659560a1522868a59c3fcd02eb3d0f6563f..0050fc87c58406d039e5138646e5c4a765c56c38 100644 (file)
--- a/src/marker.cpp
+++ b/src/marker.cpp
@@ -13,6 +13,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <cstring>
+#include <string>
 #include "config.h"
 
 

diff --git a/src/message-stack.cpp b/src/message-stack.cpp
index 33a23e7f38a78b116c7a8b2ece3964d227b6b1d4..05aec87fc8a1951c5108f49c228200f32715d700 100644 (file)
--- a/src/message-stack.cpp
+++ b/src/message-stack.cpp
@@ -11,6 +11,8 @@
 
 #include <string.h>
 #include <glib/gstrfuncs.h>
+#include <cstring>
+#include <string>
 #include "message-stack.h"
 
 namespace Inkscape {

diff --git a/src/node-context.cpp b/src/node-context.cpp
index 3d11aefe4a39c303ba783e9e41aa1a11199ee04f..14fcc8866b8b92dd192244d11616c65eb51f0c2c 100644 (file)
--- a/src/node-context.cpp
+++ b/src/node-context.cpp
@@ -13,6 +13,8 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+#include <cstring>
+#include <string>
 #include <gdk/gdkkeysyms.h>
 #include "macros.h"
 #include <glibmm/i18n.h>

diff --git a/src/nodepath.cpp b/src/nodepath.cpp
index 55c9ea3c7f036ff0f8d44100452be9e9f5b2de45..d0becd45dbf58f01042facd59a7bce2496bb0fbd 100644 (file)
--- a/src/nodepath.cpp
+++ b/src/nodepath.cpp
@@ -47,6 +47,8 @@
 #include "display/bezier-utils.h"
 #include <vector>
 #include <algorithm>
+#include <cstring>
+#include <string>
 #include "live_effects/lpeobject.h"
 #include "live_effects/parameter/parameter.h"
 #include "util/mathfns.h"

diff --git a/src/path-chemistry.cpp b/src/path-chemistry.cpp
index 32e2a7beca74ce65f1ace23297ba3b9edadad1c7..254a00e275fa5f0b27f86534ebd31b443794ca02 100644 (file)
--- a/src/path-chemistry.cpp
+++ b/src/path-chemistry.cpp
@@ -16,6 +16,8 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+#include <cstring>
+#include <string>
 #include "xml/repr.h"
 #include "svg/svg.h"
 #include "display/curve.h"

diff --git a/src/pedro/pedroconfig.cpp b/src/pedro/pedroconfig.cpp
index 08b9cd17b4b686dfde4a0673f62a6c047471650a..250674477eb00dc9e9f395cff482f786a91c9631 100644 (file)
--- a/src/pedro/pedroconfig.cpp
+++ b/src/pedro/pedroconfig.cpp
@@ -49,6 +49,9 @@ We are expecting an xml file with this format:
 #include "pedrodom.h"
 
 #include <stdio.h>
+#include <cstring>
+#include <string>
+#include <cstdlib>
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/src/pedro/pedroxmpp.cpp b/src/pedro/pedroxmpp.cpp
index bed99004f58a903e6ac75ebdc619944771b3e165..72a0cb832bff2b02794ead5efebb34e401d041de 100644 (file)
--- a/src/pedro/pedroxmpp.cpp
+++ b/src/pedro/pedroxmpp.cpp
@@ -22,7 +22,8 @@
  */
 
 
-#include <stdio.h>
+#include <algorithm>
+#include <cstdio>
 #include <stdarg.h>
 #include <stdlib.h>
 

diff --git a/src/pen-context.cpp b/src/pen-context.cpp
index cae8afbc932b7f77260edd436dd7ab93948a8215..204ed9c8d22ab35b01adae08e9637b7623337e44 100644 (file)
--- a/src/pen-context.cpp
+++ b/src/pen-context.cpp
@@ -16,6 +16,8 @@
  */
 
 #include <gdk/gdkkeysyms.h>
+#include <cstring>
+#include <string>
 
 #include "pen-context.h"
 #include "sp-namedview.h"

diff --git a/src/prefix.cpp b/src/prefix.cpp
index 4999e152432025a7ff978e8b9ecffcf322cea07d..0814bd53f9172d5ba4ff4fc36f2b17fc1a352f19 100644 (file)
--- a/src/prefix.cpp
+++ b/src/prefix.cpp
@@ -39,10 +39,10 @@
     #include <glib.h> //for GThreads
 #endif /* BR_THREADS */
 
-#include <stdlib.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstdio>
+#include <cstring>
 #include <limits.h>
-#include <string.h>
 #include "prefix.h"
 
 #ifdef __cplusplus

diff --git a/src/rect-context.cpp b/src/rect-context.cpp
index 938b4496dca3a3186adfcd7399e7fc53bebf5759..6aa7d418c85499652b422e08431e9acd0ee05c0a 100644 (file)
--- a/src/rect-context.cpp
+++ b/src/rect-context.cpp
@@ -18,6 +18,8 @@
 #include "inkscape.h"
 
 #include <gdk/gdkkeysyms.h>
+#include <cstring>
+#include <string>
 
 #include "macros.h"
 #include "display/sp-canvas.h"

diff --git a/src/select-context.cpp b/src/select-context.cpp
index 48afadb2bb85635447ce2b1e156eeb65d53b08c3..0eb5777cf609cd27366315eff8161fa356e5f484 100644 (file)
--- a/src/select-context.cpp
+++ b/src/select-context.cpp
@@ -16,6 +16,8 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+#include <cstring>
+#include <string>
 #include <gdk/gdkkeysyms.h>
 #include "macros.h"
 #include "rubberband.h"

diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp
index caf32ce3e7a01968060bb461f081c0027b93ea89..07b79b2596047c4fac865df8a49de8c8453105a4 100644 (file)
--- a/src/selection-chemistry.cpp
+++ b/src/selection-chemistry.cpp
@@ -72,6 +72,8 @@
 #include "layer-fns.h"
 #include "context-fns.h"
 #include <map>
+#include <cstring>
+#include <string>
 #include "helper/units.h"
 #include "sp-item.h"
 #include "box3d.h"

diff --git a/src/seltrans.cpp b/src/seltrans.cpp
index a3f34384107f93300bf100471b2dcdb57dc09d0f..7d09289bc7332247fae97a23f3ea317c0262b067 100644 (file)
--- a/src/seltrans.cpp
+++ b/src/seltrans.cpp
@@ -16,6 +16,8 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+#include <cstring>
+#include <string>
 
 #include <libnr/nr-matrix-ops.h>
 #include <libnr/nr-matrix-translate-ops.h>

diff --git a/src/shortcuts.cpp b/src/shortcuts.cpp
index 12657410c9b66b35bfc46e53304c1ef699cb4b18..7d0f3747d044153a9a56f64af47551491b15d4a6 100644 (file)
--- a/src/shortcuts.cpp
+++ b/src/shortcuts.cpp
@@ -23,6 +23,8 @@
 #endif
 
 #include <vector>
+#include <cstring>
+#include <string>
 
 #include <gdk/gdkkeys.h>
 #include <gdk/gdkkeysyms.h>

diff --git a/src/sp-clippath.cpp b/src/sp-clippath.cpp
index f21a15cdfebcd2596a69f69e0755d0781bf7e19f..881605a13c3dfc7cdc16fd4cddc9135ad7f2fa03 100644 (file)
--- a/src/sp-clippath.cpp
+++ b/src/sp-clippath.cpp
@@ -12,7 +12,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-
+#include <cstring>
+#include <string>
 
 #include "display/nr-arena.h"
 #include "display/nr-arena-group.h"

diff --git a/src/sp-conn-end-pair.cpp b/src/sp-conn-end-pair.cpp
index d13ef9e86a00f022f0f3c31df91e484928adec2d..0870692938f770455344c3089afd37548cb82b6c 100644 (file)
--- a/src/sp-conn-end-pair.cpp
+++ b/src/sp-conn-end-pair.cpp
@@ -10,6 +10,9 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <cstring>
+#include <string>
+
 #include "attributes.h"
 #include "sp-conn-end.h"
 #include "uri.h"

diff --git a/src/sp-conn-end.cpp b/src/sp-conn-end.cpp
index 3840daf97487d1cf5ecf16544896689503b8a4c5..99b908e69cd70cf5a2d8e2cd34cb48d3f214ab41 100644 (file)
--- a/src/sp-conn-end.cpp
+++ b/src/sp-conn-end.cpp
@@ -1,4 +1,7 @@
 
+#include <cstring>
+#include <string>
+
 #include "display/curve.h"
 #include "libnr/nr-matrix-div.h"
 #include "libnr/nr-matrix-fns.h"

diff --git a/src/sp-cursor.cpp b/src/sp-cursor.cpp
index 3e9c5ef904060f9cb93ffc3986059e442cbbb5ff..4bbba5f10875748550293add149c905de30b6e12 100644 (file)
--- a/src/sp-cursor.cpp
+++ b/src/sp-cursor.cpp
@@ -13,7 +13,8 @@
  */
 
 #include <cstdio>
-#include <string.h>
+#include <cstring>
+#include <string>
 #include <ctype.h>
 #include "sp-cursor.h"
 
@@ -32,7 +33,7 @@ sp_cursor_bitmap_and_mask_from_xpm(GdkBitmap **bitmap, GdkBitmap **mask, gchar c
 
     int transparent_color = ' ';
     int black_color = '.';
-       
+
     char pixmap_buffer[(32 * 32)/8];
     char mask_buffer[(32 * 32)/8];
 

diff --git a/src/sp-filter.cpp b/src/sp-filter.cpp
index e89108d1cae83c3773dd7fc31921a30da7ebeb0f..c74a9ffdb974da0dca92348bb7c4f8dbe5c6761d 100644 (file)
--- a/src/sp-filter.cpp
+++ b/src/sp-filter.cpp
@@ -28,6 +28,8 @@ using std::pair;
 #include "sp-filter-reference.h"
 #include "uri.h"
 #include "xml/repr.h"
+#include <cstring>
+#include <string>
 
 #define SP_MACROS_SILENT
 #include "macros.h"

diff --git a/src/sp-flowtext.cpp b/src/sp-flowtext.cpp
index 01df68b993c3dbaec8b3d6ba58c3c54255dc54af..552adb36eb37a0fe8a00281c8bc09e6ca5d8cc53 100644 (file)
--- a/src/sp-flowtext.cpp
+++ b/src/sp-flowtext.cpp
@@ -5,6 +5,8 @@
 # include "config.h"
 #endif
 #include <glibmm/i18n.h>
+#include <cstring>
+#include <string>
 
 #include "attributes.h"
 #include "xml/repr.h"

diff --git a/src/sp-gradient.cpp b/src/sp-gradient.cpp
index a00924029c8970d5d427f380099ad4057d824ea7..02544d0b1ff805ac409a3b06a98954130dcc3c2a 100644 (file)
--- a/src/sp-gradient.cpp
+++ b/src/sp-gradient.cpp
@@ -18,6 +18,8 @@
 
 #define noSP_GRADIENT_VERBOSE
 
+#include <cstring>
+#include <string>
 
 #include <libnr/nr-matrix-div.h>
 #include <libnr/nr-matrix-fns.h>

diff --git a/src/sp-guide.cpp b/src/sp-guide.cpp
index c54dd32821e6d73086178fb52ca5a23931ad906e..a6312f985ebc3d0cd7033ef36e4e579ccdacd3f1 100644 (file)
--- a/src/sp-guide.cpp
+++ b/src/sp-guide.cpp
@@ -18,6 +18,10 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+
+#include <algorithm>
+#include <cstring>
+#include <string>
 #include "display/guideline.h"
 #include "svg/svg.h"
 #include "svg/stringstream.h"

diff --git a/src/sp-image.cpp b/src/sp-image.cpp
index 46362c889fab1285e23fdc5dff912fd3e7c4b9f2..8c9df56b491d9dee8b2dda4e809aedb5a1e95eef 100644 (file)
--- a/src/sp-image.cpp
+++ b/src/sp-image.cpp
@@ -16,8 +16,10 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-#include <libnr/nr-matrix-fns.h>
 
+#include <cstring>
+#include <string>
+#include <libnr/nr-matrix-fns.h>
 //#define GDK_PIXBUF_ENABLE_BACKEND 1
 //#include <gdk-pixbuf/gdk-pixbuf-io.h>
 #include "display/nr-arena-image.h"

diff --git a/src/sp-item-group.cpp b/src/sp-item-group.cpp
index aafd489669c27b36a64b7fb6ec7985d66a169cde..ac7aee1d4f1ea38f0f176f7a0651faaed1a79155 100644 (file)
--- a/src/sp-item-group.cpp
+++ b/src/sp-item-group.cpp
@@ -19,6 +19,8 @@
 #endif
 
 #include <glibmm/i18n.h>
+#include <cstring>
+#include <string>
 
 #include "display/nr-arena-group.h"
 #include "libnr/nr-matrix-ops.h"

diff --git a/src/sp-item-rm-unsatisfied-cns.cpp b/src/sp-item-rm-unsatisfied-cns.cpp
index 7f3f06975ac818308d15513b26218b21c258b229..fe6d73a3a844d750d7272fea83d33ff790e7934a 100644 (file)
--- a/src/sp-item-rm-unsatisfied-cns.cpp
+++ b/src/sp-item-rm-unsatisfied-cns.cpp
@@ -1,9 +1,12 @@
 
-#include <approx-equal.h>
-#include <remove-last.h>
-#include <sp-guide.h>
-#include <sp-guide-constraint.h>
-#include <sp-item.h>
+#include <algorithm>
+
+#include "approx-equal.h"
+#include "remove-last.h"
+#include "sp-guide.h"
+#include "sp-guide-constraint.h"
+#include "sp-item.h"
+
 using std::vector;
 
 void sp_item_rm_unsatisfied_cns(SPItem &item)

diff --git a/src/sp-mask.cpp b/src/sp-mask.cpp
index 64ff38019d381b915b2f64cc952454be6110c450..0019b598e87047fc71ea7a902a32fd4d3cf0a686 100644 (file)
--- a/src/sp-mask.cpp
+++ b/src/sp-mask.cpp
@@ -11,6 +11,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <cstring>
+#include <string>
 
 #include "display/nr-arena.h"
 #include "display/nr-arena-group.h"

diff --git a/src/sp-namedview.cpp b/src/sp-namedview.cpp
index d26f0052963b437e1ecf13f9ff8d3091babad214..cc7adeaa8250ed8ab1a2f089aa44dca94033bdf7 100644 (file)
--- a/src/sp-namedview.cpp
+++ b/src/sp-namedview.cpp
@@ -15,6 +15,8 @@
  */
 
 #include "config.h"
+#include <cstring>
+#include <string>
 
 #include "display/canvas-grid.h"
 #include "helper/units.h"

diff --git a/src/sp-object.cpp b/src/sp-object.cpp
index ff4769f640b0ee60a9b9d7d3d1c7a0b73dd2174b..99d73970061b9389ebdca9848c2bb8b5814991ac 100644 (file)
--- a/src/sp-object.cpp
+++ b/src/sp-object.cpp
@@ -31,6 +31,8 @@
  * dictionary and so on. Source: doc/architecture.txt
  */
 
+#include <cstring>
+#include <string>
 
 #include "helper/sp-marshal.h"
 #include "xml/node-event-vector.h"

diff --git a/src/sp-offset.cpp b/src/sp-offset.cpp
index 97481a477f93500552713dd44b178967b71dd07a..44384dee9706246bb39dcb73f0be347913d9dc3c 100644 (file)
--- a/src/sp-offset.cpp
+++ b/src/sp-offset.cpp
@@ -19,6 +19,8 @@
 # include "config.h"
 #endif
 
+#include <cstring>
+#include <string>
 
 #include "svg/svg.h"
 #include "attributes.h"

diff --git a/src/sp-pattern.cpp b/src/sp-pattern.cpp
index 21ec66141a16af22c265c582a1bb0de38efcc806..c3d35de7230c579bc29b6a5161764f58551f4ff6 100644 (file)
--- a/src/sp-pattern.cpp
+++ b/src/sp-pattern.cpp
@@ -12,8 +12,12 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
+#include <cstring>
+#include <string>
 #include <libnr/nr-matrix-ops.h>
 #include "libnr/nr-matrix-fns.h"
 #include <libnr/nr-translate-matrix-ops.h>

diff --git a/src/sp-root.cpp b/src/sp-root.cpp
index c555c78a00bce3c97f12f468225fcad3730b8d93..6ad5ff6385798398609a62eb89c2c6b993c5ba15 100644 (file)
--- a/src/sp-root.cpp
+++ b/src/sp-root.cpp
@@ -13,7 +13,12 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <cstring>
+#include <string>
 
 #include "svg/svg.h"
 #include "display/nr-arena-group.h"

diff --git a/src/sp-star.cpp b/src/sp-star.cpp
index 767175e878efeaa34feeff1d99969dafbc64ddd3..a04af838f4115b2a41b03c0fb8d9feefc5aacbe1 100644 (file)
--- a/src/sp-star.cpp
+++ b/src/sp-star.cpp
@@ -14,8 +14,12 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
+#include <cstring>
+#include <string>
 #include <glibmm/i18n.h>
 
 #include "svg/svg.h"

diff --git a/src/sp-symbol.cpp b/src/sp-symbol.cpp
index 5dbbe4e415ca4d9ab1a8bc704e294d03780e8b0c..0a7fca4d212dad84bd385221196fd46537e7e20a 100644 (file)
--- a/src/sp-symbol.cpp
+++ b/src/sp-symbol.cpp
@@ -11,7 +11,12 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <cstring>
+#include <string>
 
 #include "libnr/nr-matrix-fns.h"
 #include "libnr/nr-matrix-ops.h"

diff --git a/src/sp-tspan.cpp b/src/sp-tspan.cpp
index 8050cdbf911424b08ab4d0645a33e86c3f190f9b..7d56e177b93da20e91596e8afdd99a50da5f4135 100644 (file)
--- a/src/sp-tspan.cpp
+++ b/src/sp-tspan.cpp
@@ -27,6 +27,8 @@
 # include "config.h"
 #endif
 
+#include <cstring>
+#include <string>
 #include <glibmm/i18n.h>
 
 #include <livarot/Path.h>

diff --git a/src/sp-use-reference.cpp b/src/sp-use-reference.cpp
index c7923504ae532314992fba0bc24e7f1ac1b1d6eb..1474a43a9fefe477543f494769b8c786b60c3983 100644 (file)
--- a/src/sp-use-reference.cpp
+++ b/src/sp-use-reference.cpp
@@ -7,6 +7,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information.
  */
 
+#include <cstring>
+#include <string>
 #include <string.h>
 
 #include "enums.h"

diff --git a/src/sp-use.cpp b/src/sp-use.cpp
index 0e1c257eb04eae40c8039664667293bd984b9917..dc1774e3ddac495271526904bd9a161ae6f719cd 100644 (file)
--- a/src/sp-use.cpp
+++ b/src/sp-use.cpp
@@ -16,6 +16,10 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+
+#include <cstring>
+#include <string>
+
 #include <libnr/nr-matrix-ops.h>
 #include <libnr/nr-matrix-fns.h>
 #include "libnr/nr-matrix-translate-ops.h"

diff --git a/src/spiral-context.cpp b/src/spiral-context.cpp
index 6dbdb74c950275680f85c57dd6cae02e979ba2f3..d0404c3d024f37ce790151d6bf77ea7c5314ee37 100644 (file)
--- a/src/spiral-context.cpp
+++ b/src/spiral-context.cpp
@@ -17,6 +17,8 @@
 #include "config.h"
 
 #include <gdk/gdkkeysyms.h>
+#include <cstring>
+#include <string>
 
 #include "macros.h"
 #include "display/sp-canvas.h"

diff --git a/src/splivarot.cpp b/src/splivarot.cpp
index f8e666e95a589db04ffeb087fb3f7ad6e9087f56..f176776a68f1c0b62d969b1167afdb02eca28b28 100644 (file)
--- a/src/splivarot.cpp
+++ b/src/splivarot.cpp
@@ -17,6 +17,8 @@
 # include <config.h>
 #endif
 
+#include <cstring>
+#include <string>
 #include <vector>
 #include <glib/gmem.h>
 #include "xml/repr.h"

diff --git a/src/star-context.cpp b/src/star-context.cpp
index 73e230deb57610193b1045f07ba73da3b11a7cc7..cee03b4b1fbea8906f704cb7b470ab38631d9dea 100644 (file)
--- a/src/star-context.cpp
+++ b/src/star-context.cpp
@@ -14,7 +14,12 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <cstring>
+#include <string>
 
 #include <gdk/gdkkeysyms.h>
 

diff --git a/src/streams-gzip.cpp b/src/streams-gzip.cpp
index 9cd1077703cca5c44dd982ee154a33cfefcd60e9..c77e7162b11cf3b34b8d40d0c4bb401dfe8b89a1 100644 (file)
--- a/src/streams-gzip.cpp
+++ b/src/streams-gzip.cpp
@@ -9,6 +9,8 @@
  * Released under GNU LGPL, read the file 'COPYING.LIB' for more information
  */
 
+#include <cstring>
+#include <string>
 #include <string.h>
 
 #include "streams-gzip.h"

diff --git a/src/streams-zlib.cpp b/src/streams-zlib.cpp
index 60953ad5fe327fa476a6ff3c90e3283f4cd34aac..2d5fae01ec6342e98b0bf3216e233ef202f85bb2 100644 (file)
--- a/src/streams-zlib.cpp
+++ b/src/streams-zlib.cpp
@@ -9,6 +9,8 @@
  * Released under GNU LGPL, read the file 'COPYING.LIB' for more information
  */
 
+#include <cstring>
+#include <string>
 #include <string.h>
 #include <vector>
 #include "streams-zlib.h"

diff --git a/src/streq.h b/src/streq.h
index daed17cf05e60982f7641e5409ecb484a18caaf9..c790db9e89685991528c36d6dd4ea0e06e98f1ef 100644 (file)
--- a/src/streq.h
+++ b/src/streq.h
@@ -2,6 +2,7 @@
 #define INKSCAPE_STREQ_H
 
 #include <cstring>
+#include <string>
 
 /** Convenience/readability wrapper for strcmp(a,b)==0. */
 inline bool

diff --git a/src/style.cpp b/src/style.cpp
index 357fe5f0e2a81dd95eb3003a4468036699405142..759b054c2d67ad4fab05c919ecee0a50751f8bb4 100644 (file)
--- a/src/style.cpp
+++ b/src/style.cpp
@@ -19,6 +19,9 @@
 # include "config.h"
 #endif
 
+#include <cstring>
+#include <string>
+
 #include "libcroco/cr-sel-eng.h"
 #include "xml/croco-node-iface.h"
 

diff --git a/src/svg/gnome-canvas-bpath-util.cpp b/src/svg/gnome-canvas-bpath-util.cpp
index b583e1a66a48b99f54fa17a52caa08ff05ae8986..057e54ec223889a9dc6b822bb328e0d59fe0ef84 100644 (file)
--- a/src/svg/gnome-canvas-bpath-util.cpp
+++ b/src/svg/gnome-canvas-bpath-util.cpp
@@ -10,6 +10,10 @@
  *          Raph Levien <raph@acm.org>
  */
 
+#include <cstring>
+#include <string>
+#include <cstdlib>
+#include <cstdio>
 #include <glib/gmem.h>
 #include <glib/gmessages.h>
 

diff --git a/src/svg/itos.cpp b/src/svg/itos.cpp
index ee49f501425a9e65d695fe1f81192bf69fe895d2..0f2c64ec41c5e1944923afdebad7661653d788da 100644 (file)
--- a/src/svg/itos.cpp
+++ b/src/svg/itos.cpp
@@ -16,6 +16,7 @@
 // Standard include files
 #include <algorithm>
 #include <string>              // for string
+#include <cstring>
 
 using namespace std;
 

diff --git a/src/svg/strip-trailing-zeros.cpp b/src/svg/strip-trailing-zeros.cpp
index 79b266b4278305133256752e3911b0b087658684..769834d1844c380b89008803fa669929073c4174 100644 (file)
--- a/src/svg/strip-trailing-zeros.cpp
+++ b/src/svg/strip-trailing-zeros.cpp
@@ -1,5 +1,10 @@
-#include "svg/strip-trailing-zeros.h"
+
+#include <cstring>
+#include <string>
 #include <glib/gmessages.h>
+
+#include "svg/strip-trailing-zeros.h"
+
 using std::string;
 
 string

diff --git a/src/svg/svg-affine.cpp b/src/svg/svg-affine.cpp
index 71ee5dcb5278a4b2e3567cbdb200460cfb3c58c2..98a6cbf3b996d4fe13c923bc3ac3238831fcf13a 100644 (file)
--- a/src/svg/svg-affine.cpp
+++ b/src/svg/svg-affine.cpp
@@ -17,6 +17,10 @@
 # include "config.h"
 #endif
 
+#include <cstring>
+#include <string>
+#include <cstdlib>
+#include <cstdio>
 #include <glib/gstrfuncs.h>
 #include <libnr/nr-matrix-fns.h>
 #include <libnr/nr-matrix-ops.h>

diff --git a/src/svg/svg-color.cpp b/src/svg/svg-color.cpp
index fe79736dc809d32ebb2f172532b469a3808973cd..e1f87fdb9fc189fb1685943e3969c417fe116431 100644 (file)
--- a/src/svg/svg-color.cpp
+++ b/src/svg/svg-color.cpp
@@ -17,9 +17,10 @@
 # include "config.h"
 #endif
 
-#include "prefs-utils.h"
-#include "svg-color.h"
-#include "svg-icc-color.h"
+#include <cstdlib>
+#include <cstdio> // sprintf
+#include <cstring>
+#include <string>
 #include <cassert>
 #include <math.h>
 #include <glib/gmem.h>
@@ -28,9 +29,13 @@
 #include <glib/gstrfuncs.h>
 #include <glib/ghash.h>
 #include <glib/gutils.h>
-#include <cstdio> // sprintf
 #include <errno.h>
+
 #include "strneq.h"
+#include "prefs-utils.h"
+#include "svg-color.h"
+#include "svg-icc-color.h"
+
 using std::sprintf;
 
 struct SPSVGColor {

diff --git a/src/svg/svg-length.cpp b/src/svg/svg-length.cpp
index 3b13e3d89018bbf4889e695f46cb0d8edb8258a3..f0b7f85f6dd52754aee5b1c34baf2c7a41f433a5 100644 (file)
--- a/src/svg/svg-length.cpp
+++ b/src/svg/svg-length.cpp
@@ -16,8 +16,11 @@
 # include "config.h"
 #endif
 
+#include <cstring>
+#include <string>
 #include <math.h>
 #include <glib/gstrfuncs.h>
+
 #include "svg.h"
 #include "stringstream.h"
 #include "../unit-constants.h"

diff --git a/src/svg/svg-path.cpp b/src/svg/svg-path.cpp
index b491e61c01b7baa5cb4f88a7ae6b826e07c30ae6..0239d2ae0cd843d32c916982ff9170fdee0d5007 100644 (file)
--- a/src/svg/svg-path.cpp
+++ b/src/svg/svg-path.cpp
@@ -26,6 +26,8 @@
      Lauris Kaplinski <lauris@ximian.com>
 */
 
+#include <cstring>
+#include <string>
 #include <cassert>
 #include <glib/gmem.h>
 #include <glib/gmessages.h>

diff --git a/src/svg/svg.h b/src/svg/svg.h
index 1881fb4a0e40b683a0a581c14eb5b6497ee3be02..4adacef7ab8b282ba1386a5ccc9ee510f9003dce 100644 (file)
--- a/src/svg/svg.h
+++ b/src/svg/svg.h
@@ -12,10 +12,12 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 #include <glib/gtypes.h>
-#include "svg/svg-length.h"
 #include <vector>
+#include <cstring>
 #include <string>
 
+#include "svg/svg-length.h"
+
 struct NArtBpath;
 struct NRMatrix;
 namespace NR {

diff --git a/src/text-chemistry.cpp b/src/text-chemistry.cpp
index ef5bd90bf3a48efb2facdb28edfad890f1bd4af5..3a100a6fe7cf952e26bddf36c5010219effbbeca 100644 (file)
--- a/src/text-chemistry.cpp
+++ b/src/text-chemistry.cpp
@@ -14,9 +14,13 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+
+#include <cstring>
+#include <string>
+#include <glibmm/i18n.h>
+
 #include "libnr/nr-matrix-fns.h"
 #include "xml/repr.h"
-#include <glibmm/i18n.h>
 #include "sp-rect.h"
 #include "sp-textpath.h"
 #include "inkscape.h"

diff --git a/src/text-editing.cpp b/src/text-editing.cpp
index dd054f06309fb0df3112169dde2bad075e8c1656..cab71e94a601f14bd53176c41ee29af8a09cf624 100644 (file)
--- a/src/text-editing.cpp
+++ b/src/text-editing.cpp
@@ -14,6 +14,8 @@
 # include "config.h"
 #endif
 
+#include <cstring>
+#include <string>
 #include <glibmm/i18n.h>
 
 #include "desktop.h"

diff --git a/src/tools-switch.cpp b/src/tools-switch.cpp
index c6251fe5bd77595ddb711b41cc1a6a1d70deaadd..11e3ff5b4ae97a7c76dd26980a936393a9e42a78 100644 (file)
--- a/src/tools-switch.cpp
+++ b/src/tools-switch.cpp
@@ -15,6 +15,9 @@
 # include "config.h"
 #endif
 
+#include <cstring>
+#include <string>
+
 #include "inkscape-private.h"
 #include "desktop.h"
 #include "desktop-handles.h"

diff --git a/src/ui/widget/style-swatch.cpp b/src/ui/widget/style-swatch.cpp
index e5e8d5d78065738fa43b7625118c983c55f3aab0..5a50ab84b6793f3a2f3a5260eb9d9939bbe1cb4e 100644 (file)
--- a/src/ui/widget/style-swatch.cpp
+++ b/src/ui/widget/style-swatch.cpp
@@ -13,6 +13,9 @@
 # include <config.h>
 #endif
 
+#include <cstring>
+#include <string>
+
 #include "style-swatch.h"
 
 #include "widgets/spw-utilities.h"

diff --git a/src/uri-references.cpp b/src/uri-references.cpp
index 7fc1f483801e9713edd791366fd9d75d4f37ab93..8041fbf520f46fafbe098569f117aabd21a1c858 100644 (file)
--- a/src/uri-references.cpp
+++ b/src/uri-references.cpp
@@ -12,6 +12,9 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <cstring>
+#include <string>
+
 #include "document.h"
 #include "sp-object.h"
 #include "uri.h"

diff --git a/src/verbs.cpp b/src/verbs.cpp
index f2d1d3b39dbd22f5ffeba563e1faf3fc50a4b931..95d44483e1eb9988a9eae801f4b550fd1f9d2964 100644 (file)
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
@@ -23,14 +23,14 @@
  */
 
 
-
-
-#include <gtk/gtkstock.h>
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
+#include <cstring>
+#include <string>
+#include <gtk/gtkstock.h>
+
 #include "helper/action.h"
 
 #include <gtkmm/messagedialog.h>

diff --git a/src/verbs.h b/src/verbs.h
index 2d0d3d0b634d61519da702465ed4dd6a458a9360..52f69e54e94d2722ecb84b2dccc4b34fc49b1b6f 100644 (file)
--- a/src/verbs.h
+++ b/src/verbs.h
@@ -11,11 +11,13 @@
  *
  *  Copyright (C) 2006 Johan Engelen <johan@shouraizou.nl>
  *  Copyright (C) (date unspecified) Authors
- 
+
  * This code is in public domain if done by Lauris
  * This code is GPL if done by Ted or David
  */
 
+#include <cstring>
+#include <string>
 #include <string.h>
 #include "require-config.h"   /* HAVE_GTK_WINDOW_FULLSCREEN */
 #include "helper/helper-forward.h"

diff --git a/src/widgets/dash-selector.cpp b/src/widgets/dash-selector.cpp
index 474ab90f9f95069411e96948a02fd5d5b705298f..ea666070feaa1edcaa7d10dedaa06dd19d87ce5f 100644 (file)
--- a/src/widgets/dash-selector.cpp
+++ b/src/widgets/dash-selector.cpp
@@ -18,10 +18,13 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+
+#include <cstring>
+#include <string>
 #include <libnr/nr-macros.h>
 #include <gtk/gtk.h>
-
 #include <glibmm/i18n.h>
+
 #include "../style.h"
 #include "../dialogs/dialog-events.h"
 

diff --git a/src/widgets/icon.cpp b/src/widgets/icon.cpp
index 9be74a556f9151431dee10c24372351cd6702599..03a39acb62a9d58681355b55fb9fefa30e539e24 100644 (file)
--- a/src/widgets/icon.cpp
+++ b/src/widgets/icon.cpp
@@ -14,17 +14,15 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-#include "path-prefix.h"
-
-
 
+#include <cstring>
 #include <glib/gmem.h>
 #include <gtk/gtkiconfactory.h>
 #include <gtk/gtkstock.h>
 #include <gtk/gtkimage.h>
-
 #include <gtkmm/image.h>
 
+#include "path-prefix.h"
 #include "prefs-utils.h"
 #include "inkscape.h"
 #include "document.h"

diff --git a/src/widgets/layer-selector.cpp b/src/widgets/layer-selector.cpp
index 10b497cacacb8b730d65d5afd261f6f41370c06f..65f64fa4f16cb89d5b82e95c154a38661beb75e3 100644 (file)
--- a/src/widgets/layer-selector.cpp
+++ b/src/widgets/layer-selector.cpp
@@ -13,6 +13,8 @@
 # include "config.h"
 #endif
 
+#include <cstring>
+#include <string>
 #include <glibmm/i18n.h>
 
 #include "desktop-handles.h"

diff --git a/src/widgets/paint-selector.cpp b/src/widgets/paint-selector.cpp
index ea9730d5048a6ae34647dbfa87182d89b54116ff..c66fbd3c7e28ca9fceeb828f4dfd63027cb29950 100644 (file)
--- a/src/widgets/paint-selector.cpp
+++ b/src/widgets/paint-selector.cpp
@@ -16,7 +16,8 @@
 # include "config.h"
 #endif
 
-
+#include <cstring>
+#include <string>
 
 #include <gtk/gtkhbox.h>
 #include <gtk/gtkradiobutton.h>

diff --git a/src/widgets/ruler.cpp b/src/widgets/ruler.cpp
index e0f0ba68051b5c119f78f0c198ee0c7810f00e23..fab2a0ba91892ae7a8ef5af2d25184c451af20b6 100644 (file)
--- a/src/widgets/ruler.cpp
+++ b/src/widgets/ruler.cpp
@@ -13,9 +13,10 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <cstring>
 #include <cmath>
 #include <cstdio>
-#include <string.h>
+
 #include "widget-sizes.h"
 #include "desktop-widget.h"
 #include "ruler.h"

diff --git a/src/widgets/sp-color-notebook.cpp b/src/widgets/sp-color-notebook.cpp
index b7ec3eb2c5d2c3984eb6c9b2469439cfa98d2213..cbb7faadbcb9e8d9baa57b99ebf779fde963f1b4 100644 (file)
--- a/src/widgets/sp-color-notebook.cpp
+++ b/src/widgets/sp-color-notebook.cpp
@@ -18,15 +18,17 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-#include <string.h>
-#include <stdlib.h>
+
+#include <cstring>
+#include <string>
+#include <cstdlib>
 #include <gtk/gtk.h>
 #include <glibmm/i18n.h>
+
 #include "../dialogs/dialog-events.h"
 #include "../prefs-utils.h"
 #include "sp-color-notebook.h"
 #include "spw-utilities.h"
-
 #include "sp-color-scales.h"
 #include "sp-color-wheel-selector.h"
 #include "sp-color-icc-selector.h"

diff --git a/src/widgets/sp-color-wheel.cpp b/src/widgets/sp-color-wheel.cpp
index e59cce4d38e9da2634d4047b3f15facaf828ac8a..c7d1acb3e99150ba3b04daae5e918d7bbd34cc52 100644 (file)
--- a/src/widgets/sp-color-wheel.cpp
+++ b/src/widgets/sp-color-wheel.cpp
@@ -13,6 +13,9 @@
  * This code is in public domain
  */
 
+#include <cstring>
+#include <string>
+
 #include <gtk/gtksignal.h>
 #include "sp-color-wheel.h"
 

diff --git a/src/widgets/sp-xmlview-attr-list.cpp b/src/widgets/sp-xmlview-attr-list.cpp
index e39b2a4e9c7012135ff3a84a3f447f2781b0e962..923420740338e82693b72254d64c1672653c4959 100644 (file)
--- a/src/widgets/sp-xmlview-attr-list.cpp
+++ b/src/widgets/sp-xmlview-attr-list.cpp
@@ -12,8 +12,11 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "helper/sp-marshal.h"
+
+#include <cstring>
 #include <glibmm/i18n.h>
+
+#include "helper/sp-marshal.h"
 #include "../xml/node-event-vector.h"
 #include "sp-xmlview-attr-list.h"
 

diff --git a/src/widgets/sp-xmlview-content.cpp b/src/widgets/sp-xmlview-content.cpp
index 356c1384ed29ca5d3ddffcb045264a55c397ca84..6f0b0dff1a86d3cb5838c6dc76aaa81ba25e4481 100644 (file)
--- a/src/widgets/sp-xmlview-content.cpp
+++ b/src/widgets/sp-xmlview-content.cpp
@@ -11,13 +11,14 @@
  * Released under the GNU GPL; see COPYING for details
  */
 
+#include <cstring>
+#include <glibmm/i18n.h>
 
 #include "xml/node-event-vector.h"
 #include "sp-xmlview-content.h"
 #include "desktop-handles.h"
 #include "document-private.h"
 #include "inkscape.h"
-#include <glibmm/i18n.h>
 
 static void sp_xmlview_content_class_init (SPXMLViewContentClass * klass);
 static void sp_xmlview_content_init (SPXMLViewContent * text);

diff --git a/src/widgets/sp-xmlview-tree.cpp b/src/widgets/sp-xmlview-tree.cpp
index d6fd92d78d2a9e3e5aaec14160f76732fac42893..ee5ca182377334f538de30e76f905357c7735ee1 100644 (file)
--- a/src/widgets/sp-xmlview-tree.cpp
+++ b/src/widgets/sp-xmlview-tree.cpp
@@ -11,6 +11,9 @@
  * Released under the GNU GPL; see COPYING for details
  */
 
+#include <cstring>
+#include <string>
+
 #include "../xml/node-event-vector.h"
 #include "sp-xmlview-tree.h"
 

diff --git a/src/widgets/spw-utilities.cpp b/src/widgets/spw-utilities.cpp
index ecec849796ae39937a19ee16159e285dd4cabc25..291e191e59801dba707de93b98859cabacff6d63 100644 (file)
--- a/src/widgets/spw-utilities.cpp
+++ b/src/widgets/spw-utilities.cpp
@@ -16,9 +16,10 @@
 # include "config.h"
 #endif
 
-
+#include <cstring>
+#include <string>
 #include <gtk/gtk.h>
- 
+
 #include "selection.h"
 
 #include "helper/unit-menu.h"

diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index b0a6a7e91c0d89394968759b9933db7a3f149c1d..31720b3e842c15fab32b85ebdb88b924a48a2879 100644 (file)
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -27,6 +27,9 @@
 # include "config.h"
 #endif
 
+#include <cstring>
+#include <string>
+
 #include <gtkmm.h>
 #include <gtk/gtk.h>
 #include <iostream>

diff --git a/src/xml/composite-node-observer.cpp b/src/xml/composite-node-observer.cpp
index bb68ba9c4ac7ba06d26aeb744b1c2c11af04b3f4..979462cef0b81c06a88e43b91d9aafc430a8f78e 100644 (file)
--- a/src/xml/composite-node-observer.cpp
+++ b/src/xml/composite-node-observer.cpp
@@ -12,6 +12,8 @@
  *
  */
 
+#include <cstring>
+
 #include "algorithms/find-if-before.h"
 #include "xml/composite-node-observer.h"
 #include "xml/node-event-vector.h"

diff --git a/src/xml/croco-node-iface.cpp b/src/xml/croco-node-iface.cpp
index 0464e4fb7c6a9e067b62975fc22811fef7919643..a40ddd661239899df2c2ab6dc5c66037b8298eaf 100644 (file)
--- a/src/xml/croco-node-iface.cpp
+++ b/src/xml/croco-node-iface.cpp
@@ -1,6 +1,10 @@
+
+#include <cstring>
+#include <string>
+#include <glib/gstrfuncs.h>
+
 #include "xml/croco-node-iface.h"
 #include "xml/node.h"
-#include <glib/gstrfuncs.h>
 
 static char const *
 local_part(char const *const qname)

diff --git a/src/xml/node-fns.cpp b/src/xml/node-fns.cpp
index 4d346e009ce1c7d4980fc4d68324638308fa8a0d..cb41611415b5ecd0af118fa6662ace6086e03d66 100644 (file)
--- a/src/xml/node-fns.cpp
+++ b/src/xml/node-fns.cpp
@@ -3,6 +3,8 @@
 #endif
 
 #include <map>
+#include <cstring>
+#include <string>
 #include <glib.h> // g_assert()
 
 #include "xml/node-iterators.h"

diff --git a/src/xml/quote-test.cpp b/src/xml/quote-test.cpp
index 61291b9deff7e38c357a29c3e62140e54f35fd44..197ca5309940438b8e18c22e766711c56e78fa42 100644 (file)
--- a/src/xml/quote-test.cpp
+++ b/src/xml/quote-test.cpp
@@ -1,7 +1,9 @@
 /* Initial author: Peter Moulder.
    Hereby released into the Public Domain. */
 
+#include <cstring>
 #include <functional>
+
 #include "utest/test-1ary-cases.h"
 
 /* mental disclaims all responsibility for this evil idea for testing

diff --git a/src/xml/quote.cpp b/src/xml/quote.cpp
index b5505c5e137d3a077b47cfed380c1ae58015be5f..37f00bad0738ce37a7efe665e796f7e09237b4b7 100644 (file)
--- a/src/xml/quote.cpp
+++ b/src/xml/quote.cpp
@@ -11,7 +11,7 @@
  * of the GNU General Public License: see the file `COPYING'.
  */
 
-#include <string.h>
+#include <cstring>
 #include <glib/gmem.h>
 
 

diff --git a/src/xml/repr-action-test.cpp b/src/xml/repr-action-test.cpp
index 0e3d8d4a433d365db37fdf4ae7874ed7dc4e64b6..7e022eb1821c017a618bc24183d68ae0224c707f 100644 (file)
--- a/src/xml/repr-action-test.cpp
+++ b/src/xml/repr-action-test.cpp
@@ -1,4 +1,4 @@
-#include <stdlib.h>
+#include <cstdlib>
 #include <glib.h>
 #include "../utest/utest.h"
 

diff --git a/src/xml/repr-css.cpp b/src/xml/repr-css.cpp
index ec5848366676678967c13b4b544a48558b746367..0a2e215a0c41a657235921aca96b79ecad2b6721 100644 (file)
--- a/src/xml/repr-css.cpp
+++ b/src/xml/repr-css.cpp
@@ -1,10 +1,10 @@
 /*
  *   bulia byak <buliabyak@users.sf.net>
-*/ 
- 
-#define SP_REPR_CSS_C
+*/
 
+#define SP_REPR_CSS_C
 
+#include <cstring>
 #include <glibmm/ustring.h>
 
 #include "xml/repr.h"

diff --git a/src/xml/repr-io.cpp b/src/xml/repr-io.cpp
index 62d43dd41aa77f7a5d501bece2a1963dca31a278..8f149a130368676d3d57212499d0dad55b9e8c04 100644 (file)
--- a/src/xml/repr-io.cpp
+++ b/src/xml/repr-io.cpp
@@ -16,6 +16,8 @@
 # include <config.h>
 #endif
 
+#include <cstring>
+#include <string>
 #include <stdexcept>
 
 #include "xml/repr.h"

diff --git a/src/xml/repr-util.cpp b/src/xml/repr-util.cpp
index 7a45f6fcd32b6f279e91057636b0ae4733a2a1e3..97676bebe27dd4d919d2129ef4839957ff93257e 100644 (file)
--- a/src/xml/repr-util.cpp
+++ b/src/xml/repr-util.cpp
@@ -20,11 +20,11 @@
 #include <math.h>
 
 #if HAVE_STRING_H
-# include <string.h>
+# include <cstring>
 #endif
 
 #if HAVE_STDLIB_H
-# include <stdlib.h>
+# include <cstdlib>
 #endif
 
 

diff --git a/src/xml/repr.cpp b/src/xml/repr.cpp
index be226a35752825926c56a020d65290218bbb7988..4494d3fe6dc44aa2cd6249a375bac72254157db1 100644 (file)
--- a/src/xml/repr.cpp
+++ b/src/xml/repr.cpp
@@ -22,6 +22,8 @@
 # include "config.h"
 #endif
 
+#include <cstring>
+
 #include "xml/repr.h"
 #include "xml/text-node.h"
 #include "xml/element-node.h"

diff --git a/src/xml/simple-node.cpp b/src/xml/simple-node.cpp
index d38e14b3f8af93a8b58c0d61fcd589d26c2d4840..084547a5907c3cb1f9bf0f598de9c0782b85fb3b 100644 (file)
--- a/src/xml/simple-node.cpp
+++ b/src/xml/simple-node.cpp
@@ -15,7 +15,10 @@
  *
  */
 
+#include <cstring>
+#include <string>
 #include <glib/gstrfuncs.h>
+
 #include "xml/simple-node.h"
 #include "xml/node-event-vector.h"
 #include "xml/node-fns.h"