Merge remote-tracking branch 'upstream/master' into android_signup

Gabriel Calero committed 8 years ago

Commit 13e2b992 parents 1422c17 7c9464549 files · +1814 −261Browse files

Showing the changes to interface/src/AndroidHelper.h (1 of 49 files). Show all

Unified · Split

 #define hifi_Android_Helper_h
 #include <QObject>
+#include <QMap>
+#include <QUrl>
 #include <QNetworkReply>
 #include <QtCore/QEventLoop>
             static AndroidHelper instance;
             return instance;
     }
-    void requestActivity(const QString &activityName, const bool backToScene, QList<QString> args = QList<QString>());
+    void requestActivity(const QString &activityName, const bool backToScene, QMap<QString, QString> args = QMap<QString, QString>());
     void notifyLoadComplete();
     void notifyEnterForeground();
     void notifyBeforeEnterBackground();
     void signup(QString email, QString username, QString password);
 public slots:
-    void showLoginDialog();
+    void showLoginDialog(QUrl url);
     void signupCompleted(QNetworkReply* reply);
     void signupFailed(QNetworkReply* reply);
 signals:
-    void androidActivityRequested(const QString &activityName, const bool backToScene, QList<QString> args = QList<QString>());
+    void androidActivityRequested(const QString &activityName, const bool backToScene, QMap<QString, QString> args = QMap<QString, QString>());
     void qtAppLoadComplete();
     void enterForeground();
     void beforeEnterBackground();

Keyboard shortcuts