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/display | |
| 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/display')
| -rw-r--r-- | src/display/canvas-bpath.h | 2 | ||||
| -rw-r--r-- | src/display/canvas-temporary-item.h | 2 | ||||
| -rw-r--r-- | src/display/curve.cpp | 2 | ||||
| -rw-r--r-- | src/display/curve.h | 3 | ||||
| -rw-r--r-- | src/display/gnome-canvas-acetate.h | 2 | ||||
| -rw-r--r-- | src/display/nr-3dutils.cpp | 2 | ||||
| -rw-r--r-- | src/display/nr-filter-diffuselighting.cpp | 2 | ||||
| -rw-r--r-- | src/display/nr-filter-specularlighting.cpp | 2 | ||||
| -rw-r--r-- | src/display/sodipodi-ctrlrect.h | 2 | ||||
| -rw-r--r-- | src/display/sp-canvas.h | 2 |
10 files changed, 10 insertions, 11 deletions
diff --git a/src/display/canvas-bpath.h b/src/display/canvas-bpath.h index 752ed73ea..f0520f012 100644 --- a/src/display/canvas-bpath.h +++ b/src/display/canvas-bpath.h @@ -15,7 +15,7 @@ * */ -#include <glib/gtypes.h> +#include <glib.h> #include "sp-canvas-item.h" diff --git a/src/display/canvas-temporary-item.h b/src/display/canvas-temporary-item.h index c8917b530..09d243fa1 100644 --- a/src/display/canvas-temporary-item.h +++ b/src/display/canvas-temporary-item.h @@ -13,7 +13,7 @@ #include <stddef.h> #include <sigc++/sigc++.h> -#include <glib/gtypes.h> +#include <glib.h> struct SPCanvasItem; diff --git a/src/display/curve.cpp b/src/display/curve.cpp index d52ee1fba..1a788b59a 100644 --- a/src/display/curve.cpp +++ b/src/display/curve.cpp @@ -19,7 +19,7 @@ #include "display/curve.h" -#include <glib/gmessages.h> +#include <glib.h> #include <2geom/pathvector.h> #include <2geom/sbasis-geometric.h> #include <2geom/sbasis-to-bezier.h> diff --git a/src/display/curve.h b/src/display/curve.h index 4f129b542..4866655c4 100644 --- a/src/display/curve.h +++ b/src/display/curve.h @@ -13,8 +13,7 @@ * Released under GNU GPL */ -#include <glib/gtypes.h> -#include <glib/gslist.h> +#include <glib.h> #include <2geom/forward.h> diff --git a/src/display/gnome-canvas-acetate.h b/src/display/gnome-canvas-acetate.h index ed6c99811..447c3a9c4 100644 --- a/src/display/gnome-canvas-acetate.h +++ b/src/display/gnome-canvas-acetate.h @@ -15,7 +15,7 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include <glib/gtypes.h> +#include <glib.h> #include "display/sp-canvas-item.h" diff --git a/src/display/nr-3dutils.cpp b/src/display/nr-3dutils.cpp index eb6858374..d2ac7d82b 100644 --- a/src/display/nr-3dutils.cpp +++ b/src/display/nr-3dutils.cpp @@ -9,7 +9,7 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include <glib/gmessages.h> +#include <glib.h> #include "display/nr-3dutils.h" #include <cmath> diff --git a/src/display/nr-filter-diffuselighting.cpp b/src/display/nr-filter-diffuselighting.cpp index 9df771879..fcc986189 100644 --- a/src/display/nr-filter-diffuselighting.cpp +++ b/src/display/nr-filter-diffuselighting.cpp @@ -11,7 +11,7 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include <glib/gmessages.h> +#include <glib.h> #include "display/cairo-templates.h" #include "display/cairo-utils.h" diff --git a/src/display/nr-filter-specularlighting.cpp b/src/display/nr-filter-specularlighting.cpp index 0530e38cb..0242754eb 100644 --- a/src/display/nr-filter-specularlighting.cpp +++ b/src/display/nr-filter-specularlighting.cpp @@ -10,7 +10,7 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include <glib/gmessages.h> +#include <glib.h> #include <cmath> #include "display/cairo-templates.h" diff --git a/src/display/sodipodi-ctrlrect.h b/src/display/sodipodi-ctrlrect.h index 05688e6b5..65a40a850 100644 --- a/src/display/sodipodi-ctrlrect.h +++ b/src/display/sodipodi-ctrlrect.h @@ -17,7 +17,7 @@ * */ -#include <glib/gtypes.h> +#include <glib.h> #include "sp-canvas-item.h" #include <2geom/rect.h> #include <2geom/int-rect.h> diff --git a/src/display/sp-canvas.h b/src/display/sp-canvas.h index f0deaa594..14cbab6c3 100644 --- a/src/display/sp-canvas.h +++ b/src/display/sp-canvas.h @@ -29,7 +29,7 @@ # endif #endif -#include <glib/gtypes.h> +#include <glib.h> #include <gdk/gdk.h> #include <gtk/gtk.h> #include <glibmm/ustring.h> |