Rename "after-version" attribute to "since-version"

since that better matches the actual behavior

Author: usiems

generator/typesystem.cpp

@@ -269,7 +269,7 @@ void Handler::fetchAttributeValues(const QString &name, const QXmlAttributes &at
         QString key = atts.localName(i).toLower();
         QString val = atts.value(i);
 
-        if (!acceptedAttributes->contains(key) && key != "after-version" && key != "before-version") {
+        if (!acceptedAttributes->contains(key) && key != "since-version" && key != "before-version") {
             ReportHandler::warning(QString("Unknown attribute for '%1': '%2'").arg(name).arg(key));
         } else {
             (*acceptedAttributes)[key] = val;
@@ -484,16 +484,16 @@ bool Handler::qtVersionMatches(const QXmlAttributes& atts, bool& ok)
       m_error = "Invalid 'before-version' version string: " + atts.value(beforeIndex);
     }
   }
-  int afterIndex = atts.index("after-version"); // after-version really means this version or any version after
-  if (afterIndex >= 0) {
-    uint afterVersion = TypeSystem::qtVersionFromString(atts.value(afterIndex), ok);
+  int sinceIndex = atts.index("since-version");
+  if (sinceIndex >= 0) {
+    uint sinceVersion = TypeSystem::qtVersionFromString(atts.value(sinceIndex), ok);
     if (ok) {
-      if (m_qtVersion < afterVersion) {
+      if (m_qtVersion < sinceVersion) {
         return false;
       }
     }
     else {
-      m_error = "Invalid 'after-version' version string: " + atts.value(afterIndex);
+      m_error = "Invalid 'since-version' version string: " + atts.value(sinceIndex);
     }
   }
   return true;

generator/typesystem_core.xml

@@ -1285,7 +1285,7 @@
     <!-- Can't provide same API and performance -->
 
     <modify-function signature="open(int,QFlags&lt;QIODevice::OpenModeFlag&gt;)" remove="all" before-version="6"/>
-    <modify-function signature="open(int,QFlags&lt;QIODeviceBase::OpenModeFlag&gt;,QFlags&lt;QFileDevice::FileHandleFlag&gt;)" remove="all" after-version="6"/>
+    <modify-function signature="open(int,QFlags&lt;QIODeviceBase::OpenModeFlag&gt;,QFlags&lt;QFileDevice::FileHandleFlag&gt;)" remove="all" since-version="6"/>
     <modify-function signature="decodeName(const char*)" remove="all"/>
     <modify-function signature="map(qint64,qint64,QFile::MemoryMapFlags)" remove="all"/>
     <modify-function signature="unmap(uchar*)" remove="all"/>

generator/typesystem_multimedia.xml

@@ -75,7 +75,7 @@
 <enum-type name="QMediaStreamsControl::StreamType"/>
 
 <namespace-type name="QAudio"/>
-<namespace-type name="QMultimedia" after-version="5"/>
+<namespace-type name="QMultimedia" since-version="5"/>
 
 <object-type name="QAbstractVideoBuffer"/>
 <object-type name="QAbstractVideoSurface"/>
@@ -176,7 +176,7 @@
 
 <object-type name="QMediaServiceProviderPlugin"/>
 
-<group after-verson="6">
+<group since-version="6">
   <object-type name="QAudioDevice"/>
   <object-type name="QAudioSink"/>
   <object-type name="QAudioSource"/>