revise exported headers and cleanup headers

[platform/core/connectivity/smartcard-service.git] / common / include / APDUHelper.h

diff --git a/common/include/APDUHelper.h b/common/include/APDUHelper.h
index 0f24ac8..94ffd0a 100644 (file)
--- a/common/include/APDUHelper.h
+++ b/common/include/APDUHelper.h
@@ -17,16 +17,12 @@
 #ifndef APDUHELPER_H_
 #define APDUHELPER_H_
 
-/* standard library header */
-
-/* SLP library header */
-
-/* local header */
+#include "Debug.h"
 #include "ByteArray.h"
 
 namespace smartcard_service_api
 {
-       class ResponseHelper
+       class EXPORT ResponseHelper
        {
        private:
                ByteArray response;
@@ -34,7 +30,7 @@ namespace smartcard_service_api
                int status;
                ByteArray dataField;
 
-               static int parseStatusWord(unsigned char *sw);
+               static int parseStatusWord(const unsigned char *sw);
 
        public:
                static const int SUCCESS = 0;
@@ -63,19 +59,19 @@ namespace smartcard_service_api
                ~ResponseHelper();
 
                bool setResponse(const ByteArray &response);
-               int getStatus();
-               unsigned char getSW1();
-               unsigned char getSW2();
+               inline int getStatus() const { return status; }
+               inline unsigned char getSW1() const { return sw[0]; }
+               inline unsigned char getSW2() const { return sw[1]; }
 
 //             char *getErrorString();
-               ByteArray getDataField();
+               inline const ByteArray getDataField() const { return dataField; }
 
                static int getStatus(const ByteArray &response);
-               static ByteArray getDataField(const ByteArray &response);
+               static const ByteArray getDataField(const ByteArray &response);
 //             static char *getErrorString();
        };
 
-       class APDUCommand
+       class EXPORT APDUCommand
        {
        private:
                typedef struct _command_header_t
@@ -145,33 +141,33 @@ namespace smartcard_service_api
                ~APDUCommand();
 
                bool setCommand(unsigned char cla, unsigned char ins, unsigned char p1,
-                       unsigned char p2, ByteArray commandData, unsigned int maxResponseSize);
+                       unsigned char p2, const ByteArray &commandData, unsigned int maxResponseSize);
                bool setCommand(const ByteArray &command);
 
                bool setChannel(int type, int channelNum);
 
                void setCLA(unsigned char cla);
-               unsigned char getCLA();
+               unsigned char getCLA() const;
 
                void setINS(unsigned char ins);
-               unsigned char getINS();
+               unsigned char getINS() const;
 
                void setP1(unsigned char p1);
-               unsigned char getP1();
+               unsigned char getP1() const;
 
                void setP2(unsigned char p2);
-               unsigned char getP2();
+               unsigned char getP2() const;
 
                void setCommandData(const ByteArray &data);
-               ByteArray getCommandData();
+               const ByteArray getCommandData() const;
 
                void setMaxResponseSize(unsigned int maxResponseSize);
-               unsigned int getMaxResponseSize();
+               unsigned int getMaxResponseSize() const;
 
-               bool getBuffer(ByteArray &array);
+               bool getBuffer(ByteArray &array) const;
        };
 
-       class APDUHelper
+       class EXPORT APDUHelper
        {
        public:
                static const int COMMAND_OPEN_LOGICAL_CHANNEL = 1;
@@ -186,7 +182,8 @@ namespace smartcard_service_api
                static const int COMMAND_WRITE_BINARY = 10;
                static const int COMMAND_WRITE_RECORD = 11;
 
-               static ByteArray generateAPDU(int command, int channel, ByteArray data);
+               static const ByteArray generateAPDU(int command,
+                       int channel, const ByteArray &data);
        };
 
 } /* namespace smartcard_service_api */