From efac5fa06e2d00bd67c582d8a6b1f1fc69c9b9f5 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 24 Jul 2015 13:39:49 +0200 Subject: remove some unused defines Change-Id: Ib2d50e8c29ccbc5ffcb52cdff4ae3eaae9a62188 Reviewed-on: https://gerrit.libreoffice.org/17332 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- framework/inc/macros/xinterface.hxx | 392 --------------------------------- framework/inc/macros/xtypeprovider.hxx | 358 ------------------------------ 2 files changed, 750 deletions(-) (limited to 'framework/inc') diff --git a/framework/inc/macros/xinterface.hxx b/framework/inc/macros/xinterface.hxx index 2c2f378639dc..d32eb7caa207 100644 --- a/framework/inc/macros/xinterface.hxx +++ b/framework/inc/macros/xinterface.hxx @@ -212,67 +212,6 @@ ________________________________________________________________________________ // public // implementation of XInterface -// implementation of XInterface with 0 additional interface for queryInterface() -#define DEFINE_XINTERFACE_0( CLASS, BASECLASS ) \ - PRIVATE_DEFINE_XINTERFACE_PURE ( CLASS, \ - BASECLASS \ - ) - -// implementation of XInterface with 1 additional interface for queryInterface() -#define DEFINE_XINTERFACE_1( CLASS, BASECLASS, INTERFACE1 ) \ - PRIVATE_DEFINE_XINTERFACE ( CLASS, \ - BASECLASS, \ - ( aType, PRIVATE_DEFINE_INTERFACE_1 ( INTERFACE1 \ - ) \ - ) \ - ) - -// implementation of XInterface with 2 additional interfaces for queryInterface() -#define DEFINE_XINTERFACE_2( CLASS, BASECLASS, INTERFACE1, INTERFACE2 ) \ - PRIVATE_DEFINE_XINTERFACE ( CLASS, \ - BASECLASS, \ - ( aType, PRIVATE_DEFINE_INTERFACE_2 ( INTERFACE1 , \ - INTERFACE2 \ - ) \ - ) \ - ) - -// implementation of XInterface with 3 additional interfaces for queryInterface() -#define DEFINE_XINTERFACE_3( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3 ) \ - PRIVATE_DEFINE_XINTERFACE ( CLASS, \ - BASECLASS, \ - ( aType, PRIVATE_DEFINE_INTERFACE_3 ( INTERFACE1 , \ - INTERFACE2 , \ - INTERFACE3 \ - ) \ - ) \ - ) - -// implementation of XInterface with 4 additional interfaces for queryInterface() -#define DEFINE_XINTERFACE_4( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4 ) \ - PRIVATE_DEFINE_XINTERFACE ( CLASS, \ - BASECLASS, \ - ( aType, PRIVATE_DEFINE_INTERFACE_4 ( INTERFACE1 , \ - INTERFACE2 , \ - INTERFACE3 , \ - INTERFACE4 \ - ) \ - ) \ - ) - -// implementation of XInterface with 5 additional interfaces for queryInterface() -#define DEFINE_XINTERFACE_5( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5 ) \ - PRIVATE_DEFINE_XINTERFACE ( CLASS, \ - BASECLASS, \ - ( aType, PRIVATE_DEFINE_INTERFACE_5 ( INTERFACE1 , \ - INTERFACE2 , \ - INTERFACE3 , \ - INTERFACE4 , \ - INTERFACE5 \ - ) \ - ) \ - ) - // implementation of XInterface with 6 additional interfaces for queryInterface() #define DEFINE_XINTERFACE_6( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6 ) \ PRIVATE_DEFINE_XINTERFACE ( CLASS, \ @@ -287,72 +226,6 @@ ________________________________________________________________________________ ) \ ) -// implementation of XInterface with 7 additional interfaces for queryInterface() -#define DEFINE_XINTERFACE_7( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7 ) \ - PRIVATE_DEFINE_XINTERFACE ( CLASS, \ - BASECLASS, \ - ( aType, PRIVATE_DEFINE_INTERFACE_7 ( INTERFACE1 , \ - INTERFACE2 , \ - INTERFACE3 , \ - INTERFACE4 , \ - INTERFACE5 , \ - INTERFACE6 , \ - INTERFACE7 \ - ) \ - ) \ - ) - -// implementation of XInterface with 8 additional interfaces for queryInterface() -#define DEFINE_XINTERFACE_8( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8 ) \ - PRIVATE_DEFINE_XINTERFACE ( CLASS, \ - BASECLASS, \ - ( aType, PRIVATE_DEFINE_INTERFACE_8 ( INTERFACE1 , \ - INTERFACE2 , \ - INTERFACE3 , \ - INTERFACE4 , \ - INTERFACE5 , \ - INTERFACE6 , \ - INTERFACE7 , \ - INTERFACE8 \ - ) \ - ) \ - ) - -// implementation of XInterface with 9 additional interfaces for queryInterface() -#define DEFINE_XINTERFACE_9( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9 ) \ - PRIVATE_DEFINE_XINTERFACE ( CLASS, \ - BASECLASS, \ - ( aType, PRIVATE_DEFINE_INTERFACE_9 ( INTERFACE1 , \ - INTERFACE2 , \ - INTERFACE3 , \ - INTERFACE4 , \ - INTERFACE5 , \ - INTERFACE6 , \ - INTERFACE7 , \ - INTERFACE8 , \ - INTERFACE9 \ - ) \ - ) \ - ) - -// implementation of XInterface with 10 additional interfaces for queryInterface() -#define DEFINE_XINTERFACE_10( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10 ) \ - PRIVATE_DEFINE_XINTERFACE ( CLASS, \ - BASECLASS, \ - ( aType, PRIVATE_DEFINE_INTERFACE_10 ( INTERFACE1 , \ - INTERFACE2 , \ - INTERFACE3 , \ - INTERFACE4 , \ - INTERFACE5 , \ - INTERFACE6 , \ - INTERFACE7 , \ - INTERFACE8 , \ - INTERFACE9 , \ - INTERFACE10 \ - ) \ - ) \ - ) - // implementation of XInterface with 11 additional interfaces for queryInterface() #define DEFINE_XINTERFACE_11( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11 ) \ PRIVATE_DEFINE_XINTERFACE ( CLASS, \ @@ -372,271 +245,6 @@ ________________________________________________________________________________ ) \ ) -// implementation of XInterface with 12 additional interfaces for queryInterface() -#define DEFINE_XINTERFACE_12( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12 ) \ - PRIVATE_DEFINE_XINTERFACE_LARGE ( CLASS, \ - BASECLASS, \ - ( aType, PRIVATE_DEFINE_INTERFACE_11 ( INTERFACE1 , \ - INTERFACE2 , \ - INTERFACE3 , \ - INTERFACE4 , \ - INTERFACE5 , \ - INTERFACE6 , \ - INTERFACE7 , \ - INTERFACE8 , \ - INTERFACE9 , \ - INTERFACE10 , \ - INTERFACE11 \ - ) \ - ), \ - ( aType, PRIVATE_DEFINE_INTERFACE_1 ( INTERFACE12 \ - ) \ - ) \ - ) - -// implementation of XInterface with 13 additional interfaces for queryInterface() -#define DEFINE_XINTERFACE_13( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12, INTERFACE13 ) \ - PRIVATE_DEFINE_XINTERFACE_LARGE ( CLASS, \ - BASECLASS, \ - ( aType, PRIVATE_DEFINE_INTERFACE_11 ( INTERFACE1 , \ - INTERFACE2 , \ - INTERFACE3 , \ - INTERFACE4 , \ - INTERFACE5 , \ - INTERFACE6 , \ - INTERFACE7 , \ - INTERFACE8 , \ - INTERFACE9 , \ - INTERFACE10 , \ - INTERFACE11 \ - ) \ - ), \ - ( aType, PRIVATE_DEFINE_INTERFACE_2 ( INTERFACE12 , \ - INTERFACE13 \ - ) \ - ) \ - ) - -// implementation of XInterface with 14 additional interfaces for queryInterface() -#define DEFINE_XINTERFACE_14( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12, INTERFACE13, INTERFACE14 ) \ - PRIVATE_DEFINE_XINTERFACE_LARGE ( CLASS, \ - BASECLASS, \ - ( aType, PRIVATE_DEFINE_INTERFACE_11 ( INTERFACE1 , \ - INTERFACE2 , \ - INTERFACE3 , \ - INTERFACE4 , \ - INTERFACE5 , \ - INTERFACE6 , \ - INTERFACE7 , \ - INTERFACE8 , \ - INTERFACE9 , \ - INTERFACE10 , \ - INTERFACE11 \ - ) \ - ), \ - ( aType, PRIVATE_DEFINE_INTERFACE_3 ( INTERFACE12 , \ - INTERFACE13 , \ - INTERFACE14 \ - ) \ - ) \ - ) - -// implementation of XInterface with 15 additional interfaces for queryInterface() -#define DEFINE_XINTERFACE_15( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12, INTERFACE13, INTERFACE14, INTERFACE15 ) \ - PRIVATE_DEFINE_XINTERFACE_LARGE ( CLASS, \ - BASECLASS, \ - ( aType, PRIVATE_DEFINE_INTERFACE_11 ( INTERFACE1 , \ - INTERFACE2 , \ - INTERFACE3 , \ - INTERFACE4 , \ - INTERFACE5 , \ - INTERFACE6 , \ - INTERFACE7 , \ - INTERFACE8 , \ - INTERFACE9 , \ - INTERFACE10 , \ - INTERFACE11 \ - ) \ - ), \ - ( aType, PRIVATE_DEFINE_INTERFACE_4 ( INTERFACE12 , \ - INTERFACE13 , \ - INTERFACE14 , \ - INTERFACE15 \ - ) \ - ) \ - ) - -// implementation of XInterface with 16 additional interfaces for queryInterface() -#define DEFINE_XINTERFACE_16( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12, INTERFACE13, INTERFACE14, INTERFACE15, INTERFACE16 ) \ - PRIVATE_DEFINE_XINTERFACE_LARGE ( CLASS, \ - BASECLASS, \ - ( aType, PRIVATE_DEFINE_INTERFACE_11 ( INTERFACE1 , \ - INTERFACE2 , \ - INTERFACE3 , \ - INTERFACE4 , \ - INTERFACE5 , \ - INTERFACE6 , \ - INTERFACE7 , \ - INTERFACE8 , \ - INTERFACE9 , \ - INTERFACE10 , \ - INTERFACE11 \ - ) \ - ), \ - ( aType, PRIVATE_DEFINE_INTERFACE_5 ( INTERFACE12 , \ - INTERFACE13 , \ - INTERFACE14 , \ - INTERFACE15 , \ - INTERFACE16 \ - ) \ - ) \ - ) - -// implementation of XInterface with 17 additional interfaces for queryInterface() -#define DEFINE_XINTERFACE_17( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12, INTERFACE13, INTERFACE14, INTERFACE15, INTERFACE16, INTERFACE17 ) \ - PRIVATE_DEFINE_XINTERFACE_LARGE ( CLASS, \ - BASECLASS, \ - ( aType, PRIVATE_DEFINE_INTERFACE_11 ( INTERFACE1 , \ - INTERFACE2 , \ - INTERFACE3 , \ - INTERFACE4 , \ - INTERFACE5 , \ - INTERFACE6 , \ - INTERFACE7 , \ - INTERFACE8 , \ - INTERFACE9 , \ - INTERFACE10 , \ - INTERFACE11 \ - ) \ - ), \ - ( aType, PRIVATE_DEFINE_INTERFACE_6 ( INTERFACE12 , \ - INTERFACE13 , \ - INTERFACE14 , \ - INTERFACE15 , \ - INTERFACE16 , \ - INTERFACE17 \ - ) \ - ) \ - ) - -// implementation of XInterface with 18 additional interfaces for queryInterface() -#define DEFINE_XINTERFACE_18( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12, INTERFACE13, INTERFACE14, INTERFACE15, INTERFACE16, INTERFACE17, INTERFACE18 ) \ - PRIVATE_DEFINE_XINTERFACE_LARGE ( CLASS, \ - BASECLASS, \ - ( aType, PRIVATE_DEFINE_INTERFACE_11 ( INTERFACE1 , \ - INTERFACE2 , \ - INTERFACE3 , \ - INTERFACE4 , \ - INTERFACE5 , \ - INTERFACE6 , \ - INTERFACE7 , \ - INTERFACE8 , \ - INTERFACE9 , \ - INTERFACE10 , \ - INTERFACE11 \ - ) \ - ), \ - ( aType, PRIVATE_DEFINE_INTERFACE_7 ( INTERFACE12 , \ - INTERFACE13 , \ - INTERFACE14 , \ - INTERFACE15 , \ - INTERFACE16 , \ - INTERFACE17 , \ - INTERFACE18 \ - ) \ - ) \ - ) - -// implementation of XInterface with 19 additional interfaces for queryInterface() -#define DEFINE_XINTERFACE_19( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12, INTERFACE13, INTERFACE14, INTERFACE15, INTERFACE16, INTERFACE17, INTERFACE18, INTERFACE19 ) \ - PRIVATE_DEFINE_XINTERFACE_LARGE ( CLASS, \ - BASECLASS, \ - ( aType, PRIVATE_DEFINE_INTERFACE_11 ( INTERFACE1 , \ - INTERFACE2 , \ - INTERFACE3 , \ - INTERFACE4 , \ - INTERFACE5 , \ - INTERFACE6 , \ - INTERFACE7 , \ - INTERFACE8 , \ - INTERFACE9 , \ - INTERFACE10 , \ - INTERFACE11 \ - ) \ - ), \ - ( aType, PRIVATE_DEFINE_INTERFACE_8 ( INTERFACE12 , \ - INTERFACE13 , \ - INTERFACE14 , \ - INTERFACE15 , \ - INTERFACE16 , \ - INTERFACE17 , \ - INTERFACE18 , \ - INTERFACE19 \ - ) \ - ) \ - ) - -// implementation of XInterface with 20 additional interfaces for queryInterface() -#define DEFINE_XINTERFACE_20( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12, INTERFACE13, INTERFACE14, INTERFACE15, INTERFACE16, INTERFACE17, INTERFACE18, INTERFACE19, INTERFACE20 ) \ - PRIVATE_DEFINE_XINTERFACE_LARGE ( CLASS, \ - BASECLASS, \ - ( aType, PRIVATE_DEFINE_INTERFACE_11 ( INTERFACE1 , \ - INTERFACE2 , \ - INTERFACE3 , \ - INTERFACE4 , \ - INTERFACE5 , \ - INTERFACE6 , \ - INTERFACE7 , \ - INTERFACE8 , \ - INTERFACE9 , \ - INTERFACE10 , \ - INTERFACE11 \ - ) \ - ), \ - ( aType, PRIVATE_DEFINE_INTERFACE_9 ( INTERFACE12 , \ - INTERFACE13 , \ - INTERFACE14 , \ - INTERFACE15 , \ - INTERFACE16 , \ - INTERFACE17 , \ - INTERFACE18 , \ - INTERFACE19 , \ - INTERFACE20 \ - ) \ - ) \ - ) - -// implementation of XInterface with 21 additional interfaces for queryInterface() -#define DEFINE_XINTERFACE_21( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12, INTERFACE13, INTERFACE14, INTERFACE15, INTERFACE16, INTERFACE17, INTERFACE18, INTERFACE19, INTERFACE20, INTERFACE21 ) \ - PRIVATE_DEFINE_XINTERFACE_LARGE ( CLASS, \ - BASECLASS, \ - ( aType, PRIVATE_DEFINE_INTERFACE_11 ( INTERFACE1 , \ - INTERFACE2 , \ - INTERFACE3 , \ - INTERFACE4 , \ - INTERFACE5 , \ - INTERFACE6 , \ - INTERFACE7 , \ - INTERFACE8 , \ - INTERFACE9 , \ - INTERFACE10 , \ - INTERFACE11 \ - ) \ - ), \ - ( aType, PRIVATE_DEFINE_INTERFACE_10 ( INTERFACE12 , \ - INTERFACE13 , \ - INTERFACE14 , \ - INTERFACE15 , \ - INTERFACE16 , \ - INTERFACE17 , \ - INTERFACE18 , \ - INTERFACE19 , \ - INTERFACE20 , \ - INTERFACE21 \ - ) \ - ) \ - ) - // implementation of XInterface with 22 additional interfaces for queryInterface() #define DEFINE_XINTERFACE_22( CLASS, BASECLASS, INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11, INTERFACE12, INTERFACE13, INTERFACE14, INTERFACE15, INTERFACE16, INTERFACE17, INTERFACE18, INTERFACE19, INTERFACE20, INTERFACE21, INTERFACE22 ) \ PRIVATE_DEFINE_XINTERFACE_LARGE ( CLASS, \ diff --git a/framework/inc/macros/xtypeprovider.hxx b/framework/inc/macros/xtypeprovider.hxx index d6e463c5ae3f..8fb243d1bd38 100644 --- a/framework/inc/macros/xtypeprovider.hxx +++ b/framework/inc/macros/xtypeprovider.hxx @@ -269,54 +269,7 @@ ________________________________________________________________________________ // implementation of XTypeProvider without additional interface for getTypes() // XTypeProvider is used as the only one interface automatically. -// Following defines don't use XTypeProvider automatically!!!! -#define DEFINE_XTYPEPROVIDER_0( CLASS ) \ - PRIVATE_DEFINE_XTYPEPROVIDER_PURE( CLASS ) -// implementation of XTypeProvider with 1 additional interface for getTypes() -#define DEFINE_XTYPEPROVIDER_1( CLASS, TYPE1 ) \ - PRIVATE_DEFINE_XTYPEPROVIDER ( CLASS, \ - (PRIVATE_DEFINE_TYPE_1 ( TYPE1 \ - )) \ - ) - -// implementation of XTypeProvider with 2 additional interfaces for getTypes() -#define DEFINE_XTYPEPROVIDER_2( CLASS, TYPE1, TYPE2 ) \ - PRIVATE_DEFINE_XTYPEPROVIDER ( CLASS, \ - (PRIVATE_DEFINE_TYPE_2 ( TYPE1 , \ - TYPE2 \ - )) \ - ) - -// implementation of XTypeProvider with 3 additional interfaces for getTypes() -#define DEFINE_XTYPEPROVIDER_3( CLASS, TYPE1, TYPE2, TYPE3 ) \ - PRIVATE_DEFINE_XTYPEPROVIDER ( CLASS, \ - (PRIVATE_DEFINE_TYPE_3 ( TYPE1 , \ - TYPE2 , \ - TYPE3 \ - )) \ - ) - -// implementation of XTypeProvider with 4 additional interfaces for getTypes() -#define DEFINE_XTYPEPROVIDER_4( CLASS, TYPE1, TYPE2, TYPE3, TYPE4 ) \ - PRIVATE_DEFINE_XTYPEPROVIDER ( CLASS, \ - (PRIVATE_DEFINE_TYPE_4 ( TYPE1 , \ - TYPE2 , \ - TYPE3 , \ - TYPE4 \ - )) \ - ) - -// implementation of XTypeProvider with 5 additional interfaces for getTypes() -#define DEFINE_XTYPEPROVIDER_5( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5 ) \ - PRIVATE_DEFINE_XTYPEPROVIDER ( CLASS, \ - (PRIVATE_DEFINE_TYPE_5 ( TYPE1 , \ - TYPE2 , \ - TYPE3 , \ - TYPE4 , \ - TYPE5 \ - )) \ - ) // implementation of XTypeProvider with 6 additional interfaces for getTypes() #define DEFINE_XTYPEPROVIDER_6( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6 ) \ @@ -330,64 +283,6 @@ ________________________________________________________________________________ )) \ ) -// implementation of XTypeProvider with 7 additional interfaces for getTypes() -#define DEFINE_XTYPEPROVIDER_7( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7 ) \ - PRIVATE_DEFINE_XTYPEPROVIDER ( CLASS, \ - (PRIVATE_DEFINE_TYPE_7 ( TYPE1 , \ - TYPE2 , \ - TYPE3 , \ - TYPE4 , \ - TYPE5 , \ - TYPE6 , \ - TYPE7 \ - )) \ - ) - -// implementation of XTypeProvider with 8 additional interfaces for getTypes() -#define DEFINE_XTYPEPROVIDER_8( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8 ) \ - PRIVATE_DEFINE_XTYPEPROVIDER ( CLASS, \ - (PRIVATE_DEFINE_TYPE_8 ( TYPE1 , \ - TYPE2 , \ - TYPE3 , \ - TYPE4 , \ - TYPE5 , \ - TYPE6 , \ - TYPE7 , \ - TYPE8 \ - )) \ - ) - -// implementation of XTypeProvider with 9 additional interfaces for getTypes() -#define DEFINE_XTYPEPROVIDER_9( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9 ) \ - PRIVATE_DEFINE_XTYPEPROVIDER ( CLASS, \ - (PRIVATE_DEFINE_TYPE_9 ( TYPE1 , \ - TYPE2 , \ - TYPE3 , \ - TYPE4 , \ - TYPE5 , \ - TYPE6 , \ - TYPE7 , \ - TYPE8 , \ - TYPE9 \ - )) \ - ) - -// implementation of XTypeProvider with 10 additional interfaces for getTypes() -#define DEFINE_XTYPEPROVIDER_10( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10 ) \ - PRIVATE_DEFINE_XTYPEPROVIDER ( CLASS, \ - (PRIVATE_DEFINE_TYPE_10 ( TYPE1 , \ - TYPE2 , \ - TYPE3 , \ - TYPE4 , \ - TYPE5 , \ - TYPE6 , \ - TYPE7 , \ - TYPE8 , \ - TYPE9 , \ - TYPE10 \ - )) \ - ) - // implementation of XTypeProvider with 11 additional interfaces for getTypes() #define DEFINE_XTYPEPROVIDER_11( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11 ) \ PRIVATE_DEFINE_XTYPEPROVIDER ( CLASS, \ @@ -405,212 +300,6 @@ ________________________________________________________________________________ )) \ ) -// implementation of XTypeProvider with 12 additional interfaces for getTypes() -#define DEFINE_XTYPEPROVIDER_12( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12 ) \ - PRIVATE_DEFINE_XTYPEPROVIDER ( CLASS, \ - (PRIVATE_DEFINE_TYPE_12 ( TYPE1 , \ - TYPE2 , \ - TYPE3 , \ - TYPE4 , \ - TYPE5 , \ - TYPE6 , \ - TYPE7 , \ - TYPE8 , \ - TYPE9 , \ - TYPE10 , \ - TYPE11 , \ - TYPE12 \ - )) \ - ) - -// implementation of XTypeProvider with 13 additional interfaces for getTypes() -#define DEFINE_XTYPEPROVIDER_13( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12, TYPE13 ) \ - PRIVATE_DEFINE_XTYPEPROVIDER_LARGE ( CLASS, \ - (PRIVATE_DEFINE_TYPE_12 ( TYPE1 , \ - TYPE2 , \ - TYPE3 , \ - TYPE4 , \ - TYPE5 , \ - TYPE6 , \ - TYPE7 , \ - TYPE8 , \ - TYPE9 , \ - TYPE10 , \ - TYPE11 , \ - TYPE12 \ - )), \ - (PRIVATE_DEFINE_TYPE_1 ( TYPE13 \ - )) \ - ) - -// implementation of XTypeProvider with 14 additional interfaces for getTypes() -#define DEFINE_XTYPEPROVIDER_14( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12, TYPE13, TYPE14 ) \ - PRIVATE_DEFINE_XTYPEPROVIDER_LARGE ( CLASS, \ - (PRIVATE_DEFINE_TYPE_12 ( TYPE1 , \ - TYPE2 , \ - TYPE3 , \ - TYPE4 , \ - TYPE5 , \ - TYPE6 , \ - TYPE7 , \ - TYPE8 , \ - TYPE9 , \ - TYPE10 , \ - TYPE11 , \ - TYPE12 \ - )), \ - (PRIVATE_DEFINE_TYPE_2 ( TYPE13 , \ - TYPE14 \ - )) \ - ) - -// implementation of XTypeProvider with 15 additional interfaces for getTypes() -#define DEFINE_XTYPEPROVIDER_15( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12, TYPE13, TYPE14, TYPE15 ) \ - PRIVATE_DEFINE_XTYPEPROVIDER_LARGE ( CLASS, \ - (PRIVATE_DEFINE_TYPE_12 ( TYPE1 , \ - TYPE2 , \ - TYPE3 , \ - TYPE4 , \ - TYPE5 , \ - TYPE6 , \ - TYPE7 , \ - TYPE8 , \ - TYPE9 , \ - TYPE10 , \ - TYPE11 , \ - TYPE12 \ - )), \ - (PRIVATE_DEFINE_TYPE_3 ( TYPE13 , \ - TYPE14 , \ - TYPE15 \ - )) \ - ) - -// implementation of XTypeProvider with 16 additional interfaces for getTypes() -#define DEFINE_XTYPEPROVIDER_16( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12, TYPE13, TYPE14, TYPE15, TYPE16 ) \ - PRIVATE_DEFINE_XTYPEPROVIDER_LARGE ( CLASS, \ - (PRIVATE_DEFINE_TYPE_12 ( TYPE1 , \ - TYPE2 , \ - TYPE3 , \ - TYPE4 , \ - TYPE5 , \ - TYPE6 , \ - TYPE7 , \ - TYPE8 , \ - TYPE9 , \ - TYPE10 , \ - TYPE11 , \ - TYPE12 \ - )), \ - (PRIVATE_DEFINE_TYPE_4 ( TYPE13 , \ - TYPE14 , \ - TYPE15 , \ - TYPE16 \ - )) \ - ) - -// implementation of XTypeProvider with 17 additional interfaces for getTypes() -#define DEFINE_XTYPEPROVIDER_17( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12, TYPE13, TYPE14, TYPE15, TYPE16, TYPE17 ) \ - PRIVATE_DEFINE_XTYPEPROVIDER_LARGE ( CLASS, \ - (PRIVATE_DEFINE_TYPE_12 ( TYPE1 , \ - TYPE2 , \ - TYPE3 , \ - TYPE4 , \ - TYPE5 , \ - TYPE6 , \ - TYPE7 , \ - TYPE8 , \ - TYPE9 , \ - TYPE10 , \ - TYPE11 , \ - TYPE12 \ - )), \ - (PRIVATE_DEFINE_TYPE_5 ( TYPE13 , \ - TYPE14 , \ - TYPE15 , \ - TYPE16 , \ - TYPE17 \ - )) \ - ) - -// implementation of XTypeProvider with 18 additional interfaces for getTypes() -#define DEFINE_XTYPEPROVIDER_18( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12, TYPE13, TYPE14, TYPE15, TYPE16, TYPE17, TYPE18 ) \ - PRIVATE_DEFINE_XTYPEPROVIDER_LARGE ( CLASS, \ - (PRIVATE_DEFINE_TYPE_12 ( TYPE1 , \ - TYPE2 , \ - TYPE3 , \ - TYPE4 , \ - TYPE5 , \ - TYPE6 , \ - TYPE7 , \ - TYPE8 , \ - TYPE9 , \ - TYPE10 , \ - TYPE11 , \ - TYPE12 \ - )), \ - (PRIVATE_DEFINE_TYPE_6 ( TYPE13 , \ - TYPE14 , \ - TYPE15 , \ - TYPE16 , \ - TYPE17 , \ - TYPE18 \ - )) \ - ) - -// implementation of XTypeProvider with 19 additional interfaces for getTypes() -#define DEFINE_XTYPEPROVIDER_19( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12, TYPE13, TYPE14, TYPE15, TYPE16, TYPE17, TYPE18, TYPE19 ) \ - PRIVATE_DEFINE_XTYPEPROVIDER_LARGE ( CLASS, \ - (PRIVATE_DEFINE_TYPE_12 ( TYPE1 , \ - TYPE2 , \ - TYPE3 , \ - TYPE4 , \ - TYPE5 , \ - TYPE6 , \ - TYPE7 , \ - TYPE8 , \ - TYPE9 , \ - TYPE10 , \ - TYPE11 , \ - TYPE12 \ - )), \ - (PRIVATE_DEFINE_TYPE_7 ( TYPE13 , \ - TYPE14 , \ - TYPE15 , \ - TYPE16 , \ - TYPE17 , \ - TYPE18 , \ - TYPE19 \ - )) \ - ) - -// implementation of XTypeProvider with 20 additional interfaces for getTypes() -#define DEFINE_XTYPEPROVIDER_20( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12, TYPE13, TYPE14, TYPE15, TYPE16, TYPE17, TYPE18, TYPE19, TYPE20 ) \ - PRIVATE_DEFINE_XTYPEPROVIDER_LARGE ( CLASS, \ - (PRIVATE_DEFINE_TYPE_12 ( TYPE1 , \ - TYPE2 , \ - TYPE3 , \ - TYPE4 , \ - TYPE5 , \ - TYPE6 , \ - TYPE7 , \ - TYPE8 , \ - TYPE9 , \ - TYPE10 , \ - TYPE11 , \ - TYPE12 \ - )), \ - (PRIVATE_DEFINE_TYPE_8 ( TYPE13 , \ - TYPE14 , \ - TYPE15 , \ - TYPE16 , \ - TYPE17 , \ - TYPE18 , \ - TYPE19 , \ - TYPE20 \ - )) \ - ) - // implementation of XTypeProvider with 20 additional interfaces for getTypes() #define DEFINE_XTYPEPROVIDER_21( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12, TYPE13, TYPE14, TYPE15, TYPE16, TYPE17, TYPE18, TYPE19, TYPE20, TYPE21 ) \ PRIVATE_DEFINE_XTYPEPROVIDER_LARGE ( CLASS, \ @@ -639,53 +328,6 @@ ________________________________________________________________________________ )) \ ) -// implementation of XTypeProvider with 1 additional interface for getTypes() AND using 1 baseclass -#define DEFINE_XTYPEPROVIDER_1_WITH_BASECLASS( CLASS, BASECLASS, TYPE1 ) \ - PRIVATE_DEFINE_XTYPEPROVIDER_BASECLASS ( CLASS, \ - BASECLASS, \ - (PRIVATE_DEFINE_TYPE_1 ( TYPE1 \ - )) \ - ) - -// implementation of XTypeProvider with 2 additional interface for getTypes() AND using 1 baseclass -#define DEFINE_XTYPEPROVIDER_2_WITH_BASECLASS( CLASS, BASECLASS, TYPE1, TYPE2 ) \ - PRIVATE_DEFINE_XTYPEPROVIDER_BASECLASS ( CLASS, \ - BASECLASS, \ - (PRIVATE_DEFINE_TYPE_2 ( TYPE1 , \ - TYPE2 \ - )) \ - ) - -// implementation of XTypeProvider with 3 additional interface for getTypes() AND using 1 baseclass -#define DEFINE_XTYPEPROVIDER_3_WITH_BASECLASS( CLASS, BASECLASS, TYPE1, TYPE2, TYPE3 ) \ - PRIVATE_DEFINE_XTYPEPROVIDER_BASECLASS ( CLASS, \ - BASECLASS, \ - (PRIVATE_DEFINE_TYPE_3 ( TYPE1 , \ - TYPE2 , \ - TYPE3 \ - )) \ - ) -// implementation of XTypeProvider with 4 additional interface for getTypes() AND using 1 baseclass -#define DEFINE_XTYPEPROVIDER_4_WITH_BASECLASS( CLASS, BASECLASS, TYPE1, TYPE2, TYPE3, TYPE4 ) \ - PRIVATE_DEFINE_XTYPEPROVIDER_BASECLASS ( CLASS, \ - BASECLASS, \ - (PRIVATE_DEFINE_TYPE_4 ( TYPE1 , \ - TYPE2 , \ - TYPE3 , \ - TYPE4 \ - )) \ - ) -// implementation of XTypeProvider with 5 additional interface for getTypes() AND using 1 baseclass -#define DEFINE_XTYPEPROVIDER_5_WITH_BASECLASS( CLASS, BASECLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5 ) \ - PRIVATE_DEFINE_XTYPEPROVIDER_BASECLASS ( CLASS, \ - BASECLASS, \ - (PRIVATE_DEFINE_TYPE_5 ( TYPE1 , \ - TYPE2 , \ - TYPE3 , \ - TYPE4 , \ - TYPE5 \ - )) \ - ) } // namespace framework -- cgit v1.2.3