From 76be103a91d6987527af19e87d93007be8ba8a67 Mon Sep 17 00:00:00 2001 From: Loïc Blot Date: Fri, 16 Jun 2017 11:25:52 +0200 Subject: C++11 patchset 9: move hardcoded init parameters to class definitions (part 1) (#5984) * C++11 patchset 9: move hardcoded init parameters to class definitions C++11 introduced the possibility to define the default values directly in class definitions, do it on current code Also remove some unused attributes * CollisionInfo::bouncy * collisionMoveResult::collides_xy * collisionMoveResult::standing_on_unloaded * Clouds::speed * More constructor cleanups + some variables removal * remove only write guiFormSpecMenu::m_old_tooltip * move header included inside defintions in genericobject.h * remove some unused since years exception classes * remove unused & empty debug_stacks_init * remove unused & empty content_nodemeta_serialize_legacy * remove forgotten useless bool (bouncy) in collision.cpp code --- src/database-sqlite3.cpp | 31 ++++--------------------------- 1 file changed, 4 insertions(+), 27 deletions(-) (limited to 'src/database-sqlite3.cpp') diff --git a/src/database-sqlite3.cpp b/src/database-sqlite3.cpp index 7bc87a7d0..22765c8d2 100644 --- a/src/database-sqlite3.cpp +++ b/src/database-sqlite3.cpp @@ -114,12 +114,8 @@ int Database_SQLite3::busyHandler(void *data, int count) Database_SQLite3::Database_SQLite3(const std::string &savedir, const std::string &dbname) : - m_database(NULL), - m_initialized(false), m_savedir(savedir), - m_dbname(dbname), - m_stmt_begin(NULL), - m_stmt_end(NULL) + m_dbname(dbname) { } @@ -203,13 +199,8 @@ Database_SQLite3::~Database_SQLite3() MapDatabaseSQLite3::MapDatabaseSQLite3(const std::string &savedir): Database_SQLite3(savedir, "map"), - MapDatabase(), - m_stmt_read(NULL), - m_stmt_write(NULL), - m_stmt_list(NULL), - m_stmt_delete(NULL) + MapDatabase() { - } MapDatabaseSQLite3::~MapDatabaseSQLite3() @@ -334,24 +325,10 @@ void MapDatabaseSQLite3::listAllLoadableBlocks(std::vector &dst) PlayerDatabaseSQLite3::PlayerDatabaseSQLite3(const std::string &savedir): Database_SQLite3(savedir, "players"), - PlayerDatabase(), - m_stmt_player_load(NULL), - m_stmt_player_add(NULL), - m_stmt_player_update(NULL), - m_stmt_player_remove(NULL), - m_stmt_player_list(NULL), - m_stmt_player_load_inventory(NULL), - m_stmt_player_load_inventory_items(NULL), - m_stmt_player_add_inventory(NULL), - m_stmt_player_add_inventory_items(NULL), - m_stmt_player_remove_inventory(NULL), - m_stmt_player_remove_inventory_items(NULL), - m_stmt_player_metadata_load(NULL), - m_stmt_player_metadata_remove(NULL), - m_stmt_player_metadata_add(NULL) + PlayerDatabase() { - } + PlayerDatabaseSQLite3::~PlayerDatabaseSQLite3() { FINALIZE_STATEMENT(m_stmt_player_load) -- cgit v1.2.3