From 837fa4549c457786a33150082a7528afd3484eaf Mon Sep 17 00:00:00 2001
From: Lasse Fister
Date: Tue, 6 Oct 2015 04:54:00 +0200
Subject: first set of fixes to upgrade to ufo_v3

---
 Lib/defconQt/glyphView.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'Lib/defconQt/glyphView.py')

diff --git a/Lib/defconQt/glyphView.py b/Lib/defconQt/glyphView.py
index 7b151fa..32e1fe5 100644
--- a/Lib/defconQt/glyphView.py
+++ b/Lib/defconQt/glyphView.py
@@ -809,17 +809,17 @@ class GlyphScene(QGraphicsScene):
         elif event.matches(QKeySequence.Undo):
             if len(self._dataForUndo) > 0:
                 undo = self._dataForUndo.pop()
-                redo = self._glyphObject.serializeForUndo()
-                self._glyphObject.deserializeFromUndo(undo)
+                redo = self._glyphObject.serialize()
+                self._glyphObject.deserialize(undo)
                 self._dataForRedo.append(redo)
             event.accept()
             return
         elif event.matches(QKeySequence.Redo):
             if len(self._dataForRedo) > 0:
-                undo = self._glyphObject.serializeForUndo()
+                undo = self._glyphObject.serialize()
                 redo = self._dataForRedo.pop()
                 self._dataForUndo.append(undo)
-                self._glyphObject.deserializeFromUndo(redo)
+                self._glyphObject.deserialize(redo)
             event.accept()
             return
         elif event.matches(QKeySequence.SelectAll):
@@ -843,7 +843,7 @@ class GlyphScene(QGraphicsScene):
             # TODO: somehow try to do this in the pen
             # pass the glyph to a controller object that holds a self._pen
             copyGlyph.width = self._glyphObject.width
-            mimeData.setData("application/x-defconQt-glyph-data", pickle.dumps([copyGlyph.serializeForUndo(False)]))
+            mimeData.setData("application/x-defconQt-glyph-data", pickle.dumps([copyGlyph.serialize()]))
             clipboard.setMimeData(mimeData)
             event.accept()
             return
@@ -855,7 +855,7 @@ class GlyphScene(QGraphicsScene):
                 if len(data) == 1:
                     pen = self._glyphObject.getPointPen()
                     pasteGlyph = TGlyph()
-                    pasteGlyph.deserializeFromUndo(data[0])
+                    pasteGlyph.deserialize(data[0])
                     pasteGlyph.drawPoints(pen)
             event.accept()
             return
@@ -894,7 +894,7 @@ class GlyphScene(QGraphicsScene):
             self.rulerMousePress(event)
             return
         else:
-            data = self._glyphObject.serializeForUndo()
+            data = self._glyphObject.serialize()
             self._dataForUndo.append(data)
             self._dataForRedo = []
             if view._currentTool == SceneTools.KnifeTool:
-- 
cgit v1.2.3