removed client library stubs

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index c996df7..3343acf 100644 (file)
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -1,5 +1,5 @@
-set(amb_sources abstractpropertytype.cpp abstractroutingengine.cpp listplusplus.cpp abstractsink.cpp vehicleproperty.cpp abstractsource.cpp debugout.cpp timestamp.cpp uuidhelper.cpp mappropertytype.hpp propertyinfo.hpp ambclient.cpp dbusclient.cpp)
-set(amb_headers_install abstractpropertytype.h nullptr.h abstractroutingengine.h listplusplus.h abstractsink.h vehicleproperty.h debugout.h abstractsource.h timestamp.h uuidhelper.h mappropertytype.hpp propertyinfo.hpp ambclient.h dbusclient.h)
+set(amb_sources abstractpropertytype.cpp abstractroutingengine.cpp listplusplus.cpp abstractsink.cpp vehicleproperty.cpp abstractsource.cpp debugout.cpp timestamp.cpp uuidhelper.cpp mappropertytype.hpp propertyinfo.hpp)
+set(amb_headers_install abstractpropertytype.h nullptr.h abstractroutingengine.h listplusplus.h abstractsink.h vehicleproperty.h debugout.h abstractsource.h timestamp.h uuidhelper.h mappropertytype.hpp propertyinfo.hpp)
 
 add_library(amb SHARED ${amb_sources})
 

diff --git a/lib/ambclient.cpp b/lib/ambclient.cpp
deleted file mode 100644 (file)
index 19d3f34..0000000
--- a/lib/ambclient.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-#include "ambclient.h"
-
-#include "dbusclient.h"
-
-#ifdef websocket_plugin
-//#include "websocketclient.h"
-#endif
-
-#ifdef bluetooth_plugin
-//#include "bluetoothclient.h"
-#endif
-
-AbstractAmbClient *AbstractAmbClient::create(AbstractAmbClient::ClientType type)
-{
-       if(type == AbstractAmbClient::DBus)
-       {
-               return new DBusClient();
-       }
-       else if(type == AbstractAmbClient::Bluetooth)
-       {
-#ifdef bluetooth_plugin
-
-#endif
-       }
-       else if(type == AbstractAmbClient::Websockets)
-       {
-#ifdef websocket_plugin
-
-#endif
-       }
-
-       return nullptr;
-}

diff --git a/lib/ambclient.h b/lib/ambclient.h
deleted file mode 100644 (file)
index 1942a99..0000000
--- a/lib/ambclient.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef AMBCLIENT_H_
-#define AMBCLIENT_H_
-
-#include <functional>
-
-#include "abstractpropertytype.h"
-#include "vehicleproperty.h"
-
-typedef std::function<void (AbstractPropertyType*)> PropertyReplyCbType;
-
-typedef std::function<void (bool)> SetReplyType;
-
-
-
-class AbstractAmbClient {
-public:
-
-       enum ClientType {
-               DBus,
-               Bluetooth,
-               Websockets
-       };
-
-       AbstractAmbClient() {}
-
-       virtual PropertyList supported()=0;
-
-       virtual void get(VehicleProperty property, PropertyReplyCbType reply) = 0;
-
-       virtual void set(AbstractPropertyType* value, SetReplyType reply) = 0;
-
-       virtual int subscribe(VehicleProperty property, PropertyReplyCbType callback) = 0;
-
-       virtual void unsubscribe(int handle) = 0;
-
-       static AbstractAmbClient* create(ClientType type = DBus);
-};
-
-#endif

diff --git a/lib/dbusclient.cpp b/lib/dbusclient.cpp
deleted file mode 100644 (file)
index 6cb7d14..0000000
--- a/lib/dbusclient.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#include "dbusclient.h"
-
-
-PropertyList DBusClient::supported()
-{
-}
-
-void DBusClient::get(VehicleProperty property, PropertyReplyCbType reply)
-{
-}
-
-void DBusClient::set(AbstractPropertyType *value, SetReplyType reply)
-{
-}
-
-int DBusClient::subscribe(VehicleProperty property, PropertyReplyCbType callback)
-{
-}
-
-void DBusClient::unsubscribe(int handle)
-{
-}

diff --git a/lib/dbusclient.h b/lib/dbusclient.h
deleted file mode 100644 (file)
index ec4ef80..0000000
--- a/lib/dbusclient.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef DBUSCLIENT_H_
-#define DBUSCLIENT_H_
-
-#include "ambclient.h"
-
-class DBusClient : public AbstractAmbClient
-{
-public:
-
-
-       // AbstractAmbClient interface
-public:
-       PropertyList supported();
-       void get(VehicleProperty property, PropertyReplyCbType reply);
-       void set(AbstractPropertyType *value, SetReplyType reply);
-       int subscribe(VehicleProperty property, PropertyReplyCbType callback);
-       void unsubscribe(int handle);
-};
-
-#endif