summaryrefslogtreecommitdiffstats
path: root/src/ui
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2018-06-19 15:18:27 +0000
committerMarc Jeanmougin <marcjeanmougin@free.fr>2018-06-20 09:51:42 +0000
commit954a0083d9ce7065564c18c9788743eb0cf371f2 (patch)
tree3f77797181a9e89dafd9c5f00f6da3dc477d244b /src/ui
parentReplace typedef struct with struct in POD type declarations. (diff)
downloadinkscape-954a0083d9ce7065564c18c9788743eb0cf371f2.tar.gz
inkscape-954a0083d9ce7065564c18c9788743eb0cf371f2.zip
Replace typedef enum with enum in POD type declarations.
Diffstat (limited to 'src/ui')
-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
6 files changed, 18 insertions, 18 deletions
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;
+ };
/*#########################################################################