From 530b07f12beb392426427a3f2910656da2438f99 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Thu, 3 Nov 2011 14:49:56 +0000 Subject: [PATCH] Don't use a -deprecated suffix for headers They are already in the deprecated/ directory, the suffix is redundant, and there is no chance of collision. --- clutter/Makefile.am | 6 +++--- clutter/clutter-deprecated.h | 6 +++--- .../{clutter-actor-deprecated.h => clutter-actor.h} | 0 .../{clutter-backend-deprecated.h => clutter-backend.h} | 0 .../{clutter-main-deprecated.h => clutter-main.h} | 0 5 files changed, 6 insertions(+), 6 deletions(-) rename clutter/deprecated/{clutter-actor-deprecated.h => clutter-actor.h} (100%) rename clutter/deprecated/{clutter-backend-deprecated.h => clutter-backend.h} (100%) rename clutter/deprecated/{clutter-main-deprecated.h => clutter-main.h} (100%) diff --git a/clutter/Makefile.am b/clutter/Makefile.am index 2d3b514f0..df4eca70e 100644 --- a/clutter/Makefile.am +++ b/clutter/Makefile.am @@ -230,8 +230,8 @@ source_c_priv = \ # deprecated installed headers deprecated_h = \ - $(srcdir)/deprecated/clutter-actor-deprecated.h \ - $(srcdir)/deprecated/clutter-backend-deprecated.h \ + $(srcdir)/deprecated/clutter-actor.h \ + $(srcdir)/deprecated/clutter-backend.h \ $(srcdir)/deprecated/clutter-behaviour.h \ $(srcdir)/deprecated/clutter-behaviour-depth.h \ $(srcdir)/deprecated/clutter-behaviour-ellipse.h \ @@ -242,7 +242,7 @@ deprecated_h = \ $(srcdir)/deprecated/clutter-fixed.h \ $(srcdir)/deprecated/clutter-frame-source.h \ $(srcdir)/deprecated/clutter-keysyms.h \ - $(srcdir)/deprecated/clutter-main-deprecated.h \ + $(srcdir)/deprecated/clutter-main.h \ $(srcdir)/deprecated/clutter-timeout-pool.h \ $(srcdir)/deprecated/clutter-score.h \ $(srcdir)/deprecated/clutter-shader.h \ diff --git a/clutter/clutter-deprecated.h b/clutter/clutter-deprecated.h index bb984bdaa..ab9c7a70a 100644 --- a/clutter/clutter-deprecated.h +++ b/clutter/clutter-deprecated.h @@ -3,8 +3,8 @@ #define __CLUTTER_DEPRECATED_H_INSIDE__ -#include "deprecated/clutter-actor-deprecated.h" -#include "deprecated/clutter-backend-deprecated.h" +#include "deprecated/clutter-actor.h" +#include "deprecated/clutter-backend.h" #include "deprecated/clutter-behaviour.h" #include "deprecated/clutter-behaviour-depth.h" #include "deprecated/clutter-behaviour-ellipse.h" @@ -15,7 +15,7 @@ #include "deprecated/clutter-fixed.h" #include "deprecated/clutter-frame-source.h" #include "deprecated/clutter-keysyms.h" -#include "deprecated/clutter-main-deprecated.h" +#include "deprecated/clutter-main.h" #include "deprecated/clutter-score.h" #include "deprecated/clutter-shader.h" #include "deprecated/clutter-timeout-pool.h" diff --git a/clutter/deprecated/clutter-actor-deprecated.h b/clutter/deprecated/clutter-actor.h similarity index 100% rename from clutter/deprecated/clutter-actor-deprecated.h rename to clutter/deprecated/clutter-actor.h diff --git a/clutter/deprecated/clutter-backend-deprecated.h b/clutter/deprecated/clutter-backend.h similarity index 100% rename from clutter/deprecated/clutter-backend-deprecated.h rename to clutter/deprecated/clutter-backend.h diff --git a/clutter/deprecated/clutter-main-deprecated.h b/clutter/deprecated/clutter-main.h similarity index 100% rename from clutter/deprecated/clutter-main-deprecated.h rename to clutter/deprecated/clutter-main.h