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

Collection of minor code improvements.

Browse source 
Program should still behave exactly the same.
This commit is contained in:
eelke 2018-10-21 13:46:58 +02:00
parent 38ae5f50e4
commit d4d8316917
6 changed files with 12 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
core/CsvWriter.cpp
View file

@ -1,7 +1,6 @@
#include "CsvWriter.h" #include "CsvWriter.h"
CsvWriter::CsvWriter() CsvWriter::CsvWriter() = default;
{}
CsvWriter::CsvWriter(QTextStream *output) CsvWriter::CsvWriter(QTextStream *output)
: m_output(output) : m_output(output)

8
core/ExplainTreeModelItem.cpp
View file

@ -71,7 +71,7 @@ ExplainRoot::SPtr ExplainRoot::createFromJson(Json::Value &json)
auto res = std::make_shared<ExplainRoot>(); auto res = std::make_shared<ExplainRoot>();
// Explain always seems to be an array with one element // Explain always seems to be an array with one element
if (json.isArray()) { if (json.isArray()) {
if (json.size() > 0) { if (!json.empty()) {
Json::Value &explain = json[0]; Json::Value &explain = json[0];
Json::Value &plan = explain["Plan"]; Json::Value &plan = explain["Plan"];
@ -89,7 +89,7 @@ ExplainTreeModelItem::ExplainTreeModelItem() = default;
ExplainTreeModelItem::~ExplainTreeModelItem() = default; ExplainTreeModelItem::~ExplainTreeModelItem() = default;
void ExplainTreeModelItem::appendChild(ItemPtr child) void ExplainTreeModelItem::appendChild(const ItemPtr &child)
{ {
child->setParent(shared_from_this()); child->setParent(shared_from_this());
m_childItems.push_back(child); m_childItems.push_back(child);
@ -132,7 +132,7 @@ int ExplainTreeModelItem::row() const
return idx; return idx;
} }
void ExplainTreeModelItem::setParent(ItemPtr parent) void ExplainTreeModelItem::setParent(const ItemPtr &parent)
{ {
m_parentItem = parent; m_parentItem = parent;
} }
@ -306,7 +306,7 @@ ExplainTreeModelItemPtr ExplainTreeModelItem::parent()
float ExplainTreeModelItem::exclusiveTime() const float ExplainTreeModelItem::exclusiveTime() const
{ {
float tt = inclusiveTime(); float tt = inclusiveTime();
for (auto c : m_childItems) { for (auto&& c : m_childItems) {
tt -= c->inclusiveTime(); tt -= c->inclusiveTime();
} }
return tt; return tt;

6
core/ExplainTreeModelItem.h
View file

@ -56,14 +56,14 @@ public:
ExplainTreeModelItem(const ExplainTreeModelItem &rhs) = delete; ExplainTreeModelItem(const ExplainTreeModelItem &rhs) = delete;
ExplainTreeModelItem &operator=(const ExplainTreeModelItem &rhs) = delete; ExplainTreeModelItem &operator=(const ExplainTreeModelItem &rhs) = delete;
void appendChild(ItemPtr child); void appendChild(const ItemPtr &child);
ExplainTreeModelItemPtr child(int row); ExplainTreeModelItemPtr child(int row);
int childCount() const; int childCount() const;
// int columnCount() const; // int columnCount() const;
// QVariant data(int column) const; // QVariant data(int column) const;
int row() const; int row() const;
void setParent(ItemPtr parent); void setParent(const ItemPtr &parent);
ItemPtr parent(); ItemPtr parent();
@ -112,7 +112,7 @@ public:
std::weak_ptr<ExplainTreeModelItem> m_parentItem; std::weak_ptr<ExplainTreeModelItem> m_parentItem;
QString nodeType; QString nodeType;
bool parallelAware; // 9.6 bool parallelAware = false; // 9.6
QString strategy; QString strategy;
QString joinType; QString joinType;
float startupCost = 0.f; float startupCost = 0.f;

5
core/SqlAstNode.cpp
View file

@ -2,7 +2,4 @@
using namespace SqlAst; using namespace SqlAst;
Node::Node() Node::Node() = default;
{
}

3
pglab/IconColumnDelegate.cpp
View file

@ -42,8 +42,7 @@ QSize IconColumnDelegate::sizeHint(const QStyleOptionViewItem &,
void IconColumnDelegate::clearCache() void IconColumnDelegate::clearCache()
{ {
for (auto &e : m_Icons) for (auto &e : m_Icons)
delete e. delete e.second;
second;
m_Icons.clear(); m_Icons.clear();
} }

3
pglab/PgLabItemDelegate.cpp
View file

@ -3,6 +3,7 @@
#include "Pgsql_oids.h" #include "Pgsql_oids.h"
#include "ResultTableModelUtil.h" #include "ResultTableModelUtil.h"
#include "CustomDataRole.h"
PgLabItemDelegate::PgLabItemDelegate(QObject *parent) PgLabItemDelegate::PgLabItemDelegate(QObject *parent)
: QStyledItemDelegate(parent) : QStyledItemDelegate(parent)
@ -81,7 +82,7 @@ void PgLabItemDelegate::initStyleOption(QStyleOptionViewItem *option,
// } // }
Oid oid = InvalidOid; Oid oid = InvalidOid;
value = index.data(Qt::UserRole); // get OID value = index.data(CustomDataTypeRole); // get OID
if (value.isValid()) if (value.isValid())
oid = value.toUInt(); //getType(index.column()); oid = value.toUInt(); //getType(index.column());