Browse Source

small changes

cl-refactor
yann300 10 years ago
parent
commit
bcc7ba2aad
  1. 7
      mix/ClientModel.cpp
  2. 2
      mix/CodeModel.cpp
  3. 2
      mix/CodeModel.h

7
mix/ClientModel.cpp

@ -387,14 +387,11 @@ void ClientModel::executeSequence(vector<TransactionSettings> const& _sequence,
std::pair<QString, int> ClientModel::resolvePair(QString const& _contractId)
{
std::pair<QString, int> ret;
ret.first = _contractId;
ret.second = 0;
std::pair<QString, int> ret = std::make_pair(_contractId, 0);
if (_contractId.startsWith("<") && _contractId.endsWith(">"))
{
QStringList values = ret.first.remove("<").remove(">").split(" - ");
ret.first = values[0];
ret.second = values[1].toUInt();
ret = std::make_pair(values[0], values[1].toUInt());
}
return ret;
}

2
mix/CodeModel.cpp

@ -360,7 +360,7 @@ void CodeModel::gasEstimation(solidity::CompilerStack const& _cs)
{
if (m_gasCostsMaps)
m_gasCostsMaps->deleteLater();
m_gasCostsMaps = new GasMapWrapper();
m_gasCostsMaps = new GasMapWrapper;
for (std::string n: _cs.getContractNames())
{
ContractDefinition const& contractDefinition = _cs.getContractDefinition(n);

2
mix/CodeModel.h

@ -137,7 +137,7 @@ class GasMapWrapper: public QObject
Q_PROPERTY(GasCostsMaps gasMaps MEMBER m_gasMaps CONSTANT)
public:
GasMapWrapper(QObject* _parent = 0): QObject(_parent){}
GasMapWrapper(QObject* _parent = nullptr): QObject(_parent){}
void push(QString _source, int _start, int _end, QString _value, bool _isInfinite);
bool contains(QString _key);
void insert(QString _source, QVariantList _variantList);

Loading…
Cancel
Save