cleanup state safe/restoration code

co-authored by [email protected]
mixxxdj · Aug 6, 2021 · 2299715 · 2299715
1 parent 60056f4
commit 2299715
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 24 deletions.
diff --git a/src/library/libraryview.h b/src/library/libraryview.h
@@ -26,12 +26,8 @@ class LibraryView {
     virtual void slotAddToAutoDJBottom() {};
     virtual void slotAddToAutoDJTop() {};
     virtual void slotAddToAutoDJReplace() {};
-    virtual void saveCurrentViewState() {
-        qDebug() << "empty save model sate";
-    };
-    virtual void restoreCurrentViewState() {
-        qDebug() << "empty restore model sate";
-    };
+    virtual void saveCurrentViewState(){};
+    virtual void restoreCurrentViewState(){};
 
     /// If applicable, requests that the LibraryView load the selected track to
     /// the specified group. Does nothing otherwise.

diff --git a/src/widget/wlibrary.cpp b/src/widget/wlibrary.cpp
@@ -67,7 +67,6 @@ void WLibrary::switchToView(const QString& name) {
             return;
         }
         if (currentWidget() != widget) {
-            qDebug() << "oldLibraryView" << oldLibraryView;
             if (oldLibraryView) {
                 oldLibraryView->saveCurrentViewState();
             }

diff --git a/src/widget/wlibrarytableview.cpp b/src/widget/wlibrarytableview.cpp
@@ -128,7 +128,7 @@ void WLibraryTableView::saveTrackModelState(
     }
 
     state->lastChange = QDateTime::currentSecsSinceEpoch();
-    qDebug() << "save: m_vModelScrollBarPos:" << key << verticalScrollBar()->value() << " | ";
+    // qDebug() << "save: saveTrackModelState:" << key << model << verticalScrollBar()->value() << " | ";
     state->scrollPosition = verticalScrollBar()->value();
     const QModelIndexList selectedIndexes = selectionModel()->selectedIndexes();
     if (!selectedIndexes.isEmpty()) {
@@ -147,7 +147,7 @@ void WLibraryTableView::saveTrackModelState(
 void WLibraryTableView::restoreTrackModelState(
         const QAbstractItemModel* model, const QString& key) {
     updateGeometries();
-    qDebug() << "restoreTrackModelState:" << key << model << m_vModelState.keys();
+    // qDebug() << "restoreTrackModelState:" << key << model << m_vModelState.keys();
     if (model == nullptr) {
         return;
     }
@@ -157,8 +157,6 @@ void WLibraryTableView::restoreTrackModelState(
         return;
     }
 
-    qDebug() << "restore key found:" << key;
-
     verticalScrollBar()->setValue(state->scrollPosition);
 
     auto selection = selectionModel();
@@ -236,7 +234,7 @@ void WLibraryTableView::clearStateCache() {
 
     while (m_vModelState.size() > kClearModelStatesLowWatermark) {
         const QStringList keys = lru.values(sortKeys.takeFirst());
-        for (auto key : keys) {
+        for (const auto& key : keys) {
             m_vModelState.take(key);
         }
     }

diff --git a/src/widget/wlibrarytableview.h b/src/widget/wlibrarytableview.h
@@ -30,18 +30,16 @@ class WLibraryTableView : public QTableView, public virtual LibraryView {
 
     void moveSelection(int delta) override;
 
-    /**
-     * @brief saveTrackModelState function saves current position of scrollbar
-     * using string key - can be any value but should invariant for model
-     * @param key unique for trackmodel
-     */
+    /// @brief saveTrackModelState function saves current position of scrollbar
+    /// using string key - can be any value but should invariant for model
+    /// @param key unique for trackmodel
     void saveTrackModelState(const QAbstractItemModel* model, const QString& key);
-    /**
-     * @brief restoreTrackModelState function finds scrollbar value associated with model
-     * by given key and restores it
-     * @param key unique for trackmodel
-     */
+
+    /// @brief restoreTrackModelState function finds scrollbar value associated with model
+    /// by given key and restores it
+    /// @param key unique for trackmodel
     void restoreTrackModelState(const QAbstractItemModel* model, const QString& key);
+    /// @brief clears the state cache until it's size is = kClearModelStatesLowWatermark
     void clearStateCache();
     void saveCurrentViewState() override;
     void restoreCurrentViewState() override;

diff --git a/src/widget/wtracktableview.cpp b/src/widget/wtracktableview.cpp
@@ -314,8 +314,7 @@ void WTrackTableView::loadTrackModel(QAbstractItemModel* model, bool restoreStat
 
     setVisible(true);
 
-    // restoring scrollBar position using model pointer as key
-    // scrollbar positions with respect to different models are backed by map
+    // trigger restoring scrollBar position, selection etc.
     if (restoreState) {
         restoreCurrentViewState();
     }