diff options
| author | obscuren <geffobscura@gmail.com> | 2015-02-13 22:05:56 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-02-13 22:05:56 +0800 |
| commit | a5ea21cd85530eee6eb1bb83c37c20d009f11f74 (patch) | |
| tree | e5be5bd595139ff7dfbe6261e1e659d8e7dd6f9c /cmd/mist/qml_container.go | |
| parent | db24fb792cf0dab91bc85e79aecf6758349002a4 (diff) | |
| parent | 38faf2c51a1e4a86cda5dfa1b4f7fdae4fd7f58d (diff) | |
| download | dexon-a5ea21cd85530eee6eb1bb83c37c20d009f11f74.tar dexon-a5ea21cd85530eee6eb1bb83c37c20d009f11f74.tar.gz dexon-a5ea21cd85530eee6eb1bb83c37c20d009f11f74.tar.bz2 dexon-a5ea21cd85530eee6eb1bb83c37c20d009f11f74.tar.lz dexon-a5ea21cd85530eee6eb1bb83c37c20d009f11f74.tar.xz dexon-a5ea21cd85530eee6eb1bb83c37c20d009f11f74.tar.zst dexon-a5ea21cd85530eee6eb1bb83c37c20d009f11f74.zip | |
merge
Diffstat (limited to 'cmd/mist/qml_container.go')
| -rw-r--r-- | cmd/mist/qml_container.go | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/cmd/mist/qml_container.go b/cmd/mist/qml_container.go index 7f5d97bec..16a055bc0 100644 --- a/cmd/mist/qml_container.go +++ b/cmd/mist/qml_container.go @@ -22,14 +22,12 @@ package main import ( - "fmt" "runtime" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/ethutil" - "github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/xeth" - "gopkg.in/qml.v1" + "github.com/obscuren/qml" ) type QmlApplication struct { @@ -70,14 +68,10 @@ func (app *QmlApplication) NewWatcher(quitChan chan bool) { // Events func (app *QmlApplication) NewBlock(block *types.Block) { - pblock := &xeth.JSBlock{Number: int(block.NumberU64()), Hash: ethutil.Bytes2Hex(block.Hash())} + pblock := &xeth.Block{Number: int(block.NumberU64()), Hash: ethutil.Bytes2Hex(block.Hash())} app.win.Call("onNewBlockCb", pblock) } -func (self *QmlApplication) Messages(msgs state.Messages, id string) { - fmt.Println("IMPLEMENT QML APPLICATION MESSAGES METHOD") -} - // Getters func (app *QmlApplication) Engine() *qml.Engine { return app.engine |