aboutsummaryrefslogtreecommitdiffstats
path: root/win/rfb_win32
diff options
context:
space:
mode:
Diffstat (limited to 'win/rfb_win32')
-rw-r--r--win/rfb_win32/AboutDialog.h2
-rw-r--r--win/rfb_win32/Clipboard.h2
-rw-r--r--win/rfb_win32/DeviceFrameBuffer.h2
-rw-r--r--win/rfb_win32/Dialog.h2
-rw-r--r--win/rfb_win32/RegConfig.h4
-rw-r--r--win/rfb_win32/SDisplay.h28
-rw-r--r--win/rfb_win32/SDisplayCorePolling.h8
-rw-r--r--win/rfb_win32/SDisplayCoreWMHooks.h6
-rw-r--r--win/rfb_win32/SecurityPage.h6
-rw-r--r--win/rfb_win32/Service.cxx2
-rw-r--r--win/rfb_win32/SocketManager.h4
-rw-r--r--win/rfb_win32/WMHooks.cxx2
-rw-r--r--win/rfb_win32/WMNotifier.h2
13 files changed, 35 insertions, 35 deletions
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 &region);
+ void grabRegion(const Region &region) 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;
};