diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-04-30 16:34:45 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-04-30 16:37:18 +0200 |
| commit | 8a10000222cb49eb253b41802ecf312adaf79439 (patch) | |
| tree | d3f87f54b5e8e138e65e6fcb945dd1c8ef28e469 /src/qt | |
| parent | f026ab606d7bc317a725888296921df961d26208 (diff) | |
| parent | b74dcb3b4aa29958d22135f2d6c015578069e83c (diff) | |
| download | bitcoin-8a10000222cb49eb253b41802ecf312adaf79439.tar.xz | |
Merge pull request #6022
b74dcb3 Separate CTranslationInterface from CClientUIInterface (Jorge Timón)
Diffstat (limited to 'src/qt')
| -rw-r--r-- | src/qt/bitcoin.cpp | 2 | ||||
| -rw-r--r-- | src/qt/transactiondesc.cpp | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 069601ab67..018169cfdc 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -532,7 +532,7 @@ int main(int argc, char *argv[]) // Now that QSettings are accessible, initialize translations QTranslator qtTranslatorBase, qtTranslator, translatorBase, translator; initTranslations(qtTranslatorBase, qtTranslator, translatorBase, translator); - uiInterface.Translate.connect(Translate); + translationInterface.Translate.connect(Translate); // Show help message immediately after parsing command-line options (for "-lang") and setting locale, // but before showing splash screen. diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp index 7214249435..4fffd03adf 100644 --- a/src/qt/transactiondesc.cpp +++ b/src/qt/transactiondesc.cpp @@ -14,7 +14,6 @@ #include "main.h" #include "script/script.h" #include "timedata.h" -#include "ui_interface.h" #include "util.h" #include "wallet/db.h" #include "wallet/wallet.h" |