From db8bb95817223b4fa3a93403b31af83ddde740d4 Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@gnome.org>
Date: Sun, 28 Jun 2015 10:37:01 +0100
Subject: [PATCH] Move ClutterModel to the deprecated area

And deal with the fallout in the source tree.
---
 clutter/Makefile.am                              | 6 +++---
 clutter/clutter-deprecated.h                     | 1 +
 clutter/clutter.h                                | 1 -
 clutter/deprecated/clutter-list-model.h          | 2 +-
 clutter/{ => deprecated}/clutter-model-private.h | 4 ++--
 clutter/{ => deprecated}/clutter-model.c         | 0
 clutter/{ => deprecated}/clutter-model.h         | 0
 7 files changed, 7 insertions(+), 7 deletions(-)
 rename clutter/{ => deprecated}/clutter-model-private.h (96%)
 rename clutter/{ => deprecated}/clutter-model.c (100%)
 rename clutter/{ => deprecated}/clutter-model.h (100%)

diff --git a/clutter/Makefile.am b/clutter/Makefile.am
index 9f2bbb034..d81ced805 100644
--- a/clutter/Makefile.am
+++ b/clutter/Makefile.am
@@ -96,7 +96,6 @@ source_h =					\
 	clutter-layout-meta.h		\
 	clutter-macros.h		\
 	clutter-main.h		\
-	clutter-model.h		\
 	clutter-offscreen-effect.h	\
 	clutter-page-turn-effect.h	\
 	clutter-paint-nodes.h		\
@@ -178,7 +177,6 @@ source_c = \
 	clutter-main.c 		\
 	clutter-master-clock.c	\
 	clutter-master-clock-default.c	\
-	clutter-model.c		\
 	clutter-offscreen-effect.c	\
 	clutter-page-turn-effect.c	\
 	clutter-paint-nodes.c		\
@@ -232,7 +230,6 @@ source_h_priv = \
 	clutter-id-pool.h 			\
 	clutter-master-clock.h			\
 	clutter-master-clock-default.h		\
-	clutter-model-private.h			\
 	clutter-offscreen-effect-private.h	\
 	clutter-paint-node-private.h		\
 	clutter-paint-volume-private.h		\
@@ -278,6 +275,7 @@ deprecated_h = \
 	deprecated/clutter-list-model.h			\
 	deprecated/clutter-main.h			\
 	deprecated/clutter-media.h			\
+	deprecated/clutter-model.h			\
 	deprecated/clutter-rectangle.h		\
 	deprecated/clutter-score.h 			\
 	deprecated/clutter-shader.h 			\
@@ -313,6 +311,7 @@ deprecated_c = \
 	deprecated/clutter-layout-manager-deprecated.c \
 	deprecated/clutter-list-model.c			\
 	deprecated/clutter-media.c			\
+	deprecated/clutter-model.c			\
 	deprecated/clutter-rectangle.c 		\
 	deprecated/clutter-score.c 			\
 	deprecated/clutter-shader.c 			\
@@ -324,6 +323,7 @@ deprecated_c = \
 
 # deprecated private headers; these should not be installed
 deprecated_h_priv = \
+	deprecatec/clutter-model-private.h	\
 	deprecated/clutter-timeout-interval.h	\
 	$(NULL)
 
diff --git a/clutter/clutter-deprecated.h b/clutter/clutter-deprecated.h
index 3486e174f..0b16c9b94 100644
--- a/clutter/clutter-deprecated.h
+++ b/clutter/clutter-deprecated.h
@@ -28,6 +28,7 @@
 #include "deprecated/clutter-list-model.h"
 #include "deprecated/clutter-main.h"
 #include "deprecated/clutter-media.h"
+#include "deprecated/clutter-model.h"
 #include "deprecated/clutter-rectangle.h"
 #include "deprecated/clutter-score.h"
 #include "deprecated/clutter-shader.h"
diff --git a/clutter/clutter.h b/clutter/clutter.h
index d286f847c..37ef515f3 100644
--- a/clutter/clutter.h
+++ b/clutter/clutter.h
@@ -78,7 +78,6 @@
 #include "clutter-layout-meta.h"
 #include "clutter-macros.h"
 #include "clutter-main.h"
-#include "clutter-model.h"
 #include "clutter-offscreen-effect.h"
 #include "clutter-page-turn-effect.h"
 #include "clutter-paint-nodes.h"
diff --git a/clutter/deprecated/clutter-list-model.h b/clutter/deprecated/clutter-list-model.h
index e8579899c..021b3cde4 100644
--- a/clutter/deprecated/clutter-list-model.h
+++ b/clutter/deprecated/clutter-list-model.h
@@ -32,7 +32,7 @@
 #ifndef __CLUTTER_LIST_MODEL_H__
 #define __CLUTTER_LIST_MODEL_H__
 
-#include <clutter/clutter-model.h>
+#include <clutter/deprecated/clutter-model.h>
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter-model-private.h b/clutter/deprecated/clutter-model-private.h
similarity index 96%
rename from clutter/clutter-model-private.h
rename to clutter/deprecated/clutter-model-private.h
index b7b2a6f3f..2791c837b 100644
--- a/clutter/clutter-model-private.h
+++ b/clutter/deprecated/clutter-model-private.h
@@ -26,8 +26,8 @@
 #ifndef __CLUTTER_MODEL_PRIVATE_H__
 #define __CLUTTER_MODEL_PRIVATE_H__
 
-#include <clutter/clutter-types.h>
-#include <clutter/clutter-model.h>
+#include "clutter-types.h"
+#include "clutter-model.h"
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter-model.c b/clutter/deprecated/clutter-model.c
similarity index 100%
rename from clutter/clutter-model.c
rename to clutter/deprecated/clutter-model.c
diff --git a/clutter/clutter-model.h b/clutter/deprecated/clutter-model.h
similarity index 100%
rename from clutter/clutter-model.h
rename to clutter/deprecated/clutter-model.h