Merge branch 'develop' into mixonosx

libjsqrc/natspec.js

@@ -29,10 +29,20 @@ var getContractMethods = function (address, abi) {
     return web3.eth.contract(address, abi);
 };
 
+var getMethodWithName = function(abi, name) {
+    for (var i = 0; i < abi.length; i++) {
+        if (abi[i].name === name) {
+            return abi[i];
+        }
+    }
+    console.warn('could not find method with name: ' + name);
+    return undefined;
+};
+
 /// Function called to get all contract method input variables
 /// @returns hashmap with all contract's method input variables
 var getContractInputParams = function (abi, methodName, params) {
-    var method = web3.abi.getMethodWithName(abi, methodName);
+    var method = getMethodWithName(abi, methodName);
     return method.inputs.reduce(function (acc, current, index) {
         acc[current.name] = params[index];
         return acc;

mix/AppContext.cpp

@@ -27,15 +27,16 @@
 #include <QQmlComponent>
 #include <QQmlContext>
 #include <QQmlApplicationEngine>
-#include <QQuickWindow>
+#include <QWindow>
 #include "CodeModel.h"
 #include "FileIo.h"
 #include "ClientModel.h"
 #include "CodeEditorExtensionManager.h"
 #include "Exceptions.h"
-#include "AppContext.h"
 #include "QEther.h"
+#include "QVariableDefinition.h"
 #include "HttpServer.h"
+#include "AppContext.h"
 
 using namespace dev;
 using namespace dev::eth;
@@ -82,7 +83,7 @@ void AppContext::load()
 	qmlRegisterType<CodeEditorExtensionManager>("CodeEditorExtensionManager", 1, 0, "CodeEditorExtensionManager");
 	qmlRegisterType<HttpServer>("HttpServer", 1, 0, "HttpServer");
 	m_applicationEngine->load(QUrl("qrc:/qml/main.qml"));
-	QQuickWindow *window = qobject_cast<QQuickWindow *>(m_applicationEngine->rootObjects().at(0));
+	QWindow *window = qobject_cast<QWindow *>(m_applicationEngine->rootObjects().at(0));
 	window->setIcon(QIcon(":/res/mix_256x256x32.png"));
 	appLoaded();
 }

mix/ClientModel.cpp

@@ -30,6 +30,7 @@
 #include "Exceptions.h"
 #include "QContractDefinition.h"
 #include "QVariableDeclaration.h"
+#include "QVariableDefinition.h"
 #include "ContractCallDataEncoder.h"
 #include "CodeModel.h"
 #include "ClientModel.h"

mix/ClientModel.h

@@ -26,8 +26,7 @@
 #include <atomic>
 #include <map>
 #include <QString>
-#include "MixClient.h"
-#include "QVariableDefinition.h"
+#include "MachineStates.h"
 
 namespace dev
 {
@@ -39,6 +38,8 @@ class Web3Server;
 class RpcConnector;
 class QEther;
 class QDebugData;
+class MixClient;
+class QVariableDefinition;
 
 /// Backend transaction config class
 struct TransactionSettings