From e6051b73e2a377f9586a98e24c317f21654b13e9 Mon Sep 17 00:00:00 2001 From: "Johan B. C. Engelen" Date: Thu, 28 Mar 2013 19:31:20 +0100 Subject: fix build (bzr r12254) --- src/registrytool.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/registrytool.cpp b/src/registrytool.cpp index 72b53821e..7544e1c91 100644 --- a/src/registrytool.cpp +++ b/src/registrytool.cpp @@ -21,12 +21,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "registrytool.h" + #include #include #include - -#include "registrytool.h" - +#include typedef struct { -- cgit v1.2.3 From 6d5fa9cf53cf9114cc5b7e2f52a69b61a5aaa440 Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Thu, 28 Mar 2013 20:23:28 +0100 Subject: Fix for Bug #648233 (Measure Path extension doesn't use real superscript) by Craig Marshall. Fix for Bug #481805 (Rectangle with rounded corners) by Markus Engel. (bzr r12255) --- src/sp-rect.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/sp-rect.cpp b/src/sp-rect.cpp index e7e1432c2..747a988a9 100644 --- a/src/sp-rect.cpp +++ b/src/sp-rect.cpp @@ -120,13 +120,13 @@ sp_rect_set(SPObject *object, unsigned key, gchar const *value) object->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); break; case SP_ATTR_RX: - if (!rect->rx.read(value) || rect->rx.value < 0.0) { + if (!rect->rx.read(value) || rect->rx.value <= 0.0) { rect->rx.unset(); } object->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); break; case SP_ATTR_RY: - if (!rect->ry.read(value) || rect->ry.value < 0.0) { + if (!rect->ry.read(value) || rect->ry.value <= 0.0) { rect->ry.unset(); } object->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); -- cgit v1.2.3 From e1096fd4fce62dab0da7983a2b719545f7d6fdb5 Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Thu, 28 Mar 2013 20:31:49 +0100 Subject: Fix for Bug #1161197 (Untranslatable string in Font substitution dialog) by Masato HASHIMOTO. Translation template and French translation update. (bzr r12256) --- src/ui/dialog/font-substitution.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/ui/dialog/font-substitution.cpp b/src/ui/dialog/font-substitution.cpp index f0112f1d8..0bb8195f8 100644 --- a/src/ui/dialog/font-substitution.cpp +++ b/src/ui/dialog/font-substitution.cpp @@ -236,7 +236,7 @@ GSList * FontSubstitution::getFontReplacedItems(SPDocument* doc, Glib::ustring * if (fontFound == false) { Glib::ustring subName = getSubstituteFontName(fonts); Glib::ustring err = Glib::ustring::compose( - "Font '%1' substituted with '%2'", fonts.c_str(), subName.c_str()); + _("Font '%1' substituted with '%2'"), fonts.c_str(), subName.c_str()); setErrors.insert(err); outList = g_slist_prepend (outList, item); } -- cgit v1.2.3 From 6deb2f9a0e3822de70eb62efa2e5d9dd5ff41a12 Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Thu, 28 Mar 2013 20:39:04 +0100 Subject: Fix for Bug #1161205 (Font substitution dialog appears when generic font family is found except Sans-serif). (bzr r12257) --- src/ui/dialog/font-substitution.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/ui/dialog/font-substitution.cpp b/src/ui/dialog/font-substitution.cpp index 0bb8195f8..796d2b97a 100644 --- a/src/ui/dialog/font-substitution.cpp +++ b/src/ui/dialog/font-substitution.cpp @@ -228,7 +228,11 @@ GSList * FontSubstitution::getFontReplacedItems(SPDocument* doc, Glib::ustring * std::set::const_iterator iter = setFontSpans.find(font); if (iter != setFontSpans.end() || font == Glib::ustring("sans-serif") || - font == Glib::ustring("Sans")) { + font == Glib::ustring("Sans") || + font == Glib::ustring("serif") || + font == Glib::ustring("Serif") || + font == Glib::ustring("monospace") || + font == Glib::ustring("Monospace")) { fontFound = true; break; } -- cgit v1.2.3 From 024fe729644d74a60088fa29fcc69ce4327fbe58 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Fri, 29 Mar 2013 11:00:19 +0000 Subject: Header cleanup (bzr r12258) --- src/ege-color-prof-tracker.h | 6 +----- src/registrytool.cpp | 1 + src/sp-stop.h | 10 ++++------ src/ui/cache/svg_preview_cache.cpp | 1 - src/ui/control-manager.cpp | 1 - src/ui/dialog/clonetiler.cpp | 1 - src/ui/dialog/clonetiler.h | 1 - src/ui/dialog/desktop-tracker.h | 3 +-- src/ui/dialog/find.h | 2 -- src/ui/dialog/font-substitution.cpp | 7 +++++++ src/ui/dialog/font-substitution.h | 15 ++------------- src/ui/dialog/icon-preview.cpp | 1 - src/ui/dialog/object-attributes.cpp | 1 + src/ui/dialog/object-attributes.h | 3 --- src/ui/dialog/symbols.h | 11 ++--------- src/ui/tool/node-tool.h | 7 ++----- src/ui/uxmanager.h | 11 ++--------- 17 files changed, 23 insertions(+), 59 deletions(-) (limited to 'src') diff --git a/src/ege-color-prof-tracker.h b/src/ege-color-prof-tracker.h index 09aeae970..19423c19f 100644 --- a/src/ege-color-prof-tracker.h +++ b/src/ege-color-prof-tracker.h @@ -45,16 +45,12 @@ /* Note: this file should be kept compilable as both .cpp and .c */ -#include #include +typedef struct _GtkWidget GtkWidget; G_BEGIN_DECLS -#ifdef __cplusplus -typedef struct _GtkWidget GtkWidget; -#endif /* __cplusplus */ - #define EGE_COLOR_PROF_TRACKER_TYPE ( ege_color_prof_tracker_get_type() ) #define EGE_COLOR_PROF_TRACKER( obj ) ( G_TYPE_CHECK_INSTANCE_CAST( (obj), EGE_COLOR_PROF_TRACKER_TYPE, EgeColorProfTracker) ) #define EGE_COLOR_PROF_TRACKER_CLASS( klass ) ( G_TYPE_CHECK_CLASS_CAST( (klass), EGE_COLOR_PROF_TRACKER_TYPE, EgeColorProfTrackerClass) ) diff --git a/src/registrytool.cpp b/src/registrytool.cpp index 7544e1c91..01a83a7e0 100644 --- a/src/registrytool.cpp +++ b/src/registrytool.cpp @@ -26,6 +26,7 @@ #include #include #include + #include typedef struct diff --git a/src/sp-stop.h b/src/sp-stop.h index b82dd0b13..d22e86e00 100644 --- a/src/sp-stop.h +++ b/src/sp-stop.h @@ -8,15 +8,13 @@ * Authors? */ -#include -#include #include "sp-object.h" #include "color.h" +#include -class SPObjectClass; - -struct SPStop; -struct SPStopClass; +namespace Glib { +class ustring; +} #define SP_TYPE_STOP (sp_stop_get_type()) #define SP_STOP(o) (G_TYPE_CHECK_INSTANCE_CAST((o), SP_TYPE_STOP, SPStop)) diff --git a/src/ui/cache/svg_preview_cache.cpp b/src/ui/cache/svg_preview_cache.cpp index 7842bd5b3..74e94b827 100644 --- a/src/ui/cache/svg_preview_cache.cpp +++ b/src/ui/cache/svg_preview_cache.cpp @@ -19,7 +19,6 @@ # include "config.h" #endif -#include #include #include <2geom/transforms.h> #include "sp-namedview.h" diff --git a/src/ui/control-manager.cpp b/src/ui/control-manager.cpp index 62e6ce3a3..5a3c5a496 100644 --- a/src/ui/control-manager.cpp +++ b/src/ui/control-manager.cpp @@ -14,7 +14,6 @@ #include #include -#include #include #include "display/sodipodi-ctrl.h" // for SP_TYPE_CTRL diff --git a/src/ui/dialog/clonetiler.cpp b/src/ui/dialog/clonetiler.cpp index e971cfb09..753320ab9 100644 --- a/src/ui/dialog/clonetiler.cpp +++ b/src/ui/dialog/clonetiler.cpp @@ -21,7 +21,6 @@ #include -#include #include #include <2geom/transforms.h> #include diff --git a/src/ui/dialog/clonetiler.h b/src/ui/dialog/clonetiler.h index 2cad30e9e..7ec30cfaa 100644 --- a/src/ui/dialog/clonetiler.h +++ b/src/ui/dialog/clonetiler.h @@ -11,7 +11,6 @@ #define __SP_CLONE_TILER_H__ #include "ui/widget/panel.h" -#include #include #include "ui/dialog/desktop-tracker.h" diff --git a/src/ui/dialog/desktop-tracker.h b/src/ui/dialog/desktop-tracker.h index c219e8d98..7da55cf2f 100644 --- a/src/ui/dialog/desktop-tracker.h +++ b/src/ui/dialog/desktop-tracker.h @@ -7,9 +7,8 @@ #ifndef SEEN_DIALOG_DESKTOP_TRACKER #define SEEN_DIALOG_DESKTOP_TRACKER -#include +#include #include -#include typedef struct _GtkWidget GtkWidget; class SPDesktop; diff --git a/src/ui/dialog/find.h b/src/ui/dialog/find.h index 14d54b8d4..c0c635f94 100644 --- a/src/ui/dialog/find.h +++ b/src/ui/dialog/find.h @@ -20,14 +20,12 @@ #include "ui/widget/button.h" #include "ui/widget/entry.h" #include "ui/widget/frame.h" -#include #include #include #include #include -#include "desktop.h" #include "ui/dialog/desktop-tracker.h" class SPItem; diff --git a/src/ui/dialog/font-substitution.cpp b/src/ui/dialog/font-substitution.cpp index 796d2b97a..8df3ee5c8 100644 --- a/src/ui/dialog/font-substitution.cpp +++ b/src/ui/dialog/font-substitution.cpp @@ -10,6 +10,10 @@ # include #endif +#include +#include +#include + #include #include "font-substitution.h" @@ -24,7 +28,9 @@ #include "preferences.h" #include "xml/repr.h" + #include "sp-defs.h" +#include "sp-root.h" #include "sp-text.h" #include "sp-textpath.h" #include "sp-flowtext.h" @@ -37,6 +43,7 @@ #include "libnrtype/FontFactory.h" #include "libnrtype/font-instance.h" +#include #include namespace Inkscape { diff --git a/src/ui/dialog/font-substitution.h b/src/ui/dialog/font-substitution.h index 6fa5aee91..1c445081b 100644 --- a/src/ui/dialog/font-substitution.h +++ b/src/ui/dialog/font-substitution.h @@ -12,19 +12,9 @@ #ifndef INKSCAPE_UI_FONT_SUBSTITUTION_H #define INKSCAPE_UI_FONT_SUBSTITUTION_H -#include -#include -#include -#include -#include -#if WITH_GTKMM_3_0 -#include -#endif -#include -#include -#include -#include "sp-root.h" +#include +class SPDocument; namespace Inkscape { namespace UI { @@ -46,7 +36,6 @@ protected: private: FontSubstitution(FontSubstitution const &d); FontSubstitution& operator=(FontSubstitution const &d); - }; } // namespace Dialog diff --git a/src/ui/dialog/icon-preview.cpp b/src/ui/dialog/icon-preview.cpp index 801ab2922..1a52410b8 100644 --- a/src/ui/dialog/icon-preview.cpp +++ b/src/ui/dialog/icon-preview.cpp @@ -19,7 +19,6 @@ #include #include -#include #include #include diff --git a/src/ui/dialog/object-attributes.cpp b/src/ui/dialog/object-attributes.cpp index f5addc401..027c9ae56 100644 --- a/src/ui/dialog/object-attributes.cpp +++ b/src/ui/dialog/object-attributes.cpp @@ -21,6 +21,7 @@ */ #include "ui/dialog/dialog-manager.h" +#include "desktop.h" #include "desktop-handles.h" #include "macros.h" #include "sp-anchor.h" diff --git a/src/ui/dialog/object-attributes.h b/src/ui/dialog/object-attributes.h index b0d02a0af..956091989 100644 --- a/src/ui/dialog/object-attributes.h +++ b/src/ui/dialog/object-attributes.h @@ -23,9 +23,6 @@ #ifndef SEEN_DIALOGS_OBJECT_ATTRIBUTES_H #define SEEN_DIALOGS_OBJECT_ATTRIBUTES_H -#include - -#include "desktop.h" #include "ui/dialog/desktop-tracker.h" #include "ui/widget/panel.h" diff --git a/src/ui/dialog/symbols.h b/src/ui/dialog/symbols.h index 5486ff546..08221bf22 100644 --- a/src/ui/dialog/symbols.h +++ b/src/ui/dialog/symbols.h @@ -12,15 +12,11 @@ #ifndef INKSCAPE_UI_DIALOG_SYMBOLS_H #define INKSCAPE_UI_DIALOG_SYMBOLS_H -#include "ui/widget/panel.h" -#include "ui/widget/button.h" +#include "display/drawing.h" #include "ui/dialog/desktop-tracker.h" -#include "display/drawing.h" - -#include -#include +#include "ui/widget/panel.h" #include @@ -43,9 +39,6 @@ public: static SymbolsDialog& getInstance(); -protected: - - private: SymbolsDialog(SymbolsDialog const &); // no copy SymbolsDialog &operator=(SymbolsDialog const &); // no assign diff --git a/src/ui/tool/node-tool.h b/src/ui/tool/node-tool.h index bc5267bb2..341faf329 100644 --- a/src/ui/tool/node-tool.h +++ b/src/ui/tool/node-tool.h @@ -14,12 +14,9 @@ #include #include #include -#include -#include #include "event-context.h" -#include "ui/tool/node-types.h" -#define INK_TYPE_NODE_TOOL (ink_node_tool_get_type ()) +#define INK_TYPE_NODE_TOOL (ink_node_tool_get_type ()) #define INK_NODE_TOOL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), INK_TYPE_NODE_TOOL, InkNodeTool)) #define INK_NODE_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), INK_TYPE_NODE_TOOL, InkNodeToolClass)) #define INK_IS_NODE_TOOL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), INK_TYPE_NODE_TOOL)) @@ -74,7 +71,7 @@ struct InkNodeTool : public SPEventContext }; struct InkNodeToolClass { - SPEventContextClass parent_class; + SPEventContextClass parent_class; }; GType ink_node_tool_get_type (void); diff --git a/src/ui/uxmanager.h b/src/ui/uxmanager.h index 5fef08f11..711703192 100644 --- a/src/ui/uxmanager.h +++ b/src/ui/uxmanager.h @@ -11,20 +11,13 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include #include +#include -extern "C" -{ - typedef struct _GObject GObject; - typedef struct _GtkWidget GtkWidget; -} - +extern "C" typedef struct _GtkWidget GtkWidget; class SPDesktop; - struct SPDesktopWidget; - namespace Inkscape { namespace UI { -- cgit v1.2.3