Refactoring and review comments fixing. II.

Signed-off-by: alex-z <[email protected]>
nextcloud · Jan 19, 2024 · c929570 · c929570
1 parent 2d6a19e
commit c929570
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 26 deletions.
diff --git a/src/libsync/owncloudpropagator.cpp b/src/libsync/owncloudpropagator.cpp
@@ -1150,23 +1150,6 @@ bool OwncloudPropagator::isInBulkUploadBlackList(const QString &file) const
     return _bulkUploadBlackList.contains(file);
 }
 
-QSharedPointer<FolderMetadata> OwncloudPropagator::findTopLevelFolderMetadata(const QString &path) const
-{
-    return _topLevelFoldersMetadata.value(path, QSharedPointer<FolderMetadata>{});
-}
-
-const QMap<QString, QSharedPointer<FolderMetadata>> &OwncloudPropagator::topLevelFolderMetadata() const
-{
-    return _topLevelFoldersMetadata;
-}
-
-void OwncloudPropagator::setTopLevelFoldersMetadata(const QMap<QString, QSharedPointer<FolderMetadata>> &topLevelFolderMetadata)
-{
-    _topLevelFoldersMetadata = topLevelFolderMetadata;
-}
-
-// ================================================================================
-
 PropagatorJob::PropagatorJob(OwncloudPropagator *propagator)
     : QObject(propagator)
 {

diff --git a/src/libsync/owncloudpropagator.h b/src/libsync/owncloudpropagator.h
@@ -632,11 +632,6 @@ class OWNCLOUDSYNC_EXPORT OwncloudPropagator : public QObject
 
     [[nodiscard]] bool isInBulkUploadBlackList(const QString &file) const;
 
-    [[nodiscard]] QSharedPointer<FolderMetadata> findTopLevelFolderMetadata(const QString &path) const;
-    [[nodiscard]] const QMap<QString, QSharedPointer<FolderMetadata>> &topLevelFolderMetadata() const;
-
-    void setTopLevelFoldersMetadata(const QMap<QString, QSharedPointer<FolderMetadata>> &topLevelFolderMetadata);
-
 private slots:
 
     void abortTimeout()
@@ -699,8 +694,6 @@ private slots:
     bool _scheduleDelayedTasks = false;
 
     QSet<QString> &_bulkUploadBlackList;
-
-    QMap<QString, QSharedPointer<FolderMetadata>> _topLevelFoldersMetadata;
 
     static bool _allowDelayedUpload;
 };

diff --git a/src/libsync/syncengine.cpp b/src/libsync/syncengine.cpp
@@ -888,8 +888,7 @@ void SyncEngine::slotDiscoveryFinished()
         // Emit the started signal only after the propagator has been set up.
         if (_needsUpdate)
             Q_EMIT started();
-
-        _propagator->setTopLevelFoldersMetadata(_discoveryPhase->_topLevelE2eeFoldersMetadata);
+
         _propagator->start(std::move(_syncItems));
 
         qCInfo(lcEngine) << "#### Post-Reconcile end #################################################### " << _stopWatch.addLapTime(QStringLiteral("Post-Reconcile Finished")) << "ms";