[mutter] clutter: Remove unused deprecated/clutter-keysyms.h
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] clutter: Remove unused deprecated/clutter-keysyms.h
- Date: Tue, 19 Nov 2019 21:56:56 +0000 (UTC)
commit c039764d52fa8e097b60947d0392a503b71dca08
Author: Adam Jackson <ajax redhat com>
Date: Tue Nov 5 11:36:56 2019 -0500
clutter: Remove unused deprecated/clutter-keysyms.h
https://gitlab.gnome.org/GNOME/mutter/merge_requests/921
clutter/clutter/clutter-deprecated.h | 1 -
clutter/clutter/clutter-keysyms-update.pl | 37 -
clutter/clutter/deprecated/clutter-keysyms.h | 2311 --------------------------
clutter/clutter/meson.build | 1 -
4 files changed, 2350 deletions(-)
---
diff --git a/clutter/clutter/clutter-deprecated.h b/clutter/clutter/clutter-deprecated.h
index 35fbabdca..1258eb0a1 100644
--- a/clutter/clutter/clutter-deprecated.h
+++ b/clutter/clutter/clutter-deprecated.h
@@ -11,7 +11,6 @@
#include "deprecated/clutter-box.h"
#include "deprecated/clutter-container.h"
#include "deprecated/clutter-group.h"
-#include "deprecated/clutter-keysyms.h"
#include "deprecated/clutter-rectangle.h"
#include "deprecated/clutter-stage-manager.h"
#include "deprecated/clutter-stage.h"
diff --git a/clutter/clutter/clutter-keysyms-update.pl b/clutter/clutter/clutter-keysyms-update.pl
index 35440ee97..37469e9e9 100755
--- a/clutter/clutter/clutter-keysyms-update.pl
+++ b/clutter/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/deprecated/clutter-keysyms.h
-die "Could not open file clutter-keysyms-compat.h: $!\n"
- unless open(OUT_KEYSYMS_COMPAT, ">:utf8", "deprecated/clutter-keysyms.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,23 +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_DEPRECATED_H__
-#define __CLUTTER_KEYSYMS_DEPRECATED_H__
-
-#ifndef CLUTTER_DISABLE_DEPRECATED
-
-EOF
-
while (<IN_KEYSYMDEF>)
{
next if ( ! /^#define / );
@@ -137,13 +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;
-
- my $deprecation = "CLUTTER_DEPRECATED_MACRO_FOR(\"Deprecated key symbol. Use $binding instead.\")";
printf OUT_KEYSYMS "#define %s 0x%03x\n", $binding, hex($keysymelements[2]);
- printf OUT_KEYSYMS_COMPAT "#define %s 0x%03x %s\n", $compat_binding, hex($keysymelements[2]),
$deprecation;
}
close IN_KEYSYMDEF;
@@ -187,11 +160,8 @@ 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;
@@ -202,13 +172,6 @@ print OUT_KEYSYMS<<EOF;
#endif /* __CLUTTER_KEYSYMS_H__ */
EOF
-print OUT_KEYSYMS_COMPAT<<EOF;
-
-#endif /* CLUTTER_DISABLE_DEPRECATED */
-
-#endif /* __CLUTTER_KEYSYMS_DEPRECATED_H__ */
-EOF
-
foreach my $f (qw/ keysymdef.h XF86keysym.h /) {
unlink $f or die "Unable to delete $f: $!";
}
diff --git a/clutter/clutter/meson.build b/clutter/clutter/meson.build
index 80ac52768..b6d91cb13 100644
--- a/clutter/clutter/meson.build
+++ b/clutter/clutter/meson.build
@@ -225,7 +225,6 @@ clutter_deprecated_headers = [
'deprecated/clutter-box.h',
'deprecated/clutter-container.h',
'deprecated/clutter-group.h',
- 'deprecated/clutter-keysyms.h',
'deprecated/clutter-rectangle.h',
'deprecated/clutter-stage-manager.h',
'deprecated/clutter-stage.h',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]