diff options
Diffstat (limited to 'win/vncconfig')
-rw-r--r-- | win/vncconfig/Authentication.h | 14 | ||||
-rw-r--r-- | win/vncconfig/Connections.h | 10 | ||||
-rw-r--r-- | win/vncconfig/Desktop.h | 6 | ||||
-rw-r--r-- | win/vncconfig/Hooking.h | 6 | ||||
-rw-r--r-- | win/vncconfig/Inputs.h | 6 | ||||
-rw-r--r-- | win/vncconfig/Legacy.h | 6 | ||||
-rw-r--r-- | win/vncconfig/PasswordDialog.h | 2 | ||||
-rw-r--r-- | win/vncconfig/Sharing.h | 6 |
8 files changed, 28 insertions, 28 deletions
diff --git a/win/vncconfig/Authentication.h b/win/vncconfig/Authentication.h index 79d5dfa4..1123678f 100644 --- a/win/vncconfig/Authentication.h +++ b/win/vncconfig/Authentication.h @@ -47,7 +47,7 @@ namespace rfb { security = new SecurityServer(); } - void initDialog() { + void initDialog() override { SecurityPage::initDialog(); setItemChecked(IDC_QUERY_CONNECT, rfb::Server::queryConnect); @@ -55,7 +55,7 @@ namespace rfb { onCommand(IDC_AUTH_NONE, 0); } - bool onCommand(int id, int cmd) { + bool onCommand(int id, int cmd) override { SecurityPage::onCommand(id, cmd); setChanged(true); @@ -78,7 +78,7 @@ namespace rfb { return true; } - bool onOk() { + bool onOk() override { SecurityPage::onOk(); if (isItemChecked(IDC_AUTH_VNC)) @@ -126,16 +126,16 @@ namespace rfb { } } - virtual void loadX509Certs(void) {} - virtual void enableX509Dialogs(void) { + void loadX509Certs(void) override {} + void enableX509Dialogs(void) override { enableItem(IDC_LOAD_CERT, true); enableItem(IDC_LOAD_CERTKEY, true); } - virtual void disableX509Dialogs(void) { + void disableX509Dialogs(void) override { enableItem(IDC_LOAD_CERT, false); enableItem(IDC_LOAD_CERTKEY, false); } - virtual void loadVncPasswd() { + void loadVncPasswd() override { enableItem(IDC_AUTH_VNC_PASSWD, isItemChecked(IDC_AUTH_VNC)); } diff --git a/win/vncconfig/Connections.h b/win/vncconfig/Connections.h index 9ff6f6a4..a540bd76 100644 --- a/win/vncconfig/Connections.h +++ b/win/vncconfig/Connections.h @@ -46,7 +46,7 @@ namespace rfb { pattern = pat; return Dialog::showDialog(MAKEINTRESOURCE(IDD_CONN_HOST)); } - void initDialog() { + void initDialog() override { if (pattern.empty()) pattern = "+"; @@ -60,7 +60,7 @@ namespace rfb { setItemString(IDC_HOST_PATTERN, &pattern.c_str()[1]); pattern.clear(); } - bool onOk() { + bool onOk() override { std::string newPat; if (isItemChecked(IDC_ALLOW)) newPat = '+'; @@ -88,7 +88,7 @@ namespace rfb { public: ConnectionsPage(const RegKey& rk) : PropSheetPage(GetModuleHandle(nullptr), MAKEINTRESOURCE(IDD_CONNECTIONS)), regKey(rk) {} - void initDialog() { + void initDialog() override { vlog.debug("set IDC_PORT %d", (int)port_number); setItemInt(IDC_PORT, port_number ? port_number : 5900); setItemChecked(IDC_RFB_ENABLE, port_number != 0); @@ -108,7 +108,7 @@ namespace rfb { onCommand(IDC_RFB_ENABLE, EN_CHANGE); } - bool onCommand(int id, int cmd) { + bool onCommand(int id, int cmd) override { switch (id) { case IDC_HOSTS: { @@ -221,7 +221,7 @@ namespace rfb { } return false; } - bool onOk() { + bool onOk() override { regKey.setInt("PortNumber", isItemChecked(IDC_RFB_ENABLE) ? getItemInt(IDC_PORT) : 0); regKey.setInt("IdleTimeout", getItemInt(IDC_IDLE_TIMEOUT)); regKey.setInt("LocalHost", isItemChecked(IDC_LOCALHOST)); diff --git a/win/vncconfig/Desktop.h b/win/vncconfig/Desktop.h index c927d5ac..a5058389 100644 --- a/win/vncconfig/Desktop.h +++ b/win/vncconfig/Desktop.h @@ -30,7 +30,7 @@ namespace rfb { public: DesktopPage(const RegKey& rk) : PropSheetPage(GetModuleHandle(nullptr), MAKEINTRESOURCE(IDD_DESKTOP)), regKey(rk) {} - void initDialog() { + void initDialog() override { const char *action(rfb::win32::SDisplay::disconnectAction); bool disconnectLock = stricmp(action, "Lock") == 0; bool disconnectLogoff = stricmp(action, "Logoff") == 0; @@ -40,7 +40,7 @@ namespace rfb { setItemChecked(IDC_REMOVE_WALLPAPER, rfb::win32::SDisplay::removeWallpaper); setItemChecked(IDC_DISABLE_EFFECTS, rfb::win32::SDisplay::disableEffects); } - bool onCommand(int id, int /*cmd*/) { + bool onCommand(int id, int /*cmd*/) override { switch (id) { case IDC_DISCONNECT_LOGOFF: case IDC_DISCONNECT_LOCK: @@ -58,7 +58,7 @@ namespace rfb { } return false; } - bool onOk() { + bool onOk() override { const char* action = "None"; if (isItemChecked(IDC_DISCONNECT_LOGOFF)) action = "Logoff"; diff --git a/win/vncconfig/Hooking.h b/win/vncconfig/Hooking.h index d3cf8620..9f84230d 100644 --- a/win/vncconfig/Hooking.h +++ b/win/vncconfig/Hooking.h @@ -32,14 +32,14 @@ namespace rfb { public: HookingPage(const RegKey& rk) : PropSheetPage(GetModuleHandle(nullptr), MAKEINTRESOURCE(IDD_HOOKING)), regKey(rk) {} - void initDialog() { + void initDialog() override { setItemChecked(IDC_USEPOLLING, rfb::win32::SDisplay::updateMethod == 0); setItemChecked(IDC_USEHOOKS, (rfb::win32::SDisplay::updateMethod == 1)); setItemChecked(IDC_POLLCONSOLES, rfb::win32::WMPoller::poll_console_windows); setItemChecked(IDC_CAPTUREBLT, rfb::win32::DeviceFrameBuffer::useCaptureBlt); onCommand(IDC_USEHOOKS, 0); } - bool onCommand(int id, int /*cmd*/) { + bool onCommand(int id, int /*cmd*/) override { switch (id) { case IDC_USEPOLLING: case IDC_USEHOOKS: @@ -54,7 +54,7 @@ namespace rfb { } return false; } - bool onOk() { + bool onOk() override { if (isItemChecked(IDC_USEPOLLING)) regKey.setInt("UpdateMethod", 0); if (isItemChecked(IDC_USEHOOKS)) diff --git a/win/vncconfig/Inputs.h b/win/vncconfig/Inputs.h index 671520ba..2ffdda03 100644 --- a/win/vncconfig/Inputs.h +++ b/win/vncconfig/Inputs.h @@ -35,7 +35,7 @@ namespace rfb { InputsPage(const RegKey& rk) : PropSheetPage(GetModuleHandle(nullptr), MAKEINTRESOURCE(IDD_INPUTS)), regKey(rk), enableAffectSSaver(true) {} - void initDialog() { + void initDialog() override { setItemChecked(IDC_ACCEPT_KEYS, rfb::Server::acceptKeyEvents); setItemChecked(IDC_RAW_KEYBOARD, SKeyboard::rawKeyboard); setItemChecked(IDC_ACCEPT_PTR, rfb::Server::acceptPointerEvents); @@ -49,7 +49,7 @@ namespace rfb { enableAffectSSaver = false; enableItem(IDC_AFFECT_SCREENSAVER, enableAffectSSaver); } - bool onCommand(int /*id*/, int /*cmd*/) { + bool onCommand(int /*id*/, int /*cmd*/) override { BOOL inputResetsBlocked; SystemParametersInfo(SPI_GETBLOCKSENDINPUTRESETS, 0, &inputResetsBlocked, 0); setChanged((rfb::Server::acceptKeyEvents != isItemChecked(IDC_ACCEPT_KEYS)) || @@ -61,7 +61,7 @@ namespace rfb { (enableAffectSSaver && (!inputResetsBlocked != isItemChecked(IDC_AFFECT_SCREENSAVER)))); return false; } - bool onOk() { + bool onOk() override { regKey.setBool("AcceptKeyEvents", isItemChecked(IDC_ACCEPT_KEYS)); regKey.setBool("RawKeyboard", isItemChecked(IDC_RAW_KEYBOARD)); regKey.setBool("AcceptPointerEvents", isItemChecked(IDC_ACCEPT_PTR)); diff --git a/win/vncconfig/Legacy.h b/win/vncconfig/Legacy.h index 9232a24d..47bec7d6 100644 --- a/win/vncconfig/Legacy.h +++ b/win/vncconfig/Legacy.h @@ -36,10 +36,10 @@ namespace rfb { public: LegacyPage(const RegKey& rk, bool userSettings_) : PropSheetPage(GetModuleHandle(nullptr), MAKEINTRESOURCE(IDD_LEGACY)), regKey(rk), userSettings(userSettings_) {} - void initDialog() { + void initDialog() override { setItemChecked(IDC_PROTOCOL_3_3, rfb::Server::protocol3_3); } - bool onCommand(int id, int /*cmd*/) { + bool onCommand(int id, int /*cmd*/) override { switch (id) { case IDC_LEGACY_IMPORT: { @@ -64,7 +64,7 @@ namespace rfb { }; return false; } - bool onOk() { + bool onOk() override { regKey.setBool("Protocol3.3", isItemChecked(IDC_PROTOCOL_3_3)); return true; } diff --git a/win/vncconfig/PasswordDialog.h b/win/vncconfig/PasswordDialog.h index 5b9d3fb3..06973bb9 100644 --- a/win/vncconfig/PasswordDialog.h +++ b/win/vncconfig/PasswordDialog.h @@ -28,7 +28,7 @@ namespace rfb { public: PasswordDialog(const RegKey& rk, bool registryInsecure_); bool showDialog(HWND owner=nullptr); - bool onOk(); + bool onOk() override; protected: const RegKey& regKey; bool registryInsecure; diff --git a/win/vncconfig/Sharing.h b/win/vncconfig/Sharing.h index 73966c9d..a6459e5f 100644 --- a/win/vncconfig/Sharing.h +++ b/win/vncconfig/Sharing.h @@ -30,19 +30,19 @@ namespace rfb { public: SharingPage(const RegKey& rk) : PropSheetPage(GetModuleHandle(nullptr), MAKEINTRESOURCE(IDD_SHARING)), regKey(rk) {} - void initDialog() { + void initDialog() override { setItemChecked(IDC_DISCONNECT_CLIENTS, rfb::Server::disconnectClients); setItemChecked(IDC_SHARE_NEVER, rfb::Server::neverShared); setItemChecked(IDC_SHARE_ALWAYS, rfb::Server::alwaysShared); setItemChecked(IDC_SHARE_CLIENT, !(rfb::Server::neverShared || rfb::Server::alwaysShared)); } - bool onCommand(int /*id*/, int /*cmd*/) { + bool onCommand(int /*id*/, int /*cmd*/) override { setChanged((isItemChecked(IDC_DISCONNECT_CLIENTS) != rfb::Server::disconnectClients) || (isItemChecked(IDC_SHARE_NEVER) != rfb::Server::neverShared) || (isItemChecked(IDC_SHARE_ALWAYS) != rfb::Server::alwaysShared)); return true; } - bool onOk() { + bool onOk() override { regKey.setBool("DisconnectClients", isItemChecked(IDC_DISCONNECT_CLIENTS)); regKey.setBool("AlwaysShared", isItemChecked(IDC_SHARE_ALWAYS)); regKey.setBool("NeverShared", isItemChecked(IDC_SHARE_NEVER)); |