[mutter/wip/nielsdg/clutter-remove-deprecated: 1/6] clutter: remove unused deprecated types



commit 1c7472b24dc2e85561f1eb54c55672ba0576cb13
Author: Niels De Graef <nielsdegraef gmail com>
Date:   Sat Nov 10 12:14:02 2018 +0100

    clutter: remove unused deprecated types
    
    They weren't being used anywhere, so they can be easily removed without
    going into other files.

 clutter/clutter/Makefile.am                        |   25 -
 clutter/clutter/clutter-deprecated.h               |    6 -
 clutter/clutter/deprecated/clutter-frame-source.c  |  261 ---
 clutter/clutter/deprecated/clutter-frame-source.h  |   49 -
 clutter/clutter/deprecated/clutter-list-model.c    |  834 -------
 clutter/clutter/deprecated/clutter-list-model.h    |   95 -
 clutter/clutter/deprecated/clutter-media.c         |  664 ------
 clutter/clutter/deprecated/clutter-media.h         |  121 -
 clutter/clutter/deprecated/clutter-model-private.h |   52 -
 clutter/clutter/deprecated/clutter-model.c         | 2475 --------------------
 clutter/clutter/deprecated/clutter-model.h         |  436 ----
 clutter/clutter/deprecated/clutter-score.c         | 1166 ---------
 clutter/clutter/deprecated/clutter-score.h         |  144 --
 .../clutter/deprecated/clutter-timeout-interval.c  |  140 --
 .../clutter/deprecated/clutter-timeout-interval.h  |   58 -
 clutter/clutter/deprecated/clutter-timeout-pool.c  |  498 ----
 clutter/clutter/deprecated/clutter-timeout-pool.h  |   69 -
 clutter/clutter/meson.build                        |   23 -
 clutter/tests/conform/Makefile.am                  |    1 -
 clutter/tests/conform/meson.build                  |    1 -
 clutter/tests/conform/model.c                      |  528 -----
 clutter/tests/conform/score.c                      |  121 -
 po/POTFILES.skip                                   |    2 -
 23 files changed, 7769 deletions(-)
---
diff --git a/clutter/clutter/Makefile.am b/clutter/clutter/Makefile.am
index b97bd6693..2b43a170d 100644
--- a/clutter/clutter/Makefile.am
+++ b/clutter/clutter/Makefile.am
@@ -271,16 +271,11 @@ deprecated_h = \
        deprecated/clutter-box.h                        \
        deprecated/clutter-cairo-texture.h              \
        deprecated/clutter-container.h          \
-       deprecated/clutter-frame-source.h               \
        deprecated/clutter-group.h                      \
        deprecated/clutter-input-device.h               \
        deprecated/clutter-keysyms.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                     \
        deprecated/clutter-stage-manager.h              \
        deprecated/clutter-stage.h                      \
@@ -288,7 +283,6 @@ deprecated_h = \
        deprecated/clutter-table-layout.h               \
        deprecated/clutter-texture.h                    \
        deprecated/clutter-timeline.h           \
-       deprecated/clutter-timeout-pool.h               \
        deprecated/clutter-util.h                       \
        $(NULL)
 
@@ -307,31 +301,14 @@ deprecated_c = \
        deprecated/clutter-behaviour-scale.c            \
        deprecated/clutter-box.c                        \
        deprecated/clutter-cairo-texture.c              \
-       deprecated/clutter-frame-source.c               \
        deprecated/clutter-group.c                      \
        deprecated/clutter-input-device-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                     \
        deprecated/clutter-state.c                      \
        deprecated/clutter-table-layout.c               \
        deprecated/clutter-texture.c                    \
-       deprecated/clutter-timeout-pool.c               \
-       $(NULL)
-
-# deprecated private headers; these should not be installed
-deprecated_h_priv = \
-       deprecated/clutter-model-private.h      \
-       deprecated/clutter-timeout-interval.h   \
-       $(NULL)
-
-# deprecated private source code; these should not be introspected
-deprecated_c_priv = \
-       deprecated/clutter-timeout-interval.c   \
        $(NULL)
 
 # built sources
@@ -595,8 +572,6 @@ libmutter_clutter_@LIBMUTTER_API_VERSION@_la_SOURCES = \
        $(source_h_priv) \
        $(deprecated_c) \
        $(deprecated_h) \
-       $(deprecated_c_priv) \
-       $(deprecated_h_priv) \
        $(cally_sources_c) \
        $(cally_sources_h) \
        $(cally_sources_private) \
diff --git a/clutter/clutter/clutter-deprecated.h b/clutter/clutter/clutter-deprecated.h
index c54440d88..222091b79 100644
--- a/clutter/clutter/clutter-deprecated.h
+++ b/clutter/clutter/clutter-deprecated.h
@@ -20,16 +20,11 @@
 #include "deprecated/clutter-box.h"
 #include "deprecated/clutter-cairo-texture.h"
 #include "deprecated/clutter-container.h"
-#include "deprecated/clutter-frame-source.h"
 #include "deprecated/clutter-group.h"
 #include "deprecated/clutter-input-device.h"
 #include "deprecated/clutter-keysyms.h"
-#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"
 #include "deprecated/clutter-stage-manager.h"
 #include "deprecated/clutter-stage.h"
@@ -37,7 +32,6 @@
 #include "deprecated/clutter-table-layout.h"
 #include "deprecated/clutter-texture.h"
 #include "deprecated/clutter-timeline.h"
-#include "deprecated/clutter-timeout-pool.h"
 #include "deprecated/clutter-util.h"
 
 #undef __CLUTTER_DEPRECATED_H_INSIDE__
diff --git a/clutter/clutter/meson.build b/clutter/clutter/meson.build
index e383055e7..b1a90f32e 100644
--- a/clutter/clutter/meson.build
+++ b/clutter/clutter/meson.build
@@ -231,16 +231,11 @@ clutter_deprecated_headers = [
   'deprecated/clutter-box.h',
   'deprecated/clutter-cairo-texture.h',
   'deprecated/clutter-container.h',
-  'deprecated/clutter-frame-source.h',
   'deprecated/clutter-group.h',
   'deprecated/clutter-input-device.h',
   'deprecated/clutter-keysyms.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',
   'deprecated/clutter-stage-manager.h',
   'deprecated/clutter-stage.h',
@@ -248,7 +243,6 @@ clutter_deprecated_headers = [
   'deprecated/clutter-table-layout.h',
   'deprecated/clutter-texture.h',
   'deprecated/clutter-timeline.h',
-  'deprecated/clutter-timeout-pool.h',
   'deprecated/clutter-util.h',
 ]
 
@@ -266,29 +260,14 @@ clutter_deprecated_sources = [
   'deprecated/clutter-behaviour-scale.c',
   'deprecated/clutter-box.c',
   'deprecated/clutter-cairo-texture.c',
-  'deprecated/clutter-frame-source.c',
   'deprecated/clutter-group.c',
   'deprecated/clutter-input-device-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',
   'deprecated/clutter-state.c',
   'deprecated/clutter-table-layout.c',
   'deprecated/clutter-texture.c',
-  'deprecated/clutter-timeout-pool.c',
-]
-
-clutter_deprecated_private_headers = [
-  'deprecated/clutter-model-private.h',
-  'deprecated/clutter-timeout-interval.h',
-]
-
-clutter_deprecated_nonintrospected_sources = [
-  'deprecated/clutter-timeout-interval.c',
 ]
 
 clutter_backend_sources = []
@@ -508,9 +487,7 @@ libmutter_clutter = shared_library(libmutter_clutter_name,
     clutter_private_headers,
     clutter_nonintrospected_sources,
     clutter_deprecated_sources,
-    clutter_deprecated_nonintrospected_sources,
     clutter_deprecated_headers,
-    clutter_deprecated_private_headers,
     clutter_backend_sources,
     clutter_backend_nonintrospected_sources,
     clutter_backend_headers,
diff --git a/clutter/tests/conform/Makefile.am b/clutter/tests/conform/Makefile.am
index ebe83f824..acd9d2d09 100644
--- a/clutter/tests/conform/Makefile.am
+++ b/clutter/tests/conform/Makefile.am
@@ -43,7 +43,6 @@ general_tests = \
        binding-pool \
        color \
        interval \
-       model \
        script-parser \
        units \
        $(NULL)
diff --git a/clutter/tests/conform/meson.build b/clutter/tests/conform/meson.build
index 4c60354b2..1768c401c 100644
--- a/clutter/tests/conform/meson.build
+++ b/clutter/tests/conform/meson.build
@@ -35,7 +35,6 @@ clutter_conform_tests_general_tests = [
   'binding-pool',
   'color',
   'interval',
-  'model',
   'script-parser',
   'units',
 ]
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 5ca3481e7..5d69910f7 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -66,8 +66,6 @@ clutter/clutter/deprecated/clutter-behaviour-rotate.c
 clutter/clutter/deprecated/clutter-behaviour-scale.c
 clutter/clutter/deprecated/clutter-box.c
 clutter/clutter/deprecated/clutter-cairo-texture.c
-clutter/clutter/deprecated/clutter-fixed.c
-clutter/clutter/deprecated/clutter-media.c
 clutter/clutter/deprecated/clutter-rectangle.c
 clutter/clutter/deprecated/clutter-shader.c
 clutter/clutter/deprecated/clutter-state.c


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]