summaryrefslogtreecommitdiff
path: root/p2pvr/daemon
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2015-01-17 03:06:11 +0000
committerDan Goodliffe <dan@randomdan.homeip.net>2015-06-13 17:29:47 +0100
commit8d8a3dbb2f7fc37b1c46905b531a5793705252b3 (patch)
treea23eb662e815c5a5d1e7d4578f3825daf145af95 /p2pvr/daemon
parentMigrate schedulecandidate to slicer model and migrate remaining bits of sched... (diff)
downloadp2pvr-8d8a3dbb2f7fc37b1c46905b531a5793705252b3.tar.bz2
p2pvr-8d8a3dbb2f7fc37b1c46905b531a5793705252b3.tar.xz
p2pvr-8d8a3dbb2f7fc37b1c46905b531a5793705252b3.zip
Remove remaining support code for old school DB selects
Diffstat (limited to 'p2pvr/daemon')
-rw-r--r--p2pvr/daemon/events.cpp2
-rw-r--r--p2pvr/daemon/recordings.cpp1
-rw-r--r--p2pvr/daemon/schedules.cpp1
-rw-r--r--p2pvr/daemon/sqlContainerCreator.h28
4 files changed, 1 insertions, 31 deletions
diff --git a/p2pvr/daemon/events.cpp b/p2pvr/daemon/events.cpp
index 40db4df..01fe01e 100644
--- a/p2pvr/daemon/events.cpp
+++ b/p2pvr/daemon/events.cpp
@@ -1,5 +1,5 @@
#include <pch.hpp>
-#include "containerCreator.h"
+#include "containerIterator.h"
#include <p2pvr.h>
#include <p2Helpers.h>
diff --git a/p2pvr/daemon/recordings.cpp b/p2pvr/daemon/recordings.cpp
index e3e92a0..9b79d60 100644
--- a/p2pvr/daemon/recordings.cpp
+++ b/p2pvr/daemon/recordings.cpp
@@ -3,7 +3,6 @@
#include "resources.h"
#include <Ice/Ice.h>
#include <logger.h>
-#include "sqlContainerCreator.h"
#include <slicer/slicer.h>
#include "sqlSelectDeserializer.h"
diff --git a/p2pvr/daemon/schedules.cpp b/p2pvr/daemon/schedules.cpp
index 1590312..f5aaad1 100644
--- a/p2pvr/daemon/schedules.cpp
+++ b/p2pvr/daemon/schedules.cpp
@@ -1,6 +1,5 @@
#include <pch.hpp>
#include "schedules.h"
-#include "sqlContainerCreator.h"
#include <rdbmsDataSource.h>
#include <logger.h>
#include <Ice/Ice.h>
diff --git a/p2pvr/daemon/sqlContainerCreator.h b/p2pvr/daemon/sqlContainerCreator.h
deleted file mode 100644
index 5c8d8f8..0000000
--- a/p2pvr/daemon/sqlContainerCreator.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef SQLCONTAINERCREATOR_H
-#define SQLCONTAINERCREATOR_H
-
-#include "containerCreator.h"
-#include <boost/shared_ptr.hpp>
-#include <selectcommand.h>
-#include <sqlHandleAsVariableType.h>
-
-template <typename T, typename V, typename P = IceInternal::Handle<V>>
-class SqlContainerCreator : public ContainerCreator<T, V, P> {
- public:
- SqlContainerCreator(T & c) : ContainerCreator<T, V, P>(c) { }
-
- void populate(boost::shared_ptr<DB::SelectCommand> sel)
- {
- sel->execute();
- ContainerCreator<T, V, P>::populate(boost::bind(&DB::SelectCommand::fetch, sel), [sel](unsigned int c) {
- HandleAsVariableType h;
- const DB::Column & col = (*sel)[c];
- col.apply(h);
- return h.variable;
- }, sel->columnCount());
- }
-};
-
-
-#endif
-