mirror of
https://github.com/OpenMW/openmw.git
synced 2025-02-19 15:09:43 +00:00
Merge branch 'editwidgetfixes' into 'master'
Minor fixes to editwidget.cpp See merge request OpenMW/openmw!2680
This commit is contained in:
commit
f67896893d
2 changed files with 2 additions and 3 deletions
|
@ -109,7 +109,6 @@ void CSVFilter::EditWidget::createFilterRequest(const std::vector<FilterData>& s
|
|||
std::pair<std::string, FilterType> pair = std::visit(FilterVisitor(), filterData.searchData);
|
||||
std::string searchString = pair.first;
|
||||
filterType = pair.second;
|
||||
std::vector<std::string> columns;
|
||||
newFilterData.searchData = searchString;
|
||||
newFilterData.columns = filterData.columns;
|
||||
newFilter.emplace_back(newFilterData);
|
||||
|
@ -219,7 +218,7 @@ void CSVFilter::EditWidget::createFilterRequest(const std::vector<FilterData>& s
|
|||
}
|
||||
}
|
||||
|
||||
std::string CSVFilter::EditWidget::generateFilter(const FilterData& filterData, const FilterType& filterType) const
|
||||
std::string CSVFilter::EditWidget::generateFilter(const FilterData& filterData, FilterType filterType) const
|
||||
{
|
||||
const unsigned columns = filterData.columns.size();
|
||||
|
||||
|
|
|
@ -80,7 +80,7 @@ namespace CSVFilter
|
|||
void filterChanged(std::shared_ptr<CSMFilter::Node> filter);
|
||||
|
||||
private:
|
||||
std::string generateFilter(const FilterData& filterData, const FilterType& filterType) const;
|
||||
std::string generateFilter(const FilterData& filterData, FilterType filterType) const;
|
||||
|
||||
void contextMenuEvent(QContextMenuEvent* event) override;
|
||||
|
||||
|
|
Loading…
Reference in a new issue