summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlex Valavanis <valavanisalex@gmail.com>2016-12-26 23:00:38 +0000
committerAlexander Valavanis <valavanisalex@gmail.com>2016-12-26 23:00:38 +0000
commit223ba2e5e0060a4fef243fb3249c946168698e59 (patch)
treed7f0663314d5db7ed626f8295d000a88174d3d84 /src
parentFix typo (diff)
downloadinkscape-223ba2e5e0060a4fef243fb3249c946168698e59.tar.gz
inkscape-223ba2e5e0060a4fef243fb3249c946168698e59.zip
Fix header inclusion ordering
(bzr r15365)
Diffstat (limited to 'src')
-rw-r--r--src/file.cpp4
-rw-r--r--src/live_effects/lpe-measure-line.h3
-rw-r--r--src/ui/widget/font-button.cpp3
-rw-r--r--src/ui/widget/font-button.h1
-rw-r--r--src/widgets/mesh-toolbar.cpp3
5 files changed, 10 insertions, 4 deletions
diff --git a/src/file.cpp b/src/file.cpp
index 6f7c52123..756bc55bb 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -31,6 +31,8 @@
# include "config.h"
#endif
+#include <gtkmm.h>
+
#include "ui/dialog/ocaldialogs.h"
#include "desktop.h"
@@ -71,8 +73,6 @@
#include "proj_pt.h"
#include "ui/shape-editor.h"
-#include <gtkmm.h>
-
using Inkscape::DocumentUndo;
#ifdef WITH_GNOME_VFS
diff --git a/src/live_effects/lpe-measure-line.h b/src/live_effects/lpe-measure-line.h
index 565644c07..c69921a4d 100644
--- a/src/live_effects/lpe-measure-line.h
+++ b/src/live_effects/lpe-measure-line.h
@@ -11,6 +11,9 @@
*/
#include "live_effects/effect.h"
+
+#include <gtkmm/expander.h>
+
#include "live_effects/parameter/enum.h"
#include "live_effects/parameter/fontbutton.h"
#include "live_effects/parameter/text.h"
diff --git a/src/ui/widget/font-button.cpp b/src/ui/widget/font-button.cpp
index a472ac6a4..ed57c803a 100644
--- a/src/ui/widget/font-button.cpp
+++ b/src/ui/widget/font-button.cpp
@@ -8,8 +8,11 @@
#endif
#include "font-button.h"
+
#include <glibmm/i18n.h>
+#include <gtkmm/fontbutton.h>
+
namespace Inkscape {
namespace UI {
namespace Widget {
diff --git a/src/ui/widget/font-button.h b/src/ui/widget/font-button.h
index 1f1ad2d01..98c3db440 100644
--- a/src/ui/widget/font-button.h
+++ b/src/ui/widget/font-button.h
@@ -8,7 +8,6 @@
#ifndef INKSCAPE_UI_WIDGET_FONT_BUTTON_H
#define INKSCAPE_UI_WIDGET_FONT_BUTTON_H
-#include <gtkmm.h>
#include "labelled.h"
namespace Inkscape {
diff --git a/src/widgets/mesh-toolbar.cpp b/src/widgets/mesh-toolbar.cpp
index ea0faf1df..b1cbb98b0 100644
--- a/src/widgets/mesh-toolbar.cpp
+++ b/src/widgets/mesh-toolbar.cpp
@@ -18,6 +18,8 @@
#include <config.h>
#endif
+#include <gtkmm.h>
+
// REVIEW THESE AT END OF REWRITE
#include "ui/widget/color-preview.h"
#include "toolbox.h"
@@ -36,7 +38,6 @@
#include "document-undo.h"
#include "desktop.h"
-#include <gtkmm.h>
#include <glibmm/i18n.h>
#include "ui/tools/gradient-tool.h"