diff options
| author | Liam P. White <inkscapebrony@gmail.com> | 2014-09-06 15:25:51 +0000 |
|---|---|---|
| committer | Liam P. White <inkscapebrony@gmail.com> | 2014-09-06 15:25:51 +0000 |
| commit | 990c48b80c39b942dac8bb87f16189f52ffb0d8e (patch) | |
| tree | 8281fbe19ea8b1c6cf71c75dc08b338a230d29e3 /src/display/canvas-temporary-item.h | |
| parent | lpe interpolate points: small code style fix-up. should be done for all LPEs (diff) | |
| download | inkscape-990c48b80c39b942dac8bb87f16189f52ffb0d8e.tar.gz inkscape-990c48b80c39b942dac8bb87f16189f52ffb0d8e.zip | |
More header cleanup
(bzr r13341.1.198)
Diffstat (limited to 'src/display/canvas-temporary-item.h')
| -rw-r--r-- | src/display/canvas-temporary-item.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/display/canvas-temporary-item.h b/src/display/canvas-temporary-item.h index 09d243fa1..39ca2fc65 100644 --- a/src/display/canvas-temporary-item.h +++ b/src/display/canvas-temporary-item.h @@ -11,9 +11,8 @@ */ -#include <stddef.h> -#include <sigc++/sigc++.h> -#include <glib.h> +#include <cstddef> +#include <sigc++/signal.h> struct SPCanvasItem; @@ -25,7 +24,7 @@ namespace Display { */ class TemporaryItem { public: - TemporaryItem(SPCanvasItem *item, guint lifetime, bool destroy_on_deselect = false); + TemporaryItem(SPCanvasItem *item, unsigned int lifetime, bool destroy_on_deselect = false); virtual ~TemporaryItem(); sigc::signal<void, TemporaryItem *> signal_timeout; @@ -34,10 +33,10 @@ protected: friend class TemporaryItemList; SPCanvasItem * canvasitem; /** The item we are holding on to */ - guint timeout_id; /** ID by which glib knows the timeout event */ + unsigned int timeout_id; /** ID by which glib knows the timeout event */ bool destroy_on_deselect; // only destroy when parent item is deselected, not when mouse leaves - static gboolean _timeout(gpointer data); ///< callback for when lifetime expired + static int _timeout(void* data); ///< callback for when lifetime expired private: TemporaryItem(const TemporaryItem&); |