Fix build on macOS.

This commit is contained in:
John Preston 2021-04-06 18:53:03 +04:00
parent bd42c68978
commit 8c7217ad56
7 changed files with 4 additions and 12 deletions

View file

@ -126,10 +126,6 @@ QString UiIntegration::timeFormat() {
return cTimeFormat(); return cTimeFormat();
} }
QWidget *UiIntegration::modalWindowParent() {
return Core::App().getModalParent();
}
std::shared_ptr<ClickHandler> UiIntegration::createLinkHandler( std::shared_ptr<ClickHandler> UiIntegration::createLinkHandler(
const EntityLinkData &data, const EntityLinkData &data,
const std::any &context) { const std::any &context) {

View file

@ -46,8 +46,6 @@ public:
void startFontsEnd() override; void startFontsEnd() override;
QString timeFormat() override; QString timeFormat() override;
QWidget *modalWindowParent() override;
std::shared_ptr<ClickHandler> createLinkHandler( std::shared_ptr<ClickHandler> createLinkHandler(
const EntityLinkData &data, const EntityLinkData &data,
const std::any &context) override; const std::any &context) override;

View file

@ -14,7 +14,7 @@ class HistoryItem;
class PasscodeBox; class PasscodeBox;
namespace Core { namespace Core {
class CloudPasswordState; struct CloudPasswordState;
} // namespace Core } // namespace Core
namespace Main { namespace Main {

View file

@ -130,7 +130,7 @@ void Panel::chooseShippingOption(const ShippingOptions &options) {
options.selectedId, options.selectedId,
&ShippingOption::id); &ShippingOption::id);
const auto index = (i != end(options.list)) const auto index = (i != end(options.list))
? (i - begin(options.list)) ? int(i - begin(options.list))
: -1; : -1;
const auto group = std::make_shared<RadiobuttonGroup>(index); const auto group = std::make_shared<RadiobuttonGroup>(index);

View file

@ -91,8 +91,7 @@ CountrySelectBox::CountrySelectBox(QWidget*)
} }
CountrySelectBox::CountrySelectBox(QWidget*, const QString &iso, Type type) CountrySelectBox::CountrySelectBox(QWidget*, const QString &iso, Type type)
: _type(type) : _select(this, st::defaultMultiSelect, tr::lng_country_ph())
, _select(this, st::defaultMultiSelect, tr::lng_country_ph())
, _ownedInner(this, iso, type) { , _ownedInner(this, iso, type) {
} }

View file

@ -42,7 +42,6 @@ private:
void submit(); void submit();
void applyFilterUpdate(const QString &query); void applyFilterUpdate(const QString &query);
Type _type = Type::Phones;
object_ptr<MultiSelect> _select; object_ptr<MultiSelect> _select;
class Inner; class Inner;

@ -1 +1 @@
Subproject commit 8686905ee40eb8dbe171024e04e41a32069c8add Subproject commit 876f0f06dc8eac766aecd695944455eaf577a4b9