From f0b6fa09f06ceebbaa2d0eccf8e4955a9e92ceab Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Tue, 14 Mar 2023 19:00:52 +0100 Subject: [PATCH] fix some leaks --- src/librssguard/gui/reusable/locationlineedit.cpp | 2 +- .../services/abstract/accountcheckmodel.cpp | 2 -- .../services/gmail/gmailnetworkfactory.cpp | 11 ++++------- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/librssguard/gui/reusable/locationlineedit.cpp b/src/librssguard/gui/reusable/locationlineedit.cpp index 433558a3a..6605afebc 100644 --- a/src/librssguard/gui/reusable/locationlineedit.cpp +++ b/src/librssguard/gui/reusable/locationlineedit.cpp @@ -7,7 +7,7 @@ #include LocationLineEdit::LocationLineEdit(QWidget* parent) - : BaseLineEdit(parent), m_mouseSelectsAllText(true), m_googleSuggest(new GoogleSuggest(this)) { + : BaseLineEdit(parent), m_mouseSelectsAllText(true), m_googleSuggest(new GoogleSuggest(this, this)) { setPlaceholderText(tr("Website address goes here")); connect(this, &LocationLineEdit::submitted, m_googleSuggest, &GoogleSuggest::preventSuggest); } diff --git a/src/librssguard/services/abstract/accountcheckmodel.cpp b/src/librssguard/services/abstract/accountcheckmodel.cpp index 8b2c31626..f30d865ff 100644 --- a/src/librssguard/services/abstract/accountcheckmodel.cpp +++ b/src/librssguard/services/abstract/accountcheckmodel.cpp @@ -4,8 +4,6 @@ #include "3rd-party/boolinq/boolinq.h" #include "definitions/definitions.h" -#include "miscellaneous/application.h" -#include "miscellaneous/iconfactory.h" AccountCheckModel::AccountCheckModel(QObject* parent) : QAbstractItemModel(parent), m_rootItem(nullptr), m_recursiveChange(false) {} diff --git a/src/librssguard/services/gmail/gmailnetworkfactory.cpp b/src/librssguard/services/gmail/gmailnetworkfactory.cpp index 6e1a1ce61..402553625 100644 --- a/src/librssguard/services/gmail/gmailnetworkfactory.cpp +++ b/src/librssguard/services/gmail/gmailnetworkfactory.cpp @@ -684,9 +684,9 @@ QList GmailNetworkFactory::obtainAndDecodeFullMessages(const QStringLis } do { - auto* multi = new QHttpMultiPart(); + QHttpMultiPart multi; - multi->setContentType(QHttpMultiPart::ContentType::MixedType); + multi.setContentType(QHttpMultiPart::ContentType::MixedType); for (int window = next_message + 100; next_message < window && next_message < message_ids.size(); next_message++) { QString msg_id = message_ids[next_message]; @@ -699,7 +699,7 @@ QList GmailNetworkFactory::obtainAndDecodeFullMessages(const QStringLis QString full_msg_endpoint = QSL("GET /gmail/v1/users/me/messages/%1\r\n").arg(msg_id); part.setBody(full_msg_endpoint.toUtf8()); - multi->append(part); + multi.append(part); msgs.insert(msg_id, msg); } @@ -711,7 +711,7 @@ QList GmailNetworkFactory::obtainAndDecodeFullMessages(const QStringLis NetworkResult res = NetworkFactory::performNetworkOperation(GMAIL_API_BATCH, timeout, - multi, + &multi, output, QNetworkAccessManager::Operation::PostOperation, headers, @@ -737,11 +737,8 @@ QList GmailNetworkFactory::obtainAndDecodeFullMessages(const QStringLis } } } - - multi->deleteLater(); } else { - multi->deleteLater(); return {}; } }