Skip to content

Commit

Permalink
libs: libnx: nxfonts: fix Mixed case identifier
Browse files Browse the repository at this point in the history 
Fix Mixed case identifier to pass nxstyle CI check

Signed-off-by: Alin Jerpelea <alin.jerpelea@sony.com>
  • Loading branch information
@jerpelea @xiaoxiang781216
jerpelea authored and xiaoxiang781216 committed Feb 25, 2021
1 parent 30cb7d3 commit fe9ccff
Show file tree
Hide file tree
Showing 13 changed files with 49 additions and 49 deletions.
18 changes: 9 additions & 9 deletions libs/libnx/nxfonts/Make.defs
View file
Expand Up @@ -166,59 +166,59 @@ CSRCS += nxfonts_bitmaps_x11-misc-fixed-6x13.c
endif

ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_6X13B),y)
CSRCS += nxfonts_bitmaps_x11-misc-fixed-6x13B.c
CSRCS += nxfonts_bitmaps_x11-misc-fixed-6x13b.c
endif

ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_6X13O),y)
CSRCS += nxfonts_bitmaps_x11-misc-fixed-6x13O.c
CSRCS += nxfonts_bitmaps_x11-misc-fixed-6x13o.c
endif

ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_7X13),y)
CSRCS += nxfonts_bitmaps_x11-misc-fixed-7x13.c
endif

ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_7X13B),y)
CSRCS += nxfonts_bitmaps_x11-misc-fixed-7x13B.c
CSRCS += nxfonts_bitmaps_x11-misc-fixed-7x13b.c
endif

ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_7X13O),y)
CSRCS += nxfonts_bitmaps_x11-misc-fixed-7x13O.c
CSRCS += nxfonts_bitmaps_x11-misc-fixed-7x13o.c
endif

ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_7X14),y)
CSRCS += nxfonts_bitmaps_x11-misc-fixed-7x14.c
endif

ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_7X14B),y)
CSRCS += nxfonts_bitmaps_x11-misc-fixed-7x14B.c
CSRCS += nxfonts_bitmaps_x11-misc-fixed-7x14b.c
endif

ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_8X13),y)
CSRCS += nxfonts_bitmaps_x11-misc-fixed-8x13.c
endif

ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_8X13B),y)
CSRCS += nxfonts_bitmaps_x11-misc-fixed-8x13B.c
CSRCS += nxfonts_bitmaps_x11-misc-fixed-8x13b.c
endif

ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_8X13O),y)
CSRCS += nxfonts_bitmaps_x11-misc-fixed-8x13O.c
CSRCS += nxfonts_bitmaps_x11-misc-fixed-8x13o.c
endif

ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_9X15),y)
CSRCS += nxfonts_bitmaps_x11-misc-fixed-9x15.c
endif

ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_9X15B),y)
CSRCS += nxfonts_bitmaps_x11-misc-fixed-9x15B.c
CSRCS += nxfonts_bitmaps_x11-misc-fixed-9x15b.c
endif

ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_9X18),y)
CSRCS += nxfonts_bitmaps_x11-misc-fixed-9x18.c
endif

ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_9X18B),y)
CSRCS += nxfonts_bitmaps_x11-misc-fixed-9x18B.c
CSRCS += nxfonts_bitmaps_x11-misc-fixed-9x18b.c
endif

ifeq ($(CONFIG_NXFONT_X11_MISC_FIXED_10X20),y)
Expand Down
18 changes: 9 additions & 9 deletions libs/libnx/nxfonts/Makefile.sources
View file
Expand Up @@ -223,12 +223,12 @@ endif

ifeq ($(NXFONTS_FONTID),28)
NXFONTS_PREFIX := g_x11_misc_fixed_6x13B_
GEN_CSRC = nxfonts_bitmaps_x11-misc-fixed-6x13B.c
GEN_CSRC = nxfonts_bitmaps_x11-misc-fixed-6x13b.c
endif

ifeq ($(NXFONTS_FONTID),29)
NXFONTS_PREFIX := g_x11_misc_fixed_6x13O_
GEN_CSRC = nxfonts_bitmaps_x11-misc-fixed-6x13O.c
GEN_CSRC = nxfonts_bitmaps_x11-misc-fixed-6x13o.c
endif

ifeq ($(NXFONTS_FONTID),30)
Expand All @@ -238,12 +238,12 @@ endif

ifeq ($(NXFONTS_FONTID),31)
NXFONTS_PREFIX := g_x11_misc_fixed_7x13B_
GEN_CSRC = nxfonts_bitmaps_x11-misc-fixed-7x13B.c
GEN_CSRC = nxfonts_bitmaps_x11-misc-fixed-7x13b.c
endif

ifeq ($(NXFONTS_FONTID),32)
NXFONTS_PREFIX := g_x11_misc_fixed_7x13O_
GEN_CSRC = nxfonts_bitmaps_x11-misc-fixed-7x13O.c
GEN_CSRC = nxfonts_bitmaps_x11-misc-fixed-7x13o.c
endif

ifeq ($(NXFONTS_FONTID),33)
Expand All @@ -253,7 +253,7 @@ endif

ifeq ($(NXFONTS_FONTID),34)
NXFONTS_PREFIX := g_x11_misc_fixed_7x14B_
GEN_CSRC = nxfonts_bitmaps_x11-misc-fixed-7x14B.c
GEN_CSRC = nxfonts_bitmaps_x11-misc-fixed-7x14b.c
endif

ifeq ($(NXFONTS_FONTID),35)
Expand All @@ -263,12 +263,12 @@ endif

ifeq ($(NXFONTS_FONTID),36)
NXFONTS_PREFIX := g_x11_misc_fixed_8x13B_
GEN_CSRC = nxfonts_bitmaps_x11-misc-fixed-8x13B.c
GEN_CSRC = nxfonts_bitmaps_x11-misc-fixed-8x13b.c
endif

ifeq ($(NXFONTS_FONTID),37)
NXFONTS_PREFIX := g_x11_misc_fixed_8x13O_
GEN_CSRC = nxfonts_bitmaps_x11-misc-fixed-8x13O.c
GEN_CSRC = nxfonts_bitmaps_x11-misc-fixed-8x13o.c
endif

ifeq ($(NXFONTS_FONTID),38)
Expand All @@ -278,7 +278,7 @@ endif

ifeq ($(NXFONTS_FONTID),39)
NXFONTS_PREFIX := g_x11_misc_fixed_9x15B_
GEN_CSRC = nxfonts_bitmaps_x11-misc-fixed-9x15B.c
GEN_CSRC = nxfonts_bitmaps_x11-misc-fixed-9x15b.c
endif

ifeq ($(NXFONTS_FONTID),40)
Expand All @@ -288,7 +288,7 @@ endif

ifeq ($(NXFONTS_FONTID),41)
NXFONTS_PREFIX := g_x11_misc_fixed_9x18B_
GEN_CSRC = nxfonts_bitmaps_x11-misc-fixed-9x18B.c
GEN_CSRC = nxfonts_bitmaps_x11-misc-fixed-9x18b.c
endif

ifeq ($(NXFONTS_FONTID),42)
Expand Down
18 changes: 9 additions & 9 deletions libs/libnx/nxfonts/nxfonts_bitmaps.c
View file
Expand Up @@ -101,33 +101,33 @@
#elif NXFONTS_FONTID == 27
# include "nxfonts_x11-misc-fixed-6x13.h"
#elif NXFONTS_FONTID == 28
# include "nxfonts_x11-misc-fixed-6x13B.h"
# include "nxfonts_x11-misc-fixed-6x13b.h"
#elif NXFONTS_FONTID == 29
# include "nxfonts_x11-misc-fixed-6x13O.h"
# include "nxfonts_x11-misc-fixed-6x13o.h"
#elif NXFONTS_FONTID == 30
# include "nxfonts_x11-misc-fixed-7x13.h"
#elif NXFONTS_FONTID == 31
# include "nxfonts_x11-misc-fixed-7x13B.h"
# include "nxfonts_x11-misc-fixed-7x13b.h"
#elif NXFONTS_FONTID == 32
# include "nxfonts_x11-misc-fixed-7x13O.h"
# include "nxfonts_x11-misc-fixed-7x13o.h"
#elif NXFONTS_FONTID == 33
# include "nxfonts_x11-misc-fixed-7x14.h"
#elif NXFONTS_FONTID == 34
# include "nxfonts_x11-misc-fixed-7x14B.h"
# include "nxfonts_x11-misc-fixed-7x14b.h"
#elif NXFONTS_FONTID == 35
# include "nxfonts_x11-misc-fixed-8x13.h"
#elif NXFONTS_FONTID == 36
# include "nxfonts_x11-misc-fixed-8x13B.h"
# include "nxfonts_x11-misc-fixed-8x13b.h"
#elif NXFONTS_FONTID == 37
# include "nxfonts_x11-misc-fixed-8x13O.h"
# include "nxfonts_x11-misc-fixed-8x13o.h"
#elif NXFONTS_FONTID == 38
# include "nxfonts_x11-misc-fixed-9x15.h"
#elif NXFONTS_FONTID == 39
# include "nxfonts_x11-misc-fixed-9x15B.h"
# include "nxfonts_x11-misc-fixed-9x15b.h"
#elif NXFONTS_FONTID == 40
# include "nxfonts_x11-misc-fixed-9x18.h"
#elif NXFONTS_FONTID == 41
# include "nxfonts_x11-misc-fixed-9x18B.h"
# include "nxfonts_x11-misc-fixed-9x18b.h"
#elif NXFONTS_FONTID == 42
# include "nxfonts_x11-misc-fixed-10x20.h"
#elif NXFONTS_FONTID == 43
Expand Down
36 changes: 18 additions & 18 deletions libs/libnx/nxfonts/nxfonts_getfont.c
View file
Expand Up @@ -179,59 +179,59 @@ extern const struct nx_fontpackage_s g_x11_misc_fixed_6x13_package;
#endif

#ifdef CONFIG_NXFONT_X11_MISC_FIXED_6X13B
extern const struct nx_fontpackage_s g_x11_misc_fixed_6x13B_package;
extern const struct nx_fontpackage_s g_x11_misc_fixed_6x13b_package;
#endif

#ifdef CONFIG_NXFONT_X11_MISC_FIXED_6X13O
extern const struct nx_fontpackage_s g_x11_misc_fixed_6x13O_package;
extern const struct nx_fontpackage_s g_x11_misc_fixed_6x13o_package;
#endif

#ifdef CONFIG_NXFONT_X11_MISC_FIXED_7X13
extern const struct nx_fontpackage_s g_x11_misc_fixed_7x13_package;
#endif

#ifdef CONFIG_NXFONT_X11_MISC_FIXED_7X13B
extern const struct nx_fontpackage_s g_x11_misc_fixed_7x13B_package;
extern const struct nx_fontpackage_s g_x11_misc_fixed_7x13b_package;
#endif

#ifdef CONFIG_NXFONT_X11_MISC_FIXED_7X13O
extern const struct nx_fontpackage_s g_x11_misc_fixed_7x13O_package;
extern const struct nx_fontpackage_s g_x11_misc_fixed_7x13o_package;
#endif

#ifdef CONFIG_NXFONT_X11_MISC_FIXED_7X14
extern const struct nx_fontpackage_s g_x11_misc_fixed_7x14_package;
#endif

#ifdef CONFIG_NXFONT_X11_MISC_FIXED_7X14B
extern const struct nx_fontpackage_s g_x11_misc_fixed_7x14B_package;
extern const struct nx_fontpackage_s g_x11_misc_fixed_7x14b_package;
#endif

#ifdef CONFIG_NXFONT_X11_MISC_FIXED_8X13
extern const struct nx_fontpackage_s g_x11_misc_fixed_8x13_package;
#endif

#ifdef CONFIG_NXFONT_X11_MISC_FIXED_8X13B
extern const struct nx_fontpackage_s g_x11_misc_fixed_8x13B_package;
extern const struct nx_fontpackage_s g_x11_misc_fixed_8x13b_package;
#endif

#ifdef CONFIG_NXFONT_X11_MISC_FIXED_8X13O
extern const struct nx_fontpackage_s g_x11_misc_fixed_8x13O_package;
extern const struct nx_fontpackage_s g_x11_misc_fixed_8x13o_package;
#endif

#ifdef CONFIG_NXFONT_X11_MISC_FIXED_9X15
extern const struct nx_fontpackage_s g_x11_misc_fixed_9x15_package;
#endif

#ifdef CONFIG_NXFONT_X11_MISC_FIXED_9X15B
extern const struct nx_fontpackage_s g_x11_misc_fixed_9x15B_package;
extern const struct nx_fontpackage_s g_x11_misc_fixed_9x15b_package;
#endif

#ifdef CONFIG_NXFONT_X11_MISC_FIXED_9X18
extern const struct nx_fontpackage_s g_x11_misc_fixed_9x18_package;
#endif

#ifdef CONFIG_NXFONT_X11_MISC_FIXED_9X18B
extern const struct nx_fontpackage_s g_x11_misc_fixed_9x18B_package;
extern const struct nx_fontpackage_s g_x11_misc_fixed_9x18b_package;
#endif

#ifdef CONFIG_NXFONT_X11_MISC_FIXED_10X20
Expand Down Expand Up @@ -367,59 +367,59 @@ static FAR const struct nx_fontpackage_s *g_fontpackages[] =
#endif

#ifdef CONFIG_NXFONT_X11_MISC_FIXED_6X13B
&g_x11_misc_fixed_6x13B_package,
&g_x11_misc_fixed_6x13b_package,
#endif

#ifdef CONFIG_NXFONT_X11_MISC_FIXED_6X13O
&g_x11_misc_fixed_6x13O_package,
&g_x11_misc_fixed_6x13o_package,
#endif

#ifdef CONFIG_NXFONT_X11_MISC_FIXED_7X13
&g_x11_misc_fixed_7x13_package,
#endif

#ifdef CONFIG_NXFONT_X11_MISC_FIXED_7X13B
&g_x11_misc_fixed_7x13B_package,
&g_x11_misc_fixed_7x13b_package,
#endif

#ifdef CONFIG_NXFONT_X11_MISC_FIXED_7X13O
&g_x11_misc_fixed_7x13O_package,
&g_x11_misc_fixed_7x13o_package,
#endif

#ifdef CONFIG_NXFONT_X11_MISC_FIXED_7X14
&g_x11_misc_fixed_7x14_package,
#endif

#ifdef CONFIG_NXFONT_X11_MISC_FIXED_7X14B
&g_x11_misc_fixed_7x14B_package,
&g_x11_misc_fixed_7x14b_package,
#endif

#ifdef CONFIG_NXFONT_X11_MISC_FIXED_8X13
&g_x11_misc_fixed_8x13_package,
#endif

#ifdef CONFIG_NXFONT_X11_MISC_FIXED_8X13B
&g_x11_misc_fixed_8x13B_package,
&g_x11_misc_fixed_8x13b_package,
#endif

#ifdef CONFIG_NXFONT_X11_MISC_FIXED_8X13O
&g_x11_misc_fixed_8x13O_package,
&g_x11_misc_fixed_8x13o_package,
#endif

#ifdef CONFIG_NXFONT_X11_MISC_FIXED_9X15
&g_x11_misc_fixed_9x15_package,
#endif

#ifdef CONFIG_NXFONT_X11_MISC_FIXED_9X15B
&g_x11_misc_fixed_9x15B_package,
&g_x11_misc_fixed_9x15b_package,
#endif

#ifdef CONFIG_NXFONT_X11_MISC_FIXED_9X18
&g_x11_misc_fixed_9x18_package,
#endif

#ifdef CONFIG_NXFONT_X11_MISC_FIXED_9X18B
&g_x11_misc_fixed_9x18B_package,
&g_x11_misc_fixed_9x18b_package,
#endif

#ifdef CONFIG_NXFONT_X11_MISC_FIXED_10X20
Expand Down
0 ...nx/nxfonts/nxfonts_x11-misc-fixed-6x13B.h → ...nx/nxfonts/nxfonts_x11-misc-fixed-6x13b.h
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...nx/nxfonts/nxfonts_x11-misc-fixed-6x13O.h → ...nx/nxfonts/nxfonts_x11-misc-fixed-6x13o.h
View file
@@ -1,5 +1,5 @@
/****************************************************************************
* libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x13O.h
* libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x13o.h
*
* Copyright (C) 2014 Pierre-Noel Bouteville. All rights reserved.
* Author: Pierre-Noel Bouteville <pnb990@gmail.com>
Expand Down
0 ...nx/nxfonts/nxfonts_x11-misc-fixed-7x13B.h → ...nx/nxfonts/nxfonts_x11-misc-fixed-7x13b.h
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...nx/nxfonts/nxfonts_x11-misc-fixed-7x13O.h → ...nx/nxfonts/nxfonts_x11-misc-fixed-7x13o.h
View file
@@ -1,5 +1,5 @@
/****************************************************************************
* libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x130.h
* libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x13o.h
*
* Copyright (C) 2014 Pierre-Noel Bouteville. All rights reserved.
* Author: Pierre-Noel Bouteville <pnb990@gmail.com>
Expand Down
0 ...nx/nxfonts/nxfonts_x11-misc-fixed-7x14B.h → ...nx/nxfonts/nxfonts_x11-misc-fixed-7x14b.h
View file
File renamed without changes.
0 ...nx/nxfonts/nxfonts_x11-misc-fixed-8x13B.h → ...nx/nxfonts/nxfonts_x11-misc-fixed-8x13b.h
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...nx/nxfonts/nxfonts_x11-misc-fixed-8x13O.h → ...nx/nxfonts/nxfonts_x11-misc-fixed-8x13o.h
View file
@@ -1,5 +1,5 @@
/****************************************************************************
* libs/libnx/nxfonts/nxfonts_x11-misc-fixed-8x13O.h
* libs/libnx/nxfonts/nxfonts_x11-misc-fixed-8x13o.h
*
* Copyright (C) 2014 Pierre-Noel Bouteville. All rights reserved.
* Author: Pierre-Noel Bouteville <pnb990@gmail.com>
Expand Down
0 ...nx/nxfonts/nxfonts_x11-misc-fixed-9x15B.h → ...nx/nxfonts/nxfonts_x11-misc-fixed-9x15b.h
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...nx/nxfonts/nxfonts_x11-misc-fixed-9x18B.h → ...nx/nxfonts/nxfonts_x11-misc-fixed-9x18b.h
View file
@@ -1,5 +1,5 @@
/****************************************************************************
* libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x18B.h
* libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x18b.h
*
* Copyright (C) 2014 Pierre-Noel Bouteville. All rights reserved.
* Author: Pierre-Noel Bouteville <pnb990@gmail.com>
Expand Down

0 comments on commit fe9ccff

Please sign in to comment.