From 3daae61d17a68b03a9d34a8535eaa43e2c22a157 Mon Sep 17 00:00:00 2001 From: Murray Cumming Date: Thu, 11 Feb 2016 12:38:51 +0100 Subject: gmmproc: _MEMBER_GET: Remove extra spaces, indenting and trailing. By changing ) dnl to )dnl --- tools/m4/member.m4 | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/tools/m4/member.m4 b/tools/m4/member.m4 index ed144cdd..acb6c044 100644 --- a/tools/m4/member.m4 +++ b/tools/m4/member.m4 @@ -9,27 +9,27 @@ dnl Get: dnl Creates accessors for simple types: dnl _MEMBER_GET(cpp_name, c_name, cpp_type, c_type, deprecated (optional)) define(`_MEMBER_GET',`dnl -ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_START ') dnl +ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_START ')dnl $3 get_$1() const; -ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_END ') dnl +ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_END ')dnl _PUSH(SECTION_CC) -ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_START ') dnl +ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_START ')dnl $3 __CPPNAME__::get_$1() const { return _CONVERT($4,$3,`gobj()->$2'); } -ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_END ') dnl +ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_END ')dnl _POP()') dnl Creates two accessors for pointer types, one const and one non-const: define(`_MEMBER_GET_PTR',`dnl -ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_START ') dnl +ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_START ')dnl $3 get_$1(); const $3 get_$1() const; -ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_END ') dnl +ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_END ')dnl _PUSH(SECTION_CC) -ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_START ') dnl +ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_START ')dnl $3 __CPPNAME__::get_$1() { return _CONVERT($4,$3,`gobj()->$2'); @@ -39,18 +39,18 @@ const $3 __CPPNAME__::get_$1() const { return _CONVERT($4,const $3,`gobj()->$2'); } -ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_END ') dnl +ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_END ')dnl _POP()') dnl Creates accessors for GObject-derived types that must be ref()ed. define(`_MEMBER_GET_GOBJECT',`dnl -ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_START ') dnl +ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_START ')dnl Glib::RefPtr<$3> get_$1(); Glib::RefPtr get_$1() const; -ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_END ') dnl +ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_END ')dnl _PUSH(SECTION_CC) -ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_START ') dnl +ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_START ')dnl Glib::RefPtr<$3> __CPPNAME__::get_$1() { Glib::RefPtr<$3> ref_ptr(_CONVERT($4,Glib::RefPtr<$3>,`gobj()->$2')); @@ -72,7 +72,7 @@ dnl We could use the bool with Glib::wrap(), but we want to share the m4 type-co return ref_ptr; } -ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_END ') dnl +ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_END ')dnl _POP()') @@ -81,41 +81,41 @@ dnl Set: dnl Creates accessors for simple types: define(`_MEMBER_SET',`dnl -ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_START ') dnl +ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_START ')dnl void set_$1(const $3`'& value); -ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_END ') dnl +ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_END ')dnl _PUSH(SECTION_CC) -ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_START ') dnl +ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_START ')dnl void __CPPNAME__::set_$1(const $3`'& value) { gobj()->$2 = _CONVERT($3,$4,`value'); } -ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_END ') dnl +ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_END ')dnl _POP()') dnl Creates accessors for pointer types: define(`_MEMBER_SET_PTR',`dnl -ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_START ') dnl +ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_START ')dnl void set_$1($3 value); -ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_END ') dnl +ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_END ')dnl _PUSH(SECTION_CC) -ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_START ') dnl +ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_START ')dnl void __CPPNAME__::set_$1($3 value) { gobj()->$2 = _CONVERT($3,$4,`value'); } -ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_END ') dnl +ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_END ')dnl _POP()') dnl Creates accessors for GObject-derived types that must be ref()ed. define(`_MEMBER_SET_GOBJECT',`dnl -ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_START ') dnl +ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_START ')dnl void set_$1(const Glib::RefPtr<$3>& value); -ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_END ') dnl +ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_END ')dnl _PUSH(SECTION_CC) -ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_START ') dnl +ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_START ')dnl void __CPPNAME__::set_$1(const Glib::RefPtr<$3>& value) { Glib::RefPtr<$3> valueOld(_CONVERT($4,Glib::RefPtr<$3>,`gobj()->$2')); //Take possession of the old one, unref-ing it in the destructor. @@ -125,7 +125,7 @@ void __CPPNAME__::set_$1(const Glib::RefPtr<$3>& value) gobj()->$2 = _CONVERT(const Glib::RefPtr<$3>&,$4,`value'); } -ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_END ') dnl +ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_END ')dnl _POP()') -- cgit v1.2.1