[clutter/clutter-1.99: 7/11] [2.0] Remove compatibility key symbols
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter/clutter-1.99: 7/11] [2.0] Remove compatibility key symbols
- Date: Wed, 22 Jun 2011 11:46:07 +0000 (UTC)
commit a597d6543ffbea786d3183d507a939a0fc151816
Author: Emmanuele Bassi <ebassi linux intel com>
Date: Thu Jun 16 16:30:27 2011 +0100
[2.0] Remove compatibility key symbols
clutter/Makefile.am | 1 -
clutter/clutter-keysyms-compat.h | 2290 -------------------------------------
clutter/clutter-keysyms-update.pl | 45 +-
clutter/clutter-keysyms.h | 5 -
4 files changed, 2 insertions(+), 2339 deletions(-)
---
diff --git a/clutter/Makefile.am b/clutter/Makefile.am
index 206008b..9d71c8e 100644
--- a/clutter/Makefile.am
+++ b/clutter/Makefile.am
@@ -90,7 +90,6 @@ source_h = \
$(srcdir)/clutter-input-device.h \
$(srcdir)/clutter-interval.h \
$(srcdir)/clutter-keysyms.h \
- $(srcdir)/clutter-keysyms-compat.h \
$(srcdir)/clutter-layout-manager.h \
$(srcdir)/clutter-layout-meta.h \
$(srcdir)/clutter-list-model.h \
diff --git a/clutter/clutter-keysyms-update.pl b/clutter/clutter-keysyms-update.pl
index c05322a..d874e8e 100755
--- a/clutter/clutter-keysyms-update.pl
+++ b/clutter/clutter-keysyms-update.pl
@@ -58,10 +58,6 @@ die "Could not open file keysymdef.h: $!\n"
die "Could not open file clutter-keysyms.h: $!\n"
unless open(OUT_KEYSYMS, ">:utf8", "clutter-keysyms.h");
-# Output: clutter/clutter/clutter-keysyms-compat.h
-die "Could not open file clutter-keysyms-compat.h: $!\n"
- unless open(OUT_KEYSYMS_COMPAT, ">:utf8", "clutter-keysyms-compat.h");
-
my $LICENSE_HEADER= <<EOF;
/* Clutter
*
@@ -85,7 +81,6 @@ my $LICENSE_HEADER= <<EOF;
EOF
print OUT_KEYSYMS $LICENSE_HEADER;
-print OUT_KEYSYMS_COMPAT $LICENSE_HEADER;
print OUT_KEYSYMS<<EOF;
@@ -104,21 +99,6 @@ print OUT_KEYSYMS<<EOF;
EOF
-print OUT_KEYSYMS_COMPAT<<EOF;
-/*
- * Compatibility version of clutter-keysyms.h.
- *
- * Since Clutter 1.4, the key symbol defines have been changed to have
- * a KEY_ prefix. This is a compatibility header that is included when
- * deprecated symbols are enabled. Consider porting to the new names
- * instead.
- */
-
-#ifndef __CLUTTER_KEYSYMS_COMPAT_H__
-#define __CLUTTER_KEYSYMS_COMPAT_H__
-
-EOF
-
while (<IN_KEYSYMDEF>)
{
next if ( ! /^#define / );
@@ -135,11 +115,8 @@ while (<IN_KEYSYMDEF>)
my $element = $keysymelements[1];
my $binding = $element;
$binding =~ s/^XK_/CLUTTER_KEY_/g;
- my $compat_binding = $element;
- $compat_binding =~ s/^XK_/CLUTTER_/g;
printf OUT_KEYSYMS "#define %s 0x%03x\n", $binding, hex($keysymelements[2]);
- printf OUT_KEYSYMS_COMPAT "#define %s 0x%03x\n", $compat_binding, hex($keysymelements[2]);
}
close IN_KEYSYMDEF;
@@ -183,34 +160,16 @@ while (<IN_XF86KEYSYM>)
my $element = $keysymelements[1];
my $binding = $element;
$binding =~ s/^XF86XK_/CLUTTER_KEY_/g;
- my $compat_binding = $element;
- $compat_binding =~ s/^XF86XK_/CLUTTER_/g;
printf OUT_KEYSYMS "#define %s 0x%03x\n", $binding, hex($keysymelements[2]);
- printf OUT_KEYSYMS_COMPAT "#define %s 0x%03x\n", $compat_binding, hex($keysymelements[2]);
}
close IN_XF86KEYSYM;
-print OUT_KEYSYMS<<EOF;
-
-/* include the compatibility header */
-#ifndef CLUTTER_DISABLE_DEPRECATED
-#include "clutter-keysyms-compat.h"
-#endif
-
-#endif /* __CLUTTER_KEYSYMS_H__ */
-EOF
-
-print OUT_KEYSYMS_COMPAT<<EOF;
-
-#endif /* __CLUTTER_KEYSYMS_COMPAT_H__ */
-EOF
-
foreach my $f (qw/ keysymdef.h XF86keysym.h /) {
unlink $f or die "Unable to delete $f: $!";
}
-printf "We just finished converting keysymdef.h to clutter-keysyms.h "
- . "and clutter-keysyms-compat.h\nThank you\n";
+printf "We just finished converting keysymdef.h to clutter-keysyms.h\n"
+ . "Thank you\n";
diff --git a/clutter/clutter-keysyms.h b/clutter/clutter-keysyms.h
index 9a887c8..cea0213 100644
--- a/clutter/clutter-keysyms.h
+++ b/clutter/clutter-keysyms.h
@@ -2289,9 +2289,4 @@
#define CLUTTER_KEY_Next_VMode 0x1008fe22
#define CLUTTER_KEY_Prev_VMode 0x1008fe23
-/* include the compatibility header */
-#ifndef CLUTTER_DISABLE_DEPRECATED
-#include "clutter-keysyms-compat.h"
-#endif
-
#endif /* __CLUTTER_KEYSYMS_H__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]