diff options
author | Gavin Andresen <gavinandresen@gmail.com> | 2012-07-05 16:38:12 -0400 |
---|---|---|
committer | Gavin Andresen <gavinandresen@gmail.com> | 2012-07-05 16:38:12 -0400 |
commit | 50fc02d063e7799fc50da2a43421f001a28541b7 (patch) | |
tree | c9b8a53b47ce57b1a325bbd1099b0cc8fc1a1cdf /src/qt/bitcoin.cpp | |
parent | dab9fa7f919807885bd693c4fa14ed740792c294 (diff) | |
parent | ad5f29b7437fbdf6b25c4a5823b3dea0ac68b3ff (diff) | |
download | bitcoin-50fc02d063e7799fc50da2a43421f001a28541b7.tar.xz |
Merge branch 'uri' of https://github.com/TheBlueMatt/bitcoin
Diffstat (limited to 'src/qt/bitcoin.cpp')
-rw-r--r-- | src/qt/bitcoin.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index b4e751077e..803baf92ed 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -116,9 +116,6 @@ static void handleRunawayException(std::exception *e) #ifndef BITCOIN_QT_TEST int main(int argc, char *argv[]) { -#if !defined(MAC_OSX) && !defined(WIN32) -// TODO: implement qtipcserver.cpp for Mac and Windows - // Do this early as we don't want to bother initializing if we are just calling IPC for (int i = 1; i < argc; i++) { @@ -137,7 +134,6 @@ int main(int argc, char *argv[]) } } } -#endif // Internal string conversion is all UTF-8 QTextCodec::setCodecForTr(QTextCodec::codecForName("UTF-8")); @@ -262,8 +258,6 @@ int main(int argc, char *argv[]) { window.show(); } -#if !defined(MAC_OSX) && !defined(WIN32) -// TODO: implement qtipcserver.cpp for Mac and Windows // Place this here as guiref has to be defined if we dont want to lose URIs ipcInit(); @@ -282,7 +276,7 @@ int main(int argc, char *argv[]) } } } -#endif + app.exec(); window.hide(); |