From a543eb1aef21b27e67060623e97f2e99ade9e87f Mon Sep 17 00:00:00 2001 From: blue Date: Wed, 29 Jul 2020 23:26:56 +0300 Subject: [PATCH] 0.1.5 --- CHANGELOG.md | 3 ++- core/networkaccess.cpp | 6 +++--- main.cpp | 2 +- packaging/Archlinux/PKGBUILD | 4 ++-- signalcatcher.cpp | 4 ++-- ui/models/roster.cpp | 2 +- ui/utils/flowlayout.cpp | 2 +- 7 files changed, 12 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e1f9543..5c1d31c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## Squawk 0.1.5 (UNRELEASED) +## Squawk 0.1.5 (Jul 29, 2020) ### Bug fixes - error with sending attached files to the conference - error with building on lower versions of QXmpp @@ -8,6 +8,7 @@ - quit now actually quits the app - history in MUC now works properly and requests messages from server - error with handling non lower cased JIDs +- some workaround upon reconnection ## Squawk 0.1.4 (Apr 14, 2020) diff --git a/core/networkaccess.cpp b/core/networkaccess.cpp index 3e9d2c0..8c120d8 100644 --- a/core/networkaccess.cpp +++ b/core/networkaccess.cpp @@ -334,7 +334,7 @@ void Core::NetworkAccess::startDownload(const QString& messageId, const QString& QNetworkRequest req(url); dwn->reply = manager->get(req); connect(dwn->reply, &QNetworkReply::downloadProgress, this, &NetworkAccess::onDownloadProgress); - connect(dwn->reply, qOverload(&QNetworkReply::error), this, &NetworkAccess::onDownloadError); + connect(dwn->reply, qOverload(&QNetworkReply::errorOccurred), this, &NetworkAccess::onDownloadError); connect(dwn->reply, &QNetworkReply::finished, this, &NetworkAccess::onDownloadFinished); downloads.insert(std::make_pair(url, dwn)); emit downloadFileProgress(messageId, 0); @@ -414,7 +414,7 @@ void Core::NetworkAccess::startUpload(const QString& messageId, const QString& u upl->reply = manager->put(req, file); connect(upl->reply, &QNetworkReply::uploadProgress, this, &NetworkAccess::onUploadProgress); - connect(upl->reply, qOverload(&QNetworkReply::error), this, &NetworkAccess::onUploadError); + connect(upl->reply, qOverload(&QNetworkReply::errorOccurred), this, &NetworkAccess::onUploadError); connect(upl->reply, &QNetworkReply::finished, this, &NetworkAccess::onUploadFinished); uploads.insert(std::make_pair(url, upl)); emit downloadFileProgress(messageId, 0); @@ -490,7 +490,7 @@ void Core::NetworkAccess::uploadFile(const QString& messageId, const QString& pa upl->reply = manager->put(req, file); connect(upl->reply, &QNetworkReply::uploadProgress, this, &NetworkAccess::onUploadProgress); - connect(upl->reply, qOverload(&QNetworkReply::error), this, &NetworkAccess::onUploadError); + connect(upl->reply, qOverload(&QNetworkReply::errorOccurred), this, &NetworkAccess::onUploadError); connect(upl->reply, &QNetworkReply::finished, this, &NetworkAccess::onUploadFinished); uploads.insert(std::make_pair(put.toString(), upl)); emit downloadFileProgress(messageId, 0); diff --git a/main.cpp b/main.cpp index d272d3d..4c4b3ea 100644 --- a/main.cpp +++ b/main.cpp @@ -42,7 +42,7 @@ int main(int argc, char *argv[]) QApplication::setApplicationName("squawk"); QApplication::setApplicationDisplayName("Squawk"); - QApplication::setApplicationVersion("0.1.4"); + QApplication::setApplicationVersion("0.1.5"); QTranslator qtTranslator; qtTranslator.load("qt_" + QLocale::system().name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath)); diff --git a/packaging/Archlinux/PKGBUILD b/packaging/Archlinux/PKGBUILD index 9f8ef73..20fea99 100644 --- a/packaging/Archlinux/PKGBUILD +++ b/packaging/Archlinux/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Yury Gubich pkgname=squawk -pkgver=0.1.4 +pkgver=0.1.5 pkgrel=1 pkgdesc="An XMPP desktop messenger, written on pure c++ (qt)" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ makedepends=('cmake>=3.3' 'imagemagick' 'qt5-tools') optdepends=('kwallet: secure password storage (requires rebuild)') source=("$pkgname-$pkgver.tar.gz") -sha256sums=('3b290381eaf15a35d24a58a36c29eee375a4ea77b606124982a063d7ecf98870') +sha256sums=('e1a4c88be9f0481d2aa21078faf42fd0e9d66b490b6d8af82827d441cb58df25') build() { cd "$srcdir/squawk" cmake . -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release diff --git a/signalcatcher.cpp b/signalcatcher.cpp index 9ac3aae..dcdcb88 100644 --- a/signalcatcher.cpp +++ b/signalcatcher.cpp @@ -48,7 +48,7 @@ void SignalCatcher::handleSigInt() { snInt->setEnabled(false); char tmp; - ::read(sigintFd[1], &tmp, sizeof(tmp)); + ssize_t s = ::read(sigintFd[1], &tmp, sizeof(tmp)); app->quit(); @@ -58,7 +58,7 @@ void SignalCatcher::handleSigInt() void SignalCatcher::intSignalHandler(int unused) { char a = 1; - ::write(sigintFd[0], &a, sizeof(a)); + ssize_t s = ::write(sigintFd[0], &a, sizeof(a)); } int SignalCatcher::setup_unix_signal_handlers() diff --git a/ui/models/roster.cpp b/ui/models/roster.cpp index 75555ae..ac90a50 100644 --- a/ui/models/roster.cpp +++ b/ui/models/roster.cpp @@ -308,7 +308,7 @@ void Models::Roster::updateAccount(const QString& account, const QString& field, Qt::ItemFlags Models::Roster::flags(const QModelIndex& index) const { if (!index.isValid()) { - return 0; + return Qt::ItemFlags(); } return QAbstractItemModel::flags(index); diff --git a/ui/utils/flowlayout.cpp b/ui/utils/flowlayout.cpp index ed53f51..ad7715e 100644 --- a/ui/utils/flowlayout.cpp +++ b/ui/utils/flowlayout.cpp @@ -84,7 +84,7 @@ QLayoutItem *FlowLayout::takeAt(int index) Qt::Orientations FlowLayout::expandingDirections() const { - return 0; + return Qt::Orientations(); } bool FlowLayout::hasHeightForWidth() const