From f39fc65768abd12577664cf086ab6255a2f17d01 Mon Sep 17 00:00:00 2001
From: No'am Rosenthal <noam.rosenthal@nokia.com>
Date: Sat, 3 Oct 2009 14:28:51 -0700
Subject: adjust scc to QStateMachine API changes (remove QSignalEvent and
 postInternalEvent)

---
 scc/scc.xslt | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'scc/scc.xslt')

diff --git a/scc/scc.xslt b/scc/scc.xslt
index e023e96..1f5fc20 100644
--- a/scc/scc.xslt
+++ b/scc/scc.xslt
@@ -50,13 +50,13 @@
 <xsl:template mode="execContext" match="s:raise|s:send">
 <xsl:call-template name="comment" />
             <xsl:choose>
-                <xsl:when test="name()='raise' or target='_internal'">postInternalEvent(</xsl:when>
+                <xsl:when test="name()='raise' or @target='_internal'">postEvent(</xsl:when>
                 <xsl:otherwise><xsl:if test="string(@id)!=''">
                  _eventSenders["<xsl:value-of select="@id" />"] = </xsl:if>new SCC_EventSender(this,<xsl:if test="string(@delay)=''">0</xsl:if>
                     <xsl:value-of select="@delay" />,
                             </xsl:otherwise>
                     </xsl:choose>
-                            new QSignalEvent(<xsl:if
+                            new QStateMachine::SignalEvent(<xsl:if
                         test="string(@target)=''">this</xsl:if><xsl:value-of
                         select="@target" />,metaObject()->indexOfSignal(QMetaObject::normalizedSignature("event_<xsl:value-of select="replace(@event,'\.','__')" /><xsl:if test="not(contains(@event,')'))">()</xsl:if>")),QVariantList()<xsl:for-each
                         select="s:param"><xsl:text><![CDATA[<<]]></xsl:text> QVariant(<xsl:choose>
@@ -64,7 +64,7 @@
                           <xsl:when test="string(@name)!=''">get_<xsl:value-of select="@name" />()</xsl:when>
                           <xsl:otherwise><xsl:value-of select="text()" /></xsl:otherwise>
                         </xsl:choose>)
-                      </xsl:for-each>));
+                      </xsl:for-each>)<xsl:if test="name()='raise' or @target='_internal'">,QStateMachine::HighPriority</xsl:if>);
 </xsl:template>
 <xsl:template mode="execContext" match="s:cancel">
 <xsl:call-template name="comment" /><![CDATA[
@@ -92,7 +92,6 @@
  #include "QHistoryState"
 </xsl:if>
 #include "QHash"
-#include "QSignalEvent"
 #include "QEventTransition"
 <xsl:if test="count(//s:log)!=0">
 #include "QDebug"
@@ -121,7 +120,7 @@ class SMClass_<xsl:call-template name="smname" />;
     <![CDATA[
       #define ARG_FROM_VAR(I) \
           (acount > I \
-                ? QGenericArgument(((QSignalEvent*)event)->arguments()[I].typeName(),((QSignalEvent*)event)->arguments()[I].data()) \
+                ? QGenericArgument(((QStateMachine::SignalEvent*)event)->arguments()[I].typeName(),((QStateMachine::SignalEvent*)event)->arguments()[I].data()) \
                 : QGenericArgument())
                 
 
@@ -130,9 +129,9 @@ class SMClass_<xsl:call-template name="smname" />;
           Q_OBJECT
           private:
             QStateMachine* machine;
-            QSignalEvent* event;
+            QStateMachine::SignalEvent* event;
           public:
-          SCC_EventSender(QStateMachine* m=NULL, int delay=0, QSignalEvent* e=NULL) : QTimer(m), machine(m), event(e)
+          SCC_EventSender(QStateMachine* m=NULL, int delay=0, QStateMachine::SignalEvent* e=NULL) : QTimer(m), machine(m), event(e)
           {
             setInterval(delay);
             setSingleShot(true);
@@ -276,7 +275,7 @@ class SMClass_<xsl:call-template name="smname" /> : public QStateMachine
         if (event && !event->type() == QEvent::None) {
           switch (event->type()) {
             case QEvent::Signal: {
-              QSignalEvent* e = (QSignalEvent*)event;
+              QStateMachine::SignalEvent* e = (QStateMachine::SignalEvent*)event;
               _event.data = e->arguments();
               _event.name = e->sender()->metaObject()->method(e->signalIndex()).signature();
               if (e->sender() == this)
-- 
cgit v1.2.3