diff options
| author | Liam P. White <inkscapebrony@gmail.com> | 2014-08-31 18:17:26 +0000 |
|---|---|---|
| committer | Liam P. White <inkscapebrony@gmail.com> | 2014-08-31 18:17:26 +0000 |
| commit | 1f2d8bc4ce99e970cead4ca96c1859c383a9c043 (patch) | |
| tree | 07731605bc486145ce5817c5f98a27b0136c7074 /src/sp-text.h | |
| parent | Minor pass of header cleanup (diff) | |
| download | inkscape-1f2d8bc4ce99e970cead4ca96c1859c383a9c043.tar.gz inkscape-1f2d8bc4ce99e970cead4ca96c1859c383a9c043.zip | |
Header cleanup: stop using Glib types where they aren't truly needed. Eases GThread deprecation errors.
(bzr r13341.1.190)
Diffstat (limited to 'src/sp-text.h')
| -rw-r--r-- | src/sp-text.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/sp-text.h b/src/sp-text.h index b9ae745c9..be48d7fcb 100644 --- a/src/sp-text.h +++ b/src/sp-text.h @@ -1,5 +1,5 @@ -#ifndef __SP_TEXT_H__ -#define __SP_TEXT_H__ +#ifndef SEEN_SP_TEXT_H +#define SEEN_SP_TEXT_H /* * SVG <text> and <tspan> implementation @@ -13,13 +13,13 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include <glib.h> -#include <stddef.h> +#include <cstddef> #include <sigc++/sigc++.h> -#include "sp-string.h" // Provides many other headers with SP_IS_STRING + +#include "libnrtype/Layout-TNG.h" #include "sp-item.h" +#include "sp-string.h" // Provides many other headers with SP_IS_STRING #include "text-tag-attributes.h" -#include "libnrtype/Layout-TNG.h" #define SP_TEXT(obj) (dynamic_cast<SPText*>((SPObject*)obj)) #define SP_IS_TEXT(obj) (dynamic_cast<const SPText*>((SPObject*)obj) != NULL) @@ -81,15 +81,15 @@ public: virtual void release(); virtual void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref); virtual void remove_child(Inkscape::XML::Node* child); - virtual void set(unsigned int key, const gchar* value); + virtual void set(unsigned int key, const char* value); virtual void update(SPCtx* ctx, unsigned int flags); virtual void modified(unsigned int flags); - virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags); + virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags); virtual Geom::OptRect bbox(Geom::Affine const &transform, SPItem::BBoxType type) const; virtual void print(SPPrintContext *ctx); virtual const char* displayName() const; - virtual gchar* description() const; + virtual char* description() const; virtual Inkscape::DrawingItem* show(Inkscape::Drawing &drawing, unsigned int key, unsigned int flags); virtual void hide(unsigned int key); virtual void snappoints(std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape::SnapPreferences const *snapprefs) const; |