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

(bzr r4629)

12 files changed, 35 insertions, 14 deletions

diff --git a/src/widgets/dash-selector.cpp b/src/widgets/dash-selector.cpp
index 474ab90f9..ea666070f 100644
--- 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 9be74a556..03a39acb6 100644
--- 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 10b497cac..65f64fa4f 100644
--- 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 ea9730d50..c66fbd3c7 100644
--- 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 e0f0ba680..fab2a0ba9 100644
--- 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 b7ec3eb2c..cbb7faadb 100644
--- 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 e59cce4d3..c7d1acb3e 100644
--- 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 e39b2a4e9..923420740 100644
--- 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 356c1384e..6f0b0dff1 100644
--- 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 d6fd92d78..ee5ca1823 100644
--- 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 ecec84979..291e191e5 100644
--- 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 b0a6a7e91..31720b3e8 100644
--- 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>