COMMON: Split common/stream.h into several headers

svn-id: r54385

6 files changed, 9 insertions, 17 deletions

diff --git a/engines/parallaction/disk_ns.cpp b/engines/parallaction/disk_ns.cpp
index 0b893fbe2c..12455af5e7 100644
--- a/engines/parallaction/disk_ns.cpp
+++ b/engines/parallaction/disk_ns.cpp
@@ -25,6 +25,8 @@
 
 #include "common/config-manager.h"
 #include "common/fs.h"
+#include "common/memstream.h"
+#include "common/substream.h"
 #include "parallaction/parser.h"
 #include "parallaction/parallaction.h"
 
@@ -1087,4 +1089,4 @@ Common::SeekableReadStream* AmigaDisk_ns::loadSound(const char* name) {
 	return tryOpenFile(path);
 }
 
-} // namespace Parallaction
+} // End of namespace Parallaction
diff --git a/engines/parallaction/font.cpp b/engines/parallaction/font.cpp
index bf2bf6d419..18f469f0a2 100644
--- a/engines/parallaction/font.cpp
+++ b/engines/parallaction/font.cpp
@@ -24,7 +24,7 @@
  */
 
 #include "common/endian.h"
-#include "common/stream.h"
+#include "common/memstream.h"
 
 #include "parallaction/parallaction.h"
 
@@ -670,7 +670,6 @@ GfxObj* DosDisk_br::createInventoryObjects(Common::SeekableReadStream &stream) {
 
 
 void Parallaction_ns::initFonts() {
-
 	if (getPlatform() == Common::kPlatformPC) {
 		_dialogueFont = _disk->loadFont("comic");
 		_labelFont = _disk->loadFont("topaz");
@@ -683,7 +682,6 @@ void Parallaction_ns::initFonts() {
 		_menuFont = _disk->loadFont("slide");
 		_introFont = _disk->loadFont("intro");
 	}
-
 }
 
 void Parallaction_br::initFonts() {
@@ -701,4 +699,4 @@ void Parallaction_br::initFonts() {
 	}
 }
 
-}
+} // End of namespace Parallaction
diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp
index 2de7fe9d64..1c0ab9defd 100644
--- a/engines/parallaction/parallaction.cpp
+++ b/engines/parallaction/parallaction.cpp
@@ -1004,4 +1004,4 @@ void Parallaction::scheduleLocationSwitch(const char *location) {
 }
 
 
-} // namespace Parallaction
+} // End of namespace Parallaction
diff --git a/engines/parallaction/parallaction.h b/engines/parallaction/parallaction.h
index ded1b3bda4..a8a57ed2d8 100644
--- a/engines/parallaction/parallaction.h
+++ b/engines/parallaction/parallaction.h
@@ -606,7 +606,7 @@ private:
 extern Parallaction *_vm;
 
 
-} // namespace Parallaction
+} // End of namespace Parallaction
 
 
 #endif
diff --git a/engines/parallaction/parser.cpp b/engines/parallaction/parser.cpp
index df1e91e8b4..c964b74512 100644
--- a/engines/parallaction/parser.cpp
+++ b/engines/parallaction/parser.cpp
@@ -257,5 +257,4 @@ void Parser::parseStatement() {
 	(*(*_currentOpcodes)[_lookup])();
 }
 
-
-} // namespace Parallaction
+} // End of namespace Parallaction
diff --git a/engines/parallaction/parser.h b/engines/parallaction/parser.h
index 5eb26e9fa1..7887b2192f 100644
--- a/engines/parallaction/parser.h
+++ b/engines/parallaction/parser.h
@@ -409,13 +409,6 @@ public:
 	virtual void parse(Script *script, ProgramPtr program);
 };
 
-
-} // namespace Parallaction
+} // End of namespace Parallaction
 
 #endif
-
-
-
-
-
-