diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2013-03-28 23:11:49 +0000 |
|---|---|---|
| committer | Jabiertxo Arraiza Zenotz <jtx@jtx.marker.es> | 2013-03-28 23:11:49 +0000 |
| commit | b0bc5900769742861a57b3200f25378a5d5138be (patch) | |
| tree | c641716ac21b5f28e2a05284eedd4778605fbc69 /src/extension | |
| parent | Update to trunk (diff) | |
| parent | Fix for Bug #1161205 (Font substitution dialog appears when generic font fami... (diff) | |
| download | inkscape-b0bc5900769742861a57b3200f25378a5d5138be.tar.gz inkscape-b0bc5900769742861a57b3200f25378a5d5138be.zip | |
Update to trunk
(bzr r11950.1.76)
Diffstat (limited to 'src/extension')
| -rw-r--r-- | src/extension/init.cpp | 4 | ||||
| -rw-r--r-- | src/extension/internal/odf.h | 5 | ||||
| -rw-r--r-- | src/extension/script/InkscapeScript.h | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/src/extension/init.cpp b/src/extension/init.cpp index 5555eddf6..d403d270f 100644 --- a/src/extension/init.cpp +++ b/src/extension/init.cpp @@ -26,8 +26,10 @@ #include "path-prefix.h" #include "inkscape.h" -#include <glibmm/ustring.h> + +#include <glibmm/fileutils.h> #include <glibmm/i18n.h> +#include <glibmm/ustring.h> #include "system.h" #include "db.h" diff --git a/src/extension/internal/odf.h b/src/extension/internal/odf.h index 219a99a4f..001f5e1f1 100644 --- a/src/extension/internal/odf.h +++ b/src/extension/internal/odf.h @@ -27,19 +27,18 @@ #include <io/stringstream.h> #include <dom/uri.h> -#include <glibmm.h> #include "extension/implementation/implementation.h" - #include <xml/repr.h> #include <string> #include <map> #include <dom/util/ziptool.h> -//#include <io/domstream.h> #include "sp-item.h" +#include <glibmm/ustring.h> + namespace Inkscape { namespace Extension diff --git a/src/extension/script/InkscapeScript.h b/src/extension/script/InkscapeScript.h index 2ebeb1b19..8d6346582 100644 --- a/src/extension/script/InkscapeScript.h +++ b/src/extension/script/InkscapeScript.h @@ -12,7 +12,9 @@ #include "config.h" -#include <glibmm.h> +namespace Glib { +class ustring; +} namespace Inkscape { |