Merge pull request #2875 from jasp00/journal

Split journal ID range between new and loaded elements

include/ProjectJournal.h

@@ -76,6 +76,8 @@ public:
 		reallocID( _id, NULL );
 	}
 
+	static jo_id_t idToSave( jo_id_t id );
+
 	void clearJournal();
 	void stopAllJournalling();
 	JournallingObject * journallingObject( const jo_id_t _id )

include/ProjectNotes.h

@@ -29,7 +29,7 @@
 #include <QMainWindow>
 #include <QCloseEvent>
 
-#include "JournallingObject.h"
+#include "SerializingObject.h"
 
 class QAction;
 class QComboBox;