jhuntley 10 years ago
parent
commit
e1e7b227df
  1. 1
      alethzero/MainWin.cpp
  2. 1
      alethzero/MainWin.h
  3. 1
      eth/main.cpp
  4. 1
      libethereum/All.h
  5. 1
      libethereum/Client.h
  6. 1
      libethereum/EthereumHost.h
  7. 1
      libp2p/Host.cpp
  8. 1
      libp2p/Host.h
  9. 1
      libp2p/Network.cpp
  10. 1
      libp2p/Session.h
  11. 1
      libwebthree/WebThree.cpp
  12. 1
      libwebthree/WebThree.h
  13. 1
      libwhisper/Common.h
  14. 1
      libwhisper/Interface.h
  15. 1
      libwhisper/Message.h
  16. 1
      libwhisper/WhisperHost.h
  17. 1
      libwhisper/WhisperPeer.h
  18. 1
      mix/AppContext.cpp
  19. 1
      mix/AppContext.h
  20. 1
      mix/CodeEditorExtensionManager.cpp
  21. 3
      mix/Extension.cpp
  22. 1
      mix/Extension.h
  23. 1
      mix/QContractDefinition.cpp
  24. 1
      neth/main.cpp
  25. 1
      test/TestHelper.cpp
  26. 2
      test/fork.cpp
  27. 2
      test/txTest.cpp
  28. 1
      test/whisperTopic.cpp
  29. 18
      third/MainWin.cpp

1
alethzero/MainWin.cpp

@ -20,6 +20,7 @@
*/ */
#include <fstream> #include <fstream>
#include <boost/asio.hpp>
#include <QtNetwork/QNetworkReply> #include <QtNetwork/QNetworkReply>
#include <QtWidgets/QFileDialog> #include <QtWidgets/QFileDialog>
#include <QtWidgets/QMessageBox> #include <QtWidgets/QMessageBox>

1
alethzero/MainWin.h

@ -26,6 +26,7 @@
#endif #endif
#include <map> #include <map>
#include <boost/asio.hpp>
#include <QtNetwork/QNetworkAccessManager> #include <QtNetwork/QNetworkAccessManager>
#include <QtCore/QAbstractListModel> #include <QtCore/QAbstractListModel>
#include <QtCore/QMutex> #include <QtCore/QMutex>

1
eth/main.cpp

@ -25,6 +25,7 @@
#include <fstream> #include <fstream>
#include <iostream> #include <iostream>
#include <signal.h> #include <signal.h>
#include <boost/asio.hpp>
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
#include <boost/algorithm/string/trim_all.hpp> #include <boost/algorithm/string/trim_all.hpp>
#include <libdevcrypto/FileSystem.h> #include <libdevcrypto/FileSystem.h>

1
libethereum/All.h

@ -1,5 +1,6 @@
#pragma once #pragma once
#include <boost/asio.hpp>
#include "Account.h" #include "Account.h"
#include "CanonBlockChain.h" #include "CanonBlockChain.h"
#include "Client.h" #include "Client.h"

1
libethereum/Client.h

@ -27,6 +27,7 @@
#include <atomic> #include <atomic>
#include <string> #include <string>
#include <array> #include <array>
#include <boost/asio.hpp>
#include <boost/utility.hpp> #include <boost/utility.hpp>
#include <libdevcore/Common.h> #include <libdevcore/Common.h>
#include <libdevcore/CommonIO.h> #include <libdevcore/CommonIO.h>

1
libethereum/EthereumHost.h

@ -28,6 +28,7 @@
#include <memory> #include <memory>
#include <utility> #include <utility>
#include <thread> #include <thread>
#include <boost/asio.hpp>
#include <libdevcore/Guards.h> #include <libdevcore/Guards.h>
#include <libdevcore/Worker.h> #include <libdevcore/Worker.h>
#include <libdevcore/RangeMask.h> #include <libdevcore/RangeMask.h>

1
libp2p/Host.cpp

@ -24,6 +24,7 @@
#include <chrono> #include <chrono>
#include <thread> #include <thread>
#include <mutex> #include <mutex>
#include <boost/asio.hpp>
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
#include <libdevcore/Common.h> #include <libdevcore/Common.h>
#include <libdevcore/CommonIO.h> #include <libdevcore/CommonIO.h>

1
libp2p/Host.h

@ -30,6 +30,7 @@
#include <utility> #include <utility>
#include <thread> #include <thread>
#include <chrono> #include <chrono>
#include <boost/asio.hpp>
#include <libdevcore/Guards.h> #include <libdevcore/Guards.h>
#include <libdevcore/Worker.h> #include <libdevcore/Worker.h>
#include <libdevcore/RangeMask.h> #include <libdevcore/RangeMask.h>

1
libp2p/Network.cpp

@ -26,6 +26,7 @@
#include <ifaddrs.h> #include <ifaddrs.h>
#endif #endif
#include <boost/asio.hpp>
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
#include <libdevcore/Common.h> #include <libdevcore/Common.h>
#include <libdevcore/CommonIO.h> #include <libdevcore/CommonIO.h>

1
libp2p/Session.h

@ -27,6 +27,7 @@
#include <set> #include <set>
#include <memory> #include <memory>
#include <utility> #include <utility>
#include <boost/asio.hpp>
#include <libdevcore/Common.h> #include <libdevcore/Common.h>
#include <libdevcore/RLP.h> #include <libdevcore/RLP.h>
#include <libdevcore/RangeMask.h> #include <libdevcore/RangeMask.h>

1
libwebthree/WebThree.cpp

@ -23,6 +23,7 @@
#include <chrono> #include <chrono>
#include <thread> #include <thread>
#include <boost/asio.hpp>
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include <libdevcore/Log.h> #include <libdevcore/Log.h>
#include <libp2p/Host.h> #include <libp2p/Host.h>

1
libwebthree/WebThree.h

@ -25,6 +25,7 @@
#include <mutex> #include <mutex>
#include <list> #include <list>
#include <atomic> #include <atomic>
#include <boost/asio.hpp>
#include <boost/utility.hpp> #include <boost/utility.hpp>
#include <libdevcore/Common.h> #include <libdevcore/Common.h>
#include <libdevcore/CommonIO.h> #include <libdevcore/CommonIO.h>

1
libwhisper/Common.h

@ -23,6 +23,7 @@
#include <string> #include <string>
#include <chrono> #include <chrono>
#include <boost/asio.hpp>
#include <libdevcore/Common.h> #include <libdevcore/Common.h>
#include <libdevcore/Log.h> #include <libdevcore/Log.h>
#include <libdevcore/RLP.h> #include <libdevcore/RLP.h>

1
libwhisper/Interface.h

@ -26,6 +26,7 @@
#include <set> #include <set>
#include <memory> #include <memory>
#include <utility> #include <utility>
#include <boost/asio.hpp>
#include <libdevcore/RLP.h> #include <libdevcore/RLP.h>
#include <libdevcore/Guards.h> #include <libdevcore/Guards.h>
#include <libdevcrypto/SHA3.h> #include <libdevcrypto/SHA3.h>

1
libwhisper/Message.h

@ -26,6 +26,7 @@
#include <set> #include <set>
#include <memory> #include <memory>
#include <utility> #include <utility>
#include <boost/asio.hpp>
#include <libdevcore/RLP.h> #include <libdevcore/RLP.h>
#include <libdevcore/Guards.h> #include <libdevcore/Guards.h>
#include <libdevcrypto/Common.h> #include <libdevcrypto/Common.h>

1
libwhisper/WhisperHost.h

@ -26,6 +26,7 @@
#include <set> #include <set>
#include <memory> #include <memory>
#include <utility> #include <utility>
#include <boost/asio.hpp>
#include <libdevcore/RLP.h> #include <libdevcore/RLP.h>
#include <libdevcore/Worker.h> #include <libdevcore/Worker.h>
#include <libdevcore/Guards.h> #include <libdevcore/Guards.h>

1
libwhisper/WhisperPeer.h

@ -26,6 +26,7 @@
#include <set> #include <set>
#include <memory> #include <memory>
#include <utility> #include <utility>
#include <boost/asio.hpp>
#include <libdevcore/RLP.h> #include <libdevcore/RLP.h>
#include <libdevcore/Guards.h> #include <libdevcore/Guards.h>
#include <libdevcrypto/SHA3.h> #include <libdevcrypto/SHA3.h>

1
mix/AppContext.cpp

@ -22,6 +22,7 @@
* - KeyEventManager * - KeyEventManager
*/ */
#include <boost/asio.hpp>
#include <QMessageBox> #include <QMessageBox>
#include <QClipboard> #include <QClipboard>
#include <QQmlComponent> #include <QQmlComponent>

1
mix/AppContext.h

@ -27,6 +27,7 @@
#pragma once #pragma once
#include <boost/asio.hpp>
#include <memory> #include <memory>
#include <QUrl> #include <QUrl>
#include <QObject> #include <QObject>

1
mix/CodeEditorExtensionManager.cpp

@ -20,6 +20,7 @@
* Ethereum IDE client. * Ethereum IDE client.
*/ */
#include <boost/asio.hpp>
#include <QQuickItem> #include <QQuickItem>
#include <QGraphicsObject> #include <QGraphicsObject>
#include <QQmlEngine> #include <QQmlEngine>

3
mix/Extension.cpp

@ -17,13 +17,14 @@
* Ethereum IDE client. * Ethereum IDE client.
*/ */
#include "AppContext.h"
#include <QMessageBox> #include <QMessageBox>
#include <QDebug> #include <QDebug>
#include <QQmlApplicationEngine> #include <QQmlApplicationEngine>
#include <libevm/VM.h> #include <libevm/VM.h>
#include <libwebthree/WebThree.h> #include <libwebthree/WebThree.h>
#include "Extension.h" #include "Extension.h"
#include "AppContext.h"
using namespace dev; using namespace dev;
using namespace dev::mix; using namespace dev::mix;

1
mix/Extension.h

@ -19,6 +19,7 @@
#pragma once #pragma once
#include <boost/asio.hpp>
#include <QApplication> #include <QApplication>
#include <QQmlComponent> #include <QQmlComponent>

1
mix/QContractDefinition.cpp

@ -20,6 +20,7 @@
*/ */
#include <QObject> #include <QObject>
#include <boost/asio.hpp>
#include <libsolidity/CompilerStack.h> #include <libsolidity/CompilerStack.h>
#include <libsolidity/AST.h> #include <libsolidity/AST.h>
#include <libsolidity/Scanner.h> #include <libsolidity/Scanner.h>

1
neth/main.cpp

@ -25,6 +25,7 @@
#include <fstream> #include <fstream>
#include <iostream> #include <iostream>
#include <signal.h> #include <signal.h>
#include <boost/asio.hpp>
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
#include <boost/algorithm/string/trim_all.hpp> #include <boost/algorithm/string/trim_all.hpp>
#include <libdevcrypto/FileSystem.h> #include <libdevcrypto/FileSystem.h>

1
test/TestHelper.cpp

@ -23,6 +23,7 @@
#include <thread> #include <thread>
#include <chrono> #include <chrono>
#include <boost/asio.hpp>
#include <boost/filesystem/path.hpp> #include <boost/filesystem/path.hpp>
#include <libethereum/Client.h> #include <libethereum/Client.h>
#include <liblll/Compiler.h> #include <liblll/Compiler.h>

2
test/fork.cpp

@ -19,7 +19,7 @@
* @date 2014 * @date 2014
* Tests for different forking behavior * Tests for different forking behavior
*/ */
#include <boost/asio.hpp>
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/filesystem/operations.hpp> #include <boost/filesystem/operations.hpp>
#include <libethereum/Client.h> #include <libethereum/Client.h>

2
test/txTest.cpp

@ -19,7 +19,7 @@
* @date 2014 * @date 2014
* Simple peer transaction send test. * Simple peer transaction send test.
*/ */
#include <boost/asio.hpp>
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/filesystem/operations.hpp> #include <boost/filesystem/operations.hpp>
#include <libethereum/Client.h> #include <libethereum/Client.h>

1
test/whisperTopic.cpp

@ -19,6 +19,7 @@
* @date 2014 * @date 2014
*/ */
#include <functional> #include <functional>
#include <boost/asio.hpp>
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <libp2p/Host.h> #include <libp2p/Host.h>
#include <libwhisper/WhisperPeer.h> #include <libwhisper/WhisperPeer.h>

18
third/MainWin.cpp

@ -20,6 +20,11 @@
*/ */
#include <fstream> #include <fstream>
// Make sure boost/asio.hpp is included before windows.h.
#include <boost/asio.hpp>
#include <boost/algorithm/string.hpp>
#include <QtNetwork/QNetworkReply> #include <QtNetwork/QNetworkReply>
#include <QtWidgets/QFileDialog> #include <QtWidgets/QFileDialog>
#include <QtWidgets/QMessageBox> #include <QtWidgets/QMessageBox>
@ -27,7 +32,6 @@
#include <QtWebKitWidgets/QWebFrame> #include <QtWebKitWidgets/QWebFrame>
#include <QtGui/QClipboard> #include <QtGui/QClipboard>
#include <QtCore/QtCore> #include <QtCore/QtCore>
#include <boost/algorithm/string.hpp>
#include <libserpent/funcs.h> #include <libserpent/funcs.h>
#include <libserpent/util.h> #include <libserpent/util.h>
#include <libdevcrypto/FileSystem.h> #include <libdevcrypto/FileSystem.h>
@ -112,7 +116,7 @@ Main::Main(QWidget *parent) :
statusBar()->addPermanentWidget(ui->peerCount); statusBar()->addPermanentWidget(ui->peerCount);
statusBar()->addPermanentWidget(ui->mineStatus); statusBar()->addPermanentWidget(ui->mineStatus);
statusBar()->addPermanentWidget(ui->blockCount); statusBar()->addPermanentWidget(ui->blockCount);
connect(ui->ourAccounts->model(), SIGNAL(rowsMoved(const QModelIndex &, int, int, const QModelIndex &, int)), SLOT(ourAccountsRowsMoved())); connect(ui->ourAccounts->model(), SIGNAL(rowsMoved(const QModelIndex &, int, int, const QModelIndex &, int)), SLOT(ourAccountsRowsMoved()));
bytesConstRef networkConfig((byte*)m_networkConfig.data(), m_networkConfig.size()); bytesConstRef networkConfig((byte*)m_networkConfig.data(), m_networkConfig.size());
@ -124,7 +128,7 @@ Main::Main(QWidget *parent) :
// m_server = unique_ptr<WebThreeStubServer>(new WebThreeStubServer(m_httpConnector, *web3(), keysAsVector(m_myKeys))); // m_server = unique_ptr<WebThreeStubServer>(new WebThreeStubServer(m_httpConnector, *web3(), keysAsVector(m_myKeys)));
m_server->setIdentities(keysAsVector(owned())); m_server->setIdentities(keysAsVector(owned()));
m_server->StartListening(); m_server->StartListening();
connect(ui->webView, &QWebView::loadStarted, [this]() connect(ui->webView, &QWebView::loadStarted, [this]()
{ {
QWebFrame* f = ui->webView->page()->mainFrame(); QWebFrame* f = ui->webView->page()->mainFrame();
@ -138,16 +142,16 @@ Main::Main(QWidget *parent) :
f->evaluateJavaScript(contentsOfQResource(":/js/setup.js")); f->evaluateJavaScript(contentsOfQResource(":/js/setup.js"));
}); });
}); });
connect(ui->webView, &QWebView::loadFinished, [=]() connect(ui->webView, &QWebView::loadFinished, [=]()
{ {
}); });
connect(ui->webView, &QWebView::titleChanged, [=]() connect(ui->webView, &QWebView::titleChanged, [=]()
{ {
ui->tabWidget->setTabText(0, ui->webView->title()); ui->tabWidget->setTabText(0, ui->webView->title());
}); });
readSettings(); readSettings();
installWatches(); installWatches();
@ -521,7 +525,7 @@ void Main::timerEvent(QTimerEvent*)
// 7/18, Alex: aggregating timers, prelude to better threading? // 7/18, Alex: aggregating timers, prelude to better threading?
// Runs much faster on slower dual-core processors // Runs much faster on slower dual-core processors
static int interval = 100; static int interval = 100;
// refresh mining every 200ms // refresh mining every 200ms
if (interval / 100 % 2 == 0) if (interval / 100 % 2 == 0)
refreshMining(); refreshMining();

Loading…
Cancel
Save