summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--horizonwizard.cc4
-rw-r--r--horizonwizard.hh2
2 files changed, 3 insertions, 3 deletions
diff --git a/horizonwizard.cc b/horizonwizard.cc
index f0dcdf9..5e8845f 100644
--- a/horizonwizard.cc
+++ b/horizonwizard.cc
@@ -19,7 +19,7 @@ using Horizon::NetworkInterface;
using std::map;
using std::string;
-map<int, string> help_id_map = {
+static map<int, string> help_id_map = {
{HorizonWizard::Page_Welcome, "welcome"},
{HorizonWizard::Page_Networking, "network-start"},
{HorizonWizard::Page_Network_SimpleWireless, "network-wifi"},
@@ -50,7 +50,7 @@ HorizonWizard::HorizonWizard(QWidget *parent) : QWizard(parent)
setPage(Page_Network_SimpleWireless, new NetworkSimpleWirelessPage);
setPage(Page_Software, new SoftwarePage);
- QObject::connect(this, (void (QWizard:: *)(void))&QWizard::helpRequested,
+ QObject::connect(this, static_cast<void (QWizard:: *)(void)>(&QWizard::helpRequested),
[=](void) {
if(help_id_map.find(currentId()) == help_id_map.end())
{
diff --git a/horizonwizard.hh b/horizonwizard.hh
index 403da0e..03d6421 100644
--- a/horizonwizard.hh
+++ b/horizonwizard.hh
@@ -26,7 +26,7 @@ public:
Page_CustomStart /* custom pages have IDs starting here */
};
- HorizonWizard(QWidget *parent = 0);
+ HorizonWizard(QWidget *parent = nullptr);
std::set<std::string> selected;
std::vector<Horizon::NetworkInterface> interfaces;
};