Browse Source

style

cl-refactor
arkpar 10 years ago
parent
commit
0698567085
  1. 13
      libsolidity/CompilerStack.h
  2. 2
      mix/ClientModel.cpp
  3. 1
      mix/DebuggingStateWrapper.h
  4. 1
      mix/qml/WebCodeEditor.qml

13
libsolidity/CompilerStack.h

@ -31,14 +31,17 @@
#include <libdevcore/Common.h>
#include <libdevcore/FixedHash.h>
namespace dev {
namespace dev
{
namespace eth {
class AssemblyItem;
using AssemblyItems = std::vector<AssemblyItem>;
namespace eth
{
class AssemblyItem;
using AssemblyItems = std::vector<AssemblyItem>;
}
namespace solidity {
namespace solidity
{
// forward declarations
class Scanner;

2
mix/ClientModel.cpp

@ -316,9 +316,7 @@ void ClientModel::showDebuggerForTransaction(ExecutionResult const& _t)
eth::AssemblyItems assemblyItems = !_t.isConstructor() ? compilerRes.assemblyItems() : compilerRes.constructorAssemblyItems();
QVariantList locations;
for (eth::AssemblyItem const& item: assemblyItems)
{
locations.push_back(QVariant::fromValue(new QSourceLocation(debugData, item.getLocation().start, item.getLocation().end)));
}
codes.back()->setLocations(compilerRes.documentId(), std::move(locations));
}
}

1
mix/DebuggingStateWrapper.h

@ -143,7 +143,6 @@ class QMachineState: public QObject
Q_PROPERTY(QVariantList levels READ levels CONSTANT)
Q_PROPERTY(unsigned codeIndex READ codeIndex CONSTANT)
Q_PROPERTY(unsigned dataIndex READ dataIndex CONSTANT)
//Q_PROPERTY(unsigned locationIndex READ locationIndex CONSTANT)
public:
QMachineState(QObject* _owner, MachineState const& _state, QCode* _code, QCallData* _callData):

1
mix/qml/WebCodeEditor.qml

@ -2,7 +2,6 @@ import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Layouts 1.0
import QtQuick.Controls.Styles 1.1
//import CodeEditorExtensionManager 1.0
import QtWebEngine 1.0
import QtWebEngine.experimental 1.0

Loading…
Cancel
Save