Clearer typed code

bibledit · Dec 31, 2023 · 9f7d42d · 9f7d42d
1 parent 2a3e2ca
commit 9f7d42d
Show file tree

Hide file tree

Showing 156 changed files with 439 additions and 144 deletions.
diff --git a/bootstrap/bootstrap.cpp b/bootstrap/bootstrap.cpp
@@ -417,18 +417,18 @@ void bootstrap_index (Webserver_Request& webserver_request)
     return;
   }
 
-  if ((url == search_index_url ()) && browser_request_security_okay (webserver_request) && search_index_acl (std::addressof(webserver_request))) {
-    webserver_request.reply = search_index (std::addressof(webserver_request));
+  if ((url == search_index_url ()) && browser_request_security_okay (webserver_request) && search_index_acl (webserver_request)) {
+    webserver_request.reply = search_index (webserver_request);
     return;
   }
 
-  if ((url == workspace_index_url ()) && browser_request_security_okay (webserver_request) && workspace_index_acl (std::addressof(webserver_request))) {
-    webserver_request.reply = workspace_index (std::addressof(webserver_request));
+  if ((url == workspace_index_url ()) && browser_request_security_okay (webserver_request) && workspace_index_acl (webserver_request)) {
+    webserver_request.reply = workspace_index (webserver_request);
     return;
   }
 
-  if ((url == workspace_organize_url ()) && browser_request_security_okay (webserver_request) && workspace_organize_acl (std::addressof(webserver_request))) {
-    webserver_request.reply = workspace_organize (std::addressof(webserver_request));
+  if ((url == workspace_organize_url ()) && browser_request_security_okay (webserver_request) && workspace_organize_acl (webserver_request)) {
+    webserver_request.reply = workspace_organize (webserver_request);
     return;
   }
 

diff --git a/changes/change.h b/changes/change.h
@@ -21,6 +21,8 @@
 
 #include <config/libraries.h>
 
+class Webserver_Request;
+
 std::string changes_change_url ();
 bool changes_change_acl (void * webserver_request);
 std::string changes_change (void * webserver_request);
diff --git a/changes/changes.h b/changes/changes.h
@@ -21,6 +21,8 @@
 
 #include <config/libraries.h>
 
+class Webserver_Request;
+
 std::string changes_changes_url ();
 bool changes_changes_acl (void * webserver_request);
 std::string changes_changes (void * webserver_request);
diff --git a/changes/manage.h b/changes/manage.h
@@ -21,6 +21,8 @@
 
 #include <config/libraries.h>
 
+class Webserver_Request;
+
 std::string changes_manage_url ();
 bool changes_manage_acl (void * webserver_request);
 std::string changes_manage (void * webserver_request);
diff --git a/changes/statistics.h b/changes/statistics.h
@@ -21,6 +21,8 @@
 
 #include <config/libraries.h>
 
+class Webserver_Request;
+
 std::string changes_statistics_url ();
 bool changes_statistics_acl (void * webserver_request);
 std::string changes_statistics (void * webserver_request);
diff --git a/checks/index.h b/checks/index.h
@@ -21,6 +21,8 @@
 
 #include <config/libraries.h>
 
+class Webserver_Request;
+
 std::string checks_index_url ();
 bool checks_index_acl (void * webserver_request);
 std::string checks_index (void * webserver_request);
diff --git a/checks/settings.h b/checks/settings.h
@@ -21,6 +21,8 @@
 
 #include <config/libraries.h>
 
+class Webserver_Request;
+
 std::string checks_settings_url ();
 bool checks_settings_acl (void * webserver_request);
 std::string checks_settings (void * webserver_request);
diff --git a/checks/settingspairs.h b/checks/settingspairs.h
@@ -21,6 +21,8 @@
 
 #include <config/libraries.h>
 
+class Webserver_Request;
+
 std::string checks_settingspairs_url ();
 bool checks_settingspairs_acl (void * webserver_request);
 std::string checks_settingspairs (void * webserver_request);
diff --git a/checks/settingspatterns.h b/checks/settingspatterns.h
@@ -21,6 +21,8 @@
 
 #include <config/libraries.h>
 
+class Webserver_Request;
+
 std::string checks_settingspatterns_url ();
 bool checks_settingspatterns_acl (void * webserver_request);
 std::string checks_settingspatterns (void * webserver_request);
diff --git a/checks/settingssentences.h b/checks/settingssentences.h
@@ -21,6 +21,8 @@
 
 #include <config/libraries.h>
 
+class Webserver_Request;
+
 std::string checks_settingssentences_url ();
 bool checks_settingssentences_acl (void * webserver_request);
 std::string checks_settingssentences (void * webserver_request);
diff --git a/checks/suppress.h b/checks/suppress.h
@@ -21,6 +21,8 @@
 
 #include <config/libraries.h>
 
+class Webserver_Request;
+
 std::string checks_suppress_url ();
 bool checks_suppress_acl (void * webserver_request);
 std::string checks_suppress (void * webserver_request);
diff --git a/client/index.h b/client/index.h
@@ -21,6 +21,8 @@
 
 #include <config/libraries.h>
 
+class Webserver_Request;
+
 std::string client_index_url ();
 bool client_index_acl (void * webserver_request);
 std::string client_index (void * webserver_request);
diff --git a/collaboration/index.h b/collaboration/index.h
@@ -21,6 +21,8 @@
 
 #include <config/libraries.h>
 
+class Webserver_Request;
+
 std::string collaboration_index_url ();
 bool collaboration_index_acl (void * webserver_request);
 std::string collaboration_index (void * webserver_request);
diff --git a/collaboration/settings.h b/collaboration/settings.h
@@ -21,6 +21,8 @@
 
 #include <config/libraries.h>
 
+class Webserver_Request;
+
 std::string collaboration_settings_url ();
 bool collaboration_settings_acl (void * webserver_request);
 std::string collaboration_settings (void * webserver_request);
diff --git a/consistency/index.h b/consistency/index.h
@@ -21,6 +21,8 @@
 
 #include <config/libraries.h>
 
+class Webserver_Request;
+
 std::string consistency_index_url ();
 bool consistency_index_acl (void * webserver_request);
 std::string consistency_index (void * webserver_request);
diff --git a/consistency/input.h b/consistency/input.h
@@ -21,6 +21,8 @@
 
 #include <config/libraries.h>
 
+class Webserver_Request;
+
 std::string consistency_input_url ();
 bool consistency_input_acl (void * webserver_request);
 std::string consistency_input (void * webserver_request);
diff --git a/consistency/poll.h b/consistency/poll.h
@@ -21,6 +21,8 @@
 
 #include <config/libraries.h>
 
+class Webserver_Request;
+
 std::string consistency_poll_url ();
 bool consistency_poll_acl (void * webserver_request);
 std::string consistency_poll (void * webserver_request);
diff --git a/developer/delay.h b/developer/delay.h
@@ -21,6 +21,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 #include <config/libraries.h>
 
+class Webserver_Request;
+
 const char * developer_delay_url ();
 bool developer_delay_acl (void * webserver_request);
 std::string developer_delay (void * webserver_request);
diff --git a/developer/index.h b/developer/index.h
@@ -21,6 +21,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 #include <config/libraries.h>
 
+class Webserver_Request;
+
 const char * developer_index_url ();
 bool developer_index_acl (void * webserver_request);
 std::string developer_index (void * webserver_request);
diff --git a/edit/edit.h b/edit/edit.h
@@ -21,6 +21,8 @@
 
 #include <config/libraries.h>
 
+class Webserver_Request;
+
 std::string edit_edit_url ();
 bool edit_edit_acl (void * webserver_request);
 std::string edit_edit (void * webserver_request);
diff --git a/edit/id.h b/edit/id.h
@@ -21,6 +21,8 @@
 
 #include <config/libraries.h>
 
+class Webserver_Request;
+
 std::string edit_id_url ();
 bool edit_id_acl (void * webserver_request);
 std::string edit_id (void * webserver_request);
diff --git a/edit/load.h b/edit/load.h
@@ -21,6 +21,8 @@
 
 #include <config/libraries.h>
 
+class Webserver_Request;
+
 std::string edit_load_url ();
 bool edit_load_acl (void * webserver_request);
 std::string edit_load (void * webserver_request);
diff --git a/edit/preview.h b/edit/preview.h
@@ -21,6 +21,8 @@
 
 #include <config/libraries.h>
 
+class Webserver_Request;
+
 std::string edit_preview_url ();
 bool edit_preview_acl (void * webserver_request);
 std::string edit_preview (void * webserver_request);
diff --git a/edit/save.h b/edit/save.h
@@ -21,6 +21,8 @@
 
 #include <config/libraries.h>
 
+class Webserver_Request;
+
 std::string edit_save_url ();
 bool edit_save_acl (void * webserver_request);
 std::string edit_save (void * webserver_request);
diff --git a/edit/styles.h b/edit/styles.h
@@ -21,6 +21,8 @@
 
 #include <config/libraries.h>
 
+class Webserver_Request;
+
 std::string edit_styles_url ();
 bool edit_styles_acl (void * webserver_request);
 std::string edit_styles (void * webserver_request);
diff --git a/edit/update.h b/edit/update.h
@@ -21,6 +21,8 @@
 
 #include <config/libraries.h>
 
+class Webserver_Request;
+
 std::string edit_update_url ();
 bool edit_update_acl (void * webserver_request);
 std::string edit_update (void * webserver_request);
diff --git a/editone2/index.h b/editone2/index.h
@@ -21,6 +21,8 @@
 
 #include <config/libraries.h>
 
+class Webserver_Request;
+
 std::string editone2_index_url ();
 bool editone2_index_acl (void * webserver_request);
 std::string editone2_index (void * webserver_request);
diff --git a/editone2/load.h b/editone2/load.h
@@ -21,6 +21,8 @@
 
 #include <config/libraries.h>
 
+class Webserver_Request;
+
 std::string editone2_load_url ();
 bool editone2_load_acl (void * webserver_request);
 std::string editone2_load (void * webserver_request);
diff --git a/editone2/save.h b/editone2/save.h
@@ -21,6 +21,8 @@
 
 #include <config/libraries.h>
 
+class Webserver_Request;
+
 std::string editone2_save_url ();
 bool editone2_save_acl (void * webserver_request);
 std::string editone2_save (void * webserver_request);
diff --git a/editone2/update.h b/editone2/update.h
@@ -21,6 +21,8 @@
 
 #include <config/libraries.h>
 
+class Webserver_Request;
+
 std::string editone2_update_url ();
 bool editone2_update_acl (void * webserver_request);
 std::string editone2_update (void * webserver_request);
diff --git a/editone2/verse.h b/editone2/verse.h
@@ -21,6 +21,8 @@
 
 #include <config/libraries.h>
 
+class Webserver_Request;
+
 std::string editone2_verse_url ();
 bool editone2_verse_acl (void * webserver_request);
 std::string editone2_verse (void * webserver_request);
diff --git a/editor/id.h b/editor/id.h
@@ -21,6 +21,8 @@
 
 #include <config/libraries.h>
 
+class Webserver_Request;
+
 std::string editor_id_url ();
 bool editor_id_acl (void * webserver_request);
 std::string editor_id (void * webserver_request);
diff --git a/editor/select.h b/editor/select.h
@@ -21,6 +21,8 @@
 
 #include <config/libraries.h>
 
+class Webserver_Request;
+
 std::string editor_select_url ();
 bool editor_select_acl (void * webserver_request);
 std::string editor_select (void * webserver_request);
diff --git a/editor/style.h b/editor/style.h
@@ -21,6 +21,8 @@
 
 #include <config/libraries.h>
 
+class Webserver_Request;
+
 std::string editor_style_url ();
 bool editor_style_acl (void * webserver_request);
 std::string editor_style (void * webserver_request);
diff --git a/editusfm/focus.h b/editusfm/focus.h
@@ -21,6 +21,8 @@
 
 #include <config/libraries.h>
 
+class Webserver_Request;
+
 std::string editusfm_focus_url ();
 bool editusfm_focus_acl (void * webserver_request);
 std::string editusfm_focus (void * webserver_request);
diff --git a/editusfm/load.h b/editusfm/load.h
@@ -21,6 +21,8 @@
 
 #include <config/libraries.h>
 
+class Webserver_Request;
+
 std::string editusfm_load_url ();
 bool editusfm_load_acl (void * webserver_request);
 std::string editusfm_load (void * webserver_request);
diff --git a/editusfm/offset.h b/editusfm/offset.h
@@ -21,6 +21,8 @@
 
 #include <config/libraries.h>
 
+class Webserver_Request;
+
 std::string editusfm_offset_url ();
 bool editusfm_offset_acl (void * webserver_request);
 std::string editusfm_offset (void * webserver_request);
diff --git a/editusfm/save.h b/editusfm/save.h
@@ -21,6 +21,8 @@
 
 #include <config/libraries.h>
 
+class Webserver_Request;
+
 std::string editusfm_save_url ();
 bool editusfm_save_acl (void * webserver_request);
 std::string editusfm_save (void * webserver_request);
diff --git a/email/index.h b/email/index.h
@@ -21,6 +21,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 #include <config/libraries.h>
 
+class Webserver_Request;
+
 std::string email_index_url ();
 bool email_index_acl (void * webserver_request);
 std::string email_index (void * webserver_request);
diff --git a/filter/passage.cpp b/filter/passage.cpp
@@ -70,7 +70,7 @@ bool Passage::equal (Passage & passage)
 // This method converts the passage of the object into text, like e.g. so:
 // "hexadecimal Bible _1_2_3".
 // First the hexadecimal Bible comes, then the book identifier, then the chapter number, and finally the verse number.
-string Passage::encode ()
+string Passage::encode () const
 {
   string text;
   // The encoded passage can be used as an attribute in the HTML DOM.

diff --git a/filter/passage.h b/filter/passage.h
@@ -34,7 +34,7 @@ class Passage
   int m_chapter {};
   std::string m_verse {};
   bool equal (Passage & passage);
-  std::string encode ();
+  std::string encode () const;
   static Passage decode (const std::string& encoded);
 };
 

diff --git a/help/index.h b/help/index.h
@@ -21,6 +21,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 #include <config/libraries.h>
 
+class Webserver_Request;
+
 std::string help_index_html (const std::string& url);
 bool help_index_url (const std::string& url);
 bool help_index_acl (void * webserver_request);