From 41aae1aebe1aea4db58d61a171f7ecd76b6282d7 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Fri, 14 Feb 2020 13:10:24 +0100 Subject: filter: move StringMode out of FilterData The FilterData struct has the enum StringMode, which describes how strings are searched (substring, startswith, exact). To make it more generally accessible, remove it from the class. Since it is an "enum class", the values don't pollute the global namespace anyway. Signed-off-by: Berthold Stoeger --- desktop-widgets/filterwidget2.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'desktop-widgets') diff --git a/desktop-widgets/filterwidget2.cpp b/desktop-widgets/filterwidget2.cpp index 2df96062f..534cb4594 100644 --- a/desktop-widgets/filterwidget2.cpp +++ b/desktop-widgets/filterwidget2.cpp @@ -226,12 +226,12 @@ void FilterWidget2::updateFilter() filterData.suitMode = (FilterData::Mode)ui.suitMode->currentIndex(); filterData.dnotesMode = (FilterData::Mode)ui.dnotesMode->currentIndex(); filterData.equipmentMode = (FilterData::Mode)ui.equipmentMode->currentIndex(); - filterData.tagsStringMode = (FilterData::StringMode)ui.tagsStringMode->currentIndex(); - filterData.peopleStringMode = (FilterData::StringMode)ui.peopleStringMode->currentIndex(); - filterData.locationStringMode = (FilterData::StringMode)ui.locationStringMode->currentIndex(); - filterData.suitStringMode = (FilterData::StringMode)ui.suitStringMode->currentIndex(); - filterData.dnotesStringMode = (FilterData::StringMode)ui.dnotesStringMode->currentIndex(); - filterData.equipmentStringMode = (FilterData::StringMode)ui.equipmentStringMode->currentIndex(); + filterData.tagsStringMode = (StringFilterMode)ui.tagsStringMode->currentIndex(); + filterData.peopleStringMode = (StringFilterMode)ui.peopleStringMode->currentIndex(); + filterData.locationStringMode = (StringFilterMode)ui.locationStringMode->currentIndex(); + filterData.suitStringMode = (StringFilterMode)ui.suitStringMode->currentIndex(); + filterData.dnotesStringMode = (StringFilterMode)ui.dnotesStringMode->currentIndex(); + filterData.equipmentStringMode = (StringFilterMode)ui.equipmentStringMode->currentIndex(); filterData.logged = ui.logged->isChecked(); filterData.planned = ui.planned->isChecked(); -- cgit v1.2.3-70-g09d2