From 5d1e248015895161df785d604ef7c52a8febae51 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Sun, 10 Apr 2022 14:40:20 +0200
Subject: [PATCH] Samplers, crate, playlists: fix storing import/export paths

---
 src/library/baseplaylistfeature.cpp | 6 +++---
 src/library/crate/cratefeature.cpp  | 6 +++---
 src/mixer/samplerbank.cpp           | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/library/baseplaylistfeature.cpp b/src/library/baseplaylistfeature.cpp
index e74c6f41652..5acecd7cabe 100644
--- a/src/library/baseplaylistfeature.cpp
+++ b/src/library/baseplaylistfeature.cpp
@@ -365,7 +365,7 @@ void BasePlaylistFeature::slotImportPlaylist() {
 
     // Update the import/export playlist directory
     QString fileDirectory(playlistFile);
-    fileDirectory.truncate(playlistFile.lastIndexOf(QDir::separator()));
+    fileDirectory.truncate(playlistFile.lastIndexOf("/"));
     m_pConfig->set(kConfigKeyLastImportExportPlaylistDirectory,
             ConfigValue(fileDirectory));
 
@@ -412,7 +412,7 @@ void BasePlaylistFeature::slotCreateImportPlaylist() {
 
     // Set last import directory
     QString fileDirectory(playlistFiles.first());
-    fileDirectory.truncate(playlistFiles.first().lastIndexOf(QDir::separator()));
+    fileDirectory.truncate(playlistFiles.first().lastIndexOf("/"));
     m_pConfig->set(kConfigKeyLastImportExportPlaylistDirectory,
             ConfigValue(fileDirectory));
 
@@ -483,7 +483,7 @@ void BasePlaylistFeature::slotExportPlaylist() {
 
     // Update the import/export playlist directory
     QString fileDirectory(fileLocation);
-    fileDirectory.truncate(fileLocation.lastIndexOf(QDir::separator()));
+    fileDirectory.truncate(fileLocation.lastIndexOf("/"));
     m_pConfig->set(kConfigKeyLastImportExportPlaylistDirectory,
             ConfigValue(fileDirectory));
 
diff --git a/src/library/crate/cratefeature.cpp b/src/library/crate/cratefeature.cpp
index 67d0962cd4d..b2651e0ce73 100644
--- a/src/library/crate/cratefeature.cpp
+++ b/src/library/crate/cratefeature.cpp
@@ -574,7 +574,7 @@ void CrateFeature::slotImportPlaylist() {
 
     // Update the import/export crate directory
     QString fileDirectory(playlistFile);
-    fileDirectory.truncate(playlistFile.lastIndexOf(QDir::separator()));
+    fileDirectory.truncate(playlistFile.lastIndexOf("/"));
     m_pConfig->set(kConfigKeyLastImportExportCrateDirectoryKey,
             ConfigValue(fileDirectory));
 
@@ -614,7 +614,7 @@ void CrateFeature::slotCreateImportCrate() {
 
     // Set last import directory
     QString fileDirectory(playlistFiles.first());
-    fileDirectory.truncate(playlistFiles.first().lastIndexOf(QDir::separator()));
+    fileDirectory.truncate(playlistFiles.first().lastIndexOf("/"));
     m_pConfig->set(kConfigKeyLastImportExportCrateDirectoryKey,
             ConfigValue(fileDirectory));
 
@@ -706,7 +706,7 @@ void CrateFeature::slotExportPlaylist() {
     }
     // Update the import/export crate directory
     QString fileDirectory(fileLocation);
-    fileDirectory.truncate(fileLocation.lastIndexOf(QDir::separator()));
+    fileDirectory.truncate(fileLocation.lastIndexOf("/"));
     m_pConfig->set(kConfigKeyLastImportExportCrateDirectoryKey,
             ConfigValue(fileDirectory));
 
diff --git a/src/mixer/samplerbank.cpp b/src/mixer/samplerbank.cpp
index 732f58ec0bb..fc4b18a7f0a 100644
--- a/src/mixer/samplerbank.cpp
+++ b/src/mixer/samplerbank.cpp
@@ -73,7 +73,7 @@ void SamplerBank::slotSaveSamplerBank(double v) {
 
     // Update the import/export directory
     QString fileDirectory(samplerBankPath);
-    fileDirectory.truncate(samplerBankPath.lastIndexOf(QDir::separator()));
+    fileDirectory.truncate(samplerBankPath.lastIndexOf("/"));
     m_pConfig->set(kConfigkeyLastImportExportDirectory,
             ConfigValue(fileDirectory));
 
@@ -154,7 +154,7 @@ void SamplerBank::slotLoadSamplerBank(double v) {
 
     // Update the import/export directory
     QString fileDirectory(samplerBankPath);
-    fileDirectory.truncate(samplerBankPath.lastIndexOf(QDir::separator()));
+    fileDirectory.truncate(samplerBankPath.lastIndexOf("/"));
     m_pConfig->set(kConfigkeyLastImportExportDirectory,
             ConfigValue(fileDirectory));