Partially revert polishing

No slot markup, member functions are good enough.
No const on functions which hand out non-const member.
Restore original order in header which matched order in source.

Move the new functions for testing purpose from public to protected.
The test can access them via light-weight derived type.

Author: dg0yt

src/gui/map/map_find_feature.cpp

@@ -182,7 +182,6 @@ ObjectQuery MapFindFeature::makeQuery() const
 }
 
 
-// slot
 void MapFindFeature::findNext()
 {
 	auto query = makeQuery();
@@ -235,7 +234,6 @@ void MapFindFeature::findNextMatchingObject(ObjectQuery& query)
 }
 
 
-// slot
 void MapFindFeature::findAll()
 {
 	auto map = controller.getMap();
@@ -267,14 +265,12 @@ void MapFindFeature::findAllMatchingObjects(ObjectQuery& query)
 }
 
 
-// slot
 void MapFindFeature::showHelp() const
 {
 	Util::showHelp(controller.getWindow(), "find_objects.html");
 }
 
 
-// slot
 void MapFindFeature::tagSelectorToggled(bool active)
 {
 	editor_stack->setCurrentIndex(active ? 1 : 0);

src/gui/map/map_find_feature.h

@@ -54,15 +54,20 @@ class MapFindFeature : public QObject
 
 	void setEnabled(bool enabled);
 
-	QAction* showDialogAction() const { return show_action; }
+	QAction* showDialogAction() { return show_action; }
 
-	QAction* findNextAction() const { return find_next_action; }
+	QAction* findNextAction() { return find_next_action; }
 
+protected:
 	void findNextMatchingObject(ObjectQuery& query);
 
 	void findAllMatchingObjects(ObjectQuery& query);
 
-private slots:
+private:
+	void showDialog();
+	
+	ObjectQuery makeQuery() const;
+	
 	void findNext();
 
 	void findAll();
@@ -71,11 +76,6 @@ private slots:
 
 	void tagSelectorToggled(bool active);
 
-private:
-	void showDialog();
-	
-	ObjectQuery makeQuery() const;
-	
 
 	MapEditorController& controller;
 	QPointer<QDialog> find_dialog;           // child of controller's window

test/tools_t.cpp

@@ -263,7 +263,13 @@ void ToolsTest::testFindObjects()
 
 	TestMapEditor editor(map);  // taking ownership
 	editor.editor->setTool(nullptr);
-	MapFindFeature find_feature {*editor.editor};
+	
+	struct TestMapFindFeature : public MapFindFeature{
+		TestMapFindFeature(MapEditorController &controller) : MapFindFeature(controller) {}
+		using MapFindFeature::findNextMatchingObject;
+		using MapFindFeature::findAllMatchingObjects;
+	} find_feature {*editor.editor};
+	
 	ObjectQuery symbol_query {QLatin1String("match"), ObjectQuery::OperatorIs, QLatin1String("yes")};
 
 	map->clearObjectSelection(false);