diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2013-03-29 19:54:30 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2013-03-29 19:54:30 +0000 |
| commit | 8b605523195bcad80c4a3134134066e677282640 (patch) | |
| tree | 7258ae78c0ae7e2ee7519dcecead8b1fc34ca78f /src/extension | |
| parent | merge from trunk (r12240) (diff) | |
| parent | Header cleanup (diff) | |
| download | inkscape-8b605523195bcad80c4a3134134066e677282640.tar.gz inkscape-8b605523195bcad80c4a3134134066e677282640.zip | |
merge from trunk (r12258)
(bzr r11668.1.65)
Diffstat (limited to 'src/extension')
| -rw-r--r-- | src/extension/error-file.cpp | 5 | ||||
| -rw-r--r-- | src/extension/extension.cpp | 2 | ||||
| -rw-r--r-- | src/extension/init.cpp | 4 | ||||
| -rw-r--r-- | src/extension/internal/odf.h | 5 | ||||
| -rw-r--r-- | src/extension/param/string.cpp | 3 | ||||
| -rw-r--r-- | src/extension/prefdialog.h | 2 | ||||
| -rw-r--r-- | src/extension/script/InkscapeScript.h | 4 |
7 files changed, 14 insertions, 11 deletions
diff --git a/src/extension/error-file.cpp b/src/extension/error-file.cpp index 778295f47..5a8bede70 100644 --- a/src/extension/error-file.cpp +++ b/src/extension/error-file.cpp @@ -12,12 +12,11 @@ #include "config.h" #endif -#include <glibmm/i18n.h> - +#include "ui/dialog/extensions.h" +#include <glibmm/i18n.h> #include "inkscape.h" #include "preferences.h" -#include "ui/dialog/extensions.h" #include "extension/extension.h" #include "error-file.h" diff --git a/src/extension/extension.cpp b/src/extension/extension.cpp index 28f556e75..f9cf70960 100644 --- a/src/extension/extension.cpp +++ b/src/extension/extension.cpp @@ -19,7 +19,6 @@ # include "config.h" #endif -#include <glibmm/i18n.h> #include <gtkmm/box.h> #include <gtkmm/label.h> #include <gtkmm/frame.h> @@ -30,6 +29,7 @@ # include <gtkmm/table.h> #endif +#include <glibmm/i18n.h> #include "inkscape.h" #include "extension/implementation/implementation.h" #include "extension.h" diff --git a/src/extension/init.cpp b/src/extension/init.cpp index 3be7d1509..1a163d4c2 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/param/string.cpp b/src/extension/param/string.cpp index 2020fb24d..4e525ff73 100644 --- a/src/extension/param/string.cpp +++ b/src/extension/param/string.cpp @@ -10,11 +10,12 @@ # include "config.h" #endif -#include <glibmm/value.h> #include <gtkmm/adjustment.h> #include <gtkmm/box.h> #include <gtkmm/spinbutton.h> +#include <glibmm/value.h> + #include "xml/node.h" #include "extension/extension.h" #include "string.h" diff --git a/src/extension/prefdialog.h b/src/extension/prefdialog.h index 943273623..e1999791f 100644 --- a/src/extension/prefdialog.h +++ b/src/extension/prefdialog.h @@ -10,8 +10,8 @@ #ifndef INKSCAPE_EXTENSION_DIALOG_H__ #define INKSCAPE_EXTENSION_DIALOG_H__ -#include <glibmm/value.h> #include <gtkmm/dialog.h> +#include <glibmm/value.h> #include <glibmm/ustring.h> 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 { |