diff --git a/Telegram/SourceFiles/_other/packer.cpp b/Telegram/SourceFiles/_other/packer.cpp index 2fa976b3d0..3197f0fafc 100644 --- a/Telegram/SourceFiles/_other/packer.cpp +++ b/Telegram/SourceFiles/_other/packer.cpp @@ -160,8 +160,7 @@ int main(int argc, char *argv[]) QString remove; int version = 0; - bool targetosx = false; - bool targetwin64 = false; + [[maybe_unused]] bool targetwin64 = false; QFileInfoList files; for (int i = 0; i < argc; ++i) { if (string("-path") == argv[i] && i + 1 < argc) { @@ -170,7 +169,6 @@ int main(int argc, char *argv[]) files.push_back(info); if (remove.isEmpty()) remove = info.canonicalPath() + "/"; } else if (string("-target") == argv[i] && i + 1 < argc) { - targetosx = (string("osx") == argv[i + 1]); targetwin64 = (string("win64") == argv[i + 1]); } else if (string("-version") == argv[i] && i + 1 < argc) { version = QString(argv[i + 1]).toInt(); @@ -496,7 +494,7 @@ int main(int argc, char *argv[]) #ifdef Q_OS_WIN QString outName((targetwin64 ? QString("tx64upd%1") : QString("tupdate%1")).arg(AlphaVersion ? AlphaVersion : version)); #elif defined Q_OS_MAC - QString outName((targetosx ? QString("tosxupd%1") : QString("tmacupd%1")).arg(AlphaVersion ? AlphaVersion : version)); + QString outName(QString("tmacupd%1").arg(AlphaVersion ? AlphaVersion : version)); #elif defined Q_OS_UNIX #ifndef _LP64 QString outName(QString("tlinux32upd%1").arg(AlphaVersion ? AlphaVersion : version)); diff --git a/Telegram/SourceFiles/calls/group/ui/desktop_capture_choose_source.cpp b/Telegram/SourceFiles/calls/group/ui/desktop_capture_choose_source.cpp index 63ef43423f..8dd1e93a7e 100644 --- a/Telegram/SourceFiles/calls/group/ui/desktop_capture_choose_source.cpp +++ b/Telegram/SourceFiles/calls/group/ui/desktop_capture_choose_source.cpp @@ -63,7 +63,6 @@ public: [[nodiscard]] rpl::producer<> activations() const; void setActive(bool active); - [[nodiscard]] bool isWindow() const; [[nodiscard]] QString deviceIdKey() const; [[nodiscard]] rpl::lifetime &lifetime(); @@ -171,10 +170,6 @@ rpl::producer<> Source::activations() const { return _activations.events(); } -bool Source::isWindow() const { - return _source.isWindow(); -} - QString Source::deviceIdKey() const { return QString::fromStdString(_source.deviceIdKey()); } diff --git a/Telegram/lib_ui b/Telegram/lib_ui index 2d251e063c..49166a8b72 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit 2d251e063cd063f9ba5a1c6e2596a1feb1630b49 +Subproject commit 49166a8b7243fd8926d1808da87c803670b02474