[cluttermm] Remove deprecated classes.

From: Murray Cumming <murrayc src gnome org>
To: commits-list gnome org
Cc:
Subject: [cluttermm] Remove deprecated classes.
Date: Tue, 15 Apr 2014 11:58:43 +0000 (UTC)
commit cfbad9805da66912651fbca176e413696b4f7300
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Apr 15 13:51:28 2014 +0200

    Remove deprecated classes.
    
    This is the master branch, wrapping clutter-2.0 (currently 1.99.1).
    See also the cluttermm-1-18 branch.

 clutter/cluttermm.h                              |   24 +----
 clutter/src/alpha.ccg                            |   75 -------------
 clutter/src/alpha.hg                             |   83 ---------------
 clutter/src/animation.ccg                        |   24 ----
 clutter/src/animation.hg                         |   91 ----------------
 clutter/src/animator.ccg                         |   24 ----
 clutter/src/animator.hg                          |   85 ---------------
 clutter/src/behaviour-depth.ccg                  |   24 ----
 clutter/src/behaviour-depth.hg                   |   54 ----------
 clutter/src/behaviour-ellipse.ccg                |   34 ------
 clutter/src/behaviour-ellipse.hg                 |   81 --------------
 clutter/src/behaviour-opacity.ccg                |   24 ----
 clutter/src/behaviour-opacity.hg                 |   54 ----------
 clutter/src/behaviour-path.ccg                   |   49 ---------
 clutter/src/behaviour-path.hg                    |   68 ------------
 clutter/src/behaviour-rotate.ccg                 |   24 ----
 clutter/src/behaviour-rotate.hg                  |   69 ------------
 clutter/src/behaviour-scale.ccg                  |   24 ----
 clutter/src/behaviour-scale.hg                   |   57 ----------
 clutter/src/behaviour.ccg                        |   82 --------------
 clutter/src/behaviour.hg                         |   89 ----------------
 clutter/src/box.ccg                              |   46 --------
 clutter/src/box.hg                               |   72 -------------
 clutter/src/cairo-texture.ccg                    |   34 ------
 clutter/src/cairo-texture.hg                     |   68 ------------
 clutter/src/filelist.am                          |   20 ----
 clutter/src/group.ccg                            |   24 ----
 clutter/src/group.hg                             |   70 ------------
 clutter/src/media.ccg                            |   24 ----
 clutter/src/media.hg                             |   76 -------------
 clutter/src/rectangle.ccg                        |   38 -------
 clutter/src/rectangle.hg                         |   69 ------------
 clutter/src/score.ccg                            |   58 ----------
 clutter/src/score.hg                             |   88 ---------------
 clutter/src/shader.ccg                           |   34 ------
 clutter/src/shader.hg                            |   80 --------------
 clutter/src/texture.ccg                          |   31 ------
 clutter/src/texture.hg                           |  124 ----------------------
 codegen/extradefs/generate_extra_defs_clutter.cc |   20 ----
 configure.ac                                     |    6 +-
 examples/example-stage.cc                        |    2 +-
 41 files changed, 7 insertions(+), 2116 deletions(-)
---
diff --git a/clutter/cluttermm.h b/clutter/cluttermm.h
index 664fdf2..8478d33 100644
--- a/clutter/cluttermm.h
+++ b/clutter/cluttermm.h
@@ -25,7 +25,7 @@
  *
  * cluttermm is a C++ wrapper for <a href="http://www.clutter-project.org/";>Clutter</a>.
  * See Clutter::Stage and Clutter::Actor, for instance, and see the
- * <a href="http://www.openismus.com/documents/cluttermm_tutorial/1.0/docs/tutorial/html/";>Programming with 
cluttermm</a> tutorial.
+ * <a href="http://www.openismus.com/documents/cluttermm_tutorial/2.0/docs/tutorial/html/";>Programming with 
cluttermm</a> tutorial.
  *
  * @section basics Basic Usage
  *
@@ -37,12 +37,12 @@
  *
  * If your source file is @c program.cc, you can compile it with:
  * @code
- * g++ program.cc -o program `pkg-config --cflags --libs cluttermm-1.0`
+ * g++ program.cc -o program `pkg-config --cflags --libs cluttermm-2.0`
  * @endcode
  *
  * Alternatively, if using autoconf, use the following in @c configure.ac:
  * @code
- * PKG_CHECK_MODULES([CLUTTERMM], [cluttermm-1.0])
+ * PKG_CHECK_MODULES([CLUTTERMM], [cluttermm-2.0])
  * @endcode
  * Then use the generated @c CLUTTERMM_CFLAGS and @c CLUTTERMM_LIBS variables
  * in the project @c Makefile.am files. For example:
@@ -59,24 +59,12 @@
 #include <cluttermm/actor-box.h>
 #include <cluttermm/actor-meta.h>
 #include <cluttermm/align-constraint.h>
-#include <cluttermm/alpha.h>
 #include <cluttermm/animatable.h>
-#include <cluttermm/animation.h>
-#include <cluttermm/animator.h>
-#include <cluttermm/behaviour.h>
-#include <cluttermm/behaviour-depth.h>
-#include <cluttermm/behaviour-ellipse.h>
-#include <cluttermm/behaviour-opacity.h>
-#include <cluttermm/behaviour-path.h>
-#include <cluttermm/behaviour-rotate.h>
-#include <cluttermm/behaviour-scale.h>
 #include <cluttermm/bin-layout.h>
 #include <cluttermm/bind-constraint.h>
-#include <cluttermm/box.h>
 #include <cluttermm/box-layout.h>
 #include <cluttermm/blur-effect.h>
 #include <cluttermm/brightness-contrast-effect.h>
-#include <cluttermm/cairo-texture.h>
 #include <cluttermm/canvas.h>
 #include <cluttermm/childmeta.h>
 #include <cluttermm/clone.h>
@@ -93,7 +81,6 @@
 #include <cluttermm/flow-layout.h>
 #include <cluttermm/frame-source.h>
 #include <cluttermm/grid-layout.h>
-#include <cluttermm/group.h>
 #include <cluttermm/image.h>
 #include <cluttermm/init.h>
 #include <cluttermm/input-device.h>
@@ -102,7 +89,6 @@
 #include <cluttermm/layout-manager.h>
 #include <cluttermm/layoutmeta.h>
 #include <cluttermm/main.h>
-#include <cluttermm/media.h>
 #include <cluttermm/model.h>
 #include <cluttermm/model-iter.h>
 #include <cluttermm/offscreen-effect.h>
@@ -110,18 +96,14 @@
 #include <cluttermm/path.h>
 #include <cluttermm/path-constraint.h>
 #include <cluttermm/property-transition.h>
-#include <cluttermm/rectangle.h>
-#include <cluttermm/score.h>
 #include <cluttermm/script.h>
 #include <cluttermm/scroll-actor.h>
-#include <cluttermm/shader.h>
 #include <cluttermm/shader-effect.h>
 #include <cluttermm/size.h>
 #include <cluttermm/snap-constraint.h>
 #include <cluttermm/stage.h>
 #include <cluttermm/text.h>
 #include <cluttermm/text-buffer.h>
-#include <cluttermm/texture.h>
 #include <cluttermm/threads.h>
 #include <cluttermm/timeline.h>
 #include <cluttermm/transition.h>
diff --git a/clutter/src/filelist.am b/clutter/src/filelist.am
index 9907dd1..905ddd3 100644
--- a/clutter/src/filelist.am
+++ b/clutter/src/filelist.am
@@ -17,25 +17,13 @@ files_hg =                  \
        actor-meta.hg           \
        action.hg               \
        align-constraint.hg \
-       alpha.hg                \
        animatable.hg           \
-       animation.hg            \
-       animator.hg             \
        backend.hg              \
-       behaviour.hg            \
-       behaviour-depth.hg      \
-       behaviour-ellipse.hg    \
-       behaviour-opacity.hg    \
-       behaviour-path.hg       \
-       behaviour-rotate.hg     \
-       behaviour-scale.hg      \
        bin-layout.hg           \
        bind-constraint.hg \
-       box.hg                  \
        box-layout.hg           \
        blur-effect.hg          \
        brightness-contrast-effect.hg \
-       cairo-texture.hg        \
        canvas.hg               \
        childmeta.hg            \
        clone.hg                \
@@ -51,14 +39,12 @@ files_hg =                  \
        fixed-layout.hg         \
        flow-layout.hg          \
        grid-layout.hg          \
-       group.hg                \
        image.hg                \
        input-device.hg         \
        interval.hg             \
        keyframe-transition.hg \
        layoutmeta.hg           \
        layout-manager.hg       \
-       media.hg                \
        model.hg \
        model-iter.hg \
        offscreen-effect.hg \
@@ -66,19 +52,13 @@ files_hg =                  \
        path.hg                 \
        path-constraint.hg \
        property-transition.hg  \
-       rectangle.hg            \
        scroll-actor.hg         \
-       score.hg                \
        script.hg               \
        scriptable.hg           \
-       shader.hg               \
        shader-effect.hg \
        size.hg                 \
        snap-constraint.hg \
        stage.hg                \
-       text.hg                 \
-       text-buffer.hg                  \
-       texture.hg              \
        timeline.hg             \
        transition.hg \
        types.hg
diff --git a/codegen/extradefs/generate_extra_defs_clutter.cc 
b/codegen/extradefs/generate_extra_defs_clutter.cc
index bf8017d..c26864d 100644
--- a/codegen/extradefs/generate_extra_defs_clutter.cc
+++ b/codegen/extradefs/generate_extra_defs_clutter.cc
@@ -40,25 +40,12 @@ int main(int argc, char** argv)
     << get_defs(CLUTTER_TYPE_ACTION)
     << get_defs(CLUTTER_TYPE_ALIGN_CONSTRAINT)
     << get_defs(CLUTTER_TYPE_ANIMATABLE)
-    << get_defs(CLUTTER_TYPE_ALPHA)
-    << get_defs(CLUTTER_TYPE_ANIMATABLE)
-    << get_defs(CLUTTER_TYPE_ANIMATION)
-    << get_defs(CLUTTER_TYPE_ANIMATOR)
     << get_defs(CLUTTER_TYPE_BACKEND)
-    << get_defs(CLUTTER_TYPE_BEHAVIOUR_DEPTH)
-    << get_defs(CLUTTER_TYPE_BEHAVIOUR_ELLIPSE)
-    << get_defs(CLUTTER_TYPE_BEHAVIOUR)
-    << get_defs(CLUTTER_TYPE_BEHAVIOUR_OPACITY)
-    << get_defs(CLUTTER_TYPE_BEHAVIOUR_PATH)
-    << get_defs(CLUTTER_TYPE_BEHAVIOUR_ROTATE)
-    << get_defs(CLUTTER_TYPE_BEHAVIOUR_SCALE)
     << get_defs(CLUTTER_TYPE_BIN_LAYOUT)
     << get_defs(CLUTTER_TYPE_BIND_CONSTRAINT)
     << get_defs(CLUTTER_TYPE_BLUR_EFFECT)
-    << get_defs(CLUTTER_TYPE_BOX)
     << get_defs(CLUTTER_TYPE_BOX_LAYOUT)
     << get_defs(CLUTTER_TYPE_BRIGHTNESS_CONTRAST_EFFECT)
-    << get_defs(CLUTTER_TYPE_CAIRO_TEXTURE)
     << get_defs(CLUTTER_TYPE_CANVAS)
     << get_defs(CLUTTER_TYPE_CHILD_META)
     << get_defs(CLUTTER_TYPE_CLICK_ACTION)
@@ -80,7 +67,6 @@ int main(int argc, char** argv)
     << get_defs(CLUTTER_TYPE_FLOW_LAYOUT)
     << get_defs(CLUTTER_TYPE_GESTURE_ACTION)
     << get_defs(CLUTTER_TYPE_GRID_LAYOUT)
-    << get_defs(CLUTTER_TYPE_GROUP)
     << get_defs(CLUTTER_TYPE_INTERVAL)
     << get_defs(CLUTTER_TYPE_IMAGE)
     << get_defs(CLUTTER_TYPE_INPUT_DEVICE)
@@ -91,7 +77,6 @@ int main(int argc, char** argv)
     << get_defs(CLUTTER_TYPE_LAYOUT_MANAGER)
     << get_defs(CLUTTER_TYPE_LAYOUT_META)
     << get_defs(CLUTTER_TYPE_LIST_MODEL)
-    << get_defs(CLUTTER_TYPE_MEDIA)
     << get_defs(CLUTTER_TYPE_MODEL)
     << get_defs(CLUTTER_TYPE_OFFSCREEN_EFFECT)
     << get_defs(CLUTTER_TYPE_PAGE_TURN_EFFECT)
@@ -100,13 +85,10 @@ int main(int argc, char** argv)
     << get_defs(CLUTTER_TYPE_PATH)
     << get_defs(CLUTTER_TYPE_PATH_CONSTRAINT)
     << get_defs(CLUTTER_TYPE_PROPERTY_TRANSITION)
-    << get_defs(CLUTTER_TYPE_RECTANGLE)
     << get_defs(CLUTTER_TYPE_ROTATE_ACTION)
-    << get_defs(CLUTTER_TYPE_SCORE)
     << get_defs(CLUTTER_TYPE_SCRIPT)
     << get_defs(CLUTTER_TYPE_SCRIPTABLE)
     << get_defs(CLUTTER_TYPE_SCROLL_ACTOR)
-    << get_defs(CLUTTER_TYPE_SHADER)
     << get_defs(CLUTTER_TYPE_SHADER_EFFECT)
     << get_defs(CLUTTER_TYPE_SNAP_CONSTRAINT)
     << get_defs(CLUTTER_TYPE_STAGE)
@@ -114,8 +96,6 @@ int main(int argc, char** argv)
     << get_defs(CLUTTER_TYPE_SWIPE_ACTION)
     << get_defs(CLUTTER_TYPE_TABLE_LAYOUT)
     << get_defs(CLUTTER_TYPE_TAP_ACTION)
-    << get_defs(CLUTTER_TYPE_TEXT)
-    << get_defs(CLUTTER_TYPE_TEXTURE)
     << get_defs(CLUTTER_TYPE_TEXT_BUFFER)
     << get_defs(CLUTTER_TYPE_TIMELINE)
     << get_defs(CLUTTER_TYPE_TRANSITION)
diff --git a/configure.ac b/configure.ac
index 81981e3..4177ef7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@
 ## You should have received a copy of the GNU Lesser General Public License
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-AC_INIT([cluttermm], [1.17.2],
+AC_INIT([cluttermm], [1.99.1],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=cluttermm],
         [cluttermm], [http://www.gtkmm.org/])
 AC_PREREQ([2.59])
@@ -31,7 +31,7 @@ AM_MAINTAINER_MODE
 AC_ARG_VAR([ACLOCAL_FLAGS], [aclocal flags, e.g. -I <macro dir>])
 
 MM_PREREQ([0.8])
-MM_INIT_MODULE([cluttermm-1.0])
+MM_INIT_MODULE([cluttermm-2.0])
 
 # Copy the mm-common .pl scripts into docs/,
 # and use them from there,
@@ -46,7 +46,7 @@ AC_DISABLE_STATIC
 AC_LIBTOOL_WIN32_DLL
 AC_PROG_LIBTOOL
 
-AC_SUBST([CLUTTERMM_MODULES], ['clutter-1.0 >= 1.18.0 pangomm-1.4 >= 2.27.1 atkmm-1.6 >= 2.22.2'])
+AC_SUBST([CLUTTERMM_MODULES], ['clutter-2.0 >= 1.99.1 pangomm-1.4 >= 2.27.1 atkmm-1.6 >= 2.22.2'])
 PKG_CHECK_MODULES([CLUTTERMM], [$CLUTTERMM_MODULES])
 MM_PKG_CONFIG_SUBST([GMMPROC_DIR], [--variable=gmmprocdir glibmm-2.4])
 MM_PKG_CONFIG_SUBST([GMMPROC_EXTRA_M4_DIR], [--variable=gmmprocm4dir pangomm-1.4 atkmm-1.6])
diff --git a/examples/example-stage.cc b/examples/example-stage.cc
index bfcda66..b7bf634 100644
--- a/examples/example-stage.cc
+++ b/examples/example-stage.cc
@@ -15,7 +15,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-// c++ -Wall -g `pkg-config --cflags --libs cluttermm-1.0` -o stage example-stage.cc
+// c++ -Wall -g `pkg-config --cflags --libs cluttermm-2.0` -o stage example-stage.cc
 
 /**A simple ClutterStage. */
 #include <cluttermm.h>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]