From 3a8824a9a66dfb6866ad899d315940e6682572d2 Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 14 Mar 2016 19:59:18 +0300 Subject: [PATCH] intro rewrite started, new code sending methods --- Telegram/SourceFiles/boxes/confirmbox.cpp | 2 +- Telegram/SourceFiles/history.h | 2 +- Telegram/SourceFiles/intro/introcode.cpp | 77 +- Telegram/SourceFiles/intro/introcode.h | 18 +- Telegram/SourceFiles/intro/introphone.cpp | 85 +- Telegram/SourceFiles/intro/introphone.h | 18 +- Telegram/SourceFiles/intro/intropwdcheck.cpp | 33 +- Telegram/SourceFiles/intro/intropwdcheck.h | 11 +- Telegram/SourceFiles/intro/introsignup.cpp | 26 +- Telegram/SourceFiles/intro/introsignup.h | 11 +- .../intro/{introsteps.cpp => introstart.cpp} | 35 +- .../intro/{introsteps.h => introstart.h} | 16 +- .../intro/{intro.cpp => introwidget.cpp} | 190 ++--- .../intro/{intro.h => introwidget.h} | 78 +- Telegram/SourceFiles/mainwidget.cpp | 18 +- Telegram/SourceFiles/mtproto/mtpCoreTypes.h | 2 +- Telegram/SourceFiles/mtproto/mtpScheme.cpp | 190 +++-- Telegram/SourceFiles/mtproto/mtpScheme.h | 745 +++++++++++------- Telegram/SourceFiles/mtproto/scheme.tl | 22 +- Telegram/SourceFiles/window.cpp | 2 +- Telegram/Telegram.pro | 8 +- Telegram/Telegram.vcxproj | 50 +- Telegram/Telegram.vcxproj.filters | 42 +- Telegram/Telegram.xcodeproj/project.pbxproj | 32 +- Telegram/Telegram.xcodeproj/qt_preprocess.mak | 20 +- 25 files changed, 966 insertions(+), 767 deletions(-) rename Telegram/SourceFiles/intro/{introsteps.cpp => introstart.cpp} (77%) rename Telegram/SourceFiles/intro/{introsteps.h => introstart.h} (79%) rename Telegram/SourceFiles/intro/{intro.cpp => introwidget.cpp} (69%) rename Telegram/SourceFiles/intro/{intro.h => introwidget.h} (73%) diff --git a/Telegram/SourceFiles/boxes/confirmbox.cpp b/Telegram/SourceFiles/boxes/confirmbox.cpp index b73b15d89..9de665253 100644 --- a/Telegram/SourceFiles/boxes/confirmbox.cpp +++ b/Telegram/SourceFiles/boxes/confirmbox.cpp @@ -473,7 +473,7 @@ void RichDeleteMessageBox::onDelete() { if (_deleteAll.checked()) { App::main()->deleteAllFromUser(_channel, _from); } - if (auto item = App::histItemById(_channel ? peerToChannel(_channel->id) : 0, _msgId)) { + if (HistoryItem *item = App::histItemById(_channel ? peerToChannel(_channel->id) : 0, _msgId)) { bool wasLast = (item->history()->lastMsg == item); item->destroy(); if (_msgId > 0) { diff --git a/Telegram/SourceFiles/history.h b/Telegram/SourceFiles/history.h index b76268e1d..ece0bbc72 100644 --- a/Telegram/SourceFiles/history.h +++ b/Telegram/SourceFiles/history.h @@ -1097,7 +1097,7 @@ public: bool canEdit(const QDateTime &cur) const; bool suggestBanReportDeleteAll() const { - auto channel = history()->peer->asChannel(); + ChannelData *channel = history()->peer->asChannel(); if (!channel || (!channel->amEditor() && !channel->amCreator())) return false; return !isPost() && !out() && from()->isUser() && toHistoryMessage(); } diff --git a/Telegram/SourceFiles/intro/introcode.cpp b/Telegram/SourceFiles/intro/introcode.cpp index 35f2540ea..803c1d264 100644 --- a/Telegram/SourceFiles/intro/introcode.cpp +++ b/Telegram/SourceFiles/intro/introcode.cpp @@ -25,7 +25,8 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #include "application.h" #include "intro/introcode.h" -#include "intro/intro.h" +#include "intro/introsignup.h" +#include "intro/intropwdcheck.h" CodeInput::CodeInput(QWidget *parent, const style::flatInput &st, const QString &ph) : FlatInput(parent, st, ph) { } @@ -72,7 +73,7 @@ void CodeInput::correctValue(const QString &was, QString &now) { if (strict) emit codeEntered(); } -IntroCode::IntroCode(IntroWidget *parent) : IntroStage(parent) +IntroCode::IntroCode(IntroWidget *parent) : IntroStep(parent) , a_errorAlpha(0) , _a_error(animation(this, &IntroCode::step_error)) , next(this, lang(lng_intro_next), st::btnIntroNext) @@ -80,11 +81,10 @@ IntroCode::IntroCode(IntroWidget *parent) : IntroStage(parent) , _noTelegramCode(this, lang(lng_code_no_telegram), st::introLink) , _noTelegramCodeRequestId(0) , code(this, st::inpIntroCode, lang(lng_code_ph)) +, sentRequest(0) , waitTillCall(intro()->getCallTimeout()) { - setVisible(false); setGeometry(parent->innerRect()); - connect(&next, SIGNAL(stateChanged(int, ButtonStateChangeSource)), parent, SLOT(onDoneStateChanged(int, ButtonStateChangeSource))); connect(&next, SIGNAL(clicked()), this, SLOT(onSubmitCode())); connect(&code, SIGNAL(changed()), this, SLOT(onInputChange())); connect(&callTimer, SIGNAL(timeout()), this, SLOT(onSendCall())); @@ -92,6 +92,11 @@ IntroCode::IntroCode(IntroWidget *parent) : IntroStage(parent) connect(&_noTelegramCode, SIGNAL(clicked()), this, SLOT(onNoTelegramCode())); updateDescText(); + + waitTillCall = intro()->getCallTimeout(); + if (!intro()->codeByTelegram()) { + callTimer.start(1000); + } } void IntroCode::updateDescText() { @@ -172,7 +177,7 @@ void IntroCode::step_error(float64 ms, bool timer) { _a_error.stop(); a_errorAlpha.finish(); if (!a_errorAlpha.current()) { - error = ""; + error.clear(); } } else { a_errorAlpha.update(dt, st::introErrFunc); @@ -181,30 +186,29 @@ void IntroCode::step_error(float64 ms, bool timer) { } void IntroCode::activate() { - waitTillCall = intro()->getCallTimeout(); - if (!intro()->codeByTelegram()) { - callTimer.start(1000); - } - error = ""; - a_errorAlpha = anim::fvalue(0); - sentCode = QString(); - show(); - code.setDisabled(false); + IntroStep::activate(); code.setFocus(); } -void IntroCode::prepareShow() { +void IntroCode::finished() { + IntroStep::finished(); + error.clear(); + a_errorAlpha = anim::fvalue(0); + + sentCode.clear(); + code.setDisabled(false); + + callTimer.stop(); code.setText(QString()); + rpcClear(); +} + +void IntroCode::cancelled() { if (sentRequest) { MTP::cancel(sentRequest); sentRequest = 0; } -} - -void IntroCode::deactivate() { - callTimer.stop(); - hide(); - code.clearFocus(); + MTP::send(MTPauth_CancelCode(MTP_string(intro()->getPhone()), MTP_string(intro()->getPhoneHash()))); } void IntroCode::stopCheck() { @@ -218,9 +222,9 @@ void IntroCode::onCheckRequest() { if (leftms >= 1000) { if (sentRequest) { MTP::cancel(sentRequest); - sentCode = ""; + sentRequest = 0; + sentCode.clear(); } - sentRequest = 0; if (!code.isEnabled()) { code.setDisabled(false); code.setFocus(); @@ -234,6 +238,7 @@ void IntroCode::onCheckRequest() { void IntroCode::codeSubmitDone(const MTPauth_Authorization &result) { stopCheck(); + sentRequest = 0; code.setDisabled(false); const MTPDauth_authorization &d(result.c_auth_authorization()); if (d.vuser.type() != mtpc_user || !d.vuser.c_user().is_self()) { // wtf? @@ -246,10 +251,11 @@ void IntroCode::codeSubmitDone(const MTPauth_Authorization &result) { bool IntroCode::codeSubmitFail(const RPCError &error) { stopCheck(); + sentRequest = 0; code.setDisabled(false); const QString &err = error.type(); if (err == "PHONE_NUMBER_INVALID" || err == "PHONE_CODE_EXPIRED") { // show error - onBack(); + intro()->onBack(); return true; } else if (err == "PHONE_CODE_EMPTY" || err == "PHONE_CODE_INVALID") { showError(lang(lng_bad_code)); @@ -257,7 +263,7 @@ bool IntroCode::codeSubmitFail(const RPCError &error) { return true; } else if (err == "PHONE_NUMBER_UNOCCUPIED") { // success, need to signUp intro()->setCode(sentCode); - intro()->onIntroNext(); + intro()->nextStep(new IntroSignup(intro())); return true; } else if (err == "SESSION_PASSWORD_NEEDED") { intro()->setCode(sentCode); @@ -280,14 +286,14 @@ bool IntroCode::codeSubmitFail(const RPCError &error) { } void IntroCode::onInputChange() { - showError(""); + showError(QString()); if (code.text().length() == 5) onSubmitCode(); } void IntroCode::onSendCall() { if (!--waitTillCall) { callTimer.stop(); - MTP::send(MTPauth_SendCall(MTP_string(intro()->getPhone()), MTP_string(intro()->getPhoneHash())), rpcDone(&IntroCode::callDone)); + MTP::send(MTPauth_ResendCode(MTP_string(intro()->getPhone()), MTP_string(intro()->getPhoneHash())), rpcDone(&IntroCode::callDone)); } update(); } @@ -301,6 +307,7 @@ void IntroCode::callDone(const MTPBool &v) { void IntroCode::gotPassword(const MTPaccount_Password &result) { stopCheck(); + sentRequest = 0; code.setDisabled(false); switch (result.type()) { case mtpc_account_noPassword: // should not happen @@ -312,18 +319,18 @@ void IntroCode::gotPassword(const MTPaccount_Password &result) { intro()->setPwdSalt(qba(d.vcurrent_salt)); intro()->setHasRecovery(mtpIsTrue(d.vhas_recovery)); intro()->setPwdHint(qs(d.vhint)); - intro()->onIntroNext(); + intro()->nextStep(new IntroPwdCheck(intro())); } break; } } -void IntroCode::onSubmitCode(bool force) { - if (!force && (code.text() == sentCode || !code.isEnabled())) return; +void IntroCode::onSubmitCode() { + if (sentRequest) return; code.setDisabled(true); setFocus(); - showError(""); + showError(QString()); checkRequest.start(1000); @@ -336,7 +343,7 @@ void IntroCode::onSubmitCode(bool force) { void IntroCode::onNoTelegramCode() { if (_noTelegramCodeRequestId) return; - _noTelegramCodeRequestId = MTP::send(MTPauth_SendSms(MTP_string(intro()->getPhone()), MTP_string(intro()->getPhoneHash())), rpcDone(&IntroCode::noTelegramCodeDone), rpcFail(&IntroCode::noTelegramCodeFail)); + _noTelegramCodeRequestId = MTP::send(MTPauth_ResendCode(MTP_string(intro()->getPhone()), MTP_string(intro()->getPhoneHash())), rpcDone(&IntroCode::noTelegramCodeDone), rpcFail(&IntroCode::noTelegramCodeFail)); } void IntroCode::noTelegramCodeDone(const MTPBool &result) { @@ -359,10 +366,6 @@ bool IntroCode::noTelegramCodeFail(const RPCError &error) { return false; } -void IntroCode::onNext() { +void IntroCode::onSubmit() { onSubmitCode(); } - -void IntroCode::onBack() { - intro()->onIntroBack(); -} diff --git a/Telegram/SourceFiles/intro/introcode.h b/Telegram/SourceFiles/intro/introcode.h index 174cb7c2b..def8f2871 100644 --- a/Telegram/SourceFiles/intro/introcode.h +++ b/Telegram/SourceFiles/intro/introcode.h @@ -23,9 +23,9 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #include #include "gui/flatbutton.h" #include "gui/flatinput.h" -#include "intro.h" +#include "intro/introwidget.h" -class CodeInput : public FlatInput { +class CodeInput final : public FlatInput { Q_OBJECT public: @@ -42,7 +42,7 @@ protected: }; -class IntroCode : public IntroStage, public RPCSender { +class IntroCode final : public IntroStep { Q_OBJECT public: @@ -54,15 +54,13 @@ public: void step_error(float64 ms, bool timer); - void activate(); - void prepareShow(); - void deactivate(); - void onNext(); - void onBack(); - bool hasBack() const { return true; } + void activate() override; + void finished() override; + void cancelled() override; + void onSubmit() override; void codeSubmitDone(const MTPauth_Authorization &result); bool codeSubmitFail(const RPCError &error); @@ -71,7 +69,7 @@ public: public slots: - void onSubmitCode(bool force = false); + void onSubmitCode(); void onNoTelegramCode(); void onInputChange(); void onSendCall(); diff --git a/Telegram/SourceFiles/intro/introphone.cpp b/Telegram/SourceFiles/intro/introphone.cpp index 482e47811..05cfc240c 100644 --- a/Telegram/SourceFiles/intro/introphone.cpp +++ b/Telegram/SourceFiles/intro/introphone.cpp @@ -25,7 +25,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #include "application.h" #include "intro/introphone.h" -#include "intro/intro.h" +#include "intro/introcode.h" namespace { class SignUpLink : public ITextLink { @@ -45,7 +45,7 @@ namespace { }; } -IntroPhone::IntroPhone(IntroWidget *parent) : IntroStage(parent) +IntroPhone::IntroPhone(IntroWidget *parent) : IntroStep(parent) , a_errorAlpha(0) , _a_error(animation(this, &IntroPhone::step_error)) , changed(false) @@ -54,11 +54,11 @@ IntroPhone::IntroPhone(IntroWidget *parent) : IntroStage(parent) , phone(this, st::inpIntroPhone) , code(this, st::inpIntroCountryCode) , _signup(this, lng_phone_notreg(lt_signup_start, textcmdStartLink(1), lt_signup_end, textcmdStopLink()), st::introErrLabel, st::introErrLabelTextStyle) -, _showSignup(false) { +, _showSignup(false) +, sentRequest(0) { setVisible(false); setGeometry(parent->innerRect()); - connect(&next, SIGNAL(stateChanged(int, ButtonStateChangeSource)), parent, SLOT(onDoneStateChanged(int, ButtonStateChangeSource))); connect(&next, SIGNAL(clicked()), this, SLOT(onSubmitPhone())); connect(&phone, SIGNAL(voidBackspace(QKeyEvent*)), &code, SLOT(startErasing(QKeyEvent*))); connect(&country, SIGNAL(codeChanged(const QString &)), &code, SLOT(codeSelected(const QString &))); @@ -145,7 +145,7 @@ void IntroPhone::step_error(float64 ms, bool timer) { _a_error.stop(); a_errorAlpha.finish(); if (!a_errorAlpha.current()) { - error = ""; + error.clear(); _signup.hide(); } else if (!error.isEmpty() && _showSignup) { _signup.show(); @@ -164,7 +164,7 @@ void IntroPhone::countryChanged() { void IntroPhone::onInputChange() { changed = true; - showError(""); + showError(QString()); } void IntroPhone::disableAll() { @@ -183,8 +183,8 @@ void IntroPhone::enableAll(bool failed) { if (failed) phone.setFocus(); } -void IntroPhone::onSubmitPhone(bool force) { - if (!force && !next.isEnabled()) return; +void IntroPhone::onSubmitPhone() { + if (sentRequest || isHidden()) return; if (!App::isValidPhone(fullNumber())) { showError(lang(lng_bad_phone)); @@ -193,7 +193,7 @@ void IntroPhone::onSubmitPhone(bool force) { } disableAll(); - showError(""); + showError(QString()); checkRequest.start(1000); @@ -226,45 +226,56 @@ void IntroPhone::phoneCheckDone(const MTPauth_CheckedPhone &result) { const MTPDauth_checkedPhone &d(result.c_auth_checkedPhone()); if (mtpIsTrue(d.vphone_registered)) { disableAll(); - showError(""); + showError(QString()); checkRequest.start(1000); - sentRequest = MTP::send(MTPauth_SendCode(MTP_string(sentPhone), MTP_int(5), MTP_int(ApiId), MTP_string(ApiHash), MTP_string(Sandbox::LangSystemISO())), rpcDone(&IntroPhone::phoneSubmitDone), rpcFail(&IntroPhone::phoneSubmitFail)); + int32 flags = 0; + sentRequest = MTP::send(MTPauth_SendCode(MTP_int(flags), MTP_string(sentPhone), MTPBool(), MTP_int(ApiId), MTP_string(ApiHash), MTP_string(Sandbox::LangSystemISO())), rpcDone(&IntroPhone::phoneSubmitDone), rpcFail(&IntroPhone::phoneSubmitFail)); } else { showError(lang(lng_bad_phone_noreg), true); enableAll(true); + sentRequest = 0; } } void IntroPhone::phoneSubmitDone(const MTPauth_SentCode &result) { stopCheck(); - enableAll(false); + sentRequest = 0; + enableAll(true); - if (result.type() == mtpc_auth_sentCode) { - const MTPDauth_sentCode &d(result.c_auth_sentCode()); - intro()->setPhone(sentPhone, d.vphone_code_hash.c_string().v.c_str(), mtpIsTrue(d.vphone_registered)); - intro()->setCallTimeout(d.vsend_call_timeout.v); - } else if (result.type() == mtpc_auth_sentAppCode) { - const MTPDauth_sentAppCode &d(result.c_auth_sentAppCode()); - intro()->setPhone(sentPhone, d.vphone_code_hash.c_string().v.c_str(), mtpIsTrue(d.vphone_registered)); - intro()->setCallTimeout(d.vsend_call_timeout.v); - intro()->setCodeByTelegram(true); + if (result.type() != mtpc_auth_sentCode) { + showError(lang(lng_server_error)); + return; } - intro()->onIntroNext(); + + const MTPDauth_sentCode &d(result.c_auth_sentCode()); + switch (d.vtype.type()) { + case mtpc_auth_sentCodeTypeApp: intro()->setCodeByTelegram(true); + case mtpc_auth_sentCodeTypeSms: intro()->setCodeByTelegram(false); + case mtpc_auth_sentCodeTypeCall: intro()->setCodeByTelegram(false); + case mtpc_auth_sentCodeTypeFlashCall: LOG(("Error: should not be flashcall!")); break; + } + intro()->setPhone(sentPhone, d.vphone_code_hash.c_string().v.c_str(), d.is_phone_registered()); + if (d.has_timeout() && d.has_next_type() && d.vnext_type.type() == mtpc_auth_codeTypeCall) { + intro()->setCallTimeout(d.vtimeout.v); + } + intro()->nextStep(new IntroCode(intro())); } void IntroPhone::toSignUp() { disableAll(); - showError(""); + showError(QString()); checkRequest.start(1000); - sentRequest = MTP::send(MTPauth_SendCode(MTP_string(sentPhone), MTP_int(0), MTP_int(ApiId), MTP_string(ApiHash), MTP_string(Sandbox::LangSystemISO())), rpcDone(&IntroPhone::phoneSubmitDone), rpcFail(&IntroPhone::phoneSubmitFail)); + int32 flags = 0; + sentRequest = MTP::send(MTPauth_SendCode(MTP_int(flags), MTP_string(sentPhone), MTPBool(), MTP_int(ApiId), MTP_string(ApiHash), MTP_string(Sandbox::LangSystemISO())), rpcDone(&IntroPhone::phoneSubmitDone), rpcFail(&IntroPhone::phoneSubmitFail)); } bool IntroPhone::phoneSubmitFail(const RPCError &error) { stopCheck(); + sentRequest = 0; const QString &err = error.type(); if (err == "PHONE_NUMBER_INVALID") { // show error showError(lang(lng_bad_phone)); @@ -293,21 +304,27 @@ void IntroPhone::selectCountry(const QString &c) { } void IntroPhone::activate() { - error = ""; + IntroStep::activate(); + phone.setFocus(); +} + +void IntroPhone::finished() { + IntroStep::finished(); + checkRequest.stop(); + rpcClear(); + + error.clear(); a_errorAlpha = anim::fvalue(0); - show(); enableAll(true); } -void IntroPhone::deactivate() { - checkRequest.stop(); - hide(); - phone.clearFocus(); +void IntroPhone::cancelled() { + if (sentRequest) { + MTP::cancel(sentRequest); + sentRequest = 0; + } } -void IntroPhone::onNext() { +void IntroPhone::onSubmit() { onSubmitPhone(); } - -void IntroPhone::onBack() { -} diff --git a/Telegram/SourceFiles/intro/introphone.h b/Telegram/SourceFiles/intro/introphone.h index 3a4357112..d129b05f8 100644 --- a/Telegram/SourceFiles/intro/introphone.h +++ b/Telegram/SourceFiles/intro/introphone.h @@ -23,26 +23,26 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #include #include "gui/flatbutton.h" #include "gui/countryinput.h" -#include "intro.h" +#include "intro/introwidget.h" -class IntroPhone : public IntroStage, public RPCSender { +class IntroPhone final : public IntroStep { Q_OBJECT public: IntroPhone(IntroWidget *parent); - void paintEvent(QPaintEvent *e); - void resizeEvent(QResizeEvent *e); + void paintEvent(QPaintEvent *e) override; + void resizeEvent(QResizeEvent *e) override; void step_error(float64 ms, bool timer); void selectCountry(const QString &country); - void activate(); - void deactivate(); - void onNext(); - void onBack(); + void activate() override; + void finished() override; + void cancelled() override; + void onSubmit() override; void phoneCheckDone(const MTPauth_CheckedPhone &result); void phoneSubmitDone(const MTPauth_SentCode &result); @@ -54,7 +54,7 @@ public slots: void countryChanged(); void onInputChange(); - void onSubmitPhone(bool force = false); + void onSubmitPhone(); void onCheckRequest(); private: diff --git a/Telegram/SourceFiles/intro/intropwdcheck.cpp b/Telegram/SourceFiles/intro/intropwdcheck.cpp index 9e4ba5acd..3f2a0d5bd 100644 --- a/Telegram/SourceFiles/intro/intropwdcheck.cpp +++ b/Telegram/SourceFiles/intro/intropwdcheck.cpp @@ -28,9 +28,8 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #include "application.h" #include "intro/intropwdcheck.h" -#include "intro/intro.h" -IntroPwdCheck::IntroPwdCheck(IntroWidget *parent) : IntroStage(parent) +IntroPwdCheck::IntroPwdCheck(IntroWidget *parent) : IntroStep(parent) , a_errorAlpha(0) , _a_error(animation(this, &IntroPwdCheck::step_error)) , _next(this, lang(lng_intro_submit), st::btnIntroNext) @@ -130,7 +129,7 @@ void IntroPwdCheck::step_error(float64 ms, bool timer) { _a_error.stop(); a_errorAlpha.finish(); if (!a_errorAlpha.current()) { - error = ""; + error.clear(); } } else { a_errorAlpha.update(dt, st::introErrFunc); @@ -139,7 +138,7 @@ void IntroPwdCheck::step_error(float64 ms, bool timer) { } void IntroPwdCheck::activate() { - show(); + IntroStep::activate(); if (_pwdField.isHidden()) { _codeField.setFocus(); } else { @@ -147,8 +146,11 @@ void IntroPwdCheck::activate() { } } -void IntroPwdCheck::deactivate() { - hide(); +void IntroPwdCheck::cancelled() { + if (sentRequest) { + MTP::cancel(sentRequest); + sentRequest = 0; + } } void IntroPwdCheck::stopCheck() { @@ -202,7 +204,7 @@ bool IntroPwdCheck::pwdSubmitFail(const RPCError &error) { _pwdField.notaBene(); return true; } else if (err == "PASSWORD_EMPTY") { - intro()->onIntroBack(); + intro()->onBack(); } else if (mtpIsFlood(error)) { showError(lang(lng_flood_error)); _pwdField.notaBene(); @@ -224,7 +226,7 @@ bool IntroPwdCheck::codeSubmitFail(const RPCError &error) { _codeField.setDisabled(false); const QString &err = error.type(); if (err == "PASSWORD_EMPTY") { - intro()->onIntroBack(); + intro()->onBack(); return true; } else if (err == "PASSWORD_RECOVERY_NA") { recoverStartFail(error); @@ -265,7 +267,7 @@ bool IntroPwdCheck::recoverStartFail(const RPCError &error) { _codeField.hide(); _pwdField.setFocus(); update(); - showError(""); + showError(QString()); return true; } @@ -275,7 +277,7 @@ void IntroPwdCheck::onToRecover() { MTP::cancel(sentRequest); sentRequest = 0; } - showError(""); + showError(QString()); _toRecover.hide(); _toPassword.show(); _pwdField.hide(); @@ -335,11 +337,11 @@ bool IntroPwdCheck::deleteFail(const RPCError &error) { void IntroPwdCheck::deleteDone(const MTPBool &v) { Ui::hideLayer(); - intro()->onIntroNext(); + intro()->onBack(); } void IntroPwdCheck::onInputChange() { - showError(""); + showError(QString()); } void IntroPwdCheck::onSubmitPwd(bool force) { @@ -359,7 +361,7 @@ void IntroPwdCheck::onSubmitPwd(bool force) { _pwdField.setDisabled(true); setFocus(); - showError(""); + showError(QString()); QByteArray pwdData = _salt + _pwdField.text().toUtf8() + _salt, pwdHash(32, Qt::Uninitialized); hashSha256(pwdData.constData(), pwdData.size(), pwdHash.data()); @@ -367,9 +369,6 @@ void IntroPwdCheck::onSubmitPwd(bool force) { } } -void IntroPwdCheck::onNext() { +void IntroPwdCheck::onSubmit() { onSubmitPwd(); } - -void IntroPwdCheck::onBack() { -} diff --git a/Telegram/SourceFiles/intro/intropwdcheck.h b/Telegram/SourceFiles/intro/intropwdcheck.h index 9a0d1c1f6..9814a5743 100644 --- a/Telegram/SourceFiles/intro/intropwdcheck.h +++ b/Telegram/SourceFiles/intro/intropwdcheck.h @@ -23,9 +23,9 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #include #include "gui/flatbutton.h" #include "gui/flatinput.h" -#include "intro.h" +#include "intro/introwidget.h" -class IntroPwdCheck final : public IntroStage, public RPCSender { +class IntroPwdCheck final : public IntroStep { Q_OBJECT public: @@ -37,10 +37,9 @@ public: void step_error(float64 ms, bool timer); - void activate(); - void deactivate(); - void onNext(); - void onBack(); + void activate() override; + void cancelled() override; + void onSubmit() override; void pwdSubmitDone(bool recover, const MTPauth_Authorization &result); bool pwdSubmitFail(const RPCError &error); diff --git a/Telegram/SourceFiles/intro/introsignup.cpp b/Telegram/SourceFiles/intro/introsignup.cpp index 78d01ffb6..590231727 100644 --- a/Telegram/SourceFiles/intro/introsignup.cpp +++ b/Telegram/SourceFiles/intro/introsignup.cpp @@ -28,9 +28,8 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #include "application.h" #include "intro/introsignup.h" -#include "intro/intro.h" -IntroSignup::IntroSignup(IntroWidget *parent) : IntroStage(parent) +IntroSignup::IntroSignup(IntroWidget *parent) : IntroStep(parent) , a_errorAlpha(0) , a_photoOver(0) , _a_error(animation(this, &IntroSignup::step_error)) @@ -38,6 +37,7 @@ IntroSignup::IntroSignup(IntroWidget *parent) : IntroStage(parent) , next(this, lang(lng_intro_finish), st::btnIntroNext) , first(this, st::inpIntroName, lang(lng_signup_firstname)) , last(this, st::inpIntroName, lang(lng_signup_lastname)) +, sentRequest(0) , _invertOrder(langFirstNameGoesSecond()) { setVisible(false); setGeometry(parent->innerRect()); @@ -180,7 +180,7 @@ void IntroSignup::step_error(float64 ms, bool timer) { _a_error.stop(); a_errorAlpha.finish(); if (!a_errorAlpha.current()) { - error = ""; + error.clear(); } } else { a_errorAlpha.update(dt, st::introErrFunc); @@ -201,7 +201,7 @@ void IntroSignup::step_photo(float64 ms, bool timer) { } void IntroSignup::activate() { - show(); + IntroStep::activate(); if (_invertOrder) { last.setFocus(); } else { @@ -209,8 +209,11 @@ void IntroSignup::activate() { } } -void IntroSignup::deactivate() { - hide(); +void IntroSignup::cancelled() { + if (sentRequest) { + MTP::cancel(sentRequest); + sentRequest = 0; + } } void IntroSignup::stopCheck() { @@ -264,7 +267,7 @@ bool IntroSignup::nameSubmitFail(const RPCError &error) { last.setDisabled(false); const QString &err = error.type(); if (err == "PHONE_NUMBER_INVALID" || err == "PHONE_CODE_EXPIRED" || err == "PHONE_CODE_EMPTY" || err == "PHONE_CODE_INVALID" || err == "PHONE_NUMBER_OCCUPIED") { - intro()->onIntroBack(); + intro()->onBack(); return true; } else if (err == "FIRSTNAME_INVALID") { showError(lang(lng_bad_name)); @@ -297,7 +300,7 @@ bool IntroSignup::nameSubmitFail(const RPCError &error) { } void IntroSignup::onInputChange() { - showError(""); + showError(QString()); } void IntroSignup::onSubmitName(bool force) { @@ -324,16 +327,13 @@ void IntroSignup::onSubmitName(bool force) { last.setDisabled(true); setFocus(); - showError(""); + showError(QString()); firstName = first.text().trimmed(); lastName = last.text().trimmed(); sentRequest = MTP::send(MTPauth_SignUp(MTP_string(intro()->getPhone()), MTP_string(intro()->getPhoneHash()), MTP_string(intro()->getCode()), MTP_string(firstName), MTP_string(lastName)), rpcDone(&IntroSignup::nameSubmitDone), rpcFail(&IntroSignup::nameSubmitFail)); } -void IntroSignup::onNext() { +void IntroSignup::onSubmit() { onSubmitName(); } - -void IntroSignup::onBack() { -} diff --git a/Telegram/SourceFiles/intro/introsignup.h b/Telegram/SourceFiles/intro/introsignup.h index 4a9f7df3e..cd166b8a5 100644 --- a/Telegram/SourceFiles/intro/introsignup.h +++ b/Telegram/SourceFiles/intro/introsignup.h @@ -23,9 +23,9 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #include #include "gui/flatbutton.h" #include "gui/flatinput.h" -#include "intro.h" +#include "intro/introwidget.h" -class IntroSignup : public IntroStage, public RPCSender { +class IntroSignup final : public IntroStep { Q_OBJECT public: @@ -40,10 +40,9 @@ public: void step_error(float64 ms, bool timer); void step_photo(float64 ms, bool timer); - void activate(); - void deactivate(); - void onNext(); - void onBack(); + void activate() override; + void cancelled() override; + void onSubmit() override; void nameSubmitDone(const MTPauth_Authorization &result); bool nameSubmitFail(const RPCError &error); diff --git a/Telegram/SourceFiles/intro/introsteps.cpp b/Telegram/SourceFiles/intro/introstart.cpp similarity index 77% rename from Telegram/SourceFiles/intro/introsteps.cpp rename to Telegram/SourceFiles/intro/introstart.cpp index d55c7ccad..fa900a45e 100644 --- a/Telegram/SourceFiles/intro/introsteps.cpp +++ b/Telegram/SourceFiles/intro/introstart.cpp @@ -24,16 +24,15 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #include "application.h" -#include "intro/introsteps.h" -#include "intro/intro.h" +#include "intro/introstart.h" +#include "intro/introphone.h" #include "langloaderplain.h" -IntroSteps::IntroSteps(IntroWidget *parent) : IntroStage(parent), -_intro(this, lang(lng_intro), st::introLabel, st::introLabelTextStyle), -_changeLang(this, QString()), -_next(this, lang(lng_start_msgs), st::btnIntroNext) { - +IntroStart::IntroStart(IntroWidget *parent) : IntroStep(parent) +, _intro(this, lang(lng_intro), st::introLabel, st::introLabelTextStyle) +, _changeLang(this, QString()) +, _next(this, lang(lng_start_msgs), st::btnIntroNext) { _changeLang.hide(); if (cLang() == languageDefault) { int32 l = Sandbox::LangSystem(); @@ -56,15 +55,14 @@ _next(this, lang(lng_start_msgs), st::btnIntroNext) { setGeometry(parent->innerRect()); - connect(&_next, SIGNAL(stateChanged(int, ButtonStateChangeSource)), parent, SLOT(onDoneStateChanged(int, ButtonStateChangeSource))); - connect(&_next, SIGNAL(clicked()), parent, SLOT(onIntroNext())); + connect(&_next, SIGNAL(clicked()), parent, SLOT(onStepSubmit())); connect(&_changeLang, SIGNAL(clicked()), parent, SLOT(onChangeLang())); setMouseTracking(true); } -void IntroSteps::paintEvent(QPaintEvent *e) { +void IntroStart::paintEvent(QPaintEvent *e) { bool trivial = (rect() == e->rect()); QPainter p(this); @@ -80,7 +78,7 @@ void IntroSteps::paintEvent(QPaintEvent *e) { p.drawPixmap(QPoint((width() - st::aboutIcon.pxWidth()) / 2, hy - st::introIconSkip - st::aboutIcon.pxHeight()), App::sprite(), st::aboutIcon); } -void IntroSteps::resizeEvent(QResizeEvent *e) { +void IntroStart::resizeEvent(QResizeEvent *e) { if (e->oldSize().width() != width()) { _next.move((width() - _next.width()) / 2, st::introBtnTop); _intro.move((width() - _intro.width()) / 2, _next.y() - _intro.height() - st::introSkip); @@ -88,17 +86,6 @@ void IntroSteps::resizeEvent(QResizeEvent *e) { } } -void IntroSteps::activate() { - show(); -} - -void IntroSteps::deactivate() { - hide(); -} - -void IntroSteps::onNext() { - intro()->onIntroNext(); -} - -void IntroSteps::onBack() { +void IntroStart::onSubmit() { + intro()->nextStep(new IntroPhone(intro())); } diff --git a/Telegram/SourceFiles/intro/introsteps.h b/Telegram/SourceFiles/intro/introstart.h similarity index 79% rename from Telegram/SourceFiles/intro/introsteps.h rename to Telegram/SourceFiles/intro/introstart.h index e554f11fb..8bd86075d 100644 --- a/Telegram/SourceFiles/intro/introsteps.h +++ b/Telegram/SourceFiles/intro/introstart.h @@ -20,21 +20,17 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org */ #pragma once -#include "gui/flatbutton.h" -#include "intro.h" +#include "intro/introwidget.h" -class IntroSteps : public IntroStage { +class IntroStart final : public IntroStep { public: - IntroSteps(IntroWidget *parent); + IntroStart(IntroWidget *parent); - void paintEvent(QPaintEvent *e); - void resizeEvent(QResizeEvent *e); + void paintEvent(QPaintEvent *e) override; + void resizeEvent(QResizeEvent *e) override; - void activate(); - void deactivate(); - void onNext(); - void onBack(); + void onSubmit() override; private: diff --git a/Telegram/SourceFiles/intro/intro.cpp b/Telegram/SourceFiles/intro/introwidget.cpp similarity index 69% rename from Telegram/SourceFiles/intro/intro.cpp rename to Telegram/SourceFiles/intro/introwidget.cpp index ec2c1bafd..bb5a25555 100644 --- a/Telegram/SourceFiles/intro/intro.cpp +++ b/Telegram/SourceFiles/intro/introwidget.cpp @@ -24,8 +24,8 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #include "localstorage.h" -#include "intro/intro.h" -#include "intro/introsteps.h" +#include "intro/introwidget.h" +#include "intro/introstart.h" #include "intro/introphone.h" #include "intro/introcode.h" #include "intro/introsignup.h" @@ -52,19 +52,12 @@ namespace { } } -IntroWidget::IntroWidget(Window *window) : TWidget(window) +IntroWidget::IntroWidget(QWidget *parent) : TWidget(parent) , _langChangeTo(0) , _a_stage(animation(this, &IntroWidget::step_stage)) , _cacheHideIndex(0) , _cacheShowIndex(0) , _a_show(animation(this, &IntroWidget::step_show)) -, steps(new IntroSteps(this)) -, phone(0) -, code(0) -, signup(0) -, pwdcheck(0) -, current(0) -, moving(0) , _callTimeout(60) , _registered(false) , _hasRecovery(false) @@ -74,7 +67,7 @@ IntroWidget::IntroWidget(Window *window) : TWidget(window) , _backTo(0) { setGeometry(QRect(0, st::titleHeight, App::wnd()->width(), App::wnd()->height() - st::titleHeight)); - connect(&_back, SIGNAL(clicked()), this, SLOT(onIntroBack())); + connect(&_back, SIGNAL(clicked()), this, SLOT(onBack())); _back.hide(); countryForReg = psCurrentCountry(); @@ -82,11 +75,10 @@ IntroWidget::IntroWidget(Window *window) : TWidget(window) MTP::send(MTPhelp_GetNearestDc(), rpcDone(gotNearestDC)); signalEmitOn = this; - stages[0] = steps; - memset(stages + 1, 0, sizeof(QWidget*) * 3); + _stepHistory.push_back(new IntroStart(this)); _back.raise(); - connect(window, SIGNAL(resized(const QSize&)), this, SLOT(onParentResize(const QSize&))); + connect(parent, SIGNAL(resized(const QSize&)), this, SLOT(onParentResize(const QSize&))); show(); setFocus(); @@ -112,92 +104,77 @@ void IntroWidget::onParentResize(const QSize &newSize) { resize(newSize); } -void IntroWidget::onIntroBack() { - if (!current) return; - moving = (current == 4) ? -2 : -1; - prepareMove(); +void IntroWidget::onStepSubmit() { + step()->onSubmit(); } -void IntroWidget::onIntroNext() { - if (!createNext()) return; - moving = 1; - prepareMove(); +void IntroWidget::onBack() { + historyMove(MoveBack); } -bool IntroWidget::createNext() { - if (current == sizeof(stages) / sizeof(stages[0]) - 1) return false; - if (!stages[current + 1]) { - switch (current) { - case 0: stages[current + 1] = phone = new IntroPhone(this); break; - case 1: stages[current + 1] = code = new IntroCode(this); break; - case 2: - if (_pwdSalt.isEmpty()) { - if (signup) delete signup; - stages[current + 1] = signup = new IntroSignup(this); - } else { - stages[current + 1] = pwdcheck = new IntroPwdCheck(this); - } - break; - case 3: stages[current + 1] = signup = new IntroSignup(this); break; - } - } - _back.raise(); - return true; -} +void IntroWidget::historyMove(MoveType type) { + if (_a_stage.animating()) return; + + t_assert(_stepHistory.size() > 1); -void IntroWidget::prepareMove() { if (App::app()) App::app()->mtpPause(); - if (_cacheHide.isNull() || _cacheHideIndex != current) makeHideCache(); + switch (type) { + case MoveBack: { + _cacheHide = grabStep(); - stages[current + moving]->prepareShow(); - if (_cacheShow.isNull() || _cacheShowIndex != current + moving) makeShowCache(); + IntroStep *back = step(); + _backFrom = back->hasBack() ? 1 : 0; + _stepHistory.pop_back(); + back->cancelled(); + delete back; + } break; - int32 m = (moving > 0) ? 1 : -1; + case MoveForward: { + _cacheHide = grabStep(1); + _backFrom = step(1)->hasBack() ? 1 : 0; + step(1)->finished(); + } break; + + case MoveReplace: { + _cacheHide = grabStep(1); + IntroStep *replaced = step(1); + _backFrom = replaced->hasBack() ? 1 : 0; + _stepHistory.removeAt(_stepHistory.size() - 2); + replaced->finished(); + delete replaced; + } break; + } + + _cacheShow = grabStep(); + _backTo = step()->hasBack() ? 1 : 0; + + int32 m = (type == MoveBack) ? -1 : 1; a_coordHide = anim::ivalue(0, -m * st::introSlideShift); a_opacityHide = anim::fvalue(1, 0); a_coordShow = anim::ivalue(m * st::introSlideShift, 0); a_opacityShow = anim::fvalue(0, 1); _a_stage.start(); - _backTo = stages[current + moving]->hasBack() ? 1 : 0; - _backFrom = stages[current]->hasBack() ? 1 : 0; _a_stage.step(); if (_backFrom > 0 || _backTo > 0) { _back.show(); } else { _back.hide(); } - stages[current]->deactivate(); - stages[current + moving]->hide(); + step()->hide(); } -void IntroWidget::onDoneStateChanged(int oldState, ButtonStateChangeSource source) { - if (_a_stage.animating()) return; - if (source == ButtonByPress) { - if (oldState & Button::StateDown) { - _cacheHide = QPixmap(); - } else { - makeHideCache(); - } - } else if (source == ButtonByHover && current != 2) { - if (!createNext()) return; - if (!_cacheShow) makeShowCache(current + 1); - } +void IntroWidget::pushStep(IntroStep *step, MoveType type) { + _stepHistory.push_back(step); + _back.raise(); + _stepHistory.back()->hide(); + + historyMove(type); } -void IntroWidget::makeHideCache(int stage) { - if (stage < 0) stage = current; - int w = st::introSize.width(), h = st::introSize.height(); - _cacheHide = myGrab(stages[stage], QRect(st::introSlideShift, 0, w, h)); - _cacheHideIndex = stage; -} - -void IntroWidget::makeShowCache(int stage) { - if (stage < 0) stage = current + moving; - int w = st::introSize.width(), h = st::introSize.height(); - _cacheShow = myGrab(stages[stage], QRect(st::introSlideShift, 0, w, h)); - _cacheShowIndex = stage; +QPixmap IntroWidget::grabStep(int skip) { + return myGrab(step(skip), QRect(st::introSlideShift, 0, st::introSize.width(), st::introSize.height())); } void IntroWidget::animShow(const QPixmap &bgAnimCache, bool back) { @@ -206,8 +183,8 @@ void IntroWidget::animShow(const QPixmap &bgAnimCache, bool back) { (back ? _cacheOver : _cacheUnder) = bgAnimCache; _a_show.stop(); - stages[current]->show(); - if (stages[current]->hasBack()) { + step()->show(); + if (step()->hasBack()) { _back.setOpacity(1); _back.show(); } else { @@ -215,8 +192,7 @@ void IntroWidget::animShow(const QPixmap &bgAnimCache, bool back) { } (back ? _cacheUnder : _cacheOver) = myGrab(this); - stages[current]->deactivate(); - stages[current]->hide(); + step()->hide(); _back.hide(); a_coordUnder = back ? anim::ivalue(-qFloor(st::slideShift * width()), 0) : anim::ivalue(0, -qFloor(st::slideShift * width())); @@ -239,9 +215,8 @@ void IntroWidget::step_show(float64 ms, bool timer) { _cacheUnder = _cacheOver = QPixmap(); setFocus(); - stages[current]->show(); - stages[current]->activate(); - if (stages[current]->hasBack()) { + step()->activate(); + if (step()->hasBack()) { _back.setOpacity(1); _back.show(); } @@ -269,11 +244,9 @@ void IntroWidget::step_stage(float64 ms, bool timer) { _cacheHide = _cacheShow = QPixmap(); - current += moving; - moving = 0; setFocus(); - stages[current]->activate(); - if (!stages[current]->hasBack()) { + step()->activate(); + if (!step()->hasBack()) { _back.hide(); } if (App::app()) App::app()->mtpUnpause(); @@ -312,9 +285,9 @@ void IntroWidget::paintEvent(QPaintEvent *e) { p.drawPixmap(QRect(a_coordOver.current() - st::slideShadow.pxWidth(), 0, st::slideShadow.pxWidth(), height()), App::sprite(), st::slideShadow); } else if (_a_stage.animating()) { p.setOpacity(a_opacityHide.current()); - p.drawPixmap(stages[current]->x() + st::introSlideShift + a_coordHide.current(), stages[current]->y(), _cacheHide); + p.drawPixmap(step()->x() + st::introSlideShift + a_coordHide.current(), step()->y(), _cacheHide); p.setOpacity(a_opacityShow.current()); - p.drawPixmap(stages[current + moving]->x() + st::introSlideShift + a_coordShow.current(), stages[current + moving]->y(), _cacheShow); + p.drawPixmap(step()->x() + st::introSlideShift + a_coordShow.current(), step()->y(), _cacheShow); } } @@ -339,11 +312,6 @@ void IntroWidget::setCode(const QString &code) { void IntroWidget::setPwdSalt(const QByteArray &salt) { _pwdSalt = salt; - delete signup; - delete pwdcheck; - stages[3] = stages[4] = 0; - signup = 0; - pwdcheck = 0; } void IntroWidget::setHasRecovery(bool has) { @@ -356,7 +324,6 @@ void IntroWidget::setPwdHint(const QString &hint) { void IntroWidget::setCodeByTelegram(bool byTelegram) { _codeByTelegram = byTelegram; - if (code) code->updateDescText(); } void IntroWidget::setCallTimeout(int32 callTimeout) { @@ -397,15 +364,9 @@ bool IntroWidget::codeByTelegram() const { void IntroWidget::resizeEvent(QResizeEvent *e) { QRect r(innerRect()); - if (steps) steps->setGeometry(r); - if (phone) phone->setGeometry(r); - if (code) code->setGeometry(r); - if (signup) signup->setGeometry(r); - if (pwdcheck) pwdcheck->setGeometry(r); -} - -void IntroWidget::mousePressEvent(QMouseEvent *e) { - + for (IntroStep *step : _stepHistory) { + step->setGeometry(r); + } } void IntroWidget::finish(const MTPUser &user, const QImage &photo) { @@ -419,9 +380,11 @@ void IntroWidget::keyPressEvent(QKeyEvent *e) { if (_a_show.animating() || _a_stage.animating()) return; if (e->key() == Qt::Key_Escape) { - stages[current]->onBack(); + if (step()->hasBack()) { + onBack(); + } } else if (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return || e->key() == Qt::Key_Space) { - stages[current]->onNext(); + onStepSubmit(); } } @@ -429,17 +392,16 @@ void IntroWidget::updateAdaptiveLayout() { } void IntroWidget::rpcClear() { - if (phone) phone->rpcClear(); - if (code) code->rpcClear(); - if (signup) signup->rpcClear(); - if (pwdcheck) pwdcheck->rpcClear(); + for (IntroStep *step : _stepHistory) { + step->rpcClear(); + } } IntroWidget::~IntroWidget() { - delete steps; - delete phone; - delete code; - delete signup; - delete pwdcheck; + while (!_stepHistory.isEmpty()) { + IntroStep *back = _stepHistory.back(); + _stepHistory.pop_back(); + delete back; + } if (App::wnd()) App::wnd()->noIntro(this); } diff --git a/Telegram/SourceFiles/intro/intro.h b/Telegram/SourceFiles/intro/introwidget.h similarity index 73% rename from Telegram/SourceFiles/intro/intro.h rename to Telegram/SourceFiles/intro/introwidget.h index bec0f7eb0..dc3868e15 100644 --- a/Telegram/SourceFiles/intro/intro.h +++ b/Telegram/SourceFiles/intro/introwidget.h @@ -20,26 +20,17 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org */ #pragma once -class Window; -class IntroSteps; -class IntroPhone; -class IntroCode; -class IntroSignup; -class IntroPwdCheck; -class IntroStage; -class Text; - +class IntroStep; class IntroWidget final : public TWidget { Q_OBJECT public: - IntroWidget(Window *window); + IntroWidget(QWidget *window); - void paintEvent(QPaintEvent *e); - void resizeEvent(QResizeEvent *e); - void mousePressEvent(QMouseEvent *e); - void keyPressEvent(QKeyEvent *e); + void paintEvent(QPaintEvent *e) override; + void resizeEvent(QResizeEvent *e) override; + void keyPressEvent(QKeyEvent *e) override; void updateAdaptiveLayout(); @@ -74,13 +65,19 @@ public: void rpcClear(); void langChangeTo(int32 langId); - ~IntroWidget(); + void nextStep(IntroStep *step) { + pushStep(step, MoveForward); + } + void replaceStep(IntroStep *step) { + pushStep(step, MoveReplace); + } + + ~IntroWidget() override; public slots: - void onIntroNext(); - void onIntroBack(); - void onDoneStateChanged(int oldState, ButtonStateChangeSource source); + void onStepSubmit(); + void onBack(); void onParentResize(const QSize &newSize); void onChangeLang(); @@ -90,12 +87,9 @@ signals: private: - void makeHideCache(int stage = -1); - void makeShowCache(int stage = -1); - void prepareMove(); - bool createNext(); + QPixmap grabStep(int skip = 0); - int32 _langChangeTo; + int _langChangeTo; Animation _a_stage; QPixmap _cacheHide, _cacheShow; @@ -108,13 +102,18 @@ private: anim::ivalue a_coordUnder, a_coordOver; anim::fvalue a_shadow; - IntroSteps *steps; - IntroPhone *phone; - IntroCode *code; - IntroSignup *signup; - IntroPwdCheck *pwdcheck; - IntroStage *stages[5]; - int current, moving; + QVector _stepHistory; + IntroStep *step(int skip = 0) { + t_assert(_stepHistory.size() + skip > 0); + return _stepHistory.at(_stepHistory.size() - skip - 1); + } + enum MoveType { + MoveBack, + MoveForward, + MoveReplace, + }; + void historyMove(MoveType type); + void pushStep(IntroStep *step, MoveType type); QString _phone, _phone_hash; int32 _callTimeout; @@ -133,21 +132,24 @@ private: }; -class IntroStage : public TWidget { +class IntroStep : public TWidget, public RPCSender { public: - IntroStage(IntroWidget *parent) : TWidget(parent) { + IntroStep(IntroWidget *parent) : TWidget(parent) { } - virtual void activate() = 0; // show and activate - virtual void prepareShow() { - } - virtual void deactivate() = 0; // deactivate and hide - virtual void onNext() = 0; - virtual void onBack() = 0; virtual bool hasBack() const { return false; } + virtual void activate() { + show(); + } + virtual void cancelled() { + } + virtual void finished() { + hide(); + } + virtual void onSubmit() = 0; protected: diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp index 6b51634d3..a6058b3ae 100644 --- a/Telegram/SourceFiles/mainwidget.cpp +++ b/Telegram/SourceFiles/mainwidget.cpp @@ -909,7 +909,7 @@ void MainWidget::forwardLayer(int32 forwardSelected) { void MainWidget::deleteLayer(int32 selectedCount) { if (selectedCount == -1 && !overview) { - if (auto item = App::contextItem()) { + if (HistoryItem *item = App::contextItem()) { if (item->suggestBanReportDeleteAll()) { Ui::showLayer(new RichDeleteMessageBox(item->history()->peer->asChannel(), item->from()->asUser(), item->id)); return; @@ -1067,16 +1067,16 @@ void MainWidget::deleteAllFromUser(ChannelData *channel, UserData *from) { t_assert(channel != nullptr && from != nullptr); QVector toDestroy; - if (auto history = App::historyLoaded(channel->id)) { - for (auto i = history->blocks.cbegin(), e = history->blocks.cend(); i != e; ++i) { - for (auto j = (*i)->items.cbegin(), n = (*i)->items.cend(); j != n; ++j) { - if ((*j)->from() == from && (*j)->type() == HistoryItemMsg && (*j)->canDelete()) { - toDestroy.push_back((*j)->id); + if (History *history = App::historyLoaded(channel->id)) { + for (HistoryBlock *block : history->blocks) { + for (HistoryItem *item : block->items) { + if (item->from() == from && item->type() == HistoryItemMsg && item->canDelete()) { + toDestroy.push_back(item->id); } } } - for (auto i = toDestroy.cbegin(), e = toDestroy.cend(); i != e; ++i) { - if (auto item = App::histItemById(peerToChannel(channel->id), *i)) { + for (const MsgId &msgId : toDestroy) { + if (HistoryItem *item = App::histItemById(peerToChannel(channel->id), msgId)) { item->destroy(); } } @@ -1095,7 +1095,7 @@ void MainWidget::deleteAllFromUserPart(DeleteAllFromUserParams params, const MTP if (!MTP::authedId()) return; if (offset > 0) { MTP::send(MTPchannels_DeleteUserHistory(params.channel->inputChannel, params.from->inputUser), rpcDone(&MainWidget::deleteAllFromUserPart, params)); - } else if (auto h = App::historyLoaded(params.channel)) { + } else if (History *h = App::historyLoaded(params.channel)) { if (!h->lastMsg) { checkPeerHistory(params.channel); } diff --git a/Telegram/SourceFiles/mtproto/mtpCoreTypes.h b/Telegram/SourceFiles/mtproto/mtpCoreTypes.h index 53965606c..3e2647d17 100644 --- a/Telegram/SourceFiles/mtproto/mtpCoreTypes.h +++ b/Telegram/SourceFiles/mtproto/mtpCoreTypes.h @@ -368,7 +368,7 @@ static const mtpTypeId mtpLayers[] = { mtpTypeId(mtpc_invokeWithLayer18), }; static const uint32 mtpLayerMaxSingle = sizeof(mtpLayers) / sizeof(mtpLayers[0]); -static const mtpPrime mtpCurrentLayer = 49; +static const mtpPrime mtpCurrentLayer = 50; template class MTPBoxed : public bareT { diff --git a/Telegram/SourceFiles/mtproto/mtpScheme.cpp b/Telegram/SourceFiles/mtproto/mtpScheme.cpp index 3133d7062..2efc246a1 100644 --- a/Telegram/SourceFiles/mtproto/mtpScheme.cpp +++ b/Telegram/SourceFiles/mtproto/mtpScheme.cpp @@ -1772,26 +1772,12 @@ void _serialize_auth_sentCode(MTPStringLogger &to, int32 stage, int32 lev, Types to.add("\n").addSpaces(lev); } switch (stage) { - case 0: to.add(" phone_registered: "); ++stages.back(); types.push_back(0); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; - case 1: to.add(" phone_code_hash: "); ++stages.back(); types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; - case 2: to.add(" send_call_timeout: "); ++stages.back(); types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; - case 3: to.add(" is_password: "); ++stages.back(); types.push_back(0); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; - default: to.add("}"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); break; - } -} - -void _serialize_auth_sentAppCode(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 flag) { - if (stage) { - to.add(",\n").addSpaces(lev); - } else { - to.add("{ auth_sentAppCode"); - to.add("\n").addSpaces(lev); - } - switch (stage) { - case 0: to.add(" phone_registered: "); ++stages.back(); types.push_back(0); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; - case 1: to.add(" phone_code_hash: "); ++stages.back(); types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; - case 2: to.add(" send_call_timeout: "); ++stages.back(); types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; - case 3: to.add(" is_password: "); ++stages.back(); types.push_back(0); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; + case 0: to.add(" flags: "); ++stages.back(); if (start >= end) throw Exception("start >= end in flags"); else flags.back() = *start; types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; + case 1: to.add(" phone_registered: "); ++stages.back(); if (flag & MTPDauth_sentCode::flag_phone_registered) { to.add("YES [ BY BIT 0 IN FIELD flags ]"); } else { to.add("[ SKIPPED BY BIT 0 IN FIELD flags ]"); } break; + case 2: to.add(" type: "); ++stages.back(); types.push_back(0); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; + case 3: to.add(" phone_code_hash: "); ++stages.back(); types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; + case 4: to.add(" next_type: "); ++stages.back(); if (flag & MTPDauth_sentCode::flag_next_type) { types.push_back(0); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 1 IN FIELD flags ]"); } break; + case 5: to.add(" timeout: "); ++stages.back(); if (flag & MTPDauth_sentCode::flag_timeout) { types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 2 IN FIELD flags ]"); } break; default: to.add("}"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); break; } } @@ -3847,20 +3833,6 @@ void _serialize_accountDaysTTL(MTPStringLogger &to, int32 stage, int32 lev, Type } } -void _serialize_account_sentChangePhoneCode(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 flag) { - if (stage) { - to.add(",\n").addSpaces(lev); - } else { - to.add("{ account_sentChangePhoneCode"); - to.add("\n").addSpaces(lev); - } - switch (stage) { - case 0: to.add(" phone_code_hash: "); ++stages.back(); types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; - case 1: to.add(" send_call_timeout: "); ++stages.back(); types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; - default: to.add("}"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); break; - } -} - void _serialize_documentAttributeImageSize(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 flag) { if (stage) { to.add(",\n").addSpaces(lev); @@ -5174,6 +5146,70 @@ void _serialize_channels_messageEditData(MTPStringLogger &to, int32 stage, int32 } } +void _serialize_auth_codeTypeSms(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 flag) { + to.add("{ auth_codeTypeSms }"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); +} + +void _serialize_auth_codeTypeCall(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 flag) { + to.add("{ auth_codeTypeCall }"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); +} + +void _serialize_auth_codeTypeFlashCall(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 flag) { + to.add("{ auth_codeTypeFlashCall }"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); +} + +void _serialize_auth_sentCodeTypeApp(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 flag) { + if (stage) { + to.add(",\n").addSpaces(lev); + } else { + to.add("{ auth_sentCodeTypeApp"); + to.add("\n").addSpaces(lev); + } + switch (stage) { + case 0: to.add(" length: "); ++stages.back(); types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; + default: to.add("}"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); break; + } +} + +void _serialize_auth_sentCodeTypeSms(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 flag) { + if (stage) { + to.add(",\n").addSpaces(lev); + } else { + to.add("{ auth_sentCodeTypeSms"); + to.add("\n").addSpaces(lev); + } + switch (stage) { + case 0: to.add(" length: "); ++stages.back(); types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; + default: to.add("}"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); break; + } +} + +void _serialize_auth_sentCodeTypeCall(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 flag) { + if (stage) { + to.add(",\n").addSpaces(lev); + } else { + to.add("{ auth_sentCodeTypeCall"); + to.add("\n").addSpaces(lev); + } + switch (stage) { + case 0: to.add(" length: "); ++stages.back(); types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; + default: to.add("}"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); break; + } +} + +void _serialize_auth_sentCodeTypeFlashCall(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 flag) { + if (stage) { + to.add(",\n").addSpaces(lev); + } else { + to.add("{ auth_sentCodeTypeFlashCall"); + to.add("\n").addSpaces(lev); + } + switch (stage) { + case 0: to.add(" pattern: "); ++stages.back(); types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; + default: to.add("}"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); break; + } +} + void _serialize_req_pq(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 flag) { if (stage) { to.add(",\n").addSpaces(lev); @@ -5303,20 +5339,6 @@ void _serialize_register_saveDeveloperInfo(MTPStringLogger &to, int32 stage, int } } -void _serialize_auth_sendCall(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 flag) { - if (stage) { - to.add(",\n").addSpaces(lev); - } else { - to.add("{ auth_sendCall"); - to.add("\n").addSpaces(lev); - } - switch (stage) { - case 0: to.add(" phone_number: "); ++stages.back(); types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; - case 1: to.add(" phone_code_hash: "); ++stages.back(); types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; - default: to.add("}"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); break; - } -} - void _serialize_auth_logOut(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 flag) { to.add("{ auth_logOut }"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); } @@ -5355,11 +5377,11 @@ void _serialize_auth_bindTempAuthKey(MTPStringLogger &to, int32 stage, int32 lev } } -void _serialize_auth_sendSms(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 flag) { +void _serialize_auth_cancelCode(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 flag) { if (stage) { to.add(",\n").addSpaces(lev); } else { - to.add("{ auth_sendSms"); + to.add("{ auth_cancelCode"); to.add("\n").addSpaces(lev); } switch (stage) { @@ -5943,11 +5965,43 @@ void _serialize_auth_sendCode(MTPStringLogger &to, int32 stage, int32 lev, Types to.add("\n").addSpaces(lev); } switch (stage) { + case 0: to.add(" flags: "); ++stages.back(); if (start >= end) throw Exception("start >= end in flags"); else flags.back() = *start; types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; + case 1: to.add(" allow_flashcall: "); ++stages.back(); if (flag & MTPauth_sendCode::flag_allow_flashcall) { to.add("YES [ BY BIT 0 IN FIELD flags ]"); } else { to.add("[ SKIPPED BY BIT 0 IN FIELD flags ]"); } break; + case 2: to.add(" phone_number: "); ++stages.back(); types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; + case 3: to.add(" current_number: "); ++stages.back(); if (flag & MTPauth_sendCode::flag_current_number) { types.push_back(0); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 0 IN FIELD flags ]"); } break; + case 4: to.add(" api_id: "); ++stages.back(); types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; + case 5: to.add(" api_hash: "); ++stages.back(); types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; + case 6: to.add(" lang_code: "); ++stages.back(); types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; + default: to.add("}"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); break; + } +} + +void _serialize_auth_resendCode(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 flag) { + if (stage) { + to.add(",\n").addSpaces(lev); + } else { + to.add("{ auth_resendCode"); + to.add("\n").addSpaces(lev); + } + switch (stage) { case 0: to.add(" phone_number: "); ++stages.back(); types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; - case 1: to.add(" sms_type: "); ++stages.back(); types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; - case 2: to.add(" api_id: "); ++stages.back(); types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; - case 3: to.add(" api_hash: "); ++stages.back(); types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; - case 4: to.add(" lang_code: "); ++stages.back(); types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; + case 1: to.add(" phone_code_hash: "); ++stages.back(); types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; + default: to.add("}"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); break; + } +} + +void _serialize_account_sendChangePhoneCode(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 flag) { + if (stage) { + to.add(",\n").addSpaces(lev); + } else { + to.add("{ account_sendChangePhoneCode"); + to.add("\n").addSpaces(lev); + } + switch (stage) { + case 0: to.add(" flags: "); ++stages.back(); if (start >= end) throw Exception("start >= end in flags"); else flags.back() = *start; types.push_back(mtpc_int); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; + case 1: to.add(" allow_flashcall: "); ++stages.back(); if (flag & MTPaccount_sendChangePhoneCode::flag_allow_flashcall) { to.add("YES [ BY BIT 0 IN FIELD flags ]"); } else { to.add("[ SKIPPED BY BIT 0 IN FIELD flags ]"); } break; + case 2: to.add(" phone_number: "); ++stages.back(); types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; + case 3: to.add(" current_number: "); ++stages.back(); if (flag & MTPaccount_sendChangePhoneCode::flag_current_number) { types.push_back(0); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); } else { to.add("[ SKIPPED BY BIT 0 IN FIELD flags ]"); } break; default: to.add("}"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); break; } } @@ -6162,19 +6216,6 @@ void _serialize_account_getAccountTTL(MTPStringLogger &to, int32 stage, int32 le to.add("{ account_getAccountTTL }"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); } -void _serialize_account_sendChangePhoneCode(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 flag) { - if (stage) { - to.add(",\n").addSpaces(lev); - } else { - to.add("{ account_sendChangePhoneCode"); - to.add("\n").addSpaces(lev); - } - switch (stage) { - case 0: to.add(" phone_number: "); ++stages.back(); types.push_back(mtpc_string); vtypes.push_back(0); stages.push_back(0); flags.push_back(0); break; - default: to.add("}"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); break; - } -} - void _serialize_account_getAuthorizations(MTPStringLogger &to, int32 stage, int32 lev, Types &types, Types &vtypes, StagesFlags &stages, StagesFlags &flags, const mtpPrime *start, const mtpPrime *end, int32 flag) { to.add("{ account_getAuthorizations }"); types.pop_back(); vtypes.pop_back(); stages.pop_back(); flags.pop_back(); } @@ -7746,7 +7787,6 @@ namespace { _serializers.insert(mtpc_geoPoint, _serialize_geoPoint); _serializers.insert(mtpc_auth_checkedPhone, _serialize_auth_checkedPhone); _serializers.insert(mtpc_auth_sentCode, _serialize_auth_sentCode); - _serializers.insert(mtpc_auth_sentAppCode, _serialize_auth_sentAppCode); _serializers.insert(mtpc_auth_authorization, _serialize_auth_authorization); _serializers.insert(mtpc_auth_exportedAuthorization, _serialize_auth_exportedAuthorization); _serializers.insert(mtpc_inputNotifyPeer, _serialize_inputNotifyPeer); @@ -7918,7 +7958,6 @@ namespace { _serializers.insert(mtpc_privacyValueDisallowUsers, _serialize_privacyValueDisallowUsers); _serializers.insert(mtpc_account_privacyRules, _serialize_account_privacyRules); _serializers.insert(mtpc_accountDaysTTL, _serialize_accountDaysTTL); - _serializers.insert(mtpc_account_sentChangePhoneCode, _serialize_account_sentChangePhoneCode); _serializers.insert(mtpc_documentAttributeImageSize, _serialize_documentAttributeImageSize); _serializers.insert(mtpc_documentAttributeAnimated, _serialize_documentAttributeAnimated); _serializers.insert(mtpc_documentAttributeSticker, _serialize_documentAttributeSticker); @@ -8020,6 +8059,13 @@ namespace { _serializers.insert(mtpc_exportedMessageLink, _serialize_exportedMessageLink); _serializers.insert(mtpc_messageFwdHeader, _serialize_messageFwdHeader); _serializers.insert(mtpc_channels_messageEditData, _serialize_channels_messageEditData); + _serializers.insert(mtpc_auth_codeTypeSms, _serialize_auth_codeTypeSms); + _serializers.insert(mtpc_auth_codeTypeCall, _serialize_auth_codeTypeCall); + _serializers.insert(mtpc_auth_codeTypeFlashCall, _serialize_auth_codeTypeFlashCall); + _serializers.insert(mtpc_auth_sentCodeTypeApp, _serialize_auth_sentCodeTypeApp); + _serializers.insert(mtpc_auth_sentCodeTypeSms, _serialize_auth_sentCodeTypeSms); + _serializers.insert(mtpc_auth_sentCodeTypeCall, _serialize_auth_sentCodeTypeCall); + _serializers.insert(mtpc_auth_sentCodeTypeFlashCall, _serialize_auth_sentCodeTypeFlashCall); _serializers.insert(mtpc_req_pq, _serialize_req_pq); _serializers.insert(mtpc_req_DH_params, _serialize_req_DH_params); @@ -8030,12 +8076,11 @@ namespace { _serializers.insert(mtpc_ping_delay_disconnect, _serialize_ping_delay_disconnect); _serializers.insert(mtpc_destroy_session, _serialize_destroy_session); _serializers.insert(mtpc_register_saveDeveloperInfo, _serialize_register_saveDeveloperInfo); - _serializers.insert(mtpc_auth_sendCall, _serialize_auth_sendCall); _serializers.insert(mtpc_auth_logOut, _serialize_auth_logOut); _serializers.insert(mtpc_auth_resetAuthorizations, _serialize_auth_resetAuthorizations); _serializers.insert(mtpc_auth_sendInvites, _serialize_auth_sendInvites); _serializers.insert(mtpc_auth_bindTempAuthKey, _serialize_auth_bindTempAuthKey); - _serializers.insert(mtpc_auth_sendSms, _serialize_auth_sendSms); + _serializers.insert(mtpc_auth_cancelCode, _serialize_auth_cancelCode); _serializers.insert(mtpc_account_registerDevice, _serialize_account_registerDevice); _serializers.insert(mtpc_account_unregisterDevice, _serialize_account_unregisterDevice); _serializers.insert(mtpc_account_updateNotifySettings, _serialize_account_updateNotifySettings); @@ -8078,6 +8123,8 @@ namespace { _serializers.insert(mtpc_invokeWithoutUpdates, _serialize_invokeWithoutUpdates); _serializers.insert(mtpc_auth_checkPhone, _serialize_auth_checkPhone); _serializers.insert(mtpc_auth_sendCode, _serialize_auth_sendCode); + _serializers.insert(mtpc_auth_resendCode, _serialize_auth_resendCode); + _serializers.insert(mtpc_account_sendChangePhoneCode, _serialize_account_sendChangePhoneCode); _serializers.insert(mtpc_auth_signUp, _serialize_auth_signUp); _serializers.insert(mtpc_auth_signIn, _serialize_auth_signIn); _serializers.insert(mtpc_auth_importAuthorization, _serialize_auth_importAuthorization); @@ -8095,7 +8142,6 @@ namespace { _serializers.insert(mtpc_account_getPrivacy, _serialize_account_getPrivacy); _serializers.insert(mtpc_account_setPrivacy, _serialize_account_setPrivacy); _serializers.insert(mtpc_account_getAccountTTL, _serialize_account_getAccountTTL); - _serializers.insert(mtpc_account_sendChangePhoneCode, _serialize_account_sendChangePhoneCode); _serializers.insert(mtpc_account_getAuthorizations, _serialize_account_getAuthorizations); _serializers.insert(mtpc_account_getPassword, _serialize_account_getPassword); _serializers.insert(mtpc_account_getPasswordSettings, _serialize_account_getPasswordSettings); diff --git a/Telegram/SourceFiles/mtproto/mtpScheme.h b/Telegram/SourceFiles/mtproto/mtpScheme.h index 04b2c42cf..db65f2378 100644 --- a/Telegram/SourceFiles/mtproto/mtpScheme.h +++ b/Telegram/SourceFiles/mtproto/mtpScheme.h @@ -177,8 +177,7 @@ enum { mtpc_geoPointEmpty = 0x1117dd5f, mtpc_geoPoint = 0x2049d70c, mtpc_auth_checkedPhone = 0x811ea28e, - mtpc_auth_sentCode = 0xefed51d9, - mtpc_auth_sentAppCode = 0xe325edcf, + mtpc_auth_sentCode = 0x5e002502, mtpc_auth_authorization = 0xff036af1, mtpc_auth_exportedAuthorization = 0xdf969c2d, mtpc_inputNotifyPeer = 0xb8bc5b0c, @@ -350,7 +349,6 @@ enum { mtpc_privacyValueDisallowUsers = 0xc7f49b7, mtpc_account_privacyRules = 0x554abb6f, mtpc_accountDaysTTL = 0xb8d0afdf, - mtpc_account_sentChangePhoneCode = 0xa4f58c4c, mtpc_documentAttributeImageSize = 0x6c37c15c, mtpc_documentAttributeAnimated = 0x11b58939, mtpc_documentAttributeSticker = 0x3a556302, @@ -452,14 +450,20 @@ enum { mtpc_exportedMessageLink = 0x1f486803, mtpc_messageFwdHeader = 0xc786ddcb, mtpc_channels_messageEditData = 0x67e1255f, + mtpc_auth_codeTypeSms = 0x72a3158c, + mtpc_auth_codeTypeCall = 0x741cd3e3, + mtpc_auth_codeTypeFlashCall = 0x226ccefb, + mtpc_auth_sentCodeTypeApp = 0x3dbb5986, + mtpc_auth_sentCodeTypeSms = 0xc000bba2, + mtpc_auth_sentCodeTypeCall = 0x5353e5a7, + mtpc_auth_sentCodeTypeFlashCall = 0xab03c6d9, mtpc_invokeAfterMsg = 0xcb9f372d, mtpc_invokeAfterMsgs = 0x3dc4b4f0, mtpc_initConnection = 0x69796de9, mtpc_invokeWithLayer = 0xda9b0d0d, mtpc_invokeWithoutUpdates = 0xbf9459b7, mtpc_auth_checkPhone = 0x6fe51dfb, - mtpc_auth_sendCode = 0x768d5f4d, - mtpc_auth_sendCall = 0x3c51564, + mtpc_auth_sendCode = 0xccfd70cf, mtpc_auth_signUp = 0x1b067634, mtpc_auth_signIn = 0xbcd51581, mtpc_auth_logOut = 0x5717da40, @@ -468,11 +472,12 @@ enum { mtpc_auth_exportAuthorization = 0xe5bfffcd, mtpc_auth_importAuthorization = 0xe3ef9613, mtpc_auth_bindTempAuthKey = 0xcdd42a05, - mtpc_auth_sendSms = 0xda9f3e8, mtpc_auth_importBotAuthorization = 0x67a3ff2c, mtpc_auth_checkPassword = 0xa63011e, mtpc_auth_requestPasswordRecovery = 0xd897bc66, mtpc_auth_recoverPassword = 0x4ea56e92, + mtpc_auth_resendCode = 0x3ef1a9bf, + mtpc_auth_cancelCode = 0x1f040578, mtpc_account_registerDevice = 0x446c712c, mtpc_account_unregisterDevice = 0x65c55b40, mtpc_account_updateNotifySettings = 0x84be5b93, @@ -489,7 +494,7 @@ enum { mtpc_account_deleteAccount = 0x418d4e0b, mtpc_account_getAccountTTL = 0x8fc711d, mtpc_account_setAccountTTL = 0x2442485e, - mtpc_account_sendChangePhoneCode = 0xa407a8f4, + mtpc_account_sendChangePhoneCode = 0x8e57deb, mtpc_account_changePhone = 0x70c32edb, mtpc_account_updateDeviceLocked = 0x38df3532, mtpc_account_getAuthorizations = 0xe320c158, @@ -836,7 +841,6 @@ class MTPDauth_checkedPhone; class MTPauth_sentCode; class MTPDauth_sentCode; -class MTPDauth_sentAppCode; class MTPauth_authorization; class MTPDauth_authorization; @@ -1071,9 +1075,6 @@ class MTPDaccount_privacyRules; class MTPaccountDaysTTL; class MTPDaccountDaysTTL; -class MTPaccount_sentChangePhoneCode; -class MTPDaccount_sentChangePhoneCode; - class MTPdocumentAttribute; class MTPDdocumentAttributeImageSize; class MTPDdocumentAttributeSticker; @@ -1254,6 +1255,14 @@ class MTPDmessageFwdHeader; class MTPchannels_messageEditData; class MTPDchannels_messageEditData; +class MTPauth_codeType; + +class MTPauth_sentCodeType; +class MTPDauth_sentCodeTypeApp; +class MTPDauth_sentCodeTypeSms; +class MTPDauth_sentCodeTypeCall; +class MTPDauth_sentCodeTypeFlashCall; + // Boxed types definitions typedef MTPBoxed MTPResPQ; @@ -1368,7 +1377,6 @@ typedef MTPBoxed MTPInputPrivacyRule; typedef MTPBoxed MTPPrivacyRule; typedef MTPBoxed MTPaccount_PrivacyRules; typedef MTPBoxed MTPAccountDaysTTL; -typedef MTPBoxed MTPaccount_SentChangePhoneCode; typedef MTPBoxed MTPDocumentAttribute; typedef MTPBoxed MTPmessages_Stickers; typedef MTPBoxed MTPStickerPack; @@ -1419,6 +1427,8 @@ typedef MTPBoxed MTPmessages_BotResults; typedef MTPBoxed MTPExportedMessageLink; typedef MTPBoxed MTPMessageFwdHeader; typedef MTPBoxed MTPchannels_MessageEditData; +typedef MTPBoxed MTPauth_CodeType; +typedef MTPBoxed MTPauth_SentCodeType; // Type classes definitions @@ -4048,52 +4058,32 @@ typedef MTPBoxed MTPauth_CheckedPhone; class MTPauth_sentCode : private mtpDataOwner { public: - MTPauth_sentCode() : mtpDataOwner(0), _type(0) { - } - MTPauth_sentCode(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons) : mtpDataOwner(0), _type(0) { + MTPauth_sentCode(); + MTPauth_sentCode(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_auth_sentCode) : mtpDataOwner(0) { read(from, end, cons); } MTPDauth_sentCode &_auth_sentCode() { if (!data) throw mtpErrorUninitialized(); - if (_type != mtpc_auth_sentCode) throw mtpErrorWrongTypeId(_type, mtpc_auth_sentCode); split(); return *(MTPDauth_sentCode*)data; } const MTPDauth_sentCode &c_auth_sentCode() const { if (!data) throw mtpErrorUninitialized(); - if (_type != mtpc_auth_sentCode) throw mtpErrorWrongTypeId(_type, mtpc_auth_sentCode); return *(const MTPDauth_sentCode*)data; } - MTPDauth_sentAppCode &_auth_sentAppCode() { - if (!data) throw mtpErrorUninitialized(); - if (_type != mtpc_auth_sentAppCode) throw mtpErrorWrongTypeId(_type, mtpc_auth_sentAppCode); - split(); - return *(MTPDauth_sentAppCode*)data; - } - const MTPDauth_sentAppCode &c_auth_sentAppCode() const { - if (!data) throw mtpErrorUninitialized(); - if (_type != mtpc_auth_sentAppCode) throw mtpErrorWrongTypeId(_type, mtpc_auth_sentAppCode); - return *(const MTPDauth_sentAppCode*)data; - } - uint32 innerLength() const; mtpTypeId type() const; - void read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons); + void read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_auth_sentCode); void write(mtpBuffer &to) const; typedef void ResponseType; private: - explicit MTPauth_sentCode(mtpTypeId type); explicit MTPauth_sentCode(MTPDauth_sentCode *_data); - explicit MTPauth_sentCode(MTPDauth_sentAppCode *_data); - friend MTPauth_sentCode MTP_auth_sentCode(MTPBool _phone_registered, const MTPstring &_phone_code_hash, MTPint _send_call_timeout, MTPBool _is_password); - friend MTPauth_sentCode MTP_auth_sentAppCode(MTPBool _phone_registered, const MTPstring &_phone_code_hash, MTPint _send_call_timeout, MTPBool _is_password); - - mtpTypeId _type; + friend MTPauth_sentCode MTP_auth_sentCode(MTPint _flags, const MTPauth_SentCodeType &_type, const MTPstring &_phone_code_hash, const MTPauth_CodeType &_next_type, MTPint _timeout); }; typedef MTPBoxed MTPauth_SentCode; @@ -6973,37 +6963,6 @@ private: }; typedef MTPBoxed MTPAccountDaysTTL; -class MTPaccount_sentChangePhoneCode : private mtpDataOwner { -public: - MTPaccount_sentChangePhoneCode(); - MTPaccount_sentChangePhoneCode(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_account_sentChangePhoneCode) : mtpDataOwner(0) { - read(from, end, cons); - } - - MTPDaccount_sentChangePhoneCode &_account_sentChangePhoneCode() { - if (!data) throw mtpErrorUninitialized(); - split(); - return *(MTPDaccount_sentChangePhoneCode*)data; - } - const MTPDaccount_sentChangePhoneCode &c_account_sentChangePhoneCode() const { - if (!data) throw mtpErrorUninitialized(); - return *(const MTPDaccount_sentChangePhoneCode*)data; - } - - uint32 innerLength() const; - mtpTypeId type() const; - void read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_account_sentChangePhoneCode); - void write(mtpBuffer &to) const; - - typedef void ResponseType; - -private: - explicit MTPaccount_sentChangePhoneCode(MTPDaccount_sentChangePhoneCode *_data); - - friend MTPaccount_sentChangePhoneCode MTP_account_sentChangePhoneCode(const MTPstring &_phone_code_hash, MTPint _send_call_timeout); -}; -typedef MTPBoxed MTPaccount_SentChangePhoneCode; - class MTPdocumentAttribute : private mtpDataOwner { public: MTPdocumentAttribute() : mtpDataOwner(0), _type(0) { @@ -9133,6 +9092,111 @@ private: }; typedef MTPBoxed MTPchannels_MessageEditData; +class MTPauth_codeType { +public: + MTPauth_codeType() : _type(0) { + } + MTPauth_codeType(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons) : _type(0) { + read(from, end, cons); + } + + uint32 innerLength() const; + mtpTypeId type() const; + void read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons); + void write(mtpBuffer &to) const; + + typedef void ResponseType; + +private: + explicit MTPauth_codeType(mtpTypeId type); + + friend MTPauth_codeType MTP_auth_codeTypeSms(); + friend MTPauth_codeType MTP_auth_codeTypeCall(); + friend MTPauth_codeType MTP_auth_codeTypeFlashCall(); + + mtpTypeId _type; +}; +typedef MTPBoxed MTPauth_CodeType; + +class MTPauth_sentCodeType : private mtpDataOwner { +public: + MTPauth_sentCodeType() : mtpDataOwner(0), _type(0) { + } + MTPauth_sentCodeType(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons) : mtpDataOwner(0), _type(0) { + read(from, end, cons); + } + + MTPDauth_sentCodeTypeApp &_auth_sentCodeTypeApp() { + if (!data) throw mtpErrorUninitialized(); + if (_type != mtpc_auth_sentCodeTypeApp) throw mtpErrorWrongTypeId(_type, mtpc_auth_sentCodeTypeApp); + split(); + return *(MTPDauth_sentCodeTypeApp*)data; + } + const MTPDauth_sentCodeTypeApp &c_auth_sentCodeTypeApp() const { + if (!data) throw mtpErrorUninitialized(); + if (_type != mtpc_auth_sentCodeTypeApp) throw mtpErrorWrongTypeId(_type, mtpc_auth_sentCodeTypeApp); + return *(const MTPDauth_sentCodeTypeApp*)data; + } + + MTPDauth_sentCodeTypeSms &_auth_sentCodeTypeSms() { + if (!data) throw mtpErrorUninitialized(); + if (_type != mtpc_auth_sentCodeTypeSms) throw mtpErrorWrongTypeId(_type, mtpc_auth_sentCodeTypeSms); + split(); + return *(MTPDauth_sentCodeTypeSms*)data; + } + const MTPDauth_sentCodeTypeSms &c_auth_sentCodeTypeSms() const { + if (!data) throw mtpErrorUninitialized(); + if (_type != mtpc_auth_sentCodeTypeSms) throw mtpErrorWrongTypeId(_type, mtpc_auth_sentCodeTypeSms); + return *(const MTPDauth_sentCodeTypeSms*)data; + } + + MTPDauth_sentCodeTypeCall &_auth_sentCodeTypeCall() { + if (!data) throw mtpErrorUninitialized(); + if (_type != mtpc_auth_sentCodeTypeCall) throw mtpErrorWrongTypeId(_type, mtpc_auth_sentCodeTypeCall); + split(); + return *(MTPDauth_sentCodeTypeCall*)data; + } + const MTPDauth_sentCodeTypeCall &c_auth_sentCodeTypeCall() const { + if (!data) throw mtpErrorUninitialized(); + if (_type != mtpc_auth_sentCodeTypeCall) throw mtpErrorWrongTypeId(_type, mtpc_auth_sentCodeTypeCall); + return *(const MTPDauth_sentCodeTypeCall*)data; + } + + MTPDauth_sentCodeTypeFlashCall &_auth_sentCodeTypeFlashCall() { + if (!data) throw mtpErrorUninitialized(); + if (_type != mtpc_auth_sentCodeTypeFlashCall) throw mtpErrorWrongTypeId(_type, mtpc_auth_sentCodeTypeFlashCall); + split(); + return *(MTPDauth_sentCodeTypeFlashCall*)data; + } + const MTPDauth_sentCodeTypeFlashCall &c_auth_sentCodeTypeFlashCall() const { + if (!data) throw mtpErrorUninitialized(); + if (_type != mtpc_auth_sentCodeTypeFlashCall) throw mtpErrorWrongTypeId(_type, mtpc_auth_sentCodeTypeFlashCall); + return *(const MTPDauth_sentCodeTypeFlashCall*)data; + } + + uint32 innerLength() const; + mtpTypeId type() const; + void read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons); + void write(mtpBuffer &to) const; + + typedef void ResponseType; + +private: + explicit MTPauth_sentCodeType(mtpTypeId type); + explicit MTPauth_sentCodeType(MTPDauth_sentCodeTypeApp *_data); + explicit MTPauth_sentCodeType(MTPDauth_sentCodeTypeSms *_data); + explicit MTPauth_sentCodeType(MTPDauth_sentCodeTypeCall *_data); + explicit MTPauth_sentCodeType(MTPDauth_sentCodeTypeFlashCall *_data); + + friend MTPauth_sentCodeType MTP_auth_sentCodeTypeApp(MTPint _length); + friend MTPauth_sentCodeType MTP_auth_sentCodeTypeSms(MTPint _length); + friend MTPauth_sentCodeType MTP_auth_sentCodeTypeCall(MTPint _length); + friend MTPauth_sentCodeType MTP_auth_sentCodeTypeFlashCall(const MTPstring &_pattern); + + mtpTypeId _type; +}; +typedef MTPBoxed MTPauth_SentCodeType; + // Type constructors with data class MTPDresPQ : public mtpDataImpl { @@ -10555,26 +10619,24 @@ class MTPDauth_sentCode : public mtpDataImpl { public: MTPDauth_sentCode() { } - MTPDauth_sentCode(MTPBool _phone_registered, const MTPstring &_phone_code_hash, MTPint _send_call_timeout, MTPBool _is_password) : vphone_registered(_phone_registered), vphone_code_hash(_phone_code_hash), vsend_call_timeout(_send_call_timeout), vis_password(_is_password) { + MTPDauth_sentCode(MTPint _flags, const MTPauth_SentCodeType &_type, const MTPstring &_phone_code_hash, const MTPauth_CodeType &_next_type, MTPint _timeout) : vflags(_flags), vtype(_type), vphone_code_hash(_phone_code_hash), vnext_type(_next_type), vtimeout(_timeout) { } - MTPBool vphone_registered; + MTPint vflags; + MTPauth_SentCodeType vtype; MTPstring vphone_code_hash; - MTPint vsend_call_timeout; - MTPBool vis_password; -}; + MTPauth_CodeType vnext_type; + MTPint vtimeout; -class MTPDauth_sentAppCode : public mtpDataImpl { -public: - MTPDauth_sentAppCode() { - } - MTPDauth_sentAppCode(MTPBool _phone_registered, const MTPstring &_phone_code_hash, MTPint _send_call_timeout, MTPBool _is_password) : vphone_registered(_phone_registered), vphone_code_hash(_phone_code_hash), vsend_call_timeout(_send_call_timeout), vis_password(_is_password) { - } + enum { + flag_phone_registered = (1 << 0), + flag_next_type = (1 << 1), + flag_timeout = (1 << 2), + }; - MTPBool vphone_registered; - MTPstring vphone_code_hash; - MTPint vsend_call_timeout; - MTPBool vis_password; + bool is_phone_registered() const { return vflags.v & flag_phone_registered; } + bool has_next_type() const { return vflags.v & flag_next_type; } + bool has_timeout() const { return vflags.v & flag_timeout; } }; class MTPDauth_authorization : public mtpDataImpl { @@ -12156,17 +12218,6 @@ public: MTPint vdays; }; -class MTPDaccount_sentChangePhoneCode : public mtpDataImpl { -public: - MTPDaccount_sentChangePhoneCode() { - } - MTPDaccount_sentChangePhoneCode(const MTPstring &_phone_code_hash, MTPint _send_call_timeout) : vphone_code_hash(_phone_code_hash), vsend_call_timeout(_send_call_timeout) { - } - - MTPstring vphone_code_hash; - MTPint vsend_call_timeout; -}; - class MTPDdocumentAttributeImageSize : public mtpDataImpl { public: MTPDdocumentAttributeImageSize() { @@ -13347,6 +13398,46 @@ public: bool is_caption() const { return vflags.v & flag_caption; } }; +class MTPDauth_sentCodeTypeApp : public mtpDataImpl { +public: + MTPDauth_sentCodeTypeApp() { + } + MTPDauth_sentCodeTypeApp(MTPint _length) : vlength(_length) { + } + + MTPint vlength; +}; + +class MTPDauth_sentCodeTypeSms : public mtpDataImpl { +public: + MTPDauth_sentCodeTypeSms() { + } + MTPDauth_sentCodeTypeSms(MTPint _length) : vlength(_length) { + } + + MTPint vlength; +}; + +class MTPDauth_sentCodeTypeCall : public mtpDataImpl { +public: + MTPDauth_sentCodeTypeCall() { + } + MTPDauth_sentCodeTypeCall(MTPint _length) : vlength(_length) { + } + + MTPint vlength; +}; + +class MTPDauth_sentCodeTypeFlashCall : public mtpDataImpl { +public: + MTPDauth_sentCodeTypeFlashCall() { + } + MTPDauth_sentCodeTypeFlashCall(const MTPstring &_pattern) : vpattern(_pattern) { + } + + MTPstring vpattern; +}; + // RPC methods class MTPreq_pq { // RPC method 'req_pq' @@ -13996,8 +14087,9 @@ public: class MTPauth_sendCode { // RPC method 'auth.sendCode' public: + MTPint vflags; MTPstring vphone_number; - MTPint vsms_type; + MTPBool vcurrent_number; MTPint vapi_id; MTPstring vapi_hash; MTPstring vlang_code; @@ -14007,25 +14099,35 @@ public: MTPauth_sendCode(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_auth_sendCode) { read(from, end, cons); } - MTPauth_sendCode(const MTPstring &_phone_number, MTPint _sms_type, MTPint _api_id, const MTPstring &_api_hash, const MTPstring &_lang_code) : vphone_number(_phone_number), vsms_type(_sms_type), vapi_id(_api_id), vapi_hash(_api_hash), vlang_code(_lang_code) { + MTPauth_sendCode(MTPint _flags, const MTPstring &_phone_number, MTPBool _current_number, MTPint _api_id, const MTPstring &_api_hash, const MTPstring &_lang_code) : vflags(_flags), vphone_number(_phone_number), vcurrent_number(_current_number), vapi_id(_api_id), vapi_hash(_api_hash), vlang_code(_lang_code) { } + enum { + flag_allow_flashcall = (1 << 0), + flag_current_number = (1 << 0), + }; + + bool is_allow_flashcall() const { return vflags.v & flag_allow_flashcall; } + bool has_current_number() const { return vflags.v & flag_current_number; } + uint32 innerLength() const { - return vphone_number.innerLength() + vsms_type.innerLength() + vapi_id.innerLength() + vapi_hash.innerLength() + vlang_code.innerLength(); + return vflags.innerLength() + vphone_number.innerLength() + (has_current_number() ? vcurrent_number.innerLength() : 0) + vapi_id.innerLength() + vapi_hash.innerLength() + vlang_code.innerLength(); } mtpTypeId type() const { return mtpc_auth_sendCode; } void read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_auth_sendCode) { + vflags.read(from, end); vphone_number.read(from, end); - vsms_type.read(from, end); + if (has_current_number()) { vcurrent_number.read(from, end); } else { vcurrent_number = MTPBool(); } vapi_id.read(from, end); vapi_hash.read(from, end); vlang_code.read(from, end); } void write(mtpBuffer &to) const { + vflags.write(to); vphone_number.write(to); - vsms_type.write(to); + if (has_current_number()) vcurrent_number.write(to); vapi_id.write(to); vapi_hash.write(to); vlang_code.write(to); @@ -14041,49 +14143,7 @@ public: } MTPauth_SendCode(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = 0) : MTPBoxed(from, end, cons) { } - MTPauth_SendCode(const MTPstring &_phone_number, MTPint _sms_type, MTPint _api_id, const MTPstring &_api_hash, const MTPstring &_lang_code) : MTPBoxed(MTPauth_sendCode(_phone_number, _sms_type, _api_id, _api_hash, _lang_code)) { - } -}; - -class MTPauth_sendCall { // RPC method 'auth.sendCall' -public: - MTPstring vphone_number; - MTPstring vphone_code_hash; - - MTPauth_sendCall() { - } - MTPauth_sendCall(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_auth_sendCall) { - read(from, end, cons); - } - MTPauth_sendCall(const MTPstring &_phone_number, const MTPstring &_phone_code_hash) : vphone_number(_phone_number), vphone_code_hash(_phone_code_hash) { - } - - uint32 innerLength() const { - return vphone_number.innerLength() + vphone_code_hash.innerLength(); - } - mtpTypeId type() const { - return mtpc_auth_sendCall; - } - void read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_auth_sendCall) { - vphone_number.read(from, end); - vphone_code_hash.read(from, end); - } - void write(mtpBuffer &to) const { - vphone_number.write(to); - vphone_code_hash.write(to); - } - - typedef MTPBool ResponseType; -}; -class MTPauth_SendCall : public MTPBoxed { -public: - MTPauth_SendCall() { - } - MTPauth_SendCall(const MTPauth_sendCall &v) : MTPBoxed(v) { - } - MTPauth_SendCall(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = 0) : MTPBoxed(from, end, cons) { - } - MTPauth_SendCall(const MTPstring &_phone_number, const MTPstring &_phone_code_hash) : MTPBoxed(MTPauth_sendCall(_phone_number, _phone_code_hash)) { + MTPauth_SendCode(MTPint _flags, const MTPstring &_phone_number, MTPBool _current_number, MTPint _api_id, const MTPstring &_api_hash, const MTPstring &_lang_code) : MTPBoxed(MTPauth_sendCode(_flags, _phone_number, _current_number, _api_id, _api_hash, _lang_code)) { } }; @@ -14416,48 +14476,6 @@ public: } }; -class MTPauth_sendSms { // RPC method 'auth.sendSms' -public: - MTPstring vphone_number; - MTPstring vphone_code_hash; - - MTPauth_sendSms() { - } - MTPauth_sendSms(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_auth_sendSms) { - read(from, end, cons); - } - MTPauth_sendSms(const MTPstring &_phone_number, const MTPstring &_phone_code_hash) : vphone_number(_phone_number), vphone_code_hash(_phone_code_hash) { - } - - uint32 innerLength() const { - return vphone_number.innerLength() + vphone_code_hash.innerLength(); - } - mtpTypeId type() const { - return mtpc_auth_sendSms; - } - void read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_auth_sendSms) { - vphone_number.read(from, end); - vphone_code_hash.read(from, end); - } - void write(mtpBuffer &to) const { - vphone_number.write(to); - vphone_code_hash.write(to); - } - - typedef MTPBool ResponseType; -}; -class MTPauth_SendSms : public MTPBoxed { -public: - MTPauth_SendSms() { - } - MTPauth_SendSms(const MTPauth_sendSms &v) : MTPBoxed(v) { - } - MTPauth_SendSms(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = 0) : MTPBoxed(from, end, cons) { - } - MTPauth_SendSms(const MTPstring &_phone_number, const MTPstring &_phone_code_hash) : MTPBoxed(MTPauth_sendSms(_phone_number, _phone_code_hash)) { - } -}; - class MTPauth_importBotAuthorization { // RPC method 'auth.importBotAuthorization' public: MTPint vflags; @@ -14615,6 +14633,90 @@ public: } }; +class MTPauth_resendCode { // RPC method 'auth.resendCode' +public: + MTPstring vphone_number; + MTPstring vphone_code_hash; + + MTPauth_resendCode() { + } + MTPauth_resendCode(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_auth_resendCode) { + read(from, end, cons); + } + MTPauth_resendCode(const MTPstring &_phone_number, const MTPstring &_phone_code_hash) : vphone_number(_phone_number), vphone_code_hash(_phone_code_hash) { + } + + uint32 innerLength() const { + return vphone_number.innerLength() + vphone_code_hash.innerLength(); + } + mtpTypeId type() const { + return mtpc_auth_resendCode; + } + void read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_auth_resendCode) { + vphone_number.read(from, end); + vphone_code_hash.read(from, end); + } + void write(mtpBuffer &to) const { + vphone_number.write(to); + vphone_code_hash.write(to); + } + + typedef MTPauth_SentCode ResponseType; +}; +class MTPauth_ResendCode : public MTPBoxed { +public: + MTPauth_ResendCode() { + } + MTPauth_ResendCode(const MTPauth_resendCode &v) : MTPBoxed(v) { + } + MTPauth_ResendCode(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = 0) : MTPBoxed(from, end, cons) { + } + MTPauth_ResendCode(const MTPstring &_phone_number, const MTPstring &_phone_code_hash) : MTPBoxed(MTPauth_resendCode(_phone_number, _phone_code_hash)) { + } +}; + +class MTPauth_cancelCode { // RPC method 'auth.cancelCode' +public: + MTPstring vphone_number; + MTPstring vphone_code_hash; + + MTPauth_cancelCode() { + } + MTPauth_cancelCode(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_auth_cancelCode) { + read(from, end, cons); + } + MTPauth_cancelCode(const MTPstring &_phone_number, const MTPstring &_phone_code_hash) : vphone_number(_phone_number), vphone_code_hash(_phone_code_hash) { + } + + uint32 innerLength() const { + return vphone_number.innerLength() + vphone_code_hash.innerLength(); + } + mtpTypeId type() const { + return mtpc_auth_cancelCode; + } + void read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_auth_cancelCode) { + vphone_number.read(from, end); + vphone_code_hash.read(from, end); + } + void write(mtpBuffer &to) const { + vphone_number.write(to); + vphone_code_hash.write(to); + } + + typedef MTPBool ResponseType; +}; +class MTPauth_CancelCode : public MTPBoxed { +public: + MTPauth_CancelCode() { + } + MTPauth_CancelCode(const MTPauth_cancelCode &v) : MTPBoxed(v) { + } + MTPauth_CancelCode(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = 0) : MTPBoxed(from, end, cons) { + } + MTPauth_CancelCode(const MTPstring &_phone_number, const MTPstring &_phone_code_hash) : MTPBoxed(MTPauth_cancelCode(_phone_number, _phone_code_hash)) { + } +}; + class MTPaccount_registerDevice { // RPC method 'account.registerDevice' public: MTPint vtoken_type; @@ -15266,30 +15368,44 @@ public: class MTPaccount_sendChangePhoneCode { // RPC method 'account.sendChangePhoneCode' public: + MTPint vflags; MTPstring vphone_number; + MTPBool vcurrent_number; MTPaccount_sendChangePhoneCode() { } MTPaccount_sendChangePhoneCode(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_account_sendChangePhoneCode) { read(from, end, cons); } - MTPaccount_sendChangePhoneCode(const MTPstring &_phone_number) : vphone_number(_phone_number) { + MTPaccount_sendChangePhoneCode(MTPint _flags, const MTPstring &_phone_number, MTPBool _current_number) : vflags(_flags), vphone_number(_phone_number), vcurrent_number(_current_number) { } + enum { + flag_allow_flashcall = (1 << 0), + flag_current_number = (1 << 0), + }; + + bool is_allow_flashcall() const { return vflags.v & flag_allow_flashcall; } + bool has_current_number() const { return vflags.v & flag_current_number; } + uint32 innerLength() const { - return vphone_number.innerLength(); + return vflags.innerLength() + vphone_number.innerLength() + (has_current_number() ? vcurrent_number.innerLength() : 0); } mtpTypeId type() const { return mtpc_account_sendChangePhoneCode; } void read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = mtpc_account_sendChangePhoneCode) { + vflags.read(from, end); vphone_number.read(from, end); + if (has_current_number()) { vcurrent_number.read(from, end); } else { vcurrent_number = MTPBool(); } } void write(mtpBuffer &to) const { + vflags.write(to); vphone_number.write(to); + if (has_current_number()) vcurrent_number.write(to); } - typedef MTPaccount_SentChangePhoneCode ResponseType; + typedef MTPauth_SentCode ResponseType; }; class MTPaccount_SendChangePhoneCode : public MTPBoxed { public: @@ -15299,7 +15415,7 @@ public: } MTPaccount_SendChangePhoneCode(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons = 0) : MTPBoxed(from, end, cons) { } - MTPaccount_SendChangePhoneCode(const MTPstring &_phone_number) : MTPBoxed(MTPaccount_sendChangePhoneCode(_phone_number)) { + MTPaccount_SendChangePhoneCode(MTPint _flags, const MTPstring &_phone_number, MTPBool _current_number) : MTPBoxed(MTPaccount_sendChangePhoneCode(_flags, _phone_number, _current_number)) { } }; @@ -24381,79 +24497,39 @@ inline MTPauth_checkedPhone MTP_auth_checkedPhone(MTPBool _phone_registered) { return MTPauth_checkedPhone(new MTPDauth_checkedPhone(_phone_registered)); } +inline MTPauth_sentCode::MTPauth_sentCode() : mtpDataOwner(new MTPDauth_sentCode()) { +} + inline uint32 MTPauth_sentCode::innerLength() const { - switch (_type) { - case mtpc_auth_sentCode: { - const MTPDauth_sentCode &v(c_auth_sentCode()); - return v.vphone_registered.innerLength() + v.vphone_code_hash.innerLength() + v.vsend_call_timeout.innerLength() + v.vis_password.innerLength(); - } - case mtpc_auth_sentAppCode: { - const MTPDauth_sentAppCode &v(c_auth_sentAppCode()); - return v.vphone_registered.innerLength() + v.vphone_code_hash.innerLength() + v.vsend_call_timeout.innerLength() + v.vis_password.innerLength(); - } - } - return 0; + const MTPDauth_sentCode &v(c_auth_sentCode()); + return v.vflags.innerLength() + v.vtype.innerLength() + v.vphone_code_hash.innerLength() + (v.has_next_type() ? v.vnext_type.innerLength() : 0) + (v.has_timeout() ? v.vtimeout.innerLength() : 0); } inline mtpTypeId MTPauth_sentCode::type() const { - if (!_type) throw mtpErrorUninitialized(); - return _type; + return mtpc_auth_sentCode; } inline void MTPauth_sentCode::read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons) { - if (cons != _type) setData(0); - switch (cons) { - case mtpc_auth_sentCode: _type = cons; { - if (!data) setData(new MTPDauth_sentCode()); - MTPDauth_sentCode &v(_auth_sentCode()); - v.vphone_registered.read(from, end); - v.vphone_code_hash.read(from, end); - v.vsend_call_timeout.read(from, end); - v.vis_password.read(from, end); - } break; - case mtpc_auth_sentAppCode: _type = cons; { - if (!data) setData(new MTPDauth_sentAppCode()); - MTPDauth_sentAppCode &v(_auth_sentAppCode()); - v.vphone_registered.read(from, end); - v.vphone_code_hash.read(from, end); - v.vsend_call_timeout.read(from, end); - v.vis_password.read(from, end); - } break; - default: throw mtpErrorUnexpected(cons, "MTPauth_sentCode"); - } + if (cons != mtpc_auth_sentCode) throw mtpErrorUnexpected(cons, "MTPauth_sentCode"); + + if (!data) setData(new MTPDauth_sentCode()); + MTPDauth_sentCode &v(_auth_sentCode()); + v.vflags.read(from, end); + v.vtype.read(from, end); + v.vphone_code_hash.read(from, end); + if (v.has_next_type()) { v.vnext_type.read(from, end); } else { v.vnext_type = MTPauth_CodeType(); } + if (v.has_timeout()) { v.vtimeout.read(from, end); } else { v.vtimeout = MTPint(); } } inline void MTPauth_sentCode::write(mtpBuffer &to) const { - switch (_type) { - case mtpc_auth_sentCode: { - const MTPDauth_sentCode &v(c_auth_sentCode()); - v.vphone_registered.write(to); - v.vphone_code_hash.write(to); - v.vsend_call_timeout.write(to); - v.vis_password.write(to); - } break; - case mtpc_auth_sentAppCode: { - const MTPDauth_sentAppCode &v(c_auth_sentAppCode()); - v.vphone_registered.write(to); - v.vphone_code_hash.write(to); - v.vsend_call_timeout.write(to); - v.vis_password.write(to); - } break; - } + const MTPDauth_sentCode &v(c_auth_sentCode()); + v.vflags.write(to); + v.vtype.write(to); + v.vphone_code_hash.write(to); + if (v.has_next_type()) v.vnext_type.write(to); + if (v.has_timeout()) v.vtimeout.write(to); } -inline MTPauth_sentCode::MTPauth_sentCode(mtpTypeId type) : mtpDataOwner(0), _type(type) { - switch (type) { - case mtpc_auth_sentCode: setData(new MTPDauth_sentCode()); break; - case mtpc_auth_sentAppCode: setData(new MTPDauth_sentAppCode()); break; - default: throw mtpErrorBadTypeId(type, "MTPauth_sentCode"); - } +inline MTPauth_sentCode::MTPauth_sentCode(MTPDauth_sentCode *_data) : mtpDataOwner(_data) { } -inline MTPauth_sentCode::MTPauth_sentCode(MTPDauth_sentCode *_data) : mtpDataOwner(_data), _type(mtpc_auth_sentCode) { -} -inline MTPauth_sentCode::MTPauth_sentCode(MTPDauth_sentAppCode *_data) : mtpDataOwner(_data), _type(mtpc_auth_sentAppCode) { -} -inline MTPauth_sentCode MTP_auth_sentCode(MTPBool _phone_registered, const MTPstring &_phone_code_hash, MTPint _send_call_timeout, MTPBool _is_password) { - return MTPauth_sentCode(new MTPDauth_sentCode(_phone_registered, _phone_code_hash, _send_call_timeout, _is_password)); -} -inline MTPauth_sentCode MTP_auth_sentAppCode(MTPBool _phone_registered, const MTPstring &_phone_code_hash, MTPint _send_call_timeout, MTPBool _is_password) { - return MTPauth_sentCode(new MTPDauth_sentAppCode(_phone_registered, _phone_code_hash, _send_call_timeout, _is_password)); +inline MTPauth_sentCode MTP_auth_sentCode(MTPint _flags, const MTPauth_SentCodeType &_type, const MTPstring &_phone_code_hash, const MTPauth_CodeType &_next_type, MTPint _timeout) { + return MTPauth_sentCode(new MTPDauth_sentCode(_flags, _type, _phone_code_hash, _next_type, _timeout)); } inline MTPauth_authorization::MTPauth_authorization() : mtpDataOwner(new MTPDauth_authorization()) { @@ -28462,35 +28538,6 @@ inline MTPaccountDaysTTL MTP_accountDaysTTL(MTPint _days) { return MTPaccountDaysTTL(new MTPDaccountDaysTTL(_days)); } -inline MTPaccount_sentChangePhoneCode::MTPaccount_sentChangePhoneCode() : mtpDataOwner(new MTPDaccount_sentChangePhoneCode()) { -} - -inline uint32 MTPaccount_sentChangePhoneCode::innerLength() const { - const MTPDaccount_sentChangePhoneCode &v(c_account_sentChangePhoneCode()); - return v.vphone_code_hash.innerLength() + v.vsend_call_timeout.innerLength(); -} -inline mtpTypeId MTPaccount_sentChangePhoneCode::type() const { - return mtpc_account_sentChangePhoneCode; -} -inline void MTPaccount_sentChangePhoneCode::read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons) { - if (cons != mtpc_account_sentChangePhoneCode) throw mtpErrorUnexpected(cons, "MTPaccount_sentChangePhoneCode"); - - if (!data) setData(new MTPDaccount_sentChangePhoneCode()); - MTPDaccount_sentChangePhoneCode &v(_account_sentChangePhoneCode()); - v.vphone_code_hash.read(from, end); - v.vsend_call_timeout.read(from, end); -} -inline void MTPaccount_sentChangePhoneCode::write(mtpBuffer &to) const { - const MTPDaccount_sentChangePhoneCode &v(c_account_sentChangePhoneCode()); - v.vphone_code_hash.write(to); - v.vsend_call_timeout.write(to); -} -inline MTPaccount_sentChangePhoneCode::MTPaccount_sentChangePhoneCode(MTPDaccount_sentChangePhoneCode *_data) : mtpDataOwner(_data) { -} -inline MTPaccount_sentChangePhoneCode MTP_account_sentChangePhoneCode(const MTPstring &_phone_code_hash, MTPint _send_call_timeout) { - return MTPaccount_sentChangePhoneCode(new MTPDaccount_sentChangePhoneCode(_phone_code_hash, _send_call_timeout)); -} - inline uint32 MTPdocumentAttribute::innerLength() const { switch (_type) { case mtpc_documentAttributeImageSize: { @@ -31230,5 +31277,143 @@ inline MTPchannels_messageEditData MTP_channels_messageEditData(MTPint _flags) { return MTPchannels_messageEditData(new MTPDchannels_messageEditData(_flags)); } +inline uint32 MTPauth_codeType::innerLength() const { + return 0; +} +inline mtpTypeId MTPauth_codeType::type() const { + if (!_type) throw mtpErrorUninitialized(); + return _type; +} +inline void MTPauth_codeType::read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons) { + switch (cons) { + case mtpc_auth_codeTypeSms: _type = cons; break; + case mtpc_auth_codeTypeCall: _type = cons; break; + case mtpc_auth_codeTypeFlashCall: _type = cons; break; + default: throw mtpErrorUnexpected(cons, "MTPauth_codeType"); + } +} +inline void MTPauth_codeType::write(mtpBuffer &to) const { + switch (_type) { + } +} +inline MTPauth_codeType::MTPauth_codeType(mtpTypeId type) : _type(type) { + switch (type) { + case mtpc_auth_codeTypeSms: break; + case mtpc_auth_codeTypeCall: break; + case mtpc_auth_codeTypeFlashCall: break; + default: throw mtpErrorBadTypeId(type, "MTPauth_codeType"); + } +} +inline MTPauth_codeType MTP_auth_codeTypeSms() { + return MTPauth_codeType(mtpc_auth_codeTypeSms); +} +inline MTPauth_codeType MTP_auth_codeTypeCall() { + return MTPauth_codeType(mtpc_auth_codeTypeCall); +} +inline MTPauth_codeType MTP_auth_codeTypeFlashCall() { + return MTPauth_codeType(mtpc_auth_codeTypeFlashCall); +} + +inline uint32 MTPauth_sentCodeType::innerLength() const { + switch (_type) { + case mtpc_auth_sentCodeTypeApp: { + const MTPDauth_sentCodeTypeApp &v(c_auth_sentCodeTypeApp()); + return v.vlength.innerLength(); + } + case mtpc_auth_sentCodeTypeSms: { + const MTPDauth_sentCodeTypeSms &v(c_auth_sentCodeTypeSms()); + return v.vlength.innerLength(); + } + case mtpc_auth_sentCodeTypeCall: { + const MTPDauth_sentCodeTypeCall &v(c_auth_sentCodeTypeCall()); + return v.vlength.innerLength(); + } + case mtpc_auth_sentCodeTypeFlashCall: { + const MTPDauth_sentCodeTypeFlashCall &v(c_auth_sentCodeTypeFlashCall()); + return v.vpattern.innerLength(); + } + } + return 0; +} +inline mtpTypeId MTPauth_sentCodeType::type() const { + if (!_type) throw mtpErrorUninitialized(); + return _type; +} +inline void MTPauth_sentCodeType::read(const mtpPrime *&from, const mtpPrime *end, mtpTypeId cons) { + if (cons != _type) setData(0); + switch (cons) { + case mtpc_auth_sentCodeTypeApp: _type = cons; { + if (!data) setData(new MTPDauth_sentCodeTypeApp()); + MTPDauth_sentCodeTypeApp &v(_auth_sentCodeTypeApp()); + v.vlength.read(from, end); + } break; + case mtpc_auth_sentCodeTypeSms: _type = cons; { + if (!data) setData(new MTPDauth_sentCodeTypeSms()); + MTPDauth_sentCodeTypeSms &v(_auth_sentCodeTypeSms()); + v.vlength.read(from, end); + } break; + case mtpc_auth_sentCodeTypeCall: _type = cons; { + if (!data) setData(new MTPDauth_sentCodeTypeCall()); + MTPDauth_sentCodeTypeCall &v(_auth_sentCodeTypeCall()); + v.vlength.read(from, end); + } break; + case mtpc_auth_sentCodeTypeFlashCall: _type = cons; { + if (!data) setData(new MTPDauth_sentCodeTypeFlashCall()); + MTPDauth_sentCodeTypeFlashCall &v(_auth_sentCodeTypeFlashCall()); + v.vpattern.read(from, end); + } break; + default: throw mtpErrorUnexpected(cons, "MTPauth_sentCodeType"); + } +} +inline void MTPauth_sentCodeType::write(mtpBuffer &to) const { + switch (_type) { + case mtpc_auth_sentCodeTypeApp: { + const MTPDauth_sentCodeTypeApp &v(c_auth_sentCodeTypeApp()); + v.vlength.write(to); + } break; + case mtpc_auth_sentCodeTypeSms: { + const MTPDauth_sentCodeTypeSms &v(c_auth_sentCodeTypeSms()); + v.vlength.write(to); + } break; + case mtpc_auth_sentCodeTypeCall: { + const MTPDauth_sentCodeTypeCall &v(c_auth_sentCodeTypeCall()); + v.vlength.write(to); + } break; + case mtpc_auth_sentCodeTypeFlashCall: { + const MTPDauth_sentCodeTypeFlashCall &v(c_auth_sentCodeTypeFlashCall()); + v.vpattern.write(to); + } break; + } +} +inline MTPauth_sentCodeType::MTPauth_sentCodeType(mtpTypeId type) : mtpDataOwner(0), _type(type) { + switch (type) { + case mtpc_auth_sentCodeTypeApp: setData(new MTPDauth_sentCodeTypeApp()); break; + case mtpc_auth_sentCodeTypeSms: setData(new MTPDauth_sentCodeTypeSms()); break; + case mtpc_auth_sentCodeTypeCall: setData(new MTPDauth_sentCodeTypeCall()); break; + case mtpc_auth_sentCodeTypeFlashCall: setData(new MTPDauth_sentCodeTypeFlashCall()); break; + default: throw mtpErrorBadTypeId(type, "MTPauth_sentCodeType"); + } +} +inline MTPauth_sentCodeType::MTPauth_sentCodeType(MTPDauth_sentCodeTypeApp *_data) : mtpDataOwner(_data), _type(mtpc_auth_sentCodeTypeApp) { +} +inline MTPauth_sentCodeType::MTPauth_sentCodeType(MTPDauth_sentCodeTypeSms *_data) : mtpDataOwner(_data), _type(mtpc_auth_sentCodeTypeSms) { +} +inline MTPauth_sentCodeType::MTPauth_sentCodeType(MTPDauth_sentCodeTypeCall *_data) : mtpDataOwner(_data), _type(mtpc_auth_sentCodeTypeCall) { +} +inline MTPauth_sentCodeType::MTPauth_sentCodeType(MTPDauth_sentCodeTypeFlashCall *_data) : mtpDataOwner(_data), _type(mtpc_auth_sentCodeTypeFlashCall) { +} +inline MTPauth_sentCodeType MTP_auth_sentCodeTypeApp(MTPint _length) { + return MTPauth_sentCodeType(new MTPDauth_sentCodeTypeApp(_length)); +} +inline MTPauth_sentCodeType MTP_auth_sentCodeTypeSms(MTPint _length) { + return MTPauth_sentCodeType(new MTPDauth_sentCodeTypeSms(_length)); +} +inline MTPauth_sentCodeType MTP_auth_sentCodeTypeCall(MTPint _length) { + return MTPauth_sentCodeType(new MTPDauth_sentCodeTypeCall(_length)); +} +inline MTPauth_sentCodeType MTP_auth_sentCodeTypeFlashCall(const MTPstring &_pattern) { + return MTPauth_sentCodeType(new MTPDauth_sentCodeTypeFlashCall(_pattern)); +} + // Human-readable text serialization void mtpTextSerializeType(MTPStringLogger &to, const mtpPrime *&from, const mtpPrime *end, mtpPrime cons, uint32 level, mtpPrime vcons); diff --git a/Telegram/SourceFiles/mtproto/scheme.tl b/Telegram/SourceFiles/mtproto/scheme.tl index f071798e6..e01da730d 100644 --- a/Telegram/SourceFiles/mtproto/scheme.tl +++ b/Telegram/SourceFiles/mtproto/scheme.tl @@ -266,8 +266,7 @@ geoPoint#2049d70c long:double lat:double = GeoPoint; auth.checkedPhone#811ea28e phone_registered:Bool = auth.CheckedPhone; -auth.sentCode#efed51d9 phone_registered:Bool phone_code_hash:string send_call_timeout:int is_password:Bool = auth.SentCode; -auth.sentAppCode#e325edcf phone_registered:Bool phone_code_hash:string send_call_timeout:int is_password:Bool = auth.SentCode; +auth.sentCode#5e002502 flags:# phone_registered:flags.0?true type:auth.SentCodeType phone_code_hash:string next_type:flags.1?auth.CodeType timeout:flags.2?int = auth.SentCode; auth.authorization#ff036af1 user:User = auth.Authorization; @@ -496,8 +495,6 @@ account.privacyRules#554abb6f rules:Vector users:Vector = acc accountDaysTTL#b8d0afdf days:int = AccountDaysTTL; -account.sentChangePhoneCode#a4f58c4c phone_code_hash:string send_call_timeout:int = account.SentChangePhoneCode; - documentAttributeImageSize#6c37c15c w:int h:int = DocumentAttribute; documentAttributeAnimated#11b58939 = DocumentAttribute; documentAttributeSticker#3a556302 alt:string stickerset:InputStickerSet = DocumentAttribute; @@ -649,6 +646,15 @@ messageFwdHeader#c786ddcb flags:# from_id:flags.0?int date:int channel_id:flags. channels.messageEditData#67e1255f flags:# caption:flags.0?true = channels.MessageEditData; +auth.codeTypeSms#72a3158c = auth.CodeType; +auth.codeTypeCall#741cd3e3 = auth.CodeType; +auth.codeTypeFlashCall#226ccefb = auth.CodeType; + +auth.sentCodeTypeApp#3dbb5986 length:int = auth.SentCodeType; +auth.sentCodeTypeSms#c000bba2 length:int = auth.SentCodeType; +auth.sentCodeTypeCall#5353e5a7 length:int = auth.SentCodeType; +auth.sentCodeTypeFlashCall#ab03c6d9 pattern:string = auth.SentCodeType; + ---functions--- invokeAfterMsg#cb9f372d {X:Type} msg_id:long query:!X = X; @@ -658,8 +664,7 @@ invokeWithLayer#da9b0d0d {X:Type} layer:int query:!X = X; invokeWithoutUpdates#bf9459b7 {X:Type} query:!X = X; auth.checkPhone#6fe51dfb phone_number:string = auth.CheckedPhone; -auth.sendCode#768d5f4d phone_number:string sms_type:int api_id:int api_hash:string lang_code:string = auth.SentCode; -auth.sendCall#3c51564 phone_number:string phone_code_hash:string = Bool; +auth.sendCode#ccfd70cf flags:# allow_flashcall:flags.0?true phone_number:string current_number:flags.0?Bool api_id:int api_hash:string lang_code:string = auth.SentCode; auth.signUp#1b067634 phone_number:string phone_code_hash:string phone_code:string first_name:string last_name:string = auth.Authorization; auth.signIn#bcd51581 phone_number:string phone_code_hash:string phone_code:string = auth.Authorization; auth.logOut#5717da40 = Bool; @@ -668,11 +673,12 @@ auth.sendInvites#771c1d97 phone_numbers:Vector message:string = Bool; auth.exportAuthorization#e5bfffcd dc_id:int = auth.ExportedAuthorization; auth.importAuthorization#e3ef9613 id:int bytes:bytes = auth.Authorization; auth.bindTempAuthKey#cdd42a05 perm_auth_key_id:long nonce:long expires_at:int encrypted_message:bytes = Bool; -auth.sendSms#da9f3e8 phone_number:string phone_code_hash:string = Bool; auth.importBotAuthorization#67a3ff2c flags:int api_id:int api_hash:string bot_auth_token:string = auth.Authorization; auth.checkPassword#a63011e password_hash:bytes = auth.Authorization; auth.requestPasswordRecovery#d897bc66 = auth.PasswordRecovery; auth.recoverPassword#4ea56e92 code:string = auth.Authorization; +auth.resendCode#3ef1a9bf phone_number:string phone_code_hash:string = auth.SentCode; +auth.cancelCode#1f040578 phone_number:string phone_code_hash:string = Bool; account.registerDevice#446c712c token_type:int token:string device_model:string system_version:string app_version:string app_sandbox:Bool lang_code:string = Bool; account.unregisterDevice#65c55b40 token_type:int token:string = Bool; @@ -690,7 +696,7 @@ account.setPrivacy#c9f81ce8 key:InputPrivacyKey rules:Vector = account.deleteAccount#418d4e0b reason:string = Bool; account.getAccountTTL#8fc711d = AccountDaysTTL; account.setAccountTTL#2442485e ttl:AccountDaysTTL = Bool; -account.sendChangePhoneCode#a407a8f4 phone_number:string = account.SentChangePhoneCode; +account.sendChangePhoneCode#8e57deb flags:# allow_flashcall:flags.0?true phone_number:string current_number:flags.0?Bool = auth.SentCode; account.changePhone#70c32edb phone_number:string phone_code_hash:string phone_code:string = User; account.updateDeviceLocked#38df3532 period:int = Bool; account.getAuthorizations#e320c158 = account.Authorizations; diff --git a/Telegram/SourceFiles/window.cpp b/Telegram/SourceFiles/window.cpp index 4d82a0711..90ef602b8 100644 --- a/Telegram/SourceFiles/window.cpp +++ b/Telegram/SourceFiles/window.cpp @@ -30,7 +30,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #include "pspecific.h" #include "title.h" #include "passcodewidget.h" -#include "intro/intro.h" +#include "intro/introwidget.h" #include "mainwidget.h" #include "layerwidget.h" #include "settingswidget.h" diff --git a/Telegram/Telegram.pro b/Telegram/Telegram.pro index 3ea190507..15192dbd9 100644 --- a/Telegram/Telegram.pro +++ b/Telegram/Telegram.pro @@ -160,12 +160,12 @@ SOURCES += \ ./SourceFiles/boxes/sessionsbox.cpp \ ./SourceFiles/boxes/stickersetbox.cpp \ ./SourceFiles/boxes/usernamebox.cpp \ - ./SourceFiles/intro/intro.cpp \ + ./SourceFiles/intro/introwidget.cpp \ ./SourceFiles/intro/introcode.cpp \ ./SourceFiles/intro/introphone.cpp \ ./SourceFiles/intro/intropwdcheck.cpp \ ./SourceFiles/intro/introsignup.cpp \ - ./SourceFiles/intro/introsteps.cpp + ./SourceFiles/intro/introstart.cpp HEADERS += \ ./SourceFiles/stdafx.h \ @@ -254,12 +254,12 @@ HEADERS += \ ./SourceFiles/boxes/sessionsbox.h \ ./SourceFiles/boxes/stickersetbox.h \ ./SourceFiles/boxes/usernamebox.h \ - ./SourceFiles/intro/intro.h \ + ./SourceFiles/intro/introwidget.h \ ./SourceFiles/intro/introcode.h \ ./SourceFiles/intro/introphone.h \ ./SourceFiles/intro/intropwdcheck.h \ ./SourceFiles/intro/introsignup.h \ - ./SourceFiles/intro/introsteps.h + ./SourceFiles/intro/introstart.h win32 { SOURCES += \ diff --git a/Telegram/Telegram.vcxproj b/Telegram/Telegram.vcxproj index 6f0ffc653..99397eaaa 100644 --- a/Telegram/Telegram.vcxproj +++ b/Telegram/Telegram.vcxproj @@ -263,10 +263,6 @@ true true - - true - true - true true @@ -283,6 +279,10 @@ true true + + true + true + true true @@ -521,10 +521,6 @@ true true - - true - true - true true @@ -541,6 +537,10 @@ true true + + true + true + true true @@ -805,10 +805,6 @@ true true - - true - true - true true @@ -825,6 +821,10 @@ true true + + true + true + true true @@ -1001,12 +1001,12 @@ - + - + @@ -1662,19 +1662,19 @@ $(QTDIR)\bin\moc.exe;%(FullPath) $(QTDIR)\bin\moc.exe;%(FullPath) - - Moc%27ing intro.h... + + Moc%27ing introwidget.h... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DAL_LIBTYPE_STATIC -DUNICODE -DWIN32 -DWIN64 -DHAVE_STDINT_H -DZLIB_WINAPI -D_SCL_SECURE_NO_WARNINGS "-I.\..\..\Libraries\lzma\C" "-I.\..\..\Libraries\libexif-0.6.20" "-I.\..\..\Libraries\zlib-1.2.8" "-I.\..\..\Libraries\openssl_debug\Debug\include" "-I.\..\..\Libraries\ffmpeg" "-I.\..\..\Libraries\openal-soft\include" "-I.\..\..\Libraries\breakpad\src" "-I.\ThirdParty\minizip" "-I.\SourceFiles" "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I.\..\..\Libraries\QtStatic\qtbase\include\QtCore\5.5.1\QtCore" "-I.\..\..\Libraries\QtStatic\qtbase\include\QtGui\5.5.1\QtGui" "-fstdafx.h" "-f../../SourceFiles/intro/intro.h" - Moc%27ing intro.h... - Moc%27ing intro.h... + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fstdafx.h" "-f../../SourceFiles/intro/introwidget.h" -DAL_LIBTYPE_STATIC -DUNICODE -DWIN32 -DWIN64 -DHAVE_STDINT_H -DZLIB_WINAPI -D_SCL_SECURE_NO_WARNINGS "-I.\..\..\Libraries\lzma\C" "-I.\..\..\Libraries\libexif-0.6.20" "-I.\..\..\Libraries\zlib-1.2.8" "-I.\..\..\Libraries\openssl_debug\Debug\include" "-I.\..\..\Libraries\ffmpeg" "-I.\..\..\Libraries\openal-soft\include" "-I.\..\..\Libraries\breakpad\src" "-I.\ThirdParty\minizip" "-I.\SourceFiles" "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I.\..\..\Libraries\QtStatic\qtbase\include\QtCore\5.5.1\QtCore" "-I.\..\..\Libraries\QtStatic\qtbase\include\QtGui\5.5.1\QtGui" + Moc%27ing introwidget.h... + Moc%27ing introwidget.h... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DAL_LIBTYPE_STATIC -DUNICODE -DWIN32 -DWIN64 -DHAVE_STDINT_H -DZLIB_WINAPI -DQT_NO_DEBUG -DNDEBUG -D_SCL_SECURE_NO_WARNINGS "-I.\..\..\Libraries\lzma\C" "-I.\..\..\Libraries\libexif-0.6.20" "-I.\..\..\Libraries\zlib-1.2.8" "-I.\..\..\Libraries\openssl\Release\include" "-I.\..\..\Libraries\ffmpeg" "-I.\..\..\Libraries\openal-soft\include" "-I.\SourceFiles" "-I.\GeneratedFiles" "-I.\..\..\Libraries\breakpad\src" "-I.\ThirdParty\minizip" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I.\..\..\Libraries\QtStatic\qtbase\include\QtCore\5.5.1\QtCore" "-I.\..\..\Libraries\QtStatic\qtbase\include\QtGui\5.5.1\QtGui" "-fstdafx.h" "-f../../SourceFiles/intro/intro.h" - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DAL_LIBTYPE_STATIC -DCUSTOM_API_ID -DUNICODE -DWIN32 -DWIN64 -DHAVE_STDINT_H -DZLIB_WINAPI -DQT_NO_DEBUG -DNDEBUG -D_SCL_SECURE_NO_WARNINGS "-I.\..\..\Libraries\lzma\C" "-I.\..\..\Libraries\libexif-0.6.20" "-I.\..\..\Libraries\zlib-1.2.8" "-I.\..\..\Libraries\openssl\Release\include" "-I.\..\..\Libraries\ffmpeg" "-I.\..\..\Libraries\openal-soft\include" "-I.\SourceFiles" "-I.\GeneratedFiles" "-I.\..\..\Libraries\breakpad\src" "-I.\ThirdParty\minizip" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I.\..\..\Libraries\QtStatic\qtbase\include\QtCore\5.5.1\QtCore" "-I.\..\..\Libraries\QtStatic\qtbase\include\QtGui\5.5.1\QtGui" "-fstdafx.h" "-f../../SourceFiles/intro/intro.h" - $(QTDIR)\bin\moc.exe;%(FullPath) - $(QTDIR)\bin\moc.exe;%(FullPath) - $(QTDIR)\bin\moc.exe;%(FullPath) + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fstdafx.h" "-f../../SourceFiles/intro/introwidget.h" -DAL_LIBTYPE_STATIC -DUNICODE -DWIN32 -DWIN64 -DHAVE_STDINT_H -DZLIB_WINAPI -DQT_NO_DEBUG -DNDEBUG -D_SCL_SECURE_NO_WARNINGS "-I.\..\..\Libraries\lzma\C" "-I.\..\..\Libraries\libexif-0.6.20" "-I.\..\..\Libraries\zlib-1.2.8" "-I.\..\..\Libraries\openssl\Release\include" "-I.\..\..\Libraries\ffmpeg" "-I.\..\..\Libraries\openal-soft\include" "-I.\SourceFiles" "-I.\GeneratedFiles" "-I.\..\..\Libraries\breakpad\src" "-I.\ThirdParty\minizip" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I.\..\..\Libraries\QtStatic\qtbase\include\QtCore\5.5.1\QtCore" "-I.\..\..\Libraries\QtStatic\qtbase\include\QtGui\5.5.1\QtGui" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fstdafx.h" "-f../../SourceFiles/intro/introwidget.h" -DAL_LIBTYPE_STATIC -DCUSTOM_API_ID -DUNICODE -DWIN32 -DWIN64 -DHAVE_STDINT_H -DZLIB_WINAPI -DQT_NO_DEBUG -DNDEBUG -D_SCL_SECURE_NO_WARNINGS "-I.\..\..\Libraries\lzma\C" "-I.\..\..\Libraries\libexif-0.6.20" "-I.\..\..\Libraries\zlib-1.2.8" "-I.\..\..\Libraries\openssl\Release\include" "-I.\..\..\Libraries\ffmpeg" "-I.\..\..\Libraries\openal-soft\include" "-I.\SourceFiles" "-I.\GeneratedFiles" "-I.\..\..\Libraries\breakpad\src" "-I.\ThirdParty\minizip" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I.\..\..\Libraries\QtStatic\qtbase\include\QtCore\5.5.1\QtCore" "-I.\..\..\Libraries\QtStatic\qtbase\include\QtGui\5.5.1\QtGui" + $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) + $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) + $(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing introcode.h... @@ -1732,7 +1732,7 @@ .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DAL_LIBTYPE_STATIC -DUNICODE -DWIN32 -DWIN64 -DHAVE_STDINT_H -DZLIB_WINAPI -DQT_NO_DEBUG -DNDEBUG -D_SCL_SECURE_NO_WARNINGS "-I.\..\..\Libraries\lzma\C" "-I.\..\..\Libraries\libexif-0.6.20" "-I.\..\..\Libraries\zlib-1.2.8" "-I.\..\..\Libraries\openssl\Release\include" "-I.\..\..\Libraries\ffmpeg" "-I.\..\..\Libraries\openal-soft\include" "-I.\SourceFiles" "-I.\GeneratedFiles" "-I.\..\..\Libraries\breakpad\src" "-I.\ThirdParty\minizip" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I.\..\..\Libraries\QtStatic\qtbase\include\QtCore\5.5.1\QtCore" "-I.\..\..\Libraries\QtStatic\qtbase\include\QtGui\5.5.1\QtGui" "-fstdafx.h" "-f../../SourceFiles/intro/intropwdcheck.h" - + Moc%27ing layerwidget.h... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp diff --git a/Telegram/Telegram.vcxproj.filters b/Telegram/Telegram.vcxproj.filters index 3c80ea71f..a0da01041 100644 --- a/Telegram/Telegram.vcxproj.filters +++ b/Telegram/Telegram.vcxproj.filters @@ -201,9 +201,6 @@ boxes - - intro - intro @@ -213,9 +210,6 @@ intro - - intro - Source Files @@ -426,15 +420,6 @@ Generated Files\Release - - Generated Files\Deploy - - - Generated Files\Debug - - - Generated Files\Release - Generated Files\Deploy @@ -909,6 +894,21 @@ Source Files + + intro + + + Generated Files\Deploy + + + Generated Files\Debug + + + Generated Files\Release + + + intro + @@ -962,9 +962,6 @@ gui - - intro - gui @@ -1010,6 +1007,9 @@ Source Files + + intro + @@ -1117,9 +1117,6 @@ boxes - - intro - intro @@ -1234,6 +1231,9 @@ Source Files + + intro + diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj index 65122a042..65609b1ef 100644 --- a/Telegram/Telegram.xcodeproj/project.pbxproj +++ b/Telegram/Telegram.xcodeproj/project.pbxproj @@ -99,7 +99,7 @@ 07DE92AD1AA4928B00A18F6F /* moc_passcodebox.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 07DE92AB1AA4928B00A18F6F /* moc_passcodebox.cpp */; }; 07DE92AE1AA4928B00A18F6F /* moc_passcodewidget.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 07DE92AC1AA4928B00A18F6F /* moc_passcodewidget.cpp */; }; 0CB7DE9A54CC9BF86FB7B5CA /* mtp.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 6D50D70712776D7ED3B00E5C /* mtp.cpp */; settings = {ATTRIBUTES = (); }; }; - 0F7872E39EA570249D420912 /* moc_intro.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = A37C7E516201B0264A4CDA38 /* moc_intro.cpp */; settings = {ATTRIBUTES = (); }; }; + 0F7872E39EA570249D420912 /* moc_introwidget.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = A37C7E516201B0264A4CDA38 /* moc_introwidget.cpp */; settings = {ATTRIBUTES = (); }; }; 113AA97DEE7847C7D2DCFF71 /* logs.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 974DB34EEB8F83B91614C0B0 /* logs.cpp */; settings = {ATTRIBUTES = (); }; }; 1299DDAE203A7EDFED9F5D6B /* main.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 5271C394C1E7646D117CE67E /* main.cpp */; settings = {ATTRIBUTES = (); }; }; 15364689D2AB5A30E87A689F /* Security.framework in Link Binary With Libraries */ = {isa = PBXBuildFile; fileRef = 205259EEEE2BADA5E64741E3 /* Security.framework */; }; @@ -156,7 +156,7 @@ 8771A8C96E9C391044035D99 /* OpenGL.framework in Link Binary With Libraries */ = {isa = PBXBuildFile; fileRef = D4B32C2222F82AC56BADEB21 /* OpenGL.framework */; }; 8883FF366F2623E89D90A9E6 /* qgenericbearer in Link Binary With Libraries */ = {isa = PBXBuildFile; fileRef = 9A55B8F7C143D66AD9EAE304 /* qgenericbearer */; }; 89ADB41E48A3B5E24ABB626C /* profilewidget.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = CF32DF59C7823E4F3397EF3C /* profilewidget.cpp */; settings = {ATTRIBUTES = (); }; }; - 8B22E794EFF0EAFF964A3043 /* introsteps.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = C34459FA465B57DF4DB80D12 /* introsteps.cpp */; settings = {ATTRIBUTES = (); }; }; + 8B22E794EFF0EAFF964A3043 /* introstart.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = C34459FA465B57DF4DB80D12 /* introstart.cpp */; settings = {ATTRIBUTES = (); }; }; 8B71D1C7BB9DCEE6511219C2 /* moc_flatlabel.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 2181F5E34DE0A4B2F811E2E2 /* moc_flatlabel.cpp */; settings = {ATTRIBUTES = (); }; }; 8C4BA0DB55E2C40DE5F5E990 /* moc_pspecific_mac.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 74772222DA764BE4623EAC5D /* moc_pspecific_mac.cpp */; settings = {ATTRIBUTES = (); }; }; 8D267F2E4776F0ECA2F49DC8 /* IOKit.framework in Link Binary With Libraries */ = {isa = PBXBuildFile; fileRef = A1A67BEAA744704B29168D39 /* IOKit.framework */; }; @@ -217,7 +217,7 @@ E3D7A5CA24541D5DB69D6606 /* images.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 6A510365F9F6367ECB0DB065 /* images.cpp */; settings = {ATTRIBUTES = (); }; }; E45E51A644D5FC9F942ECE55 /* AGL.framework in Link Binary With Libraries */ = {isa = PBXBuildFile; fileRef = 8D9815BDB5BD9F90D2BC05C5 /* AGL.framework */; }; E8B28580819B882A5964561A /* moc_addcontactbox.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 81780025807318AEA3B8A6FF /* moc_addcontactbox.cpp */; settings = {ATTRIBUTES = (); }; }; - E8D95529CED88F18818C9A8B /* intro.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 0771C4C94B623FC34BF62983 /* intro.cpp */; settings = {ATTRIBUTES = (); }; }; + E8D95529CED88F18818C9A8B /* introwidget.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 0771C4C94B623FC34BF62983 /* introwidget.cpp */; settings = {ATTRIBUTES = (); }; }; E97B3CFAB59B49BACFFC5F7C /* moc_title.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 1080B6D395843B8F76A2E45E /* moc_title.cpp */; settings = {ATTRIBUTES = (); }; }; E9F1CE7F9B18C7C85A50E62D /* style_auto.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 99B8D38F7F5858601230911E /* style_auto.cpp */; settings = {ATTRIBUTES = (); }; }; EBE29731916DB43BF49FE7A4 /* aboutbox.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = C194EDD00F76216057D48A5C /* aboutbox.cpp */; settings = {ATTRIBUTES = (); }; }; @@ -313,7 +313,7 @@ 0764D5581ABAD6F900FBFEED /* apiwrap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = apiwrap.cpp; path = SourceFiles/apiwrap.cpp; sourceTree = SOURCE_ROOT; }; 0764D5591ABAD6F900FBFEED /* apiwrap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = apiwrap.h; path = SourceFiles/apiwrap.h; sourceTree = SOURCE_ROOT; }; 0764D55C1ABAD71B00FBFEED /* moc_apiwrap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = moc_apiwrap.cpp; path = GeneratedFiles/Debug/moc_apiwrap.cpp; sourceTree = SOURCE_ROOT; }; - 0771C4C94B623FC34BF62983 /* intro.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = intro.cpp; path = SourceFiles/intro/intro.cpp; sourceTree = ""; }; + 0771C4C94B623FC34BF62983 /* introwidget.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = introwidget.cpp; path = SourceFiles/intro/introwidget.cpp; sourceTree = ""; }; 078A2FC91A811C5900CCC7A0 /* moc_backgroundbox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = moc_backgroundbox.cpp; path = GeneratedFiles/Debug/moc_backgroundbox.cpp; sourceTree = SOURCE_ROOT; }; 078A2FCB1A811CA600CCC7A0 /* backgroundbox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = backgroundbox.cpp; path = SourceFiles/boxes/backgroundbox.cpp; sourceTree = SOURCE_ROOT; }; 078A2FCC1A811CA600CCC7A0 /* backgroundbox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = backgroundbox.h; path = SourceFiles/boxes/backgroundbox.h; sourceTree = SOURCE_ROOT; }; @@ -393,7 +393,7 @@ 135FD3715BFDC50AD7B00E04 /* text.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = text.cpp; path = SourceFiles/gui/text.cpp; sourceTree = ""; }; 143405635D04698F421A12EA /* aboutbox.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = aboutbox.h; path = SourceFiles/boxes/aboutbox.h; sourceTree = ""; }; 14437BFDCD58FF1742EF1B35 /* photocropbox.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = photocropbox.h; path = SourceFiles/boxes/photocropbox.h; sourceTree = ""; }; - 152B8D1BCECEB7B0C77E073C /* intro.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = intro.h; path = SourceFiles/intro/intro.h; sourceTree = ""; }; + 152B8D1BCECEB7B0C77E073C /* introwidget.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = introwidget.h; path = SourceFiles/intro/introwidget.h; sourceTree = ""; }; 16DD53E17C65AC8B450CC6C3 /* /usr/local/Qt-5.5.1/mkspecs/modules/qt_lib_quick.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.5.1/mkspecs/modules/qt_lib_quick.pri"; sourceTree = ""; }; 186D09F4CB713AD4B8BDD260 /* AudioUnit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = /System/Library/Frameworks/AudioUnit.framework; sourceTree = ""; }; 19618554524B8D928F13940D /* emoji_config.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = emoji_config.h; path = SourceFiles/gui/emoji_config.h; sourceTree = ""; }; @@ -580,7 +580,7 @@ A1479F94376F9732B57C69DB /* moc_animation.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = moc_animation.cpp; path = GeneratedFiles/Debug/moc_animation.cpp; sourceTree = ""; }; A1A67BEAA744704B29168D39 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = ""; }; A3622760CEC6D6827A25E710 /* mtpPublicRSA.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = mtpPublicRSA.h; path = SourceFiles/mtproto/mtpPublicRSA.h; sourceTree = ""; }; - A37C7E516201B0264A4CDA38 /* moc_intro.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = moc_intro.cpp; path = GeneratedFiles/Debug/moc_intro.cpp; sourceTree = ""; }; + A37C7E516201B0264A4CDA38 /* moc_introwidget.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = moc_introwidget.cpp; path = GeneratedFiles/Debug/moc_introwidget.cpp; sourceTree = ""; }; A4D8AC60897F435C1C3B9D02 /* /usr/local/Qt-5.5.1/mkspecs/modules/qt_plugin_qtsensors_generic.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.5.1/mkspecs/modules/qt_plugin_qtsensors_generic.pri"; sourceTree = ""; }; A59F74CD76FDC2B4B9910E18 /* /usr/local/Qt-5.5.1/mkspecs/modules/qt_lib_scripttools_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.5.1/mkspecs/modules/qt_lib_scripttools_private.pri"; sourceTree = ""; }; A5B17ABEFBA1C2F43443D644 /* /usr/local/Qt-5.5.1/mkspecs/modules/qt_lib_macextras.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.5.1/mkspecs/modules/qt_lib_macextras.pri"; sourceTree = ""; }; @@ -596,7 +596,7 @@ AC9B5F6FB4B984C8D76F7AE2 /* moc_dropdown.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = moc_dropdown.cpp; path = GeneratedFiles/Debug/moc_dropdown.cpp; sourceTree = ""; }; ACC8A73268E5D9AF64E97AF4 /* /usr/local/Qt-5.5.1/mkspecs/modules/qt_lib_bluetooth.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.5.1/mkspecs/modules/qt_lib_bluetooth.pri"; sourceTree = ""; }; AD0C395D671BC024083A5FC7 /* localimageloader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = localimageloader.h; path = SourceFiles/localimageloader.h; sourceTree = ""; }; - AD90723EF02EAD016FD49CC9 /* introsteps.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = introsteps.h; path = SourceFiles/intro/introsteps.h; sourceTree = ""; }; + AD90723EF02EAD016FD49CC9 /* introstart.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = introstart.h; path = SourceFiles/intro/introstart.h; sourceTree = ""; }; ADC6308023253CEA51F86E21 /* qwebp */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qwebp; path = "/usr/local/Qt-5.5.1/plugins/imageformats/libqwebp$(QT_LIBRARY_SUFFIX).a"; sourceTree = ""; }; ADFC79902C14A612AE93A89A /* /usr/local/Qt-5.5.1/mkspecs/modules/qt_lib_svg.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.5.1/mkspecs/modules/qt_lib_svg.pri"; sourceTree = ""; }; AEA456A2F75ED9F5CDA7BCBE /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; @@ -629,7 +629,7 @@ C194EDD00F76216057D48A5C /* aboutbox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = aboutbox.cpp; path = SourceFiles/boxes/aboutbox.cpp; sourceTree = ""; }; C19DF71B273A4843553518F2 /* app.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = app.h; path = SourceFiles/app.h; sourceTree = ""; }; C20F9DD8C7B031B8E20D5653 /* application.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = application.cpp; path = SourceFiles/application.cpp; sourceTree = ""; }; - C34459FA465B57DF4DB80D12 /* introsteps.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = introsteps.cpp; path = SourceFiles/intro/introsteps.cpp; sourceTree = ""; }; + C34459FA465B57DF4DB80D12 /* introstart.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = introstart.cpp; path = SourceFiles/intro/introstart.cpp; sourceTree = ""; }; C4295BE59CCEBCDD16268349 /* /usr/local/Qt-5.5.1/mkspecs/modules/qt_plugin_qico.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.5.1/mkspecs/modules/qt_plugin_qico.pri"; sourceTree = ""; }; C505A18319B9B63C63877858 /* /usr/local/Qt-5.5.1/mkspecs/modules/qt_lib_script_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.5.1/mkspecs/modules/qt_lib_script_private.pri"; sourceTree = ""; }; C63C6D083EBEB13A60256DF3 /* historywidget.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = historywidget.h; path = SourceFiles/historywidget.h; sourceTree = ""; }; @@ -908,18 +908,18 @@ 5E35A03E5F2C51353EBCBF00 /* intro */ = { isa = PBXGroup; children = ( - 0771C4C94B623FC34BF62983 /* intro.cpp */, + 0771C4C94B623FC34BF62983 /* introwidget.cpp */, A0090709DE1B155085362C36 /* introcode.cpp */, 61C679D8B4B332026BD34200 /* introphone.cpp */, 07DB674F1AD07CB800A51329 /* intropwdcheck.cpp */, A9FF4818C6775109B3DBFA18 /* introsignup.cpp */, - C34459FA465B57DF4DB80D12 /* introsteps.cpp */, - 152B8D1BCECEB7B0C77E073C /* intro.h */, + C34459FA465B57DF4DB80D12 /* introstart.cpp */, + 152B8D1BCECEB7B0C77E073C /* introwidget.h */, 098EA7CE256AAFAE4A17EB77 /* introcode.h */, EF1AD6A66D0C28A6A15E2C30 /* introphone.h */, 07DB67501AD07CB800A51329 /* intropwdcheck.h */, DC23E0B79FF53F35BA8F76A1 /* introsignup.h */, - AD90723EF02EAD016FD49CC9 /* introsteps.h */, + AD90723EF02EAD016FD49CC9 /* introstart.h */, ); name = intro; sourceTree = ""; @@ -1203,7 +1203,7 @@ 0C0DC15EB416789673526AA5 /* moc_emojibox.cpp */, AF61D864B8C444ADD4E1B391 /* moc_photocropbox.cpp */, 9E0704DE8650D7952DC6B7AE /* moc_photosendbox.cpp */, - A37C7E516201B0264A4CDA38 /* moc_intro.cpp */, + A37C7E516201B0264A4CDA38 /* moc_introwidget.cpp */, 8B98A212C068D6CC7CE73CAA /* moc_introcode.cpp */, 1B4A65B84270FF2FED008EB6 /* moc_introphone.cpp */, 58A7114F60E7D09E73283983 /* moc_introsignup.cpp */, @@ -1603,11 +1603,11 @@ 07D703BB19B88FB900C4EED2 /* moc_audio.cpp in Compile Sources */, 77B998AC22A13EF3DDEE07AC /* photocropbox.cpp in Compile Sources */, F278C423357CA99797EA30AB /* photosendbox.cpp in Compile Sources */, - E8D95529CED88F18818C9A8B /* intro.cpp in Compile Sources */, + E8D95529CED88F18818C9A8B /* introwidget.cpp in Compile Sources */, 9357E7B12AD6D88B157ACA05 /* introcode.cpp in Compile Sources */, 4BF3F8D0797BC8A0C1FAD13C /* introphone.cpp in Compile Sources */, 4978DE680549639AE9AA9CA6 /* introsignup.cpp in Compile Sources */, - 8B22E794EFF0EAFF964A3043 /* introsteps.cpp in Compile Sources */, + 8B22E794EFF0EAFF964A3043 /* introstart.cpp in Compile Sources */, 74343521EECC740F777DAFE6 /* pspecific_mac.cpp in Compile Sources */, 26A81090DC8B5BCF7278FDFF /* qrc_telegram.cpp in Compile Sources */, 07AF95F51AFD03B90060B057 /* qrc_telegram_mac.cpp in Compile Sources */, @@ -1675,7 +1675,7 @@ 9D294F23E02CFDF22C288382 /* moc_emojibox.cpp in Compile Sources */, 9809A3AF1946D51ACB41D716 /* moc_photocropbox.cpp in Compile Sources */, AC6C131416AEC557C854BA70 /* moc_photosendbox.cpp in Compile Sources */, - 0F7872E39EA570249D420912 /* moc_intro.cpp in Compile Sources */, + 0F7872E39EA570249D420912 /* moc_introwidget.cpp in Compile Sources */, 4F27F5F76AA3F78C8CA27339 /* moc_introcode.cpp in Compile Sources */, 07D8509519F5C97E00623D75 /* mtpScheme.cpp in Compile Sources */, 0250AB6761AC71A2E3155EEA /* moc_introphone.cpp in Compile Sources */, diff --git a/Telegram/Telegram.xcodeproj/qt_preprocess.mak b/Telegram/Telegram.xcodeproj/qt_preprocess.mak index 109bb8a07..961347559 100644 --- a/Telegram/Telegram.xcodeproj/qt_preprocess.mak +++ b/Telegram/Telegram.xcodeproj/qt_preprocess.mak @@ -50,7 +50,7 @@ compilers: GeneratedFiles/qrc_telegram.cpp GeneratedFiles/qrc_telegram_emojis.cp GeneratedFiles/Debug/moc_confirmbox.cpp GeneratedFiles/Debug/moc_connectionbox.cpp GeneratedFiles/Debug/moc_contactsbox.cpp\ GeneratedFiles/Debug/moc_downloadpathbox.cpp GeneratedFiles/Debug/moc_emojibox.cpp GeneratedFiles/Debug/moc_languagebox.cpp\ GeneratedFiles/Debug/moc_passcodebox.cpp\ - GeneratedFiles/Debug/moc_photocropbox.cpp GeneratedFiles/Debug/moc_photosendbox.cpp GeneratedFiles/Debug/moc_sessionsbox.cpp GeneratedFiles/Debug/moc_stickersetbox.cpp GeneratedFiles/Debug/moc_usernamebox.cpp GeneratedFiles/Debug/moc_intro.cpp\ + GeneratedFiles/Debug/moc_photocropbox.cpp GeneratedFiles/Debug/moc_photosendbox.cpp GeneratedFiles/Debug/moc_sessionsbox.cpp GeneratedFiles/Debug/moc_stickersetbox.cpp GeneratedFiles/Debug/moc_usernamebox.cpp GeneratedFiles/Debug/moc_introwidget.cpp\ GeneratedFiles/Debug/moc_introcode.cpp GeneratedFiles/Debug/moc_introphone.cpp GeneratedFiles/Debug/moc_intropwdcheck.cpp GeneratedFiles/Debug/moc_introsignup.cpp\ GeneratedFiles/Debug/moc_pspecific_mac.cpp compiler_objective_c_make_all: @@ -99,9 +99,9 @@ GeneratedFiles/qrc_telegram_mac.cpp: SourceFiles/telegram_mac.qrc \ SourceFiles/art/osxtray.png /usr/local/Qt-5.5.1/bin/rcc -name telegram_mac SourceFiles/telegram_mac.qrc -o GeneratedFiles/qrc_telegram_mac.cpp -compiler_moc_header_make_all: GeneratedFiles/Debug/moc_apiwrap.cpp GeneratedFiles/Debug/moc_application.cpp GeneratedFiles/Debug/moc_audio.cpp GeneratedFiles/Debug/moc_autoupdater.cpp GeneratedFiles/Debug/moc_dialogswidget.cpp GeneratedFiles/Debug/moc_dropdown.cpp GeneratedFiles/Debug/moc_fileuploader.cpp GeneratedFiles/Debug/moc_history.cpp GeneratedFiles/Debug/moc_historywidget.cpp GeneratedFiles/Debug/moc_layerwidget.cpp GeneratedFiles/Debug/moc_mediaview.cpp GeneratedFiles/Debug/moc_overviewwidget.cpp GeneratedFiles/Debug/moc_playerwidget.cpp GeneratedFiles/Debug/moc_profilewidget.cpp GeneratedFiles/Debug/moc_passcodewidget.cpp GeneratedFiles/Debug/moc_localimageloader.cpp GeneratedFiles/Debug/moc_localstorage.cpp GeneratedFiles/Debug/moc_mainwidget.cpp GeneratedFiles/Debug/moc_settingswidget.cpp GeneratedFiles/Debug/moc_sysbuttons.cpp GeneratedFiles/Debug/moc_title.cpp GeneratedFiles/Debug/moc_types.cpp GeneratedFiles/Debug/moc_window.cpp GeneratedFiles/Debug/moc_mtp.cpp GeneratedFiles/Debug/moc_mtpConnection.cpp GeneratedFiles/Debug/moc_mtpDC.cpp GeneratedFiles/Debug/moc_mtpFileLoader.cpp GeneratedFiles/Debug/moc_mtpSession.cpp GeneratedFiles/Debug/moc_animation.cpp GeneratedFiles/Debug/moc_button.cpp GeneratedFiles/Debug/moc_popupmenu.cpp GeneratedFiles/Debug/moc_countryinput.cpp GeneratedFiles/Debug/moc_flatbutton.cpp GeneratedFiles/Debug/moc_flatcheckbox.cpp GeneratedFiles/Debug/moc_flatinput.cpp GeneratedFiles/Debug/moc_flatlabel.cpp GeneratedFiles/Debug/moc_flattextarea.cpp GeneratedFiles/Debug/moc_scrollarea.cpp GeneratedFiles/Debug/moc_twidget.cpp GeneratedFiles/Debug/moc_aboutbox.cpp GeneratedFiles/Debug/moc_abstractbox.cpp GeneratedFiles/Debug/moc_addcontactbox.cpp GeneratedFiles/Debug/moc_autolockbox.cpp GeneratedFiles/Debug/moc_backgroundbox.cpp GeneratedFiles/Debug/moc_confirmbox.cpp GeneratedFiles/Debug/moc_connectionbox.cpp GeneratedFiles/Debug/moc_contactsbox.cpp GeneratedFiles/Debug/moc_downloadpathbox.cpp GeneratedFiles/Debug/moc_emojibox.cpp GeneratedFiles/Debug/moc_languagebox.cpp GeneratedFiles/Debug/moc_passcodebox.cpp GeneratedFiles/Debug/moc_photocropbox.cpp GeneratedFiles/Debug/moc_photosendbox.cpp GeneratedFiles/Debug/moc_sessionsbox.cpp GeneratedFiles/Debug/moc_stickersetbox.cpp GeneratedFiles/Debug/moc_usernamebox.cpp GeneratedFiles/Debug/moc_intro.cpp GeneratedFiles/Debug/moc_introcode.cpp GeneratedFiles/Debug/moc_introphone.cpp GeneratedFiles/Debug/moc_intropwdcheck.cpp GeneratedFiles/Debug/moc_introsignup.cpp GeneratedFiles/Debug/moc_pspecific_mac.cpp +compiler_moc_header_make_all: GeneratedFiles/Debug/moc_apiwrap.cpp GeneratedFiles/Debug/moc_application.cpp GeneratedFiles/Debug/moc_audio.cpp GeneratedFiles/Debug/moc_autoupdater.cpp GeneratedFiles/Debug/moc_dialogswidget.cpp GeneratedFiles/Debug/moc_dropdown.cpp GeneratedFiles/Debug/moc_fileuploader.cpp GeneratedFiles/Debug/moc_history.cpp GeneratedFiles/Debug/moc_historywidget.cpp GeneratedFiles/Debug/moc_layerwidget.cpp GeneratedFiles/Debug/moc_mediaview.cpp GeneratedFiles/Debug/moc_overviewwidget.cpp GeneratedFiles/Debug/moc_playerwidget.cpp GeneratedFiles/Debug/moc_profilewidget.cpp GeneratedFiles/Debug/moc_passcodewidget.cpp GeneratedFiles/Debug/moc_localimageloader.cpp GeneratedFiles/Debug/moc_localstorage.cpp GeneratedFiles/Debug/moc_mainwidget.cpp GeneratedFiles/Debug/moc_settingswidget.cpp GeneratedFiles/Debug/moc_sysbuttons.cpp GeneratedFiles/Debug/moc_title.cpp GeneratedFiles/Debug/moc_types.cpp GeneratedFiles/Debug/moc_window.cpp GeneratedFiles/Debug/moc_mtp.cpp GeneratedFiles/Debug/moc_mtpConnection.cpp GeneratedFiles/Debug/moc_mtpDC.cpp GeneratedFiles/Debug/moc_mtpFileLoader.cpp GeneratedFiles/Debug/moc_mtpSession.cpp GeneratedFiles/Debug/moc_animation.cpp GeneratedFiles/Debug/moc_button.cpp GeneratedFiles/Debug/moc_popupmenu.cpp GeneratedFiles/Debug/moc_countryinput.cpp GeneratedFiles/Debug/moc_flatbutton.cpp GeneratedFiles/Debug/moc_flatcheckbox.cpp GeneratedFiles/Debug/moc_flatinput.cpp GeneratedFiles/Debug/moc_flatlabel.cpp GeneratedFiles/Debug/moc_flattextarea.cpp GeneratedFiles/Debug/moc_scrollarea.cpp GeneratedFiles/Debug/moc_twidget.cpp GeneratedFiles/Debug/moc_aboutbox.cpp GeneratedFiles/Debug/moc_abstractbox.cpp GeneratedFiles/Debug/moc_addcontactbox.cpp GeneratedFiles/Debug/moc_autolockbox.cpp GeneratedFiles/Debug/moc_backgroundbox.cpp GeneratedFiles/Debug/moc_confirmbox.cpp GeneratedFiles/Debug/moc_connectionbox.cpp GeneratedFiles/Debug/moc_contactsbox.cpp GeneratedFiles/Debug/moc_downloadpathbox.cpp GeneratedFiles/Debug/moc_emojibox.cpp GeneratedFiles/Debug/moc_languagebox.cpp GeneratedFiles/Debug/moc_passcodebox.cpp GeneratedFiles/Debug/moc_photocropbox.cpp GeneratedFiles/Debug/moc_photosendbox.cpp GeneratedFiles/Debug/moc_sessionsbox.cpp GeneratedFiles/Debug/moc_stickersetbox.cpp GeneratedFiles/Debug/moc_usernamebox.cpp GeneratedFiles/Debug/moc_introwidget.cpp GeneratedFiles/Debug/moc_introcode.cpp GeneratedFiles/Debug/moc_introphone.cpp GeneratedFiles/Debug/moc_intropwdcheck.cpp GeneratedFiles/Debug/moc_introsignup.cpp GeneratedFiles/Debug/moc_pspecific_mac.cpp compiler_moc_header_clean: - -$(DEL_FILE) GeneratedFiles/Debug/moc_apiwrap.cpp GeneratedFiles/Debug/moc_application.cpp GeneratedFiles/Debug/moc_audio.cpp GeneratedFiles/Debug/moc_autoupdater.cpp GeneratedFiles/Debug/moc_dialogswidget.cpp GeneratedFiles/Debug/moc_dropdown.cpp GeneratedFiles/Debug/moc_fileuploader.cpp GeneratedFiles/Debug/moc_history.cpp GeneratedFiles/Debug/moc_historywidget.cpp GeneratedFiles/Debug/moc_layerwidget.cpp GeneratedFiles/Debug/moc_mediaview.cpp GeneratedFiles/Debug/moc_overviewwidget.cpp GeneratedFiles/Debug/moc_playerwidget.cpp GeneratedFiles/Debug/moc_profilewidget.cpp GeneratedFiles/Debug/moc_passcodewidget.cpp GeneratedFiles/Debug/moc_localimageloader.cpp GeneratedFiles/Debug/moc_localstorage.cpp GeneratedFiles/Debug/moc_mainwidget.cpp GeneratedFiles/Debug/moc_settingswidget.cpp GeneratedFiles/Debug/moc_sysbuttons.cpp GeneratedFiles/Debug/moc_title.cpp GeneratedFiles/Debug/moc_types.cpp GeneratedFiles/Debug/moc_window.cpp GeneratedFiles/Debug/moc_mtp.cpp GeneratedFiles/Debug/moc_mtpConnection.cpp GeneratedFiles/Debug/moc_mtpDC.cpp GeneratedFiles/Debug/moc_mtpFileLoader.cpp GeneratedFiles/Debug/moc_mtpSession.cpp GeneratedFiles/Debug/moc_animation.cpp GeneratedFiles/Debug/moc_button.cpp GeneratedFiles/Debug/moc_popupmenu.cpp GeneratedFiles/Debug/moc_countryinput.cpp GeneratedFiles/Debug/moc_flatbutton.cpp GeneratedFiles/Debug/moc_flatcheckbox.cpp GeneratedFiles/Debug/moc_flatinput.cpp GeneratedFiles/Debug/moc_flatlabel.cpp GeneratedFiles/Debug/moc_flattextarea.cpp GeneratedFiles/Debug/moc_scrollarea.cpp GeneratedFiles/Debug/moc_twidget.cpp GeneratedFiles/Debug/moc_aboutbox.cpp GeneratedFiles/Debug/moc_abstractbox.cpp GeneratedFiles/Debug/moc_addcontactbox.cpp GeneratedFiles/Debug/moc_autolockbox.cpp GeneratedFiles/Debug/moc_backgroundbox.cpp GeneratedFiles/Debug/moc_confirmbox.cpp GeneratedFiles/Debug/moc_connectionbox.cpp GeneratedFiles/Debug/moc_contactsbox.cpp GeneratedFiles/Debug/moc_downloadpathbox.cpp GeneratedFiles/Debug/moc_emojibox.cpp GeneratedFiles/Debug/moc_languagebox.cpp GeneratedFiles/Debug/moc_passcodebox.cpp GeneratedFiles/Debug/moc_photocropbox.cpp GeneratedFiles/Debug/moc_photosendbox.cpp GeneratedFiles/Debug/moc_sessionsbox.cpp GeneratedFiles/Debug/moc_stickersetbox.cpp GeneratedFiles/Debug/moc_usernamedbox.cpp GeneratedFiles/Debug/moc_intro.cpp GeneratedFiles/Debug/moc_introcode.cpp GeneratedFiles/Debug/moc_introphone.cpp GeneratedFiles/Debug/moc_intropwdcheck.cpp GeneratedFiles/Debug/moc_introsignup.cpp GeneratedFiles/Debug/moc_pspecific_mac.cpp + -$(DEL_FILE) GeneratedFiles/Debug/moc_apiwrap.cpp GeneratedFiles/Debug/moc_application.cpp GeneratedFiles/Debug/moc_audio.cpp GeneratedFiles/Debug/moc_autoupdater.cpp GeneratedFiles/Debug/moc_dialogswidget.cpp GeneratedFiles/Debug/moc_dropdown.cpp GeneratedFiles/Debug/moc_fileuploader.cpp GeneratedFiles/Debug/moc_history.cpp GeneratedFiles/Debug/moc_historywidget.cpp GeneratedFiles/Debug/moc_layerwidget.cpp GeneratedFiles/Debug/moc_mediaview.cpp GeneratedFiles/Debug/moc_overviewwidget.cpp GeneratedFiles/Debug/moc_playerwidget.cpp GeneratedFiles/Debug/moc_profilewidget.cpp GeneratedFiles/Debug/moc_passcodewidget.cpp GeneratedFiles/Debug/moc_localimageloader.cpp GeneratedFiles/Debug/moc_localstorage.cpp GeneratedFiles/Debug/moc_mainwidget.cpp GeneratedFiles/Debug/moc_settingswidget.cpp GeneratedFiles/Debug/moc_sysbuttons.cpp GeneratedFiles/Debug/moc_title.cpp GeneratedFiles/Debug/moc_types.cpp GeneratedFiles/Debug/moc_window.cpp GeneratedFiles/Debug/moc_mtp.cpp GeneratedFiles/Debug/moc_mtpConnection.cpp GeneratedFiles/Debug/moc_mtpDC.cpp GeneratedFiles/Debug/moc_mtpFileLoader.cpp GeneratedFiles/Debug/moc_mtpSession.cpp GeneratedFiles/Debug/moc_animation.cpp GeneratedFiles/Debug/moc_button.cpp GeneratedFiles/Debug/moc_popupmenu.cpp GeneratedFiles/Debug/moc_countryinput.cpp GeneratedFiles/Debug/moc_flatbutton.cpp GeneratedFiles/Debug/moc_flatcheckbox.cpp GeneratedFiles/Debug/moc_flatinput.cpp GeneratedFiles/Debug/moc_flatlabel.cpp GeneratedFiles/Debug/moc_flattextarea.cpp GeneratedFiles/Debug/moc_scrollarea.cpp GeneratedFiles/Debug/moc_twidget.cpp GeneratedFiles/Debug/moc_aboutbox.cpp GeneratedFiles/Debug/moc_abstractbox.cpp GeneratedFiles/Debug/moc_addcontactbox.cpp GeneratedFiles/Debug/moc_autolockbox.cpp GeneratedFiles/Debug/moc_backgroundbox.cpp GeneratedFiles/Debug/moc_confirmbox.cpp GeneratedFiles/Debug/moc_connectionbox.cpp GeneratedFiles/Debug/moc_contactsbox.cpp GeneratedFiles/Debug/moc_downloadpathbox.cpp GeneratedFiles/Debug/moc_emojibox.cpp GeneratedFiles/Debug/moc_languagebox.cpp GeneratedFiles/Debug/moc_passcodebox.cpp GeneratedFiles/Debug/moc_photocropbox.cpp GeneratedFiles/Debug/moc_photosendbox.cpp GeneratedFiles/Debug/moc_sessionsbox.cpp GeneratedFiles/Debug/moc_stickersetbox.cpp GeneratedFiles/Debug/moc_usernamedbox.cpp GeneratedFiles/Debug/moc_introwidget.cpp GeneratedFiles/Debug/moc_introcode.cpp GeneratedFiles/Debug/moc_introphone.cpp GeneratedFiles/Debug/moc_intropwdcheck.cpp GeneratedFiles/Debug/moc_introsignup.cpp GeneratedFiles/Debug/moc_pspecific_mac.cpp GeneratedFiles/Debug/moc_apiwrap.cpp: SourceFiles/types.h \ SourceFiles/logs.h \ SourceFiles/apiwrap.h @@ -548,7 +548,7 @@ GeneratedFiles/Debug/moc_usernamebox.cpp: SourceFiles/boxes/abstractbox.h \ SourceFiles/boxes/usernamebox.h /usr/local/Qt-5.5.1/bin/moc $(DEFINES) -D__APPLE__ -D__GNUC__=4 -I/usr/local/Qt-5.5.1/mkspecs/macx-clang -I. -I/usr/local/Qt-5.5.1/include/QtGui/5.5.1/QtGui -I/usr/local/Qt-5.5.1/include/QtCore/5.5.1/QtCore -I/usr/local/Qt-5.5.1/include -I./SourceFiles -I./GeneratedFiles -I../../Libraries/lzma/C -I../../Libraries/libexif-0.6.20 -I/usr/local/Qt-5.5.1/include -I/usr/local/Qt-5.5.1/include/QtMultimedia -I/usr/local/Qt-5.5.1/include/QtWidgets -I/usr/local/Qt-5.5.1/include/QtNetwork -I/usr/local/Qt-5.5.1/include/QtGui -I/usr/local/Qt-5.5.1/include/QtCore -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include/c++/4.2.1 -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include/c++/4.2.1/backward -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/5.1/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include SourceFiles/boxes/usernamebox.h -o GeneratedFiles/Debug/moc_usernamebox.cpp -GeneratedFiles/Debug/moc_intro.cpp: ../../Libraries/QtStatic/qtbase/include/QtWidgets/QWidget \ +GeneratedFiles/Debug/moc_introwidget.cpp: ../../Libraries/QtStatic/qtbase/include/QtWidgets/QWidget \ SourceFiles/gui/flatbutton.h \ SourceFiles/gui/button.h \ SourceFiles/gui/twidget.h \ @@ -562,8 +562,8 @@ GeneratedFiles/Debug/moc_intro.cpp: ../../Libraries/QtStatic/qtbase/include/QtWi SourceFiles/style.h \ GeneratedFiles/style_classes.h \ GeneratedFiles/style_auto.h \ - SourceFiles/intro/intro.h - /usr/local/Qt-5.5.1/bin/moc $(DEFINES) -D__APPLE__ -D__GNUC__=4 -I/usr/local/Qt-5.5.1/mkspecs/macx-clang -I. -I/usr/local/Qt-5.5.1/include/QtGui/5.5.1/QtGui -I/usr/local/Qt-5.5.1/include/QtCore/5.5.1/QtCore -I/usr/local/Qt-5.5.1/include -I./SourceFiles -I./GeneratedFiles -I../../Libraries/lzma/C -I../../Libraries/libexif-0.6.20 -I/usr/local/Qt-5.5.1/include -I/usr/local/Qt-5.5.1/include/QtMultimedia -I/usr/local/Qt-5.5.1/include/QtWidgets -I/usr/local/Qt-5.5.1/include/QtNetwork -I/usr/local/Qt-5.5.1/include/QtGui -I/usr/local/Qt-5.5.1/include/QtCore -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include/c++/4.2.1 -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include/c++/4.2.1/backward -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/5.1/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include SourceFiles/intro/intro.h -o GeneratedFiles/Debug/moc_intro.cpp + SourceFiles/intro/introwidget.h + /usr/local/Qt-5.5.1/bin/moc $(DEFINES) -D__APPLE__ -D__GNUC__=4 -I/usr/local/Qt-5.5.1/mkspecs/macx-clang -I. -I/usr/local/Qt-5.5.1/include/QtGui/5.5.1/QtGui -I/usr/local/Qt-5.5.1/include/QtCore/5.5.1/QtCore -I/usr/local/Qt-5.5.1/include -I./SourceFiles -I./GeneratedFiles -I../../Libraries/lzma/C -I../../Libraries/libexif-0.6.20 -I/usr/local/Qt-5.5.1/include -I/usr/local/Qt-5.5.1/include/QtMultimedia -I/usr/local/Qt-5.5.1/include/QtWidgets -I/usr/local/Qt-5.5.1/include/QtNetwork -I/usr/local/Qt-5.5.1/include/QtGui -I/usr/local/Qt-5.5.1/include/QtCore -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include/c++/4.2.1 -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include/c++/4.2.1/backward -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/5.1/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include SourceFiles/intro/introwidget.h -o GeneratedFiles/Debug/moc_introwidget.cpp GeneratedFiles/Debug/moc_introcode.cpp: ../../Libraries/QtStatic/qtbase/include/QtWidgets/QWidget \ SourceFiles/gui/flatbutton.h \ @@ -581,7 +581,7 @@ GeneratedFiles/Debug/moc_introcode.cpp: ../../Libraries/QtStatic/qtbase/include/ GeneratedFiles/style_auto.h \ SourceFiles/gui/flatinput.h \ ../../Libraries/QtStatic/qtbase/include/QtWidgets/QLineEdit \ - SourceFiles/intro/intro.h \ + SourceFiles/intro/introwidget.h \ SourceFiles/intro/introcode.h /usr/local/Qt-5.5.1/bin/moc $(DEFINES) -D__APPLE__ -D__GNUC__=4 -I/usr/local/Qt-5.5.1/mkspecs/macx-clang -I. -I/usr/local/Qt-5.5.1/include/QtGui/5.5.1/QtGui -I/usr/local/Qt-5.5.1/include/QtCore/5.5.1/QtCore -I/usr/local/Qt-5.5.1/include -I./SourceFiles -I./GeneratedFiles -I../../Libraries/lzma/C -I../../Libraries/libexif-0.6.20 -I/usr/local/Qt-5.5.1/include -I/usr/local/Qt-5.5.1/include/QtMultimedia -I/usr/local/Qt-5.5.1/include/QtWidgets -I/usr/local/Qt-5.5.1/include/QtNetwork -I/usr/local/Qt-5.5.1/include/QtGui -I/usr/local/Qt-5.5.1/include/QtCore -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include/c++/4.2.1 -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include/c++/4.2.1/backward -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/5.1/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include SourceFiles/intro/introcode.h -o GeneratedFiles/Debug/moc_introcode.cpp @@ -605,7 +605,7 @@ GeneratedFiles/Debug/moc_introphone.cpp: ../../Libraries/QtStatic/qtbase/include SourceFiles/gui/scrollarea.h \ ../../Libraries/QtStatic/qtbase/include/QtWidgets/QScrollArea \ SourceFiles/gui/boxshadow.h \ - SourceFiles/intro/intro.h \ + SourceFiles/intro/introwidget.h \ SourceFiles/intro/introphone.h /usr/local/Qt-5.5.1/bin/moc $(DEFINES) -D__APPLE__ -D__GNUC__=4 -I/usr/local/Qt-5.5.1/mkspecs/macx-clang -I. -I/usr/local/Qt-5.5.1/include/QtGui/5.5.1/QtGui -I/usr/local/Qt-5.5.1/include/QtCore/5.5.1/QtCore -I/usr/local/Qt-5.5.1/include -I./SourceFiles -I./GeneratedFiles -I../../Libraries/lzma/C -I../../Libraries/libexif-0.6.20 -I/usr/local/Qt-5.5.1/include -I/usr/local/Qt-5.5.1/include/QtMultimedia -I/usr/local/Qt-5.5.1/include/QtWidgets -I/usr/local/Qt-5.5.1/include/QtNetwork -I/usr/local/Qt-5.5.1/include/QtGui -I/usr/local/Qt-5.5.1/include/QtCore -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include/c++/4.2.1 -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include/c++/4.2.1/backward -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/5.1/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include SourceFiles/intro/introphone.h -o GeneratedFiles/Debug/moc_introphone.cpp @@ -629,7 +629,7 @@ GeneratedFiles/Debug/moc_intropwdcheck.cpp: ../../Libraries/QtStatic/qtbase/incl SourceFiles/gui/scrollarea.h \ ../../Libraries/QtStatic/qtbase/include/QtWidgets/QScrollArea \ SourceFiles/gui/boxshadow.h \ - SourceFiles/intro/intro.h \ + SourceFiles/intro/introwidget.h \ SourceFiles/intro/intropwdcheck.h /usr/local/Qt-5.5.1/bin/moc $(DEFINES) -D__APPLE__ -D__GNUC__=4 -I/usr/local/Qt-5.5.1/mkspecs/macx-clang -I. -I/usr/local/Qt-5.5.1/include/QtGui/5.5.1/QtGui -I/usr/local/Qt-5.5.1/include/QtCore/5.5.1/QtCore -I/usr/local/Qt-5.5.1/include -I./SourceFiles -I./GeneratedFiles -I../../Libraries/lzma/C -I../../Libraries/libexif-0.6.20 -I/usr/local/Qt-5.5.1/include -I/usr/local/Qt-5.5.1/include/QtMultimedia -I/usr/local/Qt-5.5.1/include/QtWidgets -I/usr/local/Qt-5.5.1/include/QtNetwork -I/usr/local/Qt-5.5.1/include/QtGui -I/usr/local/Qt-5.5.1/include/QtCore -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include/c++/4.2.1 -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include/c++/4.2.1/backward -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/5.1/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include SourceFiles/intro/intropwdcheck.h -o GeneratedFiles/Debug/moc_intropwdcheck.cpp @@ -649,7 +649,7 @@ GeneratedFiles/Debug/moc_introsignup.cpp: ../../Libraries/QtStatic/qtbase/includ GeneratedFiles/style_auto.h \ SourceFiles/gui/flatinput.h \ ../../Libraries/QtStatic/qtbase/include/QtWidgets/QLineEdit \ - SourceFiles/intro/intro.h \ + SourceFiles/intro/introwidget.h \ SourceFiles/intro/introsignup.h /usr/local/Qt-5.5.1/bin/moc $(DEFINES) -D__APPLE__ -D__GNUC__=4 -I/usr/local/Qt-5.5.1/mkspecs/macx-clang -I. -I/usr/local/Qt-5.5.1/include/QtGui/5.5.1/QtGui -I/usr/local/Qt-5.5.1/include/QtCore/5.5.1/QtCore -I/usr/local/Qt-5.5.1/include -I./SourceFiles -I./GeneratedFiles -I../../Libraries/lzma/C -I../../Libraries/libexif-0.6.20 -I/usr/local/Qt-5.5.1/include -I/usr/local/Qt-5.5.1/include/QtMultimedia -I/usr/local/Qt-5.5.1/include/QtWidgets -I/usr/local/Qt-5.5.1/include/QtNetwork -I/usr/local/Qt-5.5.1/include/QtGui -I/usr/local/Qt-5.5.1/include/QtCore -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include/c++/4.2.1 -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include/c++/4.2.1/backward -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/5.1/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include SourceFiles/intro/introsignup.h -o GeneratedFiles/Debug/moc_introsignup.cpp