Skip to content

Commit 7b04709

Browse files
committed
qt: Changes for built-in PCP+NAT-PMP
Change option help, and remove conditionals.
1 parent 52f8ef6 commit 7b04709

File tree

3 files changed

+2
-9
lines changed

3 files changed

+2
-9
lines changed

src/qt/forms/optionsdialog.ui

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -328,10 +328,10 @@
328328
<item>
329329
<widget class="QCheckBox" name="mapPortNatpmp">
330330
<property name="toolTip">
331-
<string>Automatically open the Bitcoin client port on the router. This only works when your router supports NAT-PMP and it is enabled. The external port could be random.</string>
331+
<string>Automatically open the Bitcoin client port on the router. This only works when your router supports PCP or NAT-PMP and it is enabled. The external port could be random.</string>
332332
</property>
333333
<property name="text">
334-
<string>Map port using NA&amp;T-PMP</string>
334+
<string>Map port using PCP or NA&amp;T-PMP</string>
335335
</property>
336336
</widget>
337337
</item>

src/qt/optionsdialog.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,6 @@ OptionsDialog::OptionsDialog(QWidget* parent, bool enableWallet)
108108
#ifndef USE_UPNP
109109
ui->mapPortUpnp->setEnabled(false);
110110
#endif
111-
#ifndef USE_NATPMP
112-
ui->mapPortNatpmp->setEnabled(false);
113-
#endif
114111

115112
ui->proxyIp->setEnabled(false);
116113
ui->proxyPort->setEnabled(false);

src/qt/optionsmodel.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -414,11 +414,7 @@ QVariant OptionsModel::getOption(OptionID option, const std::string& suffix) con
414414
return false;
415415
#endif // USE_UPNP
416416
case MapPortNatpmp:
417-
#ifdef USE_NATPMP
418417
return SettingToBool(setting(), DEFAULT_NATPMP);
419-
#else
420-
return false;
421-
#endif // USE_NATPMP
422418
case MinimizeOnClose:
423419
return fMinimizeOnClose;
424420

0 commit comments

Comments
 (0)