Use override specifier for overridden functions

22 files changed, 73 insertions, 73 deletions

diff --git a/gtest/examples/xorg-gtest-environment-example.cpp b/gtest/examples/xorg-gtest-environment-example.cpp
index a0b9dde..14b664e 100644
--- a/gtest/examples/xorg-gtest-environment-example.cpp
+++ b/gtest/examples/xorg-gtest-environment-example.cpp
@@ -83,7 +83,7 @@ TEST_F(Test, CheckWindowProperty) {
  */
 class SubTest : public Test {
 public:
-  virtual void SetUp(void) {
+  void SetUp() override {
     Test::SetUp();
 
     /* Create some atom that we can then use inside the test */
diff --git a/gtest/examples/xorg-gtest-example.cpp b/gtest/examples/xorg-gtest-example.cpp
index b47c510..b5ba91e 100644
--- a/gtest/examples/xorg-gtest-example.cpp
+++ b/gtest/examples/xorg-gtest-example.cpp
@@ -59,7 +59,7 @@ TEST(XServer, DisplayConnection) {
  */
 class ServerTest : public Test {
 public:
-  virtual void SetUp(void) {
+  void SetUp() override {
     const ::testing::TestInfo* const test_info =
       ::testing::UnitTest::GetInstance()->current_test_info();
 
@@ -79,7 +79,7 @@ public:
     ASSERT_NO_FATAL_FAILURE(Test::SetUp());
   }
 
-  virtual void TearDown(void) {
+  void TearDown() override {
     ASSERT_TRUE(server.Terminate());
     server.RemoveLogFile();
   }
diff --git a/gtest/include/xorg/gtest/xorg-gtest-environment.h b/gtest/include/xorg/gtest/xorg-gtest-environment.h
index 33162c9..d8c8a66 100644
--- a/gtest/include/xorg/gtest/xorg-gtest-environment.h
+++ b/gtest/include/xorg/gtest/xorg-gtest-environment.h
@@ -71,7 +71,7 @@ class Environment : public ::testing::Environment {
    */
   Environment();
 
-  virtual ~Environment();
+  ~Environment() override;
 
   /**
    * Sets the path where the server log file will be created.
@@ -207,7 +207,7 @@ class Environment : public ::testing::Environment {
    * @post If successful: %Environment variable DISPLAY contains the
    * display port for connecting to the dummy X server.
    */
-  virtual void SetUp();
+  void SetUp() override;
 
   /**
    * Stops the dummy X server.
@@ -217,7 +217,7 @@ class Environment : public ::testing::Environment {
    *
    * @post Dummy X server stopped.
    */
-  virtual void TearDown();
+  void TearDown() override;
 
  private:
   struct Private;
diff --git a/gtest/include/xorg/gtest/xorg-gtest-test.h b/gtest/include/xorg/gtest/xorg-gtest-test.h
index eb8834d..1acc252 100644
--- a/gtest/include/xorg/gtest/xorg-gtest-test.h
+++ b/gtest/include/xorg/gtest/xorg-gtest-test.h
@@ -54,7 +54,7 @@ class Test : public ::testing::Test {
 
   Test();
 
-  virtual ~Test();
+  ~Test() override;
 
  protected:
   /**
@@ -68,7 +68,7 @@ class Test : public ::testing::Test {
    *
    * @throws std::runtime_error if no X server is running.
    */
-  virtual void SetUp();
+  void SetUp() override;
 
   /**
    * Closes the display.
@@ -78,7 +78,7 @@ class Test : public ::testing::Test {
    *
    * @post Subsequent calls to Display() return NULL.
    */
-  virtual void TearDown();
+  void TearDown() override;
 
   /**
    * Accesses the display representing an Xlib connection.
diff --git a/gtest/include/xorg/gtest/xorg-gtest-xserver.h b/gtest/include/xorg/gtest/xorg-gtest-xserver.h
index 3a8e1b9..5101d52 100644
--- a/gtest/include/xorg/gtest/xorg-gtest-xserver.h
+++ b/gtest/include/xorg/gtest/xorg-gtest-xserver.h
@@ -80,7 +80,7 @@ public:
 class XServer : public xorg::testing::Process {
   public:
     XServer();
-    virtual ~XServer();
+    ~XServer() override;
 
     /**
      * Start a new server. If no binary is given, the server started is the
@@ -101,7 +101,7 @@ class XServer : public xorg::testing::Process {
      * @returns true if termination succeeded and, if a timout is given, the
      *          process shut down within that timeout. false otherwise.
      */
-    virtual bool Terminate(unsigned int timeout = 2000);
+    bool Terminate(unsigned int timeout = 2000) override;
 
     /**
      * Kills the server. With a vengeance.
@@ -113,7 +113,7 @@ class XServer : public xorg::testing::Process {
      * @returns true if kill succeeded and, if a timout is given, the
      *          process shut down within that timeout. false otherwise.
      */
-    virtual bool Kill(unsigned int timeout = 2000);
+    bool Kill(unsigned int timeout = 2000) override;
 
     /**
      * Remove the log file used by this server. By default, this function
diff --git a/gtest/test/process-test.cpp b/gtest/test/process-test.cpp
index 700069a..e71934a 100644
--- a/gtest/test/process-test.cpp
+++ b/gtest/test/process-test.cpp
@@ -270,7 +270,7 @@ TEST(Process, ForkedChildDoubleStart)
 class ProcessValgrindWrapper : public ::testing::Test,
                                public ::testing::WithParamInterface<std::string> {
 public:
-  virtual void SetUp() {
+  void SetUp() override {
     CheckForValgrind();
   }
 
diff --git a/tests/common/video-driver-test.h b/tests/common/video-driver-test.h
index a6a1836..4d7804d 100644
--- a/tests/common/video-driver-test.h
+++ b/tests/common/video-driver-test.h
@@ -52,7 +52,7 @@ class VideoDriverTest : public XITServerTest {
 class SimpleVideoDriverTest : public VideoDriverTest,
                               public ::testing::WithParamInterface<std::string> {
 public:
-    virtual void SetUpConfigAndLog() {
+    void SetUpConfigAndLog() override {
 
         std::string driver = GetParam();
 
diff --git a/tests/common/xit-server-input-test.h b/tests/common/xit-server-input-test.h
index c2f3db7..ddf921e 100644
--- a/tests/common/xit-server-input-test.h
+++ b/tests/common/xit-server-input-test.h
@@ -60,7 +60,7 @@ protected:
     /**
      * Starts the server and registers for XI2.
      */
-    virtual void StartServer();
+    void StartServer() override;
 
     /**
      * Opcode for XI2 events
@@ -97,7 +97,7 @@ protected:
 class SimpleInputDriverTest : public XITServerInputTest,
                               public ::testing::WithParamInterface<std::string> {
 public:
-    virtual void SetUpConfigAndLog() {
+    void SetUpConfigAndLog() override {
 
         std::string driver = GetParam();
 
diff --git a/tests/common/xit-server-test.h b/tests/common/xit-server-test.h
index fcc8d4c..4aec701 100644
--- a/tests/common/xit-server-test.h
+++ b/tests/common/xit-server-test.h
@@ -64,13 +64,13 @@ protected:
      * Default googletest entry point for setup-work during test fixtures.
      * This implementation simply calls SetUp() with an empty string.
      */
-    virtual void SetUp();
+    void SetUp() override;
 
     /**
      * Default googletest entry point for clean-up work after test
      * fixtures were run.
      */
-    virtual void TearDown();
+    void TearDown() override;
 
     /**
      * Starts the server and waits for connections. Once completed,
diff --git a/tests/lib/libX11.cpp b/tests/lib/libX11.cpp
index 571e101..4fe3da3 100644
--- a/tests/lib/libX11.cpp
+++ b/tests/lib/libX11.cpp
@@ -45,11 +45,11 @@ public:
     /**
      * Initializes a standard mouse device with two wheels.
      */
-    virtual void SetUp() {
+    void SetUp() override {
         XITServerTest::SetUp();
     }
 
-    virtual void SetUpConfigAndLog() {
+    void SetUpConfigAndLog() override {
         config.AddDefaultScreenWithDriver();
         config.WriteConfig();
     }
diff --git a/tests/lib/libXi.cpp b/tests/lib/libXi.cpp
index cf59b2e..513e824 100644
--- a/tests/lib/libXi.cpp
+++ b/tests/lib/libXi.cpp
@@ -49,7 +49,7 @@ public:
     /**
      * Initializes a standard mouse device with two wheels.
      */
-    virtual void SetUp() {
+    void SetUp() override {
         AddDevice(xorg::testing::inputtest::DeviceType::POINTER);
         AddDevice(xorg::testing::inputtest::DeviceType::KEYBOARD);
         XITServerInputTest::SetUp();
@@ -59,7 +59,7 @@ public:
      * Sets up an xorg.conf for a single evdev CorePointer device based on
      * the evemu device.
      */
-    virtual void SetUpConfigAndLog() {
+    void SetUpConfigAndLog() override {
 
         config.AddDefaultScreenWithDriver();
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--device--",
@@ -191,7 +191,7 @@ public:
     /**
      * Initializes a touchpad device
      */
-    virtual void SetUp() {
+    void SetUp() override {
         AddDevice(xorg::testing::inputtest::DeviceType::TOUCH);
         AddDevice(xorg::testing::inputtest::DeviceType::KEYBOARD);
         XITServerInputTest::SetUp();
@@ -201,7 +201,7 @@ public:
      * Sets up an xorg.conf for a single evdev CorePointer device based on
      * the evemu device.
      */
-    virtual void SetUpConfigAndLog() {
+    void SetUpConfigAndLog() override {
 
         config.AddDefaultScreenWithDriver();
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--device--",
diff --git a/tests/server/barriers-common.h b/tests/server/barriers-common.h
index 4b2f7cb..c29a7eb 100644
--- a/tests/server/barriers-common.h
+++ b/tests/server/barriers-common.h
@@ -40,7 +40,7 @@ public:
     int xfixes_event_base;
     int xfixes_error_base;
 
-    virtual void SetUp(void) {
+    void SetUp() override {
         XITServerInputTest::SetUp();
         RequireXFixes(5, 0);
     }
@@ -161,7 +161,7 @@ public:
         XSync(dpy, False);
     }
 
-    virtual void SetUpConfigAndLog() {
+    void SetUpConfigAndLog() override {
         config.AddDefaultScreenWithDriver();
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--device0--",
                                "Option \"CorePointer\" \"on\"\n"
diff --git a/tests/server/barriers-notify.cpp b/tests/server/barriers-notify.cpp
index b5646ab..4b8b7c7 100644
--- a/tests/server/barriers-notify.cpp
+++ b/tests/server/barriers-notify.cpp
@@ -102,7 +102,7 @@ public:
     int sourceid;
     int all_deviceids[2];
 
-    virtual void SetUp(){
+    void SetUp() override {
         AddDevice(xorg::testing::inputtest::DeviceType::POINTER);
         AddDevice(xorg::testing::inputtest::DeviceType::POINTER);
         AddDevice(xorg::testing::inputtest::DeviceType::KEYBOARD);
diff --git a/tests/server/dga.cpp b/tests/server/dga.cpp
index cabdaf9..8b63614 100644
--- a/tests/server/dga.cpp
+++ b/tests/server/dga.cpp
@@ -40,7 +40,7 @@
 
 class DGATest : public XITServerInputTest {
 public:
-    virtual void SetUp() {
+    void SetUp() override {
         XITServerInputTest::SetUp();
 
         ASSERT_TRUE(XQueryExtension(Display(), "XFree86-DGA", &dga_opcode, &dga_event_base, &dga_error_base));
@@ -58,13 +58,13 @@ public:
 class DGAPointerTest : public DGATest,
                        public DeviceInputTestInterface {
 public:
-    virtual void SetUp() {
+    void SetUp() override {
         AddDevice(xorg::testing::inputtest::DeviceType::POINTER);
         AddDevice(xorg::testing::inputtest::DeviceType::KEYBOARD);
         DGATest::SetUp();
     }
 
-    virtual void SetUpConfigAndLog() {
+    void SetUpConfigAndLog() override {
         config.AddDefaultScreenWithDriver();
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--device--",
                                "Option \"CorePointer\" \"on\"\n"
diff --git a/tests/server/grab.cpp b/tests/server/grab.cpp
index f0cfa58..20ff4e1 100644
--- a/tests/server/grab.cpp
+++ b/tests/server/grab.cpp
@@ -53,7 +53,7 @@ public:
     /**
      * Initializes a standard mouse device.
      */
-    virtual void SetUp() {
+    void SetUp() override {
         AddDevice(xorg::testing::inputtest::DeviceType::POINTER);
         AddDevice(xorg::testing::inputtest::DeviceType::KEYBOARD);
 
@@ -67,7 +67,7 @@ public:
      * Sets up an xorg.conf for a single evdev CoreKeyboard device based on
      * the evemu device. The input from GetParam() is used as XkbLayout.
      */
-    virtual void SetUpConfigAndLog() {
+    void SetUpConfigAndLog() override {
 
         config.AddDefaultScreenWithDriver();
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--device--",
@@ -1246,7 +1246,7 @@ TEST_F(TouchGrabTest, GrabMultipleTouchpoints)
 
 
 class TouchGrabTestOnLegacyClient : public TouchGrabTest {
-    virtual void SetUp() {
+    void SetUp() override {
         AddDevice(xorg::testing::inputtest::DeviceType::TOUCH);
         AddDevice(xorg::testing::inputtest::DeviceType::KEYBOARD);
 
@@ -1387,7 +1387,7 @@ TEST_F(TouchGrabTestOnLegacyClient, ActivePointerGrabOverPointerSelection)
 class TouchUngrabTest : public TouchGrabTest,
                         public ::testing::WithParamInterface<enum GrabType>
 {
-    virtual void SetUp() {
+    void SetUp() override {
         AddDevice(xorg::testing::inputtest::DeviceType::TOUCH);
         AddDevice(xorg::testing::inputtest::DeviceType::KEYBOARD);
 
diff --git a/tests/server/input.cpp b/tests/server/input.cpp
index 68968d3..33a487d 100644
--- a/tests/server/input.cpp
+++ b/tests/server/input.cpp
@@ -53,13 +53,13 @@ public:
     /**
      * Initializes a standard mouse device.
      */
-    virtual void SetUp() {
+    void SetUp() override {
         AddDevice(xorg::testing::inputtest::DeviceType::POINTER);
         AddDevice(xorg::testing::inputtest::DeviceType::KEYBOARD);
         XITServerInputTest::SetUp();
     }
 
-    virtual void SetUpConfigAndLog() {
+    void SetUpConfigAndLog() override {
         config.AddDefaultScreenWithDriver();
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--device--",
                                "Option \"CorePointer\" \"on\"\n" +
@@ -83,13 +83,13 @@ public:
     /**
      * Initializes a standard mouse device.
      */
-    virtual void SetUp() {
+    void SetUp() override {
         AddDevice(xorg::testing::inputtest::DeviceType::POINTER_ABSOLUTE);
         AddDevice(xorg::testing::inputtest::DeviceType::KEYBOARD);
         XITServerInputTest::SetUp();
     }
 
-    virtual void SetUpConfigAndLog() {
+    void SetUpConfigAndLog() override {
         config.AddDefaultScreenWithDriver();
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--device--",
                                "Option \"CorePointer\" \"on\"\n" +
@@ -109,17 +109,17 @@ public:
 
 class PointerMotionPressureTest : public XITServerInputTest,
                                   public DeviceInputTestInterface {
-    virtual void SetUp() {
+    void SetUp() override {
         AddDevice(xorg::testing::inputtest::DeviceType::POINTER_ABSOLUTE);
         AddDevice(xorg::testing::inputtest::DeviceType::KEYBOARD);
         XITServerInputTest::SetUp();
     }
 
-    virtual void RequireXI2(int major, int minor, int *major_return, int *minor_return) {
+    void RequireXI2(int major, int minor, int *major_return, int *minor_return) override {
         // don't require XI2
     }
 
-    virtual void SetUpConfigAndLog() {
+    void SetUpConfigAndLog() override {
         config.AddDefaultScreenWithDriver();
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--device--",
                                "Option \"PointerHasPressure\" \"on\"\n"+
@@ -484,13 +484,13 @@ public:
     /**
      * Initializes a standard mouse device.
      */
-    virtual void SetUp() {
+    void SetUp() override {
         AddDevice(xorg::testing::inputtest::DeviceType::POINTER);
         AddDevice(xorg::testing::inputtest::DeviceType::KEYBOARD);
         XITServerInputTest::SetUp();
     }
 
-    virtual void SetUpConfigAndLog() {
+    void SetUpConfigAndLog() override {
         config.AddDefaultScreenWithDriver();
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--device--",
                                "Option \"ConstantDeceleration\" \"20\"\n" +
@@ -701,7 +701,7 @@ public:
     xorg::testing::inputtest::Device& MouseDev() { return Dev(1); }
     xorg::testing::inputtest::Device& KeyboardDev() { return Dev(2); }
 
-    virtual void SetUp() {
+    void SetUp() override {
         AddDevice(xorg::testing::inputtest::DeviceType::TOUCH);
         AddDevice(xorg::testing::inputtest::DeviceType::POINTER);
         AddDevice(xorg::testing::inputtest::DeviceType::KEYBOARD);
@@ -711,7 +711,7 @@ public:
         XITServerInputTest::SetUp();
     }
 
-    virtual void SetUpConfigAndLog() {
+    void SetUpConfigAndLog() override {
         config.AddDefaultScreenWithDriver();
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--device--",
                                "Option \"CorePointer\" \"on\"\n" +
@@ -843,13 +843,13 @@ class PointerAbsoluteTransformationMatrixTest : public XITServerInputTest,
                                                 public DeviceInputTestInterface,
                                                 public ::testing::WithParamInterface<std::tuple<enum ::MatrixType, int> > {
 public:
-    virtual void SetUp() {
+    void SetUp() override {
         AddDevice(xorg::testing::inputtest::DeviceType::POINTER_ABSOLUTE);
         AddDevice(xorg::testing::inputtest::DeviceType::KEYBOARD);
         XITServerInputTest::SetUp();
     }
 
-    virtual void SetUpConfigAndLog() {
+    void SetUpConfigAndLog() override {
         std::tuple<enum MatrixType, int> t = GetParam();
         MatrixType matrix_type = std::get<0>(t);
         int nscreens = std::get<1>(t);
@@ -1056,7 +1056,7 @@ public:
     /**
      * Initializes a standard mouse device.
      */
-    virtual void SetUp() {
+    void SetUp() override {
         AddDevice(xorg::testing::inputtest::DeviceType::KEYBOARD);
         XITServerInputTest::SetUp();
     }
@@ -1065,7 +1065,7 @@ public:
      * Sets up an xorg.conf for a single evdev CoreKeyboard device based on
      * the evemu device. The input from GetParam() is used as XkbLayout.
      */
-    virtual void SetUpConfigAndLog() {
+    void SetUpConfigAndLog() override {
         config.AddDefaultScreenWithDriver();
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--device-kbd--",
                                "Option \"CoreKeyboard\" \"on\"\n" +
@@ -1194,7 +1194,7 @@ TEST_F(KeyboardTest, FocusTestFloatingSlave)
 class XIQueryVersionTest : public XITServerTest,
                            public ::testing::WithParamInterface<int>
 {
-    virtual void SetUpConfigAndLog() {
+    void SetUpConfigAndLog() override {
         config.AddDefaultScreenWithDriver();
         config.WriteConfig();
     }
@@ -1275,14 +1275,14 @@ class FloatingSlaveTest : public XITServerInputTest,
                           public DeviceInputTestInterface,
                           public ::testing::WithParamInterface<xorg::testing::inputtest::DeviceType>
 {
-    virtual void SetUp() {
+    void SetUp() override {
         AddDevice(GetParam());
         AddDevice(xorg::testing::inputtest::DeviceType::KEYBOARD);
         AddDevice(xorg::testing::inputtest::DeviceType::POINTER);
         XITServerInputTest::SetUp();
     }
 
-    virtual void SetUpConfigAndLog() {
+    void SetUpConfigAndLog() override {
         config.AddDefaultScreenWithDriver();
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--device--",
                                "Option \"Floating\" \"on\"\n" +
diff --git a/tests/server/misc.cpp b/tests/server/misc.cpp
index 5f36b29..a2b5355 100644
--- a/tests/server/misc.cpp
+++ b/tests/server/misc.cpp
@@ -47,7 +47,7 @@ public:
     /**
      * Initializes a standard mouse device.
      */
-    virtual void SetUp() {
+    void SetUp() override {
         AddDevice(xorg::testing::inputtest::DeviceType::POINTER);
         AddDevice(xorg::testing::inputtest::DeviceType::KEYBOARD);
         XITServerInputTest::SetUp();
@@ -57,7 +57,7 @@ public:
      * Sets up an xorg.conf for a single evdev CoreKeyboard device based on
      * the evemu device. The input from GetParam() is used as XkbLayout.
      */
-    virtual void SetUpConfigAndLog() {
+    void SetUpConfigAndLog() override {
         config.AddDefaultScreenWithDriver();
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--device--",
                                "Option \"CorePointer\" \"on\"\n"
@@ -243,7 +243,7 @@ TEST_F(ScreenSaverTest, ScreenSaverActivateDeactivate)
 
 class XSyncTest : public XITServerInputTest {
     public:
-    virtual void SetUp() {
+    void SetUp() override {
         XITServerInputTest::SetUp();
         QuerySyncExtension(Display());
     }
@@ -288,13 +288,13 @@ class XSyncTest : public XITServerInputTest {
 class IdletimerTest : public XSyncTest,
                       public DeviceInputTestInterface {
 public:
-    virtual void SetUp() {
+    void SetUp() override {
         AddDevice(xorg::testing::inputtest::DeviceType::POINTER);
         AddDevice(xorg::testing::inputtest::DeviceType::KEYBOARD);
         XSyncTest::SetUp();
     }
 
-    virtual void SetUpConfigAndLog() {
+    void SetUpConfigAndLog() override {
         config.AddDefaultScreenWithDriver();
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--device--",
                                "Option \"CorePointer\" \"on\"\n"
diff --git a/tests/server/multihead.cpp b/tests/server/multihead.cpp
index 53622bf..d504063 100644
--- a/tests/server/multihead.cpp
+++ b/tests/server/multihead.cpp
@@ -85,7 +85,7 @@ public:
         config.WriteConfig();
     }
 
-    virtual void SetUp() {
+    void SetUp() override {
         AddDevice(xorg::testing::inputtest::DeviceType::POINTER);
         AddDevice(xorg::testing::inputtest::DeviceType::KEYBOARD);
         XITServerInputTest::SetUp();
@@ -104,7 +104,7 @@ protected:
 class ZaphodTest : public MultiheadTest,
                    public ::testing::WithParamInterface<bool> {
 public:
-    virtual void SetUp() {
+    void SetUp() override {
         xinerama = false;
         left_of = GetParam();
         MultiheadTest::SetUp();
@@ -390,7 +390,7 @@ INSTANTIATE_TEST_CASE_P(, ZaphodTest, ::testing::Values(true, false));
 
 class XineramaTest : public ZaphodTest {
 public:
-    virtual void SetUp() {
+    void SetUp() override {
         xinerama = true;
         left_of = GetParam();
         MultiheadTest::SetUp();
@@ -487,7 +487,7 @@ INSTANTIATE_TEST_CASE_P(, XineramaTest, ::testing::Values(true, false));
 
 class ZaphodTouchDeviceChangeTest : public MultiheadTest {
 protected:
-    virtual void SetUpConfigAndLog() {
+    void SetUpConfigAndLog() override {
         config.SetAutoAddDevices(true);
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--device-touch--",
                                "Option \"CorePointer\" \"on\"\n"
@@ -529,7 +529,7 @@ protected:
         config.WriteConfig();
     }
 
-    virtual void SetUp() {
+    void SetUp() override {
         AddDevice(xorg::testing::inputtest::DeviceType::TOUCH);
         AddDevice(xorg::testing::inputtest::DeviceType::POINTER);
         AddDevice(xorg::testing::inputtest::DeviceType::KEYBOARD);
diff --git a/tests/server/touch.cpp b/tests/server/touch.cpp
index 969e879..f2ad4be 100644
--- a/tests/server/touch.cpp
+++ b/tests/server/touch.cpp
@@ -44,7 +44,7 @@
 class TouchTest : public XITServerInputTest,
                   public DeviceInputTestInterface {
 protected:
-    virtual void SetUp() {
+    void SetUp() override {
         AddDevice(xorg::testing::inputtest::DeviceType::TOUCH);
         AddDevice(xorg::testing::inputtest::DeviceType::KEYBOARD);
 
@@ -54,7 +54,7 @@ protected:
         XITServerInputTest::SetUp();
     }
 
-    virtual void SetUpConfigAndLog() {
+    void SetUpConfigAndLog() override {
         config.AddDefaultScreenWithDriver();
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--device--",
                                "Option \"Emulate3Buttons\" \"off\""
@@ -155,13 +155,13 @@ TEST_F(TouchTest, TouchEventFlags)
 class TouchTestXI2Version : public TouchTest,
                             public ::testing::WithParamInterface<int> {
 protected:
-    virtual void SetUpConfigAndLog()
+    void SetUpConfigAndLog() override
     {
         config.SetAutoAddDevices(true);
         TouchTest::SetUpConfigAndLog();
     }
 
-    virtual void RequireXI2(int major, int minor, int *maj_ret, int *min_ret)
+    void RequireXI2(int major, int minor, int *maj_ret, int *min_ret) override
     {
         XITServerInputTest::RequireXI2(2, GetParam());
     }
@@ -170,13 +170,13 @@ protected:
 class TouchTestXI2VersionWithMouse : public TouchTestWithMouse,
                                      public ::testing::WithParamInterface<int> {
 protected:
-    virtual void SetUpConfigAndLog()
+    void SetUpConfigAndLog() override
     {
         config.SetAutoAddDevices(true);
         TouchTestWithMouse::SetUpConfigAndLog();
     }
 
-    virtual void RequireXI2(int major, int minor, int *maj_ret, int *min_ret)
+    void RequireXI2(int major, int minor, int *maj_ret, int *min_ret) override
     {
         XITServerInputTest::RequireXI2(2, GetParam());
     }
diff --git a/tests/server/xephyr.cpp b/tests/server/xephyr.cpp
index ce11c00..49c25f5 100644
--- a/tests/server/xephyr.cpp
+++ b/tests/server/xephyr.cpp
@@ -36,7 +36,7 @@
 using namespace xorg::testing;
 
 class Xephyr24bppTest : public XITServerTest {
-    virtual void SetUpConfigAndLog() {
+    void SetUpConfigAndLog() override {
         config.SetAutoAddDevices(true);
         config.AppendRawConfig(
             "Section \"ServerLayout\"\n"
@@ -97,7 +97,7 @@ TEST_F(Xephyr24bppTest, CrashOn24bppHost)
 }
 
 class Xephyr8bppTest : public XITServerTest {
-    virtual void SetUpConfigAndLog() {
+    void SetUpConfigAndLog() override {
         config.AddDefaultScreenWithDriver();
         config.WriteConfig();
     }
diff --git a/tests/server/xtest.cpp b/tests/server/xtest.cpp
index 429f3a4..897a260 100644
--- a/tests/server/xtest.cpp
+++ b/tests/server/xtest.cpp
@@ -152,13 +152,13 @@ public:
     /**
      * Initializes a standard mouse device.
      */
-    virtual void SetUp() {
+    void SetUp() override {
         AddDevice(xorg::testing::inputtest::DeviceType::POINTER);
         AddDevice(xorg::testing::inputtest::DeviceType::KEYBOARD);
         XITServerInputTest::SetUp();
     }
 
-    virtual void SetUpConfigAndLog() {
+    void SetUpConfigAndLog() override {
 
         config.AddDefaultScreenWithDriver();
         config.AddInputSection(XORG_INPUTTEST_DRIVER, "--device--",
diff --git a/tests/video/video-module-load.cpp b/tests/video/video-module-load.cpp
index 3fdc25b..466fd42 100644
--- a/tests/video/video-module-load.cpp
+++ b/tests/video/video-module-load.cpp
@@ -33,7 +33,7 @@
 
 class VideoModuleLoadTest : public SimpleVideoDriverTest {
 public:
-    virtual void SetUp() {
+    void SetUp() override {
         try {
             SimpleVideoDriverTest::SetUp();
         } catch (std::runtime_error &e) {