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

Use catalog instead of catalogue consistently

Browse source
This commit is contained in:
eelke 2018-11-25 09:05:01 +01:00
parent 52011a9842
commit 7db859737a
10 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

10
pglab/OpenDatabase.cpp
View file

@ -18,7 +18,7 @@ Expected<OpenDatabase::OpenDatabaseSPtr> OpenDatabase::createOpenDatabase(const
OpenDatabase::OpenDatabase(const ConnectionConfig& cfg)
: m_config(cfg)
, m_catalogue(std::make_shared<PgDatabaseCatalog>())
, m_catalog(std::make_shared<PgDatabaseCatalog>())
{
}
@ -32,15 +32,15 @@ bool OpenDatabase::Init()
auto kw = m_config.getKeywords();
auto vals = m_config.getValues();
if (conn.connect(kw, vals, 0)) {
m_catalogue->loadAll(conn, nullptr);
m_catalog->loadAll(conn, nullptr);
return true;
}
return false;
}
std::shared_ptr<PgDatabaseCatalog> OpenDatabase::catalogue()
std::shared_ptr<PgDatabaseCatalog> OpenDatabase::catalog()
{
return m_catalogue;
return m_catalog;
}
@ -48,7 +48,7 @@ TypeSelectionItemModel* OpenDatabase::typeSelectionModel()
{
if (m_typeSelectionModel == nullptr) {
m_typeSelectionModel = new TypeSelectionItemModel(nullptr);
m_typeSelectionModel->setTypeList(m_catalogue->types());
m_typeSelectionModel->setTypeList(m_catalog->types());
}
return m_typeSelectionModel;
}