[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: extragear/multimedia/amarok/src/scriptengine/generator/generator
From: Ian Monroe <ian.monroe () gmail ! com>
Date: 2009-02-04 0:44:57
Message-ID: 1233708297.535259.15746.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 920916 by ianmonroe:
the latest qtscriptgenerator
M +6 -0 classgenerator.cpp
M +0 -2 typesystem_gui-qtscript.xml
M +1 -1 typesystem_gui.xml
M +11 -1 typesystem_phonon-common.xml
M +18 -0 typesystem_phonon-qtscript.xml
M +23 -1 typesystem_phonon.xml
--- trunk/extragear/multimedia/amarok/src/scriptengine/generator/generator/classgenerator.cpp \
#920915:920916 @@ -164,10 +164,16 @@
return QLatin1String("isString");
else if (typeName == QLatin1String("double"))
return QLatin1String("isNumber");
+ else if (typeName == QLatin1String("float"))
+ return QLatin1String("isNumber");
else if (typeName == QLatin1String("int"))
return QLatin1String("isNumber");
else if (typeName == QLatin1String("uint"))
return QLatin1String("isNumber");
+ else if (typeName == QLatin1String("short"))
+ return QLatin1String("isNumber");
+ else if (typeName == QLatin1String("unsigned short"))
+ return QLatin1String("isNumber");
else if (typeName == QLatin1String("bool"))
return QLatin1String("isBoolean");
else if (typeName == QLatin1String("QVariant"))
--- trunk/extragear/multimedia/amarok/src/scriptengine/generator/generator/typesystem_gui-qtscript.xml \
#920915:920916 @@ -26,8 +26,6 @@
<rejection class="QAbstractProxyModel"/>
<rejection class="QSortFilterProxyModel"/>
<rejection class="QDirModel"/>
- <rejection class="QDrag"/>
- <rejection class="QDropEvent"/>
<rejection class="QFileSystemModel"/>
<rejection class="QGraphicsSceneDragDropEvent"/>
<rejection class="QPrinterInfo"/>
--- trunk/extragear/multimedia/amarok/src/scriptengine/generator/generator/typesystem_gui.xml \
#920915:920916 @@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<typesystem package="com.trolltech.qt.gui"><rejection \
class="QAbstractTextDocumentLayout"/><rejection class="QColormap"/><rejection \
class="QFontDatabase"/><rejection class="QIconEngineV2"/><rejection \
class="QInputMethodEvent"/><rejection class="QPainterPath::Element"/><rejection \
class="QTextBlock::iterator"/><rejection \
class="QTextEdit::ExtraSelection"/><rejection \
class="QTextFrame::iterator"/><rejection class="QTextLayout::FormatRange"/><rejection \
class="QTreeWidgetItemIterator"/><rejection \
class="QAccessibleFactoryInterface"/><rejection \
class="QIconEngineFactoryInterfaceV2"/><rejection \
class="QImageIOHandlerFactoryInterface"/><rejection \
class="QInputContextFactoryInterface"/><rejection \
class="QStyleFactoryInterface"/><rejection \
class="QTextCodecFactoryInterface"/><rejection \
class="QPictureFormatInterface"/><rejection class="QAbstractProxyModel"/><rejection \
class="QSortFilterProxyModel"/><rejection class="QDirModel"/><rejection \
class="QDrag"/><rejection class="QDropEvent"/> <rejection \
class="QFileSystemModel"/><rejection class="QGraphicsSceneDragDropEvent"/><rejection \
class="QPrinterInfo"/><rejection class="QProxyModel"/><rejection \
class="QPrinterInfo"/><rejection class="QTextOption"/><suppress-warning \
text="WARNING(MetaJavaBuilder) :: Rejected enum has no alternative...: \
QPalette::NColorRoles"/><suppress-warning text="WARNING(MetaJavaBuilder) :: Cannot \
find enum constant for value 'DragMove' in 'QDragMoveEvent' or any of its super \
classes"/> +<typesystem package="com.trolltech.qt.gui"><rejection \
class="QAbstractTextDocumentLayout"/><rejection class="QColormap"/><rejection \
class="QFontDatabase"/><rejection class="QIconEngineV2"/><rejection \
class="QInputMethodEvent"/><rejection class="QPainterPath::Element"/><rejection \
class="QTextBlock::iterator"/><rejection \
class="QTextEdit::ExtraSelection"/><rejection \
class="QTextFrame::iterator"/><rejection class="QTextLayout::FormatRange"/><rejection \
class="QTreeWidgetItemIterator"/><rejection \
class="QAccessibleFactoryInterface"/><rejection \
class="QIconEngineFactoryInterfaceV2"/><rejection \
class="QImageIOHandlerFactoryInterface"/><rejection \
class="QInputContextFactoryInterface"/><rejection \
class="QStyleFactoryInterface"/><rejection \
class="QTextCodecFactoryInterface"/><rejection \
class="QPictureFormatInterface"/><rejection class="QAbstractProxyModel"/><rejection \
class="QSortFilterProxyModel"/><rejection class="QDirModel"/><rejection \
class="QFileSystemModel"/><rejection class="QG \
raphicsSceneDragDropEvent"/><rejection class="QPrinterInfo"/><rejection \
class="QProxyModel"/><rejection class="QPrinterInfo"/><rejection \
class="QTextOption"/><suppress-warning text="WARNING(MetaJavaBuilder) :: Rejected \
enum has no alternative...: QPalette::NColorRoles"/><suppress-warning \
text="WARNING(MetaJavaBuilder) :: Cannot find enum constant for value 'DragMove' in \
'QDragMoveEvent' or any of its super classes"/> <rejection class="*" \
function-name="d_func"/>
<rejection class="*" field-name="d_ptr"/>
--- trunk/extragear/multimedia/amarok/src/scriptengine/generator/generator/typesystem_phonon-common.xml \
#920915:920916 @@ -12,6 +12,10 @@
<rejection class="AudioOutputAdaptor" />
<rejection class="*" field-name="k_ptr" />
+ <rejection class="Phonon::AudioOutputInterface40" />
+ <rejection class="Phonon::AudioOutputInterface42" />
+ <rejection class="Phonon::AudioOutputInterface" />
+
<namespace-type name="Phonon" />
<namespace-type name="Phonon::BackendCapabilities" \
java-name="BackendCapabilities" />
@@ -21,6 +25,8 @@
<enum-type name="Phonon::Category">
<reject-enum-value name="LastCategory" />
</enum-type>
+ <enum-type name="Phonon::AddonInterface::SubtitleCommand" />
+ <enum-type name="Phonon::AddonInterface::AudioChannelCommand" />
<enum-type name="Phonon::DiscType" />
<enum-type name="Phonon::ErrorType" />
<enum-type name="Phonon::MetaData" />
@@ -42,7 +48,8 @@
<interface-type name="Phonon::AbstractVideoOutput" \
java-name="AbstractVideoOutput" />
<interface-type name="Phonon::AddonInterface" java-name="AbstractAddon" />
- <interface-type name="Phonon::AudioOutputInterface" \
java-name="AudioOutputInterface" /> + <!-- ### causes compile error with Qt 4.5, \
the functions in the class aren't picked up by the typesystem --> +<!-- \
<interface-type name="Phonon::AudioOutputInterface" java-name="AudioOutputInterface" \
/> -->
<interface-type name="Phonon::BackendInterface" java-name="AbstractBackend" />
<interface-type name="Phonon::EffectInterface" java-name="AbstractEffect" />
<interface-type name="Phonon::MediaNode" java-name="MediaNode" />
@@ -91,6 +98,9 @@
<value-type name="Phonon::ObjectDescription" generate="no" />
<value-type name="Phonon::EffectDescription" java-name="EffectDescription" />
<value-type name="Phonon::AudioOutputDevice" java-name="AudioOutputDevice" />
+ <value-type name="Phonon::AudioChannelDescription" \
java-name="AudioChannelDescription" /> + <value-type \
name="Phonon::SubtitleDescription" java-name="SubtitleDescription" /> + \
<value-type name="Phonon::AudioCaptureDevice" java-name="AudioCaptureDevice" />
<object-type name="Phonon::AbstractAudioOutput" java-name="AbstractAudioOutput" \
/>
<object-type name="Phonon::AbstractMediaStream" java-name="AbstractMediaStream" \
/>
--- trunk/extragear/multimedia/amarok/src/scriptengine/generator/generator/typesystem_phonon-qtscript.xml \
#920915:920916 @@ -1,6 +1,18 @@
<?xml version="1.0"?>
<typesystem package="com.trolltech.qt.phonon">
+ <value-type name="Phonon::AudioChannelDescription">
+ <modify-function signature="operator==(Phonon::ObjectDescription)const" \
remove="all" /> + <modify-function \
signature="operator!=(Phonon::ObjectDescription)const" remove="all" /> + \
<modify-function signature="fromIndex(int)" remove="all" /> + </value-type>
+
+ <value-type name="Phonon::AudioCaptureDevice">
+ <modify-function signature="operator==(Phonon::ObjectDescription)const" \
remove="all" /> + <modify-function \
signature="operator!=(Phonon::ObjectDescription)const" remove="all" /> + \
<modify-function signature="fromIndex(int)" remove="all" /> + </value-type>
+
<value-type name="Phonon::AudioOutputDevice">
<modify-function signature="operator==(Phonon::ObjectDescription)const" \
remove="all" />
<modify-function signature="operator!=(Phonon::ObjectDescription)const" \
remove="all" /> @@ -18,6 +30,12 @@
<modify-function signature="operator==(Phonon::EffectParameter)const" \
remove="all" /> </value-type>
+ <value-type name="Phonon::SubtitleDescription">
+ <modify-function signature="operator==(Phonon::ObjectDescription)const" \
remove="all" /> + <modify-function \
signature="operator!=(Phonon::ObjectDescription)const" remove="all" /> + \
<modify-function signature="fromIndex(int)" remove="all" /> + </value-type>
+
<suppress-warning text="WARNING(MetaJavaBuilder) :: enum \
'Phonon::AddonInterface::SubtitleCommand' does not have a type entry or is not an \
enum" /> <suppress-warning text="WARNING(MetaJavaBuilder) :: enum \
'Phonon::AddonInterface::AudioChannelCommand' does not have a type entry or is not an \
enum" /> <suppress-warning text="WARNING(MetaJavaBuilder) :: class \
'AudioOutputInterface' inherits from unknown base class \
'Phonon::AudioOutputInterface40'" />
--- trunk/extragear/multimedia/amarok/src/scriptengine/generator/generator/typesystem_phonon.xml \
#920915:920916 @@ -12,6 +12,10 @@
<rejection class="AudioOutputAdaptor"/>
<rejection class="*" field-name="k_ptr"/>
+ <rejection class="Phonon::AudioOutputInterface40"/>
+ <rejection class="Phonon::AudioOutputInterface42"/>
+ <rejection class="Phonon::AudioOutputInterface"/>
+
<namespace-type name="Phonon"/>
<namespace-type name="Phonon::BackendCapabilities" \
java-name="BackendCapabilities"/>
@@ -21,6 +25,8 @@
<enum-type name="Phonon::Category">
<reject-enum-value name="LastCategory"/>
</enum-type>
+ <enum-type name="Phonon::AddonInterface::SubtitleCommand"/>
+ <enum-type name="Phonon::AddonInterface::AudioChannelCommand"/>
<enum-type name="Phonon::DiscType"/>
<enum-type name="Phonon::ErrorType"/>
<enum-type name="Phonon::MetaData"/>
@@ -42,7 +48,8 @@
<interface-type name="Phonon::AbstractVideoOutput" \
java-name="AbstractVideoOutput"/>
<interface-type name="Phonon::AddonInterface" java-name="AbstractAddon"/>
- <interface-type name="Phonon::AudioOutputInterface" \
java-name="AudioOutputInterface"/> + <!-- ### causes compile error with Qt 4.5, \
the functions in the class aren't picked up by the typesystem --> +<!-- \
<interface-type name="Phonon::AudioOutputInterface" java-name="AudioOutputInterface" \
/> -->
<interface-type name="Phonon::BackendInterface" java-name="AbstractBackend"/>
<interface-type name="Phonon::EffectInterface" java-name="AbstractEffect"/>
<interface-type name="Phonon::MediaNode" java-name="MediaNode"/>
@@ -102,6 +109,21 @@
<modify-function signature="operator!=(Phonon::ObjectDescription)const" \
remove="all"/> <modify-function signature="fromIndex(int)" remove="all"/>
</value-type>
+ <value-type name="Phonon::AudioChannelDescription" \
java-name="AudioChannelDescription"> + <modify-function \
signature="operator==(Phonon::ObjectDescription)const" remove="all"/> + \
<modify-function signature="operator!=(Phonon::ObjectDescription)const" \
remove="all"/> + <modify-function signature="fromIndex(int)" remove="all"/>
+ </value-type>
+ <value-type name="Phonon::SubtitleDescription" java-name="SubtitleDescription">
+ <modify-function signature="operator==(Phonon::ObjectDescription)const" \
remove="all"/> + <modify-function \
signature="operator!=(Phonon::ObjectDescription)const" remove="all"/> + \
<modify-function signature="fromIndex(int)" remove="all"/> + </value-type>
+ <value-type name="Phonon::AudioCaptureDevice" java-name="AudioCaptureDevice">
+ <modify-function signature="operator==(Phonon::ObjectDescription)const" \
remove="all"/> + <modify-function \
signature="operator!=(Phonon::ObjectDescription)const" remove="all"/> + \
<modify-function signature="fromIndex(int)" remove="all"/> + </value-type>
<object-type name="Phonon::AbstractAudioOutput" \
java-name="AbstractAudioOutput"/>
<object-type name="Phonon::AbstractMediaStream" \
java-name="AbstractMediaStream"/>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic