procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Closed beta version 1.3.16.1: Fix build for Xcode.

This commit is contained in:
John Preston 2018-09-11 23:02:07 +03:00
parent 88175aff1f
commit a5f407a458
5 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/SourceFiles/apiwrap.cpp
View File

@ -4983,7 +4983,7 @@ void ApiWrap::clearUnconfirmedPassword() {
rpl::producer<Core::CloudPasswordState> ApiWrap::passwordState() const { rpl::producer<Core::CloudPasswordState> ApiWrap::passwordState() const {
return _passwordState return _passwordState
? _passwordStateChanges.events_starting_with_copy(*_passwordState) ? _passwordStateChanges.events_starting_with_copy(*_passwordState)
: _passwordStateChanges.events(); : (_passwordStateChanges.events() | rpl::type_erased());
} }
auto ApiWrap::passwordStateCurrent() const auto ApiWrap::passwordStateCurrent() const

3
Telegram/SourceFiles/settings/settings_general.cpp
View File

@ -381,8 +381,7 @@ void SetupTray(not_null<Ui::VerticalLayout*> container) {
} }
General::General(QWidget *parent, UserData *self) General::General(QWidget *parent, UserData *self)
: Section(parent) : Section(parent) {
, _self(self) {
setupContent(); setupContent();
} }

2
Telegram/SourceFiles/settings/settings_general.h
View File

@ -25,8 +25,6 @@ public:
private: private:
void setupContent(); void setupContent();
UserData *_self = nullptr;
}; };
} // namespace Settings } // namespace Settings

4
Telegram/SourceFiles/settings/settings_intro.cpp
View File

@ -196,9 +196,9 @@ private:
IntroWidget::IntroWidget(QWidget *parent) IntroWidget::IntroWidget(QWidget *parent)
: RpWidget(parent) : RpWidget(parent)
, _topShadow(this)
, _wrap(this) , _wrap(this)
, _scroll(Ui::CreateChild<Ui::ScrollArea>(_wrap.data(), st::infoScroll)) { , _scroll(Ui::CreateChild<Ui::ScrollArea>(_wrap.data(), st::infoScroll))
, _topShadow(this) {
_wrap->setAttribute(Qt::WA_OpaquePaintEvent); _wrap->setAttribute(Qt::WA_OpaquePaintEvent);
_wrap->paintRequest( _wrap->paintRequest(
) | rpl::start_with_next([=](QRect clip) { ) | rpl::start_with_next([=](QRect clip) {

4
Telegram/SourceFiles/settings/settings_privacy_security.cpp
View File

@ -193,7 +193,7 @@ rpl::producer<bool> SetupLocalPasscode(
wrap->toggleOn(base::duplicate(has)); wrap->toggleOn(base::duplicate(has));
return std::move(has); return has;
} }
bool CheckEditCloudPassword() { bool CheckEditCloudPassword() {
@ -365,7 +365,7 @@ rpl::producer<bool> SetupCloudPassword(
reloadOnActivation); reloadOnActivation);
Auth().api().reloadPasswordState(); Auth().api().reloadPasswordState();
return std::move(has); return has;
} }
void SetupSelfDestruction(not_null<Ui::VerticalLayout*> container) { void SetupSelfDestruction(not_null<Ui::VerticalLayout*> container) {