From 0f3206d5feeba3e3ef7f76e85993e3c2d903a5fe Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Sat, 29 Sep 2018 08:12:33 +0200 Subject: [PATCH] Format code (replace ( xxx ) by (xxx)) Signed-off-by: Stefan Weil --- src/api/capi.cpp | 22 +-- src/api/capi.h | 46 ++--- src/ccstruct/statistc.cpp | 2 +- src/ccstruct/statistc.h | 2 +- src/ccutil/clst.h | 8 +- src/ccutil/elst.h | 20 +- src/ccutil/elst2.cpp | 2 +- src/ccutil/elst2.h | 8 +- src/ccutil/ocrclass.h | 4 +- src/ccutil/scanutils.cpp | 4 +- src/ccutil/serialis.h | 2 +- src/ccutil/tesscallback.h | 320 ++++++++++++++++---------------- src/classify/cluster.cpp | 12 +- src/classify/clusttool.cpp | 2 +- src/classify/kdtree.cpp | 2 +- src/classify/mfdefs.h | 2 +- src/opencl/oclkernels.h | 62 +++---- src/textord/blkocc.h | 4 +- src/textord/colpartitionset.cpp | 4 +- src/textord/tabfind.cpp | 2 +- src/textord/tospace.cpp | 8 +- src/training/cntraining.cpp | 8 +- src/training/commontraining.cpp | 4 +- 23 files changed, 274 insertions(+), 276 deletions(-) diff --git a/src/api/capi.cpp b/src/api/capi.cpp index 69b239b6c5..dc25121977 100644 --- a/src/api/capi.cpp +++ b/src/api/capi.cpp @@ -413,9 +413,9 @@ TESS_API struct Boxa* TESS_CALL TessBaseAPIGetComponentImages(TessBaseAPI* handl } TESS_API struct Boxa* - TESS_CALL TessBaseAPIGetComponentImages1( TessBaseAPI* handle, const TessPageIteratorLevel level, const BOOL text_only, - const BOOL raw_image, const int raw_padding, - struct Pixa** pixa, int** blockids, int** paraids) +TESS_CALL TessBaseAPIGetComponentImages1(TessBaseAPI* handle, const TessPageIteratorLevel level, const BOOL text_only, + const BOOL raw_image, const int raw_padding, + struct Pixa** pixa, int** blockids, int** paraids) { return handle->GetComponentImages(level, text_only != FALSE, raw_image, raw_padding, pixa, blockids, paraids); } @@ -825,37 +825,37 @@ TESS_API ETEXT_DESC* TESS_CALL TessMonitorCreate() return new ETEXT_DESC(); } -TESS_API void TESS_CALL TessMonitorDelete( ETEXT_DESC* monitor ) +TESS_API void TESS_CALL TessMonitorDelete(ETEXT_DESC* monitor) { delete monitor; } -TESS_API void TESS_CALL TessMonitorSetCancelFunc( ETEXT_DESC* monitor, TessCancelFunc cancelFunc ) +TESS_API void TESS_CALL TessMonitorSetCancelFunc(ETEXT_DESC* monitor, TessCancelFunc cancelFunc) { monitor->cancel = cancelFunc; } -TESS_API void TESS_CALL TessMonitorSetCancelThis( ETEXT_DESC* monitor, void* cancelThis ) +TESS_API void TESS_CALL TessMonitorSetCancelThis(ETEXT_DESC* monitor, void* cancelThis) { monitor->cancel_this = cancelThis; } -TESS_API void* TESS_CALL TessMonitorGetCancelThis( ETEXT_DESC* monitor ) +TESS_API void* TESS_CALL TessMonitorGetCancelThis(ETEXT_DESC* monitor) { return monitor->cancel_this; } -TESS_API void TESS_CALL TessMonitorSetProgressFunc( ETEXT_DESC* monitor, TessProgressFunc progressFunc ) +TESS_API void TESS_CALL TessMonitorSetProgressFunc(ETEXT_DESC* monitor, TessProgressFunc progressFunc) { monitor->progress_callback2 = progressFunc; } -TESS_API int TESS_CALL TessMonitorGetProgress( ETEXT_DESC* monitor ) +TESS_API int TESS_CALL TessMonitorGetProgress(ETEXT_DESC* monitor) { return monitor->progress; } -TESS_API void TESS_CALL TessMonitorSetDeadlineMSecs( ETEXT_DESC* monitor, int deadline ) +TESS_API void TESS_CALL TessMonitorSetDeadlineMSecs(ETEXT_DESC* monitor, int deadline) { - monitor->set_deadline_msecs( deadline ); + monitor->set_deadline_msecs(deadline); } diff --git a/src/api/capi.h b/src/api/capi.h index 00e0746fd1..45b33100c3 100644 --- a/src/api/capi.h +++ b/src/api/capi.h @@ -151,7 +151,7 @@ TESS_API void TESS_CALL TessBaseAPIDelete(TessBaseAPI* handle); TESS_API size_t TESS_CALL TessBaseAPIGetOpenCLDevice(TessBaseAPI* handle, void **device); -TESS_API void TESS_CALL TessBaseAPISetInputName( TessBaseAPI* handle, const char* name); +TESS_API void TESS_CALL TessBaseAPISetInputName(TessBaseAPI* handle, const char* name); TESS_API const char* TESS_CALL TessBaseAPIGetInputName(TessBaseAPI* handle); TESS_API void TESS_CALL TessBaseAPISetInputImage(TessBaseAPI* handle, struct Pix* pix); @@ -165,13 +165,13 @@ TESS_API void TESS_CALL TessBaseAPISetOutputName(TessBaseAPI* handle, const cha TESS_API BOOL TESS_CALL TessBaseAPISetVariable(TessBaseAPI* handle, const char* name, const char* value); TESS_API BOOL TESS_CALL TessBaseAPISetDebugVariable(TessBaseAPI* handle, const char* name, const char* value); -TESS_API BOOL TESS_CALL TessBaseAPIGetIntVariable( const TessBaseAPI* handle, const char* name, int* value); -TESS_API BOOL TESS_CALL TessBaseAPIGetBoolVariable( const TessBaseAPI* handle, const char* name, BOOL* value); +TESS_API BOOL TESS_CALL TessBaseAPIGetIntVariable(const TessBaseAPI* handle, const char* name, int* value); +TESS_API BOOL TESS_CALL TessBaseAPIGetBoolVariable(const TessBaseAPI* handle, const char* name, BOOL* value); TESS_API BOOL TESS_CALL TessBaseAPIGetDoubleVariable(const TessBaseAPI* handle, const char* name, double* value); TESS_API const char* TESS_CALL TessBaseAPIGetStringVariable(const TessBaseAPI* handle, const char* name); -TESS_API void TESS_CALL TessBaseAPIPrintVariables( const TessBaseAPI* handle, FILE* fp); +TESS_API void TESS_CALL TessBaseAPIPrintVariables(const TessBaseAPI* handle, FILE* fp); TESS_API BOOL TESS_CALL TessBaseAPIPrintVariablesToFile(const TessBaseAPI* handle, const char* filename); #ifdef TESS_CAPI_INCLUDE_BASEAPI @@ -231,27 +231,27 @@ TESS_API void TESS_CALL TessBaseAPISetThresholder(TessBaseAPI* handle, TessImag #endif TESS_API struct Pix* - TESS_CALL TessBaseAPIGetThresholdedImage( TessBaseAPI* handle); + TESS_CALL TessBaseAPIGetThresholdedImage(TessBaseAPI* handle); TESS_API struct Boxa* - TESS_CALL TessBaseAPIGetRegions( TessBaseAPI* handle, struct Pixa** pixa); + TESS_CALL TessBaseAPIGetRegions(TessBaseAPI* handle, struct Pixa** pixa); TESS_API struct Boxa* - TESS_CALL TessBaseAPIGetTextlines( TessBaseAPI* handle, struct Pixa** pixa, int** blockids); + TESS_CALL TessBaseAPIGetTextlines(TessBaseAPI* handle, struct Pixa** pixa, int** blockids); TESS_API struct Boxa* - TESS_CALL TessBaseAPIGetTextlines1( TessBaseAPI* handle, const BOOL raw_image, const int raw_padding, - struct Pixa** pixa, int** blockids, int** paraids); + TESS_CALL TessBaseAPIGetTextlines1(TessBaseAPI* handle, const BOOL raw_image, const int raw_padding, + struct Pixa** pixa, int** blockids, int** paraids); TESS_API struct Boxa* - TESS_CALL TessBaseAPIGetStrips( TessBaseAPI* handle, struct Pixa** pixa, int** blockids); + TESS_CALL TessBaseAPIGetStrips(TessBaseAPI* handle, struct Pixa** pixa, int** blockids); TESS_API struct Boxa* - TESS_CALL TessBaseAPIGetWords( TessBaseAPI* handle, struct Pixa** pixa); + TESS_CALL TessBaseAPIGetWords(TessBaseAPI* handle, struct Pixa** pixa); TESS_API struct Boxa* TESS_CALL TessBaseAPIGetConnectedComponents(TessBaseAPI* handle, struct Pixa** cc); TESS_API struct Boxa* - TESS_CALL TessBaseAPIGetComponentImages( TessBaseAPI* handle, const TessPageIteratorLevel level, const BOOL text_only, - struct Pixa** pixa, int** blockids); + TESS_CALL TessBaseAPIGetComponentImages(TessBaseAPI* handle, const TessPageIteratorLevel level, const BOOL text_only, + struct Pixa** pixa, int** blockids); TESS_API struct Boxa* - TESS_CALL TessBaseAPIGetComponentImages1( TessBaseAPI* handle, const TessPageIteratorLevel level, const BOOL text_only, - const BOOL raw_image, const int raw_padding, - struct Pixa** pixa, int** blockids, int** paraids); + TESS_CALL TessBaseAPIGetComponentImages1(TessBaseAPI* handle, const TessPageIteratorLevel level, const BOOL text_only, + const BOOL raw_image, const int raw_padding, + struct Pixa** pixa, int** blockids, int** paraids); TESS_API int TESS_CALL TessBaseAPIGetThresholdedImageScaleFactor(const TessBaseAPI* handle); @@ -405,13 +405,13 @@ TESS_API float TESS_CALL TessChoiceIteratorConfidence(const TessChoiceIterator* /* Progress monitor */ TESS_API ETEXT_DESC* TESS_CALL TessMonitorCreate(); -TESS_API void TESS_CALL TessMonitorDelete( ETEXT_DESC* monitor ); -TESS_API void TESS_CALL TessMonitorSetCancelFunc( ETEXT_DESC* monitor, TessCancelFunc cancelFunc ); -TESS_API void TESS_CALL TessMonitorSetCancelThis( ETEXT_DESC* monitor, void* cancelThis ); -TESS_API void* TESS_CALL TessMonitorGetCancelThis( ETEXT_DESC* monitor ); -TESS_API void TESS_CALL TessMonitorSetProgressFunc( ETEXT_DESC* monitor, TessProgressFunc progressFunc ); -TESS_API int TESS_CALL TessMonitorGetProgress( ETEXT_DESC* monitor ); -TESS_API void TESS_CALL TessMonitorSetDeadlineMSecs( ETEXT_DESC* monitor, int deadline ); +TESS_API void TESS_CALL TessMonitorDelete(ETEXT_DESC* monitor); +TESS_API void TESS_CALL TessMonitorSetCancelFunc(ETEXT_DESC* monitor, TessCancelFunc cancelFunc); +TESS_API void TESS_CALL TessMonitorSetCancelThis(ETEXT_DESC* monitor, void* cancelThis); +TESS_API void* TESS_CALL TessMonitorGetCancelThis(ETEXT_DESC* monitor); +TESS_API void TESS_CALL TessMonitorSetProgressFunc(ETEXT_DESC* monitor, TessProgressFunc progressFunc); +TESS_API int TESS_CALL TessMonitorGetProgress(ETEXT_DESC* monitor); +TESS_API void TESS_CALL TessMonitorSetDeadlineMSecs(ETEXT_DESC* monitor, int deadline); #ifndef DISABLED_LEGACY_ENGINE diff --git a/src/ccstruct/statistc.cpp b/src/ccstruct/statistc.cpp index 93a5489eab..f530e8116e 100644 --- a/src/ccstruct/statistc.cpp +++ b/src/ccstruct/statistc.cpp @@ -593,7 +593,7 @@ void STATS::plot(ScrollView* window, // to draw in window->Pen(colour); for (int index = 0; index < rangemax_ - rangemin_; index++) { - window->Rectangle( xorigin + xscale * index, yorigin, + window->Rectangle(xorigin + xscale * index, yorigin, xorigin + xscale * (index + 1), yorigin + yscale * buckets_[index]); } diff --git a/src/ccstruct/statistc.h b/src/ccstruct/statistc.h index 2deca4f0a8..b2a036dda3 100644 --- a/src/ccstruct/statistc.h +++ b/src/ccstruct/statistc.h @@ -75,7 +75,7 @@ class STATS { // between 6 and 13 = 9.5 double median() const; // get median of samples // Returns the count of the given value. - int32_t pile_count(int32_t value ) const { + int32_t pile_count(int32_t value) const { if (value <= rangemin_) return buckets_[0]; if (value >= rangemax_ - 1) diff --git a/src/ccutil/clst.h b/src/ccutil/clst.h index c87e9e78bb..cad132b0a9 100644 --- a/src/ccutil/clst.h +++ b/src/ccutil/clst.h @@ -782,10 +782,10 @@ inline void CLIST_ITERATOR::add_to_end( // element to add Replace with "". may be an arbitrary number of tokens ***********************************************************************/ -#define QUOTE_IT( parm ) #parm +#define QUOTE_IT(parm) #parm /*********************************************************************** - CLISTIZE( CLASSNAME ) MACRO DEFINITION + CLISTIZE(CLASSNAME) MACRO DEFINITION ====================================== CLASSNAME is assumed to be the name of a class to be used in a CONS list @@ -810,7 +810,7 @@ The ...IZE macros define the code use in .c files ***********************************************************************/ /*********************************************************************** - CLISTIZEH( CLASSNAME ) MACRO + CLISTIZEH(CLASSNAME) MACRO CLISTIZEH is a concatenation of 3 fragments CLISTIZEH_A, CLISTIZEH_B and CLISTIZEH_C. @@ -907,7 +907,7 @@ CLISTIZEH_C. CLISTIZEH_C(CLASSNAME) /*********************************************************************** - CLISTIZE( CLASSNAME ) MACRO + CLISTIZE(CLASSNAME) MACRO ***********************************************************************/ #define CLISTIZE(CLASSNAME) \ diff --git a/src/ccutil/elst.h b/src/ccutil/elst.h index 15531cfb97..78714ef17b 100644 --- a/src/ccutil/elst.h +++ b/src/ccutil/elst.h @@ -826,10 +826,10 @@ inline void ELIST_ITERATOR::add_to_end( // element to add Replace with "". may be an arbitrary number of tokens ***********************************************************************/ -#define QUOTE_IT( parm ) #parm +#define QUOTE_IT(parm) #parm /*********************************************************************** - ELISTIZE( CLASSNAME ) MACRO + ELISTIZE(CLASSNAME) MACRO ============================ CLASSNAME is assumed to be the name of a class which has a baseclass of @@ -852,7 +852,7 @@ The ...IZE macros define the code use in .c files ***********************************************************************/ /*********************************************************************** - ELISTIZEH( CLASSNAME ) MACRO + ELISTIZEH(CLASSNAME) MACRO ELISTIZEH is a concatenation of 3 fragments ELISTIZEH_A, ELISTIZEH_B and ELISTIZEH_C. @@ -893,10 +893,10 @@ private: \ DONT_CONSTRUCT_LIST_BY_COPY.error(QUOTE_IT(CLASSNAME##_LIST), ABORT, nullptr);\ } \ void operator=(const CLASSNAME##_LIST&) { \ - DONT_ASSIGN_LISTS.error(QUOTE_IT(CLASSNAME##_LIST), ABORT, nullptr ); \ + DONT_ASSIGN_LISTS.error(QUOTE_IT(CLASSNAME##_LIST), ABORT, nullptr); \ } \ -#define ELISTIZEH_C( CLASSNAME ) \ +#define ELISTIZEH_C(CLASSNAME) \ }; \ \ \ @@ -945,17 +945,17 @@ class DLLSYM CLASSNAME##_IT : public ELIST_ITERATOR { \ } \ }; -#define ELISTIZEH( CLASSNAME ) \ +#define ELISTIZEH(CLASSNAME) \ \ -ELISTIZEH_A( CLASSNAME ) \ +ELISTIZEH_A(CLASSNAME) \ \ -ELISTIZEH_B( CLASSNAME ) \ +ELISTIZEH_B(CLASSNAME) \ \ -ELISTIZEH_C( CLASSNAME ) +ELISTIZEH_C(CLASSNAME) /*********************************************************************** - ELISTIZE( CLASSNAME ) MACRO + ELISTIZE(CLASSNAME) MACRO ***********************************************************************/ #define ELISTIZE(CLASSNAME) \ diff --git a/src/ccutil/elst2.cpp b/src/ccutil/elst2.cpp index 6a9f4387fa..cb719078d5 100644 --- a/src/ccutil/elst2.cpp +++ b/src/ccutil/elst2.cpp @@ -102,7 +102,7 @@ int32_t ELIST2::length() const { // count elements * * Sort elements on list * NB If you don't like the const declarations in the comparator, coerce yours: - * ( int (*)(const void *, const void *) + * (int (*)(const void *, const void *) **********************************************************************/ void diff --git a/src/ccutil/elst2.h b/src/ccutil/elst2.h index 5431097072..f119ed6a88 100644 --- a/src/ccutil/elst2.h +++ b/src/ccutil/elst2.h @@ -824,10 +824,10 @@ inline void ELIST2_ITERATOR::add_to_end( // element to add Replace with "". may be an arbitrary number of tokens ***********************************************************************/ -#define QUOTE_IT( parm ) #parm +#define QUOTE_IT(parm) #parm /*********************************************************************** - ELIST2IZE( CLASSNAME ) MACRO DEFINITION + ELIST2IZE(CLASSNAME) MACRO DEFINITION ====================================== CLASSNAME is assumed to be the name of a class which has a baseclass of @@ -851,7 +851,7 @@ The ...IZE macros define the code use in .c files ***********************************************************************/ /*********************************************************************** - ELIST2IZEH( CLASSNAME ) MACRO + ELIST2IZEH(CLASSNAME) MACRO ELIST2IZEH is a concatenation of 3 fragments ELIST2IZEH_A, ELIST2IZEH_B and ELIST2IZEH_C. @@ -955,7 +955,7 @@ ELIST2IZEH_C. ELIST2IZEH_C(CLASSNAME) /*********************************************************************** - ELIST2IZE( CLASSNAME ) MACRO + ELIST2IZE(CLASSNAME) MACRO ***********************************************************************/ #define ELIST2IZE(CLASSNAME) \ diff --git a/src/ccutil/ocrclass.h b/src/ccutil/ocrclass.h index 6d9d7a8596..77272c4b79 100644 --- a/src/ccutil/ocrclass.h +++ b/src/ccutil/ocrclass.h @@ -142,7 +142,7 @@ class ETEXT_DESC { // output header err_code(0), cancel(nullptr), progress_callback(nullptr), - progress_callback2( &default_progress_func ), + progress_callback2(&default_progress_func), cancel_this(nullptr) { end_time.tv_sec = 0; end_time.tv_usec = 0; @@ -173,7 +173,7 @@ class ETEXT_DESC { // output header static bool default_progress_func(ETEXT_DESC* ths, int left, int right, int top, int bottom) { - if ( ths->progress_callback ) { + if (ths->progress_callback) { return (*(ths->progress_callback))(ths->progress, left, right, top, bottom); } return true; diff --git a/src/ccutil/scanutils.cpp b/src/ccutil/scanutils.cpp index 5dbcc4a07e..f74094b0bf 100644 --- a/src/ccutil/scanutils.cpp +++ b/src/ccutil/scanutils.cpp @@ -360,7 +360,7 @@ static int tvfscanf(FILE* stream, const char *format, va_list ap) { scan_int: q = SkipSpace(stream); - if ( q <= 0 ) { + if (q <= 0) { bail = BAIL_EOF; break; } @@ -471,7 +471,7 @@ static int tvfscanf(FILE* stream, const char *format, va_list ap) { break; case '%': // %% sequence - if (fgetc(stream) != '%' ) + if (fgetc(stream) != '%') bail = BAIL_ERR; break; diff --git a/src/ccutil/serialis.h b/src/ccutil/serialis.h index c8c755ce85..9f7f6a6ac2 100644 --- a/src/ccutil/serialis.h +++ b/src/ccutil/serialis.h @@ -34,7 +34,7 @@ class STRING; Replace with "". may be an arbitrary number of tokens ***********************************************************************/ -#define QUOTE_IT( parm ) #parm +#define QUOTE_IT(parm) #parm namespace tesseract { diff --git a/src/ccutil/tesscallback.h b/src/ccutil/tesscallback.h index 2bfd831706..26865ab9e7 100644 --- a/src/ccutil/tesscallback.h +++ b/src/ccutil/tesscallback.h @@ -185,7 +185,7 @@ class _TessMemberResultCallback_0_0 template inline typename _TessMemberResultCallback_0_0::base* NewTessCallback( - T1* obj, R (T2::*member)() ) { + T1* obj, R (T2::*member)()) { return new _TessMemberResultCallback_0_0( obj, member); } @@ -195,7 +195,7 @@ NewTessCallback( template inline typename _TessMemberResultCallback_0_0::base* NewPermanentTessCallback( - T1* obj, R (T2::*member)() ) { + T1* obj, R (T2::*member)()) { return new _TessMemberResultCallback_0_0( obj, member); } @@ -370,7 +370,7 @@ class _TessMemberResultCallback_1_0 : public TessResultCallback { typename remove_reference::type p1_; public: - inline _TessMemberResultCallback_1_0( T* object, MemberSignature member, P1 p1) + inline _TessMemberResultCallback_1_0(T* object, MemberSignature member, P1 p1) : object_(object), member_(member), p1_(p1) { } @@ -400,7 +400,7 @@ class _TessMemberResultCallback_1_0 : public TessClosure { typename remove_reference::type p1_; public: - inline _TessMemberResultCallback_1_0( T* object, MemberSignature member, P1 p1) + inline _TessMemberResultCallback_1_0(T* object, MemberSignature member, P1 p1) : object_(object), member_(member), p1_(p1) { } @@ -419,7 +419,7 @@ class _TessMemberResultCallback_1_0 : public TessClosure { #ifndef SWIG template inline typename _TessMemberResultCallback_1_0::base* -NewTessCallback( T1* obj, R (T2::*member)(P1) , typename Identity::type p1) { +NewTessCallback(T1* obj, R (T2::*member)(P1) , typename Identity::type p1) { return new _TessMemberResultCallback_1_0(obj, member, p1); } #endif @@ -427,7 +427,7 @@ NewTessCallback( T1* obj, R (T2::*member)(P1) , typename Identity::type p1) #ifndef SWIG template inline typename _TessMemberResultCallback_1_0::base* -NewPermanentTessCallback( T1* obj, R (T2::*member)(P1) , typename Identity::type p1) { +NewPermanentTessCallback(T1* obj, R (T2::*member)(P1) , typename Identity::type p1) { return new _TessMemberResultCallback_1_0(obj, member, p1); } #endif @@ -588,7 +588,7 @@ class _TessMemberResultCallback_2_0 : public TessResultCallback { typename remove_reference::type p2_; public: - inline _TessMemberResultCallback_2_0( T* object, MemberSignature member, P1 p1, P2 p2) + inline _TessMemberResultCallback_2_0(T* object, MemberSignature member, P1 p1, P2 p2) : object_(object), member_(member), p1_(p1), p2_(p2) { } @@ -619,7 +619,7 @@ class _TessMemberResultCallback_2_0 : public TessClosure { typename remove_reference::type p2_; public: - inline _TessMemberResultCallback_2_0( T* object, MemberSignature member, P1 p1, P2 p2) + inline _TessMemberResultCallback_2_0(T* object, MemberSignature member, P1 p1, P2 p2) : object_(object), member_(member), p1_(p1), p2_(p2) { } @@ -639,7 +639,7 @@ class _TessMemberResultCallback_2_0 : public TessClosure { #ifndef SWIG template inline typename _TessMemberResultCallback_2_0::base* -NewTessCallback( T1* obj, R (T2::*member)(P1,P2) , typename Identity::type p1, typename Identity::type p2) { +NewTessCallback(T1* obj, R (T2::*member)(P1,P2) , typename Identity::type p1, typename Identity::type p2) { return new _TessMemberResultCallback_2_0(obj, member, p1, p2); } #endif @@ -647,7 +647,7 @@ NewTessCallback( T1* obj, R (T2::*member)(P1,P2) , typename Identity::type p #ifndef SWIG template inline typename _TessMemberResultCallback_2_0::base* -NewPermanentTessCallback( T1* obj, R (T2::*member)(P1,P2) , typename Identity::type p1, typename Identity::type p2) { +NewPermanentTessCallback(T1* obj, R (T2::*member)(P1,P2) , typename Identity::type p1, typename Identity::type p2) { return new _TessMemberResultCallback_2_0(obj, member, p1, p2); } #endif @@ -814,7 +814,7 @@ class _TessMemberResultCallback_3_0 : public TessResultCallback { typename remove_reference::type p3_; public: - inline _TessMemberResultCallback_3_0( T* object, MemberSignature member, P1 p1, P2 p2, P3 p3) + inline _TessMemberResultCallback_3_0(T* object, MemberSignature member, P1 p1, P2 p2, P3 p3) : object_(object), member_(member), p1_(p1), p2_(p2), p3_(p3) { } @@ -846,7 +846,7 @@ class _TessMemberResultCallback_3_0 : public TessClosu typename remove_reference::type p3_; public: - inline _TessMemberResultCallback_3_0( T* object, MemberSignature member, P1 p1, P2 p2, P3 p3) + inline _TessMemberResultCallback_3_0(T* object, MemberSignature member, P1 p1, P2 p2, P3 p3) : object_(object), member_(member), p1_(p1), p2_(p2), p3_(p3) { } @@ -865,7 +865,7 @@ class _TessMemberResultCallback_3_0 : public TessClosu #ifndef SWIG template inline typename _TessMemberResultCallback_3_0::base* -NewTessCallback( T1* obj, R (T2::*member)(P1,P2,P3) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3) { +NewTessCallback(T1* obj, R (T2::*member)(P1,P2,P3) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3) { return new _TessMemberResultCallback_3_0(obj, member, p1, p2, p3); } #endif @@ -873,7 +873,7 @@ NewTessCallback( T1* obj, R (T2::*member)(P1,P2,P3) , typename Identity::typ #ifndef SWIG template inline typename _TessMemberResultCallback_3_0::base* -NewPermanentTessCallback( T1* obj, R (T2::*member)(P1,P2,P3) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3) { +NewPermanentTessCallback(T1* obj, R (T2::*member)(P1,P2,P3) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3) { return new _TessMemberResultCallback_3_0(obj, member, p1, p2, p3); } #endif @@ -1043,7 +1043,7 @@ class _TessMemberResultCallback_4_0 : public TessResultCallback { typename remove_reference::type p4_; public: - inline _TessMemberResultCallback_4_0( T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4) + inline _TessMemberResultCallback_4_0(T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4) : object_(object), member_(member), p1_(p1), p2_(p2), p3_(p3), p4_(p4) { } @@ -1076,7 +1076,7 @@ class _TessMemberResultCallback_4_0 : public TessC typename remove_reference::type p4_; public: - inline _TessMemberResultCallback_4_0( T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4) + inline _TessMemberResultCallback_4_0(T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4) : object_(object), member_(member), p1_(p1), p2_(p2), p3_(p3), p4_(p4) { } @@ -1095,7 +1095,7 @@ class _TessMemberResultCallback_4_0 : public TessC #ifndef SWIG template inline typename _TessMemberResultCallback_4_0::base* -NewTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4) { +NewTessCallback(T1* obj, R (T2::*member)(P1,P2,P3,P4) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4) { return new _TessMemberResultCallback_4_0(obj, member, p1, p2, p3, p4); } #endif @@ -1103,7 +1103,7 @@ NewTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4) , typename Identity:: #ifndef SWIG template inline typename _TessMemberResultCallback_4_0::base* -NewPermanentTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4) { +NewPermanentTessCallback(T1* obj, R (T2::*member)(P1,P2,P3,P4) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4) { return new _TessMemberResultCallback_4_0(obj, member, p1, p2, p3, p4); } #endif @@ -1278,7 +1278,7 @@ class _TessMemberResultCallback_5_0 : public TessResultCallback { typename remove_reference::type p5_; public: - inline _TessMemberResultCallback_5_0( T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5) + inline _TessMemberResultCallback_5_0(T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5) : object_(object), member_(member), p1_(p1), p2_(p2), p3_(p3), p4_(p4), p5_(p5) { } @@ -1312,7 +1312,7 @@ class _TessMemberResultCallback_5_0 : public T typename remove_reference::type p5_; public: - inline _TessMemberResultCallback_5_0( T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5) + inline _TessMemberResultCallback_5_0(T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5) : object_(object), member_(member), p1_(p1), p2_(p2), p3_(p3), p4_(p4), p5_(p5) { } @@ -1331,7 +1331,7 @@ class _TessMemberResultCallback_5_0 : public T #ifndef SWIG template inline typename _TessMemberResultCallback_5_0::base* -NewTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4,P5) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4, typename Identity::type p5) { +NewTessCallback(T1* obj, R (T2::*member)(P1,P2,P3,P4,P5) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4, typename Identity::type p5) { return new _TessMemberResultCallback_5_0(obj, member, p1, p2, p3, p4, p5); } #endif @@ -1339,7 +1339,7 @@ NewTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4,P5) , typename Identity inline typename _TessMemberResultCallback_5_0::base* -NewPermanentTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4,P5) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4, typename Identity::type p5) { +NewPermanentTessCallback(T1* obj, R (T2::*member)(P1,P2,P3,P4,P5) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4, typename Identity::type p5) { return new _TessMemberResultCallback_5_0(obj, member, p1, p2, p3, p4, p5); } #endif @@ -1519,7 +1519,7 @@ class _TessMemberResultCallback_6_0 : public TessResultCallback { typename remove_reference::type p6_; public: - inline _TessMemberResultCallback_6_0( T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6) + inline _TessMemberResultCallback_6_0(T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6) : object_(object), member_(member), p1_(p1), p2_(p2), p3_(p3), p4_(p4), p5_(p5), p6_(p6) { } @@ -1554,7 +1554,7 @@ class _TessMemberResultCallback_6_0 : publ typename remove_reference::type p6_; public: - inline _TessMemberResultCallback_6_0( T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6) + inline _TessMemberResultCallback_6_0(T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6) : object_(object), member_(member), p1_(p1), p2_(p2), p3_(p3), p4_(p4), p5_(p5), p6_(p6) { } @@ -1573,7 +1573,7 @@ class _TessMemberResultCallback_6_0 : publ #ifndef SWIG template inline typename _TessMemberResultCallback_6_0::base* -NewTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,P6) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4, typename Identity::type p5, typename Identity::type p6) { +NewTessCallback(T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,P6) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4, typename Identity::type p5, typename Identity::type p6) { return new _TessMemberResultCallback_6_0(obj, member, p1, p2, p3, p4, p5, p6); } #endif @@ -1581,7 +1581,7 @@ NewTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,P6) , typename Identity #ifndef SWIG template inline typename _TessMemberResultCallback_6_0::base* -NewPermanentTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,P6) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4, typename Identity::type p5, typename Identity::type p6) { +NewPermanentTessCallback(T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,P6) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4, typename Identity::type p5, typename Identity::type p6) { return new _TessMemberResultCallback_6_0(obj, member, p1, p2, p3, p4, p5, p6); } #endif @@ -1865,7 +1865,7 @@ class _TessMemberResultCallback_0_1 template inline typename _TessMemberResultCallback_0_1::base* NewTessCallback( - T1* obj, R (T2::*member)(A1) ) { + T1* obj, R (T2::*member)(A1)) { return new _TessMemberResultCallback_0_1( obj, member); } @@ -1875,7 +1875,7 @@ NewTessCallback( template inline typename _TessMemberResultCallback_0_1::base* NewPermanentTessCallback( - T1* obj, R (T2::*member)(A1) ) { + T1* obj, R (T2::*member)(A1)) { return new _TessMemberResultCallback_0_1( obj, member); } @@ -2036,7 +2036,7 @@ class _TessMemberResultCallback_1_1 : public TessResultCallback1 { typename remove_reference::type p1_; public: - inline _TessMemberResultCallback_1_1( T* object, MemberSignature member, P1 p1) + inline _TessMemberResultCallback_1_1(T* object, MemberSignature member, P1 p1) : object_(object), member_(member), p1_(p1) { } @@ -2066,7 +2066,7 @@ class _TessMemberResultCallback_1_1 : public TessCallback1 typename remove_reference::type p1_; public: - inline _TessMemberResultCallback_1_1( T* object, MemberSignature member, P1 p1) + inline _TessMemberResultCallback_1_1(T* object, MemberSignature member, P1 p1) : object_(object), member_(member), p1_(p1) { } @@ -2085,7 +2085,7 @@ class _TessMemberResultCallback_1_1 : public TessCallback1 #ifndef SWIG template inline typename _TessMemberResultCallback_1_1::base* -NewTessCallback( T1* obj, R (T2::*member)(P1,A1) , typename Identity::type p1) { +NewTessCallback(T1* obj, R (T2::*member)(P1,A1) , typename Identity::type p1) { return new _TessMemberResultCallback_1_1(obj, member, p1); } #endif @@ -2093,7 +2093,7 @@ NewTessCallback( T1* obj, R (T2::*member)(P1,A1) , typename Identity::type p #ifndef SWIG template inline typename _TessMemberResultCallback_1_1::base* -NewPermanentTessCallback( T1* obj, R (T2::*member)(P1,A1) , typename Identity::type p1) { +NewPermanentTessCallback(T1* obj, R (T2::*member)(P1,A1) , typename Identity::type p1) { return new _TessMemberResultCallback_1_1(obj, member, p1); } #endif @@ -2253,7 +2253,7 @@ class _TessMemberResultCallback_2_1 : public TessResultCallback1 { typename remove_reference::type p2_; public: - inline _TessMemberResultCallback_2_1( T* object, MemberSignature member, P1 p1, P2 p2) + inline _TessMemberResultCallback_2_1(T* object, MemberSignature member, P1 p1, P2 p2) : object_(object), member_(member), p1_(p1), p2_(p2) { } @@ -2284,7 +2284,7 @@ class _TessMemberResultCallback_2_1 : public TessCallb typename remove_reference::type p2_; public: - inline _TessMemberResultCallback_2_1( T* object, MemberSignature member, P1 p1, P2 p2) + inline _TessMemberResultCallback_2_1(T* object, MemberSignature member, P1 p1, P2 p2) : object_(object), member_(member), p1_(p1), p2_(p2) { } @@ -2303,7 +2303,7 @@ class _TessMemberResultCallback_2_1 : public TessCallb #ifndef SWIG template inline typename _TessMemberResultCallback_2_1::base* -NewTessCallback( T1* obj, R (T2::*member)(P1,P2,A1) , typename Identity::type p1, typename Identity::type p2) { +NewTessCallback(T1* obj, R (T2::*member)(P1,P2,A1) , typename Identity::type p1, typename Identity::type p2) { return new _TessMemberResultCallback_2_1(obj, member, p1, p2); } #endif @@ -2311,7 +2311,7 @@ NewTessCallback( T1* obj, R (T2::*member)(P1,P2,A1) , typename Identity::typ #ifndef SWIG template inline typename _TessMemberResultCallback_2_1::base* -NewPermanentTessCallback( T1* obj, R (T2::*member)(P1,P2,A1) , typename Identity::type p1, typename Identity::type p2) { +NewPermanentTessCallback(T1* obj, R (T2::*member)(P1,P2,A1) , typename Identity::type p1, typename Identity::type p2) { return new _TessMemberResultCallback_2_1(obj, member, p1, p2); } #endif @@ -2476,7 +2476,7 @@ class _TessMemberResultCallback_3_1 : public TessResultCallback1 { typename remove_reference::type p3_; public: - inline _TessMemberResultCallback_3_1( T* object, MemberSignature member, P1 p1, P2 p2, P3 p3) + inline _TessMemberResultCallback_3_1(T* object, MemberSignature member, P1 p1, P2 p2, P3 p3) : object_(object), member_(member), p1_(p1), p2_(p2), p3_(p3) { } @@ -2508,7 +2508,7 @@ class _TessMemberResultCallback_3_1 : public TessC typename remove_reference::type p3_; public: - inline _TessMemberResultCallback_3_1( T* object, MemberSignature member, P1 p1, P2 p2, P3 p3) + inline _TessMemberResultCallback_3_1(T* object, MemberSignature member, P1 p1, P2 p2, P3 p3) : object_(object), member_(member), p1_(p1), p2_(p2), p3_(p3) { } @@ -2527,7 +2527,7 @@ class _TessMemberResultCallback_3_1 : public TessC #ifndef SWIG template inline typename _TessMemberResultCallback_3_1::base* -NewTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,A1) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3) { +NewTessCallback(T1* obj, R (T2::*member)(P1,P2,P3,A1) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3) { return new _TessMemberResultCallback_3_1(obj, member, p1, p2, p3); } #endif @@ -2535,7 +2535,7 @@ NewTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,A1) , typename Identity:: #ifndef SWIG template inline typename _TessMemberResultCallback_3_1::base* -NewPermanentTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,A1) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3) { +NewPermanentTessCallback(T1* obj, R (T2::*member)(P1,P2,P3,A1) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3) { return new _TessMemberResultCallback_3_1(obj, member, p1, p2, p3); } #endif @@ -2705,7 +2705,7 @@ class _TessMemberResultCallback_4_1 : public TessResultCallback1 { typename remove_reference::type p4_; public: - inline _TessMemberResultCallback_4_1( T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4) + inline _TessMemberResultCallback_4_1(T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4) : object_(object), member_(member), p1_(p1), p2_(p2), p3_(p3), p4_(p4) { } @@ -2738,7 +2738,7 @@ class _TessMemberResultCallback_4_1 : public T typename remove_reference::type p4_; public: - inline _TessMemberResultCallback_4_1( T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4) + inline _TessMemberResultCallback_4_1(T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4) : object_(object), member_(member), p1_(p1), p2_(p2), p3_(p3), p4_(p4) { } @@ -2757,7 +2757,7 @@ class _TessMemberResultCallback_4_1 : public T #ifndef SWIG template inline typename _TessMemberResultCallback_4_1::base* -NewTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4,A1) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4) { +NewTessCallback(T1* obj, R (T2::*member)(P1,P2,P3,P4,A1) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4) { return new _TessMemberResultCallback_4_1(obj, member, p1, p2, p3, p4); } #endif @@ -2765,7 +2765,7 @@ NewTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4,A1) , typename Identity inline typename _TessMemberResultCallback_4_1::base* -NewPermanentTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4,A1) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4) { +NewPermanentTessCallback(T1* obj, R (T2::*member)(P1,P2,P3,P4,A1) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4) { return new _TessMemberResultCallback_4_1(obj, member, p1, p2, p3, p4); } #endif @@ -2940,7 +2940,7 @@ class _TessMemberResultCallback_5_1 : public TessResultCallback1 { typename remove_reference::type p5_; public: - inline _TessMemberResultCallback_5_1( T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5) + inline _TessMemberResultCallback_5_1(T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5) : object_(object), member_(member), p1_(p1), p2_(p2), p3_(p3), p4_(p4), p5_(p5) { } @@ -2974,7 +2974,7 @@ class _TessMemberResultCallback_5_1 : publ typename remove_reference::type p5_; public: - inline _TessMemberResultCallback_5_1( T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5) + inline _TessMemberResultCallback_5_1(T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5) : object_(object), member_(member), p1_(p1), p2_(p2), p3_(p3), p4_(p4), p5_(p5) { } @@ -2993,7 +2993,7 @@ class _TessMemberResultCallback_5_1 : publ #ifndef SWIG template inline typename _TessMemberResultCallback_5_1::base* -NewTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,A1) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4, typename Identity::type p5) { +NewTessCallback(T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,A1) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4, typename Identity::type p5) { return new _TessMemberResultCallback_5_1(obj, member, p1, p2, p3, p4, p5); } #endif @@ -3001,7 +3001,7 @@ NewTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,A1) , typename Identity #ifndef SWIG template inline typename _TessMemberResultCallback_5_1::base* -NewPermanentTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,A1) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4, typename Identity::type p5) { +NewPermanentTessCallback(T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,A1) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4, typename Identity::type p5) { return new _TessMemberResultCallback_5_1(obj, member, p1, p2, p3, p4, p5); } #endif @@ -3181,7 +3181,7 @@ class _TessMemberResultCallback_6_1 : public TessResultCallback1 { typename remove_reference::type p6_; public: - inline _TessMemberResultCallback_6_1( T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6) + inline _TessMemberResultCallback_6_1(T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6) : object_(object), member_(member), p1_(p1), p2_(p2), p3_(p3), p4_(p4), p5_(p5), p6_(p6) { } @@ -3216,7 +3216,7 @@ class _TessMemberResultCallback_6_1 : typename remove_reference::type p6_; public: - inline _TessMemberResultCallback_6_1( T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6) + inline _TessMemberResultCallback_6_1(T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6) : object_(object), member_(member), p1_(p1), p2_(p2), p3_(p3), p4_(p4), p5_(p5), p6_(p6) { } @@ -3235,7 +3235,7 @@ class _TessMemberResultCallback_6_1 : #ifndef SWIG template inline typename _TessMemberResultCallback_6_1::base* -NewTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,P6,A1) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4, typename Identity::type p5, typename Identity::type p6) { +NewTessCallback(T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,P6,A1) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4, typename Identity::type p5, typename Identity::type p6) { return new _TessMemberResultCallback_6_1(obj, member, p1, p2, p3, p4, p5, p6); } #endif @@ -3243,7 +3243,7 @@ NewTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,P6,A1) , typename Ident #ifndef SWIG template inline typename _TessMemberResultCallback_6_1::base* -NewPermanentTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,P6,A1) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4, typename Identity::type p5, typename Identity::type p6) { +NewPermanentTessCallback(T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,P6,A1) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4, typename Identity::type p5, typename Identity::type p6) { return new _TessMemberResultCallback_6_1(obj, member, p1, p2, p3, p4, p5, p6); } #endif @@ -3470,7 +3470,7 @@ class _TessMemberResultCallback_0_2 template inline typename _TessMemberResultCallback_0_2::base* NewTessCallback( - T1* obj, R (T2::*member)(A1,A2) ) { + T1* obj, R (T2::*member)(A1,A2)) { return new _TessMemberResultCallback_0_2( obj, member); } @@ -3480,7 +3480,7 @@ NewTessCallback( template inline typename _TessMemberResultCallback_0_2::base* NewPermanentTessCallback( - T1* obj, R (T2::*member)(A1,A2) ) { + T1* obj, R (T2::*member)(A1,A2)) { return new _TessMemberResultCallback_0_2( obj, member); } @@ -3641,7 +3641,7 @@ class _TessMemberResultCallback_1_2 : public TessResultCallback2 { typename remove_reference::type p1_; public: - inline _TessMemberResultCallback_1_2( T* object, MemberSignature member, P1 p1) + inline _TessMemberResultCallback_1_2(T* object, MemberSignature member, P1 p1) : object_(object), member_(member), p1_(p1) { } @@ -3671,7 +3671,7 @@ class _TessMemberResultCallback_1_2 : public TessCallb typename remove_reference::type p1_; public: - inline _TessMemberResultCallback_1_2( T* object, MemberSignature member, P1 p1) + inline _TessMemberResultCallback_1_2(T* object, MemberSignature member, P1 p1) : object_(object), member_(member), p1_(p1) { } @@ -3690,7 +3690,7 @@ class _TessMemberResultCallback_1_2 : public TessCallb #ifndef SWIG template inline typename _TessMemberResultCallback_1_2::base* -NewTessCallback( T1* obj, R (T2::*member)(P1,A1,A2) , typename Identity::type p1) { +NewTessCallback(T1* obj, R (T2::*member)(P1,A1,A2) , typename Identity::type p1) { return new _TessMemberResultCallback_1_2(obj, member, p1); } #endif @@ -3698,7 +3698,7 @@ NewTessCallback( T1* obj, R (T2::*member)(P1,A1,A2) , typename Identity::typ #ifndef SWIG template inline typename _TessMemberResultCallback_1_2::base* -NewPermanentTessCallback( T1* obj, R (T2::*member)(P1,A1,A2) , typename Identity::type p1) { +NewPermanentTessCallback(T1* obj, R (T2::*member)(P1,A1,A2) , typename Identity::type p1) { return new _TessMemberResultCallback_1_2(obj, member, p1); } #endif @@ -3858,7 +3858,7 @@ class _TessMemberResultCallback_2_2 : public TessResultCallback2 { typename remove_reference::type p2_; public: - inline _TessMemberResultCallback_2_2( T* object, MemberSignature member, P1 p1, P2 p2) + inline _TessMemberResultCallback_2_2(T* object, MemberSignature member, P1 p1, P2 p2) : object_(object), member_(member), p1_(p1), p2_(p2) { } @@ -3889,7 +3889,7 @@ class _TessMemberResultCallback_2_2 : public TessC typename remove_reference::type p2_; public: - inline _TessMemberResultCallback_2_2( T* object, MemberSignature member, P1 p1, P2 p2) + inline _TessMemberResultCallback_2_2(T* object, MemberSignature member, P1 p1, P2 p2) : object_(object), member_(member), p1_(p1), p2_(p2) { } @@ -3908,7 +3908,7 @@ class _TessMemberResultCallback_2_2 : public TessC #ifndef SWIG template inline typename _TessMemberResultCallback_2_2::base* -NewTessCallback( T1* obj, R (T2::*member)(P1,P2,A1,A2) , typename Identity::type p1, typename Identity::type p2) { +NewTessCallback(T1* obj, R (T2::*member)(P1,P2,A1,A2) , typename Identity::type p1, typename Identity::type p2) { return new _TessMemberResultCallback_2_2(obj, member, p1, p2); } #endif @@ -3916,7 +3916,7 @@ NewTessCallback( T1* obj, R (T2::*member)(P1,P2,A1,A2) , typename Identity:: #ifndef SWIG template inline typename _TessMemberResultCallback_2_2::base* -NewPermanentTessCallback( T1* obj, R (T2::*member)(P1,P2,A1,A2) , typename Identity::type p1, typename Identity::type p2) { +NewPermanentTessCallback(T1* obj, R (T2::*member)(P1,P2,A1,A2) , typename Identity::type p1, typename Identity::type p2) { return new _TessMemberResultCallback_2_2(obj, member, p1, p2); } #endif @@ -4081,7 +4081,7 @@ class _TessMemberResultCallback_3_2 : public TessResultCallback2 { typename remove_reference::type p3_; public: - inline _TessMemberResultCallback_3_2( T* object, MemberSignature member, P1 p1, P2 p2, P3 p3) + inline _TessMemberResultCallback_3_2(T* object, MemberSignature member, P1 p1, P2 p2, P3 p3) : object_(object), member_(member), p1_(p1), p2_(p2), p3_(p3) { } @@ -4113,7 +4113,7 @@ class _TessMemberResultCallback_3_2 : public T typename remove_reference::type p3_; public: - inline _TessMemberResultCallback_3_2( T* object, MemberSignature member, P1 p1, P2 p2, P3 p3) + inline _TessMemberResultCallback_3_2(T* object, MemberSignature member, P1 p1, P2 p2, P3 p3) : object_(object), member_(member), p1_(p1), p2_(p2), p3_(p3) { } @@ -4132,7 +4132,7 @@ class _TessMemberResultCallback_3_2 : public T #ifndef SWIG template inline typename _TessMemberResultCallback_3_2::base* -NewTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,A1,A2) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3) { +NewTessCallback(T1* obj, R (T2::*member)(P1,P2,P3,A1,A2) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3) { return new _TessMemberResultCallback_3_2(obj, member, p1, p2, p3); } #endif @@ -4140,7 +4140,7 @@ NewTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,A1,A2) , typename Identity inline typename _TessMemberResultCallback_3_2::base* -NewPermanentTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,A1,A2) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3) { +NewPermanentTessCallback(T1* obj, R (T2::*member)(P1,P2,P3,A1,A2) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3) { return new _TessMemberResultCallback_3_2(obj, member, p1, p2, p3); } #endif @@ -4310,7 +4310,7 @@ class _TessMemberResultCallback_4_2 : public TessResultCallback2 { typename remove_reference::type p4_; public: - inline _TessMemberResultCallback_4_2( T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4) + inline _TessMemberResultCallback_4_2(T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4) : object_(object), member_(member), p1_(p1), p2_(p2), p3_(p3), p4_(p4) { } @@ -4343,7 +4343,7 @@ class _TessMemberResultCallback_4_2 : publ typename remove_reference::type p4_; public: - inline _TessMemberResultCallback_4_2( T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4) + inline _TessMemberResultCallback_4_2(T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4) : object_(object), member_(member), p1_(p1), p2_(p2), p3_(p3), p4_(p4) { } @@ -4362,7 +4362,7 @@ class _TessMemberResultCallback_4_2 : publ #ifndef SWIG template inline typename _TessMemberResultCallback_4_2::base* -NewTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4,A1,A2) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4) { +NewTessCallback(T1* obj, R (T2::*member)(P1,P2,P3,P4,A1,A2) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4) { return new _TessMemberResultCallback_4_2(obj, member, p1, p2, p3, p4); } #endif @@ -4370,7 +4370,7 @@ NewTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4,A1,A2) , typename Identity #ifndef SWIG template inline typename _TessMemberResultCallback_4_2::base* -NewPermanentTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4,A1,A2) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4) { +NewPermanentTessCallback(T1* obj, R (T2::*member)(P1,P2,P3,P4,A1,A2) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4) { return new _TessMemberResultCallback_4_2(obj, member, p1, p2, p3, p4); } #endif @@ -4545,7 +4545,7 @@ class _TessMemberResultCallback_5_2 : public TessResultCallback2 { typename remove_reference::type p5_; public: - inline _TessMemberResultCallback_5_2( T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5) + inline _TessMemberResultCallback_5_2(T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5) : object_(object), member_(member), p1_(p1), p2_(p2), p3_(p3), p4_(p4), p5_(p5) { } @@ -4579,7 +4579,7 @@ class _TessMemberResultCallback_5_2 : typename remove_reference::type p5_; public: - inline _TessMemberResultCallback_5_2( T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5) + inline _TessMemberResultCallback_5_2(T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5) : object_(object), member_(member), p1_(p1), p2_(p2), p3_(p3), p4_(p4), p5_(p5) { } @@ -4598,7 +4598,7 @@ class _TessMemberResultCallback_5_2 : #ifndef SWIG template inline typename _TessMemberResultCallback_5_2::base* -NewTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,A1,A2) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4, typename Identity::type p5) { +NewTessCallback(T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,A1,A2) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4, typename Identity::type p5) { return new _TessMemberResultCallback_5_2(obj, member, p1, p2, p3, p4, p5); } #endif @@ -4606,7 +4606,7 @@ NewTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,A1,A2) , typename Ident #ifndef SWIG template inline typename _TessMemberResultCallback_5_2::base* -NewPermanentTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,A1,A2) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4, typename Identity::type p5) { +NewPermanentTessCallback(T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,A1,A2) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4, typename Identity::type p5) { return new _TessMemberResultCallback_5_2(obj, member, p1, p2, p3, p4, p5); } #endif @@ -4786,7 +4786,7 @@ class _TessMemberResultCallback_6_2 : public TessResultCallback2 { typename remove_reference::type p6_; public: - inline _TessMemberResultCallback_6_2( T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6) + inline _TessMemberResultCallback_6_2(T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6) : object_(object), member_(member), p1_(p1), p2_(p2), p3_(p3), p4_(p4), p5_(p5), p6_(p6) { } @@ -4821,7 +4821,7 @@ class _TessMemberResultCallback_6_2::type p6_; public: - inline _TessMemberResultCallback_6_2( T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6) + inline _TessMemberResultCallback_6_2(T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6) : object_(object), member_(member), p1_(p1), p2_(p2), p3_(p3), p4_(p4), p5_(p5), p6_(p6) { } @@ -4840,7 +4840,7 @@ class _TessMemberResultCallback_6_2 inline typename _TessMemberResultCallback_6_2::base* -NewTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,P6,A1,A2) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4, typename Identity::type p5, typename Identity::type p6) { +NewTessCallback(T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,P6,A1,A2) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4, typename Identity::type p5, typename Identity::type p6) { return new _TessMemberResultCallback_6_2(obj, member, p1, p2, p3, p4, p5, p6); } #endif @@ -4848,7 +4848,7 @@ NewTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,P6,A1,A2) , typename Id #ifndef SWIG template inline typename _TessMemberResultCallback_6_2::base* -NewPermanentTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,P6,A1,A2) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4, typename Identity::type p5, typename Identity::type p6) { +NewPermanentTessCallback(T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,P6,A1,A2) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4, typename Identity::type p5, typename Identity::type p6) { return new _TessMemberResultCallback_6_2(obj, member, p1, p2, p3, p4, p5, p6); } #endif @@ -5075,7 +5075,7 @@ class _TessMemberResultCallback_0_3 template inline typename _TessMemberResultCallback_0_3::base* NewTessCallback( - T1* obj, R (T2::*member)(A1,A2,A3) ) { + T1* obj, R (T2::*member)(A1,A2,A3)) { return new _TessMemberResultCallback_0_3( obj, member); } @@ -5085,7 +5085,7 @@ NewTessCallback( template inline typename _TessMemberResultCallback_0_3::base* NewPermanentTessCallback( - T1* obj, R (T2::*member)(A1,A2,A3) ) { + T1* obj, R (T2::*member)(A1,A2,A3)) { return new _TessMemberResultCallback_0_3( obj, member); } @@ -5223,7 +5223,7 @@ class _ConstTessMemberResultCallback_1_3 #ifndef SWIG template inline typename _ConstTessMemberResultCallback_1_3::base* -NewTessCallback( T1* obj, R (T2::*member)(P1,A1,A2,A3) , typename Identity::type p1) { +NewTessCallback(T1* obj, R (T2::*member)(P1,A1,A2,A3) , typename Identity::type p1) { return new _ConstTessMemberResultCallback_1_3(obj, member, p1); } #endif @@ -5231,7 +5231,7 @@ NewTessCallback( T1* obj, R (T2::*member)(P1,A1,A2,A3) , typename Identity:: #ifndef SWIG template inline typename _ConstTessMemberResultCallback_1_3::base* -NewPermanentTessCallback( T1* obj, R (T2::*member)(P1,A1,A2,A3) , typename Identity::type p1) { +NewPermanentTessCallback(T1* obj, R (T2::*member)(P1,A1,A2,A3) , typename Identity::type p1) { return new _ConstTessMemberResultCallback_1_3(obj, member, p1); } #endif @@ -5298,7 +5298,7 @@ class _TessMemberResultCallback_1_3 #ifndef SWIG template inline typename _TessMemberResultCallback_1_3::base* -NewTessCallback( T1* obj, R (T2::*member)(P1,A1,A2,A3) , typename Identity::type p1) { +NewTessCallback(T1* obj, R (T2::*member)(P1,A1,A2,A3) , typename Identity::type p1) { return new _TessMemberResultCallback_1_3(obj, member, p1); } #endif @@ -5306,7 +5306,7 @@ NewTessCallback( T1* obj, R (T2::*member)(P1,A1,A2,A3) , typename Identity:: #ifndef SWIG template inline typename _TessMemberResultCallback_1_3::base* -NewPermanentTessCallback( T1* obj, R (T2::*member)(P1,A1,A2,A3) , typename Identity::type p1) { +NewPermanentTessCallback(T1* obj, R (T2::*member)(P1,A1,A2,A3) , typename Identity::type p1) { return new _TessMemberResultCallback_1_3(obj, member, p1); } #endif @@ -5467,7 +5467,7 @@ class _TessMemberResultCallback_2_3 : public TessResultCallback3 { typename remove_reference::type p2_; public: - inline _TessMemberResultCallback_2_3( T* object, MemberSignature member, P1 p1, P2 p2) + inline _TessMemberResultCallback_2_3(T* object, MemberSignature member, P1 p1, P2 p2) : object_(object), member_(member), p1_(p1), p2_(p2) { } @@ -5499,7 +5499,7 @@ class _TessMemberResultCallback_2_3 : public T typename remove_reference::type p2_; public: - inline _TessMemberResultCallback_2_3( T* object, MemberSignature member, P1 p1, P2 p2) + inline _TessMemberResultCallback_2_3(T* object, MemberSignature member, P1 p1, P2 p2) : object_(object), member_(member), p1_(p1), p2_(p2) { } @@ -5518,7 +5518,7 @@ class _TessMemberResultCallback_2_3 : public T #ifndef SWIG template inline typename _TessMemberResultCallback_2_3::base* -NewTessCallback( T1* obj, R (T2::*member)(P1,P2,A1,A2,A3) , typename Identity::type p1, typename Identity::type p2) { +NewTessCallback(T1* obj, R (T2::*member)(P1,P2,A1,A2,A3) , typename Identity::type p1, typename Identity::type p2) { return new _TessMemberResultCallback_2_3(obj, member, p1, p2); } #endif @@ -5526,7 +5526,7 @@ NewTessCallback( T1* obj, R (T2::*member)(P1,P2,A1,A2,A3) , typename Identity inline typename _TessMemberResultCallback_2_3::base* -NewPermanentTessCallback( T1* obj, R (T2::*member)(P1,P2,A1,A2,A3) , typename Identity::type p1, typename Identity::type p2) { +NewPermanentTessCallback(T1* obj, R (T2::*member)(P1,P2,A1,A2,A3) , typename Identity::type p1, typename Identity::type p2) { return new _TessMemberResultCallback_2_3(obj, member, p1, p2); } #endif @@ -5691,7 +5691,7 @@ class _TessMemberResultCallback_3_3 : public TessResultCallback3 { typename remove_reference::type p3_; public: - inline _TessMemberResultCallback_3_3( T* object, MemberSignature member, P1 p1, P2 p2, P3 p3) + inline _TessMemberResultCallback_3_3(T* object, MemberSignature member, P1 p1, P2 p2, P3 p3) : object_(object), member_(member), p1_(p1), p2_(p2), p3_(p3) { } @@ -5723,7 +5723,7 @@ class _TessMemberResultCallback_3_3 : publ typename remove_reference::type p3_; public: - inline _TessMemberResultCallback_3_3( T* object, MemberSignature member, P1 p1, P2 p2, P3 p3) + inline _TessMemberResultCallback_3_3(T* object, MemberSignature member, P1 p1, P2 p2, P3 p3) : object_(object), member_(member), p1_(p1), p2_(p2), p3_(p3) { } @@ -5742,7 +5742,7 @@ class _TessMemberResultCallback_3_3 : publ #ifndef SWIG template inline typename _TessMemberResultCallback_3_3::base* -NewTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,A1,A2,A3) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3) { +NewTessCallback(T1* obj, R (T2::*member)(P1,P2,P3,A1,A2,A3) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3) { return new _TessMemberResultCallback_3_3(obj, member, p1, p2, p3); } #endif @@ -5750,7 +5750,7 @@ NewTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,A1,A2,A3) , typename Identity #ifndef SWIG template inline typename _TessMemberResultCallback_3_3::base* -NewPermanentTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,A1,A2,A3) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3) { +NewPermanentTessCallback(T1* obj, R (T2::*member)(P1,P2,P3,A1,A2,A3) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3) { return new _TessMemberResultCallback_3_3(obj, member, p1, p2, p3); } #endif @@ -5920,7 +5920,7 @@ class _TessMemberResultCallback_4_3 : public TessResultCallback3 { typename remove_reference::type p4_; public: - inline _TessMemberResultCallback_4_3( T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4) + inline _TessMemberResultCallback_4_3(T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4) : object_(object), member_(member), p1_(p1), p2_(p2), p3_(p3), p4_(p4) { } @@ -5953,7 +5953,7 @@ class _TessMemberResultCallback_4_3 : typename remove_reference::type p4_; public: - inline _TessMemberResultCallback_4_3( T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4) + inline _TessMemberResultCallback_4_3(T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4) : object_(object), member_(member), p1_(p1), p2_(p2), p3_(p3), p4_(p4) { } @@ -5972,7 +5972,7 @@ class _TessMemberResultCallback_4_3 : #ifndef SWIG template inline typename _TessMemberResultCallback_4_3::base* -NewTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4,A1,A2,A3) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4) { +NewTessCallback(T1* obj, R (T2::*member)(P1,P2,P3,P4,A1,A2,A3) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4) { return new _TessMemberResultCallback_4_3(obj, member, p1, p2, p3, p4); } #endif @@ -5980,7 +5980,7 @@ NewTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4,A1,A2,A3) , typename Ident #ifndef SWIG template inline typename _TessMemberResultCallback_4_3::base* -NewPermanentTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4,A1,A2,A3) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4) { +NewPermanentTessCallback(T1* obj, R (T2::*member)(P1,P2,P3,P4,A1,A2,A3) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4) { return new _TessMemberResultCallback_4_3(obj, member, p1, p2, p3, p4); } #endif @@ -6155,7 +6155,7 @@ class _TessMemberResultCallback_5_3 : public TessResultCallback3 { typename remove_reference::type p5_; public: - inline _TessMemberResultCallback_5_3( T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5) + inline _TessMemberResultCallback_5_3(T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5) : object_(object), member_(member), p1_(p1), p2_(p2), p3_(p3), p4_(p4), p5_(p5) { } @@ -6189,7 +6189,7 @@ class _TessMemberResultCallback_5_3::type p5_; public: - inline _TessMemberResultCallback_5_3( T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5) + inline _TessMemberResultCallback_5_3(T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5) : object_(object), member_(member), p1_(p1), p2_(p2), p3_(p3), p4_(p4), p5_(p5) { } @@ -6208,7 +6208,7 @@ class _TessMemberResultCallback_5_3 inline typename _TessMemberResultCallback_5_3::base* -NewTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,A1,A2,A3) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4, typename Identity::type p5) { +NewTessCallback(T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,A1,A2,A3) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4, typename Identity::type p5) { return new _TessMemberResultCallback_5_3(obj, member, p1, p2, p3, p4, p5); } #endif @@ -6216,7 +6216,7 @@ NewTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,A1,A2,A3) , typename Id #ifndef SWIG template inline typename _TessMemberResultCallback_5_3::base* -NewPermanentTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,A1,A2,A3) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4, typename Identity::type p5) { +NewPermanentTessCallback(T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,A1,A2,A3) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4, typename Identity::type p5) { return new _TessMemberResultCallback_5_3(obj, member, p1, p2, p3, p4, p5); } #endif @@ -6396,7 +6396,7 @@ class _TessMemberResultCallback_6_3 : public TessResultCallback3 { typename remove_reference::type p6_; public: - inline _TessMemberResultCallback_6_3( T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6) + inline _TessMemberResultCallback_6_3(T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6) : object_(object), member_(member), p1_(p1), p2_(p2), p3_(p3), p4_(p4), p5_(p5), p6_(p6) { } @@ -6431,7 +6431,7 @@ class _TessMemberResultCallback_6_3::type p6_; public: - inline _TessMemberResultCallback_6_3( T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6) + inline _TessMemberResultCallback_6_3(T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6) : object_(object), member_(member), p1_(p1), p2_(p2), p3_(p3), p4_(p4), p5_(p5), p6_(p6) { } @@ -6450,7 +6450,7 @@ class _TessMemberResultCallback_6_3 inline typename _TessMemberResultCallback_6_3::base* -NewTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,P6,A1,A2,A3) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4, typename Identity::type p5, typename Identity::type p6) { +NewTessCallback(T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,P6,A1,A2,A3) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4, typename Identity::type p5, typename Identity::type p6) { return new _TessMemberResultCallback_6_3(obj, member, p1, p2, p3, p4, p5, p6); } #endif @@ -6458,7 +6458,7 @@ NewTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,P6,A1,A2,A3) , typename #ifndef SWIG template inline typename _TessMemberResultCallback_6_3::base* -NewPermanentTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,P6,A1,A2,A3) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4, typename Identity::type p5, typename Identity::type p6) { +NewPermanentTessCallback(T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,P6,A1,A2,A3) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4, typename Identity::type p5, typename Identity::type p6) { return new _TessMemberResultCallback_6_3(obj, member, p1, p2, p3, p4, p5, p6); } #endif @@ -6622,7 +6622,7 @@ class _TessMemberResultCallback_0_4 : public TessResultCallback4 MemberSignature member_; public: - inline _TessMemberResultCallback_0_4( T* object, MemberSignature member) + inline _TessMemberResultCallback_0_4(T* object, MemberSignature member) : object_(object), member_(member) { } @@ -6651,7 +6651,7 @@ class _TessMemberResultCallback_0_4 : public TessC MemberSignature member_; public: - inline _TessMemberResultCallback_0_4( T* object, MemberSignature member) + inline _TessMemberResultCallback_0_4(T* object, MemberSignature member) : object_(object), member_(member) { } @@ -6670,7 +6670,7 @@ class _TessMemberResultCallback_0_4 : public TessC #ifndef SWIG template inline typename _TessMemberResultCallback_0_4::base* -NewTessCallback( T1* obj, R (T2::*member)(A1,A2,A3,A4) ) { +NewTessCallback(T1* obj, R (T2::*member)(A1,A2,A3,A4)) { return new _TessMemberResultCallback_0_4(obj, member); } #endif @@ -6678,7 +6678,7 @@ NewTessCallback( T1* obj, R (T2::*member)(A1,A2,A3,A4) ) { #ifndef SWIG template inline typename _TessMemberResultCallback_0_4::base* -NewPermanentTessCallback( T1* obj, R (T2::*member)(A1,A2,A3,A4) ) { +NewPermanentTessCallback(T1* obj, R (T2::*member)(A1,A2,A3,A4)) { return new _TessMemberResultCallback_0_4(obj, member); } #endif @@ -6833,7 +6833,7 @@ class _TessMemberResultCallback_1_4 : public TessResultCallback4 typename remove_reference::type p1_; public: - inline _TessMemberResultCallback_1_4( T* object, MemberSignature member, P1 p1) + inline _TessMemberResultCallback_1_4(T* object, MemberSignature member, P1 p1) : object_(object), member_(member), p1_(p1) { } @@ -6863,7 +6863,7 @@ class _TessMemberResultCallback_1_4 : public T typename remove_reference::type p1_; public: - inline _TessMemberResultCallback_1_4( T* object, MemberSignature member, P1 p1) + inline _TessMemberResultCallback_1_4(T* object, MemberSignature member, P1 p1) : object_(object), member_(member), p1_(p1) { } @@ -6882,7 +6882,7 @@ class _TessMemberResultCallback_1_4 : public T #ifndef SWIG template inline typename _TessMemberResultCallback_1_4::base* -NewTessCallback( T1* obj, R (T2::*member)(P1,A1,A2,A3,A4) , typename Identity::type p1) { +NewTessCallback(T1* obj, R (T2::*member)(P1,A1,A2,A3,A4) , typename Identity::type p1) { return new _TessMemberResultCallback_1_4(obj, member, p1); } #endif @@ -6890,7 +6890,7 @@ NewTessCallback( T1* obj, R (T2::*member)(P1,A1,A2,A3,A4) , typename Identity inline typename _TessMemberResultCallback_1_4::base* -NewPermanentTessCallback( T1* obj, R (T2::*member)(P1,A1,A2,A3,A4) , typename Identity::type p1) { +NewPermanentTessCallback(T1* obj, R (T2::*member)(P1,A1,A2,A3,A4) , typename Identity::type p1) { return new _TessMemberResultCallback_1_4(obj, member, p1); } #endif @@ -7050,7 +7050,7 @@ class _TessMemberResultCallback_2_4 : public TessResultCallback4 typename remove_reference::type p2_; public: - inline _TessMemberResultCallback_2_4( T* object, MemberSignature member, P1 p1, P2 p2) + inline _TessMemberResultCallback_2_4(T* object, MemberSignature member, P1 p1, P2 p2) : object_(object), member_(member), p1_(p1), p2_(p2) { } @@ -7081,7 +7081,7 @@ class _TessMemberResultCallback_2_4 : publ typename remove_reference::type p2_; public: - inline _TessMemberResultCallback_2_4( T* object, MemberSignature member, P1 p1, P2 p2) + inline _TessMemberResultCallback_2_4(T* object, MemberSignature member, P1 p1, P2 p2) : object_(object), member_(member), p1_(p1), p2_(p2) { } @@ -7100,7 +7100,7 @@ class _TessMemberResultCallback_2_4 : publ #ifndef SWIG template inline typename _TessMemberResultCallback_2_4::base* -NewTessCallback( T1* obj, R (T2::*member)(P1,P2,A1,A2,A3,A4) , typename Identity::type p1, typename Identity::type p2) { +NewTessCallback(T1* obj, R (T2::*member)(P1,P2,A1,A2,A3,A4) , typename Identity::type p1, typename Identity::type p2) { return new _TessMemberResultCallback_2_4(obj, member, p1, p2); } #endif @@ -7108,7 +7108,7 @@ NewTessCallback( T1* obj, R (T2::*member)(P1,P2,A1,A2,A3,A4) , typename Identity #ifndef SWIG template inline typename _TessMemberResultCallback_2_4::base* -NewPermanentTessCallback( T1* obj, R (T2::*member)(P1,P2,A1,A2,A3,A4) , typename Identity::type p1, typename Identity::type p2) { +NewPermanentTessCallback(T1* obj, R (T2::*member)(P1,P2,A1,A2,A3,A4) , typename Identity::type p1, typename Identity::type p2) { return new _TessMemberResultCallback_2_4(obj, member, p1, p2); } #endif @@ -7273,7 +7273,7 @@ class _TessMemberResultCallback_3_4 : public TessResultCallback4 typename remove_reference::type p3_; public: - inline _TessMemberResultCallback_3_4( T* object, MemberSignature member, P1 p1, P2 p2, P3 p3) + inline _TessMemberResultCallback_3_4(T* object, MemberSignature member, P1 p1, P2 p2, P3 p3) : object_(object), member_(member), p1_(p1), p2_(p2), p3_(p3) { } @@ -7305,7 +7305,7 @@ class _TessMemberResultCallback_3_4 : typename remove_reference::type p3_; public: - inline _TessMemberResultCallback_3_4( T* object, MemberSignature member, P1 p1, P2 p2, P3 p3) + inline _TessMemberResultCallback_3_4(T* object, MemberSignature member, P1 p1, P2 p2, P3 p3) : object_(object), member_(member), p1_(p1), p2_(p2), p3_(p3) { } @@ -7324,7 +7324,7 @@ class _TessMemberResultCallback_3_4 : #ifndef SWIG template inline typename _TessMemberResultCallback_3_4::base* -NewTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,A1,A2,A3,A4) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3) { +NewTessCallback(T1* obj, R (T2::*member)(P1,P2,P3,A1,A2,A3,A4) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3) { return new _TessMemberResultCallback_3_4(obj, member, p1, p2, p3); } #endif @@ -7332,7 +7332,7 @@ NewTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,A1,A2,A3,A4) , typename Ident #ifndef SWIG template inline typename _TessMemberResultCallback_3_4::base* -NewPermanentTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,A1,A2,A3,A4) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3) { +NewPermanentTessCallback(T1* obj, R (T2::*member)(P1,P2,P3,A1,A2,A3,A4) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3) { return new _TessMemberResultCallback_3_4(obj, member, p1, p2, p3); } #endif @@ -7502,7 +7502,7 @@ class _TessMemberResultCallback_4_4 : public TessResultCallback4 typename remove_reference::type p4_; public: - inline _TessMemberResultCallback_4_4( T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4) + inline _TessMemberResultCallback_4_4(T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4) : object_(object), member_(member), p1_(p1), p2_(p2), p3_(p3), p4_(p4) { } @@ -7535,7 +7535,7 @@ class _TessMemberResultCallback_4_4::type p4_; public: - inline _TessMemberResultCallback_4_4( T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4) + inline _TessMemberResultCallback_4_4(T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4) : object_(object), member_(member), p1_(p1), p2_(p2), p3_(p3), p4_(p4) { } @@ -7554,7 +7554,7 @@ class _TessMemberResultCallback_4_4 inline typename _TessMemberResultCallback_4_4::base* -NewTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4,A1,A2,A3,A4) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4) { +NewTessCallback(T1* obj, R (T2::*member)(P1,P2,P3,P4,A1,A2,A3,A4) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4) { return new _TessMemberResultCallback_4_4(obj, member, p1, p2, p3, p4); } #endif @@ -7562,7 +7562,7 @@ NewTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4,A1,A2,A3,A4) , typename Id #ifndef SWIG template inline typename _TessMemberResultCallback_4_4::base* -NewPermanentTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4,A1,A2,A3,A4) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4) { +NewPermanentTessCallback(T1* obj, R (T2::*member)(P1,P2,P3,P4,A1,A2,A3,A4) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4) { return new _TessMemberResultCallback_4_4(obj, member, p1, p2, p3, p4); } #endif @@ -7737,7 +7737,7 @@ class _TessMemberResultCallback_5_4 : public TessResultCallback4 typename remove_reference::type p5_; public: - inline _TessMemberResultCallback_5_4( T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5) + inline _TessMemberResultCallback_5_4(T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5) : object_(object), member_(member), p1_(p1), p2_(p2), p3_(p3), p4_(p4), p5_(p5) { } @@ -7771,7 +7771,7 @@ class _TessMemberResultCallback_5_4::type p5_; public: - inline _TessMemberResultCallback_5_4( T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5) + inline _TessMemberResultCallback_5_4(T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5) : object_(object), member_(member), p1_(p1), p2_(p2), p3_(p3), p4_(p4), p5_(p5) { } @@ -7790,7 +7790,7 @@ class _TessMemberResultCallback_5_4 inline typename _TessMemberResultCallback_5_4::base* -NewTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,A1,A2,A3,A4) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4, typename Identity::type p5) { +NewTessCallback(T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,A1,A2,A3,A4) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4, typename Identity::type p5) { return new _TessMemberResultCallback_5_4(obj, member, p1, p2, p3, p4, p5); } #endif @@ -7798,7 +7798,7 @@ NewTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,A1,A2,A3,A4) , typename #ifndef SWIG template inline typename _TessMemberResultCallback_5_4::base* -NewPermanentTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,A1,A2,A3,A4) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4, typename Identity::type p5) { +NewPermanentTessCallback(T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,A1,A2,A3,A4) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4, typename Identity::type p5) { return new _TessMemberResultCallback_5_4(obj, member, p1, p2, p3, p4, p5); } #endif @@ -7978,7 +7978,7 @@ class _TessMemberResultCallback_6_4 : public TessResultCallback4 typename remove_reference::type p6_; public: - inline _TessMemberResultCallback_6_4( T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6) + inline _TessMemberResultCallback_6_4(T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6) : object_(object), member_(member), p1_(p1), p2_(p2), p3_(p3), p4_(p4), p5_(p5), p6_(p6) { } @@ -8013,7 +8013,7 @@ class _TessMemberResultCallback_6_4::type p6_; public: - inline _TessMemberResultCallback_6_4( T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6) + inline _TessMemberResultCallback_6_4(T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6) : object_(object), member_(member), p1_(p1), p2_(p2), p3_(p3), p4_(p4), p5_(p5), p6_(p6) { } @@ -8032,7 +8032,7 @@ class _TessMemberResultCallback_6_4 inline typename _TessMemberResultCallback_6_4::base* -NewTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,P6,A1,A2,A3,A4) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4, typename Identity::type p5, typename Identity::type p6) { +NewTessCallback(T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,P6,A1,A2,A3,A4) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4, typename Identity::type p5, typename Identity::type p6) { return new _TessMemberResultCallback_6_4(obj, member, p1, p2, p3, p4, p5, p6); } #endif @@ -8040,7 +8040,7 @@ NewTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,P6,A1,A2,A3,A4) , typen #ifndef SWIG template inline typename _TessMemberResultCallback_6_4::base* -NewPermanentTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,P6,A1,A2,A3,A4) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4, typename Identity::type p5, typename Identity::type p6) { +NewPermanentTessCallback(T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,P6,A1,A2,A3,A4) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4, typename Identity::type p5, typename Identity::type p6) { return new _TessMemberResultCallback_6_4(obj, member, p1, p2, p3, p4, p5, p6); } #endif @@ -8218,7 +8218,7 @@ class _TessMemberResultCallback_0_5 : public TessResultCallback5 : public T MemberSignature member_; public: - inline _TessMemberResultCallback_0_5( T* object, MemberSignature member) + inline _TessMemberResultCallback_0_5(T* object, MemberSignature member) : object_(object), member_(member) { } @@ -8266,7 +8266,7 @@ class _TessMemberResultCallback_0_5 : public T #ifndef SWIG template inline typename _TessMemberResultCallback_0_5::base* -NewTessCallback( T1* obj, R (T2::*member)(A1,A2,A3,A4,A5) ) { +NewTessCallback(T1* obj, R (T2::*member)(A1,A2,A3,A4,A5)) { return new _TessMemberResultCallback_0_5(obj, member); } #endif @@ -8274,7 +8274,7 @@ NewTessCallback( T1* obj, R (T2::*member)(A1,A2,A3,A4,A5) ) { #ifndef SWIG template inline typename _TessMemberResultCallback_0_5::base* -NewPermanentTessCallback( T1* obj, R (T2::*member)(A1,A2,A3,A4,A5) ) { +NewPermanentTessCallback(T1* obj, R (T2::*member)(A1,A2,A3,A4,A5)) { return new _TessMemberResultCallback_0_5(obj, member); } #endif @@ -8429,7 +8429,7 @@ class _TessMemberResultCallback_1_5 : public TessResultCallback5::type p1_; public: - inline _TessMemberResultCallback_1_5( T* object, MemberSignature member, P1 p1) + inline _TessMemberResultCallback_1_5(T* object, MemberSignature member, P1 p1) : object_(object), member_(member), p1_(p1) { } @@ -8459,7 +8459,7 @@ class _TessMemberResultCallback_1_5 : publ typename remove_reference::type p1_; public: - inline _TessMemberResultCallback_1_5( T* object, MemberSignature member, P1 p1) + inline _TessMemberResultCallback_1_5(T* object, MemberSignature member, P1 p1) : object_(object), member_(member), p1_(p1) { } @@ -8478,7 +8478,7 @@ class _TessMemberResultCallback_1_5 : publ #ifndef SWIG template inline typename _TessMemberResultCallback_1_5::base* -NewTessCallback( T1* obj, R (T2::*member)(P1,A1,A2,A3,A4,A5) , typename Identity::type p1) { +NewTessCallback(T1* obj, R (T2::*member)(P1,A1,A2,A3,A4,A5) , typename Identity::type p1) { return new _TessMemberResultCallback_1_5(obj, member, p1); } #endif @@ -8486,7 +8486,7 @@ NewTessCallback( T1* obj, R (T2::*member)(P1,A1,A2,A3,A4,A5) , typename Identity #ifndef SWIG template inline typename _TessMemberResultCallback_1_5::base* -NewPermanentTessCallback( T1* obj, R (T2::*member)(P1,A1,A2,A3,A4,A5) , typename Identity::type p1) { +NewPermanentTessCallback(T1* obj, R (T2::*member)(P1,A1,A2,A3,A4,A5) , typename Identity::type p1) { return new _TessMemberResultCallback_1_5(obj, member, p1); } #endif @@ -8646,7 +8646,7 @@ class _TessMemberResultCallback_2_5 : public TessResultCallback5::type p2_; public: - inline _TessMemberResultCallback_2_5( T* object, MemberSignature member, P1 p1, P2 p2) + inline _TessMemberResultCallback_2_5(T* object, MemberSignature member, P1 p1, P2 p2) : object_(object), member_(member), p1_(p1), p2_(p2) { } @@ -8677,7 +8677,7 @@ class _TessMemberResultCallback_2_5 : typename remove_reference::type p2_; public: - inline _TessMemberResultCallback_2_5( T* object, MemberSignature member, P1 p1, P2 p2) + inline _TessMemberResultCallback_2_5(T* object, MemberSignature member, P1 p1, P2 p2) : object_(object), member_(member), p1_(p1), p2_(p2) { } @@ -8696,7 +8696,7 @@ class _TessMemberResultCallback_2_5 : #ifndef SWIG template inline typename _TessMemberResultCallback_2_5::base* -NewTessCallback( T1* obj, R (T2::*member)(P1,P2,A1,A2,A3,A4,A5) , typename Identity::type p1, typename Identity::type p2) { +NewTessCallback(T1* obj, R (T2::*member)(P1,P2,A1,A2,A3,A4,A5) , typename Identity::type p1, typename Identity::type p2) { return new _TessMemberResultCallback_2_5(obj, member, p1, p2); } #endif @@ -8704,7 +8704,7 @@ NewTessCallback( T1* obj, R (T2::*member)(P1,P2,A1,A2,A3,A4,A5) , typename Ident #ifndef SWIG template inline typename _TessMemberResultCallback_2_5::base* -NewPermanentTessCallback( T1* obj, R (T2::*member)(P1,P2,A1,A2,A3,A4,A5) , typename Identity::type p1, typename Identity::type p2) { +NewPermanentTessCallback(T1* obj, R (T2::*member)(P1,P2,A1,A2,A3,A4,A5) , typename Identity::type p1, typename Identity::type p2) { return new _TessMemberResultCallback_2_5(obj, member, p1, p2); } #endif @@ -8869,7 +8869,7 @@ class _TessMemberResultCallback_3_5 : public TessResultCallback5::type p3_; public: - inline _TessMemberResultCallback_3_5( T* object, MemberSignature member, P1 p1, P2 p2, P3 p3) + inline _TessMemberResultCallback_3_5(T* object, MemberSignature member, P1 p1, P2 p2, P3 p3) : object_(object), member_(member), p1_(p1), p2_(p2), p3_(p3) { } @@ -8901,7 +8901,7 @@ class _TessMemberResultCallback_3_5::type p3_; public: - inline _TessMemberResultCallback_3_5( T* object, MemberSignature member, P1 p1, P2 p2, P3 p3) + inline _TessMemberResultCallback_3_5(T* object, MemberSignature member, P1 p1, P2 p2, P3 p3) : object_(object), member_(member), p1_(p1), p2_(p2), p3_(p3) { } @@ -8920,7 +8920,7 @@ class _TessMemberResultCallback_3_5 inline typename _TessMemberResultCallback_3_5::base* -NewTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,A1,A2,A3,A4,A5) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3) { +NewTessCallback(T1* obj, R (T2::*member)(P1,P2,P3,A1,A2,A3,A4,A5) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3) { return new _TessMemberResultCallback_3_5(obj, member, p1, p2, p3); } #endif @@ -8928,7 +8928,7 @@ NewTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,A1,A2,A3,A4,A5) , typename Id #ifndef SWIG template inline typename _TessMemberResultCallback_3_5::base* -NewPermanentTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,A1,A2,A3,A4,A5) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3) { +NewPermanentTessCallback(T1* obj, R (T2::*member)(P1,P2,P3,A1,A2,A3,A4,A5) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3) { return new _TessMemberResultCallback_3_5(obj, member, p1, p2, p3); } #endif @@ -9098,7 +9098,7 @@ class _TessMemberResultCallback_4_5 : public TessResultCallback5::type p4_; public: - inline _TessMemberResultCallback_4_5( T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4) + inline _TessMemberResultCallback_4_5(T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4) : object_(object), member_(member), p1_(p1), p2_(p2), p3_(p3), p4_(p4) { } @@ -9131,7 +9131,7 @@ class _TessMemberResultCallback_4_5::type p4_; public: - inline _TessMemberResultCallback_4_5( T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4) + inline _TessMemberResultCallback_4_5(T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4) : object_(object), member_(member), p1_(p1), p2_(p2), p3_(p3), p4_(p4) { } @@ -9150,7 +9150,7 @@ class _TessMemberResultCallback_4_5 inline typename _TessMemberResultCallback_4_5::base* -NewTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4,A1,A2,A3,A4,A5) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4) { +NewTessCallback(T1* obj, R (T2::*member)(P1,P2,P3,P4,A1,A2,A3,A4,A5) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4) { return new _TessMemberResultCallback_4_5(obj, member, p1, p2, p3, p4); } #endif @@ -9158,7 +9158,7 @@ NewTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4,A1,A2,A3,A4,A5) , typename #ifndef SWIG template inline typename _TessMemberResultCallback_4_5::base* -NewPermanentTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4,A1,A2,A3,A4,A5) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4) { +NewPermanentTessCallback(T1* obj, R (T2::*member)(P1,P2,P3,P4,A1,A2,A3,A4,A5) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4) { return new _TessMemberResultCallback_4_5(obj, member, p1, p2, p3, p4); } #endif @@ -9334,7 +9334,7 @@ class _TessMemberResultCallback_5_5 : public TessResultCallback5::type p5_; public: - inline _TessMemberResultCallback_5_5( T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5) + inline _TessMemberResultCallback_5_5(T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5) : object_(object), member_(member), p1_(p1), p2_(p2), p3_(p3), p4_(p4), p5_(p5) { } @@ -9368,7 +9368,7 @@ class _TessMemberResultCallback_5_5::type p5_; public: - inline _TessMemberResultCallback_5_5( T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5) + inline _TessMemberResultCallback_5_5(T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5) : object_(object), member_(member), p1_(p1), p2_(p2), p3_(p3), p4_(p4), p5_(p5) { } @@ -9387,7 +9387,7 @@ class _TessMemberResultCallback_5_5 inline typename _TessMemberResultCallback_5_5::base* -NewTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,A1,A2,A3,A4,A5) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4, typename Identity::type p5) { +NewTessCallback(T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,A1,A2,A3,A4,A5) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4, typename Identity::type p5) { return new _TessMemberResultCallback_5_5(obj, member, p1, p2, p3, p4, p5); } #endif @@ -9395,7 +9395,7 @@ NewTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,A1,A2,A3,A4,A5) , typen #ifndef SWIG template inline typename _TessMemberResultCallback_5_5::base* -NewPermanentTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,A1,A2,A3,A4,A5) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4, typename Identity::type p5) { +NewPermanentTessCallback(T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,A1,A2,A3,A4,A5) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4, typename Identity::type p5) { return new _TessMemberResultCallback_5_5(obj, member, p1, p2, p3, p4, p5); } #endif @@ -9575,7 +9575,7 @@ class _TessMemberResultCallback_6_5 : public TessResultCallback5::type p6_; public: - inline _TessMemberResultCallback_6_5( T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6) + inline _TessMemberResultCallback_6_5(T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6) : object_(object), member_(member), p1_(p1), p2_(p2), p3_(p3), p4_(p4), p5_(p5), p6_(p6) { } @@ -9610,7 +9610,7 @@ class _TessMemberResultCallback_6_5::type p6_; public: - inline _TessMemberResultCallback_6_5( T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6) + inline _TessMemberResultCallback_6_5(T* object, MemberSignature member, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6) : object_(object), member_(member), p1_(p1), p2_(p2), p3_(p3), p4_(p4), p5_(p5), p6_(p6) { } @@ -9629,7 +9629,7 @@ class _TessMemberResultCallback_6_5 inline typename _TessMemberResultCallback_6_5::base* -NewTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,P6,A1,A2,A3,A4,A5) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4, typename Identity::type p5, typename Identity::type p6) { +NewTessCallback(T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,P6,A1,A2,A3,A4,A5) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4, typename Identity::type p5, typename Identity::type p6) { return new _TessMemberResultCallback_6_5(obj, member, p1, p2, p3, p4, p5, p6); } #endif @@ -9637,7 +9637,7 @@ NewTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,P6,A1,A2,A3,A4,A5) , ty #ifndef SWIG template inline typename _TessMemberResultCallback_6_5::base* -NewPermanentTessCallback( T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,P6,A1,A2,A3,A4,A5) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4, typename Identity::type p5, typename Identity::type p6) { +NewPermanentTessCallback(T1* obj, R (T2::*member)(P1,P2,P3,P4,P5,P6,A1,A2,A3,A4,A5) , typename Identity::type p1, typename Identity::type p2, typename Identity::type p3, typename Identity::type p4, typename Identity::type p5, typename Identity::type p6) { return new _TessMemberResultCallback_6_5(obj, member, p1, p2, p3, p4, p5, p6); } #endif diff --git a/src/classify/cluster.cpp b/src/classify/cluster.cpp index 14ecf1be55..c7b569b8a3 100644 --- a/src/classify/cluster.cpp +++ b/src/classify/cluster.cpp @@ -204,7 +204,7 @@ typedef double (*SOLVEFUNC) (CHISTRUCT *, double); #define Odd(N) ((N)%2) #define Mirror(N,R) ((R) - (N) - 1) -#define Abs(N) ( ( (N) < 0 ) ? ( -(N) ) : (N) ) +#define Abs(N) (((N) < 0) ? (-(N)) : (N)) //--------------Global Data Definitions and Declarations---------------------- /** the following variables describe a discrete normal distribution @@ -477,7 +477,7 @@ SAMPLE* MakeSample(CLUSTERER * Clusterer, const float* Feature, Clusterer->NumChar = CharID + 1; // execute hook for monitoring clustering operation - // (*SampleCreationHook)( Sample ); + // (*SampleCreationHook)(Sample); return (Sample); } // MakeSample @@ -2233,7 +2233,7 @@ CHISTRUCT *NewChiStruct(uint16_t DegreesOfFreedom, double Alpha) { /** * This routine attempts to find an x value at which Function - * goes to zero (i.e. a root of the function ). It will only + * goes to zero (i.e. a root of the function). It will only * work correctly if a solution actually exists and there * are no extrema between the solution and the InitialGuess. * The algorithms used are extremely primitive. @@ -2242,7 +2242,7 @@ CHISTRUCT *NewChiStruct(uint16_t DegreesOfFreedom, double Alpha) { * @param FunctionParams arbitrary data to pass to function * @param InitialGuess point to start solution search at * @param Accuracy maximum allowed error - * @return Solution of function ( x for which f(x) = 0 ). + * @return Solution of function (x for which f(x) = 0). */ double Solve (SOLVEFUNC Function, @@ -2296,8 +2296,8 @@ void *FunctionParams, double InitialGuess, double Accuracy) * from 0 to x, minus the desired area under the curve. The * number of degrees of freedom of the chi curve is specified * in the ChiParams structure. The desired area is also - * specified in the ChiParams structure as Alpha ( or 1 minus - * the desired area ). This routine is intended to be passed + * specified in the ChiParams structure as Alpha (or 1 minus + * the desired area). This routine is intended to be passed * to the Solve() function to find the value of chi-squared * which will yield a desired area under the right tail of * the chi density curve. The function will only work for diff --git a/src/classify/clusttool.cpp b/src/classify/clusttool.cpp index bb289c9f60..5bf7750252 100644 --- a/src/classify/clusttool.cpp +++ b/src/classify/clusttool.cpp @@ -354,7 +354,7 @@ void WriteProtoList(FILE* File, uint16_t N, PARAM_DESC* ParamDesc, /* write prototypes */ iterate(ProtoList) { - Proto = (PROTOTYPE *) first_node ( ProtoList ); + Proto = (PROTOTYPE *) first_node (ProtoList); if ((Proto->Significant && WriteSigProtos) || (!Proto->Significant && WriteInsigProtos)) WritePrototype(File, N, Proto); diff --git a/src/classify/kdtree.cpp b/src/classify/kdtree.cpp index b038006011..5d561cee08 100644 --- a/src/classify/kdtree.cpp +++ b/src/classify/kdtree.cpp @@ -28,7 +28,7 @@ #include #define Magnitude(X) ((X) < 0 ? -(X) : (X)) -#define NodeFound(N,K,D) (( (N)->Key == (K) ) && ( (N)->Data == (D) )) +#define NodeFound(N,K,D) (((N)->Key == (K)) && ((N)->Data == (D))) /*----------------------------------------------------------------------------- Global Data Definitions and Declarations diff --git a/src/classify/mfdefs.h b/src/classify/mfdefs.h index 141891c450..38b18b42b5 100644 --- a/src/classify/mfdefs.h +++ b/src/classify/mfdefs.h @@ -45,7 +45,7 @@ typedef float *MICROFEATURE; ----------------------------------------------------------------------------**/ /* macros for accessing micro-feature lists */ -#define NextFeatureOf(L) ( (MICROFEATURE) first_node ( L ) ) +#define NextFeatureOf(L) ((MICROFEATURE)first_node(L)) /**---------------------------------------------------------------------------- Public Function Prototypes diff --git a/src/opencl/oclkernels.h b/src/opencl/oclkernels.h index cca7afc9a3..76fe3de03a 100644 --- a/src/opencl/oclkernels.h +++ b/src/opencl/oclkernels.h @@ -249,7 +249,7 @@ KERNEL( else lastword = *(sword + row*wpl + eiter); - for ( i = 1; i < nwords; i++) + for (i = 1; i < nwords; i++) { //Gets LHS words if ((siter + i) < 0) @@ -604,7 +604,7 @@ KERNEL( lastword = *(sword + row*wpl + eiter); - for ( i = 1; i < nwords; i++) + for (i = 1; i < nwords; i++) { //Gets LHS words if ((siter + i) < 0) @@ -809,17 +809,17 @@ void kernel_HistogramRectAllChannels( int threadOffset = get_global_id(0)%HIST_REDUNDANCY; // for each pixel/channel, accumulate in global memory - for ( uint pc = get_global_id(0); pc < numPixels*NUM_CHANNELS/HR_UNROLL_SIZE; pc += get_global_size(0) ) { + for (uint pc = get_global_id(0); pc < numPixels*NUM_CHANNELS/HR_UNROLL_SIZE; pc += get_global_size(0)) { pixels = data[pc]; // channel bin thread - atomic_inc( &histBuffer[ 0*HIST_SIZE*HIST_REDUNDANCY + pixels.s0*HIST_REDUNDANCY + threadOffset ]); // ch0 - atomic_inc( &histBuffer[ 0*HIST_SIZE*HIST_REDUNDANCY + pixels.s4*HIST_REDUNDANCY + threadOffset ]); // ch0 - atomic_inc( &histBuffer[ 1*HIST_SIZE*HIST_REDUNDANCY + pixels.s1*HIST_REDUNDANCY + threadOffset ]); // ch1 - atomic_inc( &histBuffer[ 1*HIST_SIZE*HIST_REDUNDANCY + pixels.s5*HIST_REDUNDANCY + threadOffset ]); // ch1 - atomic_inc( &histBuffer[ 2*HIST_SIZE*HIST_REDUNDANCY + pixels.s2*HIST_REDUNDANCY + threadOffset ]); // ch2 - atomic_inc( &histBuffer[ 2*HIST_SIZE*HIST_REDUNDANCY + pixels.s6*HIST_REDUNDANCY + threadOffset ]); // ch2 - atomic_inc( &histBuffer[ 3*HIST_SIZE*HIST_REDUNDANCY + pixels.s3*HIST_REDUNDANCY + threadOffset ]); // ch3 - atomic_inc( &histBuffer[ 3*HIST_SIZE*HIST_REDUNDANCY + pixels.s7*HIST_REDUNDANCY + threadOffset ]); // ch3 + atomic_inc(&histBuffer[0*HIST_SIZE*HIST_REDUNDANCY + pixels.s0*HIST_REDUNDANCY + threadOffset]); // ch0 + atomic_inc(&histBuffer[0*HIST_SIZE*HIST_REDUNDANCY + pixels.s4*HIST_REDUNDANCY + threadOffset]); // ch0 + atomic_inc(&histBuffer[1*HIST_SIZE*HIST_REDUNDANCY + pixels.s1*HIST_REDUNDANCY + threadOffset]); // ch1 + atomic_inc(&histBuffer[1*HIST_SIZE*HIST_REDUNDANCY + pixels.s5*HIST_REDUNDANCY + threadOffset]); // ch1 + atomic_inc(&histBuffer[2*HIST_SIZE*HIST_REDUNDANCY + pixels.s2*HIST_REDUNDANCY + threadOffset]); // ch2 + atomic_inc(&histBuffer[2*HIST_SIZE*HIST_REDUNDANCY + pixels.s6*HIST_REDUNDANCY + threadOffset]); // ch2 + atomic_inc(&histBuffer[3*HIST_SIZE*HIST_REDUNDANCY + pixels.s3*HIST_REDUNDANCY + threadOffset]); // ch3 + atomic_inc(&histBuffer[3*HIST_SIZE*HIST_REDUNDANCY + pixels.s7*HIST_REDUNDANCY + threadOffset]); // ch3 } } ) @@ -838,17 +838,17 @@ void kernel_HistogramRectOneChannel( int threadOffset = get_global_id(0)%HIST_REDUNDANCY; // for each pixel/channel, accumulate in global memory - for ( uint pc = get_global_id(0); pc < numPixels/HR_UNROLL_SIZE; pc += get_global_size(0) ) { + for (uint pc = get_global_id(0); pc < numPixels/HR_UNROLL_SIZE; pc += get_global_size(0)) { pixels = data[pc]; // bin thread - atomic_inc( &histBuffer[ pixels.s0*HIST_REDUNDANCY + threadOffset ]); - atomic_inc( &histBuffer[ pixels.s1*HIST_REDUNDANCY + threadOffset ]); - atomic_inc( &histBuffer[ pixels.s2*HIST_REDUNDANCY + threadOffset ]); - atomic_inc( &histBuffer[ pixels.s3*HIST_REDUNDANCY + threadOffset ]); - atomic_inc( &histBuffer[ pixels.s4*HIST_REDUNDANCY + threadOffset ]); - atomic_inc( &histBuffer[ pixels.s5*HIST_REDUNDANCY + threadOffset ]); - atomic_inc( &histBuffer[ pixels.s6*HIST_REDUNDANCY + threadOffset ]); - atomic_inc( &histBuffer[ pixels.s7*HIST_REDUNDANCY + threadOffset ]); + atomic_inc(&histBuffer[pixels.s0*HIST_REDUNDANCY + threadOffset]); + atomic_inc(&histBuffer[pixels.s1*HIST_REDUNDANCY + threadOffset]); + atomic_inc(&histBuffer[pixels.s2*HIST_REDUNDANCY + threadOffset]); + atomic_inc(&histBuffer[pixels.s3*HIST_REDUNDANCY + threadOffset]); + atomic_inc(&histBuffer[pixels.s4*HIST_REDUNDANCY + threadOffset]); + atomic_inc(&histBuffer[pixels.s5*HIST_REDUNDANCY + threadOffset]); + atomic_inc(&histBuffer[pixels.s6*HIST_REDUNDANCY + threadOffset]); + atomic_inc(&histBuffer[pixels.s7*HIST_REDUNDANCY + threadOffset]); } } ) @@ -870,7 +870,7 @@ void kernel_HistogramRectAllChannelsReduction( int value = 0; // accumulate in register - for ( uint i = get_local_id(0); i < HIST_REDUNDANCY; i+=GROUP_SIZE) { + for (uint i = get_local_id(0); i < HIST_REDUNDANCY; i+=GROUP_SIZE) { value += histBuffer[ channel*HIST_SIZE*HIST_REDUNDANCY+bin*HIST_REDUNDANCY+i]; } @@ -912,7 +912,7 @@ void kernel_HistogramRectOneChannelReduction( int value = 0; // accumulate in register - for ( int i = get_local_id(0); i < HIST_REDUNDANCY; i+=GROUP_SIZE) { + for (int i = get_local_id(0); i < HIST_REDUNDANCY; i+=GROUP_SIZE) { value += histBuffer[ bin*HIST_REDUNDANCY+i]; } @@ -966,16 +966,16 @@ void kernel_ThresholdRectToPix( // declare variables int pThresholds[NUM_CHANNELS]; int pHi_Values[NUM_CHANNELS]; - for ( int i = 0; i < NUM_CHANNELS; i++) { + for (int i = 0; i < NUM_CHANNELS; i++) { pThresholds[i] = thresholds[i]; pHi_Values[i] = hi_values[i]; } // for each word (32 pixels) in output image - for ( uint w = get_global_id(0); w < wpl*height; w += get_global_size(0) ) { + for (uint w = get_global_id(0); w < wpl*height; w += get_global_size(0)) { unsigned int word = 0; // all bits start at zero // for each burst in word - for ( int b = 0; b < BURSTS_PER_WORD; b++) { + for (int b = 0; b < BURSTS_PER_WORD; b++) { // load burst charVec pixels; int offset = (w / wpl) * width; @@ -986,8 +986,8 @@ void kernel_ThresholdRectToPix( pixels.v[i] = imageData[offset + i]; // for each pixel in burst - for ( int p = 0; p < PIXELS_PER_BURST; p++) { - for ( int c = 0; c < NUM_CHANNELS; c++) { + for (int p = 0; p < PIXELS_PER_BURST; p++) { + for (int c = 0; c < NUM_CHANNELS; c++) { unsigned char pixChan = pixels.s[p*NUM_CHANNELS + c]; if (pHi_Values[c] >= 0 && (pixChan > pThresholds[c]) == (pHi_Values[c] == 0)) { const uint kTopBit = 0x80000000; @@ -1023,17 +1023,17 @@ void kernel_ThresholdRectToPix_OneChan( // declare variables int pThresholds[1]; int pHi_Values[1]; - for ( int i = 0; i < 1; i++) { + for (int i = 0; i < 1; i++) { pThresholds[i] = thresholds[i]; pHi_Values[i] = hi_values[i]; } // for each word (32 pixels) in output image - for ( uint w = get_global_id(0); w < wpl*height; w += get_global_size(0) ) { + for (uint w = get_global_id(0); w < wpl*height; w += get_global_size(0)) { unsigned int word = 0; // all bits start at zero // for each burst in word - for ( int b = 0; b < BURSTS_PER_WORD; b++) { + for (int b = 0; b < BURSTS_PER_WORD; b++) { // load burst charVec1 pixels; @@ -1044,7 +1044,7 @@ void kernel_ThresholdRectToPix_OneChan( + 0 ]; // for each pixel in burst - for ( int p = 0; p < PIXELS_PER_BURST; p++) { + for (int p = 0; p < PIXELS_PER_BURST; p++) { //int littleEndianIdx = p ^ 3; //int bigEndianIdx = p; diff --git a/src/textord/blkocc.h b/src/textord/blkocc.h index b7616ea557..bb0db400e8 100644 --- a/src/textord/blkocc.h +++ b/src/textord/blkocc.h @@ -78,7 +78,7 @@ int16_t band_min, int16_t range_max, int16_t range_min] { - if ( (range_min >= band_min) && (range_max < band_max) ) + if ((range_min >= band_min) && (range_max < band_max)) return TRUE; else return FALSE; @@ -97,7 +97,7 @@ int16_t band_min, int16_t range_max, int16_t range_min] { - if ( (range_max >= band_min) && (range_min < band_max) ) + if ((range_max >= band_min) && (range_min < band_max)) return TRUE; else return FALSE; diff --git a/src/textord/colpartitionset.cpp b/src/textord/colpartitionset.cpp index f1b301e567..8e13d4453c 100644 --- a/src/textord/colpartitionset.cpp +++ b/src/textord/colpartitionset.cpp @@ -131,7 +131,7 @@ void ColPartitionSet::ImproveColumnCandidate(WidthCallback* cb, int col_box_left = col_part->BoxLeftKey(); bool tab_width_ok = cb->Run(part->KeyWidth(col_left, part_right)); bool box_width_ok = cb->Run(part->KeyWidth(col_box_left, part_right)); - if (tab_width_ok || (!part_width_ok )) { + if (tab_width_ok || (!part_width_ok)) { // The tab is leaving the good column metric at least as good as // it was before, so use the tab. part->CopyLeftTab(*col_part, false); @@ -152,7 +152,7 @@ void ColPartitionSet::ImproveColumnCandidate(WidthCallback* cb, int col_box_right = col_part->BoxRightKey(); bool tab_width_ok = cb->Run(part->KeyWidth(part_left, col_right)); bool box_width_ok = cb->Run(part->KeyWidth(part_left, col_box_right)); - if (tab_width_ok || (!part_width_ok )) { + if (tab_width_ok || (!part_width_ok)) { // The tab is leaving the good column metric at least as good as // it was before, so use the tab. part->CopyRightTab(*col_part, false); diff --git a/src/textord/tabfind.cpp b/src/textord/tabfind.cpp index bd3daea77e..8cc5d1f4c6 100644 --- a/src/textord/tabfind.cpp +++ b/src/textord/tabfind.cpp @@ -209,7 +209,7 @@ int TabFind::GutterWidth(int bottom_y, int top_y, const TabVector& v, void TabFind::GutterWidthAndNeighbourGap(int tab_x, int mean_height, int max_gutter, bool left, BLOBNBOX* bbox, int* gutter_width, - int* neighbour_gap ) { + int* neighbour_gap) { const TBOX& box = bbox->bounding_box(); // The gutter and internal sides of the box. int gutter_x = left ? box.left() : box.right(); diff --git a/src/textord/tospace.cpp b/src/textord/tospace.cpp index 96499df86d..009f20c88d 100644 --- a/src/textord/tospace.cpp +++ b/src/textord/tospace.cpp @@ -808,7 +808,7 @@ int16_t Textord::stats_count_under(STATS *stats, int16_t threshold) { * (I.e. reasonably large space and kn:sp ratio) * && > 3/4 # gaps < kn + (sp - kn)/3 * (I.e. most gaps are well away from space estimate) - * && a gap of max( 3, (sp - kn)/3 ) empty histogram positions is found + * && a gap of max(3, (sp - kn) / 3) empty histogram positions is found * somewhere in the histogram between kn and sp * THEN set the threshold and fuzzy limits to this gap - ie NO fuzzies * NO!!!!! the bristol line has "11" with a gap of 12 between the 1's!!! @@ -836,7 +836,7 @@ void Textord::improve_row_threshold(TO_ROW *row, STATS *all_gap_stats) { tprintf (" 1"); /* Look for the first region of all 0's in the histogram which is wider than - max( 3, (sp - kn)/3 ) and starts between kn and sp. If found, and current + max(3, (sp - kn) / 3) and starts between kn and sp. If found, and current threshold is not within it, move the threshold so that is is just inside it. */ reqd_zero_width = (int16_t) floor ((sp - kn) / 3 + 0.5); @@ -1493,9 +1493,9 @@ bool Textord::make_a_word_break( /* Heuristics to turn dubious kerns to spaces */ /* TRIED THIS BUT IT MADE THINGS WORSE - if ( prev_gap == INT16_MAX ) + if (prev_gap == INT16_MAX) prev_gap = 0; // start of row - if ( next_gap == INT16_MAX ) + if (next_gap == INT16_MAX) next_gap = 0; // end of row */ if ((prev_blob_box.width () > 0) && diff --git a/src/training/cntraining.cpp b/src/training/cntraining.cpp index ea87349d9a..372f2f7106 100644 --- a/src/training/cntraining.cpp +++ b/src/training/cntraining.cpp @@ -251,9 +251,9 @@ static void WriteProtos(FILE* File, uint16_t N, LIST ProtoList, // write prototypes iterate(ProtoList) { - Proto = (PROTOTYPE *) first_node ( ProtoList ); - if (( Proto->Significant && WriteSigProtos ) || - ( ! Proto->Significant && WriteInsigProtos ) ) - WritePrototype( File, N, Proto ); + Proto = (PROTOTYPE*)first_node(ProtoList); + if ((Proto->Significant && WriteSigProtos) || + (! Proto->Significant && WriteInsigProtos)) + WritePrototype(File, N, Proto); } } // WriteProtos diff --git a/src/training/commontraining.cpp b/src/training/commontraining.cpp index 6b988150d8..8b1e1be373 100644 --- a/src/training/commontraining.cpp +++ b/src/training/commontraining.cpp @@ -851,11 +851,9 @@ void AddToNormProtosList( int NumberOfProtos(LIST ProtoList, bool CountSigProtos, bool CountInsigProtos) { int N = 0; - PROTOTYPE* Proto; - iterate(ProtoList) { - Proto = (PROTOTYPE *) first_node ( ProtoList ); + PROTOTYPE* Proto = (PROTOTYPE*)first_node(ProtoList); if ((Proto->Significant && CountSigProtos) || (!Proto->Significant && CountInsigProtos)) N++;