GNOME.org
 

[beast/devel: 3/4] BST: turn generated sources into C++

commit abbf3c7c0bf185ca1b964c4bb1834baef49bb7c7
Author: Tim Janik <timj gnu org>
Date:   Fri Dec 21 03:14:57 2012 +0100

    BST: turn generated sources into C++

 beast-gtk/.gitignore          |   10 ++++----
 beast-gtk/Makefile.am         |   48 ++++++++++++++++++++--------------------
 beast-gtk/bstbseutils.cc      |    2 +-
 beast-gtk/bstparam.h          |    2 +-
 beast-gtk/bstutils.cc         |   12 +++++-----
 beast-gtk/dialogs/.gitignore  |    2 +-
 beast-gtk/dialogs/Makefile.am |    6 ++--
 beast-gtk/icons/.gitignore    |    2 +-
 beast-gtk/icons/Makefile.am   |    8 +++---
 beast-gtk/tsmview.cc          |    2 +-
 po/POTSCAN                    |    1 -
 po/POTSKIP                    |    4 +-
 12 files changed, 49 insertions(+), 50 deletions(-)
---
diff --git a/beast-gtk/.gitignore b/beast-gtk/.gitignore
index b518d8b..6414353 100644
--- a/beast-gtk/.gitignore
+++ b/beast-gtk/.gitignore
@@ -1,11 +1,11 @@
 beast-[0-9].[0-9].[0-9]
-bstenum_arrays.c
-bstenum_list.c
-bstgenbseapi.c
+bstenum_arrays.cc
+bstenum_list.cc
+bstgenbseapi.cc
 bstgenbseapi.h
-bstgentypes.c
+bstgentypes.cc
 bstgentypes.h
-bstmarshal.c
+bstmarshal.cc
 bstmarshal.h
 stamp-bstgenbseapi.h
 stamp-bstgentypes.h
diff --git a/beast-gtk/Makefile.am b/beast-gtk/Makefile.am
index 23ac8ff..a78086e 100644
--- a/beast-gtk/Makefile.am
+++ b/beast-gtk/Makefile.am
@@ -13,8 +13,8 @@ INCLUDES += -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I. $(BEAST_CFLAGS) -D
 DEFS += -DG_LOG_DOMAIN="\"BEAST\""
 
 # special profiling hooks
-PROFILE_SOURCE = # profile.c
-DEFS += # $(subst profile.c, -pg -a, $(findstring profile.c, $(<F)))
+PROFILE_SOURCE = # profile.cc
+DEFS += # $(subst profile.cc, -pg -a, $(findstring profile.cc, $(<F)))
 LIBS += # -lefence # -pg 
 
 #
@@ -46,7 +46,7 @@ EXTRA_DIST += $(beast_headers)
 beast_sources = $(strip \
 	bsttrackrollctrl.cc	bstxframe.cc	bstscrollgraph.cc	\
 	bstdbmeter.cc		bstbusmixer.cc	bstbuseditor.cc		bstitemseqdialog.cc \
-	bstcanvassource.c	bstapp.cc	bstasciipixbuf.cc	bstcanvaslink.cc    \
+	bstcanvassource.cc	bstapp.cc	bstasciipixbuf.cc	bstcanvaslink.cc    \
 	bstpatterncolumns.cc	bstxkb.cc	bstpatternview.cc	bstpatternctrl.cc   \
 	bstkeybindings.cc	bstprofiler.cc	bstgrowbar.cc		bstbusview.cc       \
 	bstpianorollctrl.cc	bstpartview.cc	bstpianoroll.cc		bstplayback.cc	    \
@@ -101,10 +101,10 @@ stamp-bstgentypes.h: $(beast_headers) $(srcdir)/bstrecords.idl $(SFIDL)
 	&& (cmp -s xgen-$(@F) bstgentypes.h || cp xgen-$(@F) bstgentypes.h) \
 	&& rm -f xgen-$(@F) \
 	&& echo timestamp > $@
-# bstgentypes.c
-GENERATED_CLEANFILES += bstgentypes.c
-$(beast_vOBJECTS): bstgentypes.c
-bstgentypes.c: bstgentypes.h $(beast_headers) ${srcdir}/bstrecords.idl $(SFIDL)
+# bstgentypes.cc
+GENERATED_CLEANFILES += bstgentypes.cc
+$(beast_vOBJECTS): bstgentypes.cc
+bstgentypes.cc: bstgentypes.h $(beast_headers) ${srcdir}/bstrecords.idl $(SFIDL)
 	cd . \
 	&& ( cd $(srcdir) && $(GLIB_MKENUMS) \
 	  --eprod "\nGType bst__type_id__ EnumName@ = 0;" \
@@ -112,10 +112,10 @@ bstgentypes.c: bstgentypes.h $(beast_headers) ${srcdir}/bstrecords.idl $(SFIDL)
 	&& $(SFIDL) --host-c --source --init _bst_init_idl ${srcdir}/bstrecords.idl >> xgen-$(@F) \
 	&& cp xgen-$(@F) $@ \
 	&& rm -f xgen-$(@F)
-# bstenum_arrays.c
-GENERATED_CLEANFILES += bstenum_arrays.c
-$(beast_vOBJECTS): bstenum_arrays.c
-bstenum_arrays.c: $(beast_headers)
+# bstenum_arrays.cc
+GENERATED_CLEANFILES += bstenum_arrays.cc
+$(beast_vOBJECTS): bstenum_arrays.cc
+bstenum_arrays.cc: $(beast_headers)
 	cd . \
 	&& ( cd ${srcdir} && $(GLIB_MKENUMS) \
 	  --fprod "\n/* --- @filename@ --- */\n#include\t\"@filename \"" \
@@ -126,10 +126,10 @@ bstenum_arrays.c: $(beast_headers)
 	    $(beast_headers) ) > xgen-$(@F) \
 	&& cp xgen-$(@F) $@ \
 	&& rm -f xgen-$(@F)
-# bstenum_list.c
-GENERATED_CLEANFILES += bstenum_list.c
-$(beast_vOBJECTS): bstenum_list.c
-bstenum_list.c: $(beast_headers)
+# bstenum_list.cc
+GENERATED_CLEANFILES += bstenum_list.cc
+$(beast_vOBJECTS): bstenum_list.cc
+bstenum_list.cc: $(beast_headers)
 	cd . \
 	&& ( cd $(srcdir) && $(GLIB_MKENUMS) \
 	  --fprod "\n/* --- @filename@ --- */" \
@@ -148,14 +148,14 @@ stamp-bstgenbseapi.h: $(top_srcdir)/bse/*.idl $(top_builddir)/bse/*.idl $(SFIDL)
 	&& (cmp -s xgen-$(@F) bstgenbseapi.h || cp xgen-$(@F) bstgenbseapi.h) \
 	&& rm -f xgen-$(@F) \
 	&& echo timestamp > $@
-# bstgenbseapi.c
-GENERATED_CLEANFILES += bstgenbseapi.c
-$(beast_vOBJECTS): bstgenbseapi.c
-bstgenbseapi.c: bstgenbseapi.h $(top_srcdir)/bse/*.idl $(top_builddir)/bse/*.idl $(SFIDL)
+# bstgenbseapi.cc
+GENERATED_CLEANFILES += bstgenbseapi.cc
+$(beast_vOBJECTS): bstgenbseapi.cc
+bstgenbseapi.cc: bstgenbseapi.h $(top_srcdir)/bse/*.idl $(top_builddir)/bse/*.idl $(SFIDL)
 	cd .	\
 	&& echo -e "/* #include \"bstgenbseapi.h\" */\n" > xgen-$(@F) \
 	&& $(SFIDL) $(SFIDL_INC) --client-c --source --prefix beast_ $(top_srcdir)/bse/bse.idl >> xgen-$(@F) \
-	&& cp xgen-$(@F) bstgenbseapi.c \
+	&& cp xgen-$(@F) bstgenbseapi.cc \
 	&& rm -f xgen-$(@F)
 # bstmarshal.h
 GENERATED_CLEANFILES += bstmarshal.h
@@ -164,10 +164,10 @@ bstmarshal.h: bstmarshal.list
 	glib-genmarshal --prefix=bst_marshal $(srcdir)/bstmarshal.list --header > xgen-$(@F) \
 	&& cp xgen-$(@F) $@ \
 	&& rm -f xgen-$(@F)
-# bstmarshal.c
-GENERATED_CLEANFILES += bstmarshal.c
-$(srcdir)/bstutils.cc: bstmarshal.c
-bstmarshal.c: bstmarshal.list
+# bstmarshal.cc
+GENERATED_CLEANFILES += bstmarshal.cc
+$(srcdir)/bstutils.cc: bstmarshal.cc
+bstmarshal.cc: bstmarshal.list
 	glib-genmarshal --prefix=bst_marshal $(srcdir)/bstmarshal.list --body > xgen-$(@F) \
 	&& cp xgen-$(@F) $@ \
 	&& rm -f xgen-$(@F)
diff --git a/beast-gtk/bstbseutils.cc b/beast-gtk/bstbseutils.cc
index 7a17b93..54798ab 100644
--- a/beast-gtk/bstbseutils.cc
+++ b/beast-gtk/bstbseutils.cc
@@ -85,4 +85,4 @@ bst_procedure_get_title (const gchar *procedure)
 
 
 /* --- generated code --- */
-#include "bstgenbseapi.c"
+#include "bstgenbseapi.cc"
diff --git a/beast-gtk/bstparam.h b/beast-gtk/bstparam.h
index 436f8af..7dfc13d 100644
--- a/beast-gtk/bstparam.h
+++ b/beast-gtk/bstparam.h
@@ -54,7 +54,7 @@ GxkParam*    bst_param_new_proxy      (GParamSpec  *pspec,
 void         bst_param_set_proxy      (GxkParam    *param,
                                        SfiProxy     proxy);
 SfiProxy     bst_param_get_proxy      (GxkParam    *param);
-SfiProxy     bst_item_seq_list_match  (GSList      *proxy_seq_slist,    /* bstparam-proxy.c */
+SfiProxy     bst_item_seq_list_match  (GSList      *proxy_seq_slist,    /* bstparam-proxy.cc */
                                        const gchar *text);
 
 
diff --git a/beast-gtk/bstutils.cc b/beast-gtk/bstutils.cc
index 8a7ca2a..cb835de 100644
--- a/beast-gtk/bstutils.cc
+++ b/beast-gtk/bstutils.cc
@@ -37,7 +37,7 @@
 
 
 /* --- generated enums --- */
-#include "bstenum_arrays.c"     /* enum string value arrays plus include directives */
+#include "bstenum_arrays.cc"     /* enum string value arrays plus include directives */
 
 
 /* --- prototypes --- */
@@ -65,7 +65,7 @@ _bst_init_utils (void)
       GType            *type_id;
       gconstpointer     pointer1;
     } builtin_info[] = {
-#include "bstenum_list.c"       /* type entries */
+#include "bstenum_list.cc"       /* type entries */
     };
     guint i;
     for (i = 0; i < sizeof (builtin_info) / sizeof (builtin_info[0]); i++)
@@ -89,7 +89,7 @@ _bst_init_utils (void)
   /* initialize stock icons (included above) */
   {
     /* generated stock icons */
-#include "beast-gtk/icons/bst-stock-gen.c"
+#include "beast-gtk/icons/bst-stock-gen.cc"
     
     gxk_stock_register_icons (G_N_ELEMENTS (stock_icons), stock_icons);
   }
@@ -108,7 +108,7 @@ _bst_init_utils (void)
   }
 }
 
-#include "beast-gtk/dialogs/beast-xml-zfiles.c"
+#include "beast-gtk/dialogs/beast-xml-zfiles.cc"
 void
 _bst_init_radgets (void)
 {
@@ -1439,7 +1439,7 @@ bst_file_scan_find_key (const gchar *file,
 
 
 /* --- generated marshallers --- */
-#include "bstmarshal.c"
+#include "bstmarshal.cc"
 
 
 /* --- IDL pspecs --- */
@@ -1490,4 +1490,4 @@ bst_file_scan_find_key (const gchar *file,
 #define sfidl_pspec_Proxy_default(group, name) \
   sfi_pspec_set_group (sfi_pspec_proxy (name, NULL, NULL, SFI_PARAM_STANDARD), group)
 /* --- generated type IDs and SFIDL types --- */
-#include "bstgentypes.c"        /* type id defs */
+#include "bstgentypes.cc"       /* type id defs */
diff --git a/beast-gtk/dialogs/.gitignore b/beast-gtk/dialogs/.gitignore
index 470a02f..e4ffe3e 100644
--- a/beast-gtk/dialogs/.gitignore
+++ b/beast-gtk/dialogs/.gitignore
@@ -1 +1 @@
-beast-xml-zfiles.c
+beast-xml-zfiles.cc
diff --git a/beast-gtk/dialogs/Makefile.am b/beast-gtk/dialogs/Makefile.am
index b127e49..a2fa199 100644
--- a/beast-gtk/dialogs/Makefile.am
+++ b/beast-gtk/dialogs/Makefile.am
@@ -15,12 +15,12 @@ ZINTERN=$(top_builddir)/birnet/birnet-zintern
 
 XMLLINTCALL=$(if $(XMLLINT),$(XMLLINT),true) # handle undefined XMLLINT
 
-beast-xml-zfiles.c: $(XML_FILES) $(ZINTERN)
+beast-xml-zfiles.cc: $(XML_FILES) $(ZINTERN)
 	cd .						\
 	&& $(XMLLINTCALL) --noout $(XML_FILES)		\
 	&& $(ZINTERN) -b -z $(ZFILE_DEFS) > xgen-bxc	\
 	&& cp xgen-bxc $@				\
 	&& rm -f xgen-bxc
-CLEANFILES += xgen-bxc beast-xml-zfiles.c
+CLEANFILES += xgen-bxc beast-xml-zfiles.cc
 
-noinst_DATA = beast-xml-zfiles.c
+noinst_DATA = beast-xml-zfiles.cc
diff --git a/beast-gtk/icons/.gitignore b/beast-gtk/icons/.gitignore
index 09514df..63ad3f4 100644
--- a/beast-gtk/icons/.gitignore
+++ b/beast-gtk/icons/.gitignore
@@ -1,2 +1,2 @@
-bst-stock-gen.c
+bst-stock-gen.cc
 bst-stock-gen.h
diff --git a/beast-gtk/icons/Makefile.am b/beast-gtk/icons/Makefile.am
index 05def66..1a33f88 100644
--- a/beast-gtk/icons/Makefile.am
+++ b/beast-gtk/icons/Makefile.am
@@ -134,11 +134,11 @@ STOCK_IMAGE_DEFS = $(strip						\
 )
 
 gen_sources = xgen-bsgc xgen-bsgh
-CLEANFILES += $(gen_sources) bst-stock-gen.c bst-stock-gen.h
-noinst_DATA = bst-stock-gen.c bst-stock-gen.h
+CLEANFILES += $(gen_sources) bst-stock-gen.cc bst-stock-gen.h
+noinst_DATA = bst-stock-gen.cc bst-stock-gen.h
 EXTRA_DIST += $(SRC_IMAGES) $(filter-out STOCK_%, $(STOCK_IMAGE_DEFS))
 
-bst-stock-gen.c:	$(srcdir)/*.png bst-stock-gen.h
+bst-stock-gen.cc: $(srcdir)/*.png bst-stock-gen.h
 	gdk-pixbuf-csource --build-list $(STOCK_IMAGE_DEFS) > xgen-bsgc		\
 	&& echo "static const GxkStockIcon stock_icons[] = {" >> xgen-bsgc	\
 	&& for i in $(filter STOCK_%, $(STOCK_IMAGE_DEFS)) ; do			\
@@ -148,7 +148,7 @@ bst-stock-gen.c:	$(srcdir)/*.png bst-stock-gen.h
 	&& cp xgen-bsgc $@							\
 	&& rm -f xgen-bsgc
 
-bst-stock-gen.h:	$(srcdir)/*.png
+bst-stock-gen.h: $(srcdir)/*.png
 	for i in $(filter STOCK_%, $(STOCK_IMAGE_DEFS)) ; do			\
 		echo "#define BST_$$i                \"BST_$$i\"" >> xgen-bsgh;	\
 	done									\
diff --git a/beast-gtk/tsmview.cc b/beast-gtk/tsmview.cc
index 8aacf15..bc5ed2d 100644
--- a/beast-gtk/tsmview.cc
+++ b/beast-gtk/tsmview.cc
@@ -1,4 +1,4 @@
-/* tsmview.c - TagSpanMarkup Viewer
+/* tsmview.cc - TagSpanMarkup Viewer
  * Copyright (C) 2002 Tim Janik
  *
  * This library is free software; you can redistribute it and/or
diff --git a/po/POTSCAN b/po/POTSCAN
index cd1c9bb..c4b5020 100644
--- a/po/POTSCAN
+++ b/po/POTSCAN
@@ -43,7 +43,6 @@ beast-gtk/bstrecords.idl
 beast-gtk/bstsampleeditor.cc
 beast-gtk/bstscrollgraph.cc
 beast-gtk/bstsnetrouter.cc
-beast-gtk/bststest.cc
 beast-gtk/bstsupershell.cc
 beast-gtk/bsttrackrollctrl.cc
 beast-gtk/bsttracksynthdialog.cc
diff --git a/po/POTSKIP b/po/POTSKIP
index 0924182..88073e8 100644
--- a/po/POTSKIP
+++ b/po/POTSKIP
@@ -1,7 +1,7 @@
 #0 List of source files to scan for translatable strings
 #0 Please keep alphabetically sorted
-beast-gtk/bstgentypes.c
-beast-gtk/bststest.c
+beast-gtk/bstgentypes.cc
+beast-gtk/bststest.cc
 plugins/bsefirfilter.c
 plugins/davguitar.c
 plugins/evaluator/bseevaluator.idl
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]