W1Store --> Store...

[lib1wire.git] / src / DeviceData.hh

diff --git a/src/DeviceData.hh b/src/DeviceData.hh
index e3b3727d482e08bd737d195dc91459780476858d..eb64b0662fb2f15a0404acdb2c3c42c39944c7fc 100644 (file)
--- a/src/DeviceData.hh
+++ b/src/DeviceData.hh
@@ -22,26 +22,26 @@ namespace w1 {
                public:
                        DeviceData(std::string device_id);
                        virtual ~DeviceData();
-                       DataRange *get_data_range();
-                       Data *get_daily_summary(plp::Date *date, int calc_type);
+                       plp::DataRange *get_data_range();
+                       plp::Data *get_daily_summary(plp::Date *date, int calc_type);
                        /**
                         * Get summary data calculated from the daily data items that is meaning full.
                         * Depending from the device type, it may be daily mean value, daily delta, highest value, etc...
                         */
-                       Data *get_daily_summary(plp::Date *date);
-                       DataRange *get_daily_summary(plp::Date *start_date, plp::Date *end_date);
-                       std::vector<Data *> *get_hourly_summary(plp::Date *date, int calc_type);
-                       std::vector<Data *> *get_hourly_summary(plp::Date *date);
-                       DataRange *get_hourly_summary(plp::Date *start_date, plp::Date *end_date);
-                       DataRange *get_data(plp::Date *start_date, plp::Date *end_date);
+                       plp::Data *get_daily_summary(plp::Date *date);
+                       plp::DataRange *get_daily_summary(plp::Date *start_date, plp::Date *end_date);
+                       std::vector<plp::Data *> *get_hourly_summary(plp::Date *date, int calc_type);
+                       std::vector<plp::Data *> *get_hourly_summary(plp::Date *date);
+                       plp::DataRange *get_hourly_summary(plp::Date *start_date, plp::Date *end_date);
+                       plp::DataRange *get_data(plp::Date *start_date, plp::Date *end_date);
                protected:
                        std::string                     device_id;
                        std::string                     device_dir;
                        std::string                     device_ch_dir;
                        w1::DeviceConfig                *device_config;
                        enum_summary_calculation        summary_calc_type;
-                       Data *find_oldest_data(std::vector<std::string> year_vector);
-                       Data *find_newest_data(std::vector<std::string> year_vector);
+                       plp::Data *find_oldest_data(std::vector<std::string> year_vector);
+                       plp::Data *find_newest_data(std::vector<std::string> year_vector);
        };
 }