Browse Source

[Qt] make PaymentServer::ipcParseCommandLine void

- the function only returned true, so make it void
- add a comment about payment request network detection
0.10
Philip Kaufmann 10 years ago
parent
commit
b82695b89f
  1. 4
      src/qt/bitcoin.cpp
  2. 7
      src/qt/paymentserver.cpp
  3. 2
      src/qt/paymentserver.h

4
src/qt/bitcoin.cpp

@ -570,9 +570,9 @@ int main(int argc, char *argv[]) @@ -570,9 +570,9 @@ int main(int argc, char *argv[])
}
#ifdef ENABLE_WALLET
// Parse URIs on command line -- this can affect Params()
if (!PaymentServer::ipcParseCommandLine(argc, argv))
exit(0);
PaymentServer::ipcParseCommandLine(argc, argv);
#endif
QScopedPointer<const NetworkStyle> networkStyle(NetworkStyle::instantiate(QString::fromStdString(Params().NetworkIDString())));
assert(!networkStyle.isNull());
// Allow for separate UI settings for testnets

7
src/qt/paymentserver.cpp

@ -184,7 +184,7 @@ void PaymentServer::LoadRootCAs(X509_STORE* _store) @@ -184,7 +184,7 @@ void PaymentServer::LoadRootCAs(X509_STORE* _store)
// Warning: ipcSendCommandLine() is called early in init,
// so don't use "emit message()", but "QMessageBox::"!
//
bool PaymentServer::ipcParseCommandLine(int argc, char* argv[])
void PaymentServer::ipcParseCommandLine(int argc, char* argv[])
{
for (int i = 1; i < argc; i++)
{
@ -192,6 +192,10 @@ bool PaymentServer::ipcParseCommandLine(int argc, char* argv[]) @@ -192,6 +192,10 @@ bool PaymentServer::ipcParseCommandLine(int argc, char* argv[])
if (arg.startsWith("-"))
continue;
// If the bitcoin: URI contains a payment request, we are not able to detect the
// network as that would require fetching and parsing the payment request.
// That means clicking such an URI which contains a testnet payment request
// will start a mainnet instance and throw a "wrong network" error.
if (arg.startsWith(BITCOIN_IPC_PREFIX, Qt::CaseInsensitive)) // bitcoin: URI
{
savedPaymentRequests.append(arg);
@ -235,7 +239,6 @@ bool PaymentServer::ipcParseCommandLine(int argc, char* argv[]) @@ -235,7 +239,6 @@ bool PaymentServer::ipcParseCommandLine(int argc, char* argv[])
qWarning() << "PaymentServer::ipcSendCommandLine : Payment request file does not exist: " << arg;
}
}
return true;
}
//

2
src/qt/paymentserver.h

@ -59,7 +59,7 @@ class PaymentServer : public QObject @@ -59,7 +59,7 @@ class PaymentServer : public QObject
public:
// Parse URIs on command line
// Returns false on error
static bool ipcParseCommandLine(int argc, char *argv[]);
static void ipcParseCommandLine(int argc, char *argv[]);
// Returns true if there were URIs on the command line
// which were successfully sent to an already-running

Loading…
Cancel
Save