Rename ActorClone to Clone/1

Step one of the ActorClone -> Clone renaming: rename the files.

diff --git a/clutter/Makefile.am b/clutter/Makefile.am
index 39994e4..3115562 100644 (file)
--- a/clutter/Makefile.am
+++ b/clutter/Makefile.am
@@ -46,7 +46,6 @@ BUILT_SOURCES = $(MARSHALFILES) $(ENUMFILES)
 # please, keep this sorted alphabetically
 source_h =                                     \
        $(srcdir)/clutter-actor.h               \
-       $(srcdir)/clutter-actor-clone.h         \
        $(srcdir)/clutter-alpha.h               \
        $(srcdir)/clutter-animatable.h          \
        $(srcdir)/clutter-animation.h           \
@@ -62,6 +61,7 @@ source_h =                                    \
        $(srcdir)/clutter-cairo-texture.h       \
        $(srcdir)/clutter-child-meta.h          \
        $(srcdir)/clutter-clone-texture.h       \
+       $(srcdir)/clutter-clone.h               \
        $(srcdir)/clutter-color.h               \
         $(srcdir)/clutter-container.h          \
         $(srcdir)/clutter-deprecated.h         \
@@ -137,7 +137,6 @@ CLEANFILES = $(STAMPFILES)
 # please, keep this sorted alphabetically
 source_c = \
         clutter-actor.c                        \
-        clutter-actor-clone.c          \
        clutter-alpha.c                 \
        clutter-animatable.c            \
        clutter-animation.c             \
@@ -154,6 +153,7 @@ source_c = \
        clutter-cairo-texture.c         \
        clutter-child-meta.c            \
        clutter-clone-texture.c         \
+        clutter-clone.c                        \
        clutter-color.c                 \
        clutter-container.c             \
        clutter-enum-types.c            \

diff --git a/clutter/clutter-actor-clone.c b/clutter/clutter-clone.c
similarity index 99%
rename from clutter/clutter-actor-clone.c
rename to clutter/clutter-clone.c
index c70aef6..8ea0f74 100644 (file)
--- a/clutter/clutter-actor-clone.c
+++ b/clutter/clutter-clone.c
@@ -34,10 +34,10 @@
 #endif
 
 #include "clutter-color.h"
+#include "clutter-clone.h"
 #include "clutter-debug.h"
 #include "clutter-main.h"
 #include "clutter-private.h"
-#include "clutter-actor-clone.h"
 
 #include "cogl/cogl.h"
 

diff --git a/clutter/clutter-actor-clone.h b/clutter/clutter-clone.h
similarity index 100%
rename from clutter/clutter-actor-clone.h
rename to clutter/clutter-clone.h

diff --git a/clutter/clutter.h b/clutter/clutter.h
index 61dae61..83f0a38 100644 (file)
--- a/clutter/clutter.h
+++ b/clutter/clutter.h
@@ -29,7 +29,6 @@
 #define __CLUTTER_H_INSIDE__
 
 #include "clutter-actor.h"
-#include "clutter-actor-clone.h"
 #include "clutter-alpha.h"
 #include "clutter-animatable.h"
 #include "clutter-animation.h"
@@ -45,6 +44,7 @@
 #include "clutter-cairo-texture.h"
 #include "clutter-child-meta.h"
 #include "clutter-clone-texture.h"
+#include "clutter-clone.h"
 #include "clutter-color.h"
 #include "clutter-container.h"
 #include "clutter-deprecated.h"