From 1552119ee92c3536ed6be9f611f0c8efa6420950 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Wed, 22 Feb 2023 16:05:53 +0100
Subject: [PATCH] rm unused InstrumentItem::defaultName()
---
GUI/Model/Device/InstrumentItems.cpp | 20 --------------------
GUI/Model/Device/InstrumentItems.h | 7 -------
2 files changed, 27 deletions(-)
diff --git a/GUI/Model/Device/InstrumentItems.cpp b/GUI/Model/Device/InstrumentItems.cpp
index 10fbf705b86..cb7f24f7eae 100644
--- a/GUI/Model/Device/InstrumentItems.cpp
+++ b/GUI/Model/Device/InstrumentItems.cpp
@@ -372,11 +372,6 @@ QString SpecularInstrumentItem::instrumentType() const
return "Specular";
}
-QString SpecularInstrumentItem::defaultName() const
-{
- return "Specular";
-}
-
ISimulation* SpecularInstrumentItem::createSimulation(const MultiLayer& sample) const
{
BasicAxisItem* const axis_item = beamItem()->inclinationAxisItem();
@@ -490,11 +485,6 @@ void DepthprobeInstrumentItem::updateToRealData(const RealItem*)
throw std::runtime_error("DepthprobeInstrumentItem::updateToRealData()");
}
-QString DepthprobeInstrumentItem::defaultName() const
-{
- return "Depthprobe";
-}
-
QString DepthprobeInstrumentItem::instrumentType() const
{
return "Depth probe";
@@ -615,11 +605,6 @@ void GISASInstrumentItem::updateToRealData(const RealItem* item)
detectorItem()->setYSize(data_shape[1]);
}
-QString GISASInstrumentItem::defaultName() const
-{
- return "GISAS";
-}
-
QString GISASInstrumentItem::instrumentType() const
{
return "GISAS";
@@ -740,11 +725,6 @@ void OffspecInstrumentItem::updateToRealData(const RealItem* dataItem)
detectorItem()->setYSize(data_shape[1]);
}
-QString OffspecInstrumentItem::defaultName() const
-{
- return "Offspec";
-}
-
QString OffspecInstrumentItem::instrumentType() const
{
return "Off specular";
diff --git a/GUI/Model/Device/InstrumentItems.h b/GUI/Model/Device/InstrumentItems.h
index 4db19ffc33c..8893226962e 100644
--- a/GUI/Model/Device/InstrumentItems.h
+++ b/GUI/Model/Device/InstrumentItems.h
@@ -82,9 +82,6 @@ public:
virtual void updateToRealData(const RealItem* item) = 0;
virtual bool alignedWith(const RealItem* item) const;
- //! The default user visible name when creating an instrument
- virtual QString defaultName() const = 0;
-
virtual const ICoordSystem* createCoordSystem() const = 0;
bool withPolarizerAnalyzer() const;
@@ -147,7 +144,6 @@ public:
std::vector<int> shape() const override;
void updateToRealData(const RealItem* item) override;
bool alignedWith(const RealItem* item) const override;
- QString defaultName() const override;
QString instrumentType() const override;
const ICoordSystem* createCoordSystem() const override;
@@ -167,7 +163,6 @@ public:
std::vector<int> shape() const override;
void updateToRealData(const RealItem* item) override;
- QString defaultName() const override;
QString instrumentType() const override;
@@ -217,7 +212,6 @@ class GISASInstrumentItem : public Instrument2DItem {
public:
std::vector<int> shape() const override;
void updateToRealData(const RealItem* item) override;
- QString defaultName() const override;
QString instrumentType() const override;
const ICoordSystem* createCoordSystem() const override;
@@ -236,7 +230,6 @@ public:
std::vector<int> shape() const override;
void updateToRealData(const RealItem* item) override;
- QString defaultName() const override;
QString instrumentType() const override;
const ICoordSystem* createCoordSystem() const override;
--
GitLab