PINK: remove >> << operators

6 files changed, 12 insertions, 14 deletions

diff --git a/engines/pink/objects/sequences/seq_timer.cpp b/engines/pink/objects/sequences/seq_timer.cpp
index c8d166a0cd..e661308c56 100644
--- a/engines/pink/objects/sequences/seq_timer.cpp
+++ b/engines/pink/objects/sequences/seq_timer.cpp
@@ -35,7 +35,7 @@ SeqTimer::SeqTimer()
         : _updatesToMessage(0) {}
 
 void SeqTimer::deserialize(Archive &archive) {
-    archive >> _actor;
+    _actor = archive.readString();
     _period = archive.readDWORD();
     _range = archive.readDWORD();
     _sequencer = static_cast<Sequencer*>(archive.readObject());
diff --git a/engines/pink/objects/sequences/sequence.cpp b/engines/pink/objects/sequences/sequence.cpp
index ae979658f2..4cd041b087 100644
--- a/engines/pink/objects/sequences/sequence.cpp
+++ b/engines/pink/objects/sequences/sequence.cpp
@@ -46,7 +46,7 @@ Sequence::~Sequence() {
 void Sequence::deserialize(Archive &archive) {
     NamedObject::deserialize(archive);
     _sequencer = static_cast<Sequencer*>(archive.readObject());
-    archive >> _items;
+    _items.deserialize(archive);
 }
 
 void Sequence::toConsole() {
@@ -138,7 +138,7 @@ void Sequence::skipSubSequence() {
 
 void SequenceAudio::deserialize(Archive &archive) {
     Sequence::deserialize(archive);
-    archive >> _soundName;
+    _soundName = archive.readString();
 }
 
 void SequenceAudio::toConsole() {
diff --git a/engines/pink/objects/sequences/sequence.h b/engines/pink/objects/sequences/sequence.h
index ba6d3be35a..e40b0160e2 100644
--- a/engines/pink/objects/sequences/sequence.h
+++ b/engines/pink/objects/sequences/sequence.h
@@ -23,8 +23,6 @@
 #ifndef PINK_SEQUENCE_H
 #define PINK_SEQUENCE_H
 
-#include "common/array.h"
-
 #include "pink/objects/object.h"
 
 namespace Pink {
@@ -58,7 +56,7 @@ public:
 public:
     SequenceContext *_context;
     Sequencer *_sequencer;
-    Common::Array<SequenceItem*> _items;
+    Array<SequenceItem*> _items;
     int _unk;
 };
 
diff --git a/engines/pink/objects/sequences/sequence_item.cpp b/engines/pink/objects/sequences/sequence_item.cpp
index a6574b15de..07c708baf5 100644
--- a/engines/pink/objects/sequences/sequence_item.cpp
+++ b/engines/pink/objects/sequences/sequence_item.cpp
@@ -34,7 +34,8 @@
 namespace Pink {
 
 void SequenceItem::deserialize(Archive &archive) {
-    archive >> _actor >> _action;
+    _actor = archive.readString();
+    _action = archive.readString();
 }
 
 void SequenceItem::toConsole() {
diff --git a/engines/pink/objects/sequences/sequencer.cpp b/engines/pink/objects/sequences/sequencer.cpp
index b8628193ff..852011cce7 100644
--- a/engines/pink/objects/sequences/sequencer.cpp
+++ b/engines/pink/objects/sequences/sequencer.cpp
@@ -44,7 +44,8 @@ Sequencer::~Sequencer() {
 }
 
 void Sequencer::deserialize(Archive &archive) {
-    archive >> _sequences >> _timers;
+    _sequences.deserialize(archive);
+    _timers.deserialize(archive);
 }
 
 Sequence *Sequencer::findSequence(const Common::String &name) {
diff --git a/engines/pink/objects/sequences/sequencer.h b/engines/pink/objects/sequences/sequencer.h
index 850649d23e..a48439768b 100644
--- a/engines/pink/objects/sequences/sequencer.h
+++ b/engines/pink/objects/sequences/sequencer.h
@@ -23,8 +23,6 @@
 #ifndef PINK_SEQUENCER_H
 #define PINK_SEQUENCER_H
 
-#include "common/array.h"
-
 #include "pink/objects/object.h"
 
 namespace Pink {
@@ -62,10 +60,10 @@ public:
 
     SequenceContext *_context;
     // context array
-    Common::Array<Sequence*> _sequences;
-    Common::String _currentSequenceName;
-    Common::Array<SeqTimer*> _timers;
-    GamePage *_page;
+    Array<Sequence*> _sequences;
+    Array<SeqTimer*> _timers;
+	Common::String _currentSequenceName;
+	GamePage *_page;
     uint _time;
 };