diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-06-02 05:21:24 -0700 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-06-02 05:21:24 -0700 |
| commit | 50b4086a4a4fbba8241c4b8807870d7b44c109fe (patch) | |
| tree | fe299488d21bae0e041e32319c1ff8c825f0d446 /src/qt | |
| parent | 34d03f2474065c6110d10965f8e8aa30ed948db5 (diff) | |
| parent | 3260b4c09006ea5c1b00c599a14e6c706ac760f8 (diff) | |
Merge pull request #2588 from Diapolo/GetBoolArg
remove GetBoolArg() fDefault parameter defaulting to false
Diffstat (limited to 'src/qt')
| -rw-r--r-- | src/qt/bitcoin.cpp | 16 | ||||
| -rw-r--r-- | src/qt/splashscreen.cpp | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 354c5af453..b858e1c174 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -15,6 +15,9 @@ #include "ui_interface.h" #include "paymentserver.h" #include "splashscreen.h" +#ifdef Q_OS_MAC +#include "macdockiconhandler.h" +#endif #include <QMessageBox> #if QT_VERSION < 0x050000 @@ -25,10 +28,6 @@ #include <QTranslator> #include <QLibraryInfo> -#ifdef Q_OS_MAC -#include "macdockiconhandler.h" -#endif - #if defined(BITCOIN_NEED_QT_PLUGINS) && !defined(_BITCOIN_QT_PLUGINS_INCLUDED) #define _BITCOIN_QT_PLUGINS_INCLUDED #define __INSURE__ @@ -156,7 +155,7 @@ int main(int argc, char *argv[]) // as it is used to locate QSettings) QApplication::setOrganizationName("Bitcoin"); QApplication::setOrganizationDomain("bitcoin.org"); - if(GetBoolArg("-testnet")) // Separate UI settings for testnet + if (GetBoolArg("-testnet", false)) // Separate UI settings for testnet QApplication::setApplicationName("Bitcoin-Qt-testnet"); else QApplication::setApplicationName("Bitcoin-Qt"); @@ -208,13 +207,14 @@ int main(int argc, char *argv[]) #ifdef Q_OS_MAC // on mac, also change the icon now because it would look strange to have a testnet splash (green) and a std app icon (orange) - if(GetBoolArg("-testnet")) { + if(GetBoolArg("-testnet", false)) + { MacDockIconHandler::instance()->setIcon(QIcon(":icons/bitcoin_testnet")); } #endif SplashScreen splash(QPixmap(), 0); - if (GetBoolArg("-splash", true) && !GetBoolArg("-min")) + if (GetBoolArg("-splash", true) && !GetBoolArg("-min", false)) { splash.show(); splash.setAutoFillBackground(true); @@ -258,7 +258,7 @@ int main(int argc, char *argv[]) window.setCurrentWallet("~Default"); // If -min option passed, start window minimized. - if(GetBoolArg("-min")) + if(GetBoolArg("-min", false)) { window.showMinimized(); } diff --git a/src/qt/splashscreen.cpp b/src/qt/splashscreen.cpp index 95948a6cbd..e400278123 100644 --- a/src/qt/splashscreen.cpp +++ b/src/qt/splashscreen.cpp @@ -27,7 +27,7 @@ SplashScreen::SplashScreen(const QPixmap &pixmap, Qt::WindowFlags f) : // load the bitmap for writing some text over it QPixmap newPixmap; - if(GetBoolArg("-testnet")) { + if(GetBoolArg("-testnet", false)) { newPixmap = QPixmap(":/images/splash_testnet"); } else { |