From: Giovanni Gherdovich <ggherdov@brentaal.inria.fr>
Date: Wed, 15 Sep 2010 10:18:51 +0000 (+0200)
Subject: Merge branch 'master' of git://git.onelab.eu/sface
X-Git-Tag: sface-0.1-1~19
X-Git-Url: http://git.onelab.eu/?p=sface.git;a=commitdiff_plain;h=8c9d054133c19052e03bc3029ade2476271ac55d;hp=-c

Merge branch 'master' of git://git.onelab.eu/sface
---

8c9d054133c19052e03bc3029ade2476271ac55d
diff --combined sface/screens/rspecscreen.py
index dc79c83,37bbc2f..772f4cb
--- a/sface/screens/rspecscreen.py
+++ b/sface/screens/rspecscreen.py
@@@ -25,15 -25,6 +25,15 @@@ class DomModel(QAbstractItemModel)
      def __init__(self, document, parent = 0):
          QAbstractItemModel.__init__(self, parent)
          self.domDocument = document
 +        # one of the children of the rootItem is the 'xml' thing.
 +        # here I delete it.
 +        childList = document.childNodes()
 +        for i in range(childList.count()):
 +            currElem = childList.item(i)
 +            if (currElem.nodeType() ==
 +                QDomNode.ProcessingInstructionNode):
 +                document.removeChild(currElem)
 +                break
          self.rootItem = DomItem(document, 0);
  
      def data(self, index, role):
@@@ -71,8 -62,7 +71,8 @@@
              elif node.nodeType() == QDomNode.EntityNode:
                  return QString('unsupported node type')
              elif node.nodeType() == QDomNode.ProcessingInstructionNode:
 -                return node.nodeName()
 +                return QVariant()
 +                #return node.nodeName()
              elif node.nodeType() == QDomNode.CommentNode:
                  return QString('#').append(node.nodeValue())
              elif node.nodeType() == QDomNode.DocumentNode:
@@@ -175,7 -165,10 +175,10 @@@ class DomItem
  class RSpecWidget(QWidget):
      def __init__(self, parent=None):
          QWidget.__init__(self, parent)
+ 
+         self.view = RSpecView(self)
          self.updateView()
+         
  
      def updateView(self):
          document = QDomDocument("RSpec")