GNOME.org
 

[gimp] app: move the undo impl object typedefs out of the *-types.h files

commit 5080da50e6462e0de497d73a349f350f84a10fe0
Author: Michael Natterer <mitch gimp org>
Date:   Fri May 20 18:29:13 2016 +0200

    app: move the undo impl object typedefs out of the *-types.h files
    
    They are completely private to the undo system and don't need to
    be used anywhere else. Removes some clutter from the typed headers.

 app/core/core-types.h             |   21 +++------------------
 app/core/gimpchannelpropundo.h    |    1 +
 app/core/gimpchannelundo.h        |    1 +
 app/core/gimpdrawablemodundo.h    |    1 +
 app/core/gimpdrawableundo.h       |    1 +
 app/core/gimpgrouplayerundo.h     |    1 +
 app/core/gimpguideundo.h          |    1 +
 app/core/gimpimageundo.h          |    1 +
 app/core/gimpitempropundo.h       |    1 +
 app/core/gimpitemundo.h           |    1 +
 app/core/gimplayermaskpropundo.h  |    1 +
 app/core/gimplayermaskundo.h      |    1 +
 app/core/gimplayerpropundo.h      |    1 +
 app/core/gimplayerundo.h          |    1 +
 app/core/gimpmaskundo.h           |    1 +
 app/core/gimpsamplepointundo.h    |    1 +
 app/paint/gimpinkundo.h           |    1 +
 app/paint/gimppaintcoreundo.h     |    1 +
 app/paint/paint-types.h           |    6 ------
 app/vectors/gimpvectorsmodundo.h  |    1 +
 app/vectors/gimpvectorspropundo.h |    1 +
 app/vectors/gimpvectorsundo.h     |    1 +
 app/vectors/vectors-types.h       |   13 +++++--------
 23 files changed, 28 insertions(+), 32 deletions(-)
---
diff --git a/app/core/core-types.h b/app/core/core-types.h
index 9462fd7..11eaa62 100644
--- a/app/core/core-types.h
+++ b/app/core/core-types.h
@@ -154,24 +154,9 @@ typedef struct _GimpGroupLayer      GimpGroupLayer;
 
 /*  undo objects  */
 
-typedef struct _GimpUndo              GimpUndo;
-typedef struct _GimpImageUndo         GimpImageUndo;
-typedef struct _GimpItemUndo          GimpItemUndo;
-typedef struct _GimpItemPropUndo      GimpItemPropUndo;
-typedef struct _GimpChannelUndo       GimpChannelUndo;
-typedef struct _GimpChannelPropUndo   GimpChannelPropUndo;
-typedef struct _GimpDrawableUndo      GimpDrawableUndo;
-typedef struct _GimpDrawableModUndo   GimpDrawableModUndo;
-typedef struct _GimpLayerMaskUndo     GimpLayerMaskUndo;
-typedef struct _GimpLayerMaskPropUndo GimpLayerMaskPropUndo;
-typedef struct _GimpLayerUndo         GimpLayerUndo;
-typedef struct _GimpLayerPropUndo     GimpLayerPropUndo;
-typedef struct _GimpGroupLayerUndo    GimpGroupLayerUndo;
-typedef struct _GimpMaskUndo          GimpMaskUndo;
-typedef struct _GimpGuideUndo         GimpGuideUndo;
-typedef struct _GimpSamplePointUndo   GimpSamplePointUndo;
-typedef struct _GimpUndoStack         GimpUndoStack;
-typedef struct _GimpUndoAccumulator   GimpUndoAccumulator;
+typedef struct _GimpUndo            GimpUndo;
+typedef struct _GimpUndoStack       GimpUndoStack;
+typedef struct _GimpUndoAccumulator GimpUndoAccumulator;
 
 
 /* Symmetry transformations */
diff --git a/app/core/gimpchannelpropundo.h b/app/core/gimpchannelpropundo.h
index 5b8ea31..d086323 100644
--- a/app/core/gimpchannelpropundo.h
+++ b/app/core/gimpchannelpropundo.h
@@ -30,6 +30,7 @@
 #define GIMP_CHANNEL_PROP_UNDO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), 
GIMP_TYPE_CHANNEL_PROP_UNDO, GimpChannelPropUndoClass))
 
 
+typedef struct _GimpChannelPropUndo      GimpChannelPropUndo;
 typedef struct _GimpChannelPropUndoClass GimpChannelPropUndoClass;
 
 struct _GimpChannelPropUndo
diff --git a/app/core/gimpchannelundo.h b/app/core/gimpchannelundo.h
index 8801f29..54f6718 100644
--- a/app/core/gimpchannelundo.h
+++ b/app/core/gimpchannelundo.h
@@ -30,6 +30,7 @@
 #define GIMP_CHANNEL_UNDO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CHANNEL_UNDO, 
GimpChannelUndoClass))
 
 
+typedef struct _GimpChannelUndo      GimpChannelUndo;
 typedef struct _GimpChannelUndoClass GimpChannelUndoClass;
 
 struct _GimpChannelUndo
diff --git a/app/core/gimpdrawablemodundo.h b/app/core/gimpdrawablemodundo.h
index 53d2c70..6129af3 100644
--- a/app/core/gimpdrawablemodundo.h
+++ b/app/core/gimpdrawablemodundo.h
@@ -30,6 +30,7 @@
 #define GIMP_DRAWABLE_MOD_UNDO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), 
GIMP_TYPE_DRAWABLE_MOD_UNDO, GimpDrawableModUndoClass))
 
 
+typedef struct _GimpDrawableModUndo      GimpDrawableModUndo;
 typedef struct _GimpDrawableModUndoClass GimpDrawableModUndoClass;
 
 struct _GimpDrawableModUndo
diff --git a/app/core/gimpdrawableundo.h b/app/core/gimpdrawableundo.h
index d97a0d1..0f8456c 100644
--- a/app/core/gimpdrawableundo.h
+++ b/app/core/gimpdrawableundo.h
@@ -30,6 +30,7 @@
 #define GIMP_DRAWABLE_UNDO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_DRAWABLE_UNDO, 
GimpDrawableUndoClass))
 
 
+typedef struct _GimpDrawableUndo      GimpDrawableUndo;
 typedef struct _GimpDrawableUndoClass GimpDrawableUndoClass;
 
 struct _GimpDrawableUndo
diff --git a/app/core/gimpgrouplayerundo.h b/app/core/gimpgrouplayerundo.h
index 05120be..3219b2a 100644
--- a/app/core/gimpgrouplayerundo.h
+++ b/app/core/gimpgrouplayerundo.h
@@ -30,6 +30,7 @@
 #define GIMP_GROUP_LAYER_UNDO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_GROUP_LAYER_UNDO, 
GimpGroupLayerUndoClass))
 
 
+typedef struct _GimpGroupLayerUndo      GimpGroupLayerUndo;
 typedef struct _GimpGroupLayerUndoClass GimpGroupLayerUndoClass;
 
 struct _GimpGroupLayerUndo
diff --git a/app/core/gimpguideundo.h b/app/core/gimpguideundo.h
index b88b415..fd3ba27 100644
--- a/app/core/gimpguideundo.h
+++ b/app/core/gimpguideundo.h
@@ -30,6 +30,7 @@
 #define GIMP_GUIDE_UNDO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_GUIDE_UNDO, 
GimpGuideUndoClass))
 
 
+typedef struct _GimpGuideUndo      GimpGuideUndo;
 typedef struct _GimpGuideUndoClass GimpGuideUndoClass;
 
 struct _GimpGuideUndo
diff --git a/app/core/gimpimageundo.h b/app/core/gimpimageundo.h
index 6b84894..1f821d2 100644
--- a/app/core/gimpimageundo.h
+++ b/app/core/gimpimageundo.h
@@ -30,6 +30,7 @@
 #define GIMP_IMAGE_UNDO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_IMAGE_UNDO, 
GimpImageUndoClass))
 
 
+typedef struct _GimpImageUndo      GimpImageUndo;
 typedef struct _GimpImageUndoClass GimpImageUndoClass;
 
 struct _GimpImageUndo
diff --git a/app/core/gimpitempropundo.h b/app/core/gimpitempropundo.h
index c0c1c5f..59e92b4 100644
--- a/app/core/gimpitempropundo.h
+++ b/app/core/gimpitempropundo.h
@@ -30,6 +30,7 @@
 #define GIMP_ITEM_PROP_UNDO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_ITEM_PROP_UNDO, 
GimpItemPropUndoClass))
 
 
+typedef struct _GimpItemPropUndo      GimpItemPropUndo;
 typedef struct _GimpItemPropUndoClass GimpItemPropUndoClass;
 
 struct _GimpItemPropUndo
diff --git a/app/core/gimpitemundo.h b/app/core/gimpitemundo.h
index 2c137b4..1b95592 100644
--- a/app/core/gimpitemundo.h
+++ b/app/core/gimpitemundo.h
@@ -30,6 +30,7 @@
 #define GIMP_ITEM_UNDO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_ITEM_UNDO, 
GimpItemUndoClass))
 
 
+typedef struct _GimpItemUndo      GimpItemUndo;
 typedef struct _GimpItemUndoClass GimpItemUndoClass;
 
 struct _GimpItemUndo
diff --git a/app/core/gimplayermaskpropundo.h b/app/core/gimplayermaskpropundo.h
index bef4d18..2ed4d78 100644
--- a/app/core/gimplayermaskpropundo.h
+++ b/app/core/gimplayermaskpropundo.h
@@ -30,6 +30,7 @@
 #define GIMP_LAYER_MASK_PROP_UNDO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), 
GIMP_TYPE_LAYER_MASK_PROP_UNDO, GimpLayerMaskPropUndoClass))
 
 
+typedef struct _GimpLayerMaskPropUndo      GimpLayerMaskPropUndo;
 typedef struct _GimpLayerMaskPropUndoClass GimpLayerMaskPropUndoClass;
 
 struct _GimpLayerMaskPropUndo
diff --git a/app/core/gimplayermaskundo.h b/app/core/gimplayermaskundo.h
index daf80e0..7df513d 100644
--- a/app/core/gimplayermaskundo.h
+++ b/app/core/gimplayermaskundo.h
@@ -30,6 +30,7 @@
 #define GIMP_LAYER_MASK_UNDO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_LAYER_MASK_UNDO, 
GimpLayerMaskUndoClass))
 
 
+typedef struct _GimpLayerMaskUndo      GimpLayerMaskUndo;
 typedef struct _GimpLayerMaskUndoClass GimpLayerMaskUndoClass;
 
 struct _GimpLayerMaskUndo
diff --git a/app/core/gimplayerpropundo.h b/app/core/gimplayerpropundo.h
index e826e90..39df3c4 100644
--- a/app/core/gimplayerpropundo.h
+++ b/app/core/gimplayerpropundo.h
@@ -30,6 +30,7 @@
 #define GIMP_LAYER_PROP_UNDO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_LAYER_PROP_UNDO, 
GimpLayerPropUndoClass))
 
 
+typedef struct _GimpLayerPropUndo      GimpLayerPropUndo;
 typedef struct _GimpLayerPropUndoClass GimpLayerPropUndoClass;
 
 struct _GimpLayerPropUndo
diff --git a/app/core/gimplayerundo.h b/app/core/gimplayerundo.h
index 0d741e2..51a4754 100644
--- a/app/core/gimplayerundo.h
+++ b/app/core/gimplayerundo.h
@@ -30,6 +30,7 @@
 #define GIMP_LAYER_UNDO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_LAYER_UNDO, 
GimpLayerUndoClass))
 
 
+typedef struct _GimpLayerUndo      GimpLayerUndo;
 typedef struct _GimpLayerUndoClass GimpLayerUndoClass;
 
 struct _GimpLayerUndo
diff --git a/app/core/gimpmaskundo.h b/app/core/gimpmaskundo.h
index f34b9f7..9ff3601 100644
--- a/app/core/gimpmaskundo.h
+++ b/app/core/gimpmaskundo.h
@@ -30,6 +30,7 @@
 #define GIMP_MASK_UNDO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_MASK_UNDO, 
GimpMaskUndoClass))
 
 
+typedef struct _GimpMaskUndo      GimpMaskUndo;
 typedef struct _GimpMaskUndoClass GimpMaskUndoClass;
 
 struct _GimpMaskUndo
diff --git a/app/core/gimpsamplepointundo.h b/app/core/gimpsamplepointundo.h
index 0b5cb8c..ab1900b 100644
--- a/app/core/gimpsamplepointundo.h
+++ b/app/core/gimpsamplepointundo.h
@@ -30,6 +30,7 @@
 #define GIMP_SAMPLE_POINT_UNDO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), 
GIMP_TYPE_SAMPLE_POINT_UNDO, GimpSamplePointUndoClass))
 
 
+typedef struct _GimpSamplePointUndo      GimpSamplePointUndo;
 typedef struct _GimpSamplePointUndoClass GimpSamplePointUndoClass;
 
 struct _GimpSamplePointUndo
diff --git a/app/paint/gimpinkundo.h b/app/paint/gimpinkundo.h
index e3a29cf..5487bd3 100644
--- a/app/paint/gimpinkundo.h
+++ b/app/paint/gimpinkundo.h
@@ -30,6 +30,7 @@
 #define GIMP_INK_UNDO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_INK_UNDO, 
GimpInkUndoClass))
 
 
+typedef struct _GimpInkUndo      GimpInkUndo;
 typedef struct _GimpInkUndoClass GimpInkUndoClass;
 
 struct _GimpInkUndo
diff --git a/app/paint/gimppaintcoreundo.h b/app/paint/gimppaintcoreundo.h
index 51dd96e..c1697bc 100644
--- a/app/paint/gimppaintcoreundo.h
+++ b/app/paint/gimppaintcoreundo.h
@@ -30,6 +30,7 @@
 #define GIMP_PAINT_CORE_UNDO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PAINT_CORE_UNDO, 
GimpPaintCoreUndoClass))
 
 
+typedef struct _GimpPaintCoreUndo      GimpPaintCoreUndo;
 typedef struct _GimpPaintCoreUndoClass GimpPaintCoreUndoClass;
 
 struct _GimpPaintCoreUndo
diff --git a/app/paint/paint-types.h b/app/paint/paint-types.h
index 6c47051..832b345 100644
--- a/app/paint/paint-types.h
+++ b/app/paint/paint-types.h
@@ -60,12 +60,6 @@ typedef struct _GimpPerspectiveCloneOptions GimpPerspectiveCloneOptions;
 typedef struct _GimpSmudgeOptions           GimpSmudgeOptions;
 
 
-/*  paint undos  */
-
-typedef struct _GimpPaintCoreUndo GimpPaintCoreUndo;
-typedef struct _GimpInkUndo       GimpInkUndo;
-
-
 /*  functions  */
 
 typedef void (* GimpPaintRegisterCallback) (Gimp        *gimp,
diff --git a/app/vectors/gimpvectorsmodundo.h b/app/vectors/gimpvectorsmodundo.h
index 076b3a2..53013e8 100644
--- a/app/vectors/gimpvectorsmodundo.h
+++ b/app/vectors/gimpvectorsmodundo.h
@@ -30,6 +30,7 @@
 #define GIMP_VECTORS_MOD_UNDO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_VECTORS_MOD_UNDO, 
GimpVectorsModUndoClass))
 
 
+typedef struct _GimpVectorsModUndo      GimpVectorsModUndo;
 typedef struct _GimpVectorsModUndoClass GimpVectorsModUndoClass;
 
 struct _GimpVectorsModUndo
diff --git a/app/vectors/gimpvectorspropundo.h b/app/vectors/gimpvectorspropundo.h
index 96ef514..8723bb9 100644
--- a/app/vectors/gimpvectorspropundo.h
+++ b/app/vectors/gimpvectorspropundo.h
@@ -30,6 +30,7 @@
 #define GIMP_VECTORS_PROP_UNDO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), 
GIMP_TYPE_VECTORS_PROP_UNDO, GimpVectorsPropUndoClass))
 
 
+typedef struct _GimpVectorsPropUndo      GimpVectorsPropUndo;
 typedef struct _GimpVectorsPropUndoClass GimpVectorsPropUndoClass;
 
 struct _GimpVectorsPropUndo
diff --git a/app/vectors/gimpvectorsundo.h b/app/vectors/gimpvectorsundo.h
index 857dc82..0aa5ca9 100644
--- a/app/vectors/gimpvectorsundo.h
+++ b/app/vectors/gimpvectorsundo.h
@@ -30,6 +30,7 @@
 #define GIMP_VECTORS_UNDO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_VECTORS_UNDO, 
GimpVectorsUndoClass))
 
 
+typedef struct _GimpVectorsUndo      GimpVectorsUndo;
 typedef struct _GimpVectorsUndoClass GimpVectorsUndoClass;
 
 struct _GimpVectorsUndo
diff --git a/app/vectors/vectors-types.h b/app/vectors/vectors-types.h
index 45eef54..347a7e6 100644
--- a/app/vectors/vectors-types.h
+++ b/app/vectors/vectors-types.h
@@ -27,14 +27,11 @@
 #include "vectors/vectors-enums.h"
 
 
-typedef struct _GimpAnchor          GimpAnchor;
-
-typedef struct _GimpVectors         GimpVectors;
-typedef struct _GimpVectorsUndo     GimpVectorsUndo;
-typedef struct _GimpVectorsModUndo  GimpVectorsModUndo;
-typedef struct _GimpVectorsPropUndo GimpVectorsPropUndo;
-typedef struct _GimpStroke          GimpStroke;
-typedef struct _GimpBezierStroke    GimpBezierStroke;
+typedef struct _GimpAnchor       GimpAnchor;
+
+typedef struct _GimpVectors      GimpVectors;
+typedef struct _GimpStroke       GimpStroke;
+typedef struct _GimpBezierStroke GimpBezierStroke;
 
 
 #endif /* __VECTORS_TYPES_H__ */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]