Commit 420f5736 authored by Micha Mueller's avatar Micha Mueller
Browse files

Rename headers/ directory to includes/

parent 5ee328cf
......@@ -11,10 +11,9 @@
#include <set>
#include "HttpsServer.h"
#include "headers/PluginDefinitions.h"
#include <boost/property_tree/ptree.hpp>
#include <boost/log/trivial.hpp>
#include "includes/PluginDefinitions.h"
typedef struct {
int daemonize;
......
......@@ -22,8 +22,8 @@
#include <boost/asio.hpp>
#include "headers/Logging.h"
#include "headers/PluginDefinitions.h"
#include "includes/Logging.h"
#include "includes/PluginDefinitions.h"
#include "MQTTPusher.h"
typedef struct {
......
......@@ -8,8 +8,8 @@
#ifndef MQTTPUSHER_H_
#define MQTTPUSHER_H_
#include "headers/PluginDefinitions.h"
#include <mosquitto.h>
#include "includes/PluginDefinitions.h"
/**
* Class responsible for collecting values from the sensors and pushing them to the database.
......
......@@ -10,6 +10,7 @@
#include <string>
#include <vector>
#include "SensorGroupTemplate.h"
typedef struct {
......
......@@ -8,17 +8,15 @@
#ifndef SRC_CONFIGURATORTEMPLATE_H_
#define SRC_CONFIGURATORTEMPLATE_H_
#include "ConfiguratorInterface.h"
#include "SensorBase.h"
#include "SensorGroupTemplate.h"
#include <map>
#include <boost/foreach.hpp>
#include <boost/algorithm/string.hpp>
#include <boost/property_tree/ptree.hpp>
#include <boost/property_tree/info_parser.hpp>
#include "ConfiguratorInterface.h"
#include "SensorBase.h"
#include "SensorGroupTemplate.h"
//#define STRCMP(node,str) boost::iequals(node.first,str) //DEPRECATED
#define CFG_TREE boost::property_tree::iptree&
......
......@@ -8,9 +8,8 @@
#ifndef SENSORGROUPTEMPLATE_H_
#define SENSORGROUPTEMPLATE_H_
#include "SensorGroupInterface.h"
#include <vector>
#include "SensorGroupInterface.h"
template <typename S>
class SensorGroupTemplate : public SensorGroupInterface {
......
......@@ -8,12 +8,11 @@
#ifndef BACNETCLIENT_H_
#define BACNETCLIENT_H_
#include "../../headers/Logging.h"
#include "apdu.h"
#include "bacenum.h"
#include "datalink.h"
#include <boost/asio.hpp>
#include "../../includes/Logging.h"
/*
* NOTE
......
......@@ -8,9 +8,9 @@
#ifndef BACNETCONFIGURATOR_H_
#define BACNETCONFIGURATOR_H_
#include "../../includes/ConfiguratorTemplate.h"
#include "BACnetClient.h"
#include "../../headers/ConfiguratorTemplate.h"
#include "BACnetSingleSensor.h"
class BACnetConfigurator: public ConfiguratorTemplate<BACnetSensorBase, BACnetSingleSensor> {
......
......@@ -12,7 +12,7 @@
#include <list>
#include "../../headers/ConfiguratorTemplate.h"
#include "../../includes/ConfiguratorTemplate.h"
#include "IPMISingleSensor.h"
namespace DCDB {
......
......@@ -8,12 +8,11 @@
#ifndef IPMIHOST_H_
#define IPMIHOST_H_
#include "../../headers/Logging.h"
#include <string>
#include <list>
#include <freeipmi/freeipmi.h>
#include <boost/asio.hpp>
#include "../../includes/Logging.h"
namespace DCDB {
......
......@@ -8,8 +8,7 @@
#ifndef OPA_OPACONFIGURATOR_H_
#define OPA_OPACONFIGURATOR_H_
#include "../../headers/ConfiguratorTemplate.h"
#include "../../includes/ConfiguratorTemplate.h"
#include "OpaSensorGroup.h"
#include "OpaSingleSensor.h"
......
......@@ -8,7 +8,7 @@
#ifndef OPA_OPASENSORBASE_H_
#define OPA_OPASENSORBASE_H_
#include "../../headers/SensorBase.h"
#include "../../includes/SensorBase.h"
enum PORT_COUNTER_DATA {
portXmitData = 0,
......
......@@ -8,8 +8,7 @@
#ifndef OPA_OPASENSORGROUP_H_
#define OPA_OPASENSORGROUP_H_
#include "../../headers/SensorGroupTemplate.h"
#include "../../includes/SensorGroupTemplate.h"
#include "OpaAttributes.h"
#include "OpaSensorBase.h"
......
......@@ -11,7 +11,7 @@
#include "PDUUnit.h"
#include <list>
#include "../../headers/ConfiguratorTemplate.h"
#include "../../includes/ConfiguratorTemplate.h"
#include "PDUSingleSensor.h"
class PDUConfigurator: public ConfiguratorTemplate<PDUSensorBase, PDUSingleSensor> {
......
......@@ -8,8 +8,6 @@
#ifndef PDUUNIT_H_
#define PDUUNIT_H_
#include "../../headers/Logging.h"
#include <tuple>
#include <vector>
#include <utility>
......@@ -17,6 +15,7 @@
#include <boost/asio.hpp>
#include <boost/property_tree/ptree.hpp>
#include "../../includes/Logging.h"
typedef std::vector<std::pair<std::string, std::string>> attributesVector_t;
......
......@@ -8,8 +8,7 @@
#ifndef PERFSENSORGROUP_H_
#define PERFSENSORGROUP_H_
#include "../../headers/SensorGroupTemplate.h"
#include "../../includes/SensorGroupTemplate.h"
#include "PerfAttributes.h"
#include "PerfSensorBase.h"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment