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

[Arno Rehn]

SVN commit 653242 by arnorehn:

* Fixed CMakeLists.txt's to work with the new directory structure. Some lines of
  the top-level CMakeLists.txt should be put in subdirectories, though.
* Subclasses of QTextBlockUserData are now contained instances.

CCMAIL: kde-bindings at kde.org



 M  +7 -8      CMakeLists.txt  
 M  +6 -0      ChangeLog  
 M  +2 -0      src/handlers.cpp  
 M  +1 -0      tools/CMakeLists.txt  
 M  +2 -2      tools/uics/CMakeLists.txt  


--- trunk/KDE/kdebindings/csharp/qyoto/CMakeLists.txt #653241:653242
@@ -1,13 +1,13 @@
 PROJECT (kimono)
 
 # source files
-SET(SRC_CPP qyoto.cpp
-	handlers.cpp)
+SET(SRC_CPP src/qyoto.cpp
+	src/handlers.cpp)
 
-SET(SRC_CS ${CMAKE_CURRENT_SOURCE_DIR}/SmokeInvocation.cs
-	${CMAKE_CURRENT_SOURCE_DIR}/SmokeMarshallers.cs
-	${CMAKE_CURRENT_SOURCE_DIR}/Qyoto.cs
-	${CMAKE_CURRENT_SOURCE_DIR}/QyotoMetaData.cs
+SET(SRC_CS ${CMAKE_CURRENT_SOURCE_DIR}/src/SmokeInvocation.cs
+	${CMAKE_CURRENT_SOURCE_DIR}/src/SmokeMarshallers.cs
+	${CMAKE_CURRENT_SOURCE_DIR}/src/Qyoto.cs
+	${CMAKE_CURRENT_SOURCE_DIR}/src/QyotoMetaData.cs
 	${CMAKE_CURRENT_SOURCE_DIR}/core/*.cs
 	${CMAKE_CURRENT_SOURCE_DIR}/gui/*.cs
 	${CMAKE_CURRENT_SOURCE_DIR}/network/*.cs
@@ -40,7 +40,7 @@
 	MESSAGE (STATUS "Looking for gmcs - found - ${GMCS_PATH}")
 ENDIF (NOT GMCS_PATH)
 
-SET( UICS_PATH ${CMAKE_CURRENT_SOURCE_DIR}/uics/uics )
+SET( UICS_PATH ${CMAKE_CURRENT_SOURCE_DIR}/tools/uics/uics )
 SET( CSRCC_PATH ${CMAKE_CURRENT_SOURCE_DIR}/tools/csrcc/csrcc )
 
 INCLUDE_DIRECTORIES (${QT_INCLUDES})
@@ -52,6 +52,5 @@
 
 ADD_DEPENDENCIES (qt-dotnet qyoto)
 
-ADD_SUBDIRECTORY(uics)
 ADD_SUBDIRECTORY(tools)
 ADD_SUBDIRECTORY(examples)
--- trunk/KDE/kdebindings/csharp/qyoto/ChangeLog #653241:653242
@@ -1,3 +1,9 @@
+2007-04-13  Arno Rehn  <arno at arnorehn.de>
+
+	* Fixed CMakeLists.txt's to work with the new directory structure. Some lines of
+	  the top-level CMakeLists.txt should be put in subdirectories, though.
+	* Subclasses of QTextBlockUserData are now contained instances.
+
 2007-04-09  Richard Dale  <rdale at foton.es>
 
 	* Added marshallers for some of the new Qt 4.3 list types
--- trunk/KDE/kdebindings/csharp/qyoto/src/handlers.cpp #653241:653242
@@ -272,6 +272,8 @@
 		if (qobject->parent() != 0) {
 			return true;
 		}
+	} else if (isDerivedFromByName(o->smoke, className, "QTextBlockUserData")) {
+		return true;
 	}
 	
     return false;
--- trunk/KDE/kdebindings/csharp/qyoto/tools/CMakeLists.txt #653241:653242
@@ -1,3 +1,4 @@
 ADD_SUBDIRECTORY(csrcc)
+ADD_SUBDIRECTORY(uics)
 
 
--- trunk/KDE/kdebindings/csharp/qyoto/tools/uics/CMakeLists.txt #653241:653242
@@ -1,6 +1,6 @@
 
-include_directories( ${CMAKE_SOURCE_DIR}/uics )
-include_directories( ${CMAKE_SOURCE_DIR}/uics/cs )
+include_directories( ${CMAKE_SOURCE_DIR}/tools/uics )
+include_directories( ${CMAKE_SOURCE_DIR}/tools/uics/cs )
 
 ########### next target ###############