Showing the changes to interface/src/AndroidHelper.h (1 of 49 files). Show all
Unified · Split
| @@ -13,6 +13,9 @@ · 12 unmodified lines | ||
| 13 | 13 | #define hifi_Android_Helper_h |
| 14 | 14 | |
| 15 | 15 | #include <QObject> |
| 16 | +#include <QMap> | |
| 17 | +#include <QUrl> | |
| 18 | + | |
| 16 | 19 | #include <QNetworkReply> |
| 17 | 20 | #include <QtCore/QEventLoop> |
| 18 | 21 | |
| @@ -23,7 +26,7 @@ public: · 4 unmodified lines | ||
| 23 | 26 | static AndroidHelper instance; |
| 24 | 27 | return instance; |
| 25 | 28 | } |
| 26 | − void requestActivity(const QString &activityName, const bool backToScene, QList<QString> args = QList<QString>()); | |
| 29 | + void requestActivity(const QString &activityName, const bool backToScene, QMap<QString, QString> args = QMap<QString, QString>()); | |
| 27 | 30 | void notifyLoadComplete(); |
| 28 | 31 | void notifyEnterForeground(); |
| 29 | 32 | void notifyBeforeEnterBackground(); |
| @@ -39,12 +42,11 @@ public: · 9 unmodified lines | ||
| 39 | 42 | void signup(QString email, QString username, QString password); |
| 40 | 43 | |
| 41 | 44 | public slots: |
| 42 | − void showLoginDialog(); | |
| 45 | + void showLoginDialog(QUrl url); | |
| 43 | 46 | void signupCompleted(QNetworkReply* reply); |
| 44 | 47 | void signupFailed(QNetworkReply* reply); |
| 45 | − | |
| 46 | 48 | signals: |
| 47 | − void androidActivityRequested(const QString &activityName, const bool backToScene, QList<QString> args = QList<QString>()); | |
| 49 | + void androidActivityRequested(const QString &activityName, const bool backToScene, QMap<QString, QString> args = QMap<QString, QString>()); | |
| 48 | 50 | void qtAppLoadComplete(); |
| 49 | 51 | void enterForeground(); |
| 50 | 52 | void beforeEnterBackground(); |