Have db_old load news.db too

1 files changed, 2 insertions, 33 deletions

diff --git a/include/modules/os_news.h b/include/modules/os_news.h
index b1e717455..458a5a82b 100644
--- a/include/modules/os_news.h
+++ b/include/modules/os_news.h
@@ -23,14 +23,14 @@ struct NewsItem : Serializable
 	time_t time;
 
 	NewsItem() : Serializable("NewsItem") { }
-	void Serialize(Serialize::Data &data) const anope_override;
-	static Serializable* Unserialize(Serializable *obj, Serialize::Data &data);
 };
 
 class NewsService : public Service
 {
  public:
 	NewsService(Module *m) : Service(m, "NewsService", "news") { }
+
+	virtual NewsItem *CreateNewsItem() = 0;
 	
 	virtual void AddNewsItem(NewsItem *n) = 0;
 	
@@ -41,36 +41,5 @@ class NewsService : public Service
 
 static ServiceReference<NewsService> news_service("NewsService", "news");
 
-void NewsItem::Serialize(Serialize::Data &data) const
-{
-	data["type"] << this->type;
-	data["text"] << this->text;
-	data["who"] << this->who;
-	data["time"] << this->time;
-}
-
-Serializable* NewsItem::Unserialize(Serializable *obj, Serialize::Data &data)
-{
-	if (!news_service)
-		return NULL;
-
-	NewsItem *ni;
-	if (obj)
-		ni = anope_dynamic_static_cast<NewsItem *>(obj);
-	else
-		ni = new NewsItem();
-
-	unsigned int t;
-	data["type"] >> t;
-	ni->type = static_cast<NewsType>(t);
-	data["text"] >> ni->text;
-	data["who"] >> ni->who;
-	data["time"] >> ni->time;
-
-	if (!obj)
-		news_service->AddNewsItem(ni);
-	return ni;
-}
-
 #endif // OS_NEWS