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/io | |
| 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/io')
| -rw-r--r-- | src/io/inkjar.h | 3 | ||||
| -rw-r--r-- | src/io/resource.cpp | 3 | ||||
| -rw-r--r-- | src/io/sys.cpp | 2 | ||||
| -rw-r--r-- | src/io/sys.h | 4 |
4 files changed, 2 insertions, 10 deletions
diff --git a/src/io/inkjar.h b/src/io/inkjar.h index 0fe088b24..ea4b0ee32 100644 --- a/src/io/inkjar.h +++ b/src/io/inkjar.h @@ -26,8 +26,7 @@ # endif #endif -#include <glib/garray.h> -#include <glib/gtypes.h> +#include <glib.h> namespace Inkjar { diff --git a/src/io/resource.cpp b/src/io/resource.cpp index 4eeaf3b8c..ac1c5f06b 100644 --- a/src/io/resource.cpp +++ b/src/io/resource.cpp @@ -17,9 +17,6 @@ #endif #include <glib.h> // g_assert() -#include <glib/gmessages.h> -#include <glib/gstrfuncs.h> -#include <glib/gfileutils.h> #include "path-prefix.h" #include "inkscape.h" #include "io/resource.h" diff --git a/src/io/sys.cpp b/src/io/sys.cpp index 437a9d18c..e83861237 100644 --- a/src/io/sys.cpp +++ b/src/io/sys.cpp @@ -17,9 +17,7 @@ #include <glib.h> #include <glib/gstdio.h> -#include <glib/gutils.h> #include <glibmm/fileutils.h> -#include <glib/gstdio.h> #include <glibmm/ustring.h> #include <gtk/gtk.h> diff --git a/src/io/sys.h b/src/io/sys.h index 8623f6be9..83ffdb41c 100644 --- a/src/io/sys.h +++ b/src/io/sys.h @@ -15,9 +15,7 @@ #include <stdio.h> #include <sys/stat.h> #include <sys/types.h> -#include <glib/gtypes.h> -#include <glib/gdir.h> -#include <glib/gfileutils.h> +#include <glib.h> #include <glibmm/spawn.h> #include <string> |