summaryrefslogtreecommitdiff
path: root/p2pvr/daemon
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2015-01-31 14:03:20 +0000
committerDan Goodliffe <dan@randomdan.homeip.net>2015-06-13 17:29:49 +0100
commitc0b51d9c0be1bcaa3988bbd44768d8e3220fb816 (patch)
tree7ffbc17929e23019d17c067cf76a49413d5d121e /p2pvr/daemon
parentBuild right pch and include main ice header (diff)
downloadp2pvr-c0b51d9c0be1bcaa3988bbd44768d8e3220fb816.tar.bz2
p2pvr-c0b51d9c0be1bcaa3988bbd44768d8e3220fb816.tar.xz
p2pvr-c0b51d9c0be1bcaa3988bbd44768d8e3220fb816.zip
Fix typo in class name
Diffstat (limited to 'p2pvr/daemon')
-rw-r--r--p2pvr/daemon/maintenance/events.cpp2
-rw-r--r--p2pvr/daemon/maintenance/network.cpp2
-rw-r--r--p2pvr/daemon/maintenance/services.cpp2
-rw-r--r--p2pvr/daemon/storage.h2
-rw-r--r--p2pvr/daemon/unittests/testErrorHandling.cpp8
5 files changed, 8 insertions, 8 deletions
diff --git a/p2pvr/daemon/maintenance/events.cpp b/p2pvr/daemon/maintenance/events.cpp
index 4ac92e8..9a22cd9 100644
--- a/p2pvr/daemon/maintenance/events.cpp
+++ b/p2pvr/daemon/maintenance/events.cpp
@@ -50,7 +50,7 @@ class SiEventsMerger : public IHaveSubTasks {
throw std::runtime_error("bad proxy(s)");
}
- TemporarayIceAdapterObject<P2PVR::RawDataClient> parser(ice.adapter,
+ TemporaryIceAdapterObject<P2PVR::RawDataClient> parser(ice.adapter,
new SiEventsHandler(boost::bind(&SiEventsMerger::executeChildren, this, ec), ecs));
auto delivery = si->GetDeliveryForSi();
diff --git a/p2pvr/daemon/maintenance/network.cpp b/p2pvr/daemon/maintenance/network.cpp
index 815b488..0152a29 100644
--- a/p2pvr/daemon/maintenance/network.cpp
+++ b/p2pvr/daemon/maintenance/network.cpp
@@ -77,7 +77,7 @@ Maintenance::UpdateNetwork(short type, const Ice::Current & ice)
auto devs = P2PVR::DevicesPrx::checkedCast(ice.adapter->createProxy(ic->stringToIdentity("GlobalDevices")));
auto si = P2PVR::SIPrx::checkedCast(ice.adapter->createProxy(ic->stringToIdentity("SI")));
auto siparser = new SiNetworkInformationMerger(this);
- TemporarayIceAdapterObject<P2PVR::RawDataClient> parser(ice.adapter, siparser);
+ TemporaryIceAdapterObject<P2PVR::RawDataClient> parser(ice.adapter, siparser);
if (!devs) {
throw std::runtime_error("bad proxy(s)");
diff --git a/p2pvr/daemon/maintenance/services.cpp b/p2pvr/daemon/maintenance/services.cpp
index 0ab962c..6619d42 100644
--- a/p2pvr/daemon/maintenance/services.cpp
+++ b/p2pvr/daemon/maintenance/services.cpp
@@ -49,7 +49,7 @@ Maintenance::UpdateServices(const Ice::Current & ice)
}
auto siparser = new SiServicesMerger(this);
- TemporarayIceAdapterObject<P2PVR::RawDataClient> parser(ice.adapter, siparser);
+ TemporaryIceAdapterObject<P2PVR::RawDataClient> parser(ice.adapter, siparser);
auto delivery = si->GetDeliveryForSi();
if (!delivery) {
diff --git a/p2pvr/daemon/storage.h b/p2pvr/daemon/storage.h
index 0655bd2..144d6bd 100644
--- a/p2pvr/daemon/storage.h
+++ b/p2pvr/daemon/storage.h
@@ -18,7 +18,7 @@ class Storage : public P2PVR::Storage {
INITOPTIONS;
protected:
- typedef TemporarayIceAdapterObject<P2PVR::RawDataClient> OpenFile;
+ typedef TemporaryIceAdapterObject<P2PVR::RawDataClient> OpenFile;
typedef boost::shared_ptr<OpenFile> OpenFilePtr;
typedef std::set<OpenFilePtr> OpenFiles;
OpenFiles openFiles;
diff --git a/p2pvr/daemon/unittests/testErrorHandling.cpp b/p2pvr/daemon/unittests/testErrorHandling.cpp
index 91942b0..ca5bd63 100644
--- a/p2pvr/daemon/unittests/testErrorHandling.cpp
+++ b/p2pvr/daemon/unittests/testErrorHandling.cpp
@@ -95,7 +95,7 @@ BOOST_AUTO_TEST_CASE(TestRawDataClient)
BOOST_CHECKPOINT("Setup");
auto del = s->GetDeliveryForSi();
auto gd = d->GetTunerAny(del);
- TemporarayIceAdapterObject<P2PVR::RawDataClient> a(adapter, new TestClient());
+ TemporaryIceAdapterObject<P2PVR::RawDataClient> a(adapter, new TestClient());
BOOST_CHECKPOINT("Make successful call");
gd->SendNetworkInformation(a);
}
@@ -105,7 +105,7 @@ BOOST_AUTO_TEST_CASE(TestParser)
BOOST_CHECKPOINT("Setup");
auto del = s->GetDeliveryForSi();
auto gd = d->GetTunerAny(del);
- TemporarayIceAdapterObject<P2PVR::RawDataClient> a(adapter, new TestNetworkParser());
+ TemporaryIceAdapterObject<P2PVR::RawDataClient> a(adapter, new TestNetworkParser());
BOOST_CHECKPOINT("Make successful call");
gd->SendNetworkInformation(a);
}
@@ -115,7 +115,7 @@ BOOST_AUTO_TEST_CASE(TestRawDataClientWithError)
BOOST_CHECKPOINT("Setup");
auto del = s->GetDeliveryForSi();
auto gd = d->GetTunerAny(del);
- TemporarayIceAdapterObject<P2PVR::RawDataClient> a(adapter, new FailingTestClient());
+ TemporaryIceAdapterObject<P2PVR::RawDataClient> a(adapter, new FailingTestClient());
BOOST_CHECKPOINT("Make failing call");
BOOST_REQUIRE_THROW(gd->SendNetworkInformation(a), P2PVR::DataHandlingException);
}
@@ -125,7 +125,7 @@ BOOST_AUTO_TEST_CASE(TestParserWithError)
BOOST_CHECKPOINT("Setup");
auto del = s->GetDeliveryForSi();
auto gd = d->GetTunerAny(del);
- TemporarayIceAdapterObject<P2PVR::RawDataClient> a(adapter, new FailingTestNetworkParser());
+ TemporaryIceAdapterObject<P2PVR::RawDataClient> a(adapter, new FailingTestNetworkParser());
BOOST_CHECKPOINT("Make failing call");
BOOST_REQUIRE_THROW(gd->SendNetworkInformation(a), P2PVR::DataHandlingException);
}