Browse Source

Merge pull request #783 from debris/libqwebthree

renamed qethereum -> qwebthree, fixed #414
cl-refactor
Gav Wood 10 years ago
parent
commit
4bcf36e13d
  1. 2
      CMakeLists.txt
  2. 2
      alethzero/CMakeLists.txt
  3. 2
      alethzero/MainWin.h
  4. 2
      libqwebthree/CMakeLists.txt
  5. 4
      libqwebthree/QWebThree.cpp
  6. 2
      libqwebthree/QWebThree.h
  7. 2
      mix/CMakeLists.txt
  8. 2
      third/CMakeLists.txt
  9. 2
      third/MainWin.h

2
CMakeLists.txt

@ -157,7 +157,7 @@ endif ()
if (NOT HEADLESS) if (NOT HEADLESS)
add_subdirectory(libjsqrc) add_subdirectory(libjsqrc)
add_subdirectory(libqethereum) add_subdirectory(libqwebthree)
add_subdirectory(alethzero) add_subdirectory(alethzero)
add_subdirectory(third) add_subdirectory(third)
add_subdirectory(mix) add_subdirectory(mix)

2
alethzero/CMakeLists.txt

@ -34,7 +34,7 @@ add_dependencies(${EXECUTABLE} BuildInfo.h)
target_link_libraries(${EXECUTABLE} Qt5::Core) target_link_libraries(${EXECUTABLE} Qt5::Core)
target_link_libraries(${EXECUTABLE} webthree) target_link_libraries(${EXECUTABLE} webthree)
target_link_libraries(${EXECUTABLE} qethereum) target_link_libraries(${EXECUTABLE} qwebthree)
target_link_libraries(${EXECUTABLE} ethereum) target_link_libraries(${EXECUTABLE} ethereum)
target_link_libraries(${EXECUTABLE} evm) target_link_libraries(${EXECUTABLE} evm)
target_link_libraries(${EXECUTABLE} ethcore) target_link_libraries(${EXECUTABLE} ethcore)

2
alethzero/MainWin.h

@ -34,7 +34,7 @@
#include <libethcore/CommonEth.h> #include <libethcore/CommonEth.h>
#include <libethereum/State.h> #include <libethereum/State.h>
#include <libethereum/Executive.h> #include <libethereum/Executive.h>
#include <libqethereum/QEthereum.h> #include <libqwebthree/QWebThree.h>
#include <libwebthree/WebThree.h> #include <libwebthree/WebThree.h>
namespace Ui { namespace Ui {

2
libqethereum/CMakeLists.txt → libqwebthree/CMakeLists.txt

@ -15,7 +15,7 @@ aux_source_directory(. SRC_LIST)
include_directories(${JSON_RPC_CPP_INCLUDE_DIRS}) include_directories(${JSON_RPC_CPP_INCLUDE_DIRS})
include_directories(..) include_directories(..)
set(EXECUTABLE qethereum) set(EXECUTABLE qwebthree)
file(GLOB HEADERS "*.h") file(GLOB HEADERS "*.h")

4
libqethereum/QEthereum.cpp → libqwebthree/QWebThree.cpp

@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with cpp-ethereum. If not, see <http://www.gnu.org/licenses/>. along with cpp-ethereum. If not, see <http://www.gnu.org/licenses/>.
*/ */
/** @file QEthereum.cpp /** @file QWebThree.cpp
* @authors: * @authors:
* Gav Wood <i@gavwood.com> * Gav Wood <i@gavwood.com>
* Marek Kotewicz <marek@ethdev.com> * Marek Kotewicz <marek@ethdev.com>
@ -22,7 +22,7 @@
*/ */
#include <QtCore/QtCore> #include <QtCore/QtCore>
#include "QEthereum.h" #include "QWebThree.h"
using namespace std; using namespace std;

2
libqethereum/QEthereum.h → libqwebthree/QWebThree.h

@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with cpp-ethereum. If not, see <http://www.gnu.org/licenses/>. along with cpp-ethereum. If not, see <http://www.gnu.org/licenses/>.
*/ */
/** @file QEthereum.h /** @file QWebThree.h
* @authors: * @authors:
* Gav Wood <i@gavwood.com> * Gav Wood <i@gavwood.com>
* Marek Kotewicz <marek@ethdev.com> * Marek Kotewicz <marek@ethdev.com>

2
mix/CMakeLists.txt

@ -27,7 +27,7 @@ eth_add_executable(${EXECUTABLE}
target_link_libraries(${EXECUTABLE} Qt5::Core) target_link_libraries(${EXECUTABLE} Qt5::Core)
target_link_libraries(${EXECUTABLE} Qt5::Gui) target_link_libraries(${EXECUTABLE} Qt5::Gui)
target_link_libraries(${EXECUTABLE} webthree) target_link_libraries(${EXECUTABLE} webthree)
target_link_libraries(${EXECUTABLE} qethereum) target_link_libraries(${EXECUTABLE} qwebthree)
target_link_libraries(${EXECUTABLE} ethereum) target_link_libraries(${EXECUTABLE} ethereum)
target_link_libraries(${EXECUTABLE} evm) target_link_libraries(${EXECUTABLE} evm)
target_link_libraries(${EXECUTABLE} ethcore) target_link_libraries(${EXECUTABLE} ethcore)

2
third/CMakeLists.txt

@ -33,7 +33,7 @@ add_dependencies(${EXECUTABLE} BuildInfo.h)
target_link_libraries(${EXECUTABLE} Qt5::Core) target_link_libraries(${EXECUTABLE} Qt5::Core)
target_link_libraries(${EXECUTABLE} webthree) target_link_libraries(${EXECUTABLE} webthree)
target_link_libraries(${EXECUTABLE} qethereum) target_link_libraries(${EXECUTABLE} qwebthree)
target_link_libraries(${EXECUTABLE} ethereum) target_link_libraries(${EXECUTABLE} ethereum)
target_link_libraries(${EXECUTABLE} evm) target_link_libraries(${EXECUTABLE} evm)
target_link_libraries(${EXECUTABLE} ethcore) target_link_libraries(${EXECUTABLE} ethcore)

2
third/MainWin.h

@ -30,7 +30,7 @@
#include <libdevcore/RLP.h> #include <libdevcore/RLP.h>
#include <libethcore/CommonEth.h> #include <libethcore/CommonEth.h>
#include <libethereum/State.h> #include <libethereum/State.h>
#include <libqethereum/QEthereum.h> #include <libqwebthree/QWebThree.h>
namespace Ui { namespace Ui {
class Main; class Main;

Loading…
Cancel
Save