diff options
| -rw-r--r-- | src/display/canvas-axonomgrid.cpp | 3 | ||||
| -rw-r--r-- | src/display/canvas-axonomgrid.h | 5 | ||||
| -rw-r--r-- | src/display/canvas-grid.cpp | 3 | ||||
| -rw-r--r-- | src/display/canvas-grid.h | 9 | ||||
| -rw-r--r-- | src/dropper-context.cpp | 1 | ||||
| -rw-r--r-- | src/extension/extension.h | 5 | ||||
| -rw-r--r-- | src/extension/param/enum.cpp | 1 | ||||
| -rw-r--r-- | src/extension/param/radiobutton.cpp | 1 | ||||
| -rw-r--r-- | src/interface.cpp | 2 | ||||
| -rw-r--r-- | src/snap.cpp | 2 | ||||
| -rw-r--r-- | src/ui/dialog/dialog-manager.h | 1 | ||||
| -rw-r--r-- | src/ui/dialog/dock-behavior.h | 13 | ||||
| -rw-r--r-- | src/ui/dialog/filter-effects-dialog.cpp | 1 | ||||
| -rw-r--r-- | src/ui/dialog/guides.cpp | 2 | ||||
| -rw-r--r-- | src/ui/dialog/guides.h | 4 | ||||
| -rw-r--r-- | src/ui/dialog/ocaldialogs.h | 26 | ||||
| -rw-r--r-- | src/ui/tool/node.cpp | 1 | ||||
| -rw-r--r-- | src/ui/widget/dock-item.h | 8 | ||||
| -rw-r--r-- | src/ui/widget/tolerance-slider.cpp | 1 | ||||
| -rw-r--r-- | src/ui/widget/tolerance-slider.h | 6 |
20 files changed, 45 insertions, 50 deletions
diff --git a/src/display/canvas-axonomgrid.cpp b/src/display/canvas-axonomgrid.cpp index 59bb1e765..1c74e3d86 100644 --- a/src/display/canvas-axonomgrid.cpp +++ b/src/display/canvas-axonomgrid.cpp @@ -34,10 +34,13 @@ #include "sp-namedview.h" #include "sp-object.h" #include "svg/svg-color.h" +#include "ui/widget/registered-widget.h" #include "util/mathfns.h" #include "xml/node-event-vector.h" #include "round.h" +#include <gtkmm/box.h> +#include <gtkmm/label.h> #include <gtkmm/table.h> enum Dim3 { X=0, Y, Z }; diff --git a/src/display/canvas-axonomgrid.h b/src/display/canvas-axonomgrid.h index b5757f4be..0a12d3743 100644 --- a/src/display/canvas-axonomgrid.h +++ b/src/display/canvas-axonomgrid.h @@ -8,12 +8,7 @@ #include <display/sp-canvas.h> #include "xml/repr.h" -#include <gtkmm/box.h> -#include "ui/widget/color-picker.h" -#include "ui/widget/scalar-unit.h" - -#include "ui/widget/registered-widget.h" #include "ui/widget/registry.h" #include "xml/node-event-vector.h" diff --git a/src/display/canvas-grid.cpp b/src/display/canvas-grid.cpp index 3a0b18f00..b847b7854 100644 --- a/src/display/canvas-grid.cpp +++ b/src/display/canvas-grid.cpp @@ -30,9 +30,12 @@ #include "sp-object.h" #include "svg/svg-color.h" #include "svg/stringstream.h" +#include "ui/widget/registered-widget.h" #include "util/mathfns.h" #include "xml/node-event-vector.h" +#include <gtkmm/box.h> +#include <gtkmm/label.h> #include <gtkmm/table.h> using Inkscape::DocumentUndo; diff --git a/src/display/canvas-grid.h b/src/display/canvas-grid.h index 55d53f045..f3b285be7 100644 --- a/src/display/canvas-grid.h +++ b/src/display/canvas-grid.h @@ -11,13 +11,8 @@ #include <cstring> #include <string> -#include <gtkmm/box.h> - #include "sp-canvas-item.h" #include "xml/repr.h" -#include "ui/widget/color-picker.h" -#include "ui/widget/scalar-unit.h" -#include "ui/widget/registered-widget.h" #include "ui/widget/registry.h" #include "xml/node-event-vector.h" #include "snapper.h" @@ -28,6 +23,10 @@ struct SPNamedView; struct SPCanvasBuf; class SPDocument; +namespace Gtk { + class Widget; +} + namespace Inkscape { diff --git a/src/dropper-context.cpp b/src/dropper-context.cpp index 512d21705..22f71372b 100644 --- a/src/dropper-context.cpp +++ b/src/dropper-context.cpp @@ -17,6 +17,7 @@ #include <glibmm.h> #include <gdk/gdk.h> +#include <gdk/gdkkeysyms.h> #include <2geom/transforms.h> #include "macros.h" diff --git a/src/extension/extension.h b/src/extension/extension.h index 13cb409a8..16c814d26 100644 --- a/src/extension/extension.h +++ b/src/extension/extension.h @@ -18,11 +18,14 @@ #include <fstream> #include <vector> #include <gtkmm/widget.h> -#include <gtkmm/box.h> #include <gtkmm/table.h> #include <glibmm/ustring.h> #include "xml/repr.h" +namespace Gtk { + class VBox; +} + /** The key that is used to identify that the I/O should be autodetected */ #define SP_MODULE_KEY_AUTODETECT "autodetect" /** This is the key for the SVG input module */ diff --git a/src/extension/param/enum.cpp b/src/extension/param/enum.cpp index ff77c1603..846bfcb12 100644 --- a/src/extension/param/enum.cpp +++ b/src/extension/param/enum.cpp @@ -27,6 +27,7 @@ #include "sp-object.h" #include "enum.h" #include "preferences.h" +#include <gtkmm/box.h> namespace Inkscape { namespace Extension { diff --git a/src/extension/param/radiobutton.cpp b/src/extension/param/radiobutton.cpp index 1b52bebe5..706d68e02 100644 --- a/src/extension/param/radiobutton.cpp +++ b/src/extension/param/radiobutton.cpp @@ -28,6 +28,7 @@ #include "sp-object.h" #include "radiobutton.h" +#include <gtkmm/box.h> /** * The root directory in the preferences database for extension diff --git a/src/interface.cpp b/src/interface.cpp index d9f61cf43..929f19634 100644 --- a/src/interface.cpp +++ b/src/interface.cpp @@ -67,6 +67,8 @@ #include "gradient-drag.h" #include "widgets/ege-paint-def.h" +#include <gdk/gdkkeysyms.h> + using Inkscape::DocumentUndo; /* Drag and Drop */ diff --git a/src/snap.cpp b/src/snap.cpp index eab9f2142..f1197155b 100644 --- a/src/snap.cpp +++ b/src/snap.cpp @@ -35,6 +35,8 @@ #include "event-context.h" #include "util/mathfns.h" using std::vector; +using Inkscape::Util::round_to_upper_multiple_plus; +using Inkscape::Util::round_to_lower_multiple_plus; SnapManager::SnapManager(SPNamedView const *v) : guide(this, 0), diff --git a/src/ui/dialog/dialog-manager.h b/src/ui/dialog/dialog-manager.h index 45d8d8f66..33b166aa1 100644 --- a/src/ui/dialog/dialog-manager.h +++ b/src/ui/dialog/dialog-manager.h @@ -14,7 +14,6 @@ #ifndef INKSCAPE_UI_DIALOG_MANAGER_H #define INKSCAPE_UI_DIALOG_MANAGER_H -#include <glib.h> #include "dialog.h" #include <map> diff --git a/src/ui/dialog/dock-behavior.h b/src/ui/dialog/dock-behavior.h index 98c111719..cc599286f 100644 --- a/src/ui/dialog/dock-behavior.h +++ b/src/ui/dialog/dock-behavior.h @@ -13,18 +13,13 @@ #ifndef INKSCAPE_UI_DIALOG_DOCK_BEHAVIOR_H #define INKSCAPE_UI_DIALOG_DOCK_BEHAVIOR_H -#include <map> - -#include <gtkmm/buttonbox.h> -#include <gtkmm/frame.h> -#include <gtkmm/paned.h> - #include "ui/widget/dock-item.h" - -#include "libgdl/gdl.h" - #include "behavior.h" +namespace Gtk { + class Paned; +} + namespace Inkscape { namespace UI { namespace Dialog { diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp index 874fbce83..d7c46323d 100644 --- a/src/ui/dialog/filter-effects-dialog.cpp +++ b/src/ui/dialog/filter-effects-dialog.cpp @@ -63,6 +63,7 @@ #include <iostream> #include <gtkmm/colorbutton.h> +#include <gtkmm/paned.h> #include <gtkmm/scrolledwindow.h> #include <gtkmm/stock.h> diff --git a/src/ui/dialog/guides.cpp b/src/ui/dialog/guides.cpp index e353178ed..521510e1e 100644 --- a/src/ui/dialog/guides.cpp +++ b/src/ui/dialog/guides.cpp @@ -34,6 +34,8 @@ #include <2geom/point.h> #include <2geom/angle.h> +#include <gtkmm/stock.h> + namespace Inkscape { namespace UI { namespace Dialogs { diff --git a/src/ui/dialog/guides.h b/src/ui/dialog/guides.h index 20136fbff..d06c3afc8 100644 --- a/src/ui/dialog/guides.h +++ b/src/ui/dialog/guides.h @@ -13,13 +13,9 @@ #include <gtkmm/dialog.h> #include <gtkmm/table.h> -#include <gtkmm/spinbutton.h> #include <gtkmm/label.h> -#include <gtkmm/stock.h> -#include <gtkmm/adjustment.h> #include <gtkmm/colorbutton.h> #include "ui/widget/button.h" -#include "ui/widget/spinbutton.h" #include "ui/widget/unit-menu.h" #include "ui/widget/scalar-unit.h" #include "ui/widget/entry.h" diff --git a/src/ui/dialog/ocaldialogs.h b/src/ui/dialog/ocaldialogs.h index 1da3a3447..3679e6acb 100644 --- a/src/ui/dialog/ocaldialogs.h +++ b/src/ui/dialog/ocaldialogs.h @@ -12,23 +12,11 @@ #ifndef __OCAL_DIALOG_H__ #define __OCAL_DIALOG_H__ -#include <glibmm.h> -#include <vector> -#include "filedialogimpl-gtkmm.h" - //General includes -#include <unistd.h> -#include <sys/stat.h> -#include <errno.h> -#include <set> -#include <libxml/parser.h> #include <libxml/tree.h> - //Gtk includes -#include <glibmm/i18n.h> -#include <glib/gstdio.h> -#include <gtkmm/frame.h> +#include <gtkmm/dialog.h> #include <gtkmm/listviewtext.h> #include <gtkmm/scrolledwindow.h> @@ -44,15 +32,7 @@ #endif //Inkscape includes -#include <extension/input.h> -#include <extension/output.h> -#include <extension/db.h> -#include "inkscape.h" -#include "svg-view-widget.h" -#include "gc-core.h" - -//For export dialog -#include "ui/widget/scalar-unit.h" +#include "ui/dialog/filedialog.h" namespace Inkscape @@ -61,6 +41,8 @@ namespace UI { namespace Dialog { + +class SVGPreview; /*######################################################################### ### F I L E D I A L O G O C A L B A S E C L A S S diff --git a/src/ui/tool/node.cpp b/src/ui/tool/node.cpp index 4df4ba30e..1285741ca 100644 --- a/src/ui/tool/node.cpp +++ b/src/ui/tool/node.cpp @@ -32,6 +32,7 @@ #include "ui/tool/multi-path-manipulator.h" #include "ui/tool/node.h" #include "ui/tool/path-manipulator.h" +#include <gdk/gdkkeysyms.h> namespace Inkscape { namespace UI { diff --git a/src/ui/widget/dock-item.h b/src/ui/widget/dock-item.h index 48cd71846..573307452 100644 --- a/src/ui/widget/dock-item.h +++ b/src/ui/widget/dock-item.h @@ -11,14 +11,16 @@ #ifndef INKSCAPE_UI_WIGET_DOCK_ITEM_H #define INKSCAPE_UI_WIGET_DOCK_ITEM_H -#include <gtkmm/button.h> -#include <gtkmm/buttonbox.h> +#include <gtkmm/box.h> #include <gtkmm/frame.h> -#include <gtkmm/paned.h> #include <gtkmm/window.h> #include "libgdl/gdl.h" +namespace Gtk { + class HButtonBox; +} + namespace Inkscape { namespace UI { namespace Widget { diff --git a/src/ui/widget/tolerance-slider.cpp b/src/ui/widget/tolerance-slider.cpp index 5846a0c64..72fd48344 100644 --- a/src/ui/widget/tolerance-slider.cpp +++ b/src/ui/widget/tolerance-slider.cpp @@ -15,6 +15,7 @@ #include <gtkmm/adjustment.h> #include <gtkmm/box.h> #include <gtkmm/label.h> +#include <gtkmm/radiobutton.h> #include <gtkmm/scale.h> #include "xml/repr.h" diff --git a/src/ui/widget/tolerance-slider.h b/src/ui/widget/tolerance-slider.h index 790ed0e74..d0b78e3c1 100644 --- a/src/ui/widget/tolerance-slider.h +++ b/src/ui/widget/tolerance-slider.h @@ -10,6 +10,12 @@ #ifndef INKSCAPE_UI_WIDGET_TOLERANCE_SLIDER__H_ #define INKSCAPE_UI_WIDGET_TOLERANCE_SLIDER__H_ +#include <gtkmm/radiobuttongroup.h> + +namespace Gtk { + class RadioButton; +} + namespace Inkscape { namespace UI { namespace Widget { |
