jgrogan/stuff-from-scratch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Whitespace and pointer cleanup.

Browse source
This commit is contained in:
jmsgrogan 2021-03-29 21:31:24 +01:00
parent 6fc0b8dca8
commit a03eb9599f
32 changed files with 441 additions and 468 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/database/Database.cpp
View file

@ -1,7 +1,7 @@
#include "Database.h"
Database::Database()
: mPath()
: mPath()
{
}
@ -11,17 +11,17 @@ Database::~Database()
}
std::shared_ptr<Database> Database::Create()
std::unique_ptr<Database> Database::Create()
{
return std::make_shared<Database>();
return std::make_unique<Database>();
}
void Database::SetPath(const std::string& path)
{
mPath = path;
mPath = path;
}
std::string Database::GetPath()
std::string Database::GetPath() const
{
return mPath;
return mPath;
}

14
src/database/Database.h
View file

@ -6,19 +6,19 @@
class Database
{
std::string mPath;
std::string mPath;
public:
Database();
Database();
~Database();
~Database();
static std::shared_ptr<Database> Create();
static std::unique_ptr<Database> Create();
void SetPath(const std::string& path);
void SetPath(const std::string& path);
std::string GetPath();
std::string GetPath() const;
};
using DatabasePtr = std::shared_ptr<Database>;
using DatabasePtr = std::unique_ptr<Database>;

24
src/database/DatabaseManager.cpp
View file

@ -1,8 +1,8 @@
#include "DatabaseManager.h"
DatabaseManager::DatabaseManager()
: mDatabase(),
mDatabaseInterface()
: mDatabase(),
mDatabaseInterface()
{
}
@ -12,25 +12,25 @@ DatabaseManager::~DatabaseManager()
}
std::shared_ptr<DatabaseManager> DatabaseManager::Create()
std::unique_ptr<DatabaseManager> DatabaseManager::Create()
{
return std::make_shared<DatabaseManager>();
return std::make_unique<DatabaseManager>();
}
void DatabaseManager::CreateDatabase(const std::string& path)
{
mDatabase = Database::Create();
mDatabase->SetPath(path);
mDatabase = Database::Create();
mDatabase->SetPath(path);
mDatabaseInterface = SqliteInterface::Create();
mDatabaseInterface->Open(mDatabase);
mDatabaseInterface = SqliteInterface::Create();
mDatabaseInterface->Open(mDatabase);
}
void DatabaseManager::OnShutDown()
{
if(mDatabaseInterface)
{
mDatabaseInterface->Close();
}
if(mDatabaseInterface)
{
mDatabaseInterface->Close();
}
}

16
src/database/DatabaseManager.h
View file

@ -8,20 +8,20 @@
class DatabaseManager
{
DatabasePtr mDatabase;
SqliteInterfacePtr mDatabaseInterface;
DatabasePtr mDatabase;
SqliteInterfacePtr mDatabaseInterface;
public:
DatabaseManager();
DatabaseManager();
~DatabaseManager();
~DatabaseManager();
static std::shared_ptr<DatabaseManager> Create();
static std::unique_ptr<DatabaseManager> Create();
void CreateDatabase(const std::string& path);
void CreateDatabase(const std::string& path);
void OnShutDown();
void OnShutDown();
};
using DatabaseManagerPtr = std::shared_ptr<DatabaseManager>;
using DatabaseManagerPtr = std::unique_ptr<DatabaseManager>;

48
src/database/database_interfaces/SqliteInterface.cpp
View file

@ -3,7 +3,7 @@
#include <iostream>
SqliteInterface::SqliteInterface()
: mSqliteDb(nullptr)
: mSqliteDb(nullptr)
{
}
@ -13,44 +13,44 @@ SqliteInterface::~SqliteInterface()
}
std::shared_ptr<SqliteInterface> SqliteInterface::Create()
std::unique_ptr<SqliteInterface> SqliteInterface::Create()
{
return std::make_shared<SqliteInterface>();
return std::make_unique<SqliteInterface>();
}
void SqliteInterface::Open(DatabasePtr db)
void SqliteInterface::Open(const DatabasePtr& db)
{
int rc = sqlite3_open(db->GetPath().c_str(), &mSqliteDb);
if( rc )
{
std::cout << "Can't open database: %s\n" << sqlite3_errmsg(mSqliteDb) << std::endl;
sqlite3_close(mSqliteDb);
}
int rc = sqlite3_open(db->GetPath().c_str(), &mSqliteDb);
if( rc )
{
std::cout << "Can't open database: %s\n" << sqlite3_errmsg(mSqliteDb) << std::endl;
sqlite3_close(mSqliteDb);
}
}
static int callback(void *NotUsed, int argc, char **argv, char **azColName)
{
for(int i=0; i<argc; i++)
{
//std::cout << "%s = %s\n" << azColName[i] << argv[i] ? argv[i] : "NULL" << std::endl;
for(int i=0; i<argc; i++)
{
//std::cout << "%s = %s\n" << azColName[i] << argv[i] ? argv[i] : "NULL" << std::endl;
std::cout << "NULL" << std::endl;
}
return 0;
std::cout << "NULL" << std::endl;
}
return 0;
}
void SqliteInterface::Run(const std::string& statement)
{
char *zErrMsg = 0;
int rc = sqlite3_exec(mSqliteDb, statement.c_str(), callback, 0, &zErrMsg);
if( rc!=SQLITE_OK )
{
std::cout << "SQL error: %s\n" << zErrMsg << std::endl;
sqlite3_free(zErrMsg);
}
char *zErrMsg = 0;
int rc = sqlite3_exec(mSqliteDb, statement.c_str(), callback, 0, &zErrMsg);
if (rc != SQLITE_OK)
{
std::cout << "SQL error: %s\n" << zErrMsg << std::endl;
sqlite3_free(zErrMsg);
}
}
void SqliteInterface::Close()
{
sqlite3_close(mSqliteDb);
sqlite3_close(mSqliteDb);
}

16
src/database/database_interfaces/SqliteInterface.h
View file

@ -6,21 +6,21 @@
class SqliteInterface
{
sqlite3* mSqliteDb;
sqlite3* mSqliteDb;
public:
SqliteInterface();
SqliteInterface();
~SqliteInterface();
~SqliteInterface();
static std::shared_ptr<SqliteInterface> Create();
static std::unique_ptr<SqliteInterface> Create();
void Open(DatabasePtr db);
void Open(const DatabasePtr& db);
void Close();
void Close();
void Run(const std::string& statement);
void Run(const std::string& statement);
};
using SqliteInterfacePtr = std::shared_ptr<SqliteInterface>;
using SqliteInterfacePtr = std::unique_ptr<SqliteInterface>;