X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-core%2Ftrunk%2Fsrc%2Fsinfg%2Fproto%2Fproto.m4;h=91800ebb2a06c80517328ec7394517fb46c77b10;hb=f6cae1251ee6a7a9ec582d7be043d1cda96467ff;hp=70c5299dede488d423fcd8717ca7452b6be66c48;hpb=6e89dfb3f07b7de0c01c954088c7e0ced8d24105;p=synfig.git diff --git a/synfig-core/trunk/src/sinfg/proto/proto.m4 b/synfig-core/trunk/src/sinfg/proto/proto.m4 index 70c5299..91800eb 100644 --- a/synfig-core/trunk/src/sinfg/proto/proto.m4 +++ b/synfig-core/trunk/src/sinfg/proto/proto.m4 @@ -16,17 +16,17 @@ ifelse($#,1,,`v$1`'ifelse($#,2,,`, _PRINT_ARGS2(incr($1), shift(shift($@)))')')d dnl PX_DEFINE_FUNC(func_name, ret_type, args...) define(`PX_DEFINE_FUNC',` - private: sigc::slot< $2`'ifelse($#,2,,`, shift(shift($@))') > slot_$1; - public: $2 $1(ifelse($#,2,,`_PRINT_ARGS(1,shift(shift($@)))')) { - return slot_$1(ifelse($#,2,,`_PRINT_ARGS2(1,shift(shift($@)))')); + sigc::slot< $2`'ifelse($#,2,,`, shift(shift($@))') > _slot_$1; + $2 $1(ifelse($#,2,,`_PRINT_ARGS(1,shift(shift($@)))')) { + return _slot_$1(ifelse($#,2,,`_PRINT_ARGS2(1,shift(shift($@)))')); } ')dnl dnl PX_DEFINE_FUNC_CONST(func_name, ret_type, args...) define(`PX_DEFINE_FUNC_CONST',` - private: sigc::slot< $2`'ifelse($#,2,,`, shift(shift($@))') > slotconst_$1; - public: $2 $1(ifelse($#,2,,`_PRINT_ARGS(1,shift(shift($@)))'))const { - return slotconst_$1(ifelse($#,2,,`_PRINT_ARGS2(1,shift(shift($@)))')); + sigc::slot< $2`'ifelse($#,2,,`, shift(shift($@))') > _slot_$1_const; + $2 $1(ifelse($#,2,,`_PRINT_ARGS(1,shift(shift($@)))'))const { + return _slot_$1_const(ifelse($#,2,,`_PRINT_ARGS2(1,shift(shift($@)))')); } ')dnl