Code polishing

Author: dl3sdo

src/gui/map/map_find_feature.cpp

@@ -22,8 +22,8 @@
 
 #include <functional>
 
-#include <QAction>
 #include <QAbstractButton>
+#include <QAction>
 #include <QDialog>
 #include <QDialogButtonBox>
 #include <QGridLayout>
@@ -129,7 +129,7 @@ void MapFindFeature::showDialog()
 
 		auto button_box = new QDialogButtonBox(QDialogButtonBox::Close | QDialogButtonBox::Help);
 		connect(button_box, &QDialogButtonBox::rejected, &*find_dialog, &QDialog::hide);
-		connect(button_box->button(QDialogButtonBox::Help), &QPushButton::clicked, this, &MapFindFeature::showHelp);
+		connect(button_box, &QDialogButtonBox::helpRequested, this, &MapFindFeature::showHelp);
 
 		editor_stack = new QStackedLayout();
 		editor_stack->addWidget(text_edit);
@@ -182,6 +182,7 @@ ObjectQuery MapFindFeature::makeQuery() const
 }
 
 
+// slot
 void MapFindFeature::findNext()
 {
 	auto query = makeQuery();
@@ -227,6 +228,7 @@ void MapFindFeature::findNext()
 }
 
 
+// slot
 void MapFindFeature::findAll()
 {
 	auto map = controller.getMap();
@@ -251,14 +253,13 @@ void MapFindFeature::findAll()
 }
 
 
-
+// slot
 void MapFindFeature::showHelp() const
 {
 	Util::showHelp(controller.getWindow(), "find_objects.html");
 }
 
 
-
 // slot
 void MapFindFeature::tagSelectorToggled(bool active)
 {

src/gui/map/map_find_feature.h

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2017 Kai Pastor
+ *    Copyright 2017-2019, 2025 Kai Pastor
  *
  *    This file is part of OpenOrienteering.
  *
@@ -56,15 +56,11 @@ class MapFindFeature : public QObject
 
 	void setEnabled(bool enabled);
 
-	QAction* showDialogAction() { return show_action; }
+	QAction* showDialogAction() const { return show_action; }
 
-	QAction* findNextAction() { return find_next_action; }
-	
-private:
-	void showDialog();
-	
-	ObjectQuery makeQuery() const;
+	QAction* findNextAction() const { return find_next_action; }
 
+private slots:
 	void findNext();
 
 	void findAll();
@@ -73,6 +69,12 @@ class MapFindFeature : public QObject
 
 	void tagSelectorToggled(bool active);
 
+private:
+	void showDialog();
+	
+	ObjectQuery makeQuery() const;
+	
+	
 	MapEditorController& controller;
 	QPointer<QDialog> find_dialog;           // child of controller's window
 	QStackedLayout* editor_stack = nullptr;  // child of find_dialog
@@ -88,4 +90,4 @@ class MapFindFeature : public QObject
 
 }  // namespace OpenOrienteering
 
-#endif
+#endif // OPENORIENTEERING_MAP_FIND_FEATURE_H