From 0f6f0c23943116ea668ab035055cb8b0e4a6574e Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Fri, 31 May 2019 12:49:25 -0400
Subject: replaced all the manual UserRole stuff with a few constants and
 helper functions setConflictItem() is now used by all conflict lists to setup
 the data (filename, archive, etc.) and visuals (italic for archives) merged
 openDataFile() and previewDataFile() into their caller as they weren't used
 anywhere else previewDataFile() used to do a fromNativeSeparators() before
 previewing, moved that to previewFileWithAlternatives() instead brought
 overwrittenTree double click in line with overwriteTree, there's no
 difference between apply() and close() because there's only a close button

---
 src/organizercore.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/organizercore.cpp')

diff --git a/src/organizercore.cpp b/src/organizercore.cpp
index 3ad4e586..892162f6 100644
--- a/src/organizercore.cpp
+++ b/src/organizercore.cpp
@@ -1321,6 +1321,8 @@ bool OrganizerCore::executeFileVirtualized(
 bool OrganizerCore::previewFileWithAlternatives(
   QWidget* parent, QString fileName, int selectedOrigin)
 {
+  fileName = QDir::fromNativeSeparators(fileName);
+
   // what we have is an absolute path to the file in its actual location (for the primary origin)
   // what we want is the path relative to the virtual data directory
 
-- 
cgit v1.3.1