mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-21 06:39:42 +00:00
Code Issues Releases Wiki Activity

Merge branch 'editwidgetfixes' into 'master'

Browse source 
Minor fixes to editwidget.cpp

See merge request OpenMW/openmw!2680
This commit is contained in:
psi29a 2023-02-04 23:39:51 +00:00
commit f67896893d
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/opencs/view/filter/editwidget.cpp
View file

@ -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::pair<std::string, FilterType> pair = std::visit(FilterVisitor(), filterData.searchData);
std::string searchString = pair.first; std::string searchString = pair.first;
filterType = pair.second; filterType = pair.second;
std::vector<std::string> columns;
newFilterData.searchData = searchString; newFilterData.searchData = searchString;
newFilterData.columns = filterData.columns; newFilterData.columns = filterData.columns;
newFilter.emplace_back(newFilterData); 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(); const unsigned columns = filterData.columns.size();

2
apps/opencs/view/filter/editwidget.hpp
View file

@ -80,7 +80,7 @@ namespace CSVFilter
void filterChanged(std::shared_ptr<CSMFilter::Node> filter); void filterChanged(std::shared_ptr<CSMFilter::Node> filter);
private: 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; void contextMenuEvent(QContextMenuEvent* event) override;