Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 94844816550ad672ccfcdc25659c625546239998.

1 files changed, 9 insertions, 9 deletions

diff --git a/filters/kpresenter/magicpoint/mgp2kpr.py b/filters/kpresenter/magicpoint/mgp2kpr.py
index 97527471..e2e5b50a 100755
--- a/filters/kpresenter/magicpoint/mgp2kpr.py
+++ b/filters/kpresenter/magicpoint/mgp2kpr.py
@@ -56,7 +56,7 @@ class MgpImporter:
     self.__reset()           #init properties
 
   def __reset(self):
-    self.alignment="1"       #text alignment, left
+    self.tqalignment="1"       #text tqalignment, left
     self.vgap=1              #line spacing
 
     #font properties
@@ -167,14 +167,14 @@ class MgpImporter:
   def __setAlign(self,command):
     tokens=string.split(command,' ')
     if (tokens[0]=='leftfill'): #justify
-      self.alignment="8"
+      self.tqalignment="8"
     elif (tokens[0]=='right'):
-      self.alignment="2"
+      self.tqalignment="2"
     elif (tokens[0]=='center'):
-      self.alignment="4"
+      self.tqalignment="4"
     else:
-      self.alignment="1" #left
-    #print self.alignment
+      self.tqalignment="1" #left
+    #print self.tqalignment
 
   def __setBackground(self,parent):
     pageElem=self.document.createElement("PAGE")
@@ -233,7 +233,7 @@ class MgpImporter:
     indent=-1
     
     pElem=self.document.createElement("P")          #paragraph
-    pElem.setAttribute("align", self.alignment) 
+    pElem.setAttribute("align", self.tqalignment) 
 
     elem=self.document.createElement("NAME")        #style name
     elem.setAttribute("value", "Standard")          ###is this needed at all?
@@ -283,7 +283,7 @@ class MgpImporter:
     if (self.fontItalic!=0):
       elem.setAttribute("italic", "1")
     
-    text=self.document.createTextNode(unicode(line, self.charset, 'ignore'))
+    text=self.document.createTextNode(tqunicode(line, self.charset, 'ignore'))
     elem.appendChild(text)
     pElem.appendChild(elem)
     self.textElem.appendChild(pElem)
@@ -377,7 +377,7 @@ class MgpImporter:
             self.__setFontSize(command)
           elif (command.startswith('left') or
                 command.startswith('center') or
-                command.startswith('right')):             #text alignment
+                command.startswith('right')):             #text tqalignment
             self.__setAlign(command)
           elif (command.startswith('charset')):           #charset
             self.__setCharset(command)