diff -r e5618cc85d74 -r 6c158198356e javaextensions/satsa/pki/src.s60/cstssignatureservice.h --- a/javaextensions/satsa/pki/src.s60/cstssignatureservice.h Thu Jul 15 18:31:06 2010 +0300 +++ b/javaextensions/satsa/pki/src.s60/cstssignatureservice.h Thu Aug 19 09:48:13 2010 +0300 @@ -19,19 +19,18 @@ #ifndef CSTSSIGNATURESERVICE_H #define CSTSSIGNATURESERVICE_H -// INCLUDES + + #include #include #include #include "functionserver.h" -// CONSTANTS - - - // FORWARD DECLARATIONS class MSecurityDialog; +#ifndef RD_JAVA_S60_RELEASE_10_1_ONWARDS class MPKIDialog; +#endif class CUnifiedCertStore; class CUnifiedKeyStore; class CCTCertInfo; @@ -266,8 +265,10 @@ // security dialog, owned MSecurityDialog* iDialog; +#ifndef RD_JAVA_S60_RELEASE_10_1_ONWARDS // PKI Dialog, owned MPKIDialog* iPKIDialog; +#endif // certificate store, owned CUnifiedCertStore* iCertStore;