Add override

4 files changed, 12 insertions, 22 deletions

diff --git a/configutil/src/apps/configstatus/main.cpp b/configutil/src/apps/configstatus/main.cpp
index f774afa355d..4583af033c2 100644
--- a/configutil/src/apps/configstatus/main.cpp
+++ b/configutil/src/apps/configstatus/main.cpp
@@ -17,8 +17,8 @@ class Application : public FastOS_Application {
     vespalib::string getSources();
     HostFilter parse_host_set(vespalib::stringref raw_arg) const;
 public:
-    void usage(void);
-    int Main(void) override;
+    void usage();
+    int Main() override;
 
     Application();
     ~Application();
diff --git a/configutil/src/lib/configstatus.cpp b/configutil/src/lib/configstatus.cpp
index 174350c5eca..5a876a30ab5 100644
--- a/configutil/src/lib/configstatus.cpp
+++ b/configutil/src/lib/configstatus.cpp
@@ -9,9 +9,6 @@
 #include <vbench/http/http_client.h>
 #include <iostream>
 
-#include <vespa/log/log.h>
-LOG_SETUP("vespa-config-status");
-
 using configdefinitions::tagsContain;
 
 struct ComponentTraverser : public vespalib::slime::ObjectTraverser
@@ -41,8 +38,7 @@ struct ComponentTraverser : public vespalib::slime::ObjectTraverser
         slime.get()["config"].traverse(traverser);
     }
 
-    virtual void
-    field(const vespalib::Memory &symbol_name, const vespalib::slime::Inspector &inspector) override {
+    void field(const vespalib::Memory &symbol_name, const vespalib::slime::Inspector &inspector) override {
         switch (_state) {
         case ROOT:
             _component = symbol_name.make_string();
@@ -87,16 +83,16 @@ public:
     {}
     ~MyHttpHandler();
 
-    virtual void handleHeader(const vbench::string &name, const vbench::string &value) override {
+    void handleHeader(const vbench::string &name, const vbench::string &value) override {
         (void) name;
         (void) value;
     }
 
-    virtual void handleContent(const vbench::Memory &data) override {
+    void handleContent(const vbench::Memory &data) override {
         _json += std::string(data.data, data.size);
     }
 
-    virtual void handleFailure(const vbench::string &reason) override {
+    void handleFailure(const vbench::string &reason) override {
         std::cerr << _configId << ": Failed to fetch json: " << reason << std::endl;
         _error = reason;
     }
diff --git a/configutil/src/tests/config_status/config_status_test.cpp b/configutil/src/tests/config_status/config_status_test.cpp
index 77fcf1b8da8..39442068330 100644
--- a/configutil/src/tests/config_status/config_status_test.cpp
+++ b/configutil/src/tests/config_status/config_status_test.cpp
@@ -1,14 +1,10 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/fastos/fastos.h>
 #include <vespa/vespalib/testkit/testapp.h>
 #include <lib/configstatus.h>
-#include <iostream>
 #include <vespa/fastlib/net/httpserver.h>
 #include <vespa/config-model.h>
 #include <vespa/config/config.h>
 #include <vespa/config/subscription/sourcespec.h>
-#include <vector>
-#include <string>
 
 using namespace config;
 
@@ -17,8 +13,7 @@ private:
     std::string _reply;
     bool _fail;
 
-    virtual void onGetRequest(const string &, const string &,
-                              Fast_HTTPConnection &conn) override {
+    void onGetRequest(const string &, const string &, Fast_HTTPConnection &conn) override {
         if (_fail) {
             conn.Output(conn.GetHTTPVersion().c_str());
             conn.Output(" 500 Error\r\n");
diff --git a/configutil/src/tests/model_inspect/model_inspect_test.cpp b/configutil/src/tests/model_inspect/model_inspect_test.cpp
index be45d4d0d46..fe818e8e4e4 100644
--- a/configutil/src/tests/model_inspect/model_inspect_test.cpp
+++ b/configutil/src/tests/model_inspect/model_inspect_test.cpp
@@ -1,8 +1,7 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/fastos/fastos.h>
 #include <vespa/vespalib/testkit/test_kit.h>
 #include <lib/modelinspect.h>
-#include <iostream>
+#include <sstream>
 
 class Model {
 public:
@@ -89,11 +88,11 @@ public:
     void listServices() override { _listServices = true; };
     void listClusters() override { _listClusters = true; };
     void listConfigIds() override { _listConfigIds = true; };
-    int listHost(const vespalib::string)  override { _listHost = true; return 0; };
+    int listHost(const vespalib::string) override  { _listHost = true; return 0; };
     int listAllPorts() override { _listAllPorts = true; return 0; };
-    int listCluster(const vespalib::string)  override { _listCluster = true; return 0; };
-    int listService(const vespalib::string)  override { _listService = true; return 0; };
-    int listService(const vespalib::string, const vespalib::string)  override { _listService2 = true; return 0; };
+    int listCluster(const vespalib::string) override  { _listCluster = true; return 0; };
+    int listService(const vespalib::string) override  { _listService = true; return 0; };
+    int listService(const vespalib::string, const vespalib::string) override  { _listService2 = true; return 0; };
     int listConfigId(const vespalib::string) override { _listConfigId = true; return 0; };
     int getIndexOf(const vespalib::string, const vespalib::string) override { _getIndexOf = true; return 0; };