dm 7 years ago
parent
commit
6763d34fce

+ 5 - 5
src/android/AndroidFacebook.cpp

@@ -46,8 +46,8 @@ extern "C"
 
     JNIEXPORT void JNICALL Java_org_oxygine_facebook_FacebookAdapter_loginResult(JNIEnv* env, jobject obj, jboolean value, jstring juserID, jstring jToken)
     {
-		string id    = jniGetString(env, juserID);
-		string token = jniGetString(env, jToken);
+        string id    = jniGetString(env, juserID);
+        string token = jniGetString(env, jToken);
 
         core::getMainThreadDispatcher().postCallback([ = ]()
         {
@@ -69,7 +69,7 @@ extern "C"
     {
         string data = jniGetString(env, jData);
 
-        core::getMainThreadDispatcher().postCallback([=]()
+        core::getMainThreadDispatcher().postCallback([ = ]()
         {
             facebook::internal::gameRequestResult(data, (bool)error);
         });
@@ -79,7 +79,7 @@ extern "C"
     {
         string data = jniGetString(env, jData);
 
-        core::getMainThreadDispatcher().postCallback([=]()
+        core::getMainThreadDispatcher().postCallback([ = ]()
         {
             facebook::ShareEvent se((bool)canceled);
             facebook::internal::dispatch(&se);
@@ -366,7 +366,7 @@ void jniFacebookRequestInvitableFriends(const vector<string>& exc)
     env->CallVoidMethod(_jFacebookObject, jFn, arr);
 }
 
-void jniFacebookShareLink(const string &url, const string &quote)
+void jniFacebookShareLink(const string& url, const string& quote)
 {
     if (!isFacebookEnabled())
         return;

+ 1 - 1
src/android/AndroidFacebook.h

@@ -21,4 +21,4 @@ vector<string> jniFacebookGetAccessTokenPermissions();
 string jniFacebookGetUserID();
 string jniFacebookGetAppID();
 void jniFacebookRequestInvitableFriends(const vector<string>& exc);
-void jniFacebookShareLink(const string &, const string &);
+void jniFacebookShareLink(const string&, const string&);

+ 18 - 14
src/facebook.cpp

@@ -28,10 +28,14 @@ namespace facebook
         cbGetFriends    fGetFriends = []() {};
         cbGameRequest   fGameRequest = [](const string& title, const string& text, const vector<string>& dest, const string& objectID, const std::string& userData) {};
         cbRequestInvitableFriends fRequestInvitableFriends = [](const vector<string>&) {};
-        cbShareLink     fShareLink = [](const string &, const string &) { core::getMainThreadDispatcher().postCallback([]() {
-            ShareEvent ev(true);
-            dispatch(&ev);
-        }); };
+        cbShareLink     fShareLink = [](const string&, const string&)
+        {
+            core::getMainThreadDispatcher().postCallback([]()
+            {
+                ShareEvent ev(true);
+                dispatch(&ev);
+            });
+        };
 
         cbIsLoggedIn     fIsLoggedIn = []() {return false; };
         cbGetUserID      fGetUserID = []() {return std::string(""); };
@@ -98,7 +102,7 @@ namespace facebook
         fGetAppID = facebookSimulatorGetAppID;
         fGameRequest = facebookSimulatorGameRequest;
         fGetAccessTokenPermissions = facebookSimulatorGetAccessTokenPermissions;
-        fRequestInvitableFriends = facebookSimulatorInvitableFriendsRequest;    
+        fRequestInvitableFriends = facebookSimulatorInvitableFriendsRequest;
         fShareLink = facebookSimulatorShareLink;
 #endif
 
@@ -175,13 +179,13 @@ namespace facebook
         fRequestInvitableFriends(exclude);
     }
 
-    void shareLink(const string &url, const string &quote)
+    void shareLink(const string& url, const string& quote)
     {
         logs::messageln("facebook::shareLink");
         fShareLink(url, quote);
     }
 
-    void logPurchase(const double & price, const string & currency)
+    void logPurchase(const double& price, const string& currency)
     {
         logs::messageln("facebook::logPurchase");
         fLogPurchase(price, currency);
@@ -227,7 +231,7 @@ namespace facebook
     {
         logs::messageln("facebook::getUserID");
         string id = fGetUserID();
-        
+
         logs::messageln("%s", id.c_str());
 
         return id;
@@ -262,9 +266,9 @@ namespace facebook
             }
         }
     }
-    
-    
-    ShareEvent::ShareEvent(bool Canceled):Event(EVENT), canceled(Canceled){}
+
+
+    ShareEvent::ShareEvent(bool Canceled): Event(EVENT), canceled(Canceled) {}
 
     namespace internal
     {
@@ -277,13 +281,13 @@ namespace facebook
                 _dispatcher->dispatchEvent(&ev);
         }
 
-        void loginResult(bool value, const string& userID, const string &token)
+        void loginResult(bool value, const string& userID, const string& token)
         {
             logs::messageln("facebook::internal::loginResult %d %s %s", value, userID.c_str(), token.c_str());
             LoginEvent ev;
             ev.isLoggedIn = value;
-			ev.userID = userID;
-			ev.token = token;
+            ev.userID = userID;
+            ev.token = token;
             if (_dispatcher)
                 _dispatcher->dispatchEvent(&ev);
         }

+ 6 - 6
src/facebook.h

@@ -33,8 +33,8 @@ namespace facebook
         LoginEvent() : Event(EVENT) {}
 
         bool isLoggedIn = false;
-		string userID;
-		string token;
+        string userID;
+        string token;
     };
 
     class FriendsEvent : public Event
@@ -95,13 +95,13 @@ namespace facebook
         string request;
         vector<string> to;
     };
-    
+
     class ShareEvent: public Event
     {
     public:
         enum {EVENT = sysEventID('f', 'S', 'h')};
         bool canceled;
-        
+
         ShareEvent(bool canceled);
     };
 
@@ -114,7 +114,7 @@ namespace facebook
     void newMeRequest();
     void gameRequest(const string& title, const string& text, const vector<string>& dest, const string& objectID, const string& userData);
     void requestInvitableFriends(const vector<string>& exclude);
-    void shareLink(const string &url, const string &quote);
+    void shareLink(const string& url, const string& quote);
     void logPurchase(const double& price, const string& currency);
 
     bool appInviteDialog(const string& appLinkUrl, const string& previewImageUrl);
@@ -160,7 +160,7 @@ namespace facebook
         extern cbLogPurchase                fLogPurchase;
 
         void newMeRequestResult(const string& data, bool error);
-        void loginResult(bool value, const string& userID, const string &token);
+        void loginResult(bool value, const string& userID, const string& token);
         void newToken(const string& value);
         void newMyFriendsRequestResult(const string& data, bool error);
 

+ 1 - 1
src/ios/iosFacebook.h

@@ -25,6 +25,6 @@ std::string iosFacebookGetAppID();
 std::vector<std::string> iosFacebookGetPermissions();
 void iosFacebookRequestInvitableFriends(const std::vector<std::string>&);
 void iosFacebookRequestMe();
-void iosFacebookShareLink(const std::string &url, const std::string &quote);
+void iosFacebookShareLink(const std::string& url, const std::string& quote);
 
 #endif /* Header_h */

+ 5 - 5
src/sim/FacebookSimulator.cpp

@@ -168,7 +168,7 @@ void facebookSimulatorLikeUpdate(float x, float y)
 
 void facebookSimulatorLogin(const vector<string>& perm)
 {
-    getStage()->addTween(TweenDummy(), 1000)->addDoneCallback([=](Event*)
+    getStage()->addTween(TweenDummy(), 1000)->addDoneCallback([ = ](Event*)
     {
         spFacebookDialog dialog = new FacebookDialog;
         dialog->setScale(1.0f / getStage()->getScaleX());
@@ -340,9 +340,9 @@ void facebookSimulatorGameRequest(const std::string& title, const std::string& t
     });
 }
 
-void facebookSimulatorShareLink(const string &link, const string &quote)
+void facebookSimulatorShareLink(const string& link, const string& quote)
 {
-    getStage()->addTween(TweenDummy(), 1000)->addDoneCallback([=](Event*)
+    getStage()->addTween(TweenDummy(), 1000)->addDoneCallback([ = ](Event*)
     {
         spFacebookDialog dialog = new FacebookDialog;
         dialog->setScale(1.0f / getStage()->getScaleX());
@@ -352,7 +352,7 @@ void facebookSimulatorShareLink(const string &link, const string &quote)
 
         FacebookDialog* ptr = dialog.get();
 
-        dialog->_btnOk->addClickListener([=](Event * e)
+        dialog->_btnOk->addClickListener([ = ](Event * e)
         {
             ptr->detach();
             e->removeListener();
@@ -361,7 +361,7 @@ void facebookSimulatorShareLink(const string &link, const string &quote)
             facebook::internal::dispatch(&se);
         });
 
-        dialog->_btnCancel->addClickListener([=](Event * e)
+        dialog->_btnCancel->addClickListener([ = ](Event * e)
         {
             ptr->detach();
             e->removeListener();

+ 1 - 1
src/sim/FacebookSimulator.h

@@ -15,7 +15,7 @@ void facebookSimulatorNewMeRequest();
 bool facebookSimulatorAppInviteDialog(const string& appLinkUrl, const string& previewImageUrl);
 void facebookSimulatorGameRequest(const std::string& title, const std::string& text, const std::vector<std::string>& dest, const std::string& objectID, const std::string& userData);
 void facebookSimulatorInvitableFriendsRequest(const vector<string>&);
-void facebookSimulatorShareLink(const string &link, const string &quote);
+void facebookSimulatorShareLink(const string& link, const string& quote);
 vector<string> facebookSimulatorGetAccessTokenPermissions();
 
 std::string facebookSimulatorGetAccessToken();