aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/perf/decperf.cxx24
-rw-r--r--tests/perf/encperf.cxx32
-rw-r--r--tests/perf/fbperf.cxx12
-rw-r--r--tests/unit/emulatemb.cxx2
-rw-r--r--tests/unit/gesturehandler.cxx2
5 files changed, 36 insertions, 36 deletions
diff --git a/tests/perf/decperf.cxx b/tests/perf/decperf.cxx
index 87370a4c..66a50d02 100644
--- a/tests/perf/decperf.cxx
+++ b/tests/perf/decperf.cxx
@@ -52,11 +52,11 @@ class DummyOutStream : public rdr::OutStream {
public:
DummyOutStream();
- virtual size_t length();
- virtual void flush();
+ size_t length() override;
+ void flush() override;
private:
- virtual void overrun(size_t needed);
+ void overrun(size_t needed) override;
int offset;
uint8_t buf[131072];
@@ -67,15 +67,15 @@ public:
CConn(const char *filename);
~CConn();
- virtual void initDone();
- virtual void setPixelFormat(const rfb::PixelFormat& pf);
- virtual void setCursor(int, int, const rfb::Point&, const uint8_t*);
- virtual void setCursorPos(const rfb::Point&);
- virtual void framebufferUpdateStart();
- virtual void framebufferUpdateEnd();
- virtual void setColourMapEntries(int, int, uint16_t*);
- virtual void bell();
- virtual void serverCutText(const char*);
+ void initDone() override;
+ void setPixelFormat(const rfb::PixelFormat& pf) override;
+ void setCursor(int, int, const rfb::Point&, const uint8_t*) override;
+ void setCursorPos(const rfb::Point&) override;
+ void framebufferUpdateStart() override;
+ void framebufferUpdateEnd() override;
+ void setColourMapEntries(int, int, uint16_t*) override;
+ void bell() override;
+ void serverCutText(const char*) override;
public:
double cpuTime;
diff --git a/tests/perf/encperf.cxx b/tests/perf/encperf.cxx
index 7cc51f29..904363a0 100644
--- a/tests/perf/encperf.cxx
+++ b/tests/perf/encperf.cxx
@@ -80,11 +80,11 @@ class DummyOutStream : public rdr::OutStream {
public:
DummyOutStream();
- virtual size_t length();
- virtual void flush();
+ size_t length() override;
+ void flush() override;
private:
- virtual void overrun(size_t needed);
+ void overrun(size_t needed) override;
int offset;
uint8_t buf[131072];
@@ -98,16 +98,16 @@ public:
void getStats(double& ratio, unsigned long long& bytes,
unsigned long long& rawEquivalent);
- virtual void initDone() {};
- virtual void resizeFramebuffer();
- virtual void setCursor(int, int, const rfb::Point&, const uint8_t*);
- virtual void setCursorPos(const rfb::Point&);
- virtual void framebufferUpdateStart();
- virtual void framebufferUpdateEnd();
- virtual bool dataRect(const rfb::Rect&, int);
- virtual void setColourMapEntries(int, int, uint16_t*);
- virtual void bell();
- virtual void serverCutText(const char*);
+ void initDone() override {};
+ void resizeFramebuffer() override;
+ void setCursor(int, int, const rfb::Point&, const uint8_t*) override;
+ void setCursorPos(const rfb::Point&) override;
+ void framebufferUpdateStart() override;
+ void framebufferUpdateEnd() override;
+ bool dataRect(const rfb::Rect&, int) override;
+ void setColourMapEntries(int, int, uint16_t*) override;
+ void bell() override;
+ void serverCutText(const char*) override;
public:
double decodeTime;
@@ -136,10 +136,10 @@ public:
void getStats(double&, unsigned long long&, unsigned long long&);
- virtual void setAccessRights(rfb::AccessRights ar);
+ void setAccessRights(rfb::AccessRights ar) override;
- virtual void setDesktopSize(int fb_width, int fb_height,
- const rfb::ScreenSet& layout);
+ void setDesktopSize(int fb_width, int fb_height,
+ const rfb::ScreenSet& layout) override;
protected:
DummyOutStream *out;
diff --git a/tests/perf/fbperf.cxx b/tests/perf/fbperf.cxx
index ba1633b9..357aede2 100644
--- a/tests/perf/fbperf.cxx
+++ b/tests/perf/fbperf.cxx
@@ -43,10 +43,10 @@ public:
virtual void start(int width, int height);
virtual void stop();
- virtual void draw();
+ void draw() override;
protected:
- virtual void flush();
+ void flush() override;
void update();
virtual void changefb();
@@ -63,17 +63,17 @@ protected:
class PartialTestWindow: public TestWindow {
protected:
- virtual void changefb();
+ void changefb() override;
};
class OverlayTestWindow: public PartialTestWindow {
public:
OverlayTestWindow();
- virtual void start(int width, int height);
- virtual void stop();
+ void start(int width, int height) override;
+ void stop() override;
- virtual void draw();
+ void draw() override;
protected:
Surface* overlay;
diff --git a/tests/unit/emulatemb.cxx b/tests/unit/emulatemb.cxx
index 7dfc2541..662eedef 100644
--- a/tests/unit/emulatemb.cxx
+++ b/tests/unit/emulatemb.cxx
@@ -42,7 +42,7 @@ rfb::BoolParameter emulateMiddleButton("dummy_name", "dummy_desc", true);
class TestClass : public EmulateMB
{
public:
- virtual void sendPointerEvent(const rfb::Point& pos, int buttonMask);
+ void sendPointerEvent(const rfb::Point& pos, int buttonMask) override;
struct PointerEventParams {rfb::Point pos; int mask; };
diff --git a/tests/unit/gesturehandler.cxx b/tests/unit/gesturehandler.cxx
index bc39c24c..73b8c62c 100644
--- a/tests/unit/gesturehandler.cxx
+++ b/tests/unit/gesturehandler.cxx
@@ -30,7 +30,7 @@
class TestClass : public GestureHandler
{
protected:
- virtual void handleGestureEvent(const GestureEvent& event);
+ void handleGestureEvent(const GestureEvent& event) override;
public:
std::vector<GestureEvent> events;