Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Set multiselect to false in EnumeratedStringProperty #38372

Merged
merged 1 commit into from
Nov 11, 2024
Merged

Set multiselect to false in EnumeratedStringProperty #38372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Framework/Kernel/inc/MantidKernel/EnumeratedStringProperty.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
// SPDX - License - Identifier: GPL - 3.0 +
#pragma once
#include "MantidKernel/EnumeratedString.h"
#include "MantidKernel/NullValidator.h"
#include "MantidKernel/Property.h"
#include <vector>

Expand Down Expand Up @@ -59,7 +58,6 @@ template <class E, std::vector<std::string> const *const names> class Enumerated
std::string isValid() const override;
bool isDefault() const override;
std::vector<std::string> allowedValues() const override;
bool isMultipleSelectionAllowed() override;

// SETTERS
std::string setValue(E const value);
Expand Down
25 changes: 0 additions & 25 deletions Framework/Kernel/inc/MantidKernel/EnumeratedStringProperty.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,8 @@
// SPDX - License - Identifier: GPL - 3.0 +
#pragma once

#include <iomanip>
#include <iostream>
#include <sstream>
#include <type_traits>
#include <vector>
#ifndef Q_MOC_RUN
#include <boost/algorithm/string/trim.hpp>
#include <memory>
#endif
#include "MantidKernel/EnumeratedStringProperty.h"
#include "MantidKernel/Exception.h"
#include "MantidKernel/IPropertySettings.h"
#include "MantidKernel/Logger.h"
#include "MantidKernel/NullValidator.h"
#include "MantidKernel/OptionalBool.h"
#include "MantidKernel/PropertyHelper.h"
#include "MantidKernel/PropertyWithValueJSON.h"
#include "MantidKernel/StringTokenizer.h"
#include "MantidKernel/Strings.h"
#include <json/value.h>

namespace Mantid::Kernel {
Expand Down Expand Up @@ -188,14 +171,6 @@ std::vector<std::string> EnumeratedStringProperty<E, names>::allowedValues() con
return *names;
}

/** Returns true, as multiple selection is allowed.
* @return true
*/
template <class E, std::vector<std::string> const *const names>
bool EnumeratedStringProperty<E, names>::isMultipleSelectionAllowed() {
return true;
}

// ######################################################//
// SETTERS
// ######################################################//
Expand Down
Loading