[Kde-bindings] branches/KDE/4.2/kdebindings

[Richard Dale]

SVN commit 910985 by rdale:

* Remove the nepomukquery classes from Smoke, Ruby and C# for now. Add them
  in optional seperate libs and extensions later, so linking against kdebase
  won't be a problem.

CCMAIL: kde-bindings at kde.org



 M  +1 -1      csharp/nepomuk/CMakeLists.txt  
 D             csharp/nepomuk/nepomuk/Nepomuk_Search.cs  
 D             csharp/nepomuk/nepomuk/Nepomuk_Search_Query.cs  
 D             csharp/nepomuk/nepomuk/Nepomuk_Search_QueryParser.cs  
 D             csharp/nepomuk/nepomuk/Nepomuk_Search_QueryServiceClient.cs  
 D             csharp/nepomuk/nepomuk/Nepomuk_Search_Result.cs  
 D             csharp/nepomuk/nepomuk/Nepomuk_Search_Term.cs  
 M  +2 -2      ruby/CMakeLists.txt  
 M  +0 -2      ruby/nepomuk/CMakeLists.txt  
 M  +0 -2      smoke/nepomuk/CMakeLists.txt  
 M  +0 -7      smoke/nepomuk/classlist  
 M  +0 -5      smoke/nepomuk/nepomuk_header_list  


--- branches/KDE/4.2/kdebindings/csharp/nepomuk/CMakeLists.txt #910984:910985
@@ -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 nepomuk nepomukqueryclient smokeqt smokenepomuk qyotoshared ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
+TARGET_LINK_LIBRARIES(nepomuk-sharp ${NEPOMUK_LIBRARIES} 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)
--- branches/KDE/4.2/kdebindings/ruby/CMakeLists.txt #910984:910985
@@ -108,8 +108,8 @@
         set(KTEXTEDITOR_ENABLED "yes")
     endif(ENABLE_KTEXTEDITOR_RUBY)
     if(Nepomuk_FOUND)
-	    #add_subdirectory( nepomuk )
-         #set(NEPOMUK_ENABLED "yes")
+	add_subdirectory( nepomuk )
+        set(NEPOMUK_ENABLED "yes")
     endif(Nepomuk_FOUND)
     if(OKULAR_FOUND)
         add_subdirectory( okular )
--- branches/KDE/4.2/kdebindings/ruby/nepomuk/CMakeLists.txt #910984:910985
@@ -7,8 +7,6 @@
 target_link_libraries(rubynepomuk 
     ${RUBY_LIBRARY} 
     ${NEPOMUK_LIBRARIES}
-    nepomukqueryclient
-    nepomukquery
     smokeqt 
     smokesoprano
     smokekde 
--- branches/KDE/4.2/kdebindings/smoke/nepomuk/CMakeLists.txt #910984:910985
@@ -84,8 +84,6 @@
 
 target_link_libraries(smokenepomuk 
     ${NEPOMUK_LIBRARIES}
-    nepomukquery
-    nepomukqueryclient
     ${KDE4_KDECORE_LIBS}
     smokesoprano
     smokekde
--- branches/KDE/4.2/kdebindings/smoke/nepomuk/classlist #910984:910985
@@ -22,13 +22,6 @@
 Nepomuk::ResourceGuiItemFactory
 Nepomuk::ResourceManager
 Nepomuk::ResourceModel
-Nepomuk::Search
-Nepomuk::Search::Query
-Nepomuk::Search::QueryParser
-Nepomuk::Search::QueryServiceClient
-Nepomuk::Search::Result
-Nepomuk::Search::SearchCore
-Nepomuk::Search::Term
 Nepomuk::SearchHitModel
 Nepomuk::SearchHitView
 Nepomuk::Service
--- branches/KDE/4.2/kdebindings/smoke/nepomuk/nepomuk_header_list #910984:910985
@@ -16,14 +16,9 @@
 nepomuk/ontologyloader.h
 nepomuk/ontologymanager.h
 nepomuk/property.h
-nepomuk/query.h
-nepomuk/queryparser.h
-nepomuk/queryserviceclient.h
 nepomuk/resource.h
 nepomuk/resourcemanager.h
-nepomuk/result.h
 nepomuk/tag.h
-nepomuk/term.h
 nepomuk/thing.h
 nepomuk/tools.h
 nepomuk/variant.h