From 91795c25b1fa334fe81e5459d597da51a7838de0 Mon Sep 17 00:00:00 2001 From: UdjinM6 Date: Thu, 11 Dec 2014 14:07:03 +0100 Subject: [PATCH] fix broken build (UdjinM6) --- src/darkcoind.cpp | 2 +- src/qt/Makefile.am | 2 +- src/qt/darkcoin.cpp | 2 +- src/qt/locale/bitcoin_en.ts | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/darkcoind.cpp b/src/darkcoind.cpp index 0932362e0..84619f550 100644 --- a/src/darkcoind.cpp +++ b/src/darkcoind.cpp @@ -64,7 +64,7 @@ bool AppInit(int argc, char* argv[]) // // Parameters // - // If Qt is used, parameters/darkcoin.conf are parsed in qt/bitcoin.cpp's main() + // If Qt is used, parameters/darkcoin.conf are parsed in qt/darkcoin.cpp's main() ParseParameters(argc, argv); if (!boost::filesystem::is_directory(GetDataDir(false))) { diff --git a/src/qt/Makefile.am b/src/qt/Makefile.am index 24d7ef707..de9eea0eb 100644 --- a/src/qt/Makefile.am +++ b/src/qt/Makefile.am @@ -153,7 +153,7 @@ BITCOIN_MM = \ macnotificationhandler.mm QT_MOC = \ - bitcoin.moc \ + darkcoin.moc \ intro.moc \ overviewpage.moc \ rpcconsole.moc diff --git a/src/qt/darkcoin.cpp b/src/qt/darkcoin.cpp index d179dd565..d7f2881ff 100644 --- a/src/qt/darkcoin.cpp +++ b/src/qt/darkcoin.cpp @@ -221,7 +221,7 @@ private: void startThread(); }; -#include "bitcoin.moc" +#include "darkcoin.moc" BitcoinCore::BitcoinCore(): QObject() diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts index dca26cf4d..47c9f39f3 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -724,7 +724,7 @@ Address: %4 Wallet is <b>encrypted</b> and currently <b>locked</b> - + A fatal error occurred. Bitcoin can no longer continue safely and will quit. A fatal error occurred. Bitcoin can no longer continue safely and will quit. @@ -1706,7 +1706,7 @@ Address: %4 QObject - + Bitcoin