eelke/pgLab
1
0
Fork 0
Code Issues 28 Pull requests Projects Releases 1 Packages Wiki Activity Actions

Bunch of raw pointers replaced with smart pointers of references.

Browse source
This commit is contained in:
eelke 2017-12-09 20:21:22 +01:00
parent 5a199c9138
commit ea035f58c8
20 changed files with 67 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

23
pglab/PgDatabaseCatalogue.cpp
View file

@ -5,7 +5,7 @@
#include "Pgsql_Connection.h"
QString getRoleNameFromOid(const PgDatabaseCatalogue *cat, Oid oid)
QString getRoleNameFromOid(std::shared_ptr<const PgDatabaseCatalogue> cat, Oid oid)
{
QString name;
auto auth_ids = cat->authIds();
@ -18,7 +18,7 @@ QString getRoleNameFromOid(const PgDatabaseCatalogue *cat, Oid oid)
return name;
}
QString getRoleDisplayString(const PgDatabaseCatalogue *cat, Oid oid)
QString getRoleDisplayString(std::shared_ptr<const PgDatabaseCatalogue> cat, Oid oid)
{
QString name = getRoleNameFromOid(cat, oid);
return QString("%1 (%2)").arg(name).arg(oid);
@ -31,7 +31,6 @@ PgDatabaseCatalogue::PgDatabaseCatalogue()
PgDatabaseCatalogue::~PgDatabaseCatalogue()
{
delete m_types;
}
void PgDatabaseCatalogue::loadAll(Pgsql::Connection &conn)
@ -56,8 +55,8 @@ void PgDatabaseCatalogue::loadInfo(Pgsql::Connection &conn)
void PgDatabaseCatalogue::loadTypes(Pgsql::Connection &conn)
{
if (m_types == nullptr)
m_types = new PgTypeContainer(this);
if (!m_types)
m_types = std::make_shared<PgTypeContainer>(shared_from_this());
std::string q = m_types->getLoadQuery();
Pgsql::Result result = conn.query(q.c_str());
@ -70,8 +69,8 @@ void PgDatabaseCatalogue::loadTypes(Pgsql::Connection &conn)
void PgDatabaseCatalogue::loadDatabases(Pgsql::Connection &conn)
{
if (m_databases == nullptr)
m_databases = new PgDatabaseContainer(this);
if (!m_databases)
m_databases = std::make_shared<PgDatabaseContainer>(shared_from_this());
std::string q = m_databases->getLoadQuery();
@ -84,8 +83,8 @@ void PgDatabaseCatalogue::loadDatabases(Pgsql::Connection &conn)
void PgDatabaseCatalogue::loadAuthIds(Pgsql::Connection &conn)
{
if (m_authIds == nullptr)
m_authIds = new PgAuthIdContainer(this);
if (!m_authIds)
m_authIds = std::make_shared<PgAuthIdContainer>(shared_from_this());
std::string q = m_authIds->getLoadQuery();
Pgsql::Result result = conn.query(q.c_str());
@ -105,17 +104,17 @@ int PgDatabaseCatalogue::serverVersion() const
return m_serverVersion;
}
const PgTypeContainer* PgDatabaseCatalogue::types() const
std::shared_ptr<const PgTypeContainer> PgDatabaseCatalogue::types() const
{
return m_types;
}
const PgDatabaseContainer *PgDatabaseCatalogue::databases() const
std::shared_ptr<const PgDatabaseContainer> PgDatabaseCatalogue::databases() const
{
return m_databases;
}
const PgAuthIdContainer *PgDatabaseCatalogue::authIds() const
std::shared_ptr<const PgAuthIdContainer> PgDatabaseCatalogue::authIds() const
{
return m_authIds;
}