From d2b5b8d854506fe80e268c9090920319888d5826 Mon Sep 17 00:00:00 2001 From: DennisOSRM Date: Fri, 30 Dec 2011 12:20:36 +0100 Subject: [PATCH] Const'ed read-only functions in BasePlugin and derived classes. --- Plugins/BasePlugin.h | 4 ++-- Plugins/HelloWorldPlugin.h | 5 +++-- Plugins/LocatePlugin.h | 4 ++-- Plugins/NearestPlugin.h | 4 ++-- Plugins/ViaRoutePlugin.h | 4 ++-- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Plugins/BasePlugin.h b/Plugins/BasePlugin.h index de3262ac8..266d5d83a 100644 --- a/Plugins/BasePlugin.h +++ b/Plugins/BasePlugin.h @@ -33,8 +33,8 @@ public: BasePlugin() { } //Maybe someone can explain the pure virtual destructor thing to me (dennis) virtual ~BasePlugin() { } - virtual std::string GetDescriptor() = 0; - virtual std::string GetVersionString() = 0; + virtual std::string GetDescriptor() const = 0; + virtual std::string GetVersionString() const = 0 ; virtual void HandleRequest(const RouteParameters & routeParameters, http::Reply& reply) = 0; }; diff --git a/Plugins/HelloWorldPlugin.h b/Plugins/HelloWorldPlugin.h index 4488474e9..345514f13 100644 --- a/Plugins/HelloWorldPlugin.h +++ b/Plugins/HelloWorldPlugin.h @@ -17,7 +17,9 @@ class HelloWorldPlugin : public BasePlugin { public: HelloWorldPlugin() {} virtual ~HelloWorldPlugin() { /*std::cout << GetDescriptor() << " destructor" << std::endl;*/ } - std::string GetDescriptor() { return std::string("hello"); } + std::string GetDescriptor() const { return std::string("hello"); } + std::string GetVersionString() const { return std::string("0.1a"); } + void HandleRequest(const RouteParameters & routeParameters, http::Reply& reply) { std::cout << "[hello world]: runnning handler" << std::endl; reply.status = http::Reply::ok; @@ -36,7 +38,6 @@ public: reply.content.append(content.str()); reply.content.append(""); } - std::string GetVersionString() { return std::string("0.1a"); } }; #endif /* HELLOWORLDPLUGIN_H_ */ diff --git a/Plugins/LocatePlugin.h b/Plugins/LocatePlugin.h index 962a3b3ac..16a99f9c7 100644 --- a/Plugins/LocatePlugin.h +++ b/Plugins/LocatePlugin.h @@ -37,8 +37,8 @@ public: LocatePlugin(ObjectsForQueryStruct * objects) { nodeHelpDesk = objects->nodeHelpDesk; } - std::string GetDescriptor() { return std::string("locate"); } - std::string GetVersionString() { return std::string("0.3 (DL)"); } + std::string GetDescriptor() const { return std::string("locate"); } + std::string GetVersionString() const { return std::string("0.3 (DL)"); } void HandleRequest(const RouteParameters & routeParameters, http::Reply& reply) { //check number of parameters if(routeParameters.parameters.size() != 2) { diff --git a/Plugins/NearestPlugin.h b/Plugins/NearestPlugin.h index e9690fb2a..0bc061db5 100644 --- a/Plugins/NearestPlugin.h +++ b/Plugins/NearestPlugin.h @@ -43,8 +43,8 @@ public: descriptorTable.Set("kml", 0); descriptorTable.Set("json", 1); } - std::string GetDescriptor() { return std::string("nearest"); } - std::string GetVersionString() { return std::string("0.3 (DL)"); } + std::string GetDescriptor() const { return std::string("nearest"); } + std::string GetVersionString() const { return std::string("0.3 (DL)"); } void HandleRequest(const RouteParameters & routeParameters, http::Reply& reply) { //check number of parameters if(routeParameters.parameters.size() != 2) { diff --git a/Plugins/ViaRoutePlugin.h b/Plugins/ViaRoutePlugin.h index 20ef60d46..7e953b89d 100644 --- a/Plugins/ViaRoutePlugin.h +++ b/Plugins/ViaRoutePlugin.h @@ -68,8 +68,8 @@ public: DELETE( searchEngine ); } - std::string GetDescriptor() { return pluginDescriptorString; } - std::string GetVersionString() { return std::string("0.3 (DL)"); } + std::string GetDescriptor() const { return pluginDescriptorString; } + std::string GetVersionString() const { return std::string("0.3 (DL)"); } void HandleRequest(const RouteParameters & routeParameters, http::Reply& reply) { //check number of parameters if(0 == routeParameters.options["start"].size() || 0 == routeParameters.options["dest"].size() ) {