From 1466338e7e027107fb870f58a1a127dc97ac0d11 Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 3 Nov 2016 13:58:10 +0300 Subject: [PATCH] Closed beta 10019001: Build fixed for Xcode. --- Telegram/SourceFiles/boxes/addcontactbox.cpp | 26 ++++++++----------- Telegram/SourceFiles/boxes/addcontactbox.h | 10 +++---- Telegram/SourceFiles/core/zlib_help.h | 6 ++--- .../profile/profile_inner_widget.h | 2 +- .../settings/settings_inner_widget.h | 2 +- Telegram/SourceFiles/ui/style/style_core.cpp | 2 +- Telegram/gyp/Telegram.gyp | 2 ++ Telegram/gyp/refresh.sh | 2 +- 8 files changed, 25 insertions(+), 27 deletions(-) diff --git a/Telegram/SourceFiles/boxes/addcontactbox.cpp b/Telegram/SourceFiles/boxes/addcontactbox.cpp index d529be97c..9cf16de1e 100644 --- a/Telegram/SourceFiles/boxes/addcontactbox.cpp +++ b/Telegram/SourceFiles/boxes/addcontactbox.cpp @@ -36,12 +36,12 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #include "styles/style_dialogs.h" AddContactBox::AddContactBox(QString fname, QString lname, QString phone) : AbstractBox(st::boxWidth) -, _save(this, lang(lng_add_contact), st::defaultBoxButton) -, _cancel(this, lang(lng_cancel), st::cancelBoxButton) -, _retry(this, lang(lng_try_other_contact), st::defaultBoxButton) , _first(this, st::defaultInputField, lang(lng_signup_firstname), fname) , _last(this, st::defaultInputField, lang(lng_signup_lastname), lname) , _phone(this, st::defaultInputField, lang(lng_contact_phone), phone) +, _save(this, lang(lng_add_contact), st::defaultBoxButton) +, _cancel(this, lang(lng_cancel), st::cancelBoxButton) +, _retry(this, lang(lng_try_other_contact), st::defaultBoxButton) , _invertOrder(langFirstNameGoesSecond()) { if (!phone.isEmpty()) { _phone->setDisabled(true); @@ -52,12 +52,12 @@ AddContactBox::AddContactBox(QString fname, QString lname, QString phone) : Abst AddContactBox::AddContactBox(UserData *user) : AbstractBox(st::boxWidth) , _user(user) -, _save(this, lang(lng_settings_save), st::defaultBoxButton) -, _cancel(this, lang(lng_cancel), st::cancelBoxButton) -, _retry(this, lang(lng_try_other_contact), st::defaultBoxButton) , _first(this, st::defaultInputField, lang(lng_signup_firstname), user->firstName) , _last(this, st::defaultInputField, lang(lng_signup_lastname), user->lastName) , _phone(this, st::defaultInputField, lang(lng_contact_phone), user->phone()) +, _save(this, lang(lng_settings_save), st::defaultBoxButton) +, _cancel(this, lang(lng_cancel), st::cancelBoxButton) +, _retry(this, lang(lng_try_other_contact), st::defaultBoxButton) , _invertOrder(langFirstNameGoesSecond()) { _phone->setDisabled(true); initBox(); @@ -966,12 +966,11 @@ bool SetupChannelBox::onFirstCheckFail(const RPCError &error) { EditNameTitleBox::EditNameTitleBox(PeerData *peer) : _peer(peer), -_save(this, lang(lng_settings_save), st::defaultBoxButton), -_cancel(this, lang(lng_cancel), st::cancelBoxButton), _first(this, st::defaultInputField, lang(peer->isUser() ? lng_signup_firstname : lng_dlg_new_group_name), peer->isUser() ? peer->asUser()->firstName : peer->name), _last(this, st::defaultInputField, lang(lng_signup_lastname), peer->isUser() ? peer->asUser()->lastName : QString()), -_invertOrder(!peer->isChat() && langFirstNameGoesSecond()), -_requestId(0) { +_save(this, lang(lng_settings_save), st::defaultBoxButton), +_cancel(this, lang(lng_cancel), st::cancelBoxButton), +_invertOrder(!peer->isChat() && langFirstNameGoesSecond()) { if (_invertOrder) { setTabOrder(_last, _first); } @@ -1141,15 +1140,12 @@ void EditNameTitleBox::onSaveChatDone(const MTPUpdates &updates) { EditChannelBox::EditChannelBox(ChannelData *channel) : AbstractBox() , _channel(channel) -, _save(this, lang(lng_settings_save), st::defaultBoxButton) -, _cancel(this, lang(lng_cancel), st::cancelBoxButton) , _title(this, st::defaultInputField, lang(lng_dlg_new_channel_name), _channel->name) , _description(this, st::newGroupDescription, lang(lng_create_group_description), _channel->about()) , _sign(this, lang(lng_edit_sign_messages), channel->addsSignature(), st::defaultBoxCheckbox) , _publicLink(this, lang(channel->isPublic() ? lng_profile_edit_public_link : lng_profile_create_public_link), st::defaultBoxLinkButton) -, _saveTitleRequestId(0) -, _saveDescriptionRequestId(0) -, _saveSignRequestId(0) { +, _save(this, lang(lng_settings_save), st::defaultBoxButton) +, _cancel(this, lang(lng_cancel), st::cancelBoxButton) { connect(App::main(), SIGNAL(peerNameChanged(PeerData*,const PeerData::Names&,const PeerData::NameFirstChars&)), this, SLOT(peerUpdated(PeerData*))); setMouseTracking(true); diff --git a/Telegram/SourceFiles/boxes/addcontactbox.h b/Telegram/SourceFiles/boxes/addcontactbox.h index 8ae48c95f..d38ca6095 100644 --- a/Telegram/SourceFiles/boxes/addcontactbox.h +++ b/Telegram/SourceFiles/boxes/addcontactbox.h @@ -268,9 +268,9 @@ private: ChildWidget _save; ChildWidget _cancel; - bool _invertOrder; + bool _invertOrder = false; - mtpRequestId _requestId; + mtpRequestId _requestId = 0; QString _sentName; }; @@ -318,9 +318,9 @@ private: ChildWidget _save; ChildWidget _cancel; - mtpRequestId _saveTitleRequestId; - mtpRequestId _saveDescriptionRequestId; - mtpRequestId _saveSignRequestId; + mtpRequestId _saveTitleRequestId = 0; + mtpRequestId _saveDescriptionRequestId = 0; + mtpRequestId _saveSignRequestId = 0; QString _sentTitle, _sentDescription; diff --git a/Telegram/SourceFiles/core/zlib_help.h b/Telegram/SourceFiles/core/zlib_help.h index 9e0604515..1198e7539 100644 --- a/Telegram/SourceFiles/core/zlib_help.h +++ b/Telegram/SourceFiles/core/zlib_help.h @@ -243,7 +243,7 @@ public: } auto size = fileInfo.uncompressed_size; - if (size > fileSizeLimit) { + if (size > static_cast(fileSizeLimit)) { if (_error == UNZ_OK) _error = -1; LOG(("Error: current file is too large (should be less than %1, got %2) in a zip file.").arg(fileSizeLimit).arg(size)); return QByteArray(); @@ -257,7 +257,7 @@ public: result.resize(size); auto couldRead = readCurrentFile(result.data(), size); - if (couldRead != size) { + if (couldRead != static_cast(size)) { LOG(("Error: could not read current file in a zip file, got %1.").arg(couldRead)); return QByteArray(); } @@ -273,7 +273,7 @@ public: QByteArray readFileContent(const char *szFileName, int iCaseSensitivity, int fileSizeLimit) { if (locateFile(szFileName, iCaseSensitivity) != UNZ_OK) { LOG(("Error: could not locate '%1' in a zip file.").arg(szFileName)); - return false; + return QByteArray(); } return readCurrentFileContent(fileSizeLimit); } diff --git a/Telegram/SourceFiles/profile/profile_inner_widget.h b/Telegram/SourceFiles/profile/profile_inner_widget.h index 64cc9b4a7..8a6f33180 100644 --- a/Telegram/SourceFiles/profile/profile_inner_widget.h +++ b/Telegram/SourceFiles/profile/profile_inner_widget.h @@ -41,7 +41,7 @@ public: } // Updates the area that is visible inside the scroll container. - void setVisibleTopBottom(int visibleTop, int visibleBottom); + void setVisibleTopBottom(int visibleTop, int visibleBottom) override; // Profile fixed top bar should use this flag to decide // if it shows "Share contact" button or not. diff --git a/Telegram/SourceFiles/settings/settings_inner_widget.h b/Telegram/SourceFiles/settings/settings_inner_widget.h index a14cccf39..0a5fcf557 100644 --- a/Telegram/SourceFiles/settings/settings_inner_widget.h +++ b/Telegram/SourceFiles/settings/settings_inner_widget.h @@ -38,7 +38,7 @@ public: } // Updates the area that is visible inside the scroll container. - void setVisibleTopBottom(int visibleTop, int visibleBottom); + void setVisibleTopBottom(int visibleTop, int visibleBottom) override; void showFinished(); diff --git a/Telegram/SourceFiles/ui/style/style_core.cpp b/Telegram/SourceFiles/ui/style/style_core.cpp index d43e1ff0c..2e45ed8bd 100644 --- a/Telegram/SourceFiles/ui/style/style_core.cpp +++ b/Telegram/SourceFiles/ui/style/style_core.cpp @@ -101,7 +101,7 @@ void colorizeImage(const QImage &src, QColor c, QImage *outResult, QRect srcRect auto resultIntsAdded = resultIntsPerLine - width * resultIntsPerPixel; auto resultInts = reinterpret_cast(outResult->bits()) + dstPoint.y() * resultIntsPerLine + dstPoint.x() * resultIntsPerPixel; t_assert(resultIntsAdded >= 0); - t_assert(outResult->depth() == ((resultIntsPerPixel * sizeof(uint32)) << 3)); + t_assert(outResult->depth() == static_cast((resultIntsPerPixel * sizeof(uint32)) << 3)); t_assert(outResult->bytesPerLine() == (resultIntsPerLine << 2)); auto maskBytesPerPixel = (src.depth() >> 3); diff --git a/Telegram/gyp/Telegram.gyp b/Telegram/gyp/Telegram.gyp index 9c27e5302..c3448f815 100644 --- a/Telegram/gyp/Telegram.gyp +++ b/Telegram/gyp/Telegram.gyp @@ -619,6 +619,8 @@ '<(minizip_loc)/ioapi.h', '<(minizip_loc)/zip.c', '<(minizip_loc)/zip.h', + '<(minizip_loc)/unzip.c', + '<(minizip_loc)/unzip.h', ], 'sources!': [ '<(src_loc)/pspecific_win.cpp', diff --git a/Telegram/gyp/refresh.sh b/Telegram/gyp/refresh.sh index c076c08f0..4bc35fb48 100755 --- a/Telegram/gyp/refresh.sh +++ b/Telegram/gyp/refresh.sh @@ -20,7 +20,7 @@ else #gyp --depth=. --generator-output=../.. -Goutput_dir=out Telegram.gyp --format=xcode-ninja #gyp --depth=. --generator-output=../.. -Goutput_dir=out Telegram.gyp --format=xcode # use patched gyp with Xcode project generator - ../../../Libraries/gyp/gyp --depth=. --generator-output=../.. -Goutput_dir=out Telegram.gyp -Gxcode_upgrade_check_project_version=800 --format=xcode + ../../../Libraries/gyp/gyp --depth=. --generator-output=../.. -Goutput_dir=out Telegram.gyp -Gxcode_upgrade_check_project_version=810 --format=xcode fi cd ../..