From e3132b406de025ec4ecd612977425c7e7273ecf9 Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Wed, 3 Apr 2024 17:26:03 +0200 Subject: Mark overridden virtual functions Use the new "override" keyword to properly differentiate between new virtual methods, and existing virtual methods being overridden. --- win/rfb_win32/AboutDialog.h | 2 +- win/rfb_win32/Clipboard.h | 2 +- win/rfb_win32/DeviceFrameBuffer.h | 2 +- win/rfb_win32/Dialog.h | 2 +- win/rfb_win32/RegConfig.h | 4 ++-- win/rfb_win32/SDisplay.h | 28 ++++++++++++++-------------- win/rfb_win32/SDisplayCorePolling.h | 8 ++++---- win/rfb_win32/SDisplayCoreWMHooks.h | 6 +++--- win/rfb_win32/SecurityPage.h | 6 +++--- win/rfb_win32/Service.cxx | 2 +- win/rfb_win32/SocketManager.h | 4 ++-- win/rfb_win32/WMHooks.cxx | 2 +- win/rfb_win32/WMNotifier.h | 2 +- win/vncconfig/Authentication.h | 14 +++++++------- win/vncconfig/Connections.h | 10 +++++----- win/vncconfig/Desktop.h | 6 +++--- win/vncconfig/Hooking.h | 6 +++--- win/vncconfig/Inputs.h | 6 +++--- win/vncconfig/Legacy.h | 6 +++--- win/vncconfig/PasswordDialog.h | 2 +- win/vncconfig/Sharing.h | 6 +++--- win/winvnc/AddNewClientDialog.h | 4 ++-- win/winvnc/ControlPanel.h | 4 ++-- win/winvnc/QueryConnectDialog.h | 6 +++--- win/winvnc/STrayIcon.cxx | 2 +- win/winvnc/STrayIcon.h | 2 +- win/winvnc/VNCServerService.h | 4 ++-- win/winvnc/VNCServerWin32.h | 10 +++++----- 28 files changed, 79 insertions(+), 79 deletions(-) (limited to 'win') diff --git a/win/rfb_win32/AboutDialog.h b/win/rfb_win32/AboutDialog.h index 705d6b3c..00cf0d42 100644 --- a/win/rfb_win32/AboutDialog.h +++ b/win/rfb_win32/AboutDialog.h @@ -33,7 +33,7 @@ namespace rfb { public: AboutDialog(); virtual bool showDialog(); - virtual void initDialog(); + void initDialog() override; static AboutDialog instance; diff --git a/win/rfb_win32/Clipboard.h b/win/rfb_win32/Clipboard.h index 588f1086..b66aa5a4 100644 --- a/win/rfb_win32/Clipboard.h +++ b/win/rfb_win32/Clipboard.h @@ -57,7 +57,7 @@ namespace rfb { protected: // - Internal MsgWindow callback - virtual LRESULT processMessage(UINT msg, WPARAM wParam, LPARAM lParam); + LRESULT processMessage(UINT msg, WPARAM wParam, LPARAM lParam) override; Notifier* notifier; HWND next_window; diff --git a/win/rfb_win32/DeviceFrameBuffer.h b/win/rfb_win32/DeviceFrameBuffer.h index c8715724..e9f06cb0 100644 --- a/win/rfb_win32/DeviceFrameBuffer.h +++ b/win/rfb_win32/DeviceFrameBuffer.h @@ -69,7 +69,7 @@ namespace rfb { // - FrameBuffer overrides virtual void grabRect(const Rect &rect); - virtual void grabRegion(const Region ®ion); + void grabRegion(const Region ®ion) override; // - DeviceFrameBuffer specific methods diff --git a/win/rfb_win32/Dialog.h b/win/rfb_win32/Dialog.h index 4661dd31..69374bb1 100644 --- a/win/rfb_win32/Dialog.h +++ b/win/rfb_win32/Dialog.h @@ -148,7 +148,7 @@ namespace rfb { protected: void setPropSheet(PropSheet* ps) {propSheet = ps;}; static INT_PTR CALLBACK staticPageProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam); - virtual BOOL dialogProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam); + BOOL dialogProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) override; PROPSHEETPAGE page; PropSheet* propSheet; }; diff --git a/win/rfb_win32/RegConfig.h b/win/rfb_win32/RegConfig.h index ef8e45bd..401cb148 100644 --- a/win/rfb_win32/RegConfig.h +++ b/win/rfb_win32/RegConfig.h @@ -56,7 +56,7 @@ namespace rfb { static void loadRegistryConfig(RegKey& key); protected: // EventHandler interface and trigger event - virtual void processEvent(HANDLE event); + void processEvent(HANDLE event) override; EventManager* eventMgr; Handle event; @@ -72,7 +72,7 @@ namespace rfb { // Start the thread, reading from the specified key bool start(const HKEY rootkey, const char* keyname); protected: - virtual void worker(); + void worker() override; EventManager eventMgr; RegConfig config; DWORD thread_id; diff --git a/win/rfb_win32/SDisplay.h b/win/rfb_win32/SDisplay.h index 5b55cd66..76780d9e 100644 --- a/win/rfb_win32/SDisplay.h +++ b/win/rfb_win32/SDisplay.h @@ -71,31 +71,31 @@ namespace rfb { // -=- SDesktop interface - virtual void init(VNCServer* vs); - virtual void start(); - virtual void stop(); - virtual void terminate(); - virtual void queryConnection(network::Socket* sock, - const char* userName); - virtual void handleClipboardRequest(); - virtual void handleClipboardAnnounce(bool available); - virtual void handleClipboardData(const char* data); - virtual void pointerEvent(const Point& pos, int buttonmask); - virtual void keyEvent(uint32_t keysym, uint32_t keycode, bool down); + void init(VNCServer* vs) override; + void start() override; + void stop() override; + void terminate() override; + void queryConnection(network::Socket* sock, + const char* userName) override; + void handleClipboardRequest() override; + void handleClipboardAnnounce(bool available) override; + void handleClipboardData(const char* data) override; + void pointerEvent(const Point& pos, int buttonmask) override; + void keyEvent(uint32_t keysym, uint32_t keycode, bool down) override; // -=- Clipboard events - virtual void notifyClipboardChanged(bool available); + void notifyClipboardChanged(bool available) override; // -=- Display events - virtual void notifyDisplayEvent(WMMonitor::Notifier::DisplayEventType evt); + void notifyDisplayEvent(WMMonitor::Notifier::DisplayEventType evt) override; // -=- EventHandler interface HANDLE getUpdateEvent() {return updateEvent;} HANDLE getTerminateEvent() {return terminateEvent;} - virtual void processEvent(HANDLE event); + void processEvent(HANDLE event) override; // -=- Notification of whether or not SDisplay is started diff --git a/win/rfb_win32/SDisplayCorePolling.h b/win/rfb_win32/SDisplayCorePolling.h index 9a8bc29b..00de2d40 100644 --- a/win/rfb_win32/SDisplayCorePolling.h +++ b/win/rfb_win32/SDisplayCorePolling.h @@ -40,17 +40,17 @@ namespace rfb { ~SDisplayCorePolling(); // - Called by SDisplay to inform Core of the screen size - virtual void setScreenRect(const Rect& screenRect_); + void setScreenRect(const Rect& screenRect_) override; // - Called by SDisplay to flush updates to the specified tracker - virtual void flushUpdates(); + void flushUpdates() override; - virtual const char* methodName() const { return "Polling"; } + const char* methodName() const override { return "Polling"; } protected: // - MsgWindow overrides // processMessage is used to service the cursor & polling timers - virtual LRESULT processMessage(UINT msg, WPARAM wParam, LPARAM lParam); + LRESULT processMessage(UINT msg, WPARAM wParam, LPARAM lParam) override; // - Hooking subcomponents used to track the desktop state WMCopyRect copyrect; diff --git a/win/rfb_win32/SDisplayCoreWMHooks.h b/win/rfb_win32/SDisplayCoreWMHooks.h index 82557f13..3358a1ee 100644 --- a/win/rfb_win32/SDisplayCoreWMHooks.h +++ b/win/rfb_win32/SDisplayCoreWMHooks.h @@ -43,14 +43,14 @@ namespace rfb { ~SDisplayCoreWMHooks(); // - Called by SDisplay to flush updates to the specified tracker - virtual void flushUpdates(); + void flushUpdates() override; - virtual const char* methodName() const { return "VNC Hooks"; } + const char* methodName() const override { return "VNC Hooks"; } protected: // - MsgWindow overrides // processMessage is used to service the cursor & polling timers - virtual LRESULT processMessage(UINT msg, WPARAM wParam, LPARAM lParam); + LRESULT processMessage(UINT msg, WPARAM wParam, LPARAM lParam) override; // - Hooking subcomponents used to track the desktop state WMHooks hooks; diff --git a/win/rfb_win32/SecurityPage.h b/win/rfb_win32/SecurityPage.h index 258b58e0..62c50388 100644 --- a/win/rfb_win32/SecurityPage.h +++ b/win/rfb_win32/SecurityPage.h @@ -39,9 +39,9 @@ public: virtual void disableX509Dialogs(void) = 0; virtual void loadVncPasswd(void) = 0; - virtual void initDialog(); - virtual bool onCommand(int id, int cmd); - virtual bool onOk(); + void initDialog() override; + bool onCommand(int id, int cmd) override; + bool onOk() override; protected: Security *security; diff --git a/win/rfb_win32/Service.cxx b/win/rfb_win32/Service.cxx index a27cfa67..0d6cd578 100644 --- a/win/rfb_win32/Service.cxx +++ b/win/rfb_win32/Service.cxx @@ -274,7 +274,7 @@ public: DeregisterEventSource(eventlog); } - virtual void write(int level, const char *logname, const char *message) { + void write(int level, const char *logname, const char *message) override { if (!eventlog) return; const char* strings[] = {logname, message}; WORD type = EVENTLOG_INFORMATION_TYPE; diff --git a/win/rfb_win32/SocketManager.h b/win/rfb_win32/SocketManager.h index b3df2f4b..4302bbbe 100644 --- a/win/rfb_win32/SocketManager.h +++ b/win/rfb_win32/SocketManager.h @@ -75,8 +75,8 @@ namespace rfb { void setDisable(VNCServer* srvr, bool disable); protected: - virtual int checkTimeouts(); - virtual void processEvent(HANDLE event); + int checkTimeouts() override; + void processEvent(HANDLE event) override; virtual void remSocket(network::Socket* sock); struct ConnInfo { diff --git a/win/rfb_win32/WMHooks.cxx b/win/rfb_win32/WMHooks.cxx index 62fc49f6..cb2e0275 100644 --- a/win/rfb_win32/WMHooks.cxx +++ b/win/rfb_win32/WMHooks.cxx @@ -120,7 +120,7 @@ public: void stop(); DWORD getThreadId() { return thread_id; } protected: - virtual void worker(); + void worker() override; protected: bool active; DWORD thread_id; diff --git a/win/rfb_win32/WMNotifier.h b/win/rfb_win32/WMNotifier.h index 3855430b..937a655d 100644 --- a/win/rfb_win32/WMNotifier.h +++ b/win/rfb_win32/WMNotifier.h @@ -55,7 +55,7 @@ namespace rfb { protected: // - Internal MsgWindow callback - virtual LRESULT processMessage(UINT msg, WPARAM wParam, LPARAM lParam); + LRESULT processMessage(UINT msg, WPARAM wParam, LPARAM lParam) override; Notifier* notifier; }; 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)); diff --git a/win/winvnc/AddNewClientDialog.h b/win/winvnc/AddNewClientDialog.h index 1c24d23b..ad34ec23 100644 --- a/win/winvnc/AddNewClientDialog.h +++ b/win/winvnc/AddNewClientDialog.h @@ -38,11 +38,11 @@ namespace winvnc { protected: // Dialog methods (protected) - virtual void initDialog() { + void initDialog() override { if (!hostName.empty()) setItemString(IDC_HOST, hostName.c_str()); } - virtual bool onOk() { + bool onOk() override { hostName = getItemString(IDC_HOST); return true; } diff --git a/win/winvnc/ControlPanel.h b/win/winvnc/ControlPanel.h index 5d0c5069..23aff0a5 100644 --- a/win/winvnc/ControlPanel.h +++ b/win/winvnc/ControlPanel.h @@ -25,7 +25,7 @@ namespace winvnc { stop_updating = false; }; virtual bool showDialog(); - virtual void initDialog(); + void initDialog() override; virtual bool onCommand(int cmd); void UpdateListView(ListConnInfo* LCInfo); HWND GetHandle() {return handle;}; @@ -33,7 +33,7 @@ namespace winvnc { ~ControlPanel(); ListConnInfo ListConnStatus; protected: - virtual BOOL dialogProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam); + BOOL dialogProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) override; void getSelConnInfo(); HWND m_hSTIcon; ListConnInfo ListConn; diff --git a/win/winvnc/QueryConnectDialog.h b/win/winvnc/QueryConnectDialog.h index 36e885f9..332e7439 100644 --- a/win/winvnc/QueryConnectDialog.h +++ b/win/winvnc/QueryConnectDialog.h @@ -39,11 +39,11 @@ namespace winvnc { bool isAccepted() const {return approve;} protected: // Thread methods - virtual void worker(); + void worker() override; // Dialog methods (protected) - virtual void initDialog(); - virtual BOOL dialogProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam); + void initDialog() override; + BOOL dialogProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) override; // Custom internal methods void setCountdownLabel(); diff --git a/win/winvnc/STrayIcon.cxx b/win/winvnc/STrayIcon.cxx index e23ca772..d703f47a 100644 --- a/win/winvnc/STrayIcon.cxx +++ b/win/winvnc/STrayIcon.cxx @@ -86,7 +86,7 @@ public: CPanel = new ControlPanel(getHandle()); } - virtual LRESULT processMessage(UINT msg, WPARAM wParam, LPARAM lParam) { + LRESULT processMessage(UINT msg, WPARAM wParam, LPARAM lParam) override { switch(msg) { case WM_USER: diff --git a/win/winvnc/STrayIcon.h b/win/winvnc/STrayIcon.h index 511c3ae2..1aa7bfbc 100644 --- a/win/winvnc/STrayIcon.h +++ b/win/winvnc/STrayIcon.h @@ -42,7 +42,7 @@ namespace winvnc { friend class STrayIcon; protected: - virtual void worker(); + void worker() override; os::Mutex* lock; DWORD thread_id; diff --git a/win/winvnc/VNCServerService.h b/win/winvnc/VNCServerService.h index cae44868..3992bc91 100644 --- a/win/winvnc/VNCServerService.h +++ b/win/winvnc/VNCServerService.h @@ -28,8 +28,8 @@ namespace winvnc { public: VNCServerService(); - DWORD serviceMain(int argc, char* argv[]); - void stop(); + DWORD serviceMain(int argc, char* argv[]) override; + void stop() override; static const char* Name; protected: diff --git a/win/winvnc/VNCServerWin32.h b/win/winvnc/VNCServerWin32.h index 0fff0963..493b3fa6 100644 --- a/win/winvnc/VNCServerWin32.h +++ b/win/winvnc/VNCServerWin32.h @@ -81,20 +81,20 @@ namespace winvnc { // QueryConnectionHandler interface // Callback used to prompt user to accept or reject a connection. // CALLBACK IN VNCServerST "HOST" THREAD - virtual void queryConnection(network::Socket* sock, - const char* userName); + void queryConnection(network::Socket* sock, + const char* userName) override; // SocketManager::AddressChangeNotifier interface // Used to keep tray icon up to date - virtual void processAddressChange(); + void processAddressChange() override; // RegConfig::Callback interface // Called via the EventManager whenever RegConfig sees the registry change - virtual void regConfigChanged(); + void regConfigChanged() override; // EventHandler interface // Used to perform queued commands - virtual void processEvent(HANDLE event); + void processEvent(HANDLE event) override; void getConnInfo(ListConnInfo * listConn); void setConnStatus(ListConnInfo* listConn); -- cgit v1.2.3