From 57ef052051fb1a013589f02d3f4ef2ca8936c5c2 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (l)" <j.wuttke@fz-juelich.de>
Date: Fri, 5 Nov 2021 14:19:13 +0100
Subject: [PATCH] ItemFileNameUtils: pass name, not item
---
GUI/Models/Data/RealDataItem.cpp | 4 ++--
GUI/Models/Varia/ItemFileNameUtils.cpp | 9 ++++-----
GUI/Models/Varia/ItemFileNameUtils.h | 4 ++--
3 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/GUI/Models/Data/RealDataItem.cpp b/GUI/Models/Data/RealDataItem.cpp
index c2d680f1de9..e72946856d2 100644
--- a/GUI/Models/Data/RealDataItem.cpp
+++ b/GUI/Models/Data/RealDataItem.cpp
@@ -427,9 +427,9 @@ void RealDataItem::rotateData()
void RealDataItem::updateNonXMLDataFileNames()
{
if (DataItem* item = dataItem())
- item->setFileName(GUI::Model::FilenameUtils::realDataFileName(*this));
+ item->setFileName(GUI::Model::FilenameUtils::realDataFileName(dataName()));
if (DataItem* item = nativeData())
- item->setFileName(GUI::Model::FilenameUtils::nativeDataFileName(*this));
+ item->setFileName(GUI::Model::FilenameUtils::nativeDataFileName(dataName()));
}
void RealDataItem::updateToInstrument(const InstrumentItem* instrument)
diff --git a/GUI/Models/Varia/ItemFileNameUtils.cpp b/GUI/Models/Varia/ItemFileNameUtils.cpp
index 79c4615cb54..5e1f3b86399 100644
--- a/GUI/Models/Varia/ItemFileNameUtils.cpp
+++ b/GUI/Models/Varia/ItemFileNameUtils.cpp
@@ -13,7 +13,6 @@
// ************************************************************************************************
#include "GUI/Models/Varia/ItemFileNameUtils.h"
-#include "GUI/Models/Data/RealDataItem.h"
#include "GUI/Models/Instrument/InstrumentItems.h"
#include "GUI/Models/Job/JobItem.h"
#include "GUI/utils/Helpers.h"
@@ -57,14 +56,14 @@ QString GUI::Model::FilenameUtils::jobNativeDataFileName(const JobItem& jobItem)
//! Constructs the name of the intensity file belonging to real data item.
-QString GUI::Model::FilenameUtils::realDataFileName(const RealDataItem& realDataItem)
+QString GUI::Model::FilenameUtils::realDataFileName(const QString& dataName)
{
- return intensityDataFileName(realDataItem.dataName(), realdata_file_prefix);
+ return intensityDataFileName(dataName, realdata_file_prefix);
}
-QString GUI::Model::FilenameUtils::nativeDataFileName(const RealDataItem& realDataItem)
+QString GUI::Model::FilenameUtils::nativeDataFileName(const QString& dataName)
{
- return intensityDataFileName(realDataItem.dataName(), nativedata_file_prefix);
+ return intensityDataFileName(dataName, nativedata_file_prefix);
}
QString GUI::Model::FilenameUtils::instrumentDataFileName(const InstrumentItem& instrumentItem)
diff --git a/GUI/Models/Varia/ItemFileNameUtils.h b/GUI/Models/Varia/ItemFileNameUtils.h
index 745bac59cd6..9cab1f5607a 100644
--- a/GUI/Models/Varia/ItemFileNameUtils.h
+++ b/GUI/Models/Varia/ItemFileNameUtils.h
@@ -31,9 +31,9 @@ QString jobReferenceFileName(const JobItem& jobItem);
QString jobNativeDataFileName(const JobItem& jobItem);
-QString realDataFileName(const RealDataItem& realDataItem);
+QString realDataFileName(const QString& dataName);
-QString nativeDataFileName(const RealDataItem& realDataItem);
+QString nativeDataFileName(const QString& dataName);
QString instrumentDataFileName(const InstrumentItem& instrumentItem);
--
GitLab