Remove empty class

#990

bb/settings.cpp

@@ -253,7 +253,6 @@ std::string bible_settings (Webserver_Request& webserver_request)
     if (stylesheet.empty()) {
       Dialog_List dialog_list = Dialog_List ("settings", translate("Would you like to change the stylesheet for editing?"), translate ("The stylesheet affects how the Bible text in the editor looks.") + " " + translate ("Please make your choice below."), "");
       dialog_list.add_query ("bible", bible);
-      Database_Styles database_styles = Database_Styles();
       const std::vector <std::string> sheets = database::styles::get_sheets();
       for (const auto& name : sheets) {
         dialog_list.add_row (name, "stylesheetediting", name);
@@ -274,7 +273,6 @@ std::string bible_settings (Webserver_Request& webserver_request)
     if (export_stylesheet.empty()) {
       Dialog_List dialog_list = Dialog_List ("settings", translate("Would you like to change the stylesheet for export?"), translate ("The stylesheet affects how the Bible text looks when exported.") + " " + translate ("Please make your choice below."), "");
       dialog_list.add_query ("bible", bible);
-      Database_Styles database_styles = Database_Styles();
       const std::vector <std::string> sheets = database::styles::get_sheets();
       for (const auto& name : sheets) {
         dialog_list.add_row (name, "stylesheetexport", name);

checks/usfm.cpp

@@ -31,7 +31,6 @@
 
 Checks_Usfm::Checks_Usfm (const std::string& bible)
 {
-  Database_Styles database_styles {};
   const std::string stylesheet = database::config::bible::get_export_stylesheet (bible);
   markers_stylesheet = database::styles1::get_markers (stylesheet);
   for (const auto & marker : markers_stylesheet) {

database/maintenance.cpp

@@ -83,7 +83,6 @@ void database_maintenance ()
 
   // No need to optimize the following because it is hardly ever written to.
   // Database_Books database_book = Database_Books ();
-  // Database_Styles database_styles;
 
 
   database::bibles::optimize ();

database/styles.h

@@ -111,12 +111,6 @@ void update_background_color (const std::string& sheet, const std::string& marke
 } // End namespace styles1
 
 
-class Database_Styles
-{
-public:
-};
-
-
 namespace database::styles2 { // Todo database function for styles v2.
 
 const std::list<stylesv2::Style>& get_styles(const std::string& stylesheet);

editor/html2usfm.cpp

@@ -72,7 +72,6 @@ void Editor_Html2Usfm::stylesheet (const std::string& stylesheet)
   styles.clear ();
   note_openers.clear ();
   character_styles.clear ();
-  Database_Styles database_styles;
   const std::vector <std::string> markers = database::styles1::get_markers (stylesheet);
   // Load the style information into the object.
   for (const std::string& marker : markers) {

editor/usfm2html.cpp

@@ -41,7 +41,6 @@ void Editor_Usfm2Html::load (std::string usfm)
 
 void Editor_Usfm2Html::stylesheet (const std::string& stylesheet)
 {
-  Database_Styles database_styles;
   m_styles.clear();
   const std::vector <std::string> markers = database::styles1::get_markers (stylesheet);
   // Load the style information into the object.

filter/text.cpp

@@ -171,7 +171,6 @@ void Filter_Text::get_styles (std::string stylesheet)
   if (odf_text_text_only) odf_text_text_only->create_page_break_style ();
   if (odf_text_text_and_note_citations) odf_text_text_and_note_citations->create_page_break_style ();
   if (odf_text_text_and_note_citations) odf_text_text_and_note_citations->create_superscript_style ();
-  Database_Styles database_styles;
   std::vector <std::string> markers = database::styles1::get_markers (stylesheet);
   for (const auto& marker : markers) {
     database::styles1::Item style = database::styles1::get_marker_data (stylesheet, marker);

filter/usfm.cpp

@@ -213,7 +213,6 @@ std::vector <BookChapterData> usfm_import (std::string input, std::string styles
         chapter_data = "";
         store_chapter_data = false;
       }
-      Database_Styles database_styles;
       database::styles1::Item marker_data = database::styles1::get_marker_data (stylesheet, marker);
       int type = marker_data.type;
       int subtype = marker_data.subtype;

manage/exports.cpp

@@ -342,7 +342,6 @@ std::string manage_exports (Webserver_Request& webserver_request)
   }
   view.set_variable ("odtqleft", filter::strings::get_checkbox_status (database::config::bible::get_odt_poetry_verses_left (bible)));
   {
-    Database_Styles database_styles;
     const std::vector <std::string> markers = database::styles1::get_markers (styles_logic_standard_sheet ());
     std::vector <std::string> poetry_styles;
     for (auto & style : markers) {

styles/indexm.cpp

@@ -61,8 +61,6 @@ std::string styles_indexm (Webserver_Request& webserver_request)
 
   Assets_View view {};
 
-  Database_Styles database_styles {};
-
   const std::string& username {webserver_request.session_logic ()->get_username ()};
   int userlevel {webserver_request.session_logic ()->get_level ()};
 

styles/sheetm.cpp

@@ -76,8 +76,6 @@ std::string styles_sheetm (Webserver_Request& webserver_request)
   std::string name = webserver_request.query["name"];
   view.set_variable ("name", filter::strings::escape_special_xml_characters (name));
 
-  Database_Styles database_styles;
-
   const std::string& username = webserver_request.session_logic ()->get_username ();
   int userlevel = webserver_request.session_logic ()->get_level ();
   bool write = database::styles::has_write_access (username, name);

styles/sheets.cpp

@@ -47,7 +47,6 @@ void styles_sheets_create_all_run ()
 // Recreates the various stylesheets.css files.
 void Styles_Sheets::recreate ()
 {
-  Database_Styles database_styles;
   std::vector <std::string> stylesheets = database::styles::get_sheets ();
   for (const auto & stylesheet : stylesheets) {
     std::string path = get_location (stylesheet, false);

styles/view.cpp

@@ -72,7 +72,6 @@ std::string styles_view (Webserver_Request& webserver_request)
   view.set_variable ("style", filter::strings::escape_special_xml_characters (style));
 
 
-  Database_Styles database_styles {};
   database::styles1::Item marker_data = database::styles1::get_marker_data (sheet, style);
 
 

unittests/odf.cpp

@@ -113,7 +113,6 @@ TEST (filter, odf)
 
   // Test basic formatted text.
   {
-    Database_Styles database_styles;
     database::styles::create_database ();
     database::styles1::Item add = database::styles1::get_marker_data (styles_logic_standard_sheet (), "add");
     odf_text odf_text (bible);
@@ -136,7 +135,6 @@ TEST (filter, odf)
 
   // Test basic formatted note.
   {
-    Database_Styles database_styles;
     database::styles::create_database ();
     database::styles1::Item add = database::styles1::get_marker_data (styles_logic_standard_sheet (), "add");
     odf_text odf_text (bible);
@@ -163,7 +161,6 @@ TEST (filter, odf)
 
   // Test embedded formatted text.
   {
-    Database_Styles database_styles;
     database::styles::create_database ();
     database::styles1::Item add = database::styles1::get_marker_data (styles_logic_standard_sheet (), "add");
     add.italic = ooitOn;
@@ -201,7 +198,6 @@ TEST (filter, odf)
 
   // Test embedded formatted note.
   {
-    Database_Styles database_styles;
     database::styles::create_database ();
     database::styles1::Item add = database::styles1::get_marker_data (styles_logic_standard_sheet (), "add");
     add.italic = ooitOn;
@@ -243,7 +239,6 @@ TEST (filter, odf)
 
   // Test paragraph formatting.
   {
-    Database_Styles database_styles;
     database::styles::create_database ();
     database::styles1::Item d = database::styles1::get_marker_data (styles_logic_standard_sheet (), "d");
     odf_text odf_text (bible);

unittests/styles.cpp

@@ -42,7 +42,6 @@ TEST (styles, css)
   // Create basic stylesheet.
   {
     refresh_sandbox (true);
-    Database_Styles database_styles {};
     database::styles::create_sheet ("testsheet");
     Styles_Css styles_css (webserver_request, "testsheet");
     styles_css.generate ();
@@ -55,7 +54,6 @@ TEST (styles, css)
   // Create stylesheet for export.
   {
     refresh_sandbox (true);
-    Database_Styles database_styles {};
     database::styles::create_sheet ("testsheet");
     Styles_Css styles_css (webserver_request, "testsheet");
     styles_css.exports ();
@@ -69,7 +67,6 @@ TEST (styles, css)
   // Stylesheet for the Bible editor.
   {
     refresh_sandbox (true);
-    Database_Styles database_styles {};
     database::styles::create_sheet ("testsheet");
     Styles_Css styles_css (webserver_request, "testsheet");
     styles_css.editor ();
@@ -206,7 +203,6 @@ TEST (styles, css)
   // Creating and deleting stylesheets.
   {
     refresh_sandbox (true);
-    Database_Styles database_styles;
     std::vector <std::string> standard {};
 
     std::vector <std::string> sheets = database::styles::get_sheets ();
@@ -232,7 +228,6 @@ TEST (styles, css)
   // Do a spot check on the markers and their associated parameters.
   {
     refresh_sandbox (true);
-    Database_Styles database_styles {};
     database::styles::create_sheet ("testsheet");
 
     std::vector <std::string> markers {};
@@ -269,7 +264,6 @@ TEST (styles, css)
   // More specific check on a marker.
   {
     refresh_sandbox (true);
-    Database_Styles database_styles {};
     database::styles::create_sheet ("testsheet");
     database::styles1::Item data = database::styles1::get_marker_data ("testsheet", "add");
     EXPECT_EQ ("add", data.marker);
@@ -279,7 +273,6 @@ TEST (styles, css)
   // Updating a marker.
   {
     refresh_sandbox (true);
-    Database_Styles database_styles {};
     database::styles::create_sheet ("testsheet");
     database::styles1::update_name ("testsheet", "add", "Addition");
     database::styles1::Item data = database::styles1::get_marker_data ("testsheet", "add");
@@ -292,7 +285,6 @@ TEST (styles, css)
   // Read and write access to the styles database.
   {
     refresh_sandbox (true);
-    Database_Styles database_styles {};
     database::styles::create_database ();
     database::styles::create_sheet ("testsheet");
 
@@ -328,7 +320,6 @@ TEST (styles, css)
   // Adding a marker.
   {
     refresh_sandbox (true);
-    Database_Styles database_styles {};
     database::styles::create_database ();
     database::styles::create_sheet ("testsheet");
 
@@ -346,7 +337,6 @@ TEST (styles, css)
   // Testing empty stylesheet.
   {
     refresh_sandbox (true);
-    Database_Styles database_styles {};
     database::styles::create_database ();
     std::vector <std::string> markers = database::styles1::get_markers ("");
     std::string marker {"zhq"};
@@ -356,7 +346,6 @@ TEST (styles, css)
   // Testing the styles application in the editors.
   {
     refresh_sandbox (true);
-    Database_Styles database_styles {};
     database::styles::create_database ();
     Database_State database_state;
     database_state.create ();

webserver/request.cpp

@@ -41,8 +41,6 @@ Webserver_Request::~Webserver_Request ()
     delete database_config_user_instance;
   if (database_users_instance) 
     delete database_users_instance;
-  if (database_styles_instance) 
-    delete database_styles_instance;
   if (database_ipc_instance)
     delete database_ipc_instance;
 }
@@ -78,14 +76,6 @@ Database_Users * Webserver_Request::database_users ()
 }
 
 
-Database_Styles * Webserver_Request::database_styles ()
-{
-  if (!database_styles_instance) 
-    database_styles_instance = new Database_Styles ();
-  return database_styles_instance;
-}
-
-
 Database_Ipc * Webserver_Request::database_ipc ()
 {
   if (!database_ipc_instance) 

webserver/request.h

@@ -81,12 +81,10 @@ class Webserver_Request
   Session_Logic * session_logic ();
   Database_Config_User * database_config_user ();
   Database_Users * database_users ();
-  Database_Styles * database_styles ();
   Database_Ipc * database_ipc ();
 private:
   Session_Logic * session_logic_instance { nullptr };
   Database_Config_User * database_config_user_instance { nullptr };
   Database_Users * database_users_instance { nullptr };
-  Database_Styles * database_styles_instance { nullptr };
   Database_Ipc * database_ipc_instance { nullptr };
 };