Clearer types in code rather than void pointers

#926
bibledit · Jan 5, 2024 · 0c30f5b · 0c30f5b
1 parent 88df824
commit 0c30f5b
Show file tree

Hide file tree

Showing 157 changed files with 171 additions and 161 deletions.
diff --git a/access/logic.cpp b/access/logic.cpp
@@ -22,6 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include <filter/url.h>
 #include <filter/roles.h>
 #include <database/privileges.h>
+#include <webserver/request.h>
 using namespace std;
 
 

diff --git a/bb/book.cpp b/bb/book.cpp
@@ -49,7 +49,7 @@ std::string bible_book_url ()
 
 bool bible_book_acl (Webserver_Request& webserver_request)
 {
-  return Filter_Roles::access_control (std::addressof(webserver_request), Filter_Roles::manager ());
+  return Filter_Roles::access_control (webserver_request, Filter_Roles::manager ());
 }
 
 

diff --git a/bb/chapter.cpp b/bb/chapter.cpp
@@ -45,7 +45,7 @@ std::string bible_chapter_url ()
 
 bool bible_chapter_acl (Webserver_Request& webserver_request)
 {
-  return Filter_Roles::access_control (std::addressof(webserver_request), Filter_Roles::manager ());
+  return Filter_Roles::access_control (webserver_request, Filter_Roles::manager ());
 }
 
 

diff --git a/bb/css.cpp b/bb/css.cpp
@@ -42,7 +42,7 @@ std::string bible_css_url ()
 
 bool bible_css_acl (Webserver_Request& webserver_request)
 {
-  return Filter_Roles::access_control (std::addressof(webserver_request), Filter_Roles::translator ());
+  return Filter_Roles::access_control (webserver_request, Filter_Roles::translator ());
 }
 
 

diff --git a/bb/import.cpp b/bb/import.cpp
@@ -44,7 +44,7 @@ std::string bible_import_url ()
 
 bool bible_import_acl (Webserver_Request& webserver_request)
 {
-  return Filter_Roles::access_control (std::addressof(webserver_request), Filter_Roles::manager ());
+  return Filter_Roles::access_control (webserver_request, Filter_Roles::manager ());
 }
 
 

diff --git a/bb/manage.cpp b/bb/manage.cpp
@@ -59,7 +59,7 @@ std::string bible_manage_url ()
 
 bool bible_manage_acl (Webserver_Request& webserver_request)
 {
-  return Filter_Roles::access_control (std::addressof(webserver_request), Filter_Roles::translator ());
+  return Filter_Roles::access_control (webserver_request, Filter_Roles::translator ());
 }
 
 

diff --git a/bb/order.cpp b/bb/order.cpp
@@ -40,7 +40,7 @@ std::string bible_order_url ()
 
 bool bible_order_acl (Webserver_Request& webserver_request)
 {
-  return Filter_Roles::access_control (std::addressof(webserver_request), Filter_Roles::translator ());
+  return Filter_Roles::access_control (webserver_request, Filter_Roles::translator ());
 }
 
 

diff --git a/bb/settings.cpp b/bb/settings.cpp
@@ -67,7 +67,7 @@ std::string bible_settings_url ()
 
 bool bible_settings_acl (Webserver_Request& webserver_request)
 {
-  return Filter_Roles::access_control (std::addressof(webserver_request), Filter_Roles::translator ());
+  return Filter_Roles::access_control (webserver_request, Filter_Roles::translator ());
 }
 
 

diff --git a/changes/change.cpp b/changes/change.cpp
@@ -57,7 +57,7 @@ string changes_change_url ()
 
 bool changes_change_acl (Webserver_Request& webserver_request)
 {
-  return Filter_Roles::access_control (std::addressof(webserver_request), Filter_Roles::consultant ());
+  return Filter_Roles::access_control (webserver_request, Filter_Roles::consultant ());
 }
 
 

diff --git a/changes/changes.cpp b/changes/changes.cpp
@@ -59,7 +59,7 @@ string changes_changes_url ()
 
 bool changes_changes_acl (Webserver_Request& webserver_request)
 {
-  return Filter_Roles::access_control (std::addressof(webserver_request), Filter_Roles::consultant ());
+  return Filter_Roles::access_control (webserver_request, Filter_Roles::consultant ());
 }
 
 

diff --git a/changes/manage.cpp b/changes/manage.cpp
@@ -50,7 +50,7 @@ string changes_manage_url ()
 
 bool changes_manage_acl (Webserver_Request& webserver_request)
 {
-  return Filter_Roles::access_control (std::addressof(webserver_request), Filter_Roles::manager ());
+  return Filter_Roles::access_control (webserver_request, Filter_Roles::manager ());
 }
 
 

diff --git a/changes/statistics.cpp b/changes/statistics.cpp
@@ -43,7 +43,7 @@ string changes_statistics_url ()
 
 bool changes_statistics_acl (Webserver_Request& webserver_request)
 {
-  return Filter_Roles::access_control (std::addressof(webserver_request), Filter_Roles::consultant ());
+  return Filter_Roles::access_control (webserver_request, Filter_Roles::consultant ());
 }
 
 

diff --git a/checks/index.cpp b/checks/index.cpp
@@ -44,7 +44,7 @@ std::string checks_index_url ()
 
 bool checks_index_acl (Webserver_Request& webserver_request)
 {
-  return Filter_Roles::access_control (std::addressof(webserver_request), Filter_Roles::translator ());
+  return Filter_Roles::access_control (webserver_request, Filter_Roles::translator ());
 }
 
 

diff --git a/checks/settings.cpp b/checks/settings.cpp
@@ -51,7 +51,7 @@ bool checks_settings_acl ([[maybe_unused]] Webserver_Request& webserver_request)
 #ifdef HAVE_CLIENT
   return true;
 #else
-  return Filter_Roles::access_control (std::addressof(webserver_request), Filter_Roles::manager ());
+  return Filter_Roles::access_control (webserver_request, Filter_Roles::manager ());
 #endif
 }
 

diff --git a/checks/settingspairs.cpp b/checks/settingspairs.cpp
@@ -49,7 +49,7 @@ bool checks_settingspairs_acl ([[maybe_unused]] Webserver_Request& webserver_req
 #ifdef HAVE_CLIENT
   return true;
 #else
-  return Filter_Roles::access_control (std::addressof(webserver_request), Filter_Roles::manager ());
+  return Filter_Roles::access_control (webserver_request, Filter_Roles::manager ());
 #endif
 }
 

diff --git a/checks/settingspatterns.cpp b/checks/settingspatterns.cpp
@@ -42,7 +42,7 @@ bool checks_settingspatterns_acl ([[maybe_unused]] Webserver_Request& webserver_
 #ifdef HAVE_CLIENT
   return true;
 #else
-  return Filter_Roles::access_control (std::addressof(webserver_request), Filter_Roles::manager ());
+  return Filter_Roles::access_control (webserver_request, Filter_Roles::manager ());
 #endif
 }
 

diff --git a/checks/settingssentences.cpp b/checks/settingssentences.cpp
@@ -49,7 +49,7 @@ bool checks_settingssentences_acl ([[maybe_unused]] Webserver_Request& webserver
 #ifdef HAVE_CLIENT
   return true;
 #else
-  return Filter_Roles::access_control (std::addressof(webserver_request), Filter_Roles::manager ());
+  return Filter_Roles::access_control (webserver_request, Filter_Roles::manager ());
 #endif
 }
 

diff --git a/checks/suppress.cpp b/checks/suppress.cpp
@@ -42,7 +42,7 @@ string checks_suppress_url ()
 
 bool checks_suppress_acl (Webserver_Request& webserver_request)
 {
-  return Filter_Roles::access_control (std::addressof(webserver_request), Filter_Roles::translator ());
+  return Filter_Roles::access_control (webserver_request, Filter_Roles::translator ());
 }
 
 

diff --git a/client/index.cpp b/client/index.cpp
@@ -45,7 +45,7 @@ std::string client_index_url ()
 
 bool client_index_acl (Webserver_Request& webserver_request)
 {
-  return Filter_Roles::access_control (std::addressof(webserver_request), Filter_Roles::member ());
+  return Filter_Roles::access_control (webserver_request, Filter_Roles::member ());
 }
 
 

diff --git a/collaboration/index.cpp b/collaboration/index.cpp
@@ -42,7 +42,7 @@ std::string collaboration_index_url ()
 
 bool collaboration_index_acl (Webserver_Request& webserver_request)
 {
-  return Filter_Roles::access_control (std::addressof(webserver_request), Filter_Roles::admin ());
+  return Filter_Roles::access_control (webserver_request, Filter_Roles::admin ());
 }
 
 

diff --git a/collaboration/settings.cpp b/collaboration/settings.cpp
@@ -45,7 +45,7 @@ string collaboration_settings_url ()
 
 bool collaboration_settings_acl (Webserver_Request& webserver_request)
 {
-  return Filter_Roles::access_control (std::addressof(webserver_request), Filter_Roles::admin ());
+  return Filter_Roles::access_control (webserver_request, Filter_Roles::admin ());
 }
 
 

diff --git a/compare/index.cpp b/compare/index.cpp
@@ -54,7 +54,7 @@ std::string compare_index_url ()
 
 bool compare_index_acl (Webserver_Request& webserver_request)
 {
-  return Filter_Roles::access_control (std::addressof(webserver_request), Filter_Roles::consultant ());
+  return Filter_Roles::access_control (webserver_request, Filter_Roles::consultant ());
 }
 
 

diff --git a/consistency/index.cpp b/consistency/index.cpp
@@ -46,7 +46,7 @@ string consistency_index_url ()
 
 bool consistency_index_acl (Webserver_Request& webserver_request)
 {
-  return Filter_Roles::access_control (std::addressof(webserver_request), Filter_Roles::translator ());
+  return Filter_Roles::access_control (webserver_request, Filter_Roles::translator ());
 }
 
 

diff --git a/consistency/input.cpp b/consistency/input.cpp
@@ -34,7 +34,7 @@ string consistency_input_url ()
 
 bool consistency_input_acl (Webserver_Request& webserver_request)
 {
-  return Filter_Roles::access_control (std::addressof(webserver_request), Filter_Roles::translator ());
+  return Filter_Roles::access_control (webserver_request, Filter_Roles::translator ());
 }
 
 

diff --git a/consistency/poll.cpp b/consistency/poll.cpp
@@ -34,7 +34,7 @@ string consistency_poll_url ()
 
 bool consistency_poll_acl (Webserver_Request& webserver_request)
 {
-  return Filter_Roles::access_control (std::addressof(webserver_request), Filter_Roles::translator ());
+  return Filter_Roles::access_control (webserver_request, Filter_Roles::translator ());
 }
 
 

diff --git a/developer/index.cpp b/developer/index.cpp
@@ -34,6 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include <config/globals.h>
 #include <library/bibledit.h>
 #include <developer/logic.h>
+#include <webserver/request.h>
 using namespace std;
 
 
@@ -45,7 +46,7 @@ const char * developer_index_url ()
 
 bool developer_index_acl (Webserver_Request& webserver_request)
 {
-  return Filter_Roles::access_control (std::addressof(webserver_request), Filter_Roles::admin ());
+  return Filter_Roles::access_control (webserver_request, Filter_Roles::admin ());
 }
 
 

diff --git a/edit/edit.cpp b/edit/edit.cpp
@@ -41,7 +41,7 @@ string edit_edit_url ()
 
 bool edit_edit_acl (Webserver_Request& webserver_request)
 {
-  if (Filter_Roles::access_control (std::addressof(webserver_request), Filter_Roles::translator ()))
+  if (Filter_Roles::access_control (webserver_request, Filter_Roles::translator ()))
     return true;
   auto [read, write] = access_bible::any (std::addressof(webserver_request));
   return read;

diff --git a/edit/id.cpp b/edit/id.cpp
@@ -37,7 +37,7 @@ string edit_id_url ()
 
 bool edit_id_acl (Webserver_Request& webserver_request)
 {
-  if (Filter_Roles::access_control (std::addressof(webserver_request), Filter_Roles::translator ()))
+  if (Filter_Roles::access_control (webserver_request, Filter_Roles::translator ()))
     return true;
   auto [ read, write ] = access_bible::any (std::addressof(webserver_request));
   return read;

diff --git a/edit/index.cpp b/edit/index.cpp
@@ -50,7 +50,7 @@ std::string edit_index_url ()
 
 bool edit_index_acl (Webserver_Request& webserver_request)
 {
-  if (Filter_Roles::access_control (std::addressof(webserver_request), Filter_Roles::translator ())) 
+  if (Filter_Roles::access_control (webserver_request, Filter_Roles::translator ())) 
     return true;
   auto [ read, write ] = access_bible::any (std::addressof(webserver_request));
   return write;

diff --git a/edit/load.cpp b/edit/load.cpp
@@ -41,7 +41,7 @@ string edit_load_url ()
 
 bool edit_load_acl (Webserver_Request& webserver_request)
 {
-  if (Filter_Roles::access_control (std::addressof(webserver_request), Filter_Roles::translator ()))
+  if (Filter_Roles::access_control (webserver_request, Filter_Roles::translator ()))
     return true;
   auto [ read, write ] = access_bible::any (std::addressof(webserver_request));
   return write;

diff --git a/edit/navigate.cpp b/edit/navigate.cpp
@@ -36,7 +36,7 @@ std::string edit_navigate_url ()
 
 bool edit_navigate_acl (Webserver_Request& webserver_request)
 {
-  if (Filter_Roles::access_control (std::addressof(webserver_request), Filter_Roles::translator ()))
+  if (Filter_Roles::access_control (webserver_request, Filter_Roles::translator ()))
     return true;
   auto [ read, write ] = access_bible::any (std::addressof(webserver_request));
   return write;

diff --git a/edit/position.cpp b/edit/position.cpp
@@ -36,7 +36,7 @@ std::string edit_position_url ()
 
 bool edit_position_acl (Webserver_Request& webserver_request)
 {
-  if (Filter_Roles::access_control (std::addressof(webserver_request), Filter_Roles::translator ())) 
+  if (Filter_Roles::access_control (webserver_request, Filter_Roles::translator ())) 
     return true;
   auto [ read, write ] = access_bible::any (std::addressof(webserver_request));
   return write;

diff --git a/edit/preview.cpp b/edit/preview.cpp
@@ -47,7 +47,7 @@ string edit_preview_url ()
 
 bool edit_preview_acl (Webserver_Request& webserver_request)
 {
-  if (Filter_Roles::access_control (std::addressof(webserver_request), Filter_Roles::translator ())) 
+  if (Filter_Roles::access_control (webserver_request, Filter_Roles::translator ())) 
     return true;
   auto [ read, write ] = access_bible::any (std::addressof(webserver_request));
   return read;

diff --git a/edit/save.cpp b/edit/save.cpp
@@ -51,7 +51,7 @@ string edit_save_url ()
 
 bool edit_save_acl (Webserver_Request& webserver_request)
 {
-  if (Filter_Roles::access_control (std::addressof(webserver_request), Filter_Roles::translator ()))
+  if (Filter_Roles::access_control (webserver_request, Filter_Roles::translator ()))
     return true;
   auto [ read, write ] = access_bible::any (std::addressof(webserver_request));
   return read;

diff --git a/edit/styles.cpp b/edit/styles.cpp
@@ -35,7 +35,7 @@ string edit_styles_url ()
 
 bool edit_styles_acl (Webserver_Request& webserver_request)
 {
-  if (Filter_Roles::access_control (std::addressof(webserver_request), Filter_Roles::translator ()))
+  if (Filter_Roles::access_control (webserver_request, Filter_Roles::translator ()))
     return true;
   auto [ read, write ] = access_bible::any (std::addressof(webserver_request));
   return read;

diff --git a/edit/update.cpp b/edit/update.cpp
@@ -53,7 +53,7 @@ string edit_update_url ()
 
 bool edit_update_acl (Webserver_Request& webserver_request)
 {
-  if (Filter_Roles::access_control (std::addressof(webserver_request), Filter_Roles::translator ()))
+  if (Filter_Roles::access_control (webserver_request, Filter_Roles::translator ()))
     return true;
   auto [ read, write ] = access_bible::any (std::addressof(webserver_request));
   return read;

diff --git a/editone2/index.cpp b/editone2/index.cpp
@@ -54,7 +54,7 @@ bool editone2_index_acl (Webserver_Request& webserver_request)
 {
   // Default minimum role for getting access.
   int minimum_role = Filter_Roles::translator ();
-  if (Filter_Roles::access_control (std::addressof(webserver_request), minimum_role))
+  if (Filter_Roles::access_control (webserver_request, minimum_role))
     return true;
   auto [ read, write ] = access_bible::any (std::addressof(webserver_request));
   return read;

diff --git a/editone2/load.cpp b/editone2/load.cpp
@@ -41,7 +41,7 @@ string editone2_load_url ()
 
 bool editone2_load_acl (Webserver_Request& webserver_request)
 {
-  if (Filter_Roles::access_control (std::addressof(webserver_request), Filter_Roles::translator ()))
+  if (Filter_Roles::access_control (webserver_request, Filter_Roles::translator ()))
     return true;
   auto [ read, write ] = access_bible::any (std::addressof(webserver_request));
   return read;

diff --git a/editone2/save.cpp b/editone2/save.cpp
@@ -50,7 +50,7 @@ string editone2_save_url ()
 
 bool editone2_save_acl (Webserver_Request& webserver_request)
 {
-  if (Filter_Roles::access_control (std::addressof(webserver_request), Filter_Roles::translator ()))
+  if (Filter_Roles::access_control (webserver_request, Filter_Roles::translator ()))
     return true;
   auto [ read, write ] = access_bible::any (std::addressof(webserver_request));
   return read;

diff --git a/editone2/update.cpp b/editone2/update.cpp
@@ -51,7 +51,7 @@ string editone2_update_url ()
 
 bool editone2_update_acl (Webserver_Request& webserver_request)
 {
-  if (Filter_Roles::access_control (std::addressof(webserver_request), Filter_Roles::translator ()))
+  if (Filter_Roles::access_control (webserver_request, Filter_Roles::translator ()))
     return true;
   auto [ read, write ] = access_bible::any (std::addressof(webserver_request));
   return read;

diff --git a/editone2/verse.cpp b/editone2/verse.cpp
@@ -34,7 +34,7 @@ string editone2_verse_url ()
 
 bool editone2_verse_acl (Webserver_Request& webserver_request)
 {
-  if (Filter_Roles::access_control (std::addressof(webserver_request), Filter_Roles::translator ()))
+  if (Filter_Roles::access_control (webserver_request, Filter_Roles::translator ()))
     return true;
   auto [ read, write ] = access_bible::any (std::addressof(webserver_request));
   return read;

diff --git a/editor/id.cpp b/editor/id.cpp
@@ -37,7 +37,7 @@ string editor_id_url ()
 
 bool editor_id_acl (Webserver_Request& webserver_request)
 {
-  if (Filter_Roles::access_control (std::addressof(webserver_request), Filter_Roles::translator ()))
+  if (Filter_Roles::access_control (webserver_request, Filter_Roles::translator ()))
     return true;
   auto [ read, write ] = access_bible::any (std::addressof(webserver_request));
   return read;
-Original file line number
+Diff line change
@@ Expand Up / @@ -49,7 +49,7 @@ std::string bible_book_url () @@
     bool bible_book_acl (Webserver_Request& webserver_request)
     {
-      return Filter_Roles::access_control (std::addressof(webserver_request), Filter_Roles::manager ());
+      return Filter_Roles::access_control (webserver_request, Filter_Roles::manager ());
     }
@@ Expand Down @@