Mercurial > projects > qtd
changeset 308:2485419c5c63 signals
merge with 299
author | eldar_ins@eldar-laptop |
---|---|
date | Wed, 23 Dec 2009 04:45:55 +0500 |
parents | 91ed8edd442e (current diff) 3b79bd4298e8 (diff) |
children | 8a0cf14e3419 |
files | generator/abstractmetalang.cpp generator/dgenerator.cpp generator/typesystem_core.xml generator/typesystem_gui.xml generator/typesystem_phonon.xml generator/typesystem_xmlpatterns.xml qt/qtd/MetaMarshall.d |
diffstat | 8 files changed, 13 insertions(+), 39 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt Wed Dec 23 04:02:28 2009 +0500 +++ b/CMakeLists.txt Wed Dec 23 04:45:55 2009 +0500 @@ -123,14 +123,14 @@ make_native_path(cd_path) add_custom_command(TARGET main POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E make_directory ${CMAKE_BINARY_DIR}/build - COMMAND cd ARGS ${cd_path} && ${CMAKE_COMMAND} -G${CMAKE_GENERATOR} -DSECOND_RUN=1 ${CMAKE_SOURCE_DIR} && ${make_util} + COMMAND cd ARGS ${cd_path} && ${CMAKE_COMMAND} -G${CMAKE_GENERATOR} -DSECOND_RUN=1 ${CMAKE_SOURCE_DIR} && ${make_util} COMMENT "" ) ## "Make install" command. set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_BINARY_DIR}/build) add_custom_target(install - COMMAND cd ${CMAKE_BINARY_DIR}/build && ${make_util} install + COMMAND cd ARGS ${cd_path} && ${make_util} install COMMENT "" ) add_dependencies(install preinstall)
--- a/generator/abstractmetalang.cpp Wed Dec 23 04:02:28 2009 +0500 +++ b/generator/abstractmetalang.cpp Wed Dec 23 04:45:55 2009 +0500 @@ -1905,13 +1905,10 @@ if (isConstant()) minimalSignature += "const "; minimalSignature += typeEntry()->qualifiedCppName(); - if (hasInstantiations() && - (static_cast<const ContainerTypeEntry *>(typeEntry()))->type() != ContainerTypeEntry::StringListContainer) - { + if (hasInstantiations()) { QList<AbstractMetaType *> instantiations = this->instantiations(); minimalSignature += "<"; - for (int i=0;i<instantiations.size();++i) - { + for (int i=0;i<instantiations.size();++i) { if (i > 0) minimalSignature += ","; minimalSignature += instantiations.at(i)->minimalSignature();
--- a/generator/dgenerator.cpp Wed Dec 23 04:02:28 2009 +0500 +++ b/generator/dgenerator.cpp Wed Dec 23 04:45:55 2009 +0500 @@ -2708,7 +2708,7 @@ bool hasDefault = false; do // need this to look for default arguments and generate extra signatures { - if (j) + if (i || j) s << ", "; s << endl << INDENT << " \"" << meta_funcs.at(i)->minimalSignature(j) << "\""; AbstractMetaArgumentList args = meta_funcs.at(i)->arguments();
--- a/generator/typesystem_core.xml Wed Dec 23 04:02:28 2009 +0500 +++ b/generator/typesystem_core.xml Wed Dec 23 04:45:55 2009 +0500 @@ -2290,7 +2290,7 @@ <reference-count action="set" variable-name="__rcStandardOutputProcess"/> </modify-argument> </modify-function> -<!-- <modify-function signature="startDetached(QString,QStringList,QString,long long*)"> +<!-- <modify-function signature="startDetached(QString,QStringList<QString>,QString,long long*)"> <access modifier="private"/> <modify-argument index="4"> <remove-default-expression/>
--- a/generator/typesystem_gui.xml Wed Dec 23 04:02:28 2009 +0500 +++ b/generator/typesystem_gui.xml Wed Dec 23 04:45:55 2009 +0500 @@ -4868,7 +4868,7 @@ <access modifier="private" /> </modify-function> - <modify-function signature="getItem(QWidget *, const QString &, const QString &, const QStringList &, int, bool, bool *, QFlags<Qt::WindowType>)"> + <modify-function signature="getItem(QWidget *, const QString &, const QString &, const QStringList<QString> &, int, bool, bool *, QFlags<Qt::WindowType>)"> <rename to="getItem_private"/> <access modifier="private"/> </modify-function> @@ -5375,7 +5375,7 @@ <define-ownership class="java" owner="c++"/> </modify-argument> </modify-function> - <modify-function signature="QTreeWidgetItem(QTreeWidget *,const QStringList &,int)"> + <modify-function signature="QTreeWidgetItem(QTreeWidget *,const QStringList<QString> &,int)"> <modify-argument index="this"> <define-ownership class="java" owner="c++"/> </modify-argument> @@ -5390,7 +5390,7 @@ <define-ownership class="java" owner="c++"/> </modify-argument> </modify-function> - <modify-function signature="QTreeWidgetItem(QTreeWidgetItem *,const QStringList &,int)"> + <modify-function signature="QTreeWidgetItem(QTreeWidgetItem *,const QStringList<QString> &,int)"> <modify-argument index="this"> <define-ownership class="java" owner="c++"/> </modify-argument> @@ -5509,9 +5509,9 @@ <!-- <modify-function signature="addItem(const QString &)" remove="all"/>--> - <modify-function signature="addItems(const QStringList &)" remove="all"/> + <modify-function signature="addItems(const QStringList<QString> &)" remove="all"/> <modify-function signature="insertItem(int, const QString &)" remove="all"/> - <modify-function signature="insertItems(int, const QStringList &)" remove="all"/> + <modify-function signature="insertItems(int, const QStringList<QString> &)" remove="all"/> <inject-code> <import-file name="typesystem_gui-java.java" quote-after-line="class QListWidget___" quote-before-line="}// class"/> </inject-code>
--- a/generator/typesystem_phonon.xml Wed Dec 23 04:02:28 2009 +0500 +++ b/generator/typesystem_phonon.xml Wed Dec 23 04:45:55 2009 +0500 @@ -75,7 +75,7 @@ <interface-type name="Phonon::MediaObjectInterface" java-name="AbstractMediaObject"/> <interface-type name="Phonon::PlatformPlugin" java-name="PlatformPlugin"> - <modify-function signature="notification(const char *, const QString &, const QStringList &, QObject *, const char *)const"> + <modify-function signature="notification(const char *, const QString &, const QStringList<QString> &, QObject *, const char *)const"> <modify-argument index="3"> <replace-default-expression with="null"/> </modify-argument>
--- a/generator/typesystem_xmlpatterns.xml Wed Dec 23 04:02:28 2009 +0500 +++ b/generator/typesystem_xmlpatterns.xml Wed Dec 23 04:45:55 2009 +0500 @@ -125,7 +125,7 @@ <object-type name="QXmlQuery"> <modify-function signature="evaluateTo(QAbstractXmlReceiver *)const" remove="all"/> - <modify-function signature="evaluateTo(QStringList*)const" remove="all"/> + <modify-function signature="evaluateTo(QStringList<QString>*)const" remove="all"/> <modify-function signature="setMessageHandler(QAbstractMessageHandler*)"> <modify-argument index="1"> <reference-count action="set" variable-name="__rcMessageHandler"/>
--- a/qt/qtd/MetaMarshall.d Wed Dec 23 04:02:28 2009 +0500 +++ b/qt/qtd/MetaMarshall.d Wed Dec 23 04:45:55 2009 +0500 @@ -2,14 +2,8 @@ import std.traits; -// utilities // shouldn't be here -public bool startsWith(T)(T[] source, T[] pattern) -{ - return source.length >= pattern.length && source[0 .. pattern.length] == pattern[]; -} - string __toString(long v) { if (v == 0) @@ -36,16 +30,6 @@ return ret; } -template templateParam(U : V!(U), alias V) -{ - alias U templateParam; -} - - -/* - * actual stuff - */ - template isQObjectType(T) // is a QObject type that belongs to the library { enum isQObjectType = is(T.__isQObjectType); @@ -71,11 +55,6 @@ enum isStringType = is(T == string); } -template isQList(T) -{ - enum isQList = startsWith(Unqual!(T).stringof, "QList!"); -} - // converts an argumnent from C++ to D in qt_metacall string metaCallArgument(T)(string ptr) { @@ -97,8 +76,6 @@ return T.stringof ~ "*"; else static if (isStringType!T) return "QString"; - else static if (isQList!T) - return "QList<" ~ qtDeclArg!(templateParam!T)() ~ ">"; else static if (isNativeType!T) return Unqual!T.stringof; else