diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2011-12-08 11:53:54 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@gmail.com> | 2011-12-08 11:53:54 +0000 |
| commit | 4e51446f417ad82d2cdac758d0c5ce908ff88038 (patch) | |
| tree | fca19a5966d6d49873062bb0b40550f6c4984156 /src/helper | |
| parent | Colors. Patch for Bug #677081 (Default paste color opacity) by Romain. (diff) | |
| download | inkscape-4e51446f417ad82d2cdac758d0c5ce908ff88038.tar.gz inkscape-4e51446f417ad82d2cdac758d0c5ce908ff88038.zip | |
Switch to top-level glib headers. Thanks to DimStar for patch
Fixed bugs:
- https://launchpad.net/bugs/898538
(bzr r10762)
Diffstat (limited to 'src/helper')
| -rw-r--r-- | src/helper/gnome-utils.h | 3 | ||||
| -rw-r--r-- | src/helper/pixbuf-ops.cpp | 1 | ||||
| -rw-r--r-- | src/helper/pixbuf-ops.h | 2 | ||||
| -rw-r--r-- | src/helper/png-write.cpp | 2 | ||||
| -rw-r--r-- | src/helper/png-write.h | 2 | ||||
| -rw-r--r-- | src/helper/stlport.h | 3 | ||||
| -rw-r--r-- | src/helper/stock-items.h | 2 | ||||
| -rw-r--r-- | src/helper/unit-menu.h | 2 | ||||
| -rw-r--r-- | src/helper/units.h | 4 |
9 files changed, 8 insertions, 13 deletions
diff --git a/src/helper/gnome-utils.h b/src/helper/gnome-utils.h index 1a087433e..3502b28df 100644 --- a/src/helper/gnome-utils.h +++ b/src/helper/gnome-utils.h @@ -15,8 +15,7 @@ #ifndef __GNOME_UTILS_H__ #define __GNOME_UTILS_H__ -#include <glib/gtypes.h> -#include <glib/glist.h> +#include <glib.h> GList *gnome_uri_list_extract_uris(gchar const *uri_list); diff --git a/src/helper/pixbuf-ops.cpp b/src/helper/pixbuf-ops.cpp index 9f80cc58b..f980953dc 100644 --- a/src/helper/pixbuf-ops.cpp +++ b/src/helper/pixbuf-ops.cpp @@ -16,7 +16,6 @@ #endif #include <glib.h> -#include <glib/gmessages.h> #include <png.h> #include <2geom/transforms.h> diff --git a/src/helper/pixbuf-ops.h b/src/helper/pixbuf-ops.h index a985be297..af573277c 100644 --- a/src/helper/pixbuf-ops.h +++ b/src/helper/pixbuf-ops.h @@ -12,7 +12,7 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include <glib/gtypes.h> +#include <glib.h> struct SPDocument; diff --git a/src/helper/png-write.cpp b/src/helper/png-write.cpp index 992c7b886..febdb645e 100644 --- a/src/helper/png-write.cpp +++ b/src/helper/png-write.cpp @@ -19,7 +19,7 @@ #include "interface.h" #include <2geom/rect.h> #include <2geom/transforms.h> -#include <glib/gmessages.h> +#include <glib.h> #include <png.h> #include "png-write.h" #include "io/sys.h" diff --git a/src/helper/png-write.h b/src/helper/png-write.h index 83321aa4e..f8ba4bbf6 100644 --- a/src/helper/png-write.h +++ b/src/helper/png-write.h @@ -12,7 +12,7 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include <glib/gtypes.h> +#include <glib.h> #include <2geom/forward.h> struct SPDocument; diff --git a/src/helper/stlport.h b/src/helper/stlport.h index c9389e814..c7b00eb28 100644 --- a/src/helper/stlport.h +++ b/src/helper/stlport.h @@ -3,8 +3,7 @@ #include <list> -#include <glib/glist.h> -#include <glib/gslist.h> +#include <glib.h> template <typename T> class StlConv { diff --git a/src/helper/stock-items.h b/src/helper/stock-items.h index 7299e070e..990f45254 100644 --- a/src/helper/stock-items.h +++ b/src/helper/stock-items.h @@ -13,7 +13,7 @@ * */ -#include <glib/gtypes.h> +#include <glib.h> class SPObject; diff --git a/src/helper/unit-menu.h b/src/helper/unit-menu.h index b495a3c15..b3ee6bcd1 100644 --- a/src/helper/unit-menu.h +++ b/src/helper/unit-menu.h @@ -10,7 +10,7 @@ * */ -#include <glib/gtypes.h> +#include <glib.h> #include <gtk/gtk.h> struct SPUnit; diff --git a/src/helper/units.h b/src/helper/units.h index 8dc62fee6..93bd70615 100644 --- a/src/helper/units.h +++ b/src/helper/units.h @@ -15,9 +15,7 @@ * */ -#include <glib/gmessages.h> -#include <glib/gslist.h> -#include <glib/gtypes.h> +#include <glib.h> #include "sp-metric.h" |