From c0b51d9c0be1bcaa3988bbd44768d8e3220fb816 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Sat, 31 Jan 2015 14:03:20 +0000 Subject: Fix typo in class name --- p2pvr/daemon/maintenance/events.cpp | 2 +- p2pvr/daemon/maintenance/network.cpp | 2 +- p2pvr/daemon/maintenance/services.cpp | 2 +- p2pvr/daemon/storage.h | 2 +- p2pvr/daemon/unittests/testErrorHandling.cpp | 8 ++++---- p2pvr/lib/serviceStreamer.h | 4 ++-- p2pvr/lib/temporaryIceAdapterObject.h | 10 +++++----- p2pvr/p2comp/recordingStream.cpp | 2 +- p2pvr/p2comp/serviceStream.cpp | 4 ++-- 9 files changed, 18 insertions(+), 18 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 parser(ice.adapter, + TemporaryIceAdapterObject 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 parser(ice.adapter, siparser); + TemporaryIceAdapterObject 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 parser(ice.adapter, siparser); + TemporaryIceAdapterObject 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 OpenFile; + typedef TemporaryIceAdapterObject OpenFile; typedef boost::shared_ptr OpenFilePtr; typedef std::set 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 a(adapter, new TestClient()); + TemporaryIceAdapterObject 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 a(adapter, new TestNetworkParser()); + TemporaryIceAdapterObject 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 a(adapter, new FailingTestClient()); + TemporaryIceAdapterObject 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 a(adapter, new FailingTestNetworkParser()); + TemporaryIceAdapterObject a(adapter, new FailingTestNetworkParser()); BOOST_CHECKPOINT("Make failing call"); BOOST_REQUIRE_THROW(gd->SendNetworkInformation(a), P2PVR::DataHandlingException); } diff --git a/p2pvr/lib/serviceStreamer.h b/p2pvr/lib/serviceStreamer.h index 20ea8e2..9a7250f 100644 --- a/p2pvr/lib/serviceStreamer.h +++ b/p2pvr/lib/serviceStreamer.h @@ -27,8 +27,8 @@ class ServiceStreamer { P2PVR::SIPrx si; P2PVR::TunerPrx tuner; P2PVR::RawDataClientPrx target; - TemporarayIceAdapterObject patParser; - TemporarayIceAdapterObject pmtParser; + TemporaryIceAdapterObject patParser; + TemporaryIceAdapterObject pmtParser; int serviceId; int patHandle; diff --git a/p2pvr/lib/temporaryIceAdapterObject.h b/p2pvr/lib/temporaryIceAdapterObject.h index bc1dfcf..949661a 100644 --- a/p2pvr/lib/temporaryIceAdapterObject.h +++ b/p2pvr/lib/temporaryIceAdapterObject.h @@ -4,9 +4,9 @@ #include template -class TemporarayIceAdapterObject { +class TemporaryIceAdapterObject { public: - TemporarayIceAdapterObject(Ice::ObjectAdapterPtr a, Object * o) : + TemporaryIceAdapterObject(Ice::ObjectAdapterPtr a, Object * o) : adapter(a), object(o), proxy(Object::ProxyType::checkedCast(adapter->addWithUUID(object))) @@ -15,13 +15,13 @@ class TemporarayIceAdapterObject { } } - ~TemporarayIceAdapterObject() + ~TemporaryIceAdapterObject() { adapter->remove(proxy->ice_getIdentity()); } - TemporarayIceAdapterObject(const TemporarayIceAdapterObject &) = delete; - void operator=(const TemporarayIceAdapterObject &) = delete; + TemporaryIceAdapterObject(const TemporaryIceAdapterObject &) = delete; + void operator=(const TemporaryIceAdapterObject &) = delete; operator typename Object::ProxyType() const { diff --git a/p2pvr/p2comp/recordingStream.cpp b/p2pvr/p2comp/recordingStream.cpp index 21e8684..b77a2ce 100644 --- a/p2pvr/p2comp/recordingStream.cpp +++ b/p2pvr/p2comp/recordingStream.cpp @@ -22,7 +22,7 @@ class RecordingStream : public StreamBase { std::promise prom; { - TemporarayIceAdapterObject output(adapter, new StreamSinkWrapper(sink, prom)); + TemporaryIceAdapterObject output(adapter, new StreamSinkWrapper(sink, prom)); try { auto range = getRange(ec); diff --git a/p2pvr/p2comp/serviceStream.cpp b/p2pvr/p2comp/serviceStream.cpp index 307cb93..02d19d1 100644 --- a/p2pvr/p2comp/serviceStream.cpp +++ b/p2pvr/p2comp/serviceStream.cpp @@ -26,9 +26,9 @@ class ServiceStream : public StreamBase { std::promise prom; { - TemporarayIceAdapterObject output(adapter, new StreamSinkWrapper(sink, prom)); + TemporaryIceAdapterObject output(adapter, new StreamSinkWrapper(sink, prom)); { - TemporarayIceAdapterObject muxer(adapter, new Muxer(output, muxerCommand)); + TemporaryIceAdapterObject muxer(adapter, new Muxer(output, muxerCommand)); ServiceStreamerPtr ss(new ServiceStreamer(serviceId(ec), muxer, devices, si, adapter)); -- cgit v1.2.3