dm 7 years ago
parent
commit
e07b73a1ef
2 changed files with 11 additions and 8 deletions
  1. 9 6
      src/billing.cpp
  2. 2 2
      src/billing.h

+ 9 - 6
src/billing.cpp

@@ -28,7 +28,7 @@ namespace oxygine
             cbConsume                    fConsume = [](const string&) {};
             cbRequestPurchases           fRequestPurchases = []() {};
             cbRequestDetails             fRequestDetails = [](const std::vector<std::string>& items) {};
-            cbParsePurchaseData          fParsePurchaseData = [](const PurchasedEvent *event, ParsedPurchaseData &pdata) {OX_ASSERT(!"not impl"); };
+            cbParsePurchaseData          fParsePurchaseData = [](const PurchasedEvent* event, ParsedPurchaseData& pdata) {OX_ASSERT(!"not impl"); };
         }
 
         using namespace internal;
@@ -50,7 +50,8 @@ namespace oxygine
             fRequestPurchases = jniBillingGetPurchases;
             fRequestDetails = jniBillingUpdate;
 
-            fParsePurchaseData = [](const PurchasedEvent *event, ParsedPurchaseData &pdata) {
+            fParsePurchaseData = [](const PurchasedEvent * event, ParsedPurchaseData & pdata)
+            {
                 Json::Reader().parse(event->data1, pdata.data, false);
                 MarketType mt = getMarketType();
                 if (mt == google)
@@ -75,8 +76,9 @@ namespace oxygine
             fConsume = iosBillingConsume;
             fRequestPurchases = iosBillingGetPurchases;
             fRequestDetails = iosBillingUpdate;
-            
-            fParsePurchaseData = [](const PurchasedEvent *event, ParsedPurchaseData &pdata) {
+
+            fParsePurchaseData = [](const PurchasedEvent * event, ParsedPurchaseData & pdata)
+            {
                 Json::Reader().parse(event->data1, pdata.data, false);
                 pdata.productID             = pdata.data["productIdentifier"].asString();
                 pdata.iosTransactionReceipt = pdata.data["transactionReceipt"].asString();
@@ -92,7 +94,8 @@ namespace oxygine
             fRequestPurchases = billingSimulatorGetPurchases;
             fRequestDetails = billingSimulatorRequestDetails;
 
-            fParsePurchaseData = [](const PurchasedEvent *event, ParsedPurchaseData &pdata) {
+            fParsePurchaseData = [](const PurchasedEvent * event, ParsedPurchaseData & pdata)
+            {
                 Json::Reader().parse(event->data1, pdata.data, false);
                 pdata.productID     = pdata.data["productId"].asString();
                 pdata.purchaseToken = pdata.data["purchaseToken"].asString();
@@ -151,7 +154,7 @@ namespace oxygine
             fPurchase(id, payload);
         }
 
-        void parsePurchaseData(const PurchasedEvent &event, ParsedPurchaseData &data)
+        void parsePurchaseData(const PurchasedEvent& event, ParsedPurchaseData& data)
         {
             fParsePurchaseData(&event, data);
         }

+ 2 - 2
src/billing.h

@@ -121,7 +121,7 @@ namespace oxygine
         void purchase(const std::string& id, const std::string& payload);
         void consume(const std::string& token);
 
-        void parsePurchaseData(const PurchasedEvent &event, ParsedPurchaseData &data);
+        void parsePurchaseData(const PurchasedEvent& event, ParsedPurchaseData& data);
         /**requestPurchases should be called right after billing::init() or when you are ready to receive purchased
         ios purchases wont work without this;
         */
@@ -151,7 +151,7 @@ namespace oxygine
             typedef void(*cbConsume)(const std::string&);
             typedef void(*cbRequestPurchases)();
             typedef void(*cbRequestDetails)(const std::vector<std::string>& items);
-            typedef void(*cbParsePurchaseData)(const PurchasedEvent *event, ParsedPurchaseData &data);
+            typedef void(*cbParsePurchaseData)(const PurchasedEvent* event, ParsedPurchaseData& data);
 
             extern cbInit                       fInit;
             extern cbFree                       fFree;