From 50fa4cbb63b2860d76bfdceb61d576f95bd49454 Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Mon, 19 Dec 2022 17:33:20 +0100 Subject: [PATCH 1/5] Remove unused variables in folderstatusdelegate Signed-off-by: Claudio Cambra --- src/gui/folderstatusdelegate.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/gui/folderstatusdelegate.cpp b/src/gui/folderstatusdelegate.cpp index cb8ef67ed9..77dfaf4f34 100644 --- a/src/gui/folderstatusdelegate.cpp +++ b/src/gui/folderstatusdelegate.cpp @@ -126,7 +126,6 @@ void FolderStatusDelegate::paint(QPainter *painter, const QStyleOptionViewItem & QFontMetrics subFm(subFont); QFontMetrics aliasFm(aliasFont); - QFontMetrics progressFm(progressFont); int aliasMargin = aliasFm.height() / 2; int margin = subFm.height() / 4; @@ -156,7 +155,6 @@ void FolderStatusDelegate::paint(QPainter *painter, const QStyleOptionViewItem & auto statusIcon = qvariant_cast(index.data(FolderStatusIconRole)); auto aliasText = qvariant_cast(index.data(HeaderRole)); auto pathText = qvariant_cast(index.data(FolderPathRole)); - auto remotePath = qvariant_cast(index.data(FolderSecondPathRole)); auto conflictTexts = qvariant_cast(index.data(FolderConflictMsg)); auto errorTexts = qvariant_cast(index.data(FolderErrorMsg)); auto infoTexts = qvariant_cast(index.data(FolderInfoMsg)); From ad2841d96382c95a8fce49cd099cbe12e652ce3f Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Mon, 19 Dec 2022 17:34:48 +0100 Subject: [PATCH 2/5] Remove HACK for Windows Vista as this OS is no longer supported Signed-off-by: Claudio Cambra --- src/gui/folderstatusdelegate.cpp | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/gui/folderstatusdelegate.cpp b/src/gui/folderstatusdelegate.cpp index 77dfaf4f34..0934bd1da7 100644 --- a/src/gui/folderstatusdelegate.cpp +++ b/src/gui/folderstatusdelegate.cpp @@ -221,15 +221,6 @@ void FolderStatusDelegate::paint(QPainter *painter, const QStyleOptionViewItem & auto palette = option.palette; - if (qApp->style()->inherits("QWindowsVistaStyle")) { - // Hack: Windows Vista's light blue is not contrasting enough for white - - // (code from QWindowsVistaStyle::drawControl for CE_ItemViewItem) - palette.setColor(QPalette::All, QPalette::HighlightedText, palette.color(QPalette::Active, QPalette::Text)); - palette.setColor(QPalette::All, QPalette::Highlight, palette.base().color().darker(108)); - } - - QPalette::ColorGroup cg = option.state & QStyle::State_Enabled ? QPalette::Normal : QPalette::Disabled; From bf85c2d0936b3c01e7d612cc564332ebd139bcfe Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Mon, 19 Dec 2022 17:35:42 +0100 Subject: [PATCH 3/5] Remove unused QStrings from remotewipe Signed-off-by: Claudio Cambra --- src/gui/remotewipe.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/gui/remotewipe.cpp b/src/gui/remotewipe.cpp index 116c9e65c3..8a1a0b06dc 100644 --- a/src/gui/remotewipe.cpp +++ b/src/gui/remotewipe.cpp @@ -77,7 +77,6 @@ void RemoteWipe::checkJobSlot() //check for errors if (_networkReplyCheck->error() != QNetworkReply::NoError || jsonParseError.error != QJsonParseError::NoError) { - QString errorReason; QString errorFromJson = json["error"].toString(); if (!errorFromJson.isEmpty()) { qCWarning(lcRemoteWipe) << QString("Error returned from the server: %1") @@ -153,7 +152,6 @@ void RemoteWipe::notifyServerSuccessJobSlot() QJsonObject json = QJsonDocument::fromJson(jsonData, &jsonParseError).object(); if (_networkReplySuccess->error() != QNetworkReply::NoError || jsonParseError.error != QJsonParseError::NoError) { - QString errorReason; QString errorFromJson = json["error"].toString(); if (!errorFromJson.isEmpty()) { qCWarning(lcRemoteWipe) << QString("Error returned from the server: %1") From 16b33fa65863b6a0ac7f2b5ee70af61139067448 Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Mon, 19 Dec 2022 17:37:35 +0100 Subject: [PATCH 4/5] Remove unused supportedTransmissionChecksums from bulkpropagatorjob Signed-off-by: Claudio Cambra --- src/libsync/bulkpropagatorjob.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/libsync/bulkpropagatorjob.cpp b/src/libsync/bulkpropagatorjob.cpp index 04e508b304..330b17fbba 100644 --- a/src/libsync/bulkpropagatorjob.cpp +++ b/src/libsync/bulkpropagatorjob.cpp @@ -256,10 +256,6 @@ void BulkPropagatorJob::checkPropagationIsDone() void BulkPropagatorJob::slotComputeTransmissionChecksum(SyncFileItemPtr item, UploadFileInfo fileToUpload) { - // Reuse the content checksum as the transmission checksum if possible - const auto supportedTransmissionChecksums = - propagator()->account()->capabilities().supportedChecksumTypes(); - // Compute the transmission checksum. auto computeChecksum = std::make_unique(this); if (uploadChecksumEnabled()) { From bbb77dc4f7b531aa14a86d2b30564a185e52a2a3 Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Mon, 19 Dec 2022 17:38:35 +0100 Subject: [PATCH 5/5] Remove unused targetFile QString in propagateremotemove Signed-off-by: Claudio Cambra --- src/libsync/propagateremotemove.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/libsync/propagateremotemove.cpp b/src/libsync/propagateremotemove.cpp index 882d7e077b..64ad05641e 100644 --- a/src/libsync/propagateremotemove.cpp +++ b/src/libsync/propagateremotemove.cpp @@ -82,8 +82,6 @@ void PropagateRemoteMove::start() QString origin = propagator()->adjustRenamedPath(_item->_file); qCInfo(lcPropagateRemoteMove) << origin << _item->_renameTarget; - QString targetFile(propagator()->fullLocalPath(_item->_renameTarget)); - if (origin == _item->_renameTarget) { // The parent has been renamed already so there is nothing more to do.