From 2aba31fa7b94cfc6c83fc74123e2140aa8325fa7 Mon Sep 17 00:00:00 2001 From: mpv Date: Thu, 22 May 2014 16:08:53 +0400 Subject: [PATCH] Unresolved symbols problem fix --- src/Model/Model_Events.cpp | 15 --------------- src/Model/Model_Events.h | 14 ++++++++++++-- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/src/Model/Model_Events.cpp b/src/Model/Model_Events.cpp index 76655e1ee..35606208d 100644 --- a/src/Model/Model_Events.cpp +++ b/src/Model/Model_Events.cpp @@ -5,21 +5,6 @@ #include #include -// UPDATED methods -Events_MessageGroup* Model_FeatureUpdatedMessage::newEmpty() { - boost::shared_ptr anEmptyFeature; - return new Model_FeatureUpdatedMessage(anEmptyFeature, eventID()); -} - -void Model_FeatureUpdatedMessage::Join(Events_MessageGroup& theJoined) -{ - Model_FeatureUpdatedMessage* aJoined = dynamic_cast(&theJoined); - std::set >::iterator aFIter = aJoined->myFeatures.begin(); - for(; aFIter != aJoined->myFeatures.end(); aFIter++) { - myFeatures.insert(*aFIter); - } -} - // DELETED methods Events_MessageGroup* Model_FeatureDeletedMessage::newEmpty() { return new Model_FeatureDeletedMessage(myDoc, ""); diff --git a/src/Model/Model_Events.h b/src/Model/Model_Events.h index 4423238e0..6f8631fb3 100644 --- a/src/Model/Model_Events.h +++ b/src/Model/Model_Events.h @@ -38,9 +38,19 @@ public: std::set > features() const {return myFeatures;} //! Creates a new empty group (to store it in the loop before flush) - virtual Events_MessageGroup* newEmpty(); + virtual Events_MessageGroup* newEmpty() { + boost::shared_ptr anEmptyFeature; + return new Model_FeatureUpdatedMessage(anEmptyFeature, eventID()); + } + //! Allows to join the given message with the current one - virtual void Join(Events_MessageGroup& theJoined); + virtual void Join(Events_MessageGroup& theJoined) { + Model_FeatureUpdatedMessage* aJoined = dynamic_cast(&theJoined); + std::set >::iterator aFIter = aJoined->myFeatures.begin(); + for(; aFIter != aJoined->myFeatures.end(); aFIter++) { + myFeatures.insert(*aFIter); + } + } }; /// Message that feature was deleted (used for Object Browser update) -- 2.39.2