PINK: remove >> << operators

4 files changed, 5 insertions, 9 deletions

diff --git a/engines/pink/objects/walk/walk_location.cpp b/engines/pink/objects/walk/walk_location.cpp
index da5718f3d9..e3998daeb5 100644
--- a/engines/pink/objects/walk/walk_location.cpp
+++ b/engines/pink/objects/walk/walk_location.cpp
@@ -29,7 +29,7 @@ namespace Pink {
 
 void WalkLocation::deserialize(Pink::Archive &archive) {
     NamedObject::deserialize(archive);
-    archive >> _neighbors;
+    _neighbors.deserialize(archive);
 }
 
 void WalkLocation::toConsole() {
diff --git a/engines/pink/objects/walk/walk_location.h b/engines/pink/objects/walk/walk_location.h
index 3de039002d..b9b2a0abae 100644
--- a/engines/pink/objects/walk/walk_location.h
+++ b/engines/pink/objects/walk/walk_location.h
@@ -22,9 +22,7 @@
 #ifndef PINK_WALK_LOCATION_H
 #define PINK_WALK_LOCATION_H
 
-#include "common/str-array.h"
-
-#include "pink/objects/object.h"
+#include "pink/utils.h"
 
 namespace Pink {
 
@@ -35,7 +33,7 @@ public:
     Common::StringArray &getNeigbors() { return _neighbors;}
 
 private:
-    Common::StringArray _neighbors;
+    StringArray _neighbors;
 };
 
 } // End of namespace Pink
diff --git a/engines/pink/objects/walk/walk_mgr.cpp b/engines/pink/objects/walk/walk_mgr.cpp
index ad447a94bf..4c0b120918 100644
--- a/engines/pink/objects/walk/walk_mgr.cpp
+++ b/engines/pink/objects/walk/walk_mgr.cpp
@@ -37,7 +37,7 @@ WalkMgr::WalkMgr()
 
 void WalkMgr::deserialize(Pink::Archive &archive) {
     _leadActor = static_cast<LeadActor *>(archive.readObject());
-    archive >> _locations;
+    _locations.deserialize(archive);
 }
 
 WalkLocation *WalkMgr::findLocation(const Common::String &name) {
diff --git a/engines/pink/objects/walk/walk_mgr.h b/engines/pink/objects/walk/walk_mgr.h
index 522dcf884c..994796942b 100644
--- a/engines/pink/objects/walk/walk_mgr.h
+++ b/engines/pink/objects/walk/walk_mgr.h
@@ -23,8 +23,6 @@
 #ifndef PINK_WALK_MGR_H
 #define PINK_WALK_MGR_H
 
-#include "common/array.h"
-
 #include "pink/objects/object.h"
 #include "pink/objects/walk/walk_shortest_path.h"
 
@@ -65,7 +63,7 @@ private:
 
     LeadActor *_leadActor;
     WalkLocation *_destination;
-    Common::Array<WalkLocation*> _locations;
+    Array<WalkLocation*> _locations;
     WayPoint _current;
     WayPoint _next;
     bool _isWalking;