PinStates cleanup

- SyncJournalDB functions now behind internalPinStates() to avoid
accidental usage, when nearly everyone should go through Vfs.
- Rename Vfs::getPinState() to Vfs::pinState()

1 files changed, 11 insertions, 11 deletions

diff --git a/test/testsyncjournaldb.cpp b/test/testsyncjournaldb.cpp
index 960e9f8e3..2a5e98762 100644
--- a/test/testsyncjournaldb.cpp
+++ b/test/testsyncjournaldb.cpp
@@ -330,13 +330,13 @@ private slots:
     void testPinState()
     {
         auto make = [&](const QByteArray &path, PinState state) {
-            _db.setPinStateForPath(path, state);
-            auto pinState = _db.rawPinStateForPath(path);
+            _db.internalPinStates().setForPath(path, state);
+            auto pinState = _db.internalPinStates().rawForPath(path);
             QVERIFY(pinState);
             QCOMPARE(*pinState, state);
         };
         auto get = [&](const QByteArray &path) -> PinState {
-            auto state = _db.effectivePinStateForPath(path);
+            auto state = _db.internalPinStates().effectiveForPath(path);
             if (!state) {
                 QTest::qFail("couldn't read pin state", __FILE__, __LINE__);
                 return PinState::Inherited;
@@ -344,7 +344,7 @@ private slots:
             return *state;
         };
         auto getRaw = [&](const QByteArray &path) -> PinState {
-            auto state = _db.rawPinStateForPath(path);
+            auto state = _db.internalPinStates().rawForPath(path);
             if (!state) {
                 QTest::qFail("couldn't read pin state", __FILE__, __LINE__);
                 return PinState::Inherited;
@@ -352,8 +352,8 @@ private slots:
             return *state;
         };
 
-        _db.wipePinStateForPathAndBelow("");
-        auto list = _db.rawPinStates();
+        _db.internalPinStates().wipeForPathAndBelow("");
+        auto list = _db.internalPinStates().rawList();
         QCOMPARE(list->size(), 0);
 
         // Make a thrice-nested setup
@@ -373,7 +373,7 @@ private slots:
             }
         }
 
-        list = _db.rawPinStates();
+        list = _db.internalPinStates().rawList();
         QCOMPARE(list->size(), 4 + 9 + 27);
 
         // Baseline direct checks (the fallback for unset root pinstate is AlwaysLocal)
@@ -420,20 +420,20 @@ private slots:
 
         // Wiping
         QCOMPARE(getRaw("local/local"), PinState::AlwaysLocal);
-        _db.wipePinStateForPathAndBelow("local/local");
+        _db.internalPinStates().wipeForPathAndBelow("local/local");
         QCOMPARE(getRaw("local"), PinState::AlwaysLocal);
         QCOMPARE(getRaw("local/local"), PinState::Inherited);
         QCOMPARE(getRaw("local/local/local"), PinState::Inherited);
         QCOMPARE(getRaw("local/local/online"), PinState::Inherited);
-        list = _db.rawPinStates();
+        list = _db.internalPinStates().rawList();
         QCOMPARE(list->size(), 4 + 9 + 27 - 4);
 
         // Wiping everything
-        _db.wipePinStateForPathAndBelow("");
+        _db.internalPinStates().wipeForPathAndBelow("");
         QCOMPARE(getRaw(""), PinState::Inherited);
         QCOMPARE(getRaw("local"), PinState::Inherited);
         QCOMPARE(getRaw("online"), PinState::Inherited);
-        list = _db.rawPinStates();
+        list = _db.internalPinStates().rawList();
         QCOMPARE(list->size(), 0);
     }