Rename JournalWriter class to just Journal.

1 files changed, 8 insertions, 8 deletions

diff --git a/server/src/sessionserialiser.cc b/server/src/sessionserialiser.cc
index 2c35d2a..9b5e393 100644
--- a/server/src/sessionserialiser.cc
+++ b/server/src/sessionserialiser.cc
@@ -27,7 +27,7 @@
  */
 #include "sessionserialiser.h"
 
-#include "journalwriter.h"
+#include "journal.h"
 
 #include "sessionparser.h"
 #include "database.h"
@@ -66,7 +66,7 @@ void SessionSerialiser::loadStr(const std::string &xml)
   SessionParser parser;
   parser.parse(xml.data(), xml.length());
 
-  JournalWriter *j = session->journal();
+  Journal *j = session->journal();
   j->currentuser = XDEC(parser.userid);
   j->currentcpr = XDEC(parser.patientid);
   std::vector<SessionParser::Entry>::iterator i = parser.entries.begin();
@@ -88,12 +88,12 @@ std::string SessionSerialiser::saveStr()
   xml += "<session timestamp=\""+itostr(time(NULL))+"\" "
     "id=\""+session->id()+"\">\n";
 
-  JournalWriter *journal = session->journal();
+  Journal *journal = session->journal();
 
   xml += "  <journal patientid=\"" + XENC(journal->currentcpr) +
     "\" userid=\"" + XENC(journal->currentuser) + "\">\n";
 
-  std::map< int, JournalWriter::ResumeEntry >::iterator i =
+  std::map< int, Journal::ResumeEntry >::iterator i =
     journal->entrylist.begin();
   while(i != journal->entrylist.end()) {
 
@@ -148,7 +148,7 @@ void SessionSerialiser::save()
 }
 
 #ifdef TEST_SESSIONSERIALISER
-//deps: session.cc journalwriter.cc debug.cc configuration.cc mutex.cc journal_commit.cc sessionparser.cc saxparser.cc
+//deps: session.cc journal.cc debug.cc configuration.cc mutex.cc journal_commit.cc sessionparser.cc saxparser.cc
 //cflags: -I.. $(PTHREAD_CFLAGS) $(EXPAT_CFLAGS)
 //libs: $(PTHREAD_LIBS) $(EXPAT_LIBS)
 #include "test.h"
@@ -162,7 +162,7 @@ std::string xml;
 
 {
   Session session(SID);
-  JournalWriter *j = session.journal();
+  Journal *j = session.journal();
   j->addEntry("some text", "macro1", 0);
   j->addEntry("some more text", "macro2", 2);
   j->addEntry("yet some more text", "macro3", 1);
@@ -175,7 +175,7 @@ std::string xml;
 
 {
   Session session(SID);
-  JournalWriter *j = session.journal();
+  Journal *j = session.journal();
   j->addEntry("some text", "macro1", 0);
   j->addEntry("some more text", "macro2", 2);
   j->addEntry("yet some more text", "macro3", 1);
@@ -193,7 +193,7 @@ std::string xml;
 
 {
   Session session(SID);
-  JournalWriter *j = session.journal();
+  Journal *j = session.journal();
   j->addEntry("some text", "macro1", 0);
   j->addEntry("some more text", "macro2", 2);
   j->addEntry("yet some more text", "macro3", 1);