From 944045b4457bc5cbc3234d7243c7cd01e10a6038 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Mon, 12 Mar 2012 00:31:09 +0000 Subject: Fix false gtk deprecation warnings from gtkmm headers (bzr r11070) --- src/live_effects/effect.h | 1 - src/live_effects/lpe-line_segment.h | 2 +- src/ui/dialog/livepatheffect-add.cpp | 2 +- src/ui/dialog/livepatheffect-add.h | 4 ---- src/ui/dialog/object-properties.h | 2 +- src/ui/dialog/swatches.cpp | 2 +- src/ui/dialog/xml-tree.cpp | 5 ++++- src/ui/dialog/xml-tree.h | 25 ++++++++++++++----------- src/widgets/stroke-style.cpp | 3 +-- src/widgets/toolbox.cpp | 2 +- 10 files changed, 24 insertions(+), 24 deletions(-) (limited to 'src') diff --git a/src/live_effects/effect.h b/src/live_effects/effect.h index ffb4d70a3..50d4c142b 100644 --- a/src/live_effects/effect.h +++ b/src/live_effects/effect.h @@ -7,7 +7,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include #include #include <2geom/forward.h> #include "ui/widget/registry.h" diff --git a/src/live_effects/lpe-line_segment.h b/src/live_effects/lpe-line_segment.h index 3a8e895e3..b2bb0994f 100644 --- a/src/live_effects/lpe-line_segment.h +++ b/src/live_effects/lpe-line_segment.h @@ -14,8 +14,8 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include "live_effects/effect.h" #include "live_effects/parameter/enum.h" +#include "live_effects/effect.h" namespace Inkscape { namespace LivePathEffect { diff --git a/src/ui/dialog/livepatheffect-add.cpp b/src/ui/dialog/livepatheffect-add.cpp index 6420702ef..3a4549b41 100644 --- a/src/ui/dialog/livepatheffect-add.cpp +++ b/src/ui/dialog/livepatheffect-add.cpp @@ -12,11 +12,11 @@ # include #endif +#include "livepatheffect-add.h" #include #include #include "desktop.h" -#include "livepatheffect-add.h" #include "live_effects/effect-enum.h" namespace Inkscape { diff --git a/src/ui/dialog/livepatheffect-add.h b/src/ui/dialog/livepatheffect-add.h index be01e21df..00f58b038 100644 --- a/src/ui/dialog/livepatheffect-add.h +++ b/src/ui/dialog/livepatheffect-add.h @@ -12,13 +12,9 @@ #define INKSCAPE_DIALOG_LIVEPATHEFFECT_ADD_H #include -#include -#include -#include #include #include #include -#include "ui/widget/combo-enums.h" #include "live_effects/effect-enum.h" class SPDesktop; diff --git a/src/ui/dialog/object-properties.h b/src/ui/dialog/object-properties.h index 47cfae19a..d8d74cdb3 100644 --- a/src/ui/dialog/object-properties.h +++ b/src/ui/dialog/object-properties.h @@ -13,12 +13,12 @@ #ifndef SEEN_DIALOGS_ITEM_PROPERTIES_H #define SEEN_DIALOGS_ITEM_PROPERTIES_H +#include "ui/widget/panel.h" #include #include #include #include -#include "ui/widget/panel.h" #include "ui/dialog/desktop-tracker.h" #include "widgets/sp-attribute-widget.h" diff --git a/src/ui/dialog/swatches.cpp b/src/ui/dialog/swatches.cpp index ba7646d28..29492db55 100644 --- a/src/ui/dialog/swatches.cpp +++ b/src/ui/dialog/swatches.cpp @@ -18,9 +18,9 @@ #include #include +#include "swatches.h" #include -#include "swatches.h" #include #include #include diff --git a/src/ui/dialog/xml-tree.cpp b/src/ui/dialog/xml-tree.cpp index 27064d393..810f2a5c6 100644 --- a/src/ui/dialog/xml-tree.cpp +++ b/src/ui/dialog/xml-tree.cpp @@ -16,6 +16,7 @@ * */ +#include "xml-tree.h" #include "widgets/icon.h" #include #include @@ -43,7 +44,9 @@ #include "verbs.h" #include "widgets/icon.h" -#include "xml-tree.h" +#include "widgets/sp-xmlview-attr-list.h" +#include "widgets/sp-xmlview-content.h" +#include "widgets/sp-xmlview-tree.h" namespace Inkscape { namespace UI { diff --git a/src/ui/dialog/xml-tree.h b/src/ui/dialog/xml-tree.h index 0f516d8dc..82594d17e 100644 --- a/src/ui/dialog/xml-tree.h +++ b/src/ui/dialog/xml-tree.h @@ -13,28 +13,31 @@ #ifndef SEEN_DIALOGS_XML_TREE_H #define SEEN_DIALOGS_XML_TREE_H -#include -#include -#include -#include +#include "ui/widget/panel.h" #include #include #include #include -#include #include #include -#include "desktop.h" #include "ui/dialog/desktop-tracker.h" -#include "ui/widget/panel.h" -#include "widgets/sp-attribute-widget.h" +#include "message.h" -#include "widgets/sp-xmlview-attr-list.h" -#include "widgets/sp-xmlview-content.h" -#include "widgets/sp-xmlview-tree.h" +struct SPDesktop; +struct SPObject; +struct SPXMLViewAttrList; +struct SPXMLViewContent; +struct SPXMLViewTree; namespace Inkscape { +class MessageStack; +class MessageContext; + +namespace XML { +class Node; +} + namespace UI { namespace Dialog { diff --git a/src/widgets/stroke-style.cpp b/src/widgets/stroke-style.cpp index 5508d8cca..a49a26734 100644 --- a/src/widgets/stroke-style.cpp +++ b/src/widgets/stroke-style.cpp @@ -17,10 +17,9 @@ #define noSP_SS_VERBOSE +#include "widgets/dash-selector.h" #include -#include #include -#include "widgets/dash-selector.h" #include "desktop-handles.h" #include "desktop-style.h" diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp index b9d2eace3..e0454683f 100644 --- a/src/widgets/toolbox.cpp +++ b/src/widgets/toolbox.cpp @@ -31,6 +31,7 @@ #include #include +#include "live_effects/lpe-line_segment.h" #include #include #include @@ -67,7 +68,6 @@ #include "../libnrtype/font-instance.h" #include "../live_effects/effect.h" #include "../live_effects/lpe-angle_bisector.h" -#include "../live_effects/lpe-line_segment.h" #include "../lpe-tool-context.h" #include "../mod360.h" #include "../pen-context.h" -- cgit v1.2.3