brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move clutter-keysyms-compat.h to the deprecated section

Browse Source 
No reason to have it lingering in the main section.
This commit is contained in:
Emmanuele Bassi 2011-11-03 14:42:39 +00:00
parent 983510fad4
commit 142cd0bf82
5 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clutter/Makefile.am
View File

@ -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 \
@ -242,6 +241,7 @@ deprecated_h = \
$(srcdir)/deprecated/clutter-behaviour-scale.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-timeout-pool.h \
$(srcdir)/deprecated/clutter-score.h \

3
clutter/clutter-deprecated.h
View File

@ -14,10 +14,11 @@
#include "deprecated/clutter-behaviour-scale.h"
#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-timeout-pool.h"
#include "deprecated/clutter-score.h"
#include "deprecated/clutter-shader.h"
#include "deprecated/clutter-timeout-pool.h"
#undef __CLUTTER_DEPRECATED_H_INSIDE__

17
clutter/clutter-keysyms-update.pl
View File

@ -58,9 +58,9 @@ 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
# Output: clutter/clutter/deprecated/clutter-keysyms.h
die "Could not open file clutter-keysyms-compat.h: $!\n"
unless open(OUT_KEYSYMS_COMPAT, ">:utf8", "clutter-keysyms-compat.h");
unless open(OUT_KEYSYMS_COMPAT, ">:utf8", "deprecated/clutter-keysyms.h");
my $LICENSE_HEADER= <<EOF;
/* Clutter
@ -114,8 +114,8 @@ print OUT_KEYSYMS_COMPAT<<EOF;
* instead.
*/
#ifndef __CLUTTER_KEYSYMS_COMPAT_H__
#define __CLUTTER_KEYSYMS_COMPAT_H__
#ifndef __CLUTTER_KEYSYMS_DEPRECATED_H__
#define __CLUTTER_KEYSYMS_DEPRECATED_H__
EOF
@ -195,17 +195,12 @@ 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__ */
#endif /* __CLUTTER_KEYSYMS_DEPRECATED_H__ */
EOF
foreach my $f (qw/ keysymdef.h XF86keysym.h /) {
@ -213,4 +208,4 @@ foreach my $f (qw/ keysymdef.h XF86keysym.h /) {
}
printf "We just finished converting keysymdef.h to clutter-keysyms.h "
. "and clutter-keysyms-compat.h\nThank you\n";
. "and deprecated/clutter-keysyms.h\nThank you\n";

13
clutter/clutter-keysyms.h
View File

@ -336,6 +336,12 @@
#define CLUTTER_KEY_Pointer_Accelerate 0xfefa
#define CLUTTER_KEY_Pointer_DfltBtnNext 0xfefb
#define CLUTTER_KEY_Pointer_DfltBtnPrev 0xfefc
#define CLUTTER_KEY_ch 0xfea0
#define CLUTTER_KEY_Ch 0xfea1
#define CLUTTER_KEY_CH 0xfea2
#define CLUTTER_KEY_c_h 0xfea3
#define CLUTTER_KEY_C_h 0xfea4
#define CLUTTER_KEY_C_H 0xfea5
#define CLUTTER_KEY_3270_Duplicate 0xfd01
#define CLUTTER_KEY_3270_FieldMark 0xfd02
#define CLUTTER_KEY_3270_Right2 0xfd03
@ -2288,10 +2294,7 @@
#define CLUTTER_KEY_ClearGrab 0x1008fe21
#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
#define CLUTTER_KEY_LogWindowTree 0x1008fe24
#define CLUTTER_KEY_LogGrabInfo 0x1008fe25
#endif /* __CLUTTER_KEYSYMS_H__ */

14
clutter/clutter-keysyms-compat.h → clutter/deprecated/clutter-keysyms.h
View File

@ -26,8 +26,8 @@
* instead.
*/
#ifndef __CLUTTER_KEYSYMS_COMPAT_H__
#define __CLUTTER_KEYSYMS_COMPAT_H__
#ifndef __CLUTTER_KEYSYMS_DEPRECATED_H__
#define __CLUTTER_KEYSYMS_DEPRECATED_H__
#define CLUTTER_VoidSymbol 0xffffff
#define CLUTTER_BackSpace 0xff08
@ -334,6 +334,12 @@
#define CLUTTER_Pointer_Accelerate 0xfefa
#define CLUTTER_Pointer_DfltBtnNext 0xfefb
#define CLUTTER_Pointer_DfltBtnPrev 0xfefc
#define CLUTTER_ch 0xfea0
#define CLUTTER_Ch 0xfea1
#define CLUTTER_CH 0xfea2
#define CLUTTER_c_h 0xfea3
#define CLUTTER_C_h 0xfea4
#define CLUTTER_C_H 0xfea5
#define CLUTTER_3270_Duplicate 0xfd01
#define CLUTTER_3270_FieldMark 0xfd02
#define CLUTTER_3270_Right2 0xfd03
@ -2286,5 +2292,7 @@
#define CLUTTER_ClearGrab 0x1008fe21
#define CLUTTER_Next_VMode 0x1008fe22
#define CLUTTER_Prev_VMode 0x1008fe23
#define CLUTTER_LogWindowTree 0x1008fe24
#define CLUTTER_LogGrabInfo 0x1008fe25
#endif /* __CLUTTER_KEYSYMS_COMPAT_H__ */
#endif /* __CLUTTER_KEYSYMS_DEPRECATED_H__ */