From e7ffb611cb84c0c356996edb822880eea5671a5f Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Wed, 17 Nov 2010 01:09:21 +0000 Subject: [PATCH] This changes things to match Ray's Java event hierarchy change. I don't know whether it's desirable, or breaks things, or what. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6281 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- src/cpp/presents/dobj/EntryAddedEvent.cpp | 4 ++-- src/cpp/presents/dobj/EntryAddedEvent.h | 4 ++-- src/cpp/presents/dobj/EntryRemovedEvent.cpp | 4 ++-- src/cpp/presents/dobj/EntryRemovedEvent.h | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/cpp/presents/dobj/EntryAddedEvent.cpp b/src/cpp/presents/dobj/EntryAddedEvent.cpp index 738e9e659..4f762bb05 100644 --- a/src/cpp/presents/dobj/EntryAddedEvent.cpp +++ b/src/cpp/presents/dobj/EntryAddedEvent.cpp @@ -7,12 +7,12 @@ DEFINE_STREAMABLE("com.threerings.presents.dobj.EntryAddedEvent", EntryAddedEven void EntryAddedEvent::readObject (ObjectInputStream& in) { - presents::dobj::NamedEvent::readObject(in); + presents::dobj::EntryEvent::readObject(in); entry = boost::static_pointer_cast(in.readObject()); } void EntryAddedEvent::writeObject (ObjectOutputStream& out) const { - presents::dobj::NamedEvent::writeObject(out); + presents::dobj::EntryEvent::writeObject(out); out.writeObject(entry); } diff --git a/src/cpp/presents/dobj/EntryAddedEvent.h b/src/cpp/presents/dobj/EntryAddedEvent.h index b19b59548..7fc30f03d 100644 --- a/src/cpp/presents/dobj/EntryAddedEvent.h +++ b/src/cpp/presents/dobj/EntryAddedEvent.h @@ -6,11 +6,11 @@ #include "presents/streamers/StreamableStreamer.h" #include "presents/Streamable.h" -#include "presents/dobj/NamedEvent.h" +#include "presents/dobj/EntryEvent.h" namespace presents { namespace dobj { -class EntryAddedEvent : public presents::dobj::NamedEvent { +class EntryAddedEvent : public presents::dobj::EntryEvent { public: DECLARE_STREAMABLE(); diff --git a/src/cpp/presents/dobj/EntryRemovedEvent.cpp b/src/cpp/presents/dobj/EntryRemovedEvent.cpp index f3f80527d..77e9e2331 100644 --- a/src/cpp/presents/dobj/EntryRemovedEvent.cpp +++ b/src/cpp/presents/dobj/EntryRemovedEvent.cpp @@ -7,12 +7,12 @@ DEFINE_STREAMABLE("com.threerings.presents.dobj.EntryRemovedEvent", EntryRemoved void EntryRemovedEvent::readObject (ObjectInputStream& in) { - presents::dobj::NamedEvent::readObject(in); + presents::dobj::EntryEvent::readObject(in); key = boost::static_pointer_cast(in.readObject()); } void EntryRemovedEvent::writeObject (ObjectOutputStream& out) const { - presents::dobj::NamedEvent::writeObject(out); + presents::dobj::EntryEvent::writeObject(out); out.writeObject(key); } diff --git a/src/cpp/presents/dobj/EntryRemovedEvent.h b/src/cpp/presents/dobj/EntryRemovedEvent.h index 89fd01da9..f178470f7 100644 --- a/src/cpp/presents/dobj/EntryRemovedEvent.h +++ b/src/cpp/presents/dobj/EntryRemovedEvent.h @@ -6,11 +6,11 @@ #include "presents/streamers/StreamableStreamer.h" #include "presents/Streamable.h" -#include "presents/dobj/NamedEvent.h" +#include "presents/dobj/EntryEvent.h" namespace presents { namespace dobj { -class EntryRemovedEvent : public presents::dobj::NamedEvent { +class EntryRemovedEvent : public presents::dobj::EntryEvent { public: DECLARE_STREAMABLE();