[Kde-bindings] KDE/kdebindings/csharp/nepomuk

[Arno Rehn]

SVN commit 901214 by arnorehn:

* Make the marshallers active again and add nepomuk and nepomukqueryclient
  as libs to link to. This is the same in the ruby bindings.

CCMAIL: kde-bindings at kde.org



 M  +1 -1      CMakeLists.txt  
 M  +18 -18    src/nepomukhandlers.cpp  


--- trunk/KDE/kdebindings/csharp/nepomuk/CMakeLists.txt #901213:901214
@@ -18,7 +18,7 @@
 	${CMAKE_CURRENT_SOURCE_DIR}/../qyoto/src ${QT_INCLUDES})
 LINK_DIRECTORIES (${LIBRARY_OUTPUT_PATH})
 ADD_LIBRARY(nepomuk-sharp MODULE ${SRC_CPP})
-TARGET_LINK_LIBRARIES(nepomuk-sharp smokeqt smokenepomuk qyotoshared ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
+TARGET_LINK_LIBRARIES(nepomuk-sharp nepomuk nepomukqueryclient smokeqt smokenepomuk qyotoshared ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
 
 SET(CS_FLAGS -r:${LIBRARY_OUTPUT_PATH}/qt-dotnet.dll -r:${LIBRARY_OUTPUT_PATH}/soprano.dll -warn:0 -keyfile:${KEYFILE})
 ADD_CS_LIBRARY(nepomuk-dll "${SRC_CS}" ALL)
--- trunk/KDE/kdebindings/csharp/nepomuk/src/nepomukhandlers.cpp #901213:901214
@@ -17,28 +17,28 @@
 
 #include <qyoto.h>
 #include <smokeqyoto.h>
-// #include <marshall_macros.h>
+#include <marshall_macros.h>
 
-// #include <nepomuk/class.h>
-// #include <nepomuk/property.h>
-// #include <nepomuk/resource.h>
-// #include <nepomuk/tag.h>
-// #include <nepomuk/variant.h>
+#include <nepomuk/class.h>
+#include <nepomuk/property.h>
+#include <nepomuk/resource.h>
+#include <nepomuk/tag.h>
+#include <nepomuk/variant.h>
 
-// DEF_VALUELIST_MARSHALLER( NepomukResourceList, QList<Nepomuk::Resource>, Nepomuk::Resource )
-// DEF_VALUELIST_MARSHALLER( NepomukTagList, QList<Nepomuk::Tag>, Nepomuk::Tag )
-// DEF_VALUELIST_MARSHALLER( NepomukTypesClassList, QList<Nepomuk::Types::Class>, Nepomuk::Types::Class )
-// DEF_VALUELIST_MARSHALLER( NepomukTypesPropertyList, QList<Nepomuk::Types::Property>, Nepomuk::Types::Property )
+DEF_VALUELIST_MARSHALLER( NepomukResourceList, QList<Nepomuk::Resource>, Nepomuk::Resource )
+DEF_VALUELIST_MARSHALLER( NepomukTagList, QList<Nepomuk::Tag>, Nepomuk::Tag )
+DEF_VALUELIST_MARSHALLER( NepomukTypesClassList, QList<Nepomuk::Types::Class>, Nepomuk::Types::Class )
+DEF_VALUELIST_MARSHALLER( NepomukTypesPropertyList, QList<Nepomuk::Types::Property>, Nepomuk::Types::Property )
 
 TypeHandler Nepomuk_handlers[] = {
-//     { "QList<Nepomuk::Resource>", marshall_NepomukResourceList },
-//     { "QList<Nepomuk::Resource>&", marshall_NepomukResourceList },
-//     { "QList<Nepomuk::Tag>", marshall_NepomukTagList },
-//     { "QList<Nepomuk::Tag>&", marshall_NepomukTagList },
-//     { "QList<Nepomuk::Types::Class>", marshall_NepomukTypesClassList },
-//     { "QList<Nepomuk::Types::Class>&", marshall_NepomukTypesClassList },
-//     { "QList<Nepomuk::Types::Property>", marshall_NepomukTypesPropertyList },
-//     { "QList<Nepomuk::Types::Property>&", marshall_NepomukTypesPropertyList },
+    { "QList<Nepomuk::Resource>", marshall_NepomukResourceList },
+    { "QList<Nepomuk::Resource>&", marshall_NepomukResourceList },
+    { "QList<Nepomuk::Tag>", marshall_NepomukTagList },
+    { "QList<Nepomuk::Tag>&", marshall_NepomukTagList },
+    { "QList<Nepomuk::Types::Class>", marshall_NepomukTypesClassList },
+    { "QList<Nepomuk::Types::Class>&", marshall_NepomukTypesClassList },
+    { "QList<Nepomuk::Types::Property>", marshall_NepomukTypesPropertyList },
+    { "QList<Nepomuk::Types::Property>&", marshall_NepomukTypesPropertyList },
 //    { "QHash<QUrl,Nepomuk::Variant>", marshall_QHashQUrlNepomukVariant },
     { 0, 0 }
 };