summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/deptool.cpp4
-rw-r--r--src/display/canvas-bpath.h12
-rw-r--r--src/display/sodipodi-ctrl.h8
-rw-r--r--src/enums.h4
-rw-r--r--src/extension/dbus/application-interface.h4
-rw-r--r--src/extension/extension.h4
-rw-r--r--src/helper/geom-nodetype.h4
-rw-r--r--src/id-clash.cpp2
-rw-r--r--src/knot-enums.h12
-rw-r--r--src/object/sp-object.h4
-rw-r--r--src/object/sp-star.h4
-rw-r--r--src/selection-chemistry.h4
-rw-r--r--src/trace/potrace/inkscape-potrace.h4
-rw-r--r--src/ui/dialog/filedialog.h12
-rw-r--r--src/ui/dialog/transformation.h4
-rw-r--r--src/ui/interface.cpp4
-rw-r--r--src/ui/previewable.h8
-rw-r--r--src/ui/widget/color-scales.h4
-rw-r--r--src/ui/widget/imageicon.cpp4
-rw-r--r--src/widgets/button.h4
-rw-r--r--src/widgets/eek-preview.h20
21 files changed, 65 insertions, 65 deletions
diff --git a/src/deptool.cpp b/src/deptool.cpp
index 7233c5544..a2b2bb9d2 100644
--- a/src/deptool.cpp
+++ b/src/deptool.cpp
@@ -90,13 +90,13 @@ class FileRec
{
public:
- typedef enum
+ enum FileType
{
UNKNOWN,
CFILE,
HFILE,
OFILE
- } FileType;
+ };
/**
* Constructor
diff --git a/src/display/canvas-bpath.h b/src/display/canvas-bpath.h
index 92d77eb47..74f8bb7ba 100644
--- a/src/display/canvas-bpath.h
+++ b/src/display/canvas-bpath.h
@@ -36,30 +36,30 @@ class Shape;
/* stroke-linejoin */
-typedef enum {
+enum SPStrokeJoinType {
SP_STROKE_LINEJOIN_MITER,
SP_STROKE_LINEJOIN_ROUND,
SP_STROKE_LINEJOIN_BEVEL
-} SPStrokeJoinType;
+};
/* stroke-linecap */
-typedef enum {
+enum SPStrokeCapType {
SP_STROKE_LINECAP_BUTT,
SP_STROKE_LINECAP_ROUND,
SP_STROKE_LINECAP_SQUARE
-} SPStrokeCapType;
+};
/* fill-rule */
/* clip-rule */
-typedef enum {
+enum SPWindRule {
SP_WIND_RULE_NONZERO,
SP_WIND_RULE_INTERSECT,
SP_WIND_RULE_EVENODD,
SP_WIND_RULE_POSITIVE
-} SPWindRule;
+};
struct SPCanvasBPath {
diff --git a/src/display/sodipodi-ctrl.h b/src/display/sodipodi-ctrl.h
index 9bce6b6ab..37688479c 100644
--- a/src/display/sodipodi-ctrl.h
+++ b/src/display/sodipodi-ctrl.h
@@ -18,7 +18,7 @@
#define SP_IS_CTRL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SP_TYPE_CTRL))
#define SP_IS_CTRL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SP_TYPE_CTRL))
-typedef enum {
+enum SPCtrlShapeType {
SP_CTRL_SHAPE_SQUARE,
SP_CTRL_SHAPE_DIAMOND,
SP_CTRL_SHAPE_CIRCLE,
@@ -26,13 +26,13 @@ typedef enum {
SP_CTRL_SHAPE_CROSS,
SP_CTRL_SHAPE_BITMAP,
SP_CTRL_SHAPE_IMAGE
-} SPCtrlShapeType;
+};
-typedef enum {
+enum SPCtrlModeType {
SP_CTRL_MODE_COLOR,
SP_CTRL_MODE_XOR
-} SPCtrlModeType;
+};
struct SPCtrl : public SPCanvasItem {
SPCtrlShapeType shape;
diff --git a/src/enums.h b/src/enums.h
index 592cb81e9..aa2bd9ed3 100644
--- a/src/enums.h
+++ b/src/enums.h
@@ -13,7 +13,7 @@
*/
/* Anchor types (imported from Gtk) */
-typedef enum
+enum SPAnchorType
{
SP_ANCHOR_CENTER,
SP_ANCHOR_NORTH,
@@ -32,7 +32,7 @@ typedef enum
SP_ANCHOR_SE = SP_ANCHOR_SOUTH_EAST,
SP_ANCHOR_W = SP_ANCHOR_WEST,
SP_ANCHOR_E = SP_ANCHOR_EAST
-} SPAnchorType;
+};
/* preserveAspectRatio */
diff --git a/src/extension/dbus/application-interface.h b/src/extension/dbus/application-interface.h
index c108402cb..74c37cdd3 100644
--- a/src/extension/dbus/application-interface.h
+++ b/src/extension/dbus/application-interface.h
@@ -46,13 +46,13 @@ struct _ApplicationInterfaceClass {
};
-typedef enum
+enum InkscapeError
{
INKSCAPE_ERROR_SELECTION,
INKSCAPE_ERROR_OBJECT,
INKSCAPE_ERROR_VERB,
INKSCAPE_ERROR_OTHER
-} InkscapeError;
+};
diff --git a/src/extension/extension.h b/src/extension/extension.h
index 36e06939a..6b1a2aed8 100644
--- a/src/extension/extension.h
+++ b/src/extension/extension.h
@@ -91,11 +91,11 @@ class Implementation;
class Extension {
public:
/** An enumeration to identify if the Extension has been loaded or not. */
- typedef enum {
+ enum state_t {
STATE_LOADED, /**< The extension has been loaded successfully */
STATE_UNLOADED, /**< The extension has not been loaded */
STATE_DEACTIVATED /**< The extension is missing something which makes it unusable */
- } state_t;
+ };
private:
gchar *id; /**< The unique identifier for the Extension */
diff --git a/src/helper/geom-nodetype.h b/src/helper/geom-nodetype.h
index 0272318a2..e3953a65d 100644
--- a/src/helper/geom-nodetype.h
+++ b/src/helper/geom-nodetype.h
@@ -25,7 +25,7 @@ namespace Geom {
* derivate is connected. (Thus 2 means that the node is continuous
* to the second derivative, i.e. has matching endpoints and tangents)
*/
-typedef enum {
+enum NodeType {
/** Discontinuous node, usually either start or endpoint of a path */
NODE_NONE,
/** This node continuously joins two segments, but the unit tangent is discontinuous.*/
@@ -34,7 +34,7 @@ typedef enum {
NODE_SMOOTH,
/** This node is symmetric. I.e. continuously joins two segments with continuous derivative */
NODE_SYMM
-} NodeType;
+};
NodeType get_nodetype(Curve const &c_incoming, Curve const &c_outgoing);
diff --git a/src/id-clash.cpp b/src/id-clash.cpp
index 5aafee6aa..1dba84fd9 100644
--- a/src/id-clash.cpp
+++ b/src/id-clash.cpp
@@ -27,7 +27,7 @@
#include "object/sp-root.h"
#include "style.h"
-typedef enum { REF_HREF, REF_STYLE, REF_URL, REF_CLIPBOARD } ID_REF_TYPE;
+enum ID_REF_TYPE { REF_HREF, REF_STYLE, REF_URL, REF_CLIPBOARD };
struct IdReference {
ID_REF_TYPE type;
diff --git a/src/knot-enums.h b/src/knot-enums.h
index 737100c29..6f88f1c01 100644
--- a/src/knot-enums.h
+++ b/src/knot-enums.h
@@ -15,7 +15,7 @@
* Released under GNU GPL, read the file 'COPYING' for more information
*/
-typedef enum {
+enum SPKnotShapeType {
SP_KNOT_SHAPE_SQUARE,
SP_KNOT_SHAPE_DIAMOND,
SP_KNOT_SHAPE_CIRCLE,
@@ -23,20 +23,20 @@ typedef enum {
SP_KNOT_SHAPE_CROSS,
SP_KNOT_SHAPE_BITMAP,
SP_KNOT_SHAPE_IMAGE
-} SPKnotShapeType;
+};
-typedef enum {
+enum SPKnotModeType {
SP_KNOT_MODE_COLOR,
SP_KNOT_MODE_XOR
-} SPKnotModeType;
+};
-typedef enum {
+enum SPKnotStateType {
SP_KNOT_STATE_NORMAL,
SP_KNOT_STATE_MOUSEOVER,
SP_KNOT_STATE_DRAGGING,
SP_KNOT_STATE_SELECTED,
SP_KNOT_STATE_HIDDEN
-} SPKnotStateType;
+};
#define SP_KNOT_VISIBLE_STATES 4
diff --git a/src/object/sp-object.h b/src/object/sp-object.h
index cffa28d2f..b5e59cec5 100644
--- a/src/object/sp-object.h
+++ b/src/object/sp-object.h
@@ -75,7 +75,7 @@ namespace Glib {
class ustring;
}
-typedef enum {
+enum SPExceptionType {
SP_NO_EXCEPTION,
SP_INDEX_SIZE_ERR,
SP_DOMSTRING_SIZE_ERR,
@@ -92,7 +92,7 @@ typedef enum {
SP_INVALID_MODIFICATION_ERR,
SP_NAMESPACE_ERR,
SP_INVALID_ACCESS_ERR
-} SPExceptionType;
+};
/// An attempt to implement exceptions, unused?
struct SPException {
diff --git a/src/object/sp-star.h b/src/object/sp-star.h
index 27f3557c9..6e767481d 100644
--- a/src/object/sp-star.h
+++ b/src/object/sp-star.h
@@ -20,10 +20,10 @@
#define SP_STAR(obj) (dynamic_cast<SPStar*>((SPObject*)obj))
#define SP_IS_STAR(obj) (dynamic_cast<const SPStar*>((SPObject*)obj) != NULL)
-typedef enum {
+enum SPStarPoint {
SP_STAR_POINT_KNOT1,
SP_STAR_POINT_KNOT2
-} SPStarPoint;
+};
class SPStar : public SPPolygon {
public:
diff --git a/src/selection-chemistry.h b/src/selection-chemistry.h
index 0c0f78370..387e9b840 100644
--- a/src/selection-chemistry.h
+++ b/src/selection-chemistry.h
@@ -112,12 +112,12 @@ std::vector<SPItem*> &get_all_items(std::vector<SPItem*> &list, SPObject *from,
std::vector<SPItem*> sp_degroup_list (std::vector<SPItem*> &items);
/* selection cycling */
-typedef enum
+enum SPCycleType
{
SP_CYCLE_SIMPLE,
SP_CYCLE_VISIBLE, // cycle only visible items
SP_CYCLE_FOCUS // readjust visible area to view selected item
-} SPCycleType;
+};
diff --git a/src/trace/potrace/inkscape-potrace.h b/src/trace/potrace/inkscape-potrace.h
index c3600f6bb..e1ce37fcd 100644
--- a/src/trace/potrace/inkscape-potrace.h
+++ b/src/trace/potrace/inkscape-potrace.h
@@ -29,7 +29,7 @@ namespace Trace {
namespace Potrace {
-typedef enum
+enum TraceType
{
TRACE_BRIGHTNESS,
TRACE_BRIGHTNESS_MULTI,
@@ -37,7 +37,7 @@ typedef enum
TRACE_QUANT,
TRACE_QUANT_COLOR,
TRACE_QUANT_MONO
- } TraceType;
+ };
class PotraceTracingEngine : public TracingEngine
diff --git a/src/ui/dialog/filedialog.h b/src/ui/dialog/filedialog.h
index a652266c7..41101d204 100644
--- a/src/ui/dialog/filedialog.h
+++ b/src/ui/dialog/filedialog.h
@@ -43,22 +43,22 @@ namespace Dialog
* Used for setting filters and options, and
* reading them back from user selections.
*/
-typedef enum {
+enum FileDialogType {
SVG_TYPES,
IMPORT_TYPES,
EXPORT_TYPES,
EXE_TYPES,
SWATCH_TYPES,
CUSTOM_TYPE
- } FileDialogType;
+ };
/**
* Used for returning the type selected in a SaveAs
*/
-typedef enum {
+enum FileDialogSelectionType {
SVG_NAMESPACE,
SVG_NAMESPACE_WITH_EXTENSIONS
- } FileDialogSelectionType;
+ };
/**
@@ -248,13 +248,13 @@ class FileExportDialog
{
public:
- typedef enum
+ enum ScopeType
{
SCOPE_DOCUMENT,
SCOPE_PAGE,
SCOPE_SELECTION,
SCOPE_CUSTOM
- } ScopeType;
+ };
/**
* Constructor. Do not call directly . Use the factory.
diff --git a/src/ui/dialog/transformation.h b/src/ui/dialog/transformation.h
index 953c6d27a..0ecd5abd8 100644
--- a/src/ui/dialog/transformation.h
+++ b/src/ui/dialog/transformation.h
@@ -109,9 +109,9 @@ public:
int getCurrentPage()
{ return _notebook.get_current_page(); }
- typedef enum {
+ enum PageType {
PAGE_MOVE, PAGE_SCALE, PAGE_ROTATE, PAGE_SKEW, PAGE_TRANSFORM, PAGE_QTY
- } PageType;
+ };
void updateSelection(PageType page, Inkscape::Selection *selection);
diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp
index c690e5dfc..7e64e876b 100644
--- a/src/ui/interface.cpp
+++ b/src/ui/interface.cpp
@@ -84,7 +84,7 @@
using Inkscape::DocumentUndo;
/* Drag and Drop */
-typedef enum {
+enum ui_drop_target_info {
URI_LIST,
SVG_XML_DATA,
SVG_DATA,
@@ -95,7 +95,7 @@ typedef enum {
APP_X_COLOR,
APP_OSWB_COLOR,
APP_X_INK_PASTE
-} ui_drop_target_info;
+};
static GtkTargetEntry ui_drop_target_entries [] = {
{(gchar *)"text/uri-list", 0, URI_LIST },
diff --git a/src/ui/previewable.h b/src/ui/previewable.h
index c733c31df..f1282b0bc 100644
--- a/src/ui/previewable.h
+++ b/src/ui/previewable.h
@@ -19,7 +19,7 @@
namespace Inkscape {
namespace UI {
-typedef enum {
+enum PreviewStyle {
PREVIEW_STYLE_ICON = 0,
PREVIEW_STYLE_PREVIEW,
PREVIEW_STYLE_NAME,
@@ -28,12 +28,12 @@ typedef enum {
PREVIEW_STYLE_ICON_BLURB,
PREVIEW_STYLE_PREVIEW_NAME,
PREVIEW_STYLE_PREVIEW_BLURB
-} PreviewStyle;
+};
-typedef enum {
+enum ViewType {
VIEW_TYPE_LIST = 0,
VIEW_TYPE_GRID
-} ViewType;
+};
class Previewable
diff --git a/src/ui/widget/color-scales.h b/src/ui/widget/color-scales.h
index 40e2fdad0..0e98b86c3 100644
--- a/src/ui/widget/color-scales.h
+++ b/src/ui/widget/color-scales.h
@@ -15,13 +15,13 @@ namespace Widget {
class ColorSlider;
-typedef enum {
+enum SPColorScalesMode {
SP_COLOR_SCALES_MODE_NONE = 0,
SP_COLOR_SCALES_MODE_RGB = 1,
SP_COLOR_SCALES_MODE_HSL = 2,
SP_COLOR_SCALES_MODE_CMYK = 3,
SP_COLOR_SCALES_MODE_HSV = 4
-} SPColorScalesMode;
+};
class ColorScales
: public Gtk::Grid
diff --git a/src/ui/widget/imageicon.cpp b/src/ui/widget/imageicon.cpp
index 5837c0842..c2cf13f43 100644
--- a/src/ui/widget/imageicon.cpp
+++ b/src/ui/widget/imageicon.cpp
@@ -27,11 +27,11 @@ namespace Widget
-typedef enum {
+enum FileDialogType {
SVG_TYPES,
IMPORT_TYPES,
EXPORT_TYPES
- } FileDialogType;
+ };
/*#########################################################################
diff --git a/src/widgets/button.h b/src/widgets/button.h
index 60b98de45..584818181 100644
--- a/src/widgets/button.h
+++ b/src/widgets/button.h
@@ -29,10 +29,10 @@ class View;
}
}
-typedef enum {
+enum SPButtonType {
SP_BUTTON_TYPE_NORMAL,
SP_BUTTON_TYPE_TOGGLE
-} SPButtonType;
+};
struct SPBChoiceData {
guchar *px;
diff --git a/src/widgets/eek-preview.h b/src/widgets/eek-preview.h
index 883ce713e..bc756260b 100644
--- a/src/widgets/eek-preview.h
+++ b/src/widgets/eek-preview.h
@@ -53,7 +53,7 @@ G_BEGIN_DECLS
#define IS_EEK_PREVIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE( (klass), EEK_PREVIEW_TYPE))
#define EEK_PREVIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS( (obj), EEK_PREVIEW_TYPE, EekPreviewClass))
-typedef enum {
+enum PreviewStyle {
PREVIEW_STYLE_ICON = 0,
PREVIEW_STYLE_PREVIEW,
PREVIEW_STYLE_NAME,
@@ -62,23 +62,23 @@ typedef enum {
PREVIEW_STYLE_ICON_BLURB,
PREVIEW_STYLE_PREVIEW_NAME,
PREVIEW_STYLE_PREVIEW_BLURB
-} PreviewStyle;
+};
-typedef enum {
+enum ViewType {
VIEW_TYPE_LIST = 0,
VIEW_TYPE_GRID
-} ViewType;
+};
-typedef enum {
+enum PreviewSize {
PREVIEW_SIZE_TINY = 0,
PREVIEW_SIZE_SMALL,
PREVIEW_SIZE_MEDIUM,
PREVIEW_SIZE_BIG,
PREVIEW_SIZE_BIGGER,
PREVIEW_SIZE_HUGE
-} PreviewSize;
+};
-typedef enum {
+enum LinkType {
PREVIEW_LINK_NONE = 0,
PREVIEW_LINK_IN = 1,
PREVIEW_LINK_OUT = 2,
@@ -86,14 +86,14 @@ typedef enum {
PREVIEW_FILL = 8,
PREVIEW_STROKE = 16,
PREVIEW_LINK_ALL = 31
-} LinkType;
+};
-typedef enum {
+enum BorderStyle {
BORDER_NONE = 0,
BORDER_SOLID,
BORDER_WIDE,
BORDER_SOLID_LAST_ROW,
-} BorderStyle;
+};
typedef struct _EekPreview EekPreview;
typedef struct _EekPreviewClass EekPreviewClass;
generated by cgit v1.2.3 (git 2.25.1) at 2026-05-19 02:59:46 +0000